From root@helo.liwing.de  Sun Jul 27 12:47:35 2003
Return-Path: <root@helo.liwing.de>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id D15F037B405; Sun, 27 Jul 2003 12:47:33 -0700 (PDT)
Received: from helo.liwing.de (helo.liwing.de [213.70.188.163])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id DC8C844035; Sun, 27 Jul 2003 12:47:29 -0700 (PDT)
	(envelope-from root@helo.liwing.de)
Received: from helo.liwing.de (localhost.liwing.de [127.0.0.1])
	by helo.liwing.de (8.12.7/8.12.7) with ESMTP id h6RJlO6l099548;
	Sun, 27 Jul 2003 19:47:24 GMT
	(envelope-from root@helo.liwing.de)
Received: (from root@localhost)
	by helo.liwing.de (8.12.7/8.12.7/Submit) id h6RJlOW4099547;
	Sun, 27 Jul 2003 19:47:24 GMT
Message-Id: <200307271947.h6RJlOW4099547@helo.liwing.de>
Date: Sun, 27 Jul 2003 19:47:24 GMT
From: Jens Rehsack <rehsack@liwing.de>
Reply-To: Jens Rehsack <rehsack@liwing.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Jens Rehsack <rehsack@liwing.de>, andreas@freebsd.org
Subject: [PATCH] enable choose of ghostscript interpreter
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         54941
>Category:       ports
>Synopsis:       [PATCH] print/apsfilter: enable choose of ghostscript interpreter
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 27 12:50:30 PDT 2003
>Closed-Date:    Sat Aug 30 18:31:34 PDT 2003
>Last-Modified:  Sat Aug 30 18:31:34 PDT 2003
>Originator:     Jens Rehsack
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
LiWing IT-Services
>Environment:
System: FreeBSD webdev.muppets.liwing.de 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Sat Jul 19 13:25:30 GMT 2003 root@webdev.muppets.liwing.de:/usr/obj/usr/src/sys/WEBDEV i386


	
>Description:
	This patch allows the admin of the machine to choose either
	print/ghostscript-gnu or print/ghostscript-afp1
>How-To-Repeat:
	
>Fix:

	

--- patch-ghostscript-afp1 begins here ---
Index: print/apsfilter/scripts/configure
===================================================================
diff -u print/apsfilter/scripts/configure.orig print/apsfilter/scripts/configure
--- print/apsfilter/scripts/configure.orig	Sun Jul 27 13:37:30 2003
+++ print/apsfilter/scripts/configure	Sun Jul 27 13:45:01 2003
@@ -66,10 +66,10 @@
 		echo "PAPERSIZE=letterdj"
 		;;
 	\"GS\")
-		echo RUN_DEPENDS+=gs:${PORTSDIR}/print/ghostscript-gnu
+		echo RUN_DEPENDS+=gs:${PORTSDIR}/${GSPORT}
 		;;
 	\"GS_NO_X11\")
-		echo RUN_DEPENDS+=gs:${PORTSDIR}/print/ghostscript-gnu-nox11
+		echo RUN_DEPENDS+=gs:${PORTSDIR}/${GSPORT}-nox11
 		;;
 	\"GS_PDF_CRYPT\")
 		echo PDFENCRYPT=YES
Index: print/apsfilter/Makefile
===================================================================
diff -u print/apsfilter/Makefile.orig print/apsfilter/Makefile
--- print/apsfilter/Makefile.orig	Sun Jul 27 13:37:40 2003
+++ print/apsfilter/Makefile	Sun Jul 27 13:45:32 2003
@@ -32,6 +32,16 @@
 .endif

 #
+# define WITH_GHOSTSCRIPT_AFP1=yes for AFPL Postscript interpreter
+# instead of GNU one
+#
+.if defined(WITH_GHOSTSCRIPT_AFP1) && ${WITH_GHOSTSCRIPT_AFP1} == yes
+GSPORT?=	print/ghostscript-afp1
+.else
+GSPORT?=	print/ghostscript-gnu
+.endif
+
+#
 # hint: for batch mode you can now draw the following decisions
 # - <default>		build and install most important filter utilities
 #			that don't require X
@@ -45,10 +55,9 @@
 #
 # ps emulator
 .if defined(WITHOUT_X11)
-RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript-gnu-nox11
-.else
-RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript-gnu
+GSPORT=		${GSPORT}-nox11
 .endif
+RUN_DEPENDS=	gs:${PORTSDIR}/${GSPORT}
 # all needed decompression utilities
 .if !exists(/usr/bin/bzip2)
 RUN_DEPENDS+=	bunzip2:${PORTSDIR}/archivers/bzip2
@@ -97,10 +106,9 @@
 #
 # ps emulator
 .if defined(WITHOUT_X11)
-RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript-gnu-nox11
-.else
-RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript-gnu
+GSPORT=		${GSPORT}-nox11
 .endif
+RUN_DEPENDS=	gs:${PORTSDIR}/${GSPORT}
 # most important "xxx to ps" filter utilities
 RUN_DEPENDS+=	a2ps:${PORTSDIR}/print/a2ps-letter
 RUN_DEPENDS+=	psnup:${PORTSDIR}/print/psutils-letter
@@ -118,10 +126,18 @@
 HAS_CONFIGURE=	yes
 USE_BZIP2=	yes
 WRKSRC=		${WRKDIR}/apsfilter
-SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}"
+SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" GSPORT="${GSPORT}"

 # make a2ps port happy in this early stage
 PAPERSIZE?=letter
+
+pre-fetch:
+.if !defined(WITH_GHOSTSCRIPT_AFP1) || ${WITH_GHOSTSCRIPT_AFP1} != yes
+	@${ECHO} ""
+	@${ECHO} "      Define WITH_GHOSTSCRIPT_AFP1=yes to use"
+	@${ECHO} "      AFPL Postscript interpreter instead of GNU one"
+	@${ECHO} ""
+.endif

 .if !defined(BATCH)
 pre-configure:
--- patch-ghostscript-afp1 ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: ceri 
State-Changed-When: Sun Jul 27 13:01:29 PDT 2003 
State-Changed-Why:  
Duplicate of ports/54918. 
Please take care when submitting PRs; we got 38 copies of this. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=54941 
State-Changed-From-To: closed->open 
State-Changed-By: ceri 
State-Changed-When: Sun Jul 27 13:38:40 PDT 2003 
State-Changed-Why:  

Throw this back open; seems that they're not duplicates after all. 
I am adding the port name to the synopsis for clarity. 

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

From: Jens Rehsack <rehsack@liwing.de>
To: Ceri Davies <ceri@FreeBSD.org>
Cc: freebsd-ports-bugs@FreeBSD.org,
	FreeBSD-gnats-submit <FreeBSD-gnats-submit@freebsd.org>
Subject: Re: ports/54941: [PATCH] print/apsfilter: enable choose of ghostscript
 interpreter
