netpbm

1 files changed, 22 insertions, 32 deletions

diff --git a/abs/extra/netpbm/PKGBUILD b/abs/extra/netpbm/PKGBUILD
index 14ddc32..b447bee 100644
--- a/abs/extra/netpbm/PKGBUILD
+++ b/abs/extra/netpbm/PKGBUILD
@@ -1,37 +1,36 @@
-# $Id: PKGBUILD 88007 2010-08-19 02:32:47Z eric $
+# $Id: PKGBUILD 148858 2012-02-05 11:53:06Z ibiru $
 # Maintainer: Kevin Piche <kevin@archlinux.org>
-# Contributor: Jochem Kossen <j.kossen@home.nl>
 
 pkgname=netpbm
-pkgver=10.47.18
+pkgver=10.57.1
 pkgrel=1
 pkgdesc="A toolkit for manipulation of graphic images"
 arch=('i686' 'x86_64')
 license=('custom' 'BSD' 'GPL' 'LGPL')
 url="http://netpbm.sourceforge.net/"
-depends=('perl' 'libjpeg' 'libpng' 'libtiff' 'libxml2')
+depends=('perl' 'libpng' 'libtiff' 'libxml2')
 makedepends=('python2')
 options=('!makeflags')
 # Releases after 10.34 are available via SVN only.
-# Get stable tarball here: http://netpbm.sourceforge.net/release.html#tarball
-# get doc with: wget --recursive --relative -nH http://netpbm.sourceforge.net/doc/
+# Get Advanced tarball here: http://netpbm.sourceforge.net/release.html#tarball
+# Get version number from version.mk
+# Get docs with: wget --recursive --relative -nH http://netpbm.sourceforge.net/doc/
 source=(ftp://ftp.archlinux.org/other/netpbm/${pkgname}-${pkgver}.tar.gz \
         ftp://ftp.archlinux.org/other/netpbm/netpbm-doc-22Feb2009.tar.xz \
-        libpng-1.4.patch netpbm-CAN-2005-2471.patch \
-        netpbm-security-code.patch netpbm-security-scripts.patch)
-md5sums=('c3b66d329f818b6b4f02f7367ce1a6f8' '48efce0093c5f242bce3072958fe88c3'\
-         '6a8319e77f2d41881ee11c86b78c51d0' '07ee863e6f951250e8d0a08243c828c7'\
-         'fac4c9bedff9d90ac5a66e93d8c2eb33' 'cbb689129c82d16360d7f840b86789c7')
-sha1sums=('d670574754f161e37534c16f86ebda08a4266774' 'dfeba9f9a5fe987d64db0aadb5ca8c1b20fcead2'\
-         'ab2e67374871b8b6c0c8b69a24e3502e68487759' '456b76004622479f6ee81107c54b5211a1663a6a'\
-         '5af979e8fb7d3bbb7e731eed62326bb594bc91b3' '2ac31f714121e08e47af9337c6bbaab3cbfc5c75')
+        netpbm-CAN-2005-2471.patch netpbm-security-code.patch netpbm-security-scripts.patch)
+sha1sums=('cd0b99333faf994a680d77c5d217034df35ebd4e'
+          'dfeba9f9a5fe987d64db0aadb5ca8c1b20fcead2'
+          'b79cf9d42488fea065ba16262ed97694c47af08d'
+          '4cd5b94a24886ecae3973c5ae104d8298fe5a1f5'
+          '2ac31f714121e08e47af9337c6bbaab3cbfc5c75')
 
 build() {
-  cd "${srcdir}/stable"
-  patch -p1 < ../libpng-1.4.patch
+  cd "${srcdir}/advanced"
   patch -p1 < ../netpbm-CAN-2005-2471.patch
   patch -p1 < ../netpbm-security-code.patch
   patch -p1 < ../netpbm-security-scripts.patch
+  sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' buildtools/makeman
+  sed -i 's|@python|@python2|' buildtools/manpage.mk
 
   cp config.mk.in  config.mk
   [ "${CARCH}" = 'x86_64' ] && echo 'CFLAGS_SHLIB = -fPIC' >> config.mk
@@ -41,42 +40,33 @@ build() {
   echo 'PNGLIB = libpng.so' >> config.mk
   echo 'ZLIB = libz.so' >> config.mk
  
-  sed -i 's|PKGMANDIR = man|PKGMANDIR = share/man|' common.mk
   sed -i 's|misc|share/netpbm|' common.mk
   sed -i 's|/link|/lib|' lib/Makefile
   sed -i 's|install.manweb install.man|install.man|' GNUmakefile
-  sed -i '/MANUALS1 = $(BINARIES) $(SCRIPTS)/a\
-    MANUALS1 += bmptoppm faxformat gemtopbm jpegtopnm mrf netpbm pamtotiff pamx pgmedge \\\
-                pgmnorm pgmoil pgmslice pnmarith pnmcut pnmdepth pnmenlarge pnmfile \\\
-                pnminterp pnmnoraw pnmscale pnmsplit pnmtofits pnmtojpeg pnmtopnm pnmtops \\\
-                pnmtotiff pnmtotiffcmyk ppmnorm ppmsvgalib ppmtojpeg ppmtotga ppmtouil \\\
-                tifftopnm vidtoppm \
-    MANUALS3 += libnetpbm_image libnetpbm_ug libpbm libpgm libpm libpnm libppm libsystem libtmpfile \
-    MANUALS5 += extendedopacity pfm' common.mk
 
   make
 
   # Generating useful man pages with html doc
   cd  "${srcdir}/doc"
-  make MAKEMAN="${srcdir}/stable/buildtools/makeman" USERGUIDE=. \
-    -f "${srcdir}/stable/buildtools/manpage.mk" manpages
+  make MAKEMAN="${srcdir}/advanced/buildtools/makeman" USERGUIDE=. \
+    -f "${srcdir}/advanced/buildtools/manpage.mk" manpages
 }
 
 package() {
-  cd "${srcdir}/stable"
-  make pkgdir="${pkgdir}/usr" install-run install-dev
+  cd "${srcdir}/advanced"
+  make pkgdir="${pkgdir}/usr" PKGMANDIR=share/man install-run install-dev
 
 # Removing dummy man pages
   rm "${pkgdir}"/usr/share/man/man{1,3,5}/*
 
   cd  "${srcdir}/doc"
-  make MAKEMAN="${srcdir}/stable/buildtools/makeman" MANDIR="${pkgdir}/usr/share/man" \
-    -f "${srcdir}/stable/buildtools/manpage.mk" installman
+  make MAKEMAN="${srcdir}/advanced/buildtools/makeman" MANDIR="${pkgdir}/usr/share/man" \
+    -f "${srcdir}/advanced/buildtools/manpage.mk" installman
 
 # Replace obsolete utility
   echo -e '#!/bin/sh\npamditherbw $@ | pamtopnm\n' > "${pkgdir}/usr/bin/pgmtopbm"
 
 # Licensing.  Note that each program in the package has a separate license.
-  install -D -m644 "${srcdir}/stable/doc/copyright_summary" \
+  install -D -m644 "${srcdir}/advanced/doc/copyright_summary" \
     "${pkgdir}/usr/share/licenses/${pkgname}/copyright_summary.txt"
 }