4 files changed, 24 insertions, 67 deletions

diff --git a/graphics/peps/Makefile b/graphics/peps/Makefile
index ad11a2893798..062a1d5e230d 100644
--- a/graphics/peps/Makefile
+++ b/graphics/peps/Makefile
@@ -6,33 +6,27 @@
 #
 
 PORTNAME=	peps
-PORTVERSION=	1.0
-PORTREVISION=	1
+PORTVERSION=	2.0
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	petef
+MASTER_SITES=	ftp://ftp.peps.redprince.net/unix/peps/ \
+		http://www.peps.redprince.net/peps/2.0/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Converts EPS images to anti-aliased PGM bitmaps
+COMMENT=	Converts EPS images to anti-aliased bitmaps
 
-PLIST_FILES=	bin/peps
+MAN1=		peps.1
+PLIST_FILES=	bin/peps \
+		etc/peps.mime \
+		share/doc/${DISTNAME}/peps.pdf
+PLIST_DIRS=	share/doc/${DISTNAME}
 
 USE_GHOSTSCRIPT_RUN=	yes
+MAKE_ENV=	DOCDIR=${PREFIX}/share/doc MAN1DIR=${MANPREFIX}/man/man1 \
+		ETC=${PREFIX}/etc XBINDIR=${PREFIX}/bin
 
-RUN_DEPENDS=	pnmtopng:${PORTSDIR}/graphics/netpbm
-
-pre-fetch:
-.if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes
-	@${ECHO} ""
-	@${ECHO} "      Define WITH_GHOSTSCRIPT_AFPL=yes to use"
-	@${ECHO} "      AFPL Postscript interpreter instead of GNU one"
-	@${ECHO} ""
+.if !defined(WITHOUT_X11)
+PLIST_FILES+=	bin/xpeps
+INSTALL_TARGET=	install xinstall
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's!cc -O3!${CC} ${CFLAGS}!' ${WRKSRC}/Makefile
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/peps ${PREFIX}/bin
-
 .include <bsd.port.mk>
diff --git a/graphics/peps/distinfo b/graphics/peps/distinfo
index b6493f357397..fa63e1244b59 100644
--- a/graphics/peps/distinfo
+++ b/graphics/peps/distinfo
@@ -1,3 +1,3 @@
-MD5 (peps-1.0.tar.gz) = 3c60e405dd9994cc4145fd7274efe8d2
-SHA256 (peps-1.0.tar.gz) = 91cdaa421b064c12f5259a504cf96089101f41e2acd7d1db73d09dfd11a81e33
-SIZE (peps-1.0.tar.gz) = 203248
+MD5 (peps-2.0.tar.gz) = e0d90fe74976c0e7cc6dfc49afe29476
+SHA256 (peps-2.0.tar.gz) = b514fed9412548cdcf43a95b6dcf01b2038f314bc9ef363498ebd2779c897a91
+SIZE (peps-2.0.tar.gz) = 55421
diff --git a/graphics/peps/files/patch-peps.c b/graphics/peps/files/patch-peps.c
deleted file mode 100644
index 93e23e2a9f55..000000000000
--- a/graphics/peps/files/patch-peps.c
+++ /dev/null
@@ -1,37 +0,0 @@
---- peps.c-	Thu Jul  5 05:29:56 2001
-+++ peps.c	Mon Jun 16 15:13:13 2003
-@@ -62,6 +62,7 @@
-  */
- #include <stdio.h>
- #include <stdlib.h>
-+#include <sys/wait.h>
- 
- char gsargs[] = "gs "
- 	"-q "
-@@ -181,7 +182,8 @@
- }
- 
- int main(int argc, char *argv[]) {
--	register int i;
-+	register int i; 
-+	int status, error;
- 	register char *charptr;
- 	FILE *gs, *eps;
- 
-@@ -420,8 +422,14 @@
- 		input, input
- 		);
- 
--	pclose(gs);
-+	status = pclose(gs);
- 
--	return 0;
-+	error = !WIFEXITED(status) || WEXITSTATUS(status);
-+
-+	if (error && output)
-+		(void) remove(output);
-+			
-+	exit(error);
-+		
- }
- 
diff --git a/graphics/peps/pkg-descr b/graphics/peps/pkg-descr
index 9976152a401a..b88f3623f36e 100644
--- a/graphics/peps/pkg-descr
+++ b/graphics/peps/pkg-descr
@@ -1,8 +1,8 @@
-peps is a utility to Print Encapsulated PostScript files.
-Specifically, it allows you to convert an EPS file into an anti-aliased
-PGM bitmap (with a variable resolution and anti-aliasing level).
-If the -p option is specified, the resulting bitmap is piped through
-pnmtopng to create a PNG image.
+Peps will preprocess encapsulated Postscript files for conversion by
+Ghostscript into bitmaps.  It provides variable levels of resolution and
+anti-aliasing.  You can use it as a stand-alone Postscript-to-bitmap
+conversion program, or use it on-line to create bitmaps on the fly and send
+them out to a web browser, even compressing them if the browser supports
+gzip compression.
 
-- Pete
-petef@databits.net
+WWW: http://peps.redprince.net/peps/