- update to a2ps-4.14

- tweak license marker (from kili@)
- sync COMMENT with reality
- this needs psutils for most features
- enable delegations without needing to build_depends on the
corresponding programs so that printing for most formats will just work,
granted necessary utilities are installed

"commit it" kili@
This commit is contained in:
ajacoutot 2008-11-23 20:28:32 +00:00
parent ec4d137d7a
commit ca71470303
8 changed files with 186 additions and 98 deletions

View File

@ -1,23 +1,21 @@
# $OpenBSD: Makefile,v 1.38 2007/09/15 21:36:44 merdely Exp $
# $OpenBSD: Makefile,v 1.39 2008/11/23 20:28:32 ajacoutot Exp $
COMMENT= format ascii files for printing on PostScript printers
COMMENT= format files for printing on PostScript printers
DISTNAME= a2ps-4.13b
PKGNAME= ${DISTNAME}p4
WRKDIST= ${WRKDIR}/a2ps-4.13
DISTNAME= a2ps-4.14
CATEGORIES= print
SHARED_LIBS= a2ps 2.0
MODGNU_SHARED_LIBS=a2ps ''
HOMEPAGE= http://www.gnu.org/software/a2ps/
# License info. There is some questionable Sun and
# Adobe Copyrighted things in this source tree. It
# looks fine for FTP, but likely not for the CDROM.
PERMIT_PACKAGE_CDROM= No fee redistribution.
PERMIT_DISTFILES_CDROM= No fee redistribution.
# GPLv3 or later, includes AFM files from Adobe with still unclear
# terms (see ${WRKSRC}/afm/MustRead.html).
PERMIT_PACKAGE_CDROM= without charge
PERMIT_DISTFILES_CDROM= without charge
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c m
MASTER_SITES= ${MASTER_SITE_GNU:=a2ps/}
@ -28,6 +26,9 @@ USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/auxdir
RUN_DEPENDS= ::print/psutils
BUILD_DEPENDS= ${RUN_DEPENDS}
FLAVORS= a4 a4dj letter letterdj
FLAVOR?= letter
@ -50,11 +51,15 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
ac_cv_prog_EMACS=no \
ac_cv_lib_paper_systempapername=no \
lispdir=${PREFIX}/share/a2ps/emacs
.for p in bzip2 gv ghostview dvips pdf2ps acroread convert tex latex ps2pdf \
psselect psnup bzip
.for p in bzip2 gv ghostview dvips pdf2ps acroread tex latex ps2pdf \
bzip distill netscape html2ps
CONFIGURE_ENV+= ac_cv_prog_COM_$p=no
.endfor
pre-configure:
${SUBST_CMD} ${WRKSRC}/configure
pre-build:
/usr/bin/touch $(WRKSRC)/doc/*.info
/usr/bin/touch $(WRKSRC)/doc/*.dvi

View File

@ -1,5 +1,5 @@
MD5 (a2ps-4.13b.tar.gz) = DI4MMbCMFPenGYzpZ+sygQ==
RMD160 (a2ps-4.13b.tar.gz) = r/xHp0h/JFkYS+C+duSbHhhfxT0=
SHA1 (a2ps-4.13b.tar.gz) = z8eaPlQRXlafZn+j/SwuwW0isxo=
SHA256 (a2ps-4.13b.tar.gz) = 9NKsbwn0TuuCYhUwsZcK/oj9l8/oLaQ7YQaYANDAbRI=
SIZE (a2ps-4.13b.tar.gz) = 1944289
MD5 (a2ps-4.14.tar.gz) = eBrD2bIT+j4e0NefmG3Ixw==
RMD160 (a2ps-4.14.tar.gz) = pRBdYlaoCUg+CZUZMll5qq/3IZ4=
SHA1 (a2ps-4.14.tar.gz) = Nlq7vktxKL9w2tFtBuI8VwGHSFI=
SHA256 (a2ps-4.14.tar.gz) = 866NPUVkpBtuKiHyN9LysQT0gQhZHouDSXUAGCo6s6Q=
SIZE (a2ps-4.14.tar.gz) = 2552507

View File

@ -1,66 +1,122 @@
$OpenBSD: patch-configure,v 1.2 2006/02/19 17:32:59 alek Exp $
--- configure.orig Wed Mar 8 18:43:57 2000
+++ configure Sun Feb 19 15:31:11 2006
@@ -892,7 +892,7 @@ if test -z "install_sh"; then
fi
$OpenBSD: patch-configure,v 1.3 2008/11/23 20:28:32 ajacoutot Exp $
--- configure.orig Sat Dec 29 04:28:03 2007
+++ configure Fri Nov 21 09:44:00 2008
@@ -2519,7 +2519,7 @@ ac_config_headers="$ac_config_headers config.h"
# Specify the liba2ps version number
-LIBVERSION=1:0:0
+LIBVERSION=2:0:0
GNU_PACKAGE="GNU $PACKAGE"
cat >>confdefs.h <<EOF
@@ -4937,7 +4937,7 @@ if test "${ac_cv_lib_intl_strftime+set}"
echo $ECHO_N "(cached) $ECHO_C" 1>&6
@@ -25706,7 +25706,7 @@ if test "${ac_cv_lib_intl_strftime+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_save_LIBS="$LIBS"
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lintl $LIBS"
+LIBS="-lintl -liconv $LIBS"
cat >conftest.$ac_ext <<EOF
#line 4943 "configure"
#include "confdefs.h"
@@ -4973,7 +4973,7 @@ if test $ac_cv_lib_intl_strftime = yes;
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -25766,7 +25766,7 @@ if test $ac_cv_lib_intl_strftime = yes; then
#define HAVE_STRFTIME 1
EOF
_ACEOF
-LIBS="-lintl $LIBS"
+LIBS="-lintl -liconv $LIBS"
fi
fi
@@ -7447,7 +7447,7 @@ if test "${ac_cv_lib_intl_bindtextdomain
echo $ECHO_N "(cached) $ECHO_C" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lintl $LIBS"
+LIBS="-lintl -liconv $LIBS"
cat >conftest.$ac_ext <<EOF
#line 7453 "configure"
#include "confdefs.h"
@@ -7485,7 +7485,7 @@ if test "${ac_cv_lib_intl_gettext+set}"
echo $ECHO_N "(cached) $ECHO_C" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lintl $LIBS"
+LIBS="-lintl -liconv $LIBS"
cat >conftest.$ac_ext <<EOF
#line 7491 "configure"
#include "confdefs.h"
@@ -7521,7 +7521,7 @@ if test $ac_cv_lib_intl_gettext = yes; t
#define HAVE_LIBINTL 1
EOF
@@ -30760,7 +30760,7 @@ echo $ECHO_N "checking for PostScript fonts path... $E
# Find out if ghostscript is installed
ac_psfont_path=
for ac_dir in /usr/local/ghostscript/fonts \
- /usr/local/share/ghostscript/fonts;
+ ${LOCALBASE}/share/ghostscript/fonts;
do
if test "cd $ac_dir 2>/dev/null && echo *.afm"; then
ac_psfont_path="$ac_psfont_path:$ac_dir";
@@ -30855,7 +30855,7 @@ echo "${ECHO_T}$ac_cv_prog_file_link_option" >&6; };
- LIBS="-lintl $LIBS"
+ LIBS="-lintl -liconv $LIBS"
fi
@@ -8531,7 +8531,7 @@ fi
esac
# How to send things in the printer queue
-for ac_prog in lp lpr
+for ac_prog in lpr
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -33785,10 +33785,10 @@ GMSGFMT!$GMSGFMT$ac_delim
XGETTEXT!$XGETTEXT$ac_delim
MSGMERGE!$MSGMERGE$ac_delim
USE_NLS!$USE_NLS$ac_delim
-LIBICONV!$LIBICONV$ac_delim
+LIBICONV!$LTLIBICONV$ac_delim
LTLIBICONV!$LTLIBICONV$ac_delim
-INTLLIBS!$INTLLIBS$ac_delim
-LIBINTL!$LIBINTL$ac_delim
+INTLLIBS!$LTLIBINTL$ac_delim
+LIBINTL!$LTLIBINTL$ac_delim
LTLIBINTL!$LTLIBINTL$ac_delim
POSUB!$POSUB$ac_delim
EXTRA_CFLAGS!$EXTRA_CFLAGS$ac_delim
@@ -33804,20 +33804,20 @@ LPR!$LPR$ac_delim
LPR_QUEUE_OPTION!$LPR_QUEUE_OPTION$ac_delim
MEDIUM!$MEDIUM$ac_delim
ENCODING!$ENCODING$ac_delim
-COM_gv!$COM_gv$ac_delim
+COM_gv!$ac_delim
gv!$gv$ac_delim
COM_ghostview!$COM_ghostview$ac_delim
ghostview!$ghostview$ac_delim
-COM_DISPLAY!$COM_DISPLAY$ac_delim
+COM_DISPLAY!$ac_delim
COM_gzip!$COM_gzip$ac_delim
gzip!$gzip$ac_delim
-COM_bzip!$COM_bzip$ac_delim
+COM_bzip!$ac_delim
bzip!$bzip$ac_delim
-COM_bzip2!$COM_bzip2$ac_delim
+COM_bzip2!$ac_delim
bzip2!$bzip2$ac_delim
-COM_dvips!$COM_dvips$ac_delim
+COM_dvips!$ac_delim
dvips!$dvips$ac_delim
-COM_convert!$COM_convert$ac_delim
+COM_convert!$ac_delim
convert!$convert$ac_delim
COM_netscape!$COM_netscape$ac_delim
netscape!$netscape$ac_delim
@@ -33825,14 +33825,14 @@ COM_html2ps!$COM_html2ps$ac_delim
html2ps!$html2ps$ac_delim
COM_acroread!$COM_acroread$ac_delim
acroread!$acroread$ac_delim
-COM_pdf2ps!$COM_pdf2ps$ac_delim
+COM_pdf2ps!$ac_delim
pdf2ps!$pdf2ps$ac_delim
COM_acroread4!$COM_acroread4$ac_delim
COM_distill!$COM_distill$ac_delim
distill!$distill$ac_delim
-COM_ps2pdf!$COM_ps2pdf$ac_delim
+COM_ps2pdf!$ac_delim
ps2pdf!$ps2pdf$ac_delim
-COM_PS2PDF!$COM_PS2PDF$ac_delim
+COM_PS2PDF!$ac_delim
COM_psselect!$COM_psselect$ac_delim
psselect!$psselect$ac_delim
COM_psnup!$COM_psnup$ac_delim
@@ -33842,12 +33842,12 @@ COM_grog!$COM_grog$ac_delim
grog!$grog$ac_delim
COM_makeinfo!$COM_makeinfo$ac_delim
makeinfo!$makeinfo$ac_delim
-COM_tex!$COM_tex$ac_delim
+COM_tex!$ac_delim
tex!$tex$ac_delim
COM_latex!$COM_latex$ac_delim
latex!$latex$ac_delim
COM_TEXI!$COM_TEXI$ac_delim
-COM_LATEX!$COM_LATEX$ac_delim
+COM_LATEX!$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
LTALLOCA!$LTALLOCA$ac_delim
subdirs!$subdirs$ac_delim

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-contrib_sample_Makefile_in,v 1.1 2005/02/11 19:45:04 alek Exp $
--- contrib/sample/Makefile.in.orig Tue Feb 8 23:27:19 2005
+++ contrib/sample/Makefile.in Tue Feb 8 23:27:28 2005
@@ -164,7 +164,7 @@ noinst_PROGRAMS = sample
$OpenBSD: patch-contrib_sample_Makefile_in,v 1.2 2008/11/23 20:28:32 ajacoutot Exp $
--- contrib/sample/Makefile.in.orig Wed Nov 19 19:28:30 2008
+++ contrib/sample/Makefile.in Wed Nov 19 19:29:01 2008
@@ -297,7 +297,7 @@ target_alias = @target_alias@
tex = @tex@
AUTOMAKE_OPTIONS = $(top_builddir)/lib/ansi2knr
sample_SOURCES = main.c
-INCLUDES = -I. -I.. -I$(top_builddir) -I$(top_srcdir)/intl -I$(top_srcdir)/lib
+INCLUDES = -I. -I.. -I$(top_builddir) -I$(top_srcdir)/lib
sample_LDADD = $(top_builddir)/lib/liba2ps.la @INTLLIBS@ -lm
DEFS = @DEFS@ -DLOCALEDIR=\"$(localedir)\"
subdir = contrib/sample
sample_LDADD = $(top_builddir)/lib/liba2ps.la @LIBINTL@ -lm
all: all-am

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-etc_Makefile_in,v 1.1 2008/11/23 20:28:32 ajacoutot Exp $
--- etc/Makefile.in.orig Wed Nov 19 19:29:08 2008
+++ etc/Makefile.in Wed Nov 19 19:29:47 2008
@@ -414,7 +414,7 @@ info: info-am
info-am:
-install-data-am: install-data-local install-pkgdataDATA
+install-data-am: install-pkgdataDATA
install-exec-am:

View File

@ -1,21 +1,21 @@
$OpenBSD: patch-lib_Makefile_in,v 1.1 2005/02/11 19:45:04 alek Exp $
--- lib/Makefile.in.orig Tue Feb 8 23:23:43 2005
+++ lib/Makefile.in Tue Feb 8 23:25:13 2005
@@ -140,7 +140,7 @@ AUTOMAKE_OPTIONS = $(top_builddir)/lib/a
$OpenBSD: patch-lib_Makefile_in,v 1.2 2008/11/23 20:28:32 ajacoutot Exp $
--- lib/Makefile.in.orig Wed Nov 19 19:29:56 2008
+++ lib/Makefile.in Wed Nov 19 19:30:28 2008
@@ -318,7 +318,7 @@ AUTOMAKE_OPTIONS = $(top_builddir)/lib/ansi2knr
# Definition of the local target
#
lib_LTLIBRARIES = liba2ps.la
-INCLUDES = -I$(top_builddir) -I$(top_builddir)/intl -I$(srcdir)
+INCLUDES = -I$(top_builddir) -I$(srcdir)
DEFS = @DEFS@ -DLOCALEDIR=\"$(datadir)/locale\" -DSYSCONFFILE=\"$(sysconfdir)/a2ps.cfg\"
# --debug, --defines, --verbose
YFLAGS = -dtv
@@ -370,7 +370,7 @@ distclean-kr:
maintainer-clean-kr:
liba2ps.la: $(liba2ps_la_OBJECTS) $(liba2ps_la_DEPENDENCIES)
# Use a struct, handle duplicates, produce ANSI-C
GPERFFLAGS = -t -D -L ANSI-C
BUILT_SOURCES = parseppd.c parseppd.h liba2ps.h confg.c
@@ -441,7 +441,7 @@ clean-libLTLIBRARIES:
rm -f "$${dir}/so_locations"; \
done
liba2ps.la: $(liba2ps_la_OBJECTS) $(liba2ps_la_DEPENDENCIES)
- $(LINK) -rpath $(libdir) $(liba2ps_la_LDFLAGS) $(liba2ps_la_OBJECTS) $(liba2ps_la_LIBADD) $(LIBS)
+ $(LINK) -rpath $(libdir) $(liba2ps_la_LDFLAGS) $(liba2ps_la_OBJECTS) $(liba2ps_la_LIBADD)
addext_.c: addext.c $(ANSI2KNR)
$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/addext.c; then echo $(srcdir)/addext.c; else echo addext.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > addext_.c
alloca_.c: alloca.c $(ANSI2KNR)
mostlyclean-compile:
-rm -f *.$(OBJEXT)

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-src_Makefile_in,v 1.1 2005/02/11 19:45:04 alek Exp $
--- src/Makefile.in.orig Tue Feb 8 23:25:34 2005
+++ src/Makefile.in Tue Feb 8 23:25:58 2005
@@ -158,7 +158,7 @@ LEX = @LEX@
$OpenBSD: patch-src_Makefile_in,v 1.2 2008/11/23 20:28:32 ajacoutot Exp $
--- src/Makefile.in.orig Wed Nov 19 19:30:38 2008
+++ src/Makefile.in Wed Nov 19 19:30:48 2008
@@ -304,7 +304,7 @@ BUILT_SOURCES = parsessh.c parsessh.h
# I don't really understand why I have to put srcdir here, but
# it is needed for yacc and lex files (seems related to #line, but
# I really don't understand why)...
-INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/intl
+INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/lib
a2ps_LDADD = $(top_builddir)/lib/liba2ps.la @INTLLIBS@ @LEXLIB@ -lm
a2ps_LDADD = $(top_builddir)/lib/liba2ps.la @LIBINTL@ -lm
EXTRA_DIST = $(BUILT_SOURCES)
all: $(BUILT_SOURCES)

View File

@ -1,8 +1,8 @@
@comment $OpenBSD: PLIST,v 1.16 2005/12/24 09:14:43 espie Exp $
bin/a2ps
@comment $OpenBSD: PLIST,v 1.17 2008/11/23 20:28:32 ajacoutot Exp $
@bin bin/a2ps
bin/card
bin/composeglyphs
bin/fixnt
@bin bin/fixnt
bin/fixps
bin/ogonkify
bin/pdiff
@ -28,6 +28,10 @@ share/a2ps/README
share/a2ps/afm/
share/a2ps/afm/fonts.map
share/a2ps/afm/make_fonts_map.sh
share/a2ps/afm/pagb.afm
share/a2ps/afm/pagbo.afm
share/a2ps/afm/pagd.afm
share/a2ps/afm/pagdo.afm
share/a2ps/afm/pbkd.afm
share/a2ps/afm/pbkdi.afm
share/a2ps/afm/pbkl.afm
@ -60,9 +64,6 @@ share/a2ps/afm/ptmi.afm
share/a2ps/afm/ptmr.afm
share/a2ps/afm/pzcmi.afm
share/a2ps/afm/pzdr.afm
share/a2ps/emacs/
share/a2ps/emacs/a2ps-print.el
share/a2ps/emacs/a2ps.el
share/a2ps/encoding/
share/a2ps/encoding/ascii.edf
share/a2ps/encoding/encoding.map
@ -82,6 +83,7 @@ share/a2ps/encoding/iso9.edf
share/a2ps/encoding/koi8.edf
share/a2ps/encoding/mac.edf
share/a2ps/encoding/ms-cp1250.edf
share/a2ps/encoding/ms-cp1251.edf
share/a2ps/etc/
share/a2ps/etc/a2ps-site.cfg
@sample ${SYSCONFDIR}/a2ps-site.cfg
@ -101,6 +103,7 @@ share/a2ps/ps/bw.pro
share/a2ps/ps/color.hdr
share/a2ps/ps/color.pro
share/a2ps/ps/diff.pro
share/a2ps/ps/diffcolor.pro
share/a2ps/ps/ehandler.ps
share/a2ps/ps/fixed.pro
share/a2ps/ps/gray.pro
@ -126,6 +129,7 @@ share/a2ps/sheets/clisp.ssh
share/a2ps/sheets/coqv.ssh
share/a2ps/sheets/cpp.ssh
share/a2ps/sheets/csh.ssh
share/a2ps/sheets/csharp.ssh
share/a2ps/sheets/cxx.ssh
share/a2ps/sheets/dc_shell.ssh
share/a2ps/sheets/eiffel.ssh
@ -155,11 +159,13 @@ share/a2ps/sheets/lout.ssh
share/a2ps/sheets/mail.ssh
share/a2ps/sheets/make.ssh
share/a2ps/sheets/maple.ssh
share/a2ps/sheets/matlab.ssh
share/a2ps/sheets/matlab4.ssh
share/a2ps/sheets/mib.ssh
share/a2ps/sheets/mly.ssh
share/a2ps/sheets/modula2.ssh
share/a2ps/sheets/modula3.ssh
share/a2ps/sheets/nasm.ssh
share/a2ps/sheets/o2c.ssh
share/a2ps/sheets/oberon.ssh
share/a2ps/sheets/objc.ssh
@ -168,6 +174,8 @@ share/a2ps/sheets/octave.ssh
share/a2ps/sheets/oracle.ssh
share/a2ps/sheets/pascal.ssh
share/a2ps/sheets/perl.ssh
share/a2ps/sheets/php.ssh
share/a2ps/sheets/pic16f84.ssh
share/a2ps/sheets/plsql.ssh
share/a2ps/sheets/pov.ssh
share/a2ps/sheets/ppd.ssh
@ -177,7 +185,10 @@ share/a2ps/sheets/prolog.ssh
share/a2ps/sheets/promela.ssh
share/a2ps/sheets/ps.ssh
share/a2ps/sheets/python.ssh
share/a2ps/sheets/rd.ssh
share/a2ps/sheets/rexx.ssh
share/a2ps/sheets/ruby.ssh
share/a2ps/sheets/s.ssh
share/a2ps/sheets/sather.ssh
share/a2ps/sheets/scheme.ssh
share/a2ps/sheets/sdl88.ssh
@ -185,10 +196,14 @@ share/a2ps/sheets/sed.ssh
share/a2ps/sheets/sh.ssh
share/a2ps/sheets/sheets.map
share/a2ps/sheets/shell.ssh
share/a2ps/sheets/small.ssh
share/a2ps/sheets/sml.ssh
share/a2ps/sheets/specc.ssh
share/a2ps/sheets/sql.ssh
share/a2ps/sheets/sql92.ssh
share/a2ps/sheets/ssh.ssh
share/a2ps/sheets/st.ssh
share/a2ps/sheets/stratego.ssh
share/a2ps/sheets/symbols.ssh
share/a2ps/sheets/tcl.ssh
share/a2ps/sheets/tclx.ssh
@ -214,9 +229,9 @@ share/locale/cs/LC_MESSAGES/a2ps.mo
share/locale/da/LC_MESSAGES/a2ps.mo
share/locale/de/LC_MESSAGES/a2ps.mo
share/locale/es/LC_MESSAGES/a2ps.mo
share/locale/et/LC_MESSAGES/a2ps.mo
share/locale/fr/LC_MESSAGES/a2ps.mo
share/locale/it/LC_MESSAGES/a2ps.mo
share/locale/ja/LC_MESSAGES/a2ps.mo
share/locale/ko/LC_MESSAGES/a2ps.mo
share/locale/nl/LC_MESSAGES/a2ps.mo
share/locale/no/LC_MESSAGES/a2ps.mo