[arch-commits] Commit in a2ps/repos (28 files)
Eric Bélanger
eric at nymeria.archlinux.org
Sun Jul 21 22:39:59 UTC 2013
Date: Monday, July 22, 2013 @ 00:39:59
Author: eric
Revision: 191229
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
a2ps/repos/extra-i686/PKGBUILD
(from rev 191228, a2ps/trunk/PKGBUILD)
a2ps/repos/extra-i686/a2ps-4.13-manpage-chmod.patch
(from rev 191228, a2ps/trunk/a2ps-4.13-manpage-chmod.patch)
a2ps/repos/extra-i686/a2ps-4.13c-emacs.patch
(from rev 191228, a2ps/trunk/a2ps-4.13c-emacs.patch)
a2ps/repos/extra-i686/a2ps-4.13c-fnmatch-replacement.patch
(from rev 191228, a2ps/trunk/a2ps-4.13c-fnmatch-replacement.patch)
a2ps/repos/extra-i686/a2ps-4.14-check-mempcpy.patch
(from rev 191228, a2ps/trunk/a2ps-4.14-check-mempcpy.patch)
a2ps/repos/extra-i686/a2ps-4.14-fix-stpcpy-proto.patch
(from rev 191228, a2ps/trunk/a2ps-4.14-fix-stpcpy-proto.patch)
a2ps/repos/extra-i686/a2ps.install
(from rev 191228, a2ps/trunk/a2ps.install)
a2ps/repos/extra-x86_64/PKGBUILD
(from rev 191228, a2ps/trunk/PKGBUILD)
a2ps/repos/extra-x86_64/a2ps-4.13-manpage-chmod.patch
(from rev 191228, a2ps/trunk/a2ps-4.13-manpage-chmod.patch)
a2ps/repos/extra-x86_64/a2ps-4.13c-emacs.patch
(from rev 191228, a2ps/trunk/a2ps-4.13c-emacs.patch)
a2ps/repos/extra-x86_64/a2ps-4.13c-fnmatch-replacement.patch
(from rev 191228, a2ps/trunk/a2ps-4.13c-fnmatch-replacement.patch)
a2ps/repos/extra-x86_64/a2ps-4.14-check-mempcpy.patch
(from rev 191228, a2ps/trunk/a2ps-4.14-check-mempcpy.patch)
a2ps/repos/extra-x86_64/a2ps-4.14-fix-stpcpy-proto.patch
(from rev 191228, a2ps/trunk/a2ps-4.14-fix-stpcpy-proto.patch)
a2ps/repos/extra-x86_64/a2ps.install
(from rev 191228, a2ps/trunk/a2ps.install)
Deleted:
a2ps/repos/extra-i686/PKGBUILD
a2ps/repos/extra-i686/a2ps-4.13-manpage-chmod.patch
a2ps/repos/extra-i686/a2ps-4.13c-emacs.patch
a2ps/repos/extra-i686/a2ps-4.13c-fnmatch-replacement.patch
a2ps/repos/extra-i686/a2ps-4.14-check-mempcpy.patch
a2ps/repos/extra-i686/a2ps-4.14-fix-stpcpy-proto.patch
a2ps/repos/extra-i686/a2ps.install
a2ps/repos/extra-x86_64/PKGBUILD
a2ps/repos/extra-x86_64/a2ps-4.13-manpage-chmod.patch
a2ps/repos/extra-x86_64/a2ps-4.13c-emacs.patch
a2ps/repos/extra-x86_64/a2ps-4.13c-fnmatch-replacement.patch
a2ps/repos/extra-x86_64/a2ps-4.14-check-mempcpy.patch
a2ps/repos/extra-x86_64/a2ps-4.14-fix-stpcpy-proto.patch
a2ps/repos/extra-x86_64/a2ps.install
---------------------------------------------------+
/PKGBUILD | 104 ++++++++++++++++++++
/a2ps-4.13-manpage-chmod.patch | 24 ++++
/a2ps-4.13c-emacs.patch | 20 +++
/a2ps-4.13c-fnmatch-replacement.patch | 86 ++++++++++++++++
/a2ps-4.14-check-mempcpy.patch | 24 ++++
/a2ps-4.14-fix-stpcpy-proto.patch | 34 ++++++
/a2ps.install | 40 +++++++
extra-i686/PKGBUILD | 50 ---------
extra-i686/a2ps-4.13-manpage-chmod.patch | 12 --
extra-i686/a2ps-4.13c-emacs.patch | 10 -
extra-i686/a2ps-4.13c-fnmatch-replacement.patch | 43 --------
extra-i686/a2ps-4.14-check-mempcpy.patch | 12 --
extra-i686/a2ps-4.14-fix-stpcpy-proto.patch | 17 ---
extra-i686/a2ps.install | 20 ---
extra-x86_64/PKGBUILD | 50 ---------
extra-x86_64/a2ps-4.13-manpage-chmod.patch | 12 --
extra-x86_64/a2ps-4.13c-emacs.patch | 10 -
extra-x86_64/a2ps-4.13c-fnmatch-replacement.patch | 43 --------
extra-x86_64/a2ps-4.14-check-mempcpy.patch | 12 --
extra-x86_64/a2ps-4.14-fix-stpcpy-proto.patch | 17 ---
extra-x86_64/a2ps.install | 20 ---
21 files changed, 332 insertions(+), 328 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2013-07-21 22:38:57 UTC (rev 191228)
+++ extra-i686/PKGBUILD 2013-07-21 22:39:59 UTC (rev 191229)
@@ -1,50 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=a2ps
-pkgver=4.14
-pkgrel=2
-pkgdesc="An Any to PostScript filter"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/a2ps/"
-license=('GPL3')
-depends=('ghostscript' 'psutils' 'imagemagick' 'perl')
-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 \
- a2ps-4.14-check-mempcpy.patch a2ps-4.14-fix-stpcpy-proto.patch)
-md5sums=('781ac3d9b213fa3e1ed0d79f986dc8c7'
- '93011b58e9f20a7fafa31287a51884a4'
- '2e493d0bc00d71eb3e8a9b6febc52b69'
- '09cc5ed4d3d8ff1b2103e519191e8286'
- '42aa39b74f6da8cf6e94185c4fc3e601'
- '066f9327fee6b6eca3a57d657d1097d1')
-sha1sums=('365abbbe4b7128bf70dad16d06e23c5701874852'
- '8783952d3410d8d59ed953e1db45e2ef1a0b8f65'
- '94e35a6ad9268161bec22a56d4cfb696d635994a'
- '2bb3d0a2ef2f3ff9262723e35c742a80ab0235ce'
- '6aed29c1399e79f3914b408059610f9e7c0fc38e'
- '58fa90134f1027e3f05aeb08212cbcc10f420738')
-
-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
- libtoolize --force --copy
- autoreconf -I m4
- ./configure --prefix=/usr --sysconfdir=/etc/a2ps \
- --includedir=/usr/include --enable-nls
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
- sed -i "s:^countdictstack: \0:" "${pkgdir}/usr/bin/psset"
-}
Copied: a2ps/repos/extra-i686/PKGBUILD (from rev 191228, a2ps/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-07-21 22:39:59 UTC (rev 191229)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=a2ps
+pkgver=4.14
+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')
+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{,.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)
+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 ${pkgname}-${pkgver}
+ libtoolize --force --copy
+ autoreconf --force --install -I m4
+ ./configure --prefix=/usr --sysconfdir=/etc/a2ps \
+ --includedir=/usr/include --enable-nls
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-i686/a2ps-4.13-manpage-chmod.patch
===================================================================
--- extra-i686/a2ps-4.13-manpage-chmod.patch 2013-07-21 22:38:57 UTC (rev 191228)
+++ extra-i686/a2ps-4.13-manpage-chmod.patch 2013-07-21 22:39:59 UTC (rev 191229)
@@ -1,12 +0,0 @@
-diff -ur a2ps-4.13.orig/man/Makefile.maint a2ps-4.13/man/Makefile.maint
---- a2ps-4.13.orig/man/Makefile.maint 2002-03-04 20:46:26.000000000 +0200
-+++ a2ps-4.13/man/Makefile.maint 2007-02-19 21:50:29.000000000 +0200
-@@ -20,7 +20,7 @@
- --include=$(basename $@).x \
- --include=common.x \
- $(executable) > $@-t || exit 1; \
-- chmod -w $@-t || exit 1; \
-+ chmod a-w $@-t || exit 1; \
- rm -f $@ || exit 1; \
- mv $@-t $@ || exit 1; \
- else \
Copied: a2ps/repos/extra-i686/a2ps-4.13-manpage-chmod.patch (from rev 191228, a2ps/trunk/a2ps-4.13-manpage-chmod.patch)
===================================================================
--- extra-i686/a2ps-4.13-manpage-chmod.patch (rev 0)
+++ extra-i686/a2ps-4.13-manpage-chmod.patch 2013-07-21 22:39:59 UTC (rev 191229)
@@ -0,0 +1,12 @@
+diff -ur a2ps-4.13.orig/man/Makefile.maint a2ps-4.13/man/Makefile.maint
+--- a2ps-4.13.orig/man/Makefile.maint 2002-03-04 20:46:26.000000000 +0200
++++ a2ps-4.13/man/Makefile.maint 2007-02-19 21:50:29.000000000 +0200
+@@ -20,7 +20,7 @@
+ --include=$(basename $@).x \
+ --include=common.x \
+ $(executable) > $@-t || exit 1; \
+- chmod -w $@-t || exit 1; \
++ chmod a-w $@-t || exit 1; \
+ rm -f $@ || exit 1; \
+ mv $@-t $@ || exit 1; \
+ else \
Deleted: extra-i686/a2ps-4.13c-emacs.patch
===================================================================
--- extra-i686/a2ps-4.13c-emacs.patch 2013-07-21 22:38:57 UTC (rev 191228)
+++ extra-i686/a2ps-4.13c-emacs.patch 2013-07-21 22:39:59 UTC (rev 191229)
@@ -1,10 +0,0 @@
---- a2ps-4.13/contrib/emacs/a2ps-print.el.orig 2005-12-05 08:03:48.000000000 +0100
-+++ a2ps-4.13/contrib/emacs/a2ps-print.el 2005-12-06 16:38:14.000000000 +0100
-@@ -93,6 +93,7 @@
- (concat "--center-title=" name)
- (concat "--footer=" (concat name " Emacs buffer"))
- (concat "--pretty-print=" filetype)
-+ (concat "-d")
- ;Uncommenting the following gives a print preview (only):
- ; (concat "--output=/tmp/foo.ps")
- )
Copied: a2ps/repos/extra-i686/a2ps-4.13c-emacs.patch (from rev 191228, a2ps/trunk/a2ps-4.13c-emacs.patch)
===================================================================
--- extra-i686/a2ps-4.13c-emacs.patch (rev 0)
+++ extra-i686/a2ps-4.13c-emacs.patch 2013-07-21 22:39:59 UTC (rev 191229)
@@ -0,0 +1,10 @@
+--- a2ps-4.13/contrib/emacs/a2ps-print.el.orig 2005-12-05 08:03:48.000000000 +0100
++++ a2ps-4.13/contrib/emacs/a2ps-print.el 2005-12-06 16:38:14.000000000 +0100
+@@ -93,6 +93,7 @@
+ (concat "--center-title=" name)
+ (concat "--footer=" (concat name " Emacs buffer"))
+ (concat "--pretty-print=" filetype)
++ (concat "-d")
+ ;Uncommenting the following gives a print preview (only):
+ ; (concat "--output=/tmp/foo.ps")
+ )
Deleted: extra-i686/a2ps-4.13c-fnmatch-replacement.patch
===================================================================
--- extra-i686/a2ps-4.13c-fnmatch-replacement.patch 2013-07-21 22:38:57 UTC (rev 191228)
+++ extra-i686/a2ps-4.13c-fnmatch-replacement.patch 2013-07-21 22:39:59 UTC (rev 191229)
@@ -1,43 +0,0 @@
-diff -Naurp a2ps-4.13.orig/lib/fnmatch.c a2ps-4.13/lib/fnmatch.c
---- a2ps-4.13.orig/lib/fnmatch.c 2002-03-04 12:46:25 -0600
-+++ a2ps-4.13/lib/fnmatch.c 2006-05-27 11:41:15 -0500
-@@ -27,18 +27,6 @@
- #include <fnmatch.h>
- #include <ctype.h>
-
--
--/* Comment out all this code if we are using the GNU C Library, and are not
-- actually compiling the library itself. This code is part of the GNU C
-- Library, but also included in many other GNU distributions. Compiling
-- and linking in this code is a waste when using the GNU C library
-- (especially if it is a shared library). Rather than having every GNU
-- program understand `configure --with-gnu-libc' and omit the object files,
-- it is simpler to just do this in the source for each such file. */
--
--#if defined _LIBC || !defined __GNU_LIBRARY__
--
--
- # if defined STDC_HEADERS || !defined isascii
- # define ISASCII(c) 1
- # else
-@@ -52,10 +40,13 @@
- extern int errno;
- # endif
-
-+/* fnmatch replacement taken from the GNU C Library for systems that
-+ provide a broken implementation. */
-+
- /* Match STRING against the filename pattern PATTERN, returning zero if
- it matches, nonzero if not. */
- int
--fnmatch (const char *pattern, const char *string, int flags)
-+rpl_fnmatch (const char *pattern, const char *string, int flags)
- {
- register const char *p = pattern, *n = string;
- register char c;
-@@ -233,5 +224,3 @@ fnmatch (const char *pattern, const char
-
- # undef FOLD
- }
--
--#endif /* _LIBC or not __GNU_LIBRARY__. */
Copied: a2ps/repos/extra-i686/a2ps-4.13c-fnmatch-replacement.patch (from rev 191228, a2ps/trunk/a2ps-4.13c-fnmatch-replacement.patch)
===================================================================
--- extra-i686/a2ps-4.13c-fnmatch-replacement.patch (rev 0)
+++ extra-i686/a2ps-4.13c-fnmatch-replacement.patch 2013-07-21 22:39:59 UTC (rev 191229)
@@ -0,0 +1,43 @@
+diff -Naurp a2ps-4.13.orig/lib/fnmatch.c a2ps-4.13/lib/fnmatch.c
+--- a2ps-4.13.orig/lib/fnmatch.c 2002-03-04 12:46:25 -0600
++++ a2ps-4.13/lib/fnmatch.c 2006-05-27 11:41:15 -0500
+@@ -27,18 +27,6 @@
+ #include <fnmatch.h>
+ #include <ctype.h>
+
+-
+-/* Comment out all this code if we are using the GNU C Library, and are not
+- actually compiling the library itself. This code is part of the GNU C
+- Library, but also included in many other GNU distributions. Compiling
+- and linking in this code is a waste when using the GNU C library
+- (especially if it is a shared library). Rather than having every GNU
+- program understand `configure --with-gnu-libc' and omit the object files,
+- it is simpler to just do this in the source for each such file. */
+-
+-#if defined _LIBC || !defined __GNU_LIBRARY__
+-
+-
+ # if defined STDC_HEADERS || !defined isascii
+ # define ISASCII(c) 1
+ # else
+@@ -52,10 +40,13 @@
+ extern int errno;
+ # endif
+
++/* fnmatch replacement taken from the GNU C Library for systems that
++ provide a broken implementation. */
++
+ /* Match STRING against the filename pattern PATTERN, returning zero if
+ it matches, nonzero if not. */
+ int
+-fnmatch (const char *pattern, const char *string, int flags)
++rpl_fnmatch (const char *pattern, const char *string, int flags)
+ {
+ register const char *p = pattern, *n = string;
+ register char c;
+@@ -233,5 +224,3 @@ fnmatch (const char *pattern, const char
+
+ # undef FOLD
+ }
+-
+-#endif /* _LIBC or not __GNU_LIBRARY__. */
Deleted: extra-i686/a2ps-4.14-check-mempcpy.patch
===================================================================
--- extra-i686/a2ps-4.14-check-mempcpy.patch 2013-07-21 22:38:57 UTC (rev 191228)
+++ extra-i686/a2ps-4.14-check-mempcpy.patch 2013-07-21 22:39:59 UTC (rev 191229)
@@ -1,12 +0,0 @@
---- a2ps-4.14-orig/configure.in 2008-04-16 08:36:03.000000000 +0200
-+++ a2ps-4.14/configure.in 2008-04-16 08:36:29.000000000 +0200
-@@ -137,7 +137,8 @@
- ad_REPLACE_FUNC_STRCASECMP
- ad_REPLACE_FUNC_STRNCASECMP
- ad_REPLACE_FUNC_RENAME
--AC_CHECK_FUNCS(uname strchr strerror strerror_r getcwd bcopy bzero tempnam strsignal psignal setlocale)
-+AC_CHECK_FUNCS(uname strchr strerror strerror_r getcwd bcopy bzero \
-+ tempnam strsignal psignal setlocale mempcpy)
- ad_FUNC_SYSTEMPAPERNAME
- ad_FUNC_ATEXIT
- ad_FUNC_STRFTIME
Copied: a2ps/repos/extra-i686/a2ps-4.14-check-mempcpy.patch (from rev 191228, a2ps/trunk/a2ps-4.14-check-mempcpy.patch)
===================================================================
--- extra-i686/a2ps-4.14-check-mempcpy.patch (rev 0)
+++ extra-i686/a2ps-4.14-check-mempcpy.patch 2013-07-21 22:39:59 UTC (rev 191229)
@@ -0,0 +1,12 @@
+--- a2ps-4.14-orig/configure.in 2008-04-16 08:36:03.000000000 +0200
++++ a2ps-4.14/configure.in 2008-04-16 08:36:29.000000000 +0200
+@@ -137,7 +137,8 @@
+ ad_REPLACE_FUNC_STRCASECMP
+ ad_REPLACE_FUNC_STRNCASECMP
+ ad_REPLACE_FUNC_RENAME
+-AC_CHECK_FUNCS(uname strchr strerror strerror_r getcwd bcopy bzero tempnam strsignal psignal setlocale)
++AC_CHECK_FUNCS(uname strchr strerror strerror_r getcwd bcopy bzero \
++ tempnam strsignal psignal setlocale mempcpy)
+ ad_FUNC_SYSTEMPAPERNAME
+ ad_FUNC_ATEXIT
+ ad_FUNC_STRFTIME
Deleted: extra-i686/a2ps-4.14-fix-stpcpy-proto.patch
===================================================================
--- extra-i686/a2ps-4.14-fix-stpcpy-proto.patch 2013-07-21 22:38:57 UTC (rev 191228)
+++ extra-i686/a2ps-4.14-fix-stpcpy-proto.patch 2013-07-21 22:39:59 UTC (rev 191229)
@@ -1,17 +0,0 @@
-=== modified file 'lib/xstrrpl.c'
---- lib/xstrrpl.c 2008-04-14 18:04:50 +0000
-+++ lib/xstrrpl.c 2008-04-14 18:20:20 +0000
-@@ -20,12 +20,10 @@
-
- #include "system.h"
- #include <assert.h>
- #include "xstrrpl.h"
-
--extern char * stpcpy();
--
- /* Perform subsitutions in string. Result is malloc'd
- E.g., result = xstrrrpl ("1234", subst) gives result = "112333"
- where subst = { {"1", "11"}, {"3", "333"}, { "4", ""}}
- */
- char *
-
Copied: a2ps/repos/extra-i686/a2ps-4.14-fix-stpcpy-proto.patch (from rev 191228, a2ps/trunk/a2ps-4.14-fix-stpcpy-proto.patch)
===================================================================
--- extra-i686/a2ps-4.14-fix-stpcpy-proto.patch (rev 0)
+++ extra-i686/a2ps-4.14-fix-stpcpy-proto.patch 2013-07-21 22:39:59 UTC (rev 191229)
@@ -0,0 +1,17 @@
+=== modified file 'lib/xstrrpl.c'
+--- lib/xstrrpl.c 2008-04-14 18:04:50 +0000
++++ lib/xstrrpl.c 2008-04-14 18:20:20 +0000
+@@ -20,12 +20,10 @@
+
+ #include "system.h"
+ #include <assert.h>
+ #include "xstrrpl.h"
+
+-extern char * stpcpy();
+-
+ /* Perform subsitutions in string. Result is malloc'd
+ E.g., result = xstrrrpl ("1234", subst) gives result = "112333"
+ where subst = { {"1", "11"}, {"3", "333"}, { "4", ""}}
+ */
+ char *
+
Deleted: extra-i686/a2ps.install
===================================================================
--- extra-i686/a2ps.install 2013-07-21 22:38:57 UTC (rev 191228)
+++ extra-i686/a2ps.install 2013-07-21 22:39:59 UTC (rev 191229)
@@ -1,20 +0,0 @@
-infodir=/usr/share/info
-filelist=(a2ps.info.gz ogonkify.info.gz regex.info.gz)
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info $infodir/$file $infodir/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file $infodir/dir 2> /dev/null
- done
-}
Copied: a2ps/repos/extra-i686/a2ps.install (from rev 191228, a2ps/trunk/a2ps.install)
===================================================================
--- extra-i686/a2ps.install (rev 0)
+++ extra-i686/a2ps.install 2013-07-21 22:39:59 UTC (rev 191229)
@@ -0,0 +1,20 @@
+infodir=/usr/share/info
+filelist=(a2ps.info.gz ogonkify.info.gz regex.info.gz)
+
+post_install() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+ install-info $infodir/$file $infodir/dir 2> /dev/null
+ done
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+ install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+ done
+}
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2013-07-21 22:38:57 UTC (rev 191228)
+++ extra-x86_64/PKGBUILD 2013-07-21 22:39:59 UTC (rev 191229)
@@ -1,50 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=a2ps
-pkgver=4.14
-pkgrel=2
-pkgdesc="An Any to PostScript filter"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/a2ps/"
-license=('GPL3')
-depends=('ghostscript' 'psutils' 'imagemagick' 'perl')
-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 \
- a2ps-4.14-check-mempcpy.patch a2ps-4.14-fix-stpcpy-proto.patch)
-md5sums=('781ac3d9b213fa3e1ed0d79f986dc8c7'
- '93011b58e9f20a7fafa31287a51884a4'
- '2e493d0bc00d71eb3e8a9b6febc52b69'
- '09cc5ed4d3d8ff1b2103e519191e8286'
- '42aa39b74f6da8cf6e94185c4fc3e601'
- '066f9327fee6b6eca3a57d657d1097d1')
-sha1sums=('365abbbe4b7128bf70dad16d06e23c5701874852'
- '8783952d3410d8d59ed953e1db45e2ef1a0b8f65'
- '94e35a6ad9268161bec22a56d4cfb696d635994a'
- '2bb3d0a2ef2f3ff9262723e35c742a80ab0235ce'
- '6aed29c1399e79f3914b408059610f9e7c0fc38e'
- '58fa90134f1027e3f05aeb08212cbcc10f420738')
-
-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
- libtoolize --force --copy
- autoreconf -I m4
- ./configure --prefix=/usr --sysconfdir=/etc/a2ps \
- --includedir=/usr/include --enable-nls
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
- sed -i "s:^countdictstack: \0:" "${pkgdir}/usr/bin/psset"
-}
Copied: a2ps/repos/extra-x86_64/PKGBUILD (from rev 191228, a2ps/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2013-07-21 22:39:59 UTC (rev 191229)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=a2ps
+pkgver=4.14
+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')
+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{,.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)
+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 ${pkgname}-${pkgver}
+ libtoolize --force --copy
+ autoreconf --force --install -I m4
+ ./configure --prefix=/usr --sysconfdir=/etc/a2ps \
+ --includedir=/usr/include --enable-nls
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-x86_64/a2ps-4.13-manpage-chmod.patch
===================================================================
--- extra-x86_64/a2ps-4.13-manpage-chmod.patch 2013-07-21 22:38:57 UTC (rev 191228)
+++ extra-x86_64/a2ps-4.13-manpage-chmod.patch 2013-07-21 22:39:59 UTC (rev 191229)
@@ -1,12 +0,0 @@
-diff -ur a2ps-4.13.orig/man/Makefile.maint a2ps-4.13/man/Makefile.maint
---- a2ps-4.13.orig/man/Makefile.maint 2002-03-04 20:46:26.000000000 +0200
-+++ a2ps-4.13/man/Makefile.maint 2007-02-19 21:50:29.000000000 +0200
-@@ -20,7 +20,7 @@
- --include=$(basename $@).x \
- --include=common.x \
- $(executable) > $@-t || exit 1; \
-- chmod -w $@-t || exit 1; \
-+ chmod a-w $@-t || exit 1; \
- rm -f $@ || exit 1; \
- mv $@-t $@ || exit 1; \
- else \
Copied: a2ps/repos/extra-x86_64/a2ps-4.13-manpage-chmod.patch (from rev 191228, a2ps/trunk/a2ps-4.13-manpage-chmod.patch)
===================================================================
--- extra-x86_64/a2ps-4.13-manpage-chmod.patch (rev 0)
+++ extra-x86_64/a2ps-4.13-manpage-chmod.patch 2013-07-21 22:39:59 UTC (rev 191229)
@@ -0,0 +1,12 @@
+diff -ur a2ps-4.13.orig/man/Makefile.maint a2ps-4.13/man/Makefile.maint
+--- a2ps-4.13.orig/man/Makefile.maint 2002-03-04 20:46:26.000000000 +0200
++++ a2ps-4.13/man/Makefile.maint 2007-02-19 21:50:29.000000000 +0200
+@@ -20,7 +20,7 @@
+ --include=$(basename $@).x \
+ --include=common.x \
+ $(executable) > $@-t || exit 1; \
+- chmod -w $@-t || exit 1; \
++ chmod a-w $@-t || exit 1; \
+ rm -f $@ || exit 1; \
+ mv $@-t $@ || exit 1; \
+ else \
Deleted: extra-x86_64/a2ps-4.13c-emacs.patch
===================================================================
--- extra-x86_64/a2ps-4.13c-emacs.patch 2013-07-21 22:38:57 UTC (rev 191228)
+++ extra-x86_64/a2ps-4.13c-emacs.patch 2013-07-21 22:39:59 UTC (rev 191229)
@@ -1,10 +0,0 @@
---- a2ps-4.13/contrib/emacs/a2ps-print.el.orig 2005-12-05 08:03:48.000000000 +0100
-+++ a2ps-4.13/contrib/emacs/a2ps-print.el 2005-12-06 16:38:14.000000000 +0100
-@@ -93,6 +93,7 @@
- (concat "--center-title=" name)
- (concat "--footer=" (concat name " Emacs buffer"))
- (concat "--pretty-print=" filetype)
-+ (concat "-d")
- ;Uncommenting the following gives a print preview (only):
- ; (concat "--output=/tmp/foo.ps")
- )
Copied: a2ps/repos/extra-x86_64/a2ps-4.13c-emacs.patch (from rev 191228, a2ps/trunk/a2ps-4.13c-emacs.patch)
===================================================================
--- extra-x86_64/a2ps-4.13c-emacs.patch (rev 0)
+++ extra-x86_64/a2ps-4.13c-emacs.patch 2013-07-21 22:39:59 UTC (rev 191229)
@@ -0,0 +1,10 @@
+--- a2ps-4.13/contrib/emacs/a2ps-print.el.orig 2005-12-05 08:03:48.000000000 +0100
++++ a2ps-4.13/contrib/emacs/a2ps-print.el 2005-12-06 16:38:14.000000000 +0100
+@@ -93,6 +93,7 @@
+ (concat "--center-title=" name)
+ (concat "--footer=" (concat name " Emacs buffer"))
+ (concat "--pretty-print=" filetype)
++ (concat "-d")
+ ;Uncommenting the following gives a print preview (only):
+ ; (concat "--output=/tmp/foo.ps")
+ )
Deleted: extra-x86_64/a2ps-4.13c-fnmatch-replacement.patch
===================================================================
--- extra-x86_64/a2ps-4.13c-fnmatch-replacement.patch 2013-07-21 22:38:57 UTC (rev 191228)
+++ extra-x86_64/a2ps-4.13c-fnmatch-replacement.patch 2013-07-21 22:39:59 UTC (rev 191229)
@@ -1,43 +0,0 @@
-diff -Naurp a2ps-4.13.orig/lib/fnmatch.c a2ps-4.13/lib/fnmatch.c
---- a2ps-4.13.orig/lib/fnmatch.c 2002-03-04 12:46:25 -0600
-+++ a2ps-4.13/lib/fnmatch.c 2006-05-27 11:41:15 -0500
-@@ -27,18 +27,6 @@
- #include <fnmatch.h>
- #include <ctype.h>
-
--
--/* Comment out all this code if we are using the GNU C Library, and are not
-- actually compiling the library itself. This code is part of the GNU C
-- Library, but also included in many other GNU distributions. Compiling
-- and linking in this code is a waste when using the GNU C library
-- (especially if it is a shared library). Rather than having every GNU
-- program understand `configure --with-gnu-libc' and omit the object files,
-- it is simpler to just do this in the source for each such file. */
--
--#if defined _LIBC || !defined __GNU_LIBRARY__
--
--
- # if defined STDC_HEADERS || !defined isascii
- # define ISASCII(c) 1
- # else
-@@ -52,10 +40,13 @@
- extern int errno;
- # endif
-
-+/* fnmatch replacement taken from the GNU C Library for systems that
-+ provide a broken implementation. */
-+
- /* Match STRING against the filename pattern PATTERN, returning zero if
- it matches, nonzero if not. */
- int
--fnmatch (const char *pattern, const char *string, int flags)
-+rpl_fnmatch (const char *pattern, const char *string, int flags)
- {
- register const char *p = pattern, *n = string;
- register char c;
-@@ -233,5 +224,3 @@ fnmatch (const char *pattern, const char
-
- # undef FOLD
- }
--
--#endif /* _LIBC or not __GNU_LIBRARY__. */
Copied: a2ps/repos/extra-x86_64/a2ps-4.13c-fnmatch-replacement.patch (from rev 191228, a2ps/trunk/a2ps-4.13c-fnmatch-replacement.patch)
===================================================================
--- extra-x86_64/a2ps-4.13c-fnmatch-replacement.patch (rev 0)
+++ extra-x86_64/a2ps-4.13c-fnmatch-replacement.patch 2013-07-21 22:39:59 UTC (rev 191229)
@@ -0,0 +1,43 @@
+diff -Naurp a2ps-4.13.orig/lib/fnmatch.c a2ps-4.13/lib/fnmatch.c
+--- a2ps-4.13.orig/lib/fnmatch.c 2002-03-04 12:46:25 -0600
++++ a2ps-4.13/lib/fnmatch.c 2006-05-27 11:41:15 -0500
+@@ -27,18 +27,6 @@
+ #include <fnmatch.h>
+ #include <ctype.h>
+
+-
+-/* Comment out all this code if we are using the GNU C Library, and are not
+- actually compiling the library itself. This code is part of the GNU C
+- Library, but also included in many other GNU distributions. Compiling
+- and linking in this code is a waste when using the GNU C library
+- (especially if it is a shared library). Rather than having every GNU
+- program understand `configure --with-gnu-libc' and omit the object files,
+- it is simpler to just do this in the source for each such file. */
+-
+-#if defined _LIBC || !defined __GNU_LIBRARY__
+-
+-
+ # if defined STDC_HEADERS || !defined isascii
+ # define ISASCII(c) 1
+ # else
+@@ -52,10 +40,13 @@
+ extern int errno;
+ # endif
+
++/* fnmatch replacement taken from the GNU C Library for systems that
++ provide a broken implementation. */
++
+ /* Match STRING against the filename pattern PATTERN, returning zero if
+ it matches, nonzero if not. */
+ int
+-fnmatch (const char *pattern, const char *string, int flags)
++rpl_fnmatch (const char *pattern, const char *string, int flags)
+ {
+ register const char *p = pattern, *n = string;
+ register char c;
+@@ -233,5 +224,3 @@ fnmatch (const char *pattern, const char
+
+ # undef FOLD
+ }
+-
+-#endif /* _LIBC or not __GNU_LIBRARY__. */
Deleted: extra-x86_64/a2ps-4.14-check-mempcpy.patch
===================================================================
--- extra-x86_64/a2ps-4.14-check-mempcpy.patch 2013-07-21 22:38:57 UTC (rev 191228)
+++ extra-x86_64/a2ps-4.14-check-mempcpy.patch 2013-07-21 22:39:59 UTC (rev 191229)
@@ -1,12 +0,0 @@
---- a2ps-4.14-orig/configure.in 2008-04-16 08:36:03.000000000 +0200
-+++ a2ps-4.14/configure.in 2008-04-16 08:36:29.000000000 +0200
-@@ -137,7 +137,8 @@
- ad_REPLACE_FUNC_STRCASECMP
- ad_REPLACE_FUNC_STRNCASECMP
- ad_REPLACE_FUNC_RENAME
--AC_CHECK_FUNCS(uname strchr strerror strerror_r getcwd bcopy bzero tempnam strsignal psignal setlocale)
-+AC_CHECK_FUNCS(uname strchr strerror strerror_r getcwd bcopy bzero \
-+ tempnam strsignal psignal setlocale mempcpy)
- ad_FUNC_SYSTEMPAPERNAME
- ad_FUNC_ATEXIT
- ad_FUNC_STRFTIME
Copied: a2ps/repos/extra-x86_64/a2ps-4.14-check-mempcpy.patch (from rev 191228, a2ps/trunk/a2ps-4.14-check-mempcpy.patch)
===================================================================
--- extra-x86_64/a2ps-4.14-check-mempcpy.patch (rev 0)
+++ extra-x86_64/a2ps-4.14-check-mempcpy.patch 2013-07-21 22:39:59 UTC (rev 191229)
@@ -0,0 +1,12 @@
+--- a2ps-4.14-orig/configure.in 2008-04-16 08:36:03.000000000 +0200
++++ a2ps-4.14/configure.in 2008-04-16 08:36:29.000000000 +0200
+@@ -137,7 +137,8 @@
+ ad_REPLACE_FUNC_STRCASECMP
+ ad_REPLACE_FUNC_STRNCASECMP
+ ad_REPLACE_FUNC_RENAME
+-AC_CHECK_FUNCS(uname strchr strerror strerror_r getcwd bcopy bzero tempnam strsignal psignal setlocale)
++AC_CHECK_FUNCS(uname strchr strerror strerror_r getcwd bcopy bzero \
++ tempnam strsignal psignal setlocale mempcpy)
+ ad_FUNC_SYSTEMPAPERNAME
+ ad_FUNC_ATEXIT
+ ad_FUNC_STRFTIME
Deleted: extra-x86_64/a2ps-4.14-fix-stpcpy-proto.patch
===================================================================
--- extra-x86_64/a2ps-4.14-fix-stpcpy-proto.patch 2013-07-21 22:38:57 UTC (rev 191228)
+++ extra-x86_64/a2ps-4.14-fix-stpcpy-proto.patch 2013-07-21 22:39:59 UTC (rev 191229)
@@ -1,17 +0,0 @@
-=== modified file 'lib/xstrrpl.c'
---- lib/xstrrpl.c 2008-04-14 18:04:50 +0000
-+++ lib/xstrrpl.c 2008-04-14 18:20:20 +0000
-@@ -20,12 +20,10 @@
-
- #include "system.h"
- #include <assert.h>
- #include "xstrrpl.h"
-
--extern char * stpcpy();
--
- /* Perform subsitutions in string. Result is malloc'd
- E.g., result = xstrrrpl ("1234", subst) gives result = "112333"
- where subst = { {"1", "11"}, {"3", "333"}, { "4", ""}}
- */
- char *
-
Copied: a2ps/repos/extra-x86_64/a2ps-4.14-fix-stpcpy-proto.patch (from rev 191228, a2ps/trunk/a2ps-4.14-fix-stpcpy-proto.patch)
===================================================================
--- extra-x86_64/a2ps-4.14-fix-stpcpy-proto.patch (rev 0)
+++ extra-x86_64/a2ps-4.14-fix-stpcpy-proto.patch 2013-07-21 22:39:59 UTC (rev 191229)
@@ -0,0 +1,17 @@
+=== modified file 'lib/xstrrpl.c'
+--- lib/xstrrpl.c 2008-04-14 18:04:50 +0000
++++ lib/xstrrpl.c 2008-04-14 18:20:20 +0000
+@@ -20,12 +20,10 @@
+
+ #include "system.h"
+ #include <assert.h>
+ #include "xstrrpl.h"
+
+-extern char * stpcpy();
+-
+ /* Perform subsitutions in string. Result is malloc'd
+ E.g., result = xstrrrpl ("1234", subst) gives result = "112333"
+ where subst = { {"1", "11"}, {"3", "333"}, { "4", ""}}
+ */
+ char *
+
Deleted: extra-x86_64/a2ps.install
===================================================================
--- extra-x86_64/a2ps.install 2013-07-21 22:38:57 UTC (rev 191228)
+++ extra-x86_64/a2ps.install 2013-07-21 22:39:59 UTC (rev 191229)
@@ -1,20 +0,0 @@
-infodir=/usr/share/info
-filelist=(a2ps.info.gz ogonkify.info.gz regex.info.gz)
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info $infodir/$file $infodir/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file $infodir/dir 2> /dev/null
- done
-}
Copied: a2ps/repos/extra-x86_64/a2ps.install (from rev 191228, a2ps/trunk/a2ps.install)
===================================================================
--- extra-x86_64/a2ps.install (rev 0)
+++ extra-x86_64/a2ps.install 2013-07-21 22:39:59 UTC (rev 191229)
@@ -0,0 +1,20 @@
+infodir=/usr/share/info
+filelist=(a2ps.info.gz ogonkify.info.gz regex.info.gz)
+
+post_install() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+ install-info $infodir/$file $infodir/dir 2> /dev/null
+ done
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+ install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+ done
+}
More information about the arch-commits
mailing list