Date: Sun, 27 Jul 2003 22:58:47 +0200

 This is a multi-part message in MIME format.
 --------------020804080408060105070608
 Content-Type: text/plain; charset=us-ascii; format=flowed
 Content-Transfer-Encoding: 7bit
 
 On 27.07.2003 22:39, Ceri Davies wrote:
 > Old Synopsis: [PATCH] enable choose of ghostscript interpreter
 > New Synopsis: [PATCH] print/apsfilter: enable choose of ghostscript interpreter
 > 
 > State-Changed-From-To: closed->open
 > State-Changed-By: ceri
 > State-Changed-When: Sun Jul 27 13:38:40 PDT 2003
 > State-Changed-Why: 
 > 
 > Throw this back open; seems that they're not duplicates after all.
 > I am adding the port name to the synopsis for clarity.
 > 
 > http://www.freebsd.org/cgi/query-pr.cgi?pr=54941
 
 Hi Ceri,
 
 sorry about the confusion. I was doing the same work as you, but
 you seems to be much faster than me. I copy this small message for
 those who didn't read the first of my blame :-(
 
 I detected another failure of mine, I typed '1' (one)
 while 'l' (ell) was required in ghostscript-afpl.
 New patch is attached.
 
 Best wishes,
 Jens
 
 --------------020804080408060105070608
 Content-Type: text/plain;
  name="patch-ghostscript-afp1"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline;
  filename="patch-ghostscript-afp1"
 
 Index: print/apsfilter/scripts/configure
 ===================================================================
 diff -u print/apsfilter/scripts/configure.orig print/apsfilter/scripts/configure
 --- print/apsfilter/scripts/configure.orig	Sun Jul 27 13:37:30 2003
 +++ print/apsfilter/scripts/configure	Sun Jul 27 13:45:01 2003
 @@ -66,10 +66,10 @@
  		echo "PAPERSIZE=letterdj"
  		;;
  	\"GS\")
 -		echo RUN_DEPENDS+=gs:${PORTSDIR}/print/ghostscript-gnu
 +		echo RUN_DEPENDS+=gs:${PORTSDIR}/${GSPORT}
  		;;
  	\"GS_NO_X11\")
 -		echo RUN_DEPENDS+=gs:${PORTSDIR}/print/ghostscript-gnu-nox11
 +		echo RUN_DEPENDS+=gs:${PORTSDIR}/${GSPORT}-nox11
  		;;
  	\"GS_PDF_CRYPT\")
  		echo PDFENCRYPT=YES
 Index: print/apsfilter/Makefile
 ===================================================================
 diff -u print/apsfilter/Makefile.orig print/apsfilter/Makefile
 --- print/apsfilter/Makefile.orig	Sun Jul 27 13:37:40 2003
 +++ print/apsfilter/Makefile	Sun Jul 27 13:45:32 2003
 @@ -32,6 +32,16 @@
  .endif
 
  #
 +# define WITH_GHOSTSCRIPT_AFPL=yes for AFPL Postscript interpreter
 +# instead of GNU one
 +#
 +.if defined(WITH_GHOSTSCRIPT_AFPL) && ${WITH_GHOSTSCRIPT_AFPL} == yes
 +GSPORT?=	print/ghostscript-afpl
 +.else
 +GSPORT?=	print/ghostscript-gnu
 +.endif
 +
 +#
  # hint: for batch mode you can now draw the following decisions
  # - <default>		build and install most important filter utilities
  #			that don't require X
 @@ -45,10 +55,9 @@
  #
  # ps emulator
  .if defined(WITHOUT_X11)
 -RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript-gnu-nox11
 -.else
 -RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript-gnu
 +GSPORT=		${GSPORT}-nox11
  .endif
 +RUN_DEPENDS=	gs:${PORTSDIR}/${GSPORT}
  # all needed decompression utilities
  .if !exists(/usr/bin/bzip2)
  RUN_DEPENDS+=	bunzip2:${PORTSDIR}/archivers/bzip2
 @@ -97,10 +106,9 @@
  #
  # ps emulator
  .if defined(WITHOUT_X11)
 -RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript-gnu-nox11
 -.else
 -RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript-gnu
 +GSPORT=		${GSPORT}-nox11
  .endif
 +RUN_DEPENDS=	gs:${PORTSDIR}/${GSPORT}
  # most important "xxx to ps" filter utilities
  RUN_DEPENDS+=	a2ps:${PORTSDIR}/print/a2ps-letter
  RUN_DEPENDS+=	psnup:${PORTSDIR}/print/psutils-letter
 @@ -118,10 +126,18 @@
  HAS_CONFIGURE=	yes
  USE_BZIP2=	yes
  WRKSRC=		${WRKDIR}/apsfilter
 -SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}"
 +SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" GSPORT="${GSPORT}"
 
  # make a2ps port happy in this early stage
  PAPERSIZE?=letter
 +
 +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} ""
 +.endif
 
  .if !defined(BATCH)
  pre-configure:
 
 --------------020804080408060105070608--
 
State-Changed-From-To: open->closed 
State-Changed-By: edwin 
State-Changed-When: Sat Aug 30 18:31:11 PDT 2003 
State-Changed-Why:  
Commited, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=54939 
State-Changed-From-To: open->closed 
State-Changed-By: edwin 
State-Changed-When: Sat Aug 30 18:31:11 PDT 2003 
State-Changed-Why:  
Commited, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=54940 
State-Changed-From-To: open->closed 
State-Changed-By: edwin 
State-Changed-When: Sat Aug 30 18:31:11 PDT 2003 
State-Changed-Why:  
Commited, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=54941 
>Unformatted:
