From 56bd759df1d0c750a065b8c845e93d5dfa6b549d Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 8 Aug 2015 13:49:04 -0700 Subject: proj/gentoo: Initial commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson X-Thanks: Alec Warner - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring - wrote much python to improve cvs2svn X-Thanks: Rich Freeman - validation scripts X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed --- app-text/a2ps/Manifest | 2 + app-text/a2ps/a2ps-4.14-r3.ebuild | 134 +++++++++++++++++++++ app-text/a2ps/files/50a2ps-gentoo.el | 5 + app-text/a2ps/files/a2ps-4.13-manpage-chmod.patch | 12 ++ app-text/a2ps/files/a2ps-4.13-stdout.diff | 13 ++ app-text/a2ps/files/a2ps-4.13c-emacs.patch | 10 ++ .../files/a2ps-4.13c-fnmatch-replacement.patch | 43 +++++++ app-text/a2ps/files/a2ps-4.13c-locale-gentoo.diff | 25 ++++ app-text/a2ps/files/a2ps-4.13c-psset.patch | 11 ++ app-text/a2ps/files/a2ps-4.14-check-mempcpy.patch | 12 ++ app-text/a2ps/files/a2ps-4.14-cleanup.patch | 106 ++++++++++++++++ .../a2ps/files/a2ps-4.14-fix-stpcpy-proto.patch | 17 +++ app-text/a2ps/files/a2ps-4.14-ja-cleanup.patch | 122 +++++++++++++++++++ app-text/a2ps/files/a2ps-4.14-psset.patch | 21 ++++ app-text/a2ps/files/a2ps-4.14-ptrdiff_t.patch | 14 +++ app-text/a2ps/metadata.xml | 6 + 16 files changed, 553 insertions(+) create mode 100644 app-text/a2ps/Manifest create mode 100644 app-text/a2ps/a2ps-4.14-r3.ebuild create mode 100644 app-text/a2ps/files/50a2ps-gentoo.el create mode 100644 app-text/a2ps/files/a2ps-4.13-manpage-chmod.patch create mode 100644 app-text/a2ps/files/a2ps-4.13-stdout.diff create mode 100644 app-text/a2ps/files/a2ps-4.13c-emacs.patch create mode 100644 app-text/a2ps/files/a2ps-4.13c-fnmatch-replacement.patch create mode 100644 app-text/a2ps/files/a2ps-4.13c-locale-gentoo.diff create mode 100644 app-text/a2ps/files/a2ps-4.13c-psset.patch create mode 100644 app-text/a2ps/files/a2ps-4.14-check-mempcpy.patch create mode 100644 app-text/a2ps/files/a2ps-4.14-cleanup.patch create mode 100644 app-text/a2ps/files/a2ps-4.14-fix-stpcpy-proto.patch create mode 100644 app-text/a2ps/files/a2ps-4.14-ja-cleanup.patch create mode 100644 app-text/a2ps/files/a2ps-4.14-psset.patch create mode 100644 app-text/a2ps/files/a2ps-4.14-ptrdiff_t.patch create mode 100644 app-text/a2ps/metadata.xml (limited to 'app-text/a2ps') diff --git a/app-text/a2ps/Manifest b/app-text/a2ps/Manifest new file mode 100644 index 000000000000..89dfac04b50a --- /dev/null +++ b/app-text/a2ps/Manifest @@ -0,0 +1,2 @@ +DIST a2ps-4.14-ja_nls.patch.gz 27576 SHA256 90b2a4caf680f04ac8c325a4bc7434edf038ef7059003179b7fa65a5bafdecdc SHA512 f02f553dd9d9dbd9dfe41ebfe103493000aa4e9de5634c94e7453f73b66d88fea6b0010095913a4a99c7285990a1df1ebcc39da451b2b34f96b0c191112b125f WHIRLPOOL 38a532bc7f696cf3a1addc502b6ad2d26ed4222b770b0e9fc4633fc81cad911df7e64781516a84cdc589965d12d51142c0a06980be7211b0a6d9bf279a11d55e +DIST a2ps-4.14.tar.gz 2552507 SHA256 f3ae8d3d4564a41b6e2a21f237d2f2b104f48108591e8b83497500182a3ab3a4 SHA512 fd6ac8ab47d789114c283e8ca508f7f56feabd1a189f4ac772cad9e6be7e3791e210892cfffd04ad1d39efe4b15386b2e61bf4cd56b70ed581c0554f36bfe06f WHIRLPOOL f0e445b760e0fdee031c9b8204430880f8e46d0eee2b580bec0dca35564818b7a8925b5941346c008a5ef32dedc28768b43f0e58f3a0e71f289bf593e5325e8d diff --git a/app-text/a2ps/a2ps-4.14-r3.ebuild b/app-text/a2ps/a2ps-4.14-r3.ebuild new file mode 100644 index 000000000000..ce3185bbdf62 --- /dev/null +++ b/app-text/a2ps/a2ps-4.14-r3.ebuild @@ -0,0 +1,134 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=4 +inherit autotools elisp-common eutils flag-o-matic + +DESCRIPTION="Any to PostScript filter" +HOMEPAGE="http://www.inf.enst.fr/~demaille/a2ps/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.gz + linguas_ja? ( mirror://gentoo/${P}-ja_nls.patch.gz )" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +IUSE="emacs latex linguas_ja nls static-libs userland_BSD userland_GNU vanilla" + +RESTRICT=test + +RDEPEND="app-text/ghostscript-gpl + app-text/libpaper + >=app-text/psutils-1.17 + app-text/wdiff + emacs? ( virtual/emacs ) + latex? ( virtual/latex-base ) + nls? ( virtual/libintl ) + userland_GNU? ( >=sys-apps/coreutils-6.10-r1 ) + userland_BSD? ( sys-freebsd/freebsd-ubin )" +DEPEND="${RDEPEND} + >=dev-util/gperf-2.7.2 + virtual/yacc + nls? ( sys-devel/gettext )" + +SITEFILE=50${PN}-gentoo.el + +S=${WORKDIR}/${PN}-${PV:0:4} + +src_prepare() { + epatch "${FILESDIR}"/${PN}-4.13c-locale-gentoo.diff + # this will break + #epatch "${FILESDIR}/${PN}-4.13c-stdarg.patch" + use vanilla || epatch "${FILESDIR}"/${PN}-4.13-stdout.diff + if use linguas_ja; then + epatch "${DISTDIR}"/${P}-ja_nls.patch.gz + # bug #335803 + epatch "${FILESDIR}"/${P}-ja-cleanup.patch + else + epatch "${FILESDIR}"/${P}-cleanup.patch + fi + + # fix fnmatch replacement, bug #134546 + epatch "${FILESDIR}"/${PN}-4.13c-fnmatch-replacement.patch + + # bug #122026 + epatch "${FILESDIR}"/${P}-psset.patch + + # fix emacs printing, bug #114627 + epatch "${FILESDIR}"/a2ps-4.13c-emacs.patch + + # fix chmod error, #167670 + epatch "${FILESDIR}"/a2ps-4.13-manpage-chmod.patch + + # add configure check for mempcpy, bug 216588 + epatch "${FILESDIR}"/${P}-check-mempcpy.patch + + # fix compilation error due to invalid stpcpy() prototype, bug 216588 + epatch "${FILESDIR}"/${P}-fix-stpcpy-proto.patch + + # fix compilation error due to obstack.h issue, bug 269638 + epatch "${FILESDIR}"/${P}-ptrdiff_t.patch + + # fix building with sys-devel/automake >= 1.12, bug 420503 + rm -f {.,ogonkify}/aclocal.m4 + 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 || die + + eautoreconf +} + +src_configure() { + append-cppflags -DPROTOTYPES #420503 + + local myconf="COM_netscape=no COM_acroread=no" + + use emacs || myconf="${myconf} EMACS=no" + use latex || myconf="${myconf} COM_latex=no" + + export LANG=C LC_ALL=C + + econf \ + --enable-shared \ + $(use_enable static-libs static) \ + --sysconfdir="${EPREFIX}"/etc/a2ps \ + $(use_enable nls) \ + ${myconf} +} + +src_compile() { + # parallel make b0rked + emake -j1 +} + +src_install() { + emake \ + DESTDIR="${D}" \ + lispdir="${EPREFIX}${SITELISP}"/${PN} \ + install + + newdoc "${ED}"/usr/share/a2ps/README README.a2ps + newdoc "${ED}"/usr/share/a2ps/ppd/README README.a2ps.ppd + newdoc "${ED}"/usr/share/ogonkify/README README.ogonkify + + rm -f "${ED}"/usr/share/{a2ps,a2ps/ppd,ogonkify}/README + + prune_libtool_files + + if use emacs; then + elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die + fi + + dodoc ANNOUNCE AUTHORS ChangeLog FAQ NEWS README* THANKS TODO +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/app-text/a2ps/files/50a2ps-gentoo.el b/app-text/a2ps/files/50a2ps-gentoo.el new file mode 100644 index 000000000000..3e12daaf9a4b --- /dev/null +++ b/app-text/a2ps/files/50a2ps-gentoo.el @@ -0,0 +1,5 @@ +(add-to-list 'load-path "@SITELISP@") +(autoload 'a2ps-mode "a2ps" nil t) +(autoload 'a2ps-buffer "a2ps-print" nil t) +(autoload 'a2ps-region "a2ps-print" nil t) +(add-to-list 'auto-mode-alist '("\\.a2ps\\'" . a2ps-mode)) diff --git a/app-text/a2ps/files/a2ps-4.13-manpage-chmod.patch b/app-text/a2ps/files/a2ps-4.13-manpage-chmod.patch new file mode 100644 index 000000000000..e0c61124e9df --- /dev/null +++ b/app-text/a2ps/files/a2ps-4.13-manpage-chmod.patch @@ -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 \ diff --git a/app-text/a2ps/files/a2ps-4.13-stdout.diff b/app-text/a2ps/files/a2ps-4.13-stdout.diff new file mode 100644 index 000000000000..1e40e618fcbd --- /dev/null +++ b/app-text/a2ps/files/a2ps-4.13-stdout.diff @@ -0,0 +1,13 @@ +--- lib/printers.c.orig Tue Oct 12 00:01:59 1999 ++++ lib/printers.c Wed May 2 11:23:25 2001 +@@ -315,8 +315,8 @@ + res->ppd = NULL; /* Printer's ppd are not read yet */ + + /* Output */ +- /* Default is to send to default printer */ +- res->flag_output_is_printer = true; ++ /* Default is to send to stdout */ ++ res->flag_output_is_printer = false; + res->flag_output_name = NULL; + res->output_is_file = true; + res->output_name = NULL; diff --git a/app-text/a2ps/files/a2ps-4.13c-emacs.patch b/app-text/a2ps/files/a2ps-4.13c-emacs.patch new file mode 100644 index 000000000000..f1cd5d9ebdfc --- /dev/null +++ b/app-text/a2ps/files/a2ps-4.13c-emacs.patch @@ -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") + ) diff --git a/app-text/a2ps/files/a2ps-4.13c-fnmatch-replacement.patch b/app-text/a2ps/files/a2ps-4.13c-fnmatch-replacement.patch new file mode 100644 index 000000000000..c49ab78c93c0 --- /dev/null +++ b/app-text/a2ps/files/a2ps-4.13c-fnmatch-replacement.patch @@ -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 + #include + +- +-/* 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__. */ diff --git a/app-text/a2ps/files/a2ps-4.13c-locale-gentoo.diff b/app-text/a2ps/files/a2ps-4.13c-locale-gentoo.diff new file mode 100644 index 000000000000..0b59956ebc05 --- /dev/null +++ b/app-text/a2ps/files/a2ps-4.13c-locale-gentoo.diff @@ -0,0 +1,25 @@ +diff -urN a2ps-4.13.ORIG/config.h.in a2ps-4.13/config.h.in +--- a2ps-4.13.ORIG/config.h.in 2003-09-27 19:33:38.000000000 +0900 ++++ a2ps-4.13/config.h.in 2003-09-27 21:25:46.000000000 +0900 +@@ -181,6 +181,9 @@ + /* Define to 1 if you have the `rename' function. */ + #undef HAVE_RENAME + ++/* Define to 1 if you have the header file. */ ++#undef HAVE_LOCALE_H ++ + /* Define to 1 if you have the `setlocale' function. */ + #undef HAVE_SETLOCALE + +diff -urN a2ps-4.13.ORIG/configure.in a2ps-4.13/configure.in +--- a2ps-4.13.ORIG/configure.in 2003-09-27 19:33:38.000000000 +0900 ++++ a2ps-4.13/configure.in 2003-09-27 21:26:05.000000000 +0900 +@@ -71,7 +71,7 @@ + AC_HEADER_DIRENT + AC_CHECK_HEADERS(sys/time.h sys/stat.h sys/types.h sys/ioctl.h \ + math.h string.h strings.h stdlib.h unistd.h stdarg.h pwd.h malloc.h \ +- memory.h errno.h fcntl.h stdbool.h fnmatch.h) ++ memory.h errno.h fcntl.h stdbool.h fnmatch.h locale.h) + + ## --------------------- ## + ## Checks for typedefs. ## diff --git a/app-text/a2ps/files/a2ps-4.13c-psset.patch b/app-text/a2ps/files/a2ps-4.13c-psset.patch new file mode 100644 index 000000000000..f8fd4497f281 --- /dev/null +++ b/app-text/a2ps/files/a2ps-4.13c-psset.patch @@ -0,0 +1,11 @@ +--- a2ps-4.13/contrib/psset.in.orig 2006-03-16 12:30:48.000000000 +0100 ++++ a2ps-4.13/contrib/psset.in 2006-03-16 12:28:14.000000000 +0100 +@@ -241,7 +241,7 @@ + # spaces with a `\' too... + pspagedevicelen=`echo "$pspagedevice" | wc -l` + pspagedevice=`echo "$pspagedevice" | \ +- sed -e "$pspagedevicelen!s/\$/\\\\\\/;s/^/\\\\\\/"` ++ sed -e "$pspagedevicelen!s/\$/\\\\\\/;s/^ /\\\\\\/"` + + case $at in + 0) # Insert last in the Setup, so that we win over other requests. diff --git a/app-text/a2ps/files/a2ps-4.14-check-mempcpy.patch b/app-text/a2ps/files/a2ps-4.14-check-mempcpy.patch new file mode 100644 index 000000000000..7b820cead05f --- /dev/null +++ b/app-text/a2ps/files/a2ps-4.14-check-mempcpy.patch @@ -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 diff --git a/app-text/a2ps/files/a2ps-4.14-cleanup.patch b/app-text/a2ps/files/a2ps-4.14-cleanup.patch new file mode 100644 index 000000000000..25187f315384 --- /dev/null +++ b/app-text/a2ps/files/a2ps-4.14-cleanup.patch @@ -0,0 +1,106 @@ +fix missing prototype and printf warnings + +--- a/lib/argmatch.c ++++ b/lib/argmatch.c +@@ -21,6 +21,7 @@ + #include "argmatch.h" + + #include ++#include + #ifdef STDC_HEADERS + # include + #endif +--- a/lib/encoding.c ++++ b/lib/encoding.c +@@ -790,7 +790,7 @@ dump_encoding_setup (FILE * stream, + /* Create the dictionary and fill it */ + fprintf (stream, "%% Dictionary for %s support\n", + encoding->name); +- fprintf (stream, "/%sdict %d dict begin\n", encoding->key, nb); ++ fprintf (stream, "/%sdict %zu dict begin\n", encoding->key, nb); + for (i = 0 ; i < nb ; i++) + fprintf (stream, " /f%s %sEncoding /%s reencode_font\n", + font_names [i], +--- a/lib/output.c ++++ b/lib/output.c +@@ -84,7 +84,7 @@ new_derivation (enum derivation_type type) + static void + derivation_self_print (struct derivation * derivation, FILE * stream) + { +- fprintf (stream, "At %x: ", (int) derivation); ++ fprintf (stream, "At %p: ", derivation); + switch (derivation->type) + { + case nothing: +@@ -525,7 +525,7 @@ output_file (struct output * out, a2ps_job * job, + expand_user_string (job, FIRST_FILE (job), + (const uchar *) "Expand: requirement", + (const uchar *) token)); +- output (dest, expansion); ++ output (dest, "%s", expansion); + continue; + } + +--- a/lib/parseppd.y ++++ b/lib/parseppd.y +@@ -154,7 +154,7 @@ font_clause : + void + yyerror (const char *msg) + { +- error_at_line (1, 0, ppdfilename, ppdlineno, msg); ++ error_at_line (1, 0, ppdfilename, ppdlineno, "%s", msg); + } + + /* +--- a/lib/psgen.c ++++ b/lib/psgen.c +@@ -232,7 +232,7 @@ output_marker (a2ps_job * job, const char * kind, uchar * marker) + default: + *buf = '\0'; + ps_escape_char (job, cp[i], buf); +- output (jdiv, (char *) buf); ++ output (jdiv, "%s", buf); + break; + } + } +--- a/lib/quotearg.c ++++ b/lib/quotearg.c +@@ -60,6 +60,7 @@ + + #if HAVE_MBRTOWC && HAVE_WCHAR_H + # include ++# include + #else + # define iswprint(wc) 1 + # define mbrtowc(pwc, s, n, ps) 1 +--- a/lib/title.c ++++ b/lib/title.c +@@ -28,6 +28,7 @@ + #endif + + #include ++#include + + #if HAVE_VPRINTF || HAVE_DOPRNT || _LIBC + # if __STDC__ +--- a/src/long-options.c ++++ b/src/long-options.c +@@ -22,6 +22,7 @@ + #endif + + #include ++#include + #include + #include "closeout.h" + #include "long-options.h" +--- a/src/parsessh.y ++++ b/src/parsessh.y +@@ -740,7 +740,7 @@ exception_def_opt: + void + yyerror (const char *msg) + { +- error_at_line (1, 0, sshfilename, sshlineno, msg); ++ error_at_line (1, 0, sshfilename, sshlineno, "%s", msg); + } + + /* diff --git a/app-text/a2ps/files/a2ps-4.14-fix-stpcpy-proto.patch b/app-text/a2ps/files/a2ps-4.14-fix-stpcpy-proto.patch new file mode 100644 index 000000000000..7c3c69076ae9 --- /dev/null +++ b/app-text/a2ps/files/a2ps-4.14-fix-stpcpy-proto.patch @@ -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 + #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 * + diff --git a/app-text/a2ps/files/a2ps-4.14-ja-cleanup.patch b/app-text/a2ps/files/a2ps-4.14-ja-cleanup.patch new file mode 100644 index 000000000000..16271b3ec674 --- /dev/null +++ b/app-text/a2ps/files/a2ps-4.14-ja-cleanup.patch @@ -0,0 +1,122 @@ +diff --git lib/argmatch.c lib/argmatch.c +index f983e9d..eadc7ea 100644 +--- lib/argmatch.c ++++ lib/argmatch.c +@@ -21,6 +21,7 @@ + #include "argmatch.h" + + #include ++#include + #ifdef STDC_HEADERS + # include + #endif +diff --git lib/encoding.c lib/encoding.c +index 9bd9f2a..f554a6d 100644 +--- lib/encoding.c ++++ lib/encoding.c +@@ -989,7 +989,7 @@ dump_encoding_setup (FILE * stream, + /* Create the dictionary and fill it */ + fprintf (stream, "%% Dictionary for %s support\n", + encoding->name); +- fprintf (stream, "/%sdict %d dict begin\n", encoding->key, ++ fprintf (stream, "/%sdict %zu dict begin\n", encoding->key, + (encoding->composite_flag == true)? nb+nb+ns:nb+ns); + for (i = 0 ; i < nb ; i++) + fprintf (stream, " /f%s %sEncoding /%s reencode_font\n", +diff --git lib/output.c lib/output.c +index b5fc37d..5f67676 100644 +--- lib/output.c ++++ lib/output.c +@@ -84,7 +84,7 @@ new_derivation (enum derivation_type type) + static void + derivation_self_print (struct derivation * derivation, FILE * stream) + { +- fprintf (stream, "At %x: ", (int) derivation); ++ fprintf (stream, "At %p: ", derivation); + switch (derivation->type) + { + case nothing: +@@ -525,7 +525,7 @@ output_file (struct output * out, a2ps_job * job, + expand_user_string (job, FIRST_FILE (job), + (const uchar *) "Expand: requirement", + (const uchar *) token)); +- output (dest, expansion); ++ output (dest, "%s", expansion); + continue; + } + +diff --git lib/parseppd.y lib/parseppd.y +index a7558ba..c89d188 100644 +--- lib/parseppd.y ++++ lib/parseppd.y +@@ -154,7 +154,7 @@ font_clause : + void + yyerror (const char *msg) + { +- error_at_line (1, 0, ppdfilename, ppdlineno, msg); ++ error_at_line (1, 0, ppdfilename, ppdlineno, "%s", msg); + } + + /* +diff --git lib/psgen.c lib/psgen.c +index 9eeef74..9d7a27d 100644 +--- lib/psgen.c ++++ lib/psgen.c +@@ -232,7 +232,7 @@ output_marker (a2ps_job * job, const char * kind, uchar * marker) + default: + *buf = '\0'; + ps_escape_char (job, cp[i], buf); +- output (jdiv, (char *) buf); ++ output (jdiv, "%s", buf); + break; + } + } +diff --git lib/quotearg.c lib/quotearg.c +index 16d0b91..89db991 100644 +--- lib/quotearg.c ++++ lib/quotearg.c +@@ -60,6 +60,7 @@ + + #if HAVE_MBRTOWC && HAVE_WCHAR_H + # include ++# include + #else + # define iswprint(wc) 1 + # define mbrtowc(pwc, s, n, ps) 1 +diff --git lib/title.c lib/title.c +index cf4a34b..7a3e87b 100644 +--- lib/title.c ++++ lib/title.c +@@ -28,6 +28,7 @@ + #endif + + #include ++#include + + #if HAVE_VPRINTF || HAVE_DOPRNT || _LIBC + # if __STDC__ +diff --git src/long-options.c src/long-options.c +index fb40cd9..7bd77b0 100644 +--- src/long-options.c ++++ src/long-options.c +@@ -22,6 +22,7 @@ + #endif + + #include ++#include + #include + #include "closeout.h" + #include "long-options.h" +diff --git src/parsessh.y src/parsessh.y +index 21e9559..569fdb6 100644 +--- src/parsessh.y ++++ src/parsessh.y +@@ -740,7 +740,7 @@ exception_def_opt: + void + yyerror (const char *msg) + { +- error_at_line (1, 0, sshfilename, sshlineno, msg); ++ error_at_line (1, 0, sshfilename, sshlineno, "%s", msg); + } + + /* diff --git a/app-text/a2ps/files/a2ps-4.14-psset.patch b/app-text/a2ps/files/a2ps-4.14-psset.patch new file mode 100644 index 000000000000..291c3aac4fa4 --- /dev/null +++ b/app-text/a2ps/files/a2ps-4.14-psset.patch @@ -0,0 +1,21 @@ +diff -Naur a2ps-4.14.orig/contrib/psset.in a2ps-4.14/contrib/psset.in +--- a2ps-4.14.orig/contrib/psset.in 2007-12-29 12:29:01.000000000 +0900 ++++ a2ps-4.14/contrib/psset.in 2009-04-12 12:17:43.000000000 +0900 +@@ -219,7 +219,7 @@ + done + + pspagedevice="% Pagedevice definitions: +-countdictstack ++ countdictstack + % Push our own mark, since there can be several PS marks pushed depending + % where the failure really occured. + /psset_mark +@@ -227,7 +227,7 @@ + } stopped + % My cleartomark + { /psset_mark eq { exit } if } loop +-countdictstack exch sub dup 0 gt ++ countdictstack exch sub dup 0 gt + { + { end } repeat + }{ diff --git a/app-text/a2ps/files/a2ps-4.14-ptrdiff_t.patch b/app-text/a2ps/files/a2ps-4.14-ptrdiff_t.patch new file mode 100644 index 000000000000..00d955a819a9 --- /dev/null +++ b/app-text/a2ps/files/a2ps-4.14-ptrdiff_t.patch @@ -0,0 +1,14 @@ +diff -uNr a2ps-4.14/lib/obstack.h a2ps-4.14.test/lib/obstack.h +--- a2ps-4.14/lib/obstack.h 2007-12-29 09:37:59.000000000 +0800 ++++ a2ps-4.14.test/lib/obstack.h 2009-06-10 18:49:45.000000000 +0900 +@@ -138,9 +138,9 @@ + #define __need_ptrdiff_t + #endif + #endif ++#endif + + #include +-#endif + + #if defined (__STDC__) && __STDC__ + #define PTR_INT_TYPE ptrdiff_t diff --git a/app-text/a2ps/metadata.xml b/app-text/a2ps/metadata.xml new file mode 100644 index 000000000000..c050a28d58f9 --- /dev/null +++ b/app-text/a2ps/metadata.xml @@ -0,0 +1,6 @@ + + + +printing +cjk + -- cgit v1.2.3-65-gdbad