changes see ChangeLog

revamped port dependencies
- if defined(BATCH) && defined(APSFILTER_ALL)
  every tool and filter supported by apsfilter will be installed
  (very time and space consuming)
- if defined(BATCH)
  only most necessary things are installed

If you want complete control over what to install, then don't
define BATCH or  BATCH && APSFILTER_ALL, then please use the
new updated interactive method of building using dialog.

The configure script is now up to date, concerning tools needed/supported
by apsfilter and a little bit more explicite !

Thanks for Greg Lehey and friends for a vivit discussion, this
is the desired result I hope !!!

3 files changed, 74 insertions, 60 deletions

diff --git a/print/apsfilter6/Makefile b/print/apsfilter6/Makefile
index d9c23dfd3da3..416d2aca30bb 100644
--- a/print/apsfilter6/Makefile
+++ b/print/apsfilter6/Makefile
@@ -9,22 +9,36 @@ PORTNAME=	apsfilter
 PORTVERSION=	6.0.0
 CATEGORIES=	print
 MASTER_SITES=	http://www.apsfilter.org/download/
-DISTFILES=	apsfilter-current-07.09.2000.tar.bz2
+DISTFILES=	apsfilter-current-09.09.2000.tar.bz2
 
 MAINTAINER=	andreas@FreeBSD.org
 
-RUN_DEPENDS=	recode:${PORTSDIR}/converters/recode
-.if defined(BATCH)
-RUN_DEPENDS+=	gs:${PORTSDIR}/print/ghostscript6
-RUN_DEPENDS+=	html2ps:${PORTSDIR}/print/html2ps-letter
-RUN_DEPENDS+=	transfig:${PORTSDIR}/print/transfig
-RUN_DEPENDS+=	cjpeg:${PORTSDIR}/graphics/jpeg
-RUN_DEPENDS+=	anytopnm:${PORTSDIR}/graphics/netpbm
+.if defined(BATCH) && defined(APSFILTER_ALL)
+# Please note: this might be needed only in rare cases or for testing
+# all of apsfilters capabilities
+# ps emulator
+RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript6
+# all needed decompression utilities
 RUN_DEPENDS+=	bunzip2:${PORTSDIR}/archivers/bzip2
+RUN_DEPENDS+=	melt:${PORTSDIR}/archivers/freeze
+# all needed "xxx to ps" filter utilities
 RUN_DEPENDS+=	a2ps:${PORTSDIR}/print/a2ps-letter
+RUN_DEPENDS+=	acroread4:${PORTSDIR}/print/acroread4
+RUN_DEPENDS+=	convert:${PORTSDIR}/graphics/ImageMagick
+RUN_DEPENDS+=	dvips:${PORTSDIR}/print/teTeX
+RUN_DEPENDS+=	html2ps:${PORTSDIR}/print/html2ps-letter
 RUN_DEPENDS+=	psnup:${PORTSDIR}/print/psutils-letter
-RUN_DEPENDS+=	smbclient:${PORTSDIR}/net/samba
+RUN_DEPENDS+=	transfig:${PORTSDIR}/print/transfig
+# all possible remote printing support
 RUN_DEPENDS+=	pap:${PORTSDIR}/net/netatalk
+RUN_DEPENDS+=	smbclient:${PORTSDIR}/net/samba
+.elif defined(BATCH)
+# ps emulator
+RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript6
+# most important "xxx to ps" filter utilities
+RUN_DEPENDS+=	a2ps:${PORTSDIR}/print/a2ps-letter
+RUN_DEPENDS+=	psnup:${PORTSDIR}/print/psutils-letter
+RUN_DEPENDS+=	convert:${PORTSDIR}/graphics/ImageMagick
 .endif
 
 USE_BZIP2=	yes
