[arch-commits] Commit in netpbm/repos (extra-i686 extra-i686/PKGBUILD)

[Eric Bélanger]

    Date: Monday, February 23, 2009 @ 03:19:12
  Author: eric
Revision: 27584

Merged revisions 143,356,27582 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/netpbm/trunk

........
  r143 | eric | 2008-04-11 23:50:41 -0400 (Fri, 11 Apr 2008) | 2 lines
  
  upgpkg: netpbm 10.35-608
      FSH man pages
........
  r356 | aaron | 2008-04-18 18:56:27 -0400 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r27582 | eric | 2009-02-23 02:43:52 -0500 (Mon, 23 Feb 2009) | 2 lines
  
  upgpkg: netpbm 10.35-841
      Upstream update, Switched to a svn snapshot on ftp.archlinux.org instead of an svn checkout in PKGBUILD, Used web html doc to generate useful man pages, PKGBUILD cleaned up
........

Modified:
  netpbm/repos/extra-i686/	(properties)
  netpbm/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |   65 +++++++++++++++++++++++++++++++------------------------------
 1 file changed, 34 insertions(+), 31 deletions(-)


Property changes on: netpbm/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /netpbm/trunk:1-134
   + /netpbm/trunk:1-27583

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-02-23 07:44:35 UTC (rev 27583)
+++ extra-i686/PKGBUILD	2009-02-23 08:19:12 UTC (rev 27584)
@@ -4,47 +4,50 @@
 
 pkgname=netpbm
 pkgver=10.35
-# pkgrel is the revision number of the stable branch
-pkgrel=608
+pkgrel=841
 pkgdesc="A toolkit for manipulation of graphic images"
 arch=(i686 x86_64)
-license=('custom' 'BSD' 'GPL' 'LGPL')  
+license=('custom' 'BSD' 'GPL' 'LGPL')
+url="http://netpbm.sourceforge.net/"
 depends=('perl' 'libjpeg' 'libpng' 'libtiff' 'libxml2')
-makedepends=('subversion')
-url="http://netpbm.sourceforge.net/"
+makedepends=('python')
+options=('!makeflags')
 # Releases after 10.34 are available via SVN only.
-source=(Makefile.config arch.patch)
-md5sums=('cfdb69f77f8ef06f8863fe02ce27db71' '88992e053dbfa9fdde2cccea32e6632b')
+# remake snapshot with: svn export http://netpbm.svn.sourceforge.net/svnroot/netpbm/stable@${pkgrel} netpbm
+# get doc with: wget --recursive --relative -nH http://netpbm.sourceforge.net/doc/
+source=(ftp://ftp.archlinux.org/other/netpbm/$pkgname-$pkgver-$pkgrel.tar.bz2 \
+        ftp://ftp.archlinux.org/other/netpbm/netpbm-doc-20090222.tar.bz2 Makefile.config arch.patch)
+md5sums=('04d94bf5eefd56e6443b4008196d5969' '20f5392fd1deacfa267bf64ab9d420c5'\
+         'cfdb69f77f8ef06f8863fe02ce27db71' '88992e053dbfa9fdde2cccea32e6632b')
 
-svntrunk=http://netpbm.svn.sourceforge.net/svnroot/netpbm/stable
-svnmod=netpbm
-
 build() {
-  /usr/bin/svn checkout --config-dir ./ -r ${pkgrel} ${svntrunk} ${svnmod}
-  cd ${startdir}/src/${pkgname}
-  /usr/bin/patch -p1 < ../arch.patch
-  /bin/cp ../Makefile.config .
+  cd ${srcdir}/${pkgname}
+  patch -p1 < ../arch.patch
+  cp ../Makefile.config .
 
-if [ "${CARCH}" == "x86_64" ]; then
-  sed -i "s/^\(CFLAGS =\) .*/\1 $CFLAGS/" Makefile.config
-  sed -i "s/^\(CFLAGS_SHLIB =\) .*/\1 -fPIC/" Makefile.config # real 64bit fix 
-  sed -i 's/\(.*\$(SYMLINK) \)\(pnmtopnm\)\(\$(EXE) \)\(pamtopnm\)/\1\4\3\2/' converter/other/Makefile
-fi
+  if [ "${CARCH}" == "x86_64" ]; then
+    sed -i "s/^\(CFLAGS =\) .*/\1 $CFLAGS/" Makefile.config || return 1
+    sed -i "s/^\(CFLAGS_SHLIB =\) .*/\1 -fPIC/" Makefile.config  || return 1 # real 64bit fix 
+    sed -i 's/\(.*\$(SYMLINK) \)\(pnmtopnm\)\(\$(EXE) \)\(pamtopnm\)/\1\4\3\2/' converter/other/Makefile || return 1
+  fi
 
-  export MAKEFLAGS="-j1"
-  /usr/bin/make || return 1
-  /usr/bin/make package pkgdir=${startdir}/pkg/usr
+  make || return 1
+  make package pkgdir=${pkgdir}/usr PKGMANDIR=share/man || return 1
 
+  # Generating useful man pages with html doc 
+  cd  ${srcdir}/doc
+  make MAKEMAN=${srcdir}/netpbm/buildtools/makeman \
+    -f ${srcdir}/netpbm/buildtools/Makefile.manpage manpages || return 1
+  make MAKEMAN=${srcdir}/netpbm/buildtools/makeman MANDIR=${pkgdir}/usr/share/man \
+    -f ${srcdir}/netpbm/buildtools/Makefile.manpage installman || return 1
+
   # clean up and fixing symlinks
-  /bin/mv ${startdir}/pkg/usr/link/libnetpbm.a ${startdir}/pkg/usr/lib
-  /bin/rm ${startdir}/pkg/usr/{config_template,README,pkginfo,misc,VERSION,link} -rf
-  /bin/rm ${startdir}/pkg/usr/man/web -rf
-  /bin/rm ${startdir}/pkg/usr/bin/doc.url
-  cd ${startdir}/pkg/usr/lib
-  /bin/ln -s ./libnetpbm.so.10 libnetpbm.so
+  mv ${pkgdir}/usr/link/libnetpbm.a ${pkgdir}/usr/lib || return 1
+  rm -rf ${pkgdir}/usr/{config_template,README,pkginfo,misc,VERSION,link} || return 1
+  rm -rf ${pkgdir}/usr/man 
+  rm ${pkgdir}/usr/bin/doc.url
+  ln -s libnetpbm.so.10 ${pkgdir}/usr/lib/libnetpbm.so || return 1
 
   # Licensing.  Note that each program in the package has a separate license.
-  install -D -m644 ${startdir}/src/${pkgname}/doc/copyright_summary \
-      ${startdir}/pkg/usr/share/licenses/${pkgname}/copyright_summary.txt || return 1
+  install -D -m644 ${srcdir}/${pkgname}/doc/copyright_summary ${pkgdir}/usr/share/licenses/${pkgname}/copyright_summary.txt || return 1
 }
-# vim: ts=2 sw=2 et ft=sh