svn commit: r316680 - in head/print/apsfilter: . scripts

[Hiroki Sato]

Author: hrs
Date: Sat Apr 27 18:04:42 2013
New Revision: 316680
URL: http://svnweb.freebsd.org/changeset/ports/316680

Log:
  Fix psutils-* and a2ps-* dependency.
  
  Spotted by:	Scott Allendorf

Modified:
  head/print/apsfilter/Makefile
  head/print/apsfilter/scripts/configure

Modified: head/print/apsfilter/Makefile
==============================================================================
--- head/print/apsfilter/Makefile	Sat Apr 27 17:52:39 2013	(r316679)
+++ head/print/apsfilter/Makefile	Sat Apr 27 18:04:42 2013	(r316680)
@@ -3,7 +3,7 @@
 
 PORTNAME=	apsfilter
 PORTVERSION=	7.2.8
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	print
 MASTER_SITES=	http://www.apsfilter.org/download/
 
@@ -61,7 +61,7 @@ PAPERSIZE?=	letter
 RUN_DEPENDS+=	melt:${PORTSDIR}/archivers/freeze
 RUN_DEPENDS+=	lzop:${PORTSDIR}/archivers/lzop
 # all needed "ASCII to ps" filter utilities
-RUN_DEPENDS+=	a2ps:${PORTSDIR}/print/a2ps-${PAPERSIZE}
+RUN_DEPENDS+=	a2ps:${PORTSDIR}/print/a2ps
 RUN_DEPENDS+=	enscript:${PORTSDIR}/print/enscript-${PAPERSIZE}
 RUN_DEPENDS+=	mpage:${PORTSDIR}/print/mpage
 RUN_DEPENDS+=	recode:${PORTSDIR}/converters/recode
@@ -104,7 +104,7 @@ RUN_DEPENDS+=	smbclient:${PORTSDIR}/${SA
 # since apsfilter should fit easily on installation CD 1...
 #
 # most important "xxx to ps" filter utilities
-RUN_DEPENDS+=	a2ps:${PORTSDIR}/print/a2ps-${PAPERSIZE}
+RUN_DEPENDS+=	a2ps:${PORTSDIR}/print/a2ps
 RUN_DEPENDS+=	psnup:${PORTSDIR}/print/psutils
 .endif
 

Modified: head/print/apsfilter/scripts/configure
==============================================================================
--- head/print/apsfilter/scripts/configure	Sat Apr 27 17:52:39 2013	(r316679)
+++ head/print/apsfilter/scripts/configure	Sat Apr 27 18:04:42 2013	(r316680)
@@ -86,30 +86,10 @@ while [ "$1" ]; do
 		echo PDFENCRYPT=YES
 		;;
 	\"PSUTILS\")
-		case $PAPERSIZE in
-		    letter)
-			echo RUN_DEPENDS+=psnup:${PORTSDIR}/print/psutils-letter
-			;;
-		    letterdj)
-			echo RUN_DEPENDS+=psnup:${PORTSDIR}/print/psutils-letter
-			;;
-		    a4)
-			echo RUN_DEPENDS+=psnup:${PORTSDIR}/print/psutils-a4
-			;;
-		esac
+		echo RUN_DEPENDS+=psnup:${PORTSDIR}/print/psutils
 		;;
 	\"A2PS\")
-		case $PAPERSIZE in
-		    letter)
-			echo RUN_DEPENDS+=a2ps:${PORTSDIR}/print/a2ps-letter
-			;;
-		    letterdj)
-			echo RUN_DEPENDS+=a2ps:${PORTSDIR}/print/a2ps-letterdj
-			;;
-		    a4)
-			echo RUN_DEPENDS+=a2ps:${PORTSDIR}/print/a2ps-a4
-			;;
-		esac
+		echo RUN_DEPENDS+=a2ps:${PORTSDIR}/print/a2ps
 		;;
 	\"CONVERT\")
 		echo RUN_DEPENDS+=convert:${PORTSDIR}/graphics/ImageMagick