From 27f8321046e2bbcff4f9b5d54904c44b9d663df3 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 4 Sep 2014 21:41:51 -0300 Subject: psutils: remove libre suffix and add complex pkgrel --- libre/psutils-libre/PKGBUILD | 57 ----------------------------------- libre/psutils-libre/libre.patch | 41 ------------------------- libre/psutils-libre/psutils-1.17.diff | 33 -------------------- libre/psutils/PKGBUILD | 57 +++++++++++++++++++++++++++++++++++ libre/psutils/libre.patch | 41 +++++++++++++++++++++++++ libre/psutils/psutils-1.17.diff | 33 ++++++++++++++++++++ 6 files changed, 131 insertions(+), 131 deletions(-) delete mode 100644 libre/psutils-libre/PKGBUILD delete mode 100644 libre/psutils-libre/libre.patch delete mode 100644 libre/psutils-libre/psutils-1.17.diff create mode 100644 libre/psutils/PKGBUILD create mode 100644 libre/psutils/libre.patch create mode 100644 libre/psutils/psutils-1.17.diff (limited to 'libre') diff --git a/libre/psutils-libre/PKGBUILD b/libre/psutils-libre/PKGBUILD deleted file mode 100644 index e0749a1da..000000000 --- a/libre/psutils-libre/PKGBUILD +++ /dev/null @@ -1,57 +0,0 @@ -# $Id: PKGBUILD 216383 2014-07-03 06:24:56Z fyan $ -# Maintainer (Arch): Ronald van Haren -# Contributor (Arch): eric -# Contributor (Arch): Tom Newsom -# Maintainer: André Silva -# Contributor: xihh - -_pkgname=psutils -pkgname=psutils-libre -pkgver=1.17 -pkgrel=5 -arch=('i686' 'x86_64' 'mips64el') -pkgdesc="A set of postscript utilities, without nonfree files" -url="http://knackered.org/angus/psutils/" -license=('custom') -depends=('glibc' 'ghostscript') -provides=('psutils-lprng' 'psutils') -replaces=('psutils-lprng' 'psutils') -conflicts=('psutils-lprng' 'psutils') -options=('!makeflags') -mksource=("ftp://ftp.archlinux.org/other/psutils/${_pkgname}-${pkgver}.tar.gz" - 'libre.patch') -source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'psutils-1.17.diff') -mkmd5sums=('b161522f3bd1507655326afa7db4a0ad' - 'a4beaf371607085e89ef190c1db7aee3') -md5sums=('75c88dc9e33877368d471dfa8652d96d' - '2b49e9e796000b42f42804d4b50a2be1') - -mksource() { - cd "${srcdir}/${_pkgname}" - # apply patch to remove nonfree files support from Makefile - patch -Np1 -i "${srcdir}/libre.patch" - # remove nonfree files - rm -v {fixmacps.{man,pl},md{68_0,71_0}.ps} -} - -build() { - cd "${srcdir}/${_pkgname}" - patch -Np1 -i "${srcdir}/psutils-1.17.diff" - make -f Makefile.unix BINDIR=/usr/bin \ - INCLUDEDIR=/usr/include/psutils PERL=/usr/bin/perl \ - MANDIR=/usr/share/man/man1 \ - CFLAGS="$CFLAGS -DPAPER=\\\"letter\\\" -DUNIX -Wall" \ - CCFLAGS="$LDFLAGS" -} - -package() { - cd "${srcdir}/${_pkgname}" - install -d -m755 "${pkgdir}/usr/include" - install -d -m755 "${pkgdir}/usr/share/man" - make -f Makefile.unix BINDIR="${pkgdir}/usr/bin" \ - INCLUDEDIR="${pkgdir}/usr/include/psutils" PERL=/usr/bin/perl \ - MANDIR="${pkgdir}/usr/share/man/man1" install - install -m755 -d "${pkgdir}/usr/share/licenses/${_pkgname}" - install -m644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/" -} diff --git a/libre/psutils-libre/libre.patch b/libre/psutils-libre/libre.patch deleted file mode 100644 index c2bd21245..000000000 --- a/libre/psutils-libre/libre.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- psutils.orig/Makefile.unix 2013-06-21 05:46:39.671197867 -0300 -+++ psutils/Makefile.unix 2013-06-21 05:55:30.248672628 -0300 -@@ -44,15 +44,14 @@ - BIN = psbook psselect pstops epsffit psnup \ - psresize - SHELLSCRIPTS = getafm showchar --PERLSCRIPTS = fixfmps fixmacps fixpsditps fixpspps \ -+PERLSCRIPTS = fixfmps fixpsditps fixpspps \ - fixtpps fixwfwps fixwpps fixscribeps fixwwps \ - fixdlsrps extractres includeres psmerge - MANPAGES = psbook.$(MANEXT) psselect.$(MANEXT) pstops.$(MANEXT) epsffit.$(MANEXT) psnup.$(MANEXT) \ - psresize.$(MANEXT) psmerge.$(MANEXT) fixscribeps.$(MANEXT) getafm.$(MANEXT) \ -- fixdlsrps.$(MANEXT) fixfmps.$(MANEXT) fixmacps.$(MANEXT) fixpsditps.$(MANEXT) \ -+ fixdlsrps.$(MANEXT) fixfmps.$(MANEXT) fixpsditps.$(MANEXT) \ - fixpspps.$(MANEXT) fixtpps.$(MANEXT) fixwfwps.$(MANEXT) fixwpps.$(MANEXT) \ - fixwwps.$(MANEXT) extractres.$(MANEXT) includeres.$(MANEXT) --INCLUDES = md68_0.ps md71_0.ps - - all: $(BIN) $(PERLSCRIPTS) $(MANPAGES) $(SHELLSCRIPTS) - -@@ -106,10 +105,6 @@ - $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@ - $(CHMOD) $(BINMODE) $@ - --fixmacps: fixmacps.pl -- $(PERL) maketext OS=$(OS) PERL=$(PERL) INCLUDE=$(INCLUDEDIR) $? > $@ -- $(CHMOD) $(BINMODE) $@ -- - fixpsditps: fixpsditps.pl - $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@ - $(CHMOD) $(BINMODE) $@ -@@ -174,9 +169,6 @@ - fixfmps.$(MANEXT): fixfmps.man - $(PERL) maketext "MAN=$(MANPAGES)" $? > $@ - --fixmacps.$(MANEXT): fixmacps.man -- $(PERL) maketext "MAN=$(MANPAGES)" INCLUDE=$(INCLUDEDIR) $? > $@ -- - fixpsditps.$(MANEXT): fixpsditps.man - $(PERL) maketext "MAN=$(MANPAGES)" $? > $@ - diff --git a/libre/psutils-libre/psutils-1.17.diff b/libre/psutils-libre/psutils-1.17.diff deleted file mode 100644 index 4af32bd7f..000000000 --- a/libre/psutils-libre/psutils-1.17.diff +++ /dev/null @@ -1,33 +0,0 @@ -diff -u -r --new-file psutils.orig/Makefile.unix psutils/Makefile.unix ---- psutils.orig/Makefile.unix Tue Mar 11 14:52:59 1997 -+++ psutils/Makefile.unix Thu Jan 18 20:53:36 2001 -@@ -19,16 +19,16 @@ - # psnup puts multiple logical pages on one physical page - # psresize scales and moves pages to fit on different paper sizes - --PAPER=a4 -+PAPER=letter - - # Makefile for PSUtils under Unix - - OS = UNIX - --BINDIR = /usr/local/bin -+BINDIR = /usr/bin - SCRIPTDIR = $(BINDIR) --INCLUDEDIR = /usr/local/share/psutils --PERL = /usr/local/bin/perl -+INCLUDEDIR = /usr/share/psutils -+PERL = /usr/bin/perl - - BINMODE = 0755 - MANMODE = 0644 -@@ -36,7 +36,7 @@ - INSTALL = install -c -m $(BINMODE) - INSTALLMAN = install -c -m $(MANMODE) - MANEXT = 1 --MANDIR = /usr/local/share/man/man$(MANEXT) -+MANDIR = /usr/man/man$(MANEXT) - - CC = gcc - CFLAGS = -DPAPER=\"$(PAPER)\" -DUNIX -O -Wall diff --git a/libre/psutils/PKGBUILD b/libre/psutils/PKGBUILD new file mode 100644 index 000000000..220680ce9 --- /dev/null +++ b/libre/psutils/PKGBUILD @@ -0,0 +1,57 @@ +# $Id: PKGBUILD 216383 2014-07-03 06:24:56Z fyan $ +# Maintainer (Arch): Ronald van Haren +# Contributor (Arch): eric +# Contributor (Arch): Tom Newsom +# Maintainer: André Silva +# Contributor: xihh + +_pkgname=psutils-libre +pkgname=psutils +pkgver=1.17 +pkgrel=5.parabola1 +arch=('i686' 'x86_64' 'mips64el') +pkgdesc="A set of postscript utilities, without nonfree files" +url="http://knackered.org/angus/psutils/" +license=('custom') +depends=('glibc' 'ghostscript') +provides=('psutils-lprng') +replaces=('psutils-lprng' 'psutils-libre') +conflicts=('psutils-lprng' 'psutils-libre') +options=('!makeflags') +mksource=("ftp://ftp.archlinux.org/other/psutils/${pkgname}-${pkgver}.tar.gz" + 'libre.patch') +source=("https://repo.parabolagnulinux.org/other/${_pkgname}/${_pkgname}-${pkgver}.tar.gz" + 'psutils-1.17.diff') +mkmd5sums=('b161522f3bd1507655326afa7db4a0ad' + 'a4beaf371607085e89ef190c1db7aee3') +md5sums=('75c88dc9e33877368d471dfa8652d96d' + '2b49e9e796000b42f42804d4b50a2be1') + +mksource() { + cd "${srcdir}/${pkgname}" + # apply patch to remove nonfree files support from Makefile + patch -Np1 -i "${srcdir}/libre.patch" + # remove nonfree files + rm -v {fixmacps.{man,pl},md{68_0,71_0}.ps} +} + +build() { + cd "${srcdir}/${pkgname}" + patch -Np1 -i "${srcdir}/psutils-1.17.diff" + make -f Makefile.unix BINDIR=/usr/bin \ + INCLUDEDIR=/usr/include/psutils PERL=/usr/bin/perl \ + MANDIR=/usr/share/man/man1 \ + CFLAGS="$CFLAGS -DPAPER=\\\"letter\\\" -DUNIX -Wall" \ + CCFLAGS="$LDFLAGS" +} + +package() { + cd "${srcdir}/${pkgname}" + install -d -m755 "${pkgdir}/usr/include" + install -d -m755 "${pkgdir}/usr/share/man" + make -f Makefile.unix BINDIR="${pkgdir}/usr/bin" \ + INCLUDEDIR="${pkgdir}/usr/include/psutils" PERL=/usr/bin/perl \ + MANDIR="${pkgdir}/usr/share/man/man1" install + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/" +} diff --git a/libre/psutils/libre.patch b/libre/psutils/libre.patch new file mode 100644 index 000000000..c2bd21245 --- /dev/null +++ b/libre/psutils/libre.patch @@ -0,0 +1,41 @@ +--- psutils.orig/Makefile.unix 2013-06-21 05:46:39.671197867 -0300 ++++ psutils/Makefile.unix 2013-06-21 05:55:30.248672628 -0300 +@@ -44,15 +44,14 @@ + BIN = psbook psselect pstops epsffit psnup \ + psresize + SHELLSCRIPTS = getafm showchar +-PERLSCRIPTS = fixfmps fixmacps fixpsditps fixpspps \ ++PERLSCRIPTS = fixfmps fixpsditps fixpspps \ + fixtpps fixwfwps fixwpps fixscribeps fixwwps \ + fixdlsrps extractres includeres psmerge + MANPAGES = psbook.$(MANEXT) psselect.$(MANEXT) pstops.$(MANEXT) epsffit.$(MANEXT) psnup.$(MANEXT) \ + psresize.$(MANEXT) psmerge.$(MANEXT) fixscribeps.$(MANEXT) getafm.$(MANEXT) \ +- fixdlsrps.$(MANEXT) fixfmps.$(MANEXT) fixmacps.$(MANEXT) fixpsditps.$(MANEXT) \ ++ fixdlsrps.$(MANEXT) fixfmps.$(MANEXT) fixpsditps.$(MANEXT) \ + fixpspps.$(MANEXT) fixtpps.$(MANEXT) fixwfwps.$(MANEXT) fixwpps.$(MANEXT) \ + fixwwps.$(MANEXT) extractres.$(MANEXT) includeres.$(MANEXT) +-INCLUDES = md68_0.ps md71_0.ps + + all: $(BIN) $(PERLSCRIPTS) $(MANPAGES) $(SHELLSCRIPTS) + +@@ -106,10 +105,6 @@ + $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@ + $(CHMOD) $(BINMODE) $@ + +-fixmacps: fixmacps.pl +- $(PERL) maketext OS=$(OS) PERL=$(PERL) INCLUDE=$(INCLUDEDIR) $? > $@ +- $(CHMOD) $(BINMODE) $@ +- + fixpsditps: fixpsditps.pl + $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@ + $(CHMOD) $(BINMODE) $@ +@@ -174,9 +169,6 @@ + fixfmps.$(MANEXT): fixfmps.man + $(PERL) maketext "MAN=$(MANPAGES)" $? > $@ + +-fixmacps.$(MANEXT): fixmacps.man +- $(PERL) maketext "MAN=$(MANPAGES)" INCLUDE=$(INCLUDEDIR) $? > $@ +- + fixpsditps.$(MANEXT): fixpsditps.man + $(PERL) maketext "MAN=$(MANPAGES)" $? > $@ + diff --git a/libre/psutils/psutils-1.17.diff b/libre/psutils/psutils-1.17.diff new file mode 100644 index 000000000..4af32bd7f --- /dev/null +++ b/libre/psutils/psutils-1.17.diff @@ -0,0 +1,33 @@ +diff -u -r --new-file psutils.orig/Makefile.unix psutils/Makefile.unix +--- psutils.orig/Makefile.unix Tue Mar 11 14:52:59 1997 ++++ psutils/Makefile.unix Thu Jan 18 20:53:36 2001 +@@ -19,16 +19,16 @@ + # psnup puts multiple logical pages on one physical page + # psresize scales and moves pages to fit on different paper sizes + +-PAPER=a4 ++PAPER=letter + + # Makefile for PSUtils under Unix + + OS = UNIX + +-BINDIR = /usr/local/bin ++BINDIR = /usr/bin + SCRIPTDIR = $(BINDIR) +-INCLUDEDIR = /usr/local/share/psutils +-PERL = /usr/local/bin/perl ++INCLUDEDIR = /usr/share/psutils ++PERL = /usr/bin/perl + + BINMODE = 0755 + MANMODE = 0644 +@@ -36,7 +36,7 @@ + INSTALL = install -c -m $(BINMODE) + INSTALLMAN = install -c -m $(MANMODE) + MANEXT = 1 +-MANDIR = /usr/local/share/man/man$(MANEXT) ++MANDIR = /usr/man/man$(MANEXT) + + CC = gcc + CFLAGS = -DPAPER=\"$(PAPER)\" -DUNIX -O -Wall -- cgit v1.2.3-54-g00ecf