diff --git a/PKGBUILD b/PKGBUILD index 3967562..d8ab2c5 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,7 +3,7 @@ pkgname=netpbm pkgver=10.61.02 -pkgrel=3 +pkgrel=4 pkgdesc="A toolkit for manipulation of graphic images" arch=('i686' 'x86_64') license=('custom' 'BSD' 'GPL' 'LGPL') @@ -13,14 +13,16 @@ makedepends=('python2') options=('!makeflags') source=(ftp://ftp.archlinux.org/other/packages/netpbm/${pkgname}-${pkgver}.tar.gz{,.sig} \ ftp://ftp.archlinux.org/other/packages/netpbm/netpbm-doc-22Feb2009.tar.xz{,.sig} \ - netpbm-CAN-2005-2471.patch netpbm-security-code.patch netpbm-security-scripts.patch) + netpbm-CAN-2005-2471.patch netpbm-security-code.patch \ + netpbm-security-scripts.patch netpbm-install-netpbm-1-manpage.patch) sha1sums=('dc2354716996c8fe4c4836386e6c403ec2f15589' '253df0e79f9344e68ee907a43347d630ff6b1b95' 'dfeba9f9a5fe987d64db0aadb5ca8c1b20fcead2' 'e9513608a661beb05a63270931f6191029e935f8' 'b79cf9d42488fea065ba16262ed97694c47af08d' 'cde27f75fa5ca8010a3b1f08d8e247d42243d0f5' - '300a2386d3207005f4cb4120bbb2f3788a9b7716') + '300a2386d3207005f4cb4120bbb2f3788a9b7716' + '9590f35406c75203b92ae3d4dfc6fb2db9caefa9') # source PKGBUILD && mksource mksource() { @@ -39,6 +41,7 @@ prepare() { patch -p1 < ../netpbm-CAN-2005-2471.patch patch -p1 < ../netpbm-security-code.patch patch -p1 < ../netpbm-security-scripts.patch + patch -p1 < ../netpbm-install-netpbm-1-manpage.patch sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' buildtools/makeman sed -i 's|@python|@python2|' buildtools/manpage.mk diff --git a/netpbm-install-netpbm-1-manpage.patch b/netpbm-install-netpbm-1-manpage.patch new file mode 100644 index 0000000..2161a01 --- /dev/null +++ b/netpbm-install-netpbm-1-manpage.patch @@ -0,0 +1,29 @@ +diff --git a/buildtools/manpage.mk b/buildtools/manpage.mk +index 9edf613..97cd799 100644 +--- a/buildtools/manpage.mk ++++ b/buildtools/manpage.mk +@@ -388,13 +388,13 @@ xmlpages: + # This will install the generated man pages + installman: + set -x +- for f in $(MAN1); do if [ -f $$f ]; then gzip <$$f >$(MANDIR)/man1/$$f.gz; fi; done ++ for f in netpbm.1 $(MAN1); do if [ -f $$f ]; then gzip <$$f >$(MANDIR)/man1/$$f.gz; fi; done + for f in $(MAN3); do if [ -f $$f ]; then gzip <$$f >$(MANDIR)/man3/$$f.gz; fi; done + for f in $(MAN5); do if [ -f $$f ]; then gzip <$$f >$(MANDIR)/man5/$$f.gz; fi; done + + # This will uninstall them + uninstallman: +- for f in $(MAN1); do rm -f $(MANDIR)/man1/$$f.gz; fi; done ++ for f in netpbm.1 $(MAN1); do rm -f $(MANDIR)/man1/$$f.gz; fi; done + for f in $(MAN3); do rm -f $(MANDIR)/man3/$$f.gz; fi; done + for f in $(MAN5); do rm -f $(MANDIR)/man5/$$f.gz; fi; done + +@@ -405,7 +405,7 @@ oldclean: + rm -f $(MANDIR)/man3/libnetpbm_dir.3.gz + # remove pointer man pages (that say, "The man page isn't here") + # which might have been installed previously +- for f in $(MAN1); do rm -f $(MANDIR)/man1/$$f; done ++ for f in netpbm.1 $(MAN1); do rm -f $(MANDIR)/man1/$$f; done + for f in $(MAN3); do rm -f $(MANDIR)/man3/$$f; done + for f in $(MAN5); do rm -f $(MANDIR)/man5/$$f; done +