diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-04-11 20:31:43 -0400 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-04-11 20:31:43 -0400 |
commit | 5f338c195e399f2c2486e06be0851d4f597162d7 (patch) | |
tree | 4c144c54bbd85fa2e641d219275045bae11cb4c3 /libre/psutils-libre | |
parent | 158b35a711165b70a2b718b01cbc261ba50a5cf1 (diff) | |
parent | 7e431bf14475a0539a570ce18d290d04427c194c (diff) | |
download | abslibre-5f338c195e399f2c2486e06be0851d4f597162d7.tar.gz abslibre-5f338c195e399f2c2486e06be0851d4f597162d7.tar.bz2 abslibre-5f338c195e399f2c2486e06be0851d4f597162d7.zip |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/abslibre
Diffstat (limited to 'libre/psutils-libre')
-rw-r--r-- | libre/psutils-libre/.directory | 2 | ||||
-rw-r--r-- | libre/psutils-libre/PKGBUILD | 15 | ||||
-rw-r--r-- | libre/psutils-libre/psutils-1.17.diff | 33 |
3 files changed, 43 insertions, 7 deletions
diff --git a/libre/psutils-libre/.directory b/libre/psutils-libre/.directory new file mode 100644 index 000000000..60ed4bded --- /dev/null +++ b/libre/psutils-libre/.directory @@ -0,0 +1,2 @@ +[Dolphin] +Timestamp=2012,4,11,16,24,1 diff --git a/libre/psutils-libre/PKGBUILD b/libre/psutils-libre/PKGBUILD index 4cb5ac014..25e88f492 100644 --- a/libre/psutils-libre/PKGBUILD +++ b/libre/psutils-libre/PKGBUILD @@ -4,6 +4,7 @@ # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: xihh <hahj87@gmail.com> +_pkgname=psutils pkgname=psutils-libre pkgver=1.17 pkgrel=3 @@ -11,18 +12,18 @@ arch=('i686' 'x86_64' 'mips64el') pkgdesc="A set of postscript utilities" url="http://www.tardis.ed.ac.uk/~ajcd/psutils/index.html" license=('custom') -depends=('glibc' 'ghostscript-libre') +depends=('glibc' 'gnu-ghostscript') provides=('psutils-lprng' 'psutils') replaces=('psutils-lprng' 'psutils') conflicts=('psutils-lprng' 'psutils') options=('!makeflags') -source=(http://www.connochaetos.org/misc/${pkgname}-${pkgver}.tar.gz +source=("ftp://ftp.archlinux.org/other/psutils/${_pkgname}-${pkgver}.tar.gz" 'psutils-1.17.diff') -md5sums=('5553b70be2484cef7a76d741a26f24d5' +md5sums=('b161522f3bd1507655326afa7db4a0ad' '2b49e9e796000b42f42804d4b50a2be1') build() { - cd "${srcdir}/${pkgname}" + cd "${srcdir}/${_pkgname}" patch -Np1 -i "${srcdir}/psutils-1.17.diff" make -f Makefile.unix BINDIR="${pkgdir}/usr/bin" \ INCLUDEDIR="${pkgdir}/usr/include/psutils" PERL=/usr/bin/perl \ @@ -32,12 +33,12 @@ build() { } package() { - cd "${srcdir}/${pkgname}" + 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}/" + install -m755 -d "${pkgdir}/usr/share/licenses/${_pkgname}" + install -m644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/" } diff --git a/libre/psutils-libre/psutils-1.17.diff b/libre/psutils-libre/psutils-1.17.diff new file mode 100644 index 000000000..4af32bd7f --- /dev/null +++ b/libre/psutils-libre/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 |