summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libre/psutils-libre/PKGBUILD8
-rw-r--r--libre/psutils-libre/libre.patch41
2 files changed, 47 insertions, 2 deletions
diff --git a/libre/psutils-libre/PKGBUILD b/libre/psutils-libre/PKGBUILD
index d6fcff26e..4a55ea38e 100644
--- a/libre/psutils-libre/PKGBUILD
+++ b/libre/psutils-libre/PKGBUILD
@@ -19,13 +19,17 @@ replaces=('psutils-lprng' 'psutils')
conflicts=('psutils-lprng' 'psutils')
options=('!makeflags')
source=("ftp://ftp.archlinux.org/other/psutils/${_pkgname}-${pkgver}.tar.gz"
- 'psutils-1.17.diff')
+ 'psutils-1.17.diff'
+ 'libre.patch')
md5sums=('b161522f3bd1507655326afa7db4a0ad'
- '2b49e9e796000b42f42804d4b50a2be1')
+ '2b49e9e796000b42f42804d4b50a2be1'
+ 'a4beaf371607085e89ef190c1db7aee3')
build() {
cd "${srcdir}/${_pkgname}"
patch -Np1 -i "${srcdir}/psutils-1.17.diff"
+ # 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}
make -f Makefile.unix BINDIR=/usr/bin \
diff --git a/libre/psutils-libre/libre.patch b/libre/psutils-libre/libre.patch
new file mode 100644
index 000000000..c2bd21245
--- /dev/null
+++ b/libre/psutils-libre/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)" $? > $@
+