aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhrs <hrs@FreeBSD.org>2013-04-28 02:04:42 +0800
committerhrs <hrs@FreeBSD.org>2013-04-28 02:04:42 +0800
commitfe0cb85c8a83982bd6ad775ba524720c627e8fdb (patch)
tree415a4adc3a8d0bb4c6e9fc07f77b88c04f699b4f
parent573e287e1faf681b3b64286579d9bf6ab12b289e (diff)
downloadfreebsd-ports-gnome-fe0cb85c8a83982bd6ad775ba524720c627e8fdb.tar.gz
freebsd-ports-gnome-fe0cb85c8a83982bd6ad775ba524720c627e8fdb.tar.zst
freebsd-ports-gnome-fe0cb85c8a83982bd6ad775ba524720c627e8fdb.zip
Fix psutils-* and a2ps-* dependency.
Spotted by: Scott Allendorf
-rw-r--r--print/apsfilter/Makefile6
-rw-r--r--print/apsfilter/scripts/configure24
2 files changed, 5 insertions, 25 deletions
diff --git a/print/apsfilter/Makefile b/print/apsfilter/Makefile
index f789c9ad9e7f..87661908dd53 100644
--- a/print/apsfilter/Makefile
+++ b/print/apsfilter/Makefile
@@ -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}/${SAMBA_PORT}
# 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
diff --git a/print/apsfilter/scripts/configure b/print/apsfilter/scripts/configure
index 6cf3906f69ed..1766fae00c00 100644
--- a/print/apsfilter/scripts/configure
+++ b/print/apsfilter/scripts/configure
@@ -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