summaryrefslogtreecommitdiff
path: root/print
diff options
context:
space:
mode:
authorHiroki Sato <hrs@FreeBSD.org>2012-02-29 12:09:03 +0000
committerHiroki Sato <hrs@FreeBSD.org>2012-02-29 12:09:03 +0000
commit6026687361b17cf83542fa54ef9fa84385cb368e (patch)
tree914d35daaed4820634dd0ad3372493cc11a3edaf /print
parentTake maintainership. (diff)
Disable libpaper by default because it can override the A4SIZE option
unintentionally. Spotted by: ume
Notes
Notes: svn path=/head/; revision=292421
Diffstat (limited to 'print')
-rw-r--r--print/ghostscript9/Makefile14
1 files changed, 10 insertions, 4 deletions
diff --git a/print/ghostscript9/Makefile b/print/ghostscript9/Makefile
index 39a491ac30ae..5705de4efa98 100644
--- a/print/ghostscript9/Makefile
+++ b/print/ghostscript9/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ghostscript9
PORTVERSION= 9.05
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= print
MASTER_SITES= http://downloads.ghostscript.com/public/:gs_srcs \
SF/ghostscript/GPL%20Ghostscript/${PORTVERSION}:gs_srcs \
@@ -27,7 +27,6 @@ LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2 \
idn:${PORTSDIR}/dns/libidn \
jbig2dec:${PORTSDIR}/graphics/jbig2dec \
jpeg:${PORTSDIR}/graphics/jpeg \
- paper:${PORTSDIR}/print/libpaper \
png:${PORTSDIR}/graphics/png \
tiff:${PORTSDIR}/graphics/tiff
@@ -58,7 +57,6 @@ CONFIGURE_ARGS= --disable-compile-inits \
--enable-dynamic \
--with-ijs \
--with-libidn \
- --with-libpaper \
--without-jasper \
--with-drivers=""
CPPFLAGS+= -DUPD_SIGNAL=0 -I. \
@@ -77,9 +75,10 @@ SUB_LIST= DATADIR=${DATADIR} PORTVERSION=${PORTVERSION}
PKGMESSAGE= ${WRKDIR}/pkg-message
DATADIR= ${PREFIX}/share/${PORTNAME:S,9$,,}
-OPTIONS= A4SIZE "Set A4 (not Letter) as a default paper size" off \
+OPTIONS= A4SIZE "Set A4 (not Letter) as the default paper size" off \
CUPS "Enable CUPS support" on \
FONTCONFIG "fontconfig support" on \
+ LIBPAPER "libpaper support" off \
GTK "GTK frontend" off \
X11 "X11 support" on
@@ -117,6 +116,13 @@ MSG_PAPERSIZE= "NOTE: Default paper size will be A4."
.endif
.endif
+.if !defined(WITHOUT_LIBPAPER)
+LIB_DEPENDS+= paper:${PORTSDIR}/print/libpaper
+CONFIGURE_ARGS+= --with-libpaper
+.else
+CONFIGURE_ARGS+= --without-libpaper
+.endif
+
.if !defined(WITHOUT_FONTCONFIG)
LIB_DEPENDS+= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
CONFIGURE_ARGS+= --enable-fontconfig