diff options
| -rw-r--r-- | network/polipo/makefile.diff | 52 | ||||
| -rw-r--r-- | network/polipo/makefile.patch.gz | bin | 708 -> 0 bytes | |||
| -rw-r--r-- | network/polipo/polipo.SlackBuild | 23 | ||||
| -rw-r--r-- | network/polipo/polipo.info | 2 |
4 files changed, 72 insertions, 5 deletions
diff --git a/network/polipo/makefile.diff b/network/polipo/makefile.diff new file mode 100644 index 0000000000000..60ebc4ed61905 --- /dev/null +++ b/network/polipo/makefile.diff @@ -0,0 +1,52 @@ +diff -Naur polipo-1.0.4.orig/Makefile polipo-1.0.4/Makefile +--- polipo-1.0.4.orig/Makefile 2008-01-08 13:56:45.000000000 +0100 ++++ polipo-1.0.4/Makefile 2009-09-10 15:23:41.703441052 +0200 +@@ -1,7 +1,9 @@ +-PREFIX = /usr/local ++PREFIX = /usr + BINDIR = $(PREFIX)/bin + MANDIR = $(PREFIX)/man + INFODIR = $(PREFIX)/info ++CONFDIR = /etc/polipo ++PIDDIR = /var/run/polipo + LOCAL_ROOT = /usr/share/polipo/www + DISK_CACHE_ROOT = /var/cache/polipo + +@@ -89,20 +91,25 @@ + install: install.binary install.man + + install.binary: all +- mkdir -p $(TARGET)$(BINDIR) +- mkdir -p $(TARGET)$(LOCAL_ROOT) +- mkdir -p $(TARGET)$(LOCAL_ROOT)/doc +- rm -f $(TARGET)$(BINDIR)/polipo +- cp -f polipo $(TARGET)$(BINDIR)/ +- cp -f html/* $(TARGET)$(LOCAL_ROOT)/doc +- cp -f localindex.html $(TARGET)$(LOCAL_ROOT)/index.html ++ mkdir -p $(DESTDIR)$(CONFDIR) ++ mkdir -p $(DESTDIR)$(PIDDIR) ++ mkdir -p $(DESTDIR)$(BINDIR) ++ mkdir -p $(DESTDIR)$(LOCAL_ROOT) ++ mkdir -p $(DESTDIR)$(LOCAL_ROOT)/doc ++ mkdir -p $(DESTDIR)$(DISK_CACHE_ROOT) ++ rm -f $(DESTDIR)$(BINDIR)/polipo ++ rm -f $(DESTDIR)$(CONFDIR)/config.new ++ cp -f polipo $(DESTDIR)$(BINDIR)/ ++ cp -f config.sample $(DESTDIR)$(CONFDIR)/config.new ++ cp -f html/* $(DESTDIR)$(LOCAL_ROOT)/doc ++ cp -f localindex.html $(DESTDIR)$(LOCAL_ROOT)/index.html + + install.man: all +- mkdir -p $(TARGET)$(MANDIR)/man1 +- mkdir -p $(TARGET)$(INFODIR) +- cp -f polipo.man $(TARGET)$(MANDIR)/man1/polipo.1 +- cp polipo.info $(TARGET)$(INFODIR)/ +- install-info --info-dir=$(TARGET)$(INFODIR) polipo.info ++ mkdir -p $(DESTDIR)$(MANDIR)/man1 ++ mkdir -p $(DESTDIR)$(INFODIR) ++ cp -f polipo.man $(DESTDIR)$(MANDIR)/man1/polipo.1 ++ cp polipo.info $(DESTDIR)$(INFODIR)/ ++ install-info --info-dir=$(DESTDIR)$(INFODIR) polipo.info + + + polipo.info: polipo.texi diff --git a/network/polipo/makefile.patch.gz b/network/polipo/makefile.patch.gz Binary files differdeleted file mode 100644 index fbbf61bb07e0c..0000000000000 --- a/network/polipo/makefile.patch.gz +++ /dev/null diff --git a/network/polipo/polipo.SlackBuild b/network/polipo/polipo.SlackBuild index 1f442a5451862..f82e344d61842 100644 --- a/network/polipo/polipo.SlackBuild +++ b/network/polipo/polipo.SlackBuild @@ -26,15 +26,27 @@ PRGNAM=polipo VERSION=${VERSION:-1.0.4} ARCH=${ARCH:-i486} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} + DOCS="CHANGES COPYING INSTALL README" +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +fi + set -e rm -rf $PKG @@ -44,8 +56,8 @@ rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION -# Fix Makefile and add a sample config file -zcat $CWD/makefile.patch.gz | patch -p1 --verbose +# Fix Makefile +cat $CWD/makefile.diff | patch -p1 --verbose chown -R root:root . find . \ @@ -54,7 +66,7 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -make +make CDEBUGFLAGS="$SLKCFLAGS" make install DESTDIR=$PKG ( cd $PKG @@ -84,4 +96,5 @@ 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.tgz +/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 5ebc3db236e6b..b153c15593c58 100644 --- a/network/polipo/polipo.info +++ b/network/polipo/polipo.info @@ -2,7 +2,9 @@ PRGNAM="polipo" VERSION="1.0.4" HOMEPAGE="http://www.pps.jussieu.fr/~jch/software/polipo/" DOWNLOAD="http://www.pps.jussieu.fr/~jch/software/files/polipo/polipo-1.0.4.tar.gz" +DOWNLOAD_x86_64="" MD5SUM="defdce7f8002ca68705b6c2c36c4d096" +MD5SUM_x86_64="" MAINTAINER="Marco Bonetti" EMAIL="sid77@slackware.it" APPROVED="dsomero" |