Attachment 223169 Details for Bug 254202 – patch to update port

[patch] patch to update port

a2ps-4.14-rev0.diff (text/plain), 14.92 KB, created by Steve Wills on 2021-03-10 19:05:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Wills

Created: 2021-03-10 19:05:47 UTC

Size: 14.92 KB

patch

obsolete

>diff --git print/a2ps/Makefile print/a2ps/Makefile
>index ff9405716f5d..85fa869134d3 100644
>--- print/a2ps/Makefile
>+++ print/a2ps/Makefile
>@@ -2,10 +2,10 @@
> # $FreeBSD$
> 
> PORTNAME=	a2ps
>-PORTVERSION=	4.13b
>-PORTREVISION=	12
>+PORTVERSION=	4.14
> CATEGORIES=	print
>-MASTER_SITES=	GNU LOCAL/hrs/a2ps/:i18n
>+MASTER_SITES=	GNU \
>+		LOCAL/hrs/a2ps/:i18n
> 
> MAINTAINER=	dinoex@FreeBSD.org
> COMMENT=	Formats an ASCII file for printing on a postscript printer
>@@ -14,20 +14,21 @@ LICENSE=	GPLv2
> 
> LIB_DEPENDS=	libpaper.so:print/libpaper
> 
>+USES=		cpe gperf perl5
>+
> PORTSCOUT=	skipv:4.14
> 
>-USES=		perl5 cpe
> USE_CSTD=	gnu89
> GNU_CONFIGURE=	yes
>-USE_LDCONFIG=	yes
> INFO=		a2ps ogonkify regex
>-WRKSRC=		${WRKDIR}/${PORTNAME}-4.13
> I18N_PACKAGE=	i18n-fonts-0.1
> CPE_VENDOR=	gnu
> 
>-CONFIGURE_ARGS=	--with-medium=libpaper --sharedstatedir=${PREFIX}/share \
>-	--sysconfdir=${PREFIX}/etc --datadir=${PREFIX}/share \
>-	--localstatedir=${PREFIX}/share
>+CONFIGURE_ARGS=	--datadir=${PREFIX}/share \
>+		--localstatedir=${PREFIX}/share \
>+		--sharedstatedir=${PREFIX}/share \
>+		--sysconfdir=${PREFIX}/etc \
>+		--with-medium=libpaper
> LIBS+=		-L${LOCALBASE}/lib
> 
> PAPERSIZE?=
>@@ -35,11 +36,11 @@ PAPERSIZE?=
> RUN_DEPENDS+=	${LOCALBASE}/etc/papersize:print/papersize-default-a4
> .endif
> 
>-OPTIONS_DEFINE=NLS I18N EMACS
>-NO_OPTIONS_SORT=yes
>+OPTIONS_DEFINE=	EMACS I18N NLS
>+NO_OPTIONS_SORT=	yes
> OPTIONS_SUB=	yes
>-EMACS_DESC=Enable Emacs support
>-I18N_DESC=Enable I18N support
>+EMACS_DESC=	Enable Emacs support
>+I18N_DESC=	Enable I18N support
> 
> NLS_USES=		gettext
> NLS_CONFIGURE_ENABLE=	nls
>@@ -52,13 +53,9 @@ EMACS_CONFIGURE_ON=	--with-lispdir=${LOCALBASE}/${EMACS_SITE_LISPDIR}
> CONFIGURE_ENV+=	EMACS=no
> .endif
> 
>-post-patch:
>-	${REINPLACE_CMD} -e 's|^DESTDIR|#DESTDIR|' \
>-		`${FIND} ${WRKSRC} -name "Makefile.in"`
>-
> .if ${PORT_OPTIONS:MI18N}
>-#DISTFILES+=	${I18N_PACKAGE}${EXTRACT_SUFX}:i18n
>-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${I18N_PACKAGE}${EXTRACT_SUFX}:i18n
>+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
>+		${I18N_PACKAGE}${EXTRACT_SUFX}:i18n
> 
> pre-configure:
> 	cd ${WRKDIR}/${I18N_PACKAGE}/afm && \
>diff --git print/a2ps/distinfo print/a2ps/distinfo
>index f5a7b78eb097..f9f0636512a6 100644
>--- print/a2ps/distinfo
>+++ print/a2ps/distinfo
>@@ -1,4 +1,3 @@
>-SHA256 (a2ps-4.13b.tar.gz) = f4d2ac6f09f44eeb82621530b1970afe88fd97cfe82da43b61069800d0c06d12
>-SIZE (a2ps-4.13b.tar.gz) = 1944289
>-SHA256 (i18n-fonts-0.1.tar.gz) = 20628df682359044b8e5241c97a3c8da7a098aa260a7d281a87f67486a531786
>-SIZE (i18n-fonts-0.1.tar.gz) = 352530
>+TIMESTAMP = 1615391588
>+SHA256 (a2ps-4.14.tar.gz) = f3ae8d3d4564a41b6e2a21f237d2f2b104f48108591e8b83497500182a3ab3a4
>+SIZE (a2ps-4.14.tar.gz) = 2552507
>diff --git print/a2ps/files/patch-contrib-emacs-Makefile.in print/a2ps/files/patch-contrib-emacs-Makefile.in
>deleted file mode 100644
>index f623ca440ff2..000000000000
>--- print/a2ps/files/patch-contrib-emacs-Makefile.in
>+++ /dev/null
>@@ -1,24 +0,0 @@
>---- contrib/emacs/Makefile.in.orig	2000-02-24 18:01:08 UTC
>-+++ contrib/emacs/Makefile.in
>-@@ -159,8 +159,9 @@ Makefile: $(srcdir)/Makefile.in  $(top_b
>- 
>- install-dist_lispLISP: $(dist_lisp_LISP) $(ELCFILES)
>- 	@$(NORMAL_INSTALL)
>--	$(mkinstalldirs) $(DESTDIR)$(lispdir)
>--	@list='$(dist_lisp_LISP)'; for p in $$list; do \
>-+	if test $(EMACS) != no; then \
>-+	$(mkinstalldirs) $(DESTDIR)$(lispdir); \
>-+	list='$(dist_lisp_LISP)'; for p in $$list; do \
>- 	  if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
>- 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
>- 	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(lispdir)/$$f"; \
>-@@ -169,7 +170,8 @@ install-dist_lispLISP: $(dist_lisp_LISP)
>- 	    echo " $(INSTALL_DATA) $${p}c $(DESTDIR)$(lispdir)/$${f}c"; \
>- 	    $(INSTALL_DATA) $${p}c $(DESTDIR)$(lispdir)/$${f}c; \
>- 	  else : ; fi; \
>--	done
>-+	done; \
>-+	fi
>- 
>- uninstall-dist_lispLISP:
>- 	@$(NORMAL_UNINSTALL)
>diff --git print/a2ps/files/patch-contrib-tmpdircreation print/a2ps/files/patch-contrib-tmpdircreation
>deleted file mode 100644
>index 6c1e8059a985..000000000000
>--- print/a2ps/files/patch-contrib-tmpdircreation
>+++ /dev/null
>@@ -1,116 +0,0 @@
>-diff -ru contrib.orig/card.in contrib/card.in
>---- contrib.orig/card.in	2000-01-27 00:42:36 UTC
>-+++ contrib/card.in
>-@@ -38,7 +38,7 @@
>- LC_ALL="${LC_ALL-C}" export LC_ALL
>- print_form_feeds=:
>- RM="/bin/rm -rf"
>--tmp_dir=${TMPDIR-/tmp}/$program.$$
>-+tmp_dir=$(mktemp -d -t ${program}) || exit 1
>- tmp_file=$tmp_dir/card
>- success=false
>- verbose=:
>-@@ -190,7 +190,6 @@
>- 
>- # Create a tmp dir and be ready to clean up
>- trap "$RM $tmp_dir" 0 1 2 15
>--(umask 077 && mkdir $tmp_dir) || exit 1
>- 
>- case $LC_ALL in
>-   fr) footer="Engendré par $version_short" ;;
>-diff -ru contrib.orig/fixps.in contrib/fixps.in
>---- contrib.orig/fixps.in	2000-02-21 08:16:15 UTC
>-+++ contrib/fixps.in
>-@@ -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 ${program}) || 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 -ru contrib.orig/pdiff.in contrib/pdiff.in
>---- contrib.orig/pdiff.in	1999-10-24 15:07:51 UTC
>-+++ contrib/pdiff.in
>-@@ -34,7 +34,7 @@
>- diff_options='-u'
>- file=
>- output=
>--tmpdir=/tmp/$program.$$
>-+tmpdir=$(mktemp -d -t ${program}) || exit 1
>- verbose=echo
>- wdiff_prog=${WDIFF:-wdiff}
>- wdiff_options='-w[wd- -x-wd] -y{wd+ -z+wd}'
>-diff -ru contrib.orig/psmandup.in contrib/psmandup.in
>---- contrib.orig/psmandup.in	1999-10-24 13:06:42 UTC
>-+++ contrib/psmandup.in
>-@@ -36,7 +36,7 @@
>- message=
>- psselect=${PSSELECT:-psselect}
>- psset=${PSSET:-psset}
>--tmpdir=/tmp/$program.$$
>-+tmpdir=$(mktemp -d -t ${program}) || exit 1
>- 
>- # These two must be kept in synch.  They are opposed.
>- verbose=echo
>-@@ -184,8 +184,6 @@
>-   # Temp dir.  Get ready not to leave junk (if not debugging)
>-   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 -ru contrib.orig/psset.in contrib/psset.in
>---- contrib.orig/psset.in	1999-10-24 12:41:46 UTC
>-+++ contrib/psset.in
>-@@ -33,7 +33,7 @@
>- output=-
>- pagedevices=	# `;' separated list of `key:value'
>- quiet=:         # i.e., verbose
>--tmpdir=${TMPDIR:-/tmp}/$program.$$
>-+tmpdir=$(mktemp -d -t ${program}) || exit 1
>- sedscript=$tmpdir/psset.sed
>- 
>- # The version/usage strings
>-@@ -185,8 +185,6 @@
>-       echo "$help"  1>&2
>-       exit 1;;
>- esac
>--
>--mkdir $tmpdir
>- 
>- if test -n "$debug"; then
>-   # Set -x now if debugging
>-diff -ru contrib.orig/texi2dvi4a2ps contrib/texi2dvi4a2ps
>---- contrib.orig/texi2dvi4a2ps	2000-02-24 17:45:31 UTC
>-+++ contrib/texi2dvi4a2ps
>-@@ -91,7 +91,7 @@
>- quiet=          # by default let the tools' message be displayed
>- set_language=
>- textra=
>--tmpdir=${TMPDIR:-/tmp}/t2d$$  # avoid collisions on 8.3 filesystems.
>-+tmpdir=$(mktemp -d -t ${program}) || exit 1
>- txincludes=     # TEXINPUTS extensions
>- txiprereq=19990129 # minimum texinfo.tex version to have macro expansion
>- verbose=false   # echo for verbose mode
>-@@ -202,9 +202,6 @@
>- if test -z "$debug"; then
>-   trap "cd / && rm -rf $tmpdir" 0 1 2 15
>- fi
>--
>--# Create the temporary directory with strict rights
>--(umask 077 && mkdir $tmpdir) || exit 1
>- 
>- # Prepare the tools we might need.  This may be extra work in some
>- # cases, but improves the readibility of the script.
>diff --git print/a2ps/files/patch-etc-Makefile.in print/a2ps/files/patch-etc_Makefile.in
>similarity index 60%
>rename from print/a2ps/files/patch-etc-Makefile.in
>rename to print/a2ps/files/patch-etc_Makefile.in
>index 713480077c38..c5d69ca742f6 100644
>--- print/a2ps/files/patch-etc-Makefile.in
>+++ print/a2ps/files/patch-etc_Makefile.in
>@@ -1,11 +1,11 @@
>---- etc/Makefile.in.orig	2000-02-24 17:55:34 UTC
>+--- etc/Makefile.in.orig	2007-12-29 03:28:07 UTC
> +++ etc/Makefile.in
>-@@ -131,7 +131,7 @@ l = @l@
>- lispdir = @lispdir@
>- 
>- 
>+@@ -261,7 +261,7 @@ subdirs = @subdirs@
>+ sysconfdir = @sysconfdir@
>+ target_alias = @target_alias@
>+ tex = @tex@
> -ogonkifydir = $(datadir)/ogonkify
> +ogonkifydir = $(datadir)/a2ps/ogonkify
>  libpath = $(pkgdatadir)/sheets:$(pkgdatadir)/ps:$(pkgdatadir)/encoding:$(pkgdatadir)/afm:$(ogonkifydir)/afm:$(pkgdatadir)/ppd:$(pkgdatadir)/fonts:$(ogonkifydir)/fonts:$(pkgdatadir)
>- 
>  pkgdata_DATA = README
>+ dsysconf = $(DESTDIR)$(sysconfdir)
>diff --git print/a2ps/files/patch-localealias.c print/a2ps/files/patch-localealias.c
>deleted file mode 100644
>index f796d000f9ee..000000000000
>--- print/a2ps/files/patch-localealias.c
>+++ /dev/null
>@@ -1,20 +0,0 @@
>---- intl/localealias.c.orig	1999-08-31 17:29:35 UTC
>-+++ intl/localealias.c
>-@@ -329,6 +329,17 @@ read_alias_file (fname, fname_len)
>- 		      FREE_BLOCKS (block_list);
>- 		      return added;
>- 		    }
>-+		  if (string_space != new_pool)
>-+		    {
>-+		      size_t i;
>-+
>-+		      for (i = 0; i < nmap; i++)
>-+			{
>-+			  map[i].alias += new_pool - string_space;
>-+			  map[i].value += new_pool - string_space;
>-+			}
>-+		    }
>-+
>- 		  string_space = new_pool;
>- 		  string_space_max = new_size;
>- 		}
>diff --git print/a2ps/files/patch-ogonkify-Makefile.in print/a2ps/files/patch-ogonkify-Makefile.in
>index 62d65c40ee33..58fbde0badf3 100644
>--- print/a2ps/files/patch-ogonkify-Makefile.in
>+++ print/a2ps/files/patch-ogonkify-Makefile.in
>@@ -1,11 +1,11 @@
>---- ogonkify/Makefile.in.orig	2000-01-07 13:00:49 UTC
>+--- ogonkify/Makefile.in.orig	2007-12-29 03:27:58 UTC
> +++ ogonkify/Makefile.in
>-@@ -33,7 +33,7 @@ mandir = @mandir@
>- 
>- DESTDIR =
>- 
>+@@ -18,7 +18,7 @@
>+ srcdir = @srcdir@
>+ top_srcdir = @top_srcdir@
>+ VPATH = @srcdir@
> -pkgdatadir = $(datadir)/@PACKAGE@
> +pkgdatadir = $(datadir)/a2ps/@PACKAGE@
>  pkglibdir = $(libdir)/@PACKAGE@
>  pkgincludedir = $(includedir)/@PACKAGE@
>- 
>+ top_builddir = .
>diff --git print/a2ps/files/patch-printlen.c print/a2ps/files/patch-printlen.c
>deleted file mode 100644
>index 4afb7da9f1d5..000000000000
>--- print/a2ps/files/patch-printlen.c
>+++ /dev/null
>@@ -1,27 +0,0 @@
>---- lib/printlen.c.orig	1999-08-31 17:42:42 UTC
>-+++ lib/printlen.c
>-@@ -28,14 +28,11 @@ Foundation, Inc., 59 Temple Place - Suit
>- unsigned long strtoul ();
>- 
>- static int
>--int_printflen (const char *format, va_list *args)
>-+int_printflen (const char *format, va_list ap)
>- {
>-   const char *cp;
>-   int total_width = 0;
>-   int width = 0;
>--  va_list ap;
>--
>--  memcpy (&ap, args, sizeof (va_list));
>- 
>-   for (cp = format ; *cp ; cp++)
>-     {
>-@@ -99,7 +96,7 @@ int_printflen (const char *format, va_li
>- int
>- vprintflen (const char *format,  va_list args)
>- {
>--  return int_printflen (format, &args);
>-+  return int_printflen (format, args);
>- }
>- 
>- int
>diff --git print/a2ps/files/patch-select.c print/a2ps/files/patch-select.c
>deleted file mode 100644
>index 58fd686c38b8..000000000000
>--- print/a2ps/files/patch-select.c
>+++ /dev/null
>@@ -1,57 +0,0 @@
>---- src/select.c.orig	1999-12-16 01:04:56 UTC
>-+++ src/select.c
>-@@ -131,6 +131,36 @@ sheets_map_load_main (void)
>-   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 @@ file_verdict_on (const uchar *filename)
>-   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");
>- 
>diff --git print/a2ps/files/patch-title.c print/a2ps/files/patch-title.c
>deleted file mode 100644
>index 7f0a807aa26f..000000000000
>--- print/a2ps/files/patch-title.c
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- lib/title.c.orig	1999-08-28 16:54:19 UTC
>-+++ lib/title.c
>-@@ -88,6 +88,8 @@ title (stream, c, center_p, format, va_a
>-   if (center_p)
>-     for (padding = 0 ; padding < 79 - len ; padding += 2)
>-       putc (' ', stream);
>-+  va_end(args);
>-+  VA_START(args, format);
>- # if HAVE_VPRINTF || _LIBC
>-   vfprintf (stream, format, args);
>- # else
>diff --git print/a2ps/pkg-plist print/a2ps/pkg-plist
>index 99f55748268e..f0b4b57cc6bc 100644
>--- print/a2ps/pkg-plist
>+++ print/a2ps/pkg-plist
>@@ -23,6 +23,10 @@ man/man1/texi2dvi4a2ps.1.gz
> %%DATADIR%%/README
> %%DATADIR%%/afm/fonts.map
> %%DATADIR%%/afm/make_fonts_map.sh
>+%%DATADIR%%/afm/pagb.afm
>+%%DATADIR%%/afm/pagbo.afm
>+%%DATADIR%%/afm/pagd.afm
>+%%DATADIR%%/afm/pagdo.afm
> %%DATADIR%%/afm/pbkd.afm
> %%DATADIR%%/afm/pbkdi.afm
> %%DATADIR%%/afm/pbkl.afm
>@@ -83,6 +87,7 @@ man/man1/texi2dvi4a2ps.1.gz
> %%DATADIR%%/encoding/koi8.edf
> %%DATADIR%%/encoding/mac.edf
> %%DATADIR%%/encoding/ms-cp1250.edf
>+%%DATADIR%%/encoding/ms-cp1251.edf
> %%DATADIR%%/fonts/pcfont.pfa
> %%I18N%%%%DATADIR%%/fonts/colle10.pfb
> %%I18N%%%%DATADIR%%/fonts/colle8.pfb
>@@ -160,6 +165,7 @@ man/man1/texi2dvi4a2ps.1.gz
> %%DATADIR%%/ps/color.hdr
> %%DATADIR%%/ps/color.pro
> %%DATADIR%%/ps/diff.pro
>+%%DATADIR%%/ps/diffcolor.pro
> %%DATADIR%%/ps/ehandler.ps
> %%DATADIR%%/ps/fixed.pro
> %%DATADIR%%/ps/gray.pro
>@@ -180,6 +186,18 @@ man/man1/texi2dvi4a2ps.1.gz
> %%DATADIR%%/sheets/chlog.ssh
> %%DATADIR%%/sheets/cidl.ssh
> %%DATADIR%%/sheets/claire.ssh
>+%%DATADIR%%/sheets/csharp.ssh
>+%%DATADIR%%/sheets/matlab.ssh
>+%%DATADIR%%/sheets/nasm.ssh
>+%%DATADIR%%/sheets/php.ssh
>+%%DATADIR%%/sheets/pic16f84.ssh
>+%%DATADIR%%/sheets/rd.ssh
>+%%DATADIR%%/sheets/ruby.ssh
>+%%DATADIR%%/sheets/s.ssh
>+%%DATADIR%%/sheets/small.ssh
>+%%DATADIR%%/sheets/specc.ssh
>+%%DATADIR%%/sheets/st.ssh
>+%%DATADIR%%/sheets/stratego.ssh
> %%DATADIR%%/sheets/clisp.ssh
> %%DATADIR%%/sheets/coqv.ssh
> %%DATADIR%%/sheets/cpp.ssh
>@@ -268,11 +286,11 @@ man/man1/texi2dvi4a2ps.1.gz
> %%DATADIR%%/sheets/yacc.ssh
> %%DATADIR%%/sheets/zsh.ssh
> %%NLS%%share/locale/ca/LC_MESSAGES/a2ps.mo
>+%%NLS%%share/locale/ja/LC_MESSAGES/a2ps.mo
> %%NLS%%share/locale/cs/LC_MESSAGES/a2ps.mo
> %%NLS%%share/locale/da/LC_MESSAGES/a2ps.mo
> %%NLS%%share/locale/de/LC_MESSAGES/a2ps.mo
> %%NLS%%share/locale/es/LC_MESSAGES/a2ps.mo
>-%%NLS%%share/locale/et/LC_MESSAGES/a2ps.mo
> %%NLS%%share/locale/fr/LC_MESSAGES/a2ps.mo
> %%NLS%%share/locale/it/LC_MESSAGES/a2ps.mo
> %%NLS%%share/locale/ko/LC_MESSAGES/a2ps.mo

Flags:

swills: maintainer-approval? (dinoex)

Actions: View | Diff

Attachments on bug 254202: 223169