From a53026e4ca86134cec2d44c8fd67b030e227fd7a Mon Sep 17 00:00:00 2001 From: Juergen Daubert Date: Mon, 24 Nov 2008 12:28:15 +0100 Subject: [PATCH] a2ps: update to 4.14 --- a2ps/.footprint | 11 ++++ a2ps/.md5sum | 3 +- a2ps/Pkgfile | 20 +++---- a2ps/a2ps-4.13c.patch | 121 ------------------------------------------ 4 files changed, 22 insertions(+), 133 deletions(-) delete mode 100644 a2ps/a2ps-4.13c.patch diff --git a/a2ps/.footprint b/a2ps/.footprint index cec116471..14062a723 100644 --- a/a2ps/.footprint +++ b/a2ps/.footprint @@ -33,6 +33,10 @@ drwxr-xr-x root/root usr/share/a2ps/ drwxr-xr-x root/root usr/share/a2ps/afm/ -rw-r--r-- root/root usr/share/a2ps/afm/fonts.map -rwxr-xr-x root/root usr/share/a2ps/afm/make_fonts_map.sh +-rw-r--r-- root/root usr/share/a2ps/afm/pagb.afm +-rw-r--r-- root/root usr/share/a2ps/afm/pagbo.afm +-rw-r--r-- root/root usr/share/a2ps/afm/pagd.afm +-rw-r--r-- root/root usr/share/a2ps/afm/pagdo.afm -rw-r--r-- root/root usr/share/a2ps/afm/pbkd.afm -rw-r--r-- root/root usr/share/a2ps/afm/pbkdi.afm -rw-r--r-- root/root usr/share/a2ps/afm/pbkl.afm @@ -84,6 +88,7 @@ drwxr-xr-x root/root usr/share/a2ps/encoding/ -rw-r--r-- root/root usr/share/a2ps/encoding/koi8.edf -rw-r--r-- root/root usr/share/a2ps/encoding/mac.edf -rw-r--r-- root/root usr/share/a2ps/encoding/ms-cp1250.edf +-rw-r--r-- root/root usr/share/a2ps/encoding/ms-cp1251.edf drwxr-xr-x root/root usr/share/a2ps/fonts/ -rw-r--r-- root/root usr/share/a2ps/fonts/pcfont.pfa drwxr-xr-x root/root usr/share/a2ps/ppd/ @@ -97,6 +102,7 @@ drwxr-xr-x root/root usr/share/a2ps/ps/ -rw-r--r-- root/root usr/share/a2ps/ps/color.hdr -rw-r--r-- root/root usr/share/a2ps/ps/color.pro -rw-r--r-- root/root usr/share/a2ps/ps/diff.pro +-rw-r--r-- root/root usr/share/a2ps/ps/diffcolor.pro -rw-r--r-- root/root usr/share/a2ps/ps/ehandler.ps -rw-r--r-- root/root usr/share/a2ps/ps/fixed.pro -rw-r--r-- root/root usr/share/a2ps/ps/gray.pro @@ -167,6 +173,7 @@ drwxr-xr-x root/root usr/share/a2ps/sheets/ -rw-r--r-- root/root usr/share/a2ps/sheets/oracle.ssh -rw-r--r-- root/root usr/share/a2ps/sheets/pascal.ssh -rw-r--r-- root/root usr/share/a2ps/sheets/perl.ssh +-rw-r--r-- root/root usr/share/a2ps/sheets/php.ssh -rw-r--r-- root/root usr/share/a2ps/sheets/pic16f84.ssh -rw-r--r-- root/root usr/share/a2ps/sheets/plsql.ssh -rw-r--r-- root/root usr/share/a2ps/sheets/pov.ssh @@ -177,7 +184,10 @@ drwxr-xr-x root/root usr/share/a2ps/sheets/ -rw-r--r-- root/root usr/share/a2ps/sheets/promela.ssh -rw-r--r-- root/root usr/share/a2ps/sheets/ps.ssh -rw-r--r-- root/root usr/share/a2ps/sheets/python.ssh +-rw-r--r-- root/root usr/share/a2ps/sheets/rd.ssh -rw-r--r-- root/root usr/share/a2ps/sheets/rexx.ssh +-rw-r--r-- root/root usr/share/a2ps/sheets/ruby.ssh +-rw-r--r-- root/root usr/share/a2ps/sheets/s.ssh -rw-r--r-- root/root usr/share/a2ps/sheets/sather.ssh -rw-r--r-- root/root usr/share/a2ps/sheets/scheme.ssh -rw-r--r-- root/root usr/share/a2ps/sheets/sdl88.ssh @@ -191,6 +201,7 @@ drwxr-xr-x root/root usr/share/a2ps/sheets/ -rw-r--r-- root/root usr/share/a2ps/sheets/sql.ssh -rw-r--r-- root/root usr/share/a2ps/sheets/sql92.ssh -rw-r--r-- root/root usr/share/a2ps/sheets/ssh.ssh +-rw-r--r-- root/root usr/share/a2ps/sheets/st.ssh -rw-r--r-- root/root usr/share/a2ps/sheets/stratego.ssh -rw-r--r-- root/root usr/share/a2ps/sheets/symbols.ssh -rw-r--r-- root/root usr/share/a2ps/sheets/tcl.ssh diff --git a/a2ps/.md5sum b/a2ps/.md5sum index 424ed02ac..ea48145c9 100644 --- a/a2ps/.md5sum +++ b/a2ps/.md5sum @@ -1,2 +1 @@ -d0fafa1203756238648143e2b98d1c60 a2ps-4.13c.patch -97164e84ba911e4604155507e0893669 a2ps-4.13c.tar.gz +781ac3d9b213fa3e1ed0d79f986dc8c7 a2ps-4.14.tar.gz diff --git a/a2ps/Pkgfile b/a2ps/Pkgfile index dd0041e22..b93264e03 100644 --- a/a2ps/Pkgfile +++ b/a2ps/Pkgfile @@ -1,22 +1,22 @@ # Description: ASCII to Postscript converter (Prettyprint) -# URL: http://www.inf.enst.fr/~demaille/a2ps/ +# URL: http://www.gnu.org/software/a2ps/ # Maintainer: Juergen Daubert, juergen dot daubert at t-online dot de -# Depends on: psutils, perl +# Depends on: psutils gperf perl name=a2ps -version=4.13c -release=3 -source=(http://ftp.belnet.be/mirror/rsync.gentoo.org/gentoo/distfiles/$name-$version.tar.gz \ - $name-$version.patch) +version=4.14 +release=1 +source=(http://ftp.gnu.org/gnu/a2ps/$name-$version.tar.gz) build() { - cd $name-4.13 - patch -p1 -i $SRC/$name-$version.patch + cd $name-$version - ./configure --prefix=/usr + ./configure --prefix=/usr \ + --mandir=/usr/man \ + --disable-nls make make DESTDIR=$PKG install - rm -r $PKG/usr/{info,share/locale} + rm -r $PKG/usr/share/info find $PKG -type f -name README -delete } diff --git a/a2ps/a2ps-4.13c.patch b/a2ps/a2ps-4.13c.patch deleted file mode 100644 index 2633e9268..000000000 --- a/a2ps/a2ps-4.13c.patch +++ /dev/null @@ -1,121 +0,0 @@ -diff -Nru a2ps-4.13.orig/contrib/Makefile.in a2ps-4.13/contrib/Makefile.in ---- a2ps-4.13.orig/contrib/Makefile.in 2005-04-16 21:34:09.000000000 +0200 -+++ a2ps-4.13/contrib/Makefile.in 2005-04-16 21:36:27.000000000 +0200 -@@ -162,7 +162,7 @@ - install_sh = @install_sh@ - lispdir = @lispdir@ - --SUBDIRS = sample emacs -+SUBDIRS = sample - - bin_SCRIPTS = card fixps pdiff psmandup psset texi2dvi4a2ps - bin_PROGRAMS = fixnt -diff -Nru a2ps-4.13.orig/contrib/fixps.in a2ps-4.13/contrib/fixps.in ---- a2ps-4.13.orig/contrib/fixps.in 2005-04-16 21:34:09.000000000 +0200 -+++ a2ps-4.13/contrib/fixps.in 2005-04-16 21:34:54.000000000 +0200 -@@ -38,7 +38,7 @@ - run_gs=0 - # What action to perform: fixps, cat, check, and gs - task=fixps --tmpdir=/tmp/$program.$$ -+tmpdir=`mktemp -d -t fixps.XXXXXX` || { echo "$program: Cannot create temporary dir!" >&2 ; exit 1; } - verbose=echo - - # The version/usage strings -@@ -191,7 +191,6 @@ - trap "/bin/rm -rf $tmpdir" 0 1 2 3 13 15 - fi - --mkdir $tmpdir - fixps_sed=$tmpdir/fixps.sed - - # If printing from stdin, save into a tmp file -diff -Nru a2ps-4.13.orig/contrib/psmandup.in a2ps-4.13/contrib/psmandup.in ---- a2ps-4.13.orig/contrib/psmandup.in 2005-04-16 21:34:09.000000000 +0200 -+++ a2ps-4.13/contrib/psmandup.in 2005-04-16 21:35:05.000000000 +0200 -@@ -36,7 +36,7 @@ - message= - psselect=${PSSELECT:-psselect} - psset=${PSSET:-psset} --tmpdir=/tmp/$program.$$ -+tmpdir=`mktemp -d -t fixps.XXXXXX` || { echo "$program: Cannot create temporary dir!" >&2 ; exit 1; } - - # These two must be kept in synch. They are opposed. - verbose=echo -@@ -185,7 +185,6 @@ - trap "/bin/rm -rf $tmpdir" 0 1 2 3 13 15 - fi - --mkdir $tmpdir - - # If printing from stdin, save into a tmp file - if test $file = '-'; then -diff -Nru a2ps-4.13.orig/lib/path-concat.c a2ps-4.13/lib/path-concat.c ---- a2ps-4.13.orig/lib/path-concat.c 2005-04-16 21:34:09.000000000 +0200 -+++ a2ps-4.13/lib/path-concat.c 2005-04-16 21:36:01.000000000 +0200 -@@ -31,7 +31,6 @@ - #endif - #include - --char *malloc (); - - #ifndef DIRECTORY_SEPARATOR - # define DIRECTORY_SEPARATOR '/' -diff -Nru a2ps-4.13.orig/src/select.c a2ps-4.13/src/select.c ---- a2ps-4.13.orig/src/select.c 2005-04-16 21:34:09.000000000 +0200 -+++ a2ps-4.13/src/select.c 2005-04-16 21:35:11.000000000 +0200 -@@ -131,6 +131,36 @@ - return 1; - } - -+/* escapes the name of a file so that the shell groks it in 'single' q.marks. -+ The resulting pointer has to be free()ed when not longer used. */ -+char * -+shell_escape(const char *fn) -+{ -+ size_t len = 0; -+ const char *inp; -+ char *retval, *outp; -+ -+ for(inp = fn; *inp; ++inp) -+ switch(*inp) -+ { -+ case '\'': len += 4; break; -+ default: len += 1; break; -+ } -+ -+ outp = retval = malloc(len + 1); -+ if(!outp) -+ return NULL; /* perhaps one should do better error handling here */ -+ for(inp = fn; *inp; ++inp) -+ switch(*inp) -+ { -+ case '\'': *outp++ = '\''; *outp++ = '\\'; *outp++ = '\'', *outp++ = '\''; break; -+ default: *outp++ = *inp; break; -+ } -+ *outp = 0; -+ -+ return retval; -+} -+ - /* What says file about the type of a file (result is malloc'd). NULL - if could not be run. */ - -@@ -144,11 +174,15 @@ - if (IS_EMPTY (job->file_command)) - return NULL; - -+ filename = shell_escape(filename); -+ if(filename == NULL) -+ return NULL; - /* Call file(1) with the correct option */ -- command = ALLOCA (char, (2 -+ command = ALLOCA (char, (4 - + strlen (job->file_command) - + ustrlen (filename))); -- sprintf (command, "%s %s", job->file_command, (const char *) filename); -+ sprintf (command, "%s '%s'", job->file_command, (const char *) filename); -+ free(filename); - message (msg_tool, (stderr, "Reading pipe: `%s'\n", command)); - file_out = popen (command, "r"); -