From nobody@FreeBSD.org  Thu Apr  5 20:51:39 2007
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 1287516A409
	for <freebsd-gnats-submit@FreeBSD.org>; Thu,  5 Apr 2007 20:51:39 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [69.147.83.33])
	by mx1.freebsd.org (Postfix) with ESMTP id E9FB613C4CB
	for <freebsd-gnats-submit@FreeBSD.org>; Thu,  5 Apr 2007 20:51:38 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.13.1/8.13.1) with ESMTP id l35Kpc7o048358
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 5 Apr 2007 20:51:38 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.13.1/8.13.1/Submit) id l35Kkbdl047538;
	Thu, 5 Apr 2007 20:46:37 GMT
	(envelope-from nobody)
Message-Id: <200704052046.l35Kkbdl047538@www.freebsd.org>
Date: Thu, 5 Apr 2007 20:46:37 GMT
From: bf<bf2006a@yahoo.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH] graphics/peps: update to 2.0
X-Send-Pr-Version: www-3.0

>Number:         111287
>Category:       ports
>Synopsis:       [PATCH] graphics/peps: update to 2.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    rafan
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Apr 05 21:00:12 GMT 2007
>Closed-Date:    Sat Apr 07 15:16:03 GMT 2007
>Last-Modified:  Sat Apr  7 15:20:02 GMT 2007
>Originator:     bf
>Release:        6.2-Stable i386
>Organization:
>Environment:
>Description:
diff -ruN peps.bak/Makefile peps/Makefile
--- peps.bak/Makefile	Sun May  7 19:46:21 2006
+++ peps/Makefile	Thu Apr  5 15:27:06 2007
@@ -6,33 +6,29 @@
 #
 
 PORTNAME=	peps
-PORTVERSION=	1.0
-PORTREVISION=	1
+PORTVERSION=	2.0
+PORTREVISION=	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_SUB=	DISTNAME=${DISTNAME}
+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=${PREFIX}/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 -ruN peps.bak/distinfo peps/distinfo
--- peps.bak/distinfo	Sun Jan 22 07:35:05 2006
+++ peps/distinfo	Thu Apr  5 15:30:26 2007
@@ -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 -ruN peps.bak/files/patch-peps.c peps/files/patch-peps.c
--- peps.bak/files/patch-peps.c	Mon Jun 16 21:31:54 2003
+++ peps/files/patch-peps.c	Wed Dec 31 19:00:00 1969
@@ -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 -ruN peps.bak/pkg-descr peps/pkg-descr
--- peps.bak/pkg-descr	Sun Dec  8 13:29:30 2002
+++ peps/pkg-descr	Thu Apr  5 16:19:44 2007
@@ -1,8 +1,7 @@
-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/

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN peps.bak/Makefile peps/Makefile
--- peps.bak/Makefile	Sun May  7 19:46:21 2006
+++ peps/Makefile	Thu Apr  5 15:27:06 2007
@@ -6,33 +6,29 @@
 #
 
 PORTNAME=	peps
-PORTVERSION=	1.0
-PORTREVISION=	1
+PORTVERSION=	2.0
+PORTREVISION=	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_SUB=	DISTNAME=${DISTNAME}
+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=${PREFIX}/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 -ruN peps.bak/distinfo peps/distinfo
--- peps.bak/distinfo	Sun Jan 22 07:35:05 2006
+++ peps/distinfo	Thu Apr  5 15:30:26 2007
@@ -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 -ruN peps.bak/files/patch-peps.c peps/files/patch-peps.c
--- peps.bak/files/patch-peps.c	Mon Jun 16 21:31:54 2003
+++ peps/files/patch-peps.c	Wed Dec 31 19:00:00 1969
@@ -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 -ruN peps.bak/pkg-descr peps/pkg-descr
--- peps.bak/pkg-descr	Sun Dec  8 13:29:30 2002
+++ peps/pkg-descr	Thu Apr  5 16:19:44 2007
@@ -1,8 +1,7 @@
-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/

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->rafan 
Responsible-Changed-By: rafan 
Responsible-Changed-When: Sat Apr 7 15:12:41 UTC 2007 
Responsible-Changed-Why:  
Eat. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=111287 
State-Changed-From-To: open->closed 
State-Changed-By: rafan 
State-Changed-When: Sat Apr 7 15:16:01 UTC 2007 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=111287 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/111287: commit references a PR
Date: Sat,  7 Apr 2007 15:16:02 +0000 (UTC)

 rafan       2007-04-07 15:15:55 UTC
 
   FreeBSD ports repository
 
   Modified files:
     graphics/peps        Makefile distinfo pkg-descr 
   Removed files:
     graphics/peps/files  patch-peps.c 
   Log:
   - Update to 2.0
   - Refine pkg-descr
   
   PR:             ports/111287
   Submitted by:   bf <bf2006a at yahoo.com>
   
   Revision  Changes    Path
   1.13      +14 -20    ports/graphics/peps/Makefile
   1.4       +3 -3      ports/graphics/peps/distinfo
   1.2       +0 -37     ports/graphics/peps/files/patch-peps.c (dead)
   1.3       +7 -7      ports/graphics/peps/pkg-descr
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
