- enable choose of ghostscript interpreter

- change all occurrences of acrobat reader from v4 to v5
- bumped portrevision

To Jens in e-mail:
"Jens, do you take care of the pending PRs ?
Content of PRs sounded to me as if you are waiting for several changes."

PR:		54958 54960 (both pending)
Submitted by:	Jens Rehsack <rehsack@liwing.de>

2 files changed, 28 insertions, 12 deletions

diff --git a/print/apsfilter/Makefile b/print/apsfilter/Makefile
index 7434aca5cc9c..b105743aade0 100644
--- a/print/apsfilter/Makefile
+++ b/print/apsfilter/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	apsfilter
 PORTVERSION=	7.2.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	print
 MASTER_SITES=	http://www.apsfilter.org/download/
 
@@ -32,6 +32,16 @@ MAKE_ENV+=      NO_X=true
 .endif
 
 #
+# define WITH_GHOSTSCRIPT_AFP1=yes for AFPL Postscript interpreter
+# instead of GNU one
+#
+.if defined(WITH_GHOSTSCRIPT_AFP1)
+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 @@ MAKE_ENV+=      NO_X=true
 #
 # 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 @@ RUN_DEPENDS+=	smbclient:${PORTSDIR}/net/samba
 #
 # 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,11 +126,19 @@ MAN5=		apsfilterrc.5
 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)
+	@${ECHO} ""
+	@${ECHO} "      Define WITH_GHOSTSCRIPT_AFP1=yes to use"
+	@${ECHO} "      AFPL Postscript interpreter instead of GNU one"
+	@${ECHO} ""
+.endif
+
 .if !defined(BATCH)
 pre-configure:
 	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
diff --git a/print/apsfilter/scripts/configure b/print/apsfilter/scripts/configure
index 8e1c4dbf362f..e5466a0369ce 100644
--- a/print/apsfilter/scripts/configure
+++ b/print/apsfilter/scripts/configure
@@ -19,7 +19,7 @@ GS_NO_X11	"Postscript for non-PS printer, no X11"		OFF	\
 GS_PDF_CRYPT	"print encrypted PDF files using gs"		ON	\
 PSUTILS		"for pseudo duplex printing + paper handling"	ON	\
 A2PS		"ASCII files in different styles/orientation"	ON	\
-ACROREAD4	"PDF files, needs Linux emulation"		ON	\
+ACROREAD5	"PDF files, needs Linux emulation"		ON	\
 CONVERT		"support for lots of graphic file formats"	ON	\
 DVIPS		"TeX DVI files"					OFF	\
 FIG2DEV		"XFIG drawings"					OFF	\
@@ -66,10 +66,10 @@ while [ "$1" ]; do
 		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
@@ -100,7 +100,7 @@ while [ "$1" ]; do
 			;;
 		esac
 		;;
-	\"ACROREAD4\")
+	\"ACROREAD5\")
 		echo RUN_DEPENDS+=acroread5:${PORTSDIR}/print/acroread5
 		;;
 	\"CONVERT\")