svn commit: r316401 - in head: . print print/apsfilter print/lpr-wrapper print/muttprint print/psutils print/psutils-a4 print/psutils-letter print/psutils/files print/psutils/scripts sysutils/lire ...
Hiroki Sato
hrs at FreeBSD.org
Wed Apr 24 04:13:13 UTC 2013
Author: hrs
Date: Wed Apr 24 04:13:09 2013
New Revision: 316401
URL: http://svnweb.freebsd.org/changeset/ports/316401
Log:
Merge print/psutils-a4 and print/psutils-letter into a single port
print/psutils. The default paper size in the programs can be set via
libpaper ($PAPERSIZE or etc/papersize configuration file).
Added:
head/print/psutils/
- copied from r316307, head/print/psutils-letter/
head/print/psutils/files/patch-Makefile.unix (contents, props changed)
head/print/psutils/files/patch-getafm.sh (contents, props changed)
head/print/psutils/files/patch-psutil.c (contents, props changed)
Deleted:
head/print/psutils-a4/
head/print/psutils-letter/
head/print/psutils/files/patch-aa
head/print/psutils/scripts/
Modified:
head/MOVED
head/UPDATING
head/print/Makefile
head/print/apsfilter/Makefile
head/print/lpr-wrapper/Makefile
head/print/muttprint/Makefile
head/print/psutils/Makefile
head/print/psutils/files/patch-epsffit.c
head/print/psutils/files/patch-psnup.c
head/print/psutils/files/patch-psresize.c
head/print/psutils/files/patch-pstops.c
head/sysutils/lire/Makefile
head/textproc/groff/Makefile
Modified: head/MOVED
==============================================================================
--- head/MOVED Wed Apr 24 02:42:20 2013 (r316400)
+++ head/MOVED Wed Apr 24 04:13:09 2013 (r316401)
@@ -4218,3 +4218,5 @@ dns/bind97-sdb||2013-04-20|Has expired:
dns/bind-tools||2013-04-20|Has expired: No longer supported by ISC, use Bind 9.8 or 9.9
lang/tcl83||2013-04-23|Has expired: No longer supported
x11-toolkits/tk83||2013-04-23|Has expired: No longer supported
+print/psutils-a4|print/psutils|2013-04-24|Merged into print/psutils
+print/psutils-letter|print/psutils|2013-04-24|Merged into print/psutils
Modified: head/UPDATING
==============================================================================
--- head/UPDATING Wed Apr 24 02:42:20 2013 (r316400)
+++ head/UPDATING Wed Apr 24 04:13:09 2013 (r316401)
@@ -5,6 +5,19 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20130424:
+ AFFECTS: users of print/psutils-a4 or print/psutils-letter
+ AUTHOR: hrs at FreeBSD.org
+
+ print/psutils-a4 and print/psutils-letter have been merged into a single port
+ print/psutils. The default paper size in psnup(1), psresize(1), and
+ pstops(1) is now selected via an environment variable and/or a configuration
+ file of libpaper(3). For more detail, see papersize(5) and paperconfig(8)
+ manual page. If you prefer A4 or letter size by default as the old
+ version did, please install print/papersize-default-a4 or
+ print/papersize-default-letter, which installs a papersize configuration
+ file without manual configuration.
+
20130423:
AFFECTS: users of mail/postfix
AUTHOR: sahil at FreeBSD.org
Modified: head/print/Makefile
==============================================================================
--- head/print/Makefile Wed Apr 24 02:42:20 2013 (r316400)
+++ head/print/Makefile Wed Apr 24 04:13:09 2013 (r316401)
@@ -243,8 +243,7 @@
SUBDIR += psdim
SUBDIR += pslib
SUBDIR += pstotext
- SUBDIR += psutils-a4
- SUBDIR += psutils-letter
+ SUBDIR += psutils
SUBDIR += pup
SUBDIR += py-cups
SUBDIR += py-fonttools
Modified: head/print/apsfilter/Makefile
==============================================================================
--- head/print/apsfilter/Makefile Wed Apr 24 02:42:20 2013 (r316400)
+++ head/print/apsfilter/Makefile Wed Apr 24 04:13:09 2013 (r316401)
@@ -1,13 +1,9 @@
-# New ports collection makefile for: apsfilter
-# Date created: Tue Nov 14 18:29:48 MET 1995
-# Whom: Andreas Klemm <andreas at klemm.gtn.com>
-#
+# Created by: Andreas Klemm <andreas at klemm.gtn.com>
# $FreeBSD$
-#
PORTNAME= apsfilter
PORTVERSION= 7.2.8
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= print
MASTER_SITES= http://www.apsfilter.org/download/
@@ -81,7 +77,7 @@ RUN_DEPENDS+= zoo:${PORTSDIR}/archivers/
# all needed "xxx to ps" filter utilities
RUN_DEPENDS+= fitstopnm:${PORTSDIR}/graphics/netpbm
RUN_DEPENDS+= htmldoc:${PORTSDIR}/textproc/htmldoc
-RUN_DEPENDS+= psnup:${PORTSDIR}/print/psutils-${PAPERSIZE}
+RUN_DEPENDS+= psnup:${PORTSDIR}/print/psutils
.if !defined(WITHOUT_X11)
# "xxx to ps" filter utilities that require X
RUN_DEPENDS+= convert:${PORTSDIR}/graphics/ImageMagick
@@ -109,7 +105,7 @@ RUN_DEPENDS+= smbclient:${PORTSDIR}/${SA
#
# most important "xxx to ps" filter utilities
RUN_DEPENDS+= a2ps:${PORTSDIR}/print/a2ps-${PAPERSIZE}
-RUN_DEPENDS+= psnup:${PORTSDIR}/print/psutils-${PAPERSIZE}
+RUN_DEPENDS+= psnup:${PORTSDIR}/print/psutils
.endif
# needed for aps2file
Modified: head/print/lpr-wrapper/Makefile
==============================================================================
--- head/print/lpr-wrapper/Makefile Wed Apr 24 02:42:20 2013 (r316400)
+++ head/print/lpr-wrapper/Makefile Wed Apr 24 04:13:09 2013 (r316401)
@@ -7,7 +7,7 @@
PORTNAME= lpr-wrapper
PORTVERSION= 0.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= print
MASTER_SITES= http://www.mathstat.dal.ca/~selinger/lpr-wrapper/download/
@@ -23,11 +23,7 @@ RUN_DEPENDS+= bash:${PORTSDIR}/shells/ba
RUN_DEPENDS+= ppdfilt:${PORTSDIR}/print/libppd
RUN_DEPENDS+= psdim:${PORTSDIR}/print/psdim
RUN_DEPENDS+= mpage:${PORTSDIR}/print/mpage
-.if defined(A4)
-RUN_DEPENDS+= pstops:${PORTSDIR}/print/psutils-a4
-.else
-RUN_DEPENDS+= pstops:${PORTSDIR}/print/psutils-letter
-.endif
+RUN_DEPENDS+= pstops:${PORTSDIR}/print/psutils
PLIST_FILES= bin/lpr-wrapper bin/lpr-wrapper-cups bin/lpr-wrapper-features
Modified: head/print/muttprint/Makefile
==============================================================================
--- head/print/muttprint/Makefile Wed Apr 24 02:42:20 2013 (r316400)
+++ head/print/muttprint/Makefile Wed Apr 24 04:13:09 2013 (r316401)
@@ -1,13 +1,9 @@
-# New ports collection makefile for: muttprint
-# Date created: 11 november 2001
-# Whom: Oliver Braun <obraun at informatik.unibw-muenchen.de>
-#
+# Created by: Oliver Braun <obraun at informatik.unibw-muenchen.de>
# $FreeBSD$
-#
PORTNAME?= muttprint
PORTVERSION= 0.72d
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES?= print mail
MASTER_SITES= SF/muttprint/muttprint/muttprint-${PORTVERSION}
@@ -21,7 +17,7 @@ PAPERSIZE= letter
.endif
RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX \
- psnup:${PORTSDIR}/print/psutils-${PAPERSIZE} \
+ psnup:${PORTSDIR}/print/psutils \
uncompface:${PORTSDIR}/mail/faces \
convert:${PORTSDIR}/graphics/ImageMagick \
p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
Modified: head/print/psutils/Makefile
==============================================================================
--- head/print/psutils-letter/Makefile Tue Apr 23 05:11:57 2013 (r316307)
+++ head/print/psutils/Makefile Wed Apr 24 04:13:09 2013 (r316401)
@@ -1,61 +1,30 @@
-# New ports collection makefile for: psutils (letter)
-# Date created: 21 September 1994
-# Whom: jmz & David O'Brien (obrien at cs.ucdavis.edu)
-#
+# Created by: Jean-Marc Zucconi <jmz at FreeBSD.org> and David O'Brien <obrien at FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= psutils
PORTVERSION= 1.17
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= print
MASTER_SITES= ftp://ftp.dcs.ed.ac.uk/pub/ajcd/ \
ftp://ftp.knackered.org/pub/psutils/ \
${MASTER_SITE_TEX_CTAN}
MASTER_SITE_SUBDIR= support/psutils
-PKGNAMESUFFIX= -${PAPERSIZE}
DISTNAME= psutils-p17
MAINTAINER= hrs at FreeBSD.org
COMMENT= Utilities for manipulating PostScript documents
+LIB_DEPENDS= paper:${PORTSDIR}/print/libpaper
+
USE_PERL5_BUILD=yes
WRKSRC= ${WRKDIR}/${PORTNAME}
+MAKEFILE= Makefile.unix
+MAKE_ENV+= DATADIR="${DATADIR}" PERL="${PERL5}" CHMOD="${CHMOD}"
MAN1= psbook.1 psselect.1 pstops.1 epsffit.1 psnup.1 psresize.1 \
getafm.1 fixdlsrps.1 fixfmps.1 fixmacps.1 fixpsditps.1 \
fixpspps.1 fixtpps.1 fixwfwps.1 fixwpps.1 fixwwps.1 \
extractres.1 includeres.1 fixscribeps.1 psmerge.1
SCRIPTS_ENV+= PERL5=${PERL5} CC=${CC} DATADIR=${DATADIR} \
- MANPREFIX=${MANPREFIX} PAPER=${PAPERSIZE}
-CONFLICTS?= psutils-a4-[0-9]*
-
-.if !defined(PAPERSIZE)
-PAPERSIZE=letter
-PAPERSIZE_UNSPECIFIED= yes
-.else
-.if ${PAPERSIZE} != A3 && ${PAPERSIZE} != a3 && ${PAPERSIZE} != A4 \
- && ${PAPERSIZE} != a4 && ${PAPERSIZE} != A5 && ${PAPERSIZE} != a5 \
- && ${PAPERSIZE} != B4 && ${PAPERSIZE} != b4 \
- && ${PAPERSIZE} != B5 && ${PAPERSIZE} != b5 \
- && ${PAPERSIZE} != letter && ${PAPERSIZE} != legal \
- && ${PAPERSIZE} != ledger && ${PAPERSIZE} != tabloid \
- && ${PAPERSIZE} != statement && ${PAPERSIZE} != executive \
- && ${PAPERSIZE} != folio && ${PAPERSIZE} != quarto && ${PAPERSIZE} != 10x14
-.BEGIN:
- @${ECHO} "Error: invalid value for PAPERSIZE: \"${PAPERSIZE}\""
- @${ECHO} "Possible values are: A3, A4 (default), A5, B4, B5, letter, legal,"
- @${ECHO} " ledger, tabloid, statement, executive, folio, quarto, and 10x14."
- @${FALSE}
-.endif
-.endif
-
-pre-fetch:
-.if defined(PAPERSIZE_UNSPECIFIED)
- @${ECHO_MSG} "Defaulting to ${PAPERSIZE} sized paper."
- @${ECHO_MSG} ""
- @${ECHO_MSG} "Set the environment variable PAPERSIZE if you want to use other sizes."
- @${ECHO_MSG} "Possible values are: A3, A4, A5, B4, B5, letter, legal,"
- @${ECHO_MSG} " ledger, tabloid, statement, executive, folio, quarto, and 10x14."
-.endif
+ MANPREFIX=${MANPREFIX} PAPER=dummy
.include <bsd.port.mk>
Added: head/print/psutils/files/patch-Makefile.unix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/print/psutils/files/patch-Makefile.unix Wed Apr 24 04:13:09 2013 (r316401)
@@ -0,0 +1,103 @@
+--- Makefile.unix.orig 1997-03-12 07:52:59.000000000 +0900
++++ Makefile.unix 2013-04-23 16:36:38.000000000 +0900
+@@ -25,21 +25,22 @@
+
+ OS = UNIX
+
+-BINDIR = /usr/local/bin
++BINDIR ?= $(PREFIX)/bin
+ SCRIPTDIR = $(BINDIR)
+-INCLUDEDIR = /usr/local/share/psutils
+-PERL = /usr/local/bin/perl
++INCLUDEDIR ?= $(DATADIR)
++PERL ?= $(PERL5)
+
+-BINMODE = 0755
+-MANMODE = 0644
+-CHMOD = chmod
++BINMODE ?= 0755
++MANMODE ?= 0644
++CHMOD ?= chmod
+ INSTALL = install -c -m $(BINMODE)
+ INSTALLMAN = install -c -m $(MANMODE)
+ MANEXT = 1
+-MANDIR = /usr/local/share/man/man$(MANEXT)
++MANDIR ?= $(MANPREFIX)/man/man$(MANEXT)
+
+-CC = gcc
+-CFLAGS = -DPAPER=\"$(PAPER)\" -DUNIX -O -Wall
++CC ?= gcc
++CFLAGS += -DLIBPAPER -DPAPER=\"$(PAPER)\" -I${LOCALBASE}/include -DUNIX -Wall
++LDFLAGS+= -L${LOCALBASE}/lib -lm -lpaper
+
+ BIN = psbook psselect pstops epsffit psnup \
+ psresize
+@@ -65,30 +66,30 @@
+ epsffit.o: epsffit.c pserror.h patchlev.h
+
+ epsffit: epsffit.o pserror.o
+- $(CC) $(CCFLAGS) -o epsffit pserror.o epsffit.o
++ $(CC) $(LDFLAGS) -o epsffit pserror.o epsffit.o
+
+ psnup: psnup.o psutil.o psspec.o pserror.o
+- $(CC) $(CCFLAGS) -o psnup psutil.o psspec.o pserror.o psnup.o
++ $(CC) $(LDFLAGS) -o psnup psutil.o psspec.o pserror.o psnup.o
+
+ psnup.o: psutil.h patchlev.h psspec.h pserror.h psnup.c
+
+ psresize: psresize.o psutil.o pserror.o psspec.o
+- $(CC) $(CCFLAGS) -o psresize psutil.o psspec.o pserror.o psresize.o
++ $(CC) $(LDFLAGS) -o psresize psutil.o psspec.o pserror.o psresize.o
+
+ psresize.o: psutil.h patchlev.h psspec.h pserror.h psresize.c
+
+ psbook: psbook.o psutil.o pserror.o
+- $(CC) $(CCFLAGS) -o psbook psutil.o pserror.o psbook.o
++ $(CC) $(LDFLAGS) -o psbook psutil.o pserror.o psbook.o
+
+ psbook.o: psutil.h patchlev.h pserror.h psbook.c
+
+ psselect: psselect.o psutil.o pserror.o
+- $(CC) $(CCFLAGS) -o psselect psutil.o pserror.o psselect.o
++ $(CC) $(LDFLAGS) -o psselect psutil.o pserror.o psselect.o
+
+ psselect.o: psutil.h patchlev.h pserror.h psselect.c
+
+ pstops: pstops.o psutil.o psspec.o pserror.o
+- $(CC) $(CCFLAGS) -o pstops psutil.o psspec.o pserror.o pstops.o
++ $(CC) $(LDFLAGS) -o pstops psutil.o psspec.o pserror.o pstops.o
+
+ pstops.o: psutil.h patchlev.h psspec.h pserror.h pstops.c
+
+@@ -222,27 +223,27 @@
+ -mkdir $(BINDIR)
+ @for i in $(BIN); do \
+ echo Installing $$i; \
+- $(INSTALL) $$i $(BINDIR); \
++ $(BSD_INSTALL_PROGRAM) $$i $(BINDIR); \
+ done
+
+ install.script: $(PERLSCRIPTS) $(SHELLSCRIPTS)
+ -mkdir $(SCRIPTDIR)
+ @for i in $(PERLSCRIPTS) $(SHELLSCRIPTS); do \
+ echo Installing $$i; \
+- $(INSTALL) $$i $(SCRIPTDIR); \
++ $(BSD_INSTALL_SCRIPT) $$i $(SCRIPTDIR); \
+ done
+
+ install.include: $(INCLUDES)
+ -mkdir $(INCLUDEDIR)
+ @for i in $(INCLUDES); do \
+ echo Installing $$i; \
+- $(INSTALLMAN) $$i $(INCLUDEDIR); \
++ $(BSD_INSTALL_DATA) $$i $(INCLUDEDIR); \
+ done
+
+ install.man: $(MANPAGES)
+ -mkdir $(MANDIR)
+ @for i in $(MANPAGES); do \
+ echo Installing manual page for $$i; \
+- $(INSTALLMAN) $$i $(MANDIR)/$$i; \
++ $(BSD_INSTALL_DATA) $$i $(MANDIR)/$$i; \
+ done
+
Modified: head/print/psutils/files/patch-epsffit.c
==============================================================================
--- head/print/psutils-letter/files/patch-epsffit.c Tue Apr 23 05:11:57 2013 (r316307)
+++ head/print/psutils/files/patch-epsffit.c Wed Apr 24 04:13:09 2013 (r316401)
@@ -1,6 +1,6 @@
---- epsffit.c.org 2011-06-21 04:22:01.000000000 +0900
-+++ epsffit.c 2011-06-21 04:22:16.000000000 +0900
-@@ -39,7 +39,7 @@
+--- epsffit.c.orig 1997-03-12 07:52:52.000000000 +0900
++++ epsffit.c 2012-03-03 02:46:20.000000000 +0900
+@@ -39,10 +39,10 @@
exit(1);
}
@@ -8,7 +8,11 @@
+int main(int argc, char **argv)
{
int bbfound = 0; /* %%BoundingBox: found */
- int urx, ury, llx, lly;
+- int urx, ury, llx, lly;
++ int urx = 0, ury = 0, llx = 0, lly = 0;
+ int furx, fury, fllx, flly;
+ int showpage = 0, centre = 0, rotate = 0, aspect = 0, maximise = 0;
+ char buf[BUFSIZ];
@@ -185,5 +185,5 @@
} else
message(FATAL, "no %%%%BoundingBox:\n");
Added: head/print/psutils/files/patch-getafm.sh
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/print/psutils/files/patch-getafm.sh Wed Apr 24 04:13:09 2013 (r316401)
@@ -0,0 +1,34 @@
+--- getafm.sh.orig 2013-04-23 16:38:17.000000000 +0900
++++ getafm.sh 2013-04-23 16:38:24.000000000 +0900
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+
+ if [ $# -ne 1 ]; then
+- echo "usage: $0 font-name | gsnd - >font-name.afm" >&2
++ echo "usage: $0 font-name | gsnd -q - >font-name.afm" >&2
+ exit 1
+ fi
+
+@@ -13,6 +13,11 @@
+ % getafm 1.00 (c) AJCD
+ % and getafm.ps by an unknown author,
+ % modified by J. Daniel Smith <dsmith at mailhost.aa.cad.slb.com>
++%
++% modified by Joachim H. Kaiser <jhk at cmpnetmail.com>:
++% - suggest a quiet gs run in usage
++% - get font version info (from 'version', not 'Version')
++% - add copyright field to output
+
+ % Metrics dictionary code added by AJCD, 7/6/93
+
+@@ -66,8 +71,9 @@
+ (isFixedPitch)(IsFixedPitch) prany
+ (UnderlinePosition)dup prany
+ (UnderlineThickness)dup prany
+- (Version)(version) prany
++ (version)(Version) prany
+ (Notice)dup prany
++ (Copyright)dup prany
+ pop
+ }
+ {
Modified: head/print/psutils/files/patch-psnup.c
==============================================================================
--- head/print/psutils-letter/files/patch-psnup.c Tue Apr 23 05:11:57 2013 (r316307)
+++ head/print/psutils/files/patch-psnup.c Wed Apr 24 04:13:09 2013 (r316401)
@@ -1,15 +1,59 @@
---- psnup.c.orig 2011-06-21 04:22:34.000000000 +0900
-+++ psnup.c 2011-06-21 04:22:46.000000000 +0900
-@@ -66,7 +66,7 @@
+--- psnup.c.orig 1997-03-12 07:53:02.000000000 +0900
++++ psnup.c 2012-03-03 03:03:01.000000000 +0900
+@@ -28,6 +28,10 @@
+ #include "pserror.h"
+ #include "patchlev.h"
+
++#if defined(LIBPAPER)
++#include <paper.h>
++#endif
++
+ char *program ;
+ int pages ;
+ int verbose ;
+@@ -66,12 +70,12 @@
return (0);
}
-void main(int argc, char *argv[])
+int main(int argc, char *argv[])
{
- int horiz, vert, rotate, column, flip, leftright, topbottom;
+- int horiz, vert, rotate, column, flip, leftright, topbottom;
++ int horiz = 0, vert = 0, rotate = 0, column, flip, leftright, topbottom;
int nup = 1;
-@@ -331,6 +331,6 @@
+ double draw = 0; /* draw page borders */
+- double scale; /* page scale */
++ double scale = 0; /* page scale */
+ double uscale = 0; /* user supplied scale */
+ double ppwid, pphgt; /* paper dimensions */
+ double margin, border; /* paper & page margins */
+@@ -79,13 +83,21 @@
+ double iwidth, iheight ; /* input paper size */
+ double tolerance = 100000; /* layout tolerance */
+ Paper *paper;
++ char *name;
+
++#if defined(LIBPAPER)
++ name = (char *)systempapername();
++ if (name == NULL)
++ name = (char *)defaultpapername();
++#else
+ #ifdef PAPER
+- if ( (paper = findpaper(PAPER)) != (Paper *)0 ) {
+- width = (double)PaperWidth(paper);
+- height = (double)PaperHeight(paper);
+- }
++ name = PAPER;
+ #endif
++#endif
++ if ((paper = findpaper(name)) != NULL) {
++ width = (double)PaperWidth(paper);
++ height = (double)PaperHeight(paper);
++ }
+
+ margin = border = vshift = hshift = column = flip = 0;
+ leftright = topbottom = 1;
+@@ -331,6 +343,6 @@
pstops(nup, 1, 0, specs, draw); /* do page rearrangement */
}
Modified: head/print/psutils/files/patch-psresize.c
==============================================================================
--- head/print/psutils-letter/files/patch-psresize.c Tue Apr 23 05:11:57 2013 (r316307)
+++ head/print/psutils/files/patch-psresize.c Wed Apr 24 04:13:09 2013 (r316401)
@@ -1,6 +1,17 @@
---- psresize.c.orig 2011-06-21 04:23:10.000000000 +0900
-+++ psresize.c 2011-06-21 04:23:27.000000000 +0900
-@@ -46,7 +46,7 @@
+--- psresize.c.orig 1997-03-12 07:53:03.000000000 +0900
++++ psresize.c 2012-03-03 03:02:24.000000000 +0900
+@@ -20,6 +20,10 @@
+ #include "pserror.h"
+ #include "patchlev.h"
+
++#if defined(LIBPAPER)
++#include <paper.h>
++#endif
++
+ char *program ;
+ int pages ;
+ int verbose ;
+@@ -46,7 +50,7 @@
#define MIN(x,y) ((x) > (y) ? (y) : (x))
#define MAX(x,y) ((x) > (y) ? (x) : (y))
@@ -9,7 +20,33 @@
{
double scale, rscale; /* page scale */
double waste, rwaste; /* amount wasted */
-@@ -175,6 +175,6 @@
+@@ -56,13 +60,21 @@
+ double inheight = -1;
+ Paper *paper;
+ PageSpec *specs;
++ char *name = NULL;
+
++#if defined(LIBPAPER)
++ name = (char *)systempapername();
++ if (name == NULL)
++ name = (char *)defaultpapername();
++#else
+ #ifdef PAPER
+- if ( (paper = findpaper(PAPER)) != (Paper *)0 ) {
+- inwidth = width = (double)PaperWidth(paper);
+- inheight = height = (double)PaperHeight(paper);
+- }
++ name = PAPER;
++#endif
+ #endif
++ if ((paper = findpaper(name)) != NULL) {
++ inwidth = width = (double)PaperWidth(paper);
++ inheight = height = (double)PaperHeight(paper);
++ }
+
+ vshift = hshift = 0;
+ rotate = 0;
+@@ -175,6 +187,6 @@
pstops(1, 1, 0, specs, 0.0); /* do page rearrangement */
Modified: head/print/psutils/files/patch-pstops.c
==============================================================================
--- head/print/psutils-letter/files/patch-pstops.c Tue Apr 23 05:11:57 2013 (r316307)
+++ head/print/psutils/files/patch-pstops.c Wed Apr 24 04:13:09 2013 (r316401)
@@ -1,6 +1,17 @@
---- pstops.c.orig 2011-06-21 04:21:27.000000000 +0900
-+++ pstops.c 2011-06-21 04:21:41.000000000 +0900
-@@ -112,7 +112,7 @@
+--- pstops.c.orig 1997-03-12 07:53:04.000000000 +0900
++++ pstops.c 2012-03-03 03:04:32.000000000 +0900
+@@ -13,6 +13,10 @@
+ #include "pserror.h"
+ #include "patchlev.h"
+
++#if defined(LIBPAPER)
++#include <paper.h>
++#endif
++
+ char *program ;
+ int pages ;
+ int verbose ;
+@@ -112,19 +116,27 @@
return (head);
}
@@ -9,7 +20,31 @@
{
PageSpec *specs = NULL;
int nobinding = 0;
-@@ -194,5 +194,5 @@
+ double draw = 0;
+ Paper *paper;
++ char *name;
+
++#if defined(LIBPAPER)
++ name = (char *)systempapername();
++ if (name == NULL)
++ name = (char *)defaultpapername();
++#else
+ #ifdef PAPER
+- if ( (paper = findpaper(PAPER)) != (Paper *)0 ) {
+- width = (double)PaperWidth(paper);
+- height = (double)PaperHeight(paper);
+- }
++ name = PAPER;
++#endif
+ #endif
++ if ((paper = findpaper(name)) != NULL) {
++ width = (double)PaperWidth(paper);
++ height = (double)PaperHeight(paper);
++ }
+
+ infile = stdin;
+ outfile = stdout;
+@@ -194,5 +206,5 @@
pstops(modulo, pagesperspec, nobinding, specs, draw);
Added: head/print/psutils/files/patch-psutil.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/print/psutils/files/patch-psutil.c Wed Apr 24 04:13:09 2013 (r316401)
@@ -0,0 +1,58 @@
+--- psutil.c.orig 2012-03-03 03:13:21.000000000 +0900
++++ psutil.c 2012-03-03 03:20:46.000000000 +0900
+@@ -21,6 +21,11 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+
++#if defined(LIBPAPER)
++#include <math.h>
++#include <paper.h>
++#endif
++
+ #define iscomment(x,y) (strncmp(x,y,strlen(y)) == 0)
+
+ extern char *program ;
+@@ -42,6 +47,7 @@
+ static int maxpages = 100;
+ static long *pageptr;
+
++#if !defined(LIBPAPER)
+ /* list of paper sizes supported */
+ static Paper papersizes[] = {
+ { "a3", 842, 1191 }, /* 29.7cm * 42cm */
+@@ -70,6 +76,7 @@
+ Paper* findpaper(char *name)
+ {
+ Paper *pp;
++
+ for (pp = papersizes; PaperName(pp); pp++) {
+ if (strcmp(PaperName(pp), name) == 0) {
+ return pp;
+@@ -77,6 +84,27 @@
+ }
+ return (Paper *)NULL;
+ }
++#else
++static Paper pspec;
++
++Paper *findpaper(char *name)
++{
++ const struct paper *pp;
++
++ paperinit();
++ for (pp = paperfirst(); pp; pp = papernext(pp)) {
++ if (strcmp(name, papername(pp)) == 0) {
++ pspec.name = strdup(name);
++ pspec.width = round(paperpswidth(pp));
++ pspec.height = round(paperpsheight(pp));
++ return (&pspec);
++ }
++ }
++ return (NULL);
++}
++#endif
++
++
+
+ /* Make a file seekable, using temporary files if necessary */
+ FILE *seekable(FILE *fp)
Modified: head/sysutils/lire/Makefile
==============================================================================
--- head/sysutils/lire/Makefile Wed Apr 24 02:42:20 2013 (r316400)
+++ head/sysutils/lire/Makefile Wed Apr 24 04:13:09 2013 (r316401)
@@ -13,7 +13,7 @@
PORTNAME= lire
PORTVERSION= 2.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= sysutils
MASTER_SITES= http://download.logreport.org/pub/
@@ -270,7 +270,7 @@ BUILD_DEPENDS+= p5-GD-Graph>=0:${PORTSDI
RUN_DEPENDS+= lynx:${PORTSDIR}/www/lynx
.endif
.ifdef(WITH_PDF)
-RUN_DEPENDS+= epsffit:${PORTSDIR}/print/psutils-a4 \
+RUN_DEPENDS+= epsffit:${PORTSDIR}/print/psutils \
gs:${PORTSDIR}/print/ghostview \
jade:${PORTSDIR}/textproc/jade \
jadetex:${PORTSDIR}/print/jadetex \
Modified: head/textproc/groff/Makefile
==============================================================================
--- head/textproc/groff/Makefile Wed Apr 24 02:42:20 2013 (r316400)
+++ head/textproc/groff/Makefile Wed Apr 24 04:13:09 2013 (r316401)
@@ -7,7 +7,7 @@
PORTNAME= groff
PORTVERSION= 1.21
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= groff
@@ -16,7 +16,7 @@ MAINTAINER= uqs at FreeBSD.org
COMMENT= Software typesetting package
BUILD_DEPENDS= ${LOCALBASE}/bin/gs:${PORTSDIR}/print/ghostscript8 \
- ${LOCALBASE}/bin/psselect:${PORTSDIR}/print/psutils-letter
+ ${LOCALBASE}/bin/psselect:${PORTSDIR}/print/psutils
RUN_DEPENDS:= ${BUILD_DEPENDS}
LICENSE= GPLv3
More information about the svn-ports-all
mailing list