5 files changed, 51 insertions, 30 deletions
diff --git a/network/polipo/README b/network/polipo/README
index f9c4c2f41b..33007a22ea 100644
--- a/network/polipo/README
+++ b/network/polipo/README
@@ -1,23 +1,25 @@
-Polipo is a small and fast caching web proxy (a web cache, an HTTP proxy, a
-proxy server). While Polipo was designed to be used by one person or a small
-group of people, there is nothing that prevents it from being used by a larger
-group.
+Polipo is a small and fast caching web proxy (a web cache, an HTTP
+proxy, a proxy server). While Polipo was designed to be used by one
+person or a small group of people, there is nothing that prevents it
+from being used by a larger group.
 
-Polipo has some features that are, as far as I know, unique among currently
-available proxies:
-  * Polipo will use HTTP/1.1 pipelining if it believes that the remote server
-    supports it, whether the incoming requests are pipelined or come in
-    simultaneously on multiple connections (this is more than the simple usage
-    of persistent connections, which is done by e.g. Squid); Polipo will cache
-    the initial segment of an instance if the download has been interrupted,
-    and, if necessary, complete it later using Range requests;
-  * Polipo will upgrade client requests to HTTP/1.1 even if they come in as
-    HTTP/1.0, and up- or downgrade server replies to the client's capabilities
-    (this may involve conversion to or from the HTTP/1.1 chunked encoding);
-  * Polipo has complete support for IPv6 (except for scoped (link-local)
-    addresses).
-  * Polipo can optionally use a technique known as Poor Man's Multiplexing to
-    reduce latency even further.
+Polipo has some features that are, as far as I know, unique among
+currently available proxies:
+  * Polipo will use HTTP/1.1 pipelining if it believes that the remote
+    server supports it, whether the incoming requests are pipelined
+    or come in simultaneously on multiple connections (this is more
+    than the simple usage of persistent connections, which is done by
+    e.g. Squid); Polipo will cache the initial segment of an instance
+    if the download has been interrupted, and, if necessary, complete
+    it later using Range requests;
+  * Polipo will upgrade client requests to HTTP/1.1 even if they
+    come in as HTTP/1.0, and up- or downgrade server replies to the
+    client's capabilities (this may involve conversion to or from the
+    HTTP/1.1 chunked encoding);
+  * Polipo has complete support for IPv6 (except for scoped
+    (link-local) addresses).
+  * Polipo can optionally use a technique known as Poor Man's
+    Multiplexing to reduce latency even further.
 
-In short, Polipo uses a plethora of techniques to make web browsing (seem)
-faster.
+In short, Polipo uses a plethora of techniques to make web browsing
+(seem) faster.
diff --git a/network/polipo/doinst.sh b/network/polipo/doinst.sh
index 22e39ecac9..a3be83cfe3 100644
--- a/network/polipo/doinst.sh
+++ b/network/polipo/doinst.sh
@@ -18,8 +18,11 @@ if [ -e etc/rc.d/rc.polipo ]; then
   mv etc/rc.d/rc.polipo.new.incoming etc/rc.d/rc.polipo.new
 fi
 
-if [ -x /usr/bin/install-info ]; then
-  chroot . /usr/bin/install-info --info-dir=/usr/info /usr/info/polipo.info.gz 2> /dev/null
+if [ -x /usr/bin/install-info -a -d usr/info ]; then
+  ( cd usr/info
+    rm -f dir
+    for i in *.info*; do /usr/bin/install-info $i dir 2>/dev/null; done
+  )
 fi
 
 config etc/rc.d/rc.polipo.new
diff --git a/network/polipo/douninst.sh b/network/polipo/douninst.sh
new file mode 100644
index 0000000000..1bef502028
--- /dev/null
+++ b/network/polipo/douninst.sh
@@ -0,0 +1,6 @@
+if [ -x /usr/bin/install-info -a -d usr/info ]; then
+  ( cd usr/info
+    rm -f dir
+    for i in *.info*; do /usr/bin/install-info $i dir 2>/dev/null; done
+  )
+fi
diff --git a/network/polipo/polipo.SlackBuild b/network/polipo/polipo.SlackBuild
index 59c96b34b9..0f9e399932 100644
--- a/network/polipo/polipo.SlackBuild
+++ b/network/polipo/polipo.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Polipo
 
@@ -23,11 +23,16 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20240331 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - handle /usr/info properly in doinst.sh, add douninst.sh
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=polipo
 VERSION=${VERSION:-1.1.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,7 +42,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -73,9 +82,9 @@ patch -p1 < $CWD/makefile.diff
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
+ -exec chmod 755 {} + -o \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ -exec chmod 644 {} +
 
 make CDEBUGFLAGS="$SLKCFLAGS"
 make install DESTDIR=$PKG
@@ -100,6 +109,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
+cat $CWD/douninst.sh > $PKG/install/douninst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/polipo/polipo.info b/network/polipo/polipo.info
index 7f8de43505..86c583f827 100644
--- a/network/polipo/polipo.info
+++ b/network/polipo/polipo.info
@@ -1,7 +1,7 @@
 PRGNAM="polipo"
 VERSION="1.1.1"
 HOMEPAGE="http://www.pps.jussieu.fr/~jch/software/polipo/"
-DOWNLOAD="https://github.com/jech/polipo/archive/polipo-1.1.1.tar.gz"
+DOWNLOAD="https://github.com/jech/polipo/archive/polipo-1.1.1/polipo-polipo-1.1.1.tar.gz"
 MD5SUM="bfbe3222a517d7c4153c4dc7cd9fd2ef"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""