3 files changed, 4 insertions, 80 deletions
diff --git a/source/l/libproxy/gcc47-include-unistd.h.diff b/source/l/libproxy/gcc47-include-unistd.h.diff
deleted file mode 100644
index fc08aeeae..000000000
--- a/source/l/libproxy/gcc47-include-unistd.h.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Nur libproxy-0.4.7.orig/libproxy/modules/config_sysconfig.cpp libproxy-0.4.7/libproxy/modules/config_sysconfig.cpp
---- libproxy-0.4.7.orig/libproxy/modules/config_sysconfig.cpp	2011-06-06 16:44:37.220019451 -0500
-+++ libproxy-0.4.7/libproxy/modules/config_sysconfig.cpp	2012-04-15 23:35:45.752467960 -0500
-@@ -18,6 +18,7 @@
-  ******************************************************************************/
- 
- #include <sys/stat.h>
-+#include <unistd.h>
- #include <cstdlib>
- #include <map>
- #include <fstream>
-diff -Nur libproxy-0.4.7.orig/libproxy/url.cpp libproxy-0.4.7/libproxy/url.cpp
---- libproxy-0.4.7.orig/libproxy/url.cpp	2011-06-06 16:44:37.216019447 -0500
-+++ libproxy-0.4.7/libproxy/url.cpp	2012-04-15 23:35:05.654783125 -0500
-@@ -27,6 +27,7 @@
- #define close _close
- #endif
- #include <fcntl.h> // For ::open()
-+#include <unistd.h> //For close(), read()
- #include <cstring> // For memcpy()
- #include <sstream> // For int/string conversion (using stringstream)
- #include <cstdio>  // For sscanf()
diff --git a/source/l/libproxy/libproxy.SlackBuild b/source/l/libproxy/libproxy.SlackBuild
index fecbceb8b..0c2a18cc5 100755
--- a/source/l/libproxy/libproxy.SlackBuild
+++ b/source/l/libproxy/libproxy.SlackBuild
@@ -1,8 +1,7 @@
 #!/bin/sh
 
-# Slackware build script for libproxy
-
-# Copyright 2009,2010,2011  Robby Workman  Northport, AL, USA
+# Copyright 2009, 2010, 2011  Robby Workman  Northport, AL, USA
+# Copyright 2013  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +22,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PKGNAM=libproxy
-VERSION=${VERSION:-0.4.7}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-2}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -67,13 +66,6 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# 0.4.7 won't build against seamonkey's nss stuff, and the first commit in
-# svn after that release disables its use in favor of nspr and js185
-zcat $CWD/only_link_mozjs185.diff.gz | patch -p0 --verbose || exit 1
-
-# Include unistd.h for gcc-4.7.x:
-zcat $CWD/gcc47-include-unistd.h.diff.gz | patch -p1 --verbose || exit 1
-
 cmake . \
   -DCMAKE_C_FLAGS="$SLKCFLAGS" \
   -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
diff --git a/source/l/libproxy/only_link_mozjs185.diff b/source/l/libproxy/only_link_mozjs185.diff
deleted file mode 100644
index 84016ac80..000000000
--- a/source/l/libproxy/only_link_mozjs185.diff
+++ /dev/null
@@ -1,46 +0,0 @@
-Index: libproxy/cmake/modules/pacrunner_mozjs.cmk
-===================================================================
---- libproxy/cmake/modules/pacrunner_mozjs.cmk	(revision 814)
-+++ libproxy/cmake/modules/pacrunner_mozjs.cmk	(revision 815)
-@@ -7,19 +7,15 @@
-     include_directories("${MOZJS_INCLUDE_DIR}")
-   endif()
- elseif(NOT APPLE)
--  set(MOZJS_SEARCH_ORDER "mozilla-js;xulrunner-js;firefox-js;seamonkey-js" CACHE STRING "MozJS search order")
-   option(WITH_MOZJS "Search for MOZJS package" ON)
-   if (WITH_MOZJS)
--    foreach(MOZJSLIB ${MOZJS_SEARCH_ORDER})
--      pkg_search_module(MOZJS ${MOZJSLIB}>=2.0b12)
--      if(MOZJS_FOUND)
--        include_directories(${MOZJS_INCLUDE_DIRS})
--        link_directories(${MOZJS_LIBRARY_DIRS})
--        break()
--      else()
--        set(MOZJS_FOUND 0)
--      endif()
--    endforeach()
-+    pkg_search_module(MOZJS mozjs185>=1.8.5)
-+    if(MOZJS_FOUND)
-+      include_directories(${MOZJS_INCLUDE_DIRS})
-+      link_directories(${MOZJS_LIBRARY_DIRS})
-+    else()
-+      set(MOZJS_FOUND 0)
-+    endif()
-   else()
-     set(MOZJS_FOUND 0)
-   endif()
-Index: NEWS
-===================================================================
---- NEWS	(revision 814)
-+++ NEWS	(revision 815)
-@@ -1,3 +1,10 @@
-+New in version 0.4.8 (not yet released)
-+==============================
-+* Only support standalone mozjs185 as mozilla js engine.
-+  xulrunner being part of the now lightning fast moving firefox
-+  is impossible to be tracked as a dependency and it is not
-+  supported by Mozilla to be used in this scenario.
-+
- New in version 0.4.7
- ==============================
- * Support/require xulrunner 2.0+