12 files changed, 142 insertions, 19 deletions

diff --git a/print/psutils-a4/Makefile b/print/psutils-a4/Makefile
index 02d4ea1220c3..ab00106ad128 100644
--- a/print/psutils-a4/Makefile
+++ b/print/psutils-a4/Makefile
@@ -8,6 +8,6 @@
 PAPERSIZE=	a4
 MASTERDIR=	${.CURDIR}/../psutils-letter
 
-CONFLICTS=	psutils-letter-*
+CONFLICTS=	psutils-letter-[0-9]*
 
 .include "${MASTERDIR}/Makefile"
diff --git a/print/psutils-letter/Makefile b/print/psutils-letter/Makefile
index 49c2417da218..b69bca5a30fa 100644
--- a/print/psutils-letter/Makefile
+++ b/print/psutils-letter/Makefile
@@ -5,28 +5,29 @@
 # $FreeBSD$
 #
 
-PORTNAME=	psutils-${PAPERSIZE}
+PORTNAME=	psutils
 PORTVERSION=	1.17
 PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.dcs.ed.ac.uk/pub/ajcd/ \
-		ftp://ftp.knackered.org/pub/psutils/
+		ftp://ftp.knackered.org/pub/psutils/ \
+		${MASTER_SITE_TEX_CTAN}
+MASTER_SITE_SUBDIR=	support/psutils
+PKGNAMESUFFIX=	-${PAPERSIZE}
 DISTNAME=	psutils-p17
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Utilities for manipulating PostScript documents
 
-USE_PERL5=	yes
-WRKSRC=		${WRKDIR}/psutils
-MAKE_FLAGS?=	PAPER=${PAPERSIZE} -f
+USE_PERL5_BUILD=yes
+WRKSRC=		${WRKDIR}/${PORTNAME}
 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+=	PERL=${PERL}
-
-CONFLICTS?=	psutils-a4-*
+SCRIPTS_ENV+=	PERL5=${PERL5} CC=${CC} DATADIR=${DATADIR} \
+		MANPREFIX=${MANPREFIX} PAPER=${PAPERSIZE}
+CONFLICTS?=	psutils-a4-[0-9]*
 
 .if !defined(PAPERSIZE)
 PAPERSIZE=letter
diff --git a/print/psutils-letter/distinfo b/print/psutils-letter/distinfo
index d8705353a68e..0dc0e5961cc8 100644
--- a/print/psutils-letter/distinfo
+++ b/print/psutils-letter/distinfo
@@ -1,3 +1,2 @@
-MD5 (psutils-p17.tar.gz) = b161522f3bd1507655326afa7db4a0ad
 SHA256 (psutils-p17.tar.gz) = 3853eb79584ba8fbe27a815425b65a9f7f15b258e0d43a05a856bdb75d588ae4
 SIZE (psutils-p17.tar.gz) = 62039
