diff options
-rw-r--r-- | network/polipo/polipo.SlackBuild | 27 | ||||
-rw-r--r-- | network/polipo/polipo.info | 10 | ||||
-rw-r--r-- | network/polipo/rc.polipo | 3 |
3 files changed, 20 insertions, 20 deletions
diff --git a/network/polipo/polipo.SlackBuild b/network/polipo/polipo.SlackBuild index a29abeeef5..217e9378c8 100644 --- a/network/polipo/polipo.SlackBuild +++ b/network/polipo/polipo.SlackBuild @@ -1,7 +1,8 @@ #!/bin/sh # Slackware build script for Polipo -# + +# Copyright 2015 Brenton Earl <brent@exitstatusone.com> # Copyright 2009-2012 Marco Bonetti <sid77@slackware.it> # All rights reserved. # @@ -24,7 +25,7 @@ PRGNAM=polipo -VERSION=${VERSION:-1.0.4.1} +VERSION=${VERSION:-1.1.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -62,12 +63,12 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION +rm -rf $PRGNAM-$PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION +cd $PRGNAM-$PRGNAM-$VERSION # Fix Makefile -cat $CWD/makefile.diff | patch -p1 --verbose +patch -p1 < $CWD/makefile.diff chown -R root:root . find -L . \ @@ -82,14 +83,8 @@ make install DESTDIR=$PKG find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -( cd $PKG/usr/man - find . -type f -exec gzip -9 {} \; - for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done -) - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +find $PKG/usr/man -type f -exec gzip -9 {} \; || true +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done || true rm -f $PKG/usr/info/dir gzip -9 $PKG/usr/info/*.info* @@ -97,10 +92,14 @@ gzip -9 $PKG/usr/info/*.info* mkdir -p $PKG/etc/rc.d cat $CWD/rc.polipo > $PKG/etc/rc.d/rc.polipo.new +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION +ln -s /usr/share/polipo/www $PKG/usr/doc/$PRGNAM-$VERSION/html +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 cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} - diff --git a/network/polipo/polipo.info b/network/polipo/polipo.info index 417d0102fd..7f8de43505 100644 --- a/network/polipo/polipo.info +++ b/network/polipo/polipo.info @@ -1,10 +1,10 @@ PRGNAM="polipo" -VERSION="1.0.4.1" +VERSION="1.1.1" HOMEPAGE="http://www.pps.jussieu.fr/~jch/software/polipo/" -DOWNLOAD="http://freehaven.net/~chrisd/polipo/polipo-1.0.4.1.tar.gz" -MD5SUM="bfc5c85289519658280e093a270d6703" +DOWNLOAD="https://github.com/jech/polipo/archive/polipo-1.1.1.tar.gz" +MD5SUM="bfbe3222a517d7c4153c4dc7cd9fd2ef" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Marco Bonetti" -EMAIL="sid77@slackware.it" +MAINTAINER="Brenton Earl" +EMAIL="brent@exitstatusone.com" diff --git a/network/polipo/rc.polipo b/network/polipo/rc.polipo index c08ae73250..419e9b0fad 100644 --- a/network/polipo/rc.polipo +++ b/network/polipo/rc.polipo @@ -5,12 +5,13 @@ PIDFILE="/var/run/polipo/polipo.pid" start() { echo "Starting polipo..." + mkdir -p $(dirname $PIDFILE) polipo daemonise=true pidFile=$PIDFILE } stop() { echo "Stopping polipo..." - kill `cat $PIDFILE` + kill $(cat $PIDFILE) } case "$1" in |