3 files changed, 29 insertions, 14 deletions
diff --git a/source/l/libproxy/libproxy.SlackBuild b/source/l/libproxy/libproxy.SlackBuild
index 4a760df7..9669cfde 100755
--- a/source/l/libproxy/libproxy.SlackBuild
+++ b/source/l/libproxy/libproxy.SlackBuild
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/bin/bash
 
 # Copyright 2009, 2010, 2011  Robby Workman  Northport, AL, USA
-# Copyright 2013  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2013, 2018  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,11 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PKGNAM=libproxy
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -33,9 +35,16 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+  exit 0
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
 
@@ -53,6 +62,9 @@ else
   LIBDIRSUFFIX=""
 fi
 
+PYTHONLIB=$( python -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())' )
+PYTHON3LIB=$( python3 -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())' )
+
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
@@ -66,8 +78,6 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# See https://github.com/maxinbjohn/libproxy/issues/197 for information about "-DWITH_KDE4=OFF"
-
 cmake . \
   -DCMAKE_C_FLAGS="$SLKCFLAGS" \
   -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
@@ -75,12 +85,17 @@ cmake . \
   -DLIB_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX} \
   -DLIB_SUFFIX=${LIBDIRSUFFIX} \
   -DMODULE_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX}/libproxy/${VERSION}/modules \
-  -DWITH_KDE4=OFF \
   -DPERL_VENDORINSTALL=yes || exit 1
 
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
+# Generate .pyc files
+python -m compileall "${PKG}$PYTHONLIB"
+python -O -m compileall "${PKG}$PYTHONLIB"
+python3 -m compileall "${PKG}$PYTHON3LIB"
+python3 -O -m compileall "${PKG}$PYTHON3LIB"
+
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
diff --git a/source/l/libproxy/libproxy.url b/source/l/libproxy/libproxy.url
index 3897ae58..fd085b2b 100644
--- a/source/l/libproxy/libproxy.url
+++ b/source/l/libproxy/libproxy.url
@@ -1 +1 @@
-http://code.google.com/p/libproxy/
+https://github.com/libproxy/libproxy
diff --git a/source/l/libproxy/slack-desc b/source/l/libproxy/slack-desc
index 05b109e0..47e59d31 100644
--- a/source/l/libproxy/slack-desc
+++ b/source/l/libproxy/slack-desc
@@ -1,19 +1,19 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
+# The "handy ruler" below makes it easier to edit a package description. Line
 # up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
 # customary to leave one space after the ':'.
 
         |-----handy-ruler-----------------------------------------------------|
 libproxy: libproxy (proxy configuration library)
 libproxy:
 libproxy: libproxy exists to answer the question: Given a network resource, 
-libproxy: how do I reach it?  It handles all the details, enabling you to get 
-libproxy: back to programming.  Just ask libproxy what proxy to use:  you get
+libproxy: how do I reach it? It handles all the details, enabling you to get 
+libproxy: back to programming. Just ask libproxy what proxy to use: you get
 libproxy: simple code and your users get correct, consistent behavior and 
 libproxy: broad infrastructure compatibility. 
 libproxy:
-libproxy: Homepage: http://code.google.com/p/libproxy/
+libproxy: Homepage: https://github.com/libproxy/libproxy
 libproxy:
 libproxy: