archrelease: copy trunk to extra-i686, extra-x86_64

git-svn-id: file:///srv/repos/svn-packages/svn@191229 eb2447ed-0c53-47e4-bac8-5bc4a241df78
youngar · Jul 21, 2013 · 03ee72f · 03ee72f
1 parent 3e810bb
commit 03ee72f
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 38 deletions.
diff --git a/a2ps/repos/extra-i686/PKGBUILD b/a2ps/repos/extra-i686/PKGBUILD
@@ -3,48 +3,50 @@
 
 pkgname=a2ps
 pkgver=4.14
-pkgrel=2
+pkgrel=3
 pkgdesc="An Any to PostScript filter"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/a2ps/"
 license=('GPL3')
-depends=('ghostscript' 'psutils' 'imagemagick' 'perl')
+depends=('ghostscript' 'psutils' 'imagemagick')
 makedepends=('gperf')
 backup=('etc/a2ps/a2ps.cfg' 'etc/a2ps/a2ps-site.cfg')
 options=('!libtool')
 install=a2ps.install
-source=(ftp://ftp.gnu.org/gnu/a2ps/${pkgname}-${pkgver}.tar.gz \
-        a2ps-4.13c-fnmatch-replacement.patch a2ps-4.13c-emacs.patch a2ps-4.13-manpage-chmod.patch \
+source=(ftp://ftp.gnu.org/gnu/a2ps/${pkgname}-${pkgver}.tar.gz{,.sig}
+        a2ps-4.13c-fnmatch-replacement.patch a2ps-4.13c-emacs.patch a2ps-4.13-manpage-chmod.patch
         a2ps-4.14-check-mempcpy.patch a2ps-4.14-fix-stpcpy-proto.patch)
-md5sums=('781ac3d9b213fa3e1ed0d79f986dc8c7'
-         '93011b58e9f20a7fafa31287a51884a4'
-         '2e493d0bc00d71eb3e8a9b6febc52b69'
-         '09cc5ed4d3d8ff1b2103e519191e8286'
-         '42aa39b74f6da8cf6e94185c4fc3e601'
-         '066f9327fee6b6eca3a57d657d1097d1')
 sha1sums=('365abbbe4b7128bf70dad16d06e23c5701874852'
+          'SKIP'
           '8783952d3410d8d59ed953e1db45e2ef1a0b8f65'
           '94e35a6ad9268161bec22a56d4cfb696d635994a'
           '2bb3d0a2ef2f3ff9262723e35c742a80ab0235ce'
           '6aed29c1399e79f3914b408059610f9e7c0fc38e'
           '58fa90134f1027e3f05aeb08212cbcc10f420738')
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+  sed -i -e '/^AM_C_PROTOTYPES/d' -e '/^AUTOMAKE_OPTIONS.*ansi2knr/d' \
+    -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' -e 's:AM_PROG_CC_STDC:AC_PROG_CC:' \
+    configure.in {contrib/sample,lib,src}/Makefile.am m4/protos.m4
+  sed -i "s:^countdictstack: \0:" contrib/psset.in
+  patch -p1 -i "${srcdir}/a2ps-4.13c-fnmatch-replacement.patch"
+  patch -p1 -i "${srcdir}/a2ps-4.13c-emacs.patch"
+  patch -p1 -i "${srcdir}/a2ps-4.13-manpage-chmod.patch"
+  patch -p1 -i "${srcdir}/a2ps-4.14-check-mempcpy.patch"
+  patch -p0 -i "${srcdir}/a2ps-4.14-fix-stpcpy-proto.patch"
+}
+
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 < ../a2ps-4.13c-fnmatch-replacement.patch
-  patch -p1 < ../a2ps-4.13c-emacs.patch
-  patch -p1 < ../a2ps-4.13-manpage-chmod.patch
-  patch -p1 < ../a2ps-4.14-check-mempcpy.patch
-  patch -p0 < ../a2ps-4.14-fix-stpcpy-proto.patch
+  cd ${pkgname}-${pkgver}
   libtoolize --force --copy