diff --git a/print/apsfilter6/distinfo b/print/apsfilter6/distinfo
index 041e2e6c0b93..e592bc1555a1 100644
--- a/print/apsfilter6/distinfo
+++ b/print/apsfilter6/distinfo
@@ -1 +1 @@
-MD5 (apsfilter-current-07.09.2000.tar.bz2) = 2b478d1d606540aac1e734aa47983477
+MD5 (apsfilter-current-09.09.2000.tar.bz2) = 86340abc2d75be8215a54b225f3fc5db
diff --git a/print/apsfilter6/scripts/configure b/print/apsfilter6/scripts/configure
index 3724a4c41bc2..f93597740538 100644
--- a/print/apsfilter6/scripts/configure
+++ b/print/apsfilter6/scripts/configure
@@ -11,23 +11,23 @@ if [ "$BATCH" != "yes" ]; then
 /usr/bin/dialog --title "supported file types" --clear \
 	--checklist "\n\
 Select file types you want to print:" -1 -1 14	\
-LETTER		"LETTER printing"		OFF	\
-LETTERDJ	"LETTERDJ printing"		ON	\
-A4		"A4 printing"			OFF	\
-PS		"Postscript and PDF files"	ON	\
-SAMBA		"Windows Remote-Print Support"	ON	\
-ATALK		"AppleTalk Remote-Print Support" OFF	\
-ENCRYPTED_PDF	"Encrypted PDF files"		ON	\
-ASCII		"ASCII/English Text/Scripts"	ON	\
-MAIL		"Mail/News articles"		ON	\
-DVI		"TeX DVI files"			OFF	\
-HTML		"HTML documents"		OFF	\
-TROFF		"Troff documents"		ON	\
-JPEG		"JPEG pictures"			OFF	\
-TIFF		"TIFF pictures"			OFF	\
-PBM		"GIF/PNM/PBM/PPM/BMP pictures"	ON	\
-FIG		"XFIG drawings"			OFF	\
-FAXG3		"Fax Group 3 files"		OFF	\
+A4		"A4 papersize"					ON	\
+LETTER		"letter papersize"				OFF	\
+LETTERDJ	"letter + special DeskJet adjustements"		OFF	\
+GS		"Postscript for non-PS printer, needs X11"	ON	\
+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	\
+CONVERT		"support for lots of graphic file formats"	ON	\
+DVIPS		"TeX DVI files"					OFF	\
+FIG2DEV		"XFIG drawings"					OFF	\
+HTML2PS		"HTML documents"				OFF	\
+TROFF		"Troff documents"				OFF	\
+ATALK		"remote printing on AppleTalk remote printer"	OFF	\
+SAMBA		"remote printing on Windows remote printer"	OFF	\
+BZIP2		"print bunzip2 compressed documents"		OFF	\
+FREEZE		"print freeze compressed documents"		OFF	\
 2> /tmp/apsfilter-checklist.$$
 
 retval=$?
@@ -52,6 +52,10 @@ exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 
 while [ "$1" ]; do
     case $1 in
+	\"A4\")
+		PAPERSIZE=a4
+		echo "PAPERSIZE=a4"
+		;;
 	\"LETTER\")
 		PAPERSIZE=letter
 		echo "PAPERSIZE=letter"
@@ -60,53 +64,52 @@ while [ "$1" ]; do
 		PAPERSIZE=letterdj
 		echo "PAPERSIZE=letterdj"
 		;;
-	\"A4\")
-		PAPERSIZE=a4
-		echo "PAPERSIZE=a4"
-		;;
-	\"PS\")
+	\"GS\")
 		echo RUN_DEPENDS+=gs:${PORTSDIR}/print/ghostscript6
 		;;
-	\"SAMBA\")
-		echo RUN_DEPENDS+=smbclient:${PORTSDIR}/net/samba
-		;;
-	\"ATALK\")
-		echo RUN_DEPENDS+=pap:${PORTSDIR}/net/netatalk
-		;;
-	\"ENCRYPTED_PDF\")
+	\"GS_PDF_CRYPT\")
 		echo RUN_DEPENDS+=gs:${PORTSDIR}/print/ghostscript6
 		echo PDFENCRYPT=YES
 		;;
