summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-09-04 21:41:51 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-09-04 21:41:51 -0300
commit27f8321046e2bbcff4f9b5d54904c44b9d663df3 (patch)
treea29c7c57c522ca3e53586a3637f3caa226d36f2c
parentad9f6d848f9b0fa975cffa7c919d02c404586ae3 (diff)
psutils: remove libre suffix and add complex pkgrel
-rw-r--r--libre/psutils/PKGBUILD (renamed from libre/psutils-libre/PKGBUILD)26
-rw-r--r--libre/psutils/libre.patch (renamed from libre/psutils-libre/libre.patch)0
-rw-r--r--libre/psutils/psutils-1.17.diff (renamed from libre/psutils-libre/psutils-1.17.diff)0
3 files changed, 13 insertions, 13 deletions
diff --git a/libre/psutils-libre/PKGBUILD b/libre/psutils/PKGBUILD
index e0749a1da..220680ce9 100644
--- a/libre/psutils-libre/PKGBUILD
+++ b/libre/psutils/PKGBUILD
@@ -5,22 +5,22 @@
# Maintainer: André Silva <emulatorman@parabola.nu>
# Contributor: xihh <hahj87@gmail.com>
-_pkgname=psutils
-pkgname=psutils-libre
+_pkgname=psutils-libre
+pkgname=psutils
pkgver=1.17
-pkgrel=5
+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' 'psutils')
-replaces=('psutils-lprng' 'psutils')
-conflicts=('psutils-lprng' 'psutils')
+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"
+mksource=("ftp://ftp.archlinux.org/other/psutils/${pkgname}-${pkgver}.tar.gz"
'libre.patch')
-source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+source=("https://repo.parabolagnulinux.org/other/${_pkgname}/${_pkgname}-${pkgver}.tar.gz"
'psutils-1.17.diff')
mkmd5sums=('b161522f3bd1507655326afa7db4a0ad'
'a4beaf371607085e89ef190c1db7aee3')
@@ -28,7 +28,7 @@ md5sums=('75c88dc9e33877368d471dfa8652d96d'
'2b49e9e796000b42f42804d4b50a2be1')
mksource() {
- cd "${srcdir}/${_pkgname}"
+ cd "${srcdir}/${pkgname}"
# apply patch to remove nonfree files support from Makefile
patch -Np1 -i "${srcdir}/libre.patch"
# remove nonfree files
@@ -36,7 +36,7 @@ mksource() {
}
build() {
- cd "${srcdir}/${_pkgname}"
+ 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 \
@@ -46,12 +46,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/libre.patch b/libre/psutils/libre.patch
index c2bd21245..c2bd21245 100644
--- a/libre/psutils-libre/libre.patch
+++ b/libre/psutils/libre.patch
diff --git a/libre/psutils-libre/psutils-1.17.diff b/libre/psutils/psutils-1.17.diff
index 4af32bd7f..4af32bd7f 100644
--- a/libre/psutils-libre/psutils-1.17.diff
+++ b/libre/psutils/psutils-1.17.diff