netpbm-10.69.02-1.parabola2: nonfree references should be removed by us from packaging instead of librefetch

1 files changed, 38 insertions, 30 deletions

diff --git a/libre/netpbm/PKGBUILD b/libre/netpbm/PKGBUILD
index ec012d7dd..714f41d88 100644
--- a/libre/netpbm/PKGBUILD
+++ b/libre/netpbm/PKGBUILD
@@ -1,9 +1,11 @@
 # $Id$
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
+# Contributor: André Silva <emulatorman@parabola.nu>
 
+_pkgname=netpbm-libre
 pkgname=netpbm
 pkgver=10.69.02
-pkgrel=1.parabola1
+pkgrel=1.parabola2
 pkgdesc="A toolkit for manipulation of graphic images, without nonfree parts and patent issues"
 arch=('i686' 'x86_64')
 license=('custom' 'BSD' 'GPL' 'LGPL')
@@ -13,11 +15,11 @@ makedepends=('python2' 'jbigkit' 'subversion')
 options=('!makeflags')
 # Get docs with: wget --recursive --relative -nH http://netpbm.sourceforge.net/doc/
 mksource=(svn://svn.code.sf.net/p/netpbm/code/advanced)
-source=(https://repo.parabola.nu/other/${pkgname}-libre/${pkgname}-${pkgver}.tar.gz
-        https://sources.archlinux.org/other/packages/netpbm/netpbm-doc-31Jan2014.tar.xz {,.sig}
+source=(https://repo.parabola.nu/other/${_pkgname}/${_pkgname}-${pkgver}.tar.gz
+        https://sources.archlinux.org/other/packages/netpbm/netpbm-doc-31Jan2014.tar.xz{,.sig}
         netpbm-CAN-2005-2471.patch netpbm-security-code.patch netpbm-security-scripts.patch)
 mksha1sums=('SKIP')
-sha1sums=('5bf2dccd6876bdf8d079a28fda139991ec5b96c6'
+sha1sums=('ab442ef64af90f59a121a34e5da587233b6463e6'
           '25a58975bd8cd383238b4ae31f4405c60914faac'
           'SKIP'
           'b79cf9d42488fea065ba16262ed97694c47af08d'
@@ -33,73 +35,79 @@ pkgver() {
 mksource() {
   cd advanced
 
-  #Removing hpcdtoppm/pcdindex (nocomercial)
+  #Removing hpcdtoppm/pcdindex (non comercial)
   rm -rv converter/ppm/hpcdtoppm
+
+  #Removing ppmtogif/giftopnm (patent restriction)
+  rm -v converter/other/giftopnm.c converter/ppm/ppmtogif.c
+  rm -v test/gif-quant-roundtrip.test test/gif-roundtrip.test test/all-in-place.ok
+
+  #Removing programs without license information
+  rm -v other/pamchannel.c test/pamchannel.ok
+  rm -v converter/other/pamtopnm.c
+  rm -v converter/pbm/pbmto4425.c
+  rm -v converter/pbm/pbmtoln03.c
+  rm -v converter/pbm/pbmtolps.c
+  rm -v converter/pbm/pbmtopk.c
+  rm -v converter/pbm/pktopbm.c
+  rm -v converter/ppm/ppmtopjxl.c
+  rm -v converter/pgm/spottopgm.c
+
+  rm -v test/avs-roundtrip.test test/facesaver-roundtrip.test test/ilbm-roundtrip.test test/pamchannel.test \
+        test/pamditherbw.test test/pamenlarge.test test/pamfile.test test/pfm-roundtrip.test \
+        test/pgmtoppm.test test/pict-roundtrip.test test/pnminvert.test test/pnmremap1.test \
+        test/pnmremap2.test test/pnmtopnm-plain.test test/pnm-pam-roundtrip.test test/pnm-plain-roundtrip.test \
+        test/ps-alt-roundtrip.test test/ps-roundtrip.test test/sbig-roundtrip.test test/st4-roundtrip.test \
+        test/targa-roundtrip.test test/utahrle-roundtrip.test test/winicon-roundtrip.test test/xwd-roundtrip.test
+}
+
+prepare() {
+  cd advanced
+
+  #Removing references about hpcdtoppm/pcdindex (non comercial)
   sed -i 's/hpcdtoppm//g' converter/ppm/Makefile
   sed -i 's/hpcdtoppm\.1//g' buildtools/manpage.mk
   sed -i 's/pcdindex\.1//g' buildtools/manpage.mk
 
-  #Removing ppmtogif/giftopnm (patent restriction)
-  rm -v converter/other/giftopnm.c converter/ppm/ppmtogif.c
+  #Removing references about ppmtogif/giftopnm (patent restriction)
   sed -i 's/ppmtogif//g' converter/ppm/Makefile test/all-in-place.test
   sed -i 's/ppmtogif\.1//g' buildtools/manpage.mk
   sed -i 's/giftopnm//g' converter/other/Makefile test/all-in-place.test
   sed -i 's/giftopnm\.1//g' buildtools/manpage.mk
   sed -i '/giftopnm/d' converter/other/pnmtopalm/README
-  rm -v test/gif-quant-roundtrip.test test/gif-roundtrip.test test/all-in-place.ok
 
-  #Removing programs without license information
-  rm -v other/pamchannel.c test/pamchannel.ok
+  #Removing references about programs without license information
   sed -i 's/pamchannel//g' other/Makefile test/all-in-place.test
   sed -i 's/pamchannel\.1//g' buildtools/manpage.mk
   sed -i 's/pamchannel\.test//g' test/Test-Order
 
-  rm -v converter/other/pamtopnm.c
   sed -i 's/pamtopnm//g' converter/other/Makefile test/all-in-place.test
   sed -i 's/pamtopnm\.1//g' buildtools/manpage.mk
   sed -i '/pnmtopnm/d' netpbm.c
 
-  rm -v converter/pbm/pbmto4425.c
   sed -i 's/pbmto4425//g' converter/pbm/Makefile test/all-in-place.test
   sed -i 's/pbmto4425\.1//g' buildtools/manpage.mk
 
-  rm -v converter/pbm/pbmtoln03.c
   sed -i 's/pbmtoln03//g' converter/pbm/Makefile test/all-in-place.test
   sed -i 's/pbmtoln03\.1//g' buildtools/manpage.mk
 
-  rm -v converter/pbm/pbmtolps.c
   sed -i 's/pbmtolps//g' converter/pbm/Makefile test/all-in-place.test
   sed -i 's/pbmtolps\.1//g' buildtools/manpage.mk
 
-  rm -v converter/pbm/pbmtopk.c
   sed -i 's/pbmtopk//g' converter/pbm/Makefile test/all-in-place.test
   sed -i 's/pbmtopk\.1//g' buildtools/manpage.mk
 
-  rm -v converter/pbm/pktopbm.c
   sed -i 's/pktopbm//g' converter/pbm/Makefile test/all-in-place.test
   sed -i 's/pktopbm\.1//g' buildtools/manpage.mk
 
-  rm -v converter/ppm/ppmtopjxl.c
   sed -i 's/ppmtopjxl//g' converter/ppm/Makefile test/all-in-place.test
   sed -i 's/ppmtopjxl\.1//g' buildtools/manpage.mk
 
-  rm -v converter/pgm/spottopgm.c
   sed -i 's/spottopgm//g' converter/pgm/Makefile test/all-in-place.test
   sed -i 's/spottopgm\.1//g' buildtools/manpage.mk
 
-  rm -v test/avs-roundtrip.test test/facesaver-roundtrip.test test/ilbm-roundtrip.test test/pamchannel.test \
-        test/pamditherbw.test test/pamenlarge.test test/pamfile.test test/pfm-roundtrip.test \
-        test/pgmtoppm.test test/pict-roundtrip.test test/pnminvert.test test/pnmremap1.test \
-        test/pnmremap2.test test/pnmtopnm-plain.test test/pnm-pam-roundtrip.test test/pnm-plain-roundtrip.test \
-        test/ps-alt-roundtrip.test test/ps-roundtrip.test test/sbig-roundtrip.test test/st4-roundtrip.test \
-        test/targa-roundtrip.test test/utahrle-roundtrip.test test/winicon-roundtrip.test test/xwd-roundtrip.test
-
-  #Removing non-free licenses part
+  #Removing references about nonfree licenses part
   sed -i '338,383d' doc/copyright_summary
-}
-
-prepare() {
-  cd advanced
 
   patch -p1 < ../netpbm-CAN-2005-2471.patch
   patch -p1 < ../netpbm-security-code.patch