-	\"ASCII\")
+	\"PSUTILS\")
 		case $PAPERSIZE in
 		    letter)
-			echo RUN_DEPENDS+=a2ps:${PORTSDIR}/print/a2ps-letter
+			echo RUN_DEPENDS+=psnup:${PORTSDIR}/print/psutils-letter
 			;;
 		    letterdj)
-			echo RUN_DEPENDS+=a2ps:${PORTSDIR}/print/a2ps-letterdj
+			echo RUN_DEPENDS+=psnup:${PORTSDIR}/print/psutils-letter
 			;;
 		    a4)
-			echo RUN_DEPENDS+=a2ps:${PORTSDIR}/print/a2ps-a4
+			echo RUN_DEPENDS+=psnup:${PORTSDIR}/print/psutils-a4
 			;;
 		esac
 		;;
-	\"MAIL\")
+	\"A2PS\")
 		case $PAPERSIZE in
 		    letter)
-			echo RUN_DEPENDS+=psnup:${PORTSDIR}/print/psutils-letter
+			echo RUN_DEPENDS+=a2ps:${PORTSDIR}/print/a2ps-letter
 			;;
 		    letterdj)
-			echo RUN_DEPENDS+=psnup:${PORTSDIR}/print/psutils-letter
+			echo RUN_DEPENDS+=a2ps:${PORTSDIR}/print/a2ps-letterdj
 			;;
 		    a4)
-			echo RUN_DEPENDS+=psnup:${PORTSDIR}/print/psutils-a4
+			echo RUN_DEPENDS+=a2ps:${PORTSDIR}/print/a2ps-a4
 			;;
 		esac
 		;;
-	\"DVI\")
+	\"ACROREAD4\")
+		echo RUN_DEPENDS+=acroread4:${PORTSDIR}/print/acroread4
+		;;
+	\"CONVERT\")
+		echo RUN_DEPENDS+=convert:${PORTSDIR}/graphics/ImageMagick
+		;;
+	\"DVIPS\")
 		echo RUN_DEPENDS+=dvips:${PORTSDIR}/print/teTeX
 		;;
-	\"HTML\")
+	\"FIG2DEV\")
+		echo RUN_DEPENDS+=fig2dev:${PORTSDIR}/print/transfig
+		;;
+	\"HTML2PS\")
 		case $PAPERSIZE in
 		    letter)
 		      echo RUN_DEPENDS+=html2ps:${PORTSDIR}/print/html2ps-letter
@@ -122,20 +125,17 @@ while [ "$1" ]; do
 	\"TROFF\")
 		TROFF=YES
 		;;
-	\"JPEG\")
-		echo RUN_DEPENDS+=cjpeg:${PORTSDIR}/graphics/jpeg
-		;;
-	\"TIFF\")
-		echo LIB_DEPENDS+=tiff.4:${PORTSDIR}/graphics/tiff
+	\"ATALK\")
+		echo RUN_DEPENDS+=pap:${PORTSDIR}/net/netatalk
 		;;
-	\"PBM\")
-		echo RUN_DEPENDS+=anytopnm:${PORTSDIR}/graphics/netpbm
+	\"SAMBA\")
+		echo RUN_DEPENDS+=smbclient:${PORTSDIR}/net/samba
 		;;
-	\"FIG\")
-		echo RUN_DEPENDS+=fig2dev:${PORTSDIR}/print/transfig
+	\"BZIP2\")
+		echo RUN_DEPENDS+=bunzip2:${PORTSDIR}/archivers/bzip2
 		;;
-	\"FAXG3\")
-		echo RUN_DEPENDS+=g3cat:${PORTSDIR}/comms/mgetty+sendfax
+	\"FREEZE\")
+		echo RUN_DEPENDS+=smbclient:${PORTSDIR}/archivers/freeze
 		;;
     esac
     shift