Index: head/print/ghostscript9-agpl/Makefile
===================================================================
--- head/print/ghostscript9-agpl/Makefile	(revision 326311)
+++ head/print/ghostscript9-agpl/Makefile	(revision 326312)
@@ -1,203 +1,203 @@
 # $FreeBSD$
 
 PORTNAME=	ghostscript
 PORTVERSION=	9.07
 PORTREVISION=	3
 CATEGORIES=	print
 MASTER_SITES=	http://downloads.ghostscript.com/public/:gs_srcs \
 		SF/ghostscript/GPL%20Ghostscript/${PORTVERSION}:gs_srcs \
 		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/GPL/gs${PORTVERSION:S/.//}/:gs_srcs \
 		http://www.humblesoft.com/pub/:epag
 MASTER_SITE_SUBDIR=	ghostscript/:gs_srcs
 PKGNAMESUFFIX=	9-agpl
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:gs_srcs ${EPAG_SRCS}:epag
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
-EXTRACT_AFTER_ARGS=	| ${TAR} -xpf - ${EXCLUDE_DIRS:S/^/--exclude /}
+EXTRACT_AFTER_ARGS=	${EXCLUDE_DIRS:S/^/--exclude /}
 
 MAINTAINER=	doceng@FreeBSD.org
 COMMENT=	Ghostscript 9.x PostScript interpreter
 
 LICENSE=	AGPLv3
 
 LIB_DEPENDS=	expat:${PORTSDIR}/textproc/expat2 \
 		idn:${PORTSDIR}/dns/libidn \
 		jbig2dec:${PORTSDIR}/graphics/jbig2dec \
 		jpeg:${PORTSDIR}/graphics/jpeg \
 		png15:${PORTSDIR}/graphics/png \
 		tiff:${PORTSDIR}/graphics/tiff \
 		lcms2:${PORTSDIR}/graphics/lcms2 \
 		paper:${PORTSDIR}/print/libpaper
 RUN_DEPENDS=	${LOCALBASE}/share/${PORTNAME}/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts
 
 CONFLICTS_INSTALL= \
 		gambc-[0-9]* \
 		ghostscript[789]-[0-9]* \
 		ghostscript[789]-nox11-[0-9]*
 
+USES=		gmake
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 WANT_GNOME=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	autoconf
 GNU_CONFIGURE=	yes
 
 MAKE_ENV=	CFLAGS_STANDARD="${CFLAGS}" \
 		XCFLAGS="${XCFLAGS}" XLDFLAGS="${XLDFLAGS}" \
 		EXTRALIBS="${EXTRALIBS}" \
 		SOC_LOADER="dxmainc.c"
 CONFIGURE_ENV=	${MAKE_ENV}
 CONFIGURE_ARGS=	--disable-compile-inits \
 		--enable-contrib \
 		--enable-dynamic \
 		--with-system-libtiff \
 		--with-ijs \
 		--with-libidn \
 		--without-jasper \
 		--with-libpaper \
 		--with-drivers=""
 CPPFLAGS+=	-DUPD_SIGNAL=0 -I. \
 		-I${WRKSRC}/lcms2/include \
 		-I${LOCALBASE}/include/libpng \
 		-I${WRKSRC}/openjpeg/libopenjpeg \
 		-I${WRKSRC}/openjpeg \
 		-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 XCFLAGS=	${PTHREAD_CFLAGS} \
 		-DA4
 XLDFLAGS=	${PTHREAD_LIBS}
 
 PLIST_SUB=	GS_VERSION="${PORTVERSION}" \
 		X11BITS=${X11BITS}
 SUB_FILES=	pkg-message
 SUB_LIST=	DATADIR=${DATADIR} PORTVERSION=${PORTVERSION}
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 OPTIONS_DEFINE=	X11 DOCS CUPS FONTCONFIG ICONV GTK2
 OPTIONS_DEFAULT=X11 DOCS CUPS FONTCONFIG ICONV
 FONTCONFIG_DESC=Enable fontconfig support
 NO_OPTIONS_SORT=yes
 
 MAN1=		dvipdf.1 font2c.1 gs.1 gslp.1 gsnd.1 \
 		pdf2dsc.1 pdf2ps.1 pdfopt.1 pf2afm.1 pfbtopfa.1 printafm.1 \
 		ps2ascii.1 ps2epsi.1 ps2pdf.1 ps2pdfwr.1 ps2ps.1 \
 		wftopfa.1
 MLINKS=		gslp.1 gsbj.1 \
 		gslp.1 gsdj.1 \
 		gslp.1 gsdj500.1 \
 		gslp.1 gslj.1 \
 		ps2pdf.1 ps2pdf12.1 \
 		ps2pdf.1 ps2pdf13.1 \
 		ps2pdf.1 ps2pdf14.1 \
 		ps2ps.1 eps2eps.1
 
 EXCLUDE_DIRS=	freetype jbig2dec jpeg expat jasper lcms libpng tiff zlib
 
 .include "Makefile.drivers"
 .include <bsd.port.options.mk>
 
 MASTERDIR?=	${.CURDIR}
 .include "${MASTERDIR}/files/Makefile.drivers_post"
 
 .for D in ${OPTIONS_DEFINE:MGS_*:S/^GS_//} \
 	${OPTIONS_MULTI_X11:MGS_*:S/^GS_//} \
 	${OPTIONS_GROUP_ICONV:MGS_*:S/^GS_//} \
 	${OPTIONS_GROUP_SVGALIB:MGS_*:S/^GS_//}
 .if ${PORT_OPTIONS:MGS_${D}}
 PLIST_SUB+=	GS_${D}=""
 .else
 PLIST_SUB+=	GS_${D}="@comment "
 .endif
 .endfor
 
 .if ${PORT_OPTIONS:MFONTCONFIG}
 LIB_DEPENDS+=	fontconfig:${PORTSDIR}/x11-fonts/fontconfig
 CONFIGURE_ARGS+=	--enable-fontconfig
 .else
 CONFIGURE_ARGS+=	--disable-fontconfig
 .endif
 
 # FT_BRIDGE=1 by default
 LIB_DEPENDS+=	freetype:${PORTSDIR}/print/freetype2
 MAKE_ENV+=	FT_BRIDGE=1
 
 ALL_TARGET=	so
 INSTALL_TARGET=	soinstall
 USE_LDCONFIG=	yes
 PLIST_SUB+=	SHLIB_VER="${PORTVERSION:R}"
 
 PORTDOCS=	japanese chp2200 epson740 lxm3200-tweaked md2k_md5k
 PORTDOC_FILES=	japanese/Gdevlips.htm japanese/README.gs550j		\
 	japanese/cdj880.txt japanese/dj505j.txt japanese/djgpp.txt	\
 	japanese/gdev10v.txt japanese/gdevalps.txt			\
 	japanese/gdevcd8.txt japanese/gdevdmpr.txt			\
 	japanese/gdevfmlbp.txt japanese/gdevj100.txt			\
 	japanese/gdevlbp3.txt japanese/gdevmag.txt			\
 	japanese/gdevmd2k.txt japanese/gdevmjc.txt			\
 	japanese/gdevml6.txt japanese/gdevp201.txt japanese/gs261j.euc	\
 	japanese/gs261j.txt chp2200/AUTHORS chp2200/INSTALL		\
 	epson740/README epson740/upp-HowTo-to-be			\
 	lxm3200-tweaked/LICENSE lxm3200-tweaked/README			\
 	lxm3200-tweaked/RELEASE_NOTES					\
 	lxm3200-tweaked/Z12-Z31-QuickSetup md2k_md5k/README.jis
 
 post-patch:
 	${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|g ; \
 		 s|%%GS_VERSION%%|${PORTVERSION}|g' \
 			${WRKSRC}/contrib/japanese/dmp_site.ps
 
 pre-build-drivers.mak:
 	@${ECHO_CMD} '# automatically generated' > ${WRKSRC}/base/drivers.mak
 	@${ECHO_CMD} 'DEVICE_DEVS=$${DISPLAY_DEV}' >> ${WRKSRC}/base/drivers.mak
 .for N in ${DEVS_LIST}
 	@${ECHO_CMD} '${N:S/^/DEVICE_/:S/^DEVICE_DISPLAY_DEV/DISPLAY_DEV/}=' >> ${WRKSRC}/base/drivers.mak
 .endfor
 .for D in ${OPTIONS_DEFINE:MGS_*:S/^GS_//} \
 	${OPTIONS_MULTI_X11:MGS_*:S/^GS_//} \
 	${OPTIONS_GROUP_ICONV:MGS_*:S/^GS_//} \
 	${OPTIONS_GROUP_SVGALIB:MGS_*:S/^GS_//}
 .for N in ${DEVS_LIST}
 .if ${PORT_OPTIONS:MGS_${D}}
 .if !defined(OPTIONS_UNSET) || !${OPTIONS_UNSET:MGS_${D}}
 .for X in ${${N:S/^/DEVICE_/:S/^DEVICE_DISPLAY_DEV/DISPLAY_DEV/}:M${D}.dev}
 	@${ECHO_CMD} '${N:S/^/DEVICE_/:S/^DEVICE_DISPLAY_DEV/DISPLAY_DEV/}+= $$(DD)${D}.dev'  >> ${WRKSRC}/base/drivers.mak
 .endfor
 .endif
 .endif
 .endfor
 .endfor
 
 pre-build: pre-build-drivers.mak
 	${MKDIR} ${WRKSRC}/obj
 	${MKDIR} ${WRKSRC}/bin
 
 pre-install:
 	cd ${WRKSRC}/Resource/Init && ${RM} -f \
 		gs_statd.ps.orig gs_ttf.ps.orig pdf_font.ps.orig
 
 pre-su-install:
 	${MKDIR} ${DATADIR}
 
 post-install-docs:
 	${MKDIR} ${WRKSRC}/contrib/japanese
 	${INSTALL_DATA} ${WRKSRC}/contrib/japanese/doc/* ${WRKSRC}/contrib/japanese
 	${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC}/contrib && \
 		${TAR} -cf - ${PORTDOC_FILES} | \
 		( cd ${DOCSDIR} && ${TAR} -xof - )
 
 post-install:
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}/${PORTVERSION}
 	${STRIP_CMD} ${PREFIX}/bin/gsc ${PREFIX}/bin/gsx
 	${LN} -sf gsc ${PREFIX}/bin/gs
 	${LN} -s -f ${LOCALBASE}/share/fonts/CIDFont \
 		${DATADIR}/${PORTVERSION}/Resource/CIDFont/fonts
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
 
 .if ${PORT_OPTIONS:MDOCS}
 post-install: post-install-docs
 .endif
 
 .include <bsd.port.mk>
Index: head/print/ghostscript9-agpl/files/Makefile.drivers_post
===================================================================
--- head/print/ghostscript9-agpl/files/Makefile.drivers_post	(revision 326311)
+++ head/print/ghostscript9-agpl/files/Makefile.drivers_post	(revision 326312)
@@ -1,203 +1,203 @@
 # $FreeBSD$
 # pre/postprocessing driver variables
 
 # dmprt specific
 .if ${PORT_OPTIONS:MGS_dmprt}
 .include "${MASTERDIR}/files/Makefile.dmprt"
 .endif
 
 # epag specific
 .if ${PORT_OPTIONS:MGS_epag}
 .include "${MASTERDIR}/files/Makefile.epag"
 .endif
 
 EPAG_BASE=	epag
 EPAG_SRCS=	${EPAG_BASE}-3.09.tar.gz
 EPAG_NAME=	${EPAG_SRCS:S,.tar.gz$,,}
 
 post-extract-epag:
 	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EPAG_SRCS}
 	${LN} -s -f ${EPAG_NAME} ${WRKSRC}/${EPAG_BASE}
 	${INSTALL_DATA} ${FILESDIR}/epag.contrib.mak ${WRKSRC}/base/epag.contrib.mak
 
 post-extract: post-extract-epag
 
 # pcl3 specific
 .if ${PORT_OPTIONS:MGS_pcl3}
 .include "${MASTERDIR}/files/Makefile.pcl3"
 .endif
 
 # cups specific
 CUPS_DEVS= cups
 .undef _CUPS_DEVS
 
 .for D in ${CUPS_DEVS}
 .if ${PORT_OPTIONS:MCUPS} && ${PORT_OPTIONS:MGS_${D}}
 _CUPS_DEVS+= ${D}
 .else
 PORT_OPTIONS:=	${PORT_OPTIONS:NGS_${D}}
 .endif
 .endfor
 
 .if defined(_CUPS_DEVS)
 LIB_DEPENDS+=	cupsimage.2:${PORTSDIR}/print/cups-image
 CONFIGURE_ARGS+=	--enable-cups
 .else
 CONFIGURE_ARGS+=	--disable-cups
 .endif
 
 # vgalib specific
 VGA_DEVS= lvga256 vgalib
 .undef _VGA_DEVS
 
 .for D in ${VGA_DEVS}
 .if ${PORT_OPTIONS:MGS_${D}}
 .if ${ARCH:Mamd64} || ${ARCH:Mi386}
 _VGA_DEVS+= ${D}
 .else
 OPTIONS_UNSET+=	${PORT_OPTIONS:MGS_${D}}
 .endif
 .endif
 .endfor
 
 .if defined(_VGA_DEVS)
 LIB_DEPENDS+=	vga.1:${PORTSDIR}/graphics/svgalib
 .endif
 
 # x11 specific
 X11_DEVS= x11 x11alpha x11cmyk x11cmyk2 x11cmyk4 x11cmyk8  x11gray2 x11gray4 \
 	x11mono x11rg16x x11rg32x display
 .undef _X11_DEVS
 
 .for D in ${X11_DEVS}
 .if ${PORT_OPTIONS:MX11} && ${PORT_OPTIONS:MGS_${D}}
 _X11_DEVS+= ${D}
 .else
 PORT_OPTIONS:=	${PORT_OPTIONS:NGS_${D}}
 .endif
 .endfor
 
 .if defined(_X11_DEVS)
 USE_XORG=	xt xext
 X11BITS=	""
 CONFIGURE_ARGS+=--with-x \
 		--x-includes=${LOCALBASE}/include \
 		--x-libraries=${LOCALBASE}/lib
 CONFLICTS_INSTALL+=	ghostscript9-nox11-[0-9]*
 .if ${PORT_OPTIONS:MGTK2}
 USE_GNOME=	atk gdkpixbuf2 glib20 gtk20
 CONFIGURE_ARGS+=--enable-gtk
 .else
 CONFIGURE_ARGS+=--disable-gtk
 .endif
 .else	# defined(_X11_DEVS)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-nox11
 CONFIGURE_ARGS+=--without-x --disable-gtk
 CONFLICTS_INSTALL+=	ghostscript9-[0-9]*
 X11BITS=	"@comment "
 .endif	# defined(_X11_DEVS)
 
 # iconv specific
 ICONV_DEVS= oprp opvp
 .undef _ICONV_DEVS
 
 .for D in ${ICONV_DEVS}
 .if ${PORT_OPTIONS:MICONV} && ${PORT_OPTIONS:MGS_${D}}
 _ICONV_DEVS+= ${D}
 .else
 PORT_OPTIONS:=	${PORT_OPTIONS:NGS_${D}}
 .endif
 .endfor
 
 .if defined(_ICONV_DEVS)
-USE_ICONV=	yes
+USES+=		iconv
 CONFIGURE_ARGS+=--with-libiconv=gnu
 EXTRALIBS+=	-liconv
 .else
 CONFIGURE_ARGS+=--with-libiconv=no
 .endif
 
 # pre-defined order
 DEVS_LIST= DISPLAY_DEV \
 	DEVS1 DEVS2 DEVS3 DEVS4 DEVS5 DEVS6 DEVS7 DEVS8 DEVS9	\
 	DEVS10 DEVS11 DEVS12 DEVS13 DEVS14 DEVS15 DEVS16 DEVS17 DEVS18	\
 	DEVS19 DEVS20 DEVS21
 
 DISPLAY_DEV= bbox.dev
 DEVICE_DEVS1= bmpmono.dev bmpgray.dev bmpsep1.dev bmpsep8.dev	\
 	bmp16.dev bmp256.dev bmp16m.dev bmp32b.dev stcolor.dev
 DEVICE_DEVS2= epson.dev eps9high.dev eps9mid.dev epsonc.dev ibmpro.dev
 DEVICE_DEVS3= deskjet.dev djet500.dev laserjet.dev ljetplus.dev	\
 	ljet2p.dev ljet3.dev ljet3d.dev ljet4.dev ljet4d.dev	\
 	lj5mono.dev lj5gray.dev cups.dev
 DEVICE_DEVS4= cdeskjet.dev cdjcolor.dev cdjmono.dev cdj550.dev pj.dev	\
 	pjxl.dev pjxl300.dev ijs.dev
 DEVICE_DEVS5= uniprint.dev omni.dev inkcov.dev
 DEVICE_DEVS6= bj10e.dev bj200.dev bjc600.dev bjc800.dev png48.dev	\
 	png16m.dev pnggray.dev pngmono.dev png256.dev png16.dev		\
 	pngalpha.dev
 DEVICE_DEVS7= faxg3.dev faxg32d.dev faxg4.dev
 DEVICE_DEVS8= pcxmono.dev pcxgray.dev pcx16.dev pcx256.dev pcx24b.dev	\
 	pcxcmyk.dev svgwrite.dev plan.dev planc.dev plang.dev plank.dev \
 	planm.dev plib.dev plibc.dev plibg.dev plibk.dev plibm.dev
 DEVICE_DEVS9= pbm.dev pbmraw.dev pgm.dev pgmraw.dev pgnm.dev		\
 	pgnmraw.dev pnm.dev pnmraw.dev ppm.dev ppmraw.dev pkm.dev	\
 	pkmraw.dev pksm.dev pksmraw.dev
 DEVICE_DEVS10= tiffcrle.dev tiffg3.dev tiffg32d.dev tiffg4.dev	\
 	tifflzw.dev tiffpack.dev
 DEVICE_DEVS11= tiff12nc.dev tiff24nc.dev tiff48nc tiffgray.dev	\
 	tiff32nc.dev tiff64nc.dev tiffsep.dev tiffsep1.dev
 DEVICE_DEVS12= psmono.dev psgray.dev psrgb.dev bit.dev bitrgb.dev	\
 	bitcmyk.dev
 DEVICE_DEVS13=
 DEVICE_DEVS14= jpeg.dev jpeggray.dev jpegcmyk.dev
 DEVICE_DEVS15= pdfwrite.dev pswrite.dev ps2write.dev epswrite.dev	\
 	txtwrite.dev pxlmono.dev pxlcolor.dev
 DEVICE_DEVS16= bbox.dev
 DEVICE_DEVS17=
 DEVICE_DEVS18=
 DEVICE_DEVS20= cljet5.dev cljet5c.dev
 DEVICE_DEVS21= spotcmyk.dev devicen.dev xcf.dev psdcmyk.dev psdrgb.dev	\
 	pamcmyk32.dev
 
 # DEVS19 is for this port specific
 DEVICE_DEVS19= alc1900.dev alc2000.dev alc4000.dev alc4100.dev		\
 	alc8500.dev alc8600.dev ap3250.dev appledmp.dev atx23.dev	\
 	atx24.dev atx38.dev bj10v.dev bj10vh.dev bjc880j.dev		\
 	bjccmyk.dev bjccolor.dev bjcgray.dev bjcmono.dev 		\
 	ccr.dev cdj1600.dev cdj500.dev cdj670.dev cdj850.dev		\
 	cdj880.dev cdj890.dev cdj970.dev cdnj500.dev cfax.dev		\
 	cgm24.dev cgm8.dev cgmmono.dev chp2200.dev cif.dev		\
 	cljet5pr.dev coslw2p.dev coslwxl.dev cp50.dev declj250.dev	\
 	dfaxhigh.dev dfaxlow.dev display.dev dj505j.dev djet500c.dev	\
 	dl2100.dev dmprt.dev dnj650c.dev epag.dev epl2050.dev		\
 	epl2050p.dev epl2120.dev epl2500.dev epl2750.dev epl5800.dev	\
 	epl5900.dev epl6100.dev eplcolor.dev eplmono.dev escpage.dev	\
 	fmlbp.dev fmpr.dev fs600.dev gdi.dev hl1240.dev hl1250.dev	\
 	hl7x0.dev imagen.dev imdi.dev inferno.dev iwhi.dev iwlo.dev	\
 	iwlq.dev jetp3852.dev jj100.dev jpegcmyk.dev la50.dev la70.dev	\
 	la75.dev la75plus.dev lbp310.dev lbp320.dev lbp8.dev		\
 	lex2050.dev lex3200.dev lex5700.dev lex7000.dev lips2p.dev	\
 	lips3.dev lips4.dev lips4v.dev lj250.dev lj4dith.dev		\
 	lj4dithp.dev ljet4pjl.dev ln03.dev lp1800.dev lp1900.dev	\
 	lp2000.dev lp2200.dev lp2400.dev lp2500.dev lp2563.dev		\
 	lp3000c.dev lp7500.dev lp7700.dev lp7900.dev lp8000.dev		\
 	lp8000c.dev lp8100.dev lp8200c.dev lp8300c.dev lp8300f.dev	\
 	lp8400f.dev lp8500c.dev lp8600.dev lp8600f.dev lp8700.dev	\
 	lp8800c.dev lp8900.dev lp9000b.dev lp9000c.dev lp9100.dev	\
 	lp9300.dev lp9400.dev lp9500c.dev lp9600.dev lp9600s.dev	\
 	lp9800c.dev lq850.dev lvga256.dev lx5000.dev lxm3200.dev	\
 	lxm5700m.dev m8510.dev mag16.dev mag256.dev md1xMono.dev	\
 	md2k.dev md50Eco.dev md50Mono.dev md5k.dev mgr4.dev mgr8.dev	\
 	mgrgray2.dev mgrgray4.dev mgrgray8.dev mgrmono.dev miff24.dev	\
 	mj500c.dev mj6000c.dev mj700v2c.dev mj8000c.dev ml600.dev	\
 	necp6.dev npdl.dev oce9050.dev oki182.dev oki4w.dev okiibm.dev	\
 	oprp.dev opvp.dev paintjet.dev pam.dev pamcmyk32.dev pcl3.dev	\
 	perm.dev photoex.dev picty180.dev pjetxl.dev plan9bm.dev	\
 	pr1000.dev pr1000_4.dev pr150.dev pr201.dev r4081.dev rpdl.dev	\
 	sgirgb.dev sj48.dev st800.dev sunhmono.dev t4693d2.dev		\
 	t4693d4.dev t4693d8.dev tek4696.dev tiff48nc tiff64nc.dev	\
 	tiffsep1.dev txtwrite.dev vgalib.dev wtscmyk.dev wtsimdi.dev	\
 	x11.dev x11alpha.dev x11cmyk.dev x11cmyk2.dev x11cmyk4.dev	\
 	x11cmyk8.dev x11gray2.dev x11gray4.dev x11mono.dev x11rg16x.dev	\
 	x11rg32x.dev xcfcmyk.dev xes.dev