diff --git a/print/psutils-letter/files/patch-epsffit.c b/print/psutils-letter/files/patch-epsffit.c
new file mode 100644
index 000000000000..363fb335dbe9
--- /dev/null
+++ b/print/psutils-letter/files/patch-epsffit.c
@@ -0,0 +1,18 @@
+--- 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 @@
+    exit(1);
+ }
+ 
+-void main(int argc, char **argv)
++int main(int argc, char **argv)
+ {
+    int bbfound = 0;              /* %%BoundingBox: found */
+    int urx, ury, llx, lly;
+@@ -185,5 +185,5 @@
+    } else
+       message(FATAL, "no %%%%BoundingBox:\n");
+ 
+-   exit(0);
++   return (0);
+ }
diff --git a/print/psutils-letter/files/patch-psbook.c b/print/psutils-letter/files/patch-psbook.c
new file mode 100644
index 000000000000..b19ce81deeac
--- /dev/null
+++ b/print/psutils-letter/files/patch-psbook.c
@@ -0,0 +1,18 @@
+--- psbook.c.orig	2011-06-21 04:19:12.000000000 +0900
++++ psbook.c	2011-06-21 04:19:36.000000000 +0900
+@@ -32,7 +32,7 @@
+ }
+ 
+ 
+-void main(int argc, char *argv[])
++int main(int argc, char *argv[])
+ {
+    int signature = 0;
+    int currentpg, maxpage;
+@@ -107,5 +107,5 @@
+    }
+    writetrailer();
+ 
+-   exit(0);
++   return (0);
+ }
diff --git a/print/psutils-letter/files/patch-pserror.c b/print/psutils-letter/files/patch-pserror.c
new file mode 100644
index 000000000000..a758c5408984
--- /dev/null
+++ b/print/psutils-letter/files/patch-pserror.c
@@ -0,0 +1,11 @@
+--- pserror.c.orig	2011-06-21 04:20:14.000000000 +0900
++++ pserror.c	2011-06-21 04:20:31.000000000 +0900
+@@ -24,7 +24,7 @@
+ void message(int flags, char *format, ...)
+ {
+   va_list args ;
+-  static column = 0 ;		/* current screen column for message wrap */
++  static int column = 0 ;		/* current screen column for message wrap */
+   char msgbuf[MAX_MESSAGE] ;	/* buffer in which to put the message */
+   char *bufptr = msgbuf ;	/* message buffer pointer */
+ 
diff --git a/print/psutils-letter/files/patch-psnup.c b/print/psutils-letter/files/patch-psnup.c
new file mode 100644
index 000000000000..31ce03a9e268
--- /dev/null
+++ b/print/psutils-letter/files/patch-psnup.c
@@ -0,0 +1,19 @@
+--- 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 @@
+    return (0);
+ }
+ 
+-void main(int argc, char *argv[])
++int main(int argc, char *argv[])
+ {
+    int horiz, vert, rotate, column, flip, leftright, topbottom;
+    int nup = 1;
+@@ -331,6 +331,6 @@
+       pstops(nup, 1, 0, specs, draw);		/* do page rearrangement */
+    }
+ 
+-   exit(0);
++   return (0);
+ }
+ 
diff --git a/print/psutils-letter/files/patch-psresize.c b/print/psutils-letter/files/patch-psresize.c
new file mode 100644
index 000000000000..d56ec8f0620b
--- /dev/null
+++ b/print/psutils-letter/files/patch-psresize.c
@@ -0,0 +1,19 @@
+--- 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 @@
+ #define MIN(x,y) ((x) > (y) ? (y) : (x))
+ #define MAX(x,y) ((x) > (y) ? (x) : (y))
+ 
+-void main(int argc, char *argv[])
++int main(int argc, char *argv[])
+ {
+    double scale, rscale;			/* page scale */
+    double waste, rwaste;			/* amount wasted */
+@@ -175,6 +175,6 @@
+       
+    pstops(1, 1, 0, specs, 0.0);		/* do page rearrangement */
+ 
+-   exit(0);
++   return (0);
+ }
+ 
diff --git a/print/psutils-letter/files/patch-psselect.c b/print/psutils-letter/files/patch-psselect.c
new file mode 100644
index 000000000000..85cb97ccf773
--- /dev/null
+++ b/print/psutils-letter/files/patch-psselect.c
@@ -0,0 +1,18 @@
+--- psselect.c.orig	2011-06-21 04:20:51.000000000 +0900
++++ psselect.c	2011-06-21 04:21:08.000000000 +0900
+@@ -91,7 +91,7 @@
+ }
+ 
+ 
+-void main(int argc, char *argv[])
++int main(int argc, char *argv[])
+ {
+    int currentpg, maxpage = 0;
+    int even = 0, odd = 0, reverse = 0;
+@@ -235,5 +235,5 @@
+    }
+    writetrailer();
+ 
+-   exit(0);
++   return (0);
+ }
diff --git a/print/psutils-letter/files/patch-pstops.c b/print/psutils-letter/files/patch-pstops.c
new file mode 100644
index 000000000000..491c7734c29d
--- /dev/null
+++ b/print/psutils-letter/files/patch-pstops.c
@@ -0,0 +1,18 @@
+--- 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 @@
+    return (head);
+ }
+ 
+-void main(int argc, char *argv[])
++int main(int argc, char *argv[])
+ {
+    PageSpec *specs = NULL;
+    int nobinding = 0;
+@@ -194,5 +194,5 @@
+ 
+    pstops(modulo, pagesperspec, nobinding, specs, draw);
+ 
+-   exit(0);
++   return (0);
+ }
diff --git a/print/psutils-letter/pkg-plist b/print/psutils-letter/pkg-plist
index 09a9d89e7f88..9ce00d19f2ef 100644
--- a/print/psutils-letter/pkg-plist
+++ b/print/psutils-letter/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 bin/psbook
 bin/psselect
 bin/pstops
@@ -19,6 +20,6 @@ bin/extractres
 bin/includeres
 bin/psmerge
 bin/showchar
-share/psutils/md68_0.ps
-share/psutils/md71_0.ps
-@dirrm share/psutils
+%%DATADIR%%/md68_0.ps
+%%DATADIR%%/md71_0.ps
+@dirrm %%DATADIR%%
diff --git a/print/psutils-letter/scripts/configure b/print/psutils-letter/scripts/configure
index 18327c3d4415..34ef84063264 100644
--- a/print/psutils-letter/scripts/configure
+++ b/print/psutils-letter/scripts/configure
@@ -3,9 +3,10 @@ cd $WRKSRC || exit 1
 cp Makefile.unix Makefile
 cat >>Makefile<<END
 BINDIR = $PREFIX/bin
-INCLUDEDIR = $PREFIX/share/psutils
-MANDIR =$PREFIX/man/man1
-PERL = $PERL
-CC=cc
+INCLUDEDIR = $DATADIR
+MANDIR =$MANPREFIX/man/man1
+PERL = $PERL5
+CC=${CC}
+PAPER=${PAPER}
 END
 exit 0