-  autoreconf -I m4
+  autoreconf --force --install -I m4 
   ./configure --prefix=/usr --sysconfdir=/etc/a2ps \
     --includedir=/usr/include --enable-nls
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
-  sed -i "s:^countdictstack: \0:" "${pkgdir}/usr/bin/psset"
 }
diff --git a/a2ps/repos/extra-x86_64/PKGBUILD b/a2ps/repos/extra-x86_64/PKGBUILD
@@ -3,48 +3,50 @@
 
 pkgname=a2ps
 pkgver=4.14
-pkgrel=2
+pkgrel=3
 pkgdesc="An Any to PostScript filter"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/a2ps/"
 license=('GPL3')
-depends=('ghostscript' 'psutils' 'imagemagick' 'perl')
+depends=('ghostscript' 'psutils' 'imagemagick')
 makedepends=('gperf')
 backup=('etc/a2ps/a2ps.cfg' 'etc/a2ps/a2ps-site.cfg')
 options=('!libtool')
 install=a2ps.install
-source=(ftp://ftp.gnu.org/gnu/a2ps/${pkgname}-${pkgver}.tar.gz \
-        a2ps-4.13c-fnmatch-replacement.patch a2ps-4.13c-emacs.patch a2ps-4.13-manpage-chmod.patch \
+source=(ftp://ftp.gnu.org/gnu/a2ps/${pkgname}-${pkgver}.tar.gz{,.sig}
+        a2ps-4.13c-fnmatch-replacement.patch a2ps-4.13c-emacs.patch a2ps-4.13-manpage-chmod.patch
         a2ps-4.14-check-mempcpy.patch a2ps-4.14-fix-stpcpy-proto.patch)
-md5sums=('781ac3d9b213fa3e1ed0d79f986dc8c7'
-         '93011b58e9f20a7fafa31287a51884a4'
-         '2e493d0bc00d71eb3e8a9b6febc52b69'
-         '09cc5ed4d3d8ff1b2103e519191e8286'
-         '42aa39b74f6da8cf6e94185c4fc3e601'
-         '066f9327fee6b6eca3a57d657d1097d1')
 sha1sums=('365abbbe4b7128bf70dad16d06e23c5701874852'
+          'SKIP'
           '8783952d3410d8d59ed953e1db45e2ef1a0b8f65'
           '94e35a6ad9268161bec22a56d4cfb696d635994a'
           '2bb3d0a2ef2f3ff9262723e35c742a80ab0235ce'
           '6aed29c1399e79f3914b408059610f9e7c0fc38e'
           '58fa90134f1027e3f05aeb08212cbcc10f420738')
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+  sed -i -e '/^AM_C_PROTOTYPES/d' -e '/^AUTOMAKE_OPTIONS.*ansi2knr/d' \
+    -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' -e 's:AM_PROG_CC_STDC:AC_PROG_CC:' \
+    configure.in {contrib/sample,lib,src}/Makefile.am m4/protos.m4
+  sed -i "s:^countdictstack: \0:" contrib/psset.in
+  patch -p1 -i "${srcdir}/a2ps-4.13c-fnmatch-replacement.patch"
+  patch -p1 -i "${srcdir}/a2ps-4.13c-emacs.patch"
+  patch -p1 -i "${srcdir}/a2ps-4.13-manpage-chmod.patch"
+  patch -p1 -i "${srcdir}/a2ps-4.14-check-mempcpy.patch"
+  patch -p0 -i "${srcdir}/a2ps-4.14-fix-stpcpy-proto.patch"
+}
+
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 < ../a2ps-4.13c-fnmatch-replacement.patch
-  patch -p1 < ../a2ps-4.13c-emacs.patch
-  patch -p1 < ../a2ps-4.13-manpage-chmod.patch
-  patch -p1 < ../a2ps-4.14-check-mempcpy.patch
-  patch -p0 < ../a2ps-4.14-fix-stpcpy-proto.patch
+  cd ${pkgname}-${pkgver}
   libtoolize --force --copy
-  autoreconf -I m4
+  autoreconf --force --install -I m4 
   ./configure --prefix=/usr --sysconfdir=/etc/a2ps \
     --includedir=/usr/include --enable-nls
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
-  sed -i "s:^countdictstack: \0:" "${pkgdir}/usr/bin/psset"
 }