svn commit: r373122 - in head: . print print/ghostscript7 print/ghostscript7-commfont print/ghostscript7-commfont/files print/ghostscript7-jpnfont print/ghostscript7-korfont print/ghostscript7-nox1...

Sun Nov 23 06:14:28 UTC 2014

Author: hrs
Date: Sun Nov 23 06:14:21 2014
New Revision: 373122
URL: https://svnweb.freebsd.org/changeset/ports/373122
QAT: https://qat.redports.org/buildarchive/r373122/

Log:
  Resurrect print/ghostscript7{,-commfont,-jpnfont,-korfont,-nox11}.

Added:
  head/print/ghostscript7/
     - copied from r362828, head/print/ghostscript7/
  head/print/ghostscript7-commfont/
     - copied from r362828, head/print/ghostscript7-commfont/
  head/print/ghostscript7-jpnfont/
     - copied from r362828, head/print/ghostscript7-jpnfont/
  head/print/ghostscript7-korfont/
     - copied from r362828, head/print/ghostscript7-korfont/
  head/print/ghostscript7-nox11/
     - copied from r362828, head/print/ghostscript7-nox11/
  head/print/ghostscript7/files/patch-src-unixinst.mak   (contents, props changed)
Modified:
  head/MOVED
  head/print/Makefile
  head/print/ghostscript7-commfont/Makefile
  head/print/ghostscript7-commfont/files/Makefile.in
  head/print/ghostscript7-jpnfont/Makefile
  head/print/ghostscript7-korfont/Makefile
  head/print/ghostscript7-nox11/Makefile
  head/print/ghostscript7/Makefile
  head/print/ghostscript7/files/Makefile.alps
  head/print/ghostscript7/files/Makefile.bj10v
  head/print/ghostscript7/files/Makefile.dmprt
  head/print/ghostscript7/files/Makefile.epag
  head/print/ghostscript7/files/Makefile.eplaser
  head/print/ghostscript7/files/Makefile.gdi
  head/print/ghostscript7/files/Makefile.lips
  head/print/ghostscript7/files/Makefile.lxm3200
  head/print/ghostscript7/files/Makefile.md2k
  head/print/ghostscript7/files/Makefile.mjc
  head/print/ghostscript7/files/Makefile.pcl3
  head/print/ghostscript7/files/patch-src-Makefile.in
  head/print/ghostscript7/files/patch-src:unix-dll.mak
  head/print/ghostscript7/pkg-plist

Modified: head/MOVED
==============================================================================

--- head/MOVED	Sun Nov 23 03:49:48 2014	(r373121)
+++ head/MOVED	Sun Nov 23 06:14:21 2014	(r373122)
@@ -6979,11 +6979,6 @@ sysutils/boxbackup||2014-09-01|Not stage
 www/webcalendar-devel|www/webcalendar|2014-09-04|Removed, use www/webcalendar instead
 devel/ruby-memoize||2014-09-06|Has expired: RubyForge shutdown May 15 2014
 www/oops||2014-09-06|Development stops long ago, domain has been expired
-print/ghostscript7||2014-09-06|Not staged
-print/ghostscript7-commfont||2014-09-06|Not staged
-print/ghostscript7-jpnfont||2014-09-06|Not staged
-print/ghostscript7-korfont||2014-09-06|Not staged
-print/ghostscript7-nox11||2014-09-06|Not staged
 net/freeswitch-core-devel||2014-09-06|Not staged
 net/freeswitch-devel||2014-09-06|Not staged
 audio/freeswitch-sounds||2014-09-06|Not staged

Modified: head/print/Makefile
==============================================================================
--- head/print/Makefile	Sun Nov 23 03:49:48 2014	(r373121)
+++ head/print/Makefile	Sun Nov 23 06:14:21 2014	(r373122)
@@ -63,6 +63,11 @@
     SUBDIR += frescobaldi
     SUBDIR += ft2demos
     SUBDIR += ggv
+    SUBDIR += ghostscript7
+    SUBDIR += ghostscript7-commfont
+    SUBDIR += ghostscript7-jpnfont
+    SUBDIR += ghostscript7-korfont
+    SUBDIR += ghostscript7-nox11
     SUBDIR += ghostscript8
     SUBDIR += ghostscript8-nox11
     SUBDIR += ghostscript9

Modified: head/print/ghostscript7-commfont/Makefile
==============================================================================
--- head/print/ghostscript7-commfont/Makefile	Thu Jul 24 16:33:10 2014	(r362828)
+++ head/print/ghostscript7-commfont/Makefile	Sun Nov 23 06:14:21 2014	(r373122)
@@ -3,13 +3,13 @@
 
 PORTNAME=	ghostscript
 PORTVERSION=	7.07
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	print
 MASTER_SITES=	# empty
 PKGNAMESUFFIX=	7-commfont
 DISTFILES=	# empty
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	hrs at FreeBSD.org
 COMMENT=	Common files for Ghostscript 7.x CJK font support
 
 BUILD_DEPENDS=	${CMAPDIR}/ac15/cid2code.txt:${PORTSDIR}/print/adobe-cmaps
@@ -25,7 +25,8 @@ DEPENDS_ARGS+=	-DA4
 # set these forcibly
 USE_GHOSTSCRIPT_RUN=7
 
-CONFLICTS=	ghostscript8-[0-9]* \
+CONFLICTS_INSTALL= \
+		ghostscript8-[0-9]* \
 		ghostscript8-nox11-[0-9]* \
 		ghostscript9-[0-9]* \
 		ghostscript9-nox11-[0-9]* \
@@ -37,8 +38,4 @@ GS_RESDIR?=	share/ghostscript/Resource
 
 post-extract:	apply-slist
 
-NO_STAGE=	yes
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.mk>

Modified: head/print/ghostscript7-commfont/files/Makefile.in
==============================================================================
--- head/print/ghostscript7-commfont/files/Makefile.in	Thu Jul 24 16:33:10 2014	(r362828)
+++ head/print/ghostscript7-commfont/files/Makefile.in	Sun Nov 23 06:14:21 2014	(r373122)
@@ -130,12 +130,12 @@ all:
 	@echo "Generating virtual fonts...done."
 
 install:
-	${MKDIR} ${GS_RESCIDFONTDIR}
-	${INSTALL_DATA} CIDFont/* ${GS_RESCIDFONTDIR}
-	${MKDIR} ${GS_RESFONTDIR}
-	${INSTALL_DATA} Font/* ${GS_RESFONTDIR}
-	${MKDIR} ${GS_RESCMAPDIR}
-	cd ${GS_RESCMAPDIR} && ${LN} -s -f `${FIND} ${CMAPDIR} -type f` .
+	${MKDIR} ${DESTDIR}${GS_RESCIDFONTDIR}
+	${INSTALL_DATA} CIDFont/* ${DESTDIR}${GS_RESCIDFONTDIR}
+	${MKDIR} ${DESTDIR}${GS_RESFONTDIR}
+	${INSTALL_DATA} Font/* ${DESTDIR}${GS_RESFONTDIR}
+	${MKDIR} ${DESTDIR}${GS_RESCMAPDIR}
+	cd ${DESTDIR}${GS_RESCMAPDIR} && ${LN} -s -f `${FIND} ${CMAPDIR} -type f` .
 .for T in ${TEMPLATES_CID}
-	cd ${GS_RESCIDFONTDIR} && ${LN} -s -f ${CIDFONTDIR}/${${T:tu}.GENERIC_SUBST} ${${T:tu}.GENERIC_SUBST}
+	cd ${DESTDIR}${GS_RESCIDFONTDIR} && ${LN} -s -f ${CIDFONTDIR}/${${T:tu}.GENERIC_SUBST} ${${T:tu}.GENERIC_SUBST}
 .endfor

Modified: head/print/ghostscript7-jpnfont/Makefile
==============================================================================
--- head/print/ghostscript7-jpnfont/Makefile	Thu Jul 24 16:33:10 2014	(r362828)
+++ head/print/ghostscript7-jpnfont/Makefile	Sun Nov 23 06:14:21 2014	(r373122)
@@ -3,13 +3,13 @@
 
 PORTNAME=	ghostscript
 PORTVERSION=	7.07
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	print japanese
 MASTER_SITES=	# empty
 PKGNAMESUFFIX=	7-jpnfont
 DISTFILES=	# empty
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	hrs at FreeBSD.org
 COMMENT=	Japanese font support for Ghostscript 7.x
 
 RUN_DEPENDS=	${LOCALBASE}/share/fonts/std.ja_JP/Ryumin-Light.gs7:${PORTSDIR}/japanese/font-std \
@@ -20,7 +20,6 @@ USE_GHOSTSCRIPT_RUN=	7
 NO_BUILD=		yes
 DEPENDS_ARGS+=		-DA4
 
-NO_STAGE=	yes
 do-install:
 	@${DO_NADA}
 

Modified: head/print/ghostscript7-korfont/Makefile
==============================================================================
--- head/print/ghostscript7-korfont/Makefile	Thu Jul 24 16:33:10 2014	(r362828)
+++ head/print/ghostscript7-korfont/Makefile	Sun Nov 23 06:14:21 2014	(r373122)
@@ -3,13 +3,13 @@
 
 PORTNAME=	ghostscript
 PORTVERSION=	7.07
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	print korean
 MASTER_SITES=	# empty
 PKGNAMESUFFIX=	7-korfont
 DISTFILES=	# empty
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	hrs at FreeBSD.org
 COMMENT=	Korean font support for Ghostscript 7.x
 
 RUN_DEPENDS=	${LOCALBASE}/share/fonts/CIDFont/Munhwa-Regular:${PORTSDIR}/korean/munhwafonts-cid \
@@ -20,7 +20,6 @@ USE_GHOSTSCRIPT_RUN=	7
 NO_BUILD=		yes
 DEPENDS_ARGS+=		-DA4
 
-NO_STAGE=	yes
 do-install:
 	@${DO_NADA}
 

Modified: head/print/ghostscript7-nox11/Makefile
==============================================================================
--- head/print/ghostscript7-nox11/Makefile	Thu Jul 24 16:33:10 2014	(r362828)
+++ head/print/ghostscript7-nox11/Makefile	Sun Nov 23 06:14:21 2014	(r373122)
@@ -5,5 +5,4 @@ WITHOUT_X11=	yes
 
 MASTERDIR=	${.CURDIR}/../ghostscript7
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"

Modified: head/print/ghostscript7/Makefile
==============================================================================
--- head/print/ghostscript7/Makefile	Thu Jul 24 16:33:10 2014	(r362828)
+++ head/print/ghostscript7/Makefile	Sun Nov 23 06:14:21 2014	(r373122)
@@ -3,7 +3,7 @@
 
 PORTNAME=	ghostscript
 PORTVERSION=	7.07
-PORTREVISION=	29
+PORTREVISION=	30
 CATEGORIES=	print
 MASTER_SITES=	SF/ghostscript/gnu-gs/${PORTVERSION}:gs_srcs \
 		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/gs${PORTVERSION:S/.//}/:gs_srcs \
@@ -16,7 +16,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:gs
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	hrs at FreeBSD.org
 COMMENT=	Ghostscript 7.x PostScript interpreter
 
 LICENSE=	GPLv2
@@ -32,8 +32,9 @@ CONFLICTS_INSTALL= \
 		ghostscript9-agpl-[0-9]* \
 		ghostscript9-agpl-nox11-[0-9]*
 
-USES=		gmake tar:bzip2
+USES=		tar:bzip2 gmake shebangfix
 USE_LDCONFIG=	yes
+SHEBANG_FILES=	lib/fixmswrd.pl	
 WANT_GNOME=	yes
 # normazile WRKSRC so things like cups-pstoraster may work
 WRKSRC=		${WRKDIR}/${PORTNAME}
@@ -55,20 +56,10 @@ PLIST_SUB=	GS_VERSION="${PORTVERSION}"
 OPTIONS_DEFINE=	X11 DOCS A4SIZE
 OPTIONS_DEFAULT=X11 DOCS A4SIZE
 NO_OPTIONS_SORT=yes
+X11_USE=	GNOME=gtk12
+X11_MAKE_ENV=	GS_SHLIB_VER="${SHLIB_VER}"
 A4SIZE_DESC=	Set A4 (not Letter) as the default paper size
 
-MAN1=		ansi2knr.1 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 \
-		ps2ps.1 eps2eps.1
-
-NO_STAGE=	yes
 post-extract-all:
 	${LN} -sf ${WRKDIR}/${DISTNAME} ${WRKDIR}/${PORTNAME}
 
@@ -77,10 +68,6 @@ post-extract: post-extract-all
 .include "Makefile.drivers"
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MX11}
-USE_GNOME=	gtk12
-.endif
-
 MASTERDIR?=	${.CURDIR}
 .include "${MASTERDIR}/files/Makefile.drivers_post"
 
@@ -103,7 +90,6 @@ CONTRIB_UPP=	lqx70ch.upp lqx70cl.upp lqx
 		stc740ih.upp stc740p.upp stc740pl.upp
 
 .if ${PORT_OPTIONS:MX11}
-MAKE_ENV+=	GS_SHLIB_VER="${SHLIB_VER}"
 SHLIB_VER=	1
 PLIST_SUB+=	SHLIB="" X11="" SHLIB_VER="${SHLIB_VER}"
 ALL_TARGET=	so
@@ -118,11 +104,9 @@ PLIST_SUB+=	SHLIB="@comment " X11="@comm
 
 post-patch:
 	${REINPLACE_CMD} -e 's|^DEVICE_DEVS|#DEVICE_DEVS|g' \
-		${WRKSRC}/src/unix-gcc.mak
-	${REINPLACE_CMD} -e 's|\. de|\.|g' \
-		${WRKSRC}/src/unixinst.mak
+	    ${WRKSRC}/src/unix-gcc.mak
 	${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|g' \
-		${WRKSRC}/lib/gs_res.ps
+	    ${WRKSRC}/lib/gs_res.ps
 
 pre-build-drivers.mak:
 	@${ECHO_CMD} '# automatically generated' > ${WRKSRC}/src/drivers.mak
@@ -152,28 +136,19 @@ pre-build-all:
 pre-build: pre-build-all pre-build-drivers.mak pre-build-contrib_extra.mak
 
 pre-su-install:
-	${MKDIR} ${DATADIR}
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}
+	${MKDIR} ${STAGEDIR}${DATADIR}
 
 post-install-docs:
-	${MKDIR} ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 
 post-install:
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}/${PORTVERSION}
 .if ${PORT_OPTIONS:MX11}
-	${STRIP_CMD} ${PREFIX}/bin/gsc ${PREFIX}/bin/gsx
-	${LN} -sf gsc ${PREFIX}/bin/gs
-.else
-	${STRIP_CMD} ${PREFIX}/bin/gs
+	${LN} -sf gsc ${STAGEDIR}${PREFIX}/bin/gs
 .endif
 	cd ${FILESDIR} \
-		&& ${INSTALL_DATA} ${CONTRIB_UPP} ${DATADIR}/${PORTVERSION}/lib
-	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG}
+	    && ${INSTALL_DATA} ${CONTRIB_UPP} \
+		${STAGEDIR}${DATADIR}/${PORTVERSION}/lib
 
-.if ${PORT_OPTIONS:MDOCS}
 post-install: post-install-docs
-.endif
 
 .include <bsd.port.mk>

Modified: head/print/ghostscript7/files/Makefile.alps
==============================================================================
--- head/print/ghostscript7/files/Makefile.alps	Thu Jul 24 16:33:10 2014	(r362828)
+++ head/print/ghostscript7/files/Makefile.alps	Sun Nov 23 06:14:21 2014	(r373122)
@@ -13,8 +13,9 @@ pre-build-alps:
 	${LN} -s -f ${WRKSRC}/alps/gdevalps.c ${WRKSRC}/src
 
 post-install-docs-alps:
-	${MKDIR} ${DOCSDIR}/alps
-	${INSTALL_DATA} ${WRKSRC}/alps/README.gdevalps ${DOCSDIR}/alps
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/alps
+	${INSTALL_DATA} ${WRKSRC}/alps/README.gdevalps \
+	    ${STAGEDIR}${DOCSDIR}/alps
 
 post-extract: post-extract-alps
 pre-build: pre-build-alps

Modified: head/print/ghostscript7/files/Makefile.bj10v
==============================================================================
--- head/print/ghostscript7/files/Makefile.bj10v	Thu Jul 24 16:33:10 2014	(r362828)
+++ head/print/ghostscript7/files/Makefile.bj10v	Sun Nov 23 06:14:21 2014	(r373122)
@@ -12,8 +12,9 @@ pre-build-bj10v:
 	${LN} -s -f ${WRKSRC}/gdev10v/gdev10v.c ${WRKSRC}/src
 
 post-install-docs-bj10v:
-	${MKDIR} ${DOCSDIR}/bj10v
-	${INSTALL_DATA} ${WRKSRC}/gdev10v/gdev10v.jis ${DOCSDIR}/bj10v
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/bj10v
+	${INSTALL_DATA} ${WRKSRC}/gdev10v/gdev10v.jis \
+	    ${STAGEDIR}${DOCSDIR}/bj10v
 
 post-extract: post-extract-bj10v
 pre-build: pre-build-bj10v

Modified: head/print/ghostscript7/files/Makefile.dmprt
==============================================================================
--- head/print/ghostscript7/files/Makefile.dmprt	Thu Jul 24 16:33:10 2014	(r362828)
+++ head/print/ghostscript7/files/Makefile.dmprt	Sun Nov 23 06:14:21 2014	(r373122)
@@ -16,11 +16,11 @@ post-patch-dmprt:
 post-install-dmprt:
 	cd ${WRKSRC}/src \
 		&& ${INSTALL_DATA} dmp_init.ps dmp_site.ps escp_24.src \
-		${DATADIR}/${PORTVERSION}/lib
+		${STAGEDIR}${DATADIR}/${PORTVERSION}/lib
 
 post-install-docs-dmprt:
-	${MKDIR} ${DOCSDIR}/dmprt
-	${INSTALL_DATA} ${WRKSRC}/src/gdevdmpr.sj ${DOCSDIR}/dmprt
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/dmprt
+	${INSTALL_DATA} ${WRKSRC}/src/gdevdmpr.sj ${STAGEDIR}${DOCSDIR}/dmprt
 
 post-extract: post-extract-dmprt
 post-patch: post-patch-dmprt

Modified: head/print/ghostscript7/files/Makefile.epag
==============================================================================
--- head/print/ghostscript7/files/Makefile.epag	Thu Jul 24 16:33:10 2014	(r362828)
+++ head/print/ghostscript7/files/Makefile.epag	Sun Nov 23 06:14:21 2014	(r373122)
@@ -21,16 +21,16 @@ pre-build-epag:
 	${LN} -s -f ${WRKSRC}/epag-3.09/gdevepag.c ${WRKSRC}/src
 
 post-install-epag:
-	${INSTALL_PROGRAM} ${WRKSRC}/epag-3.09/ert ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/epag-3.09/ert ${STAGEDIR}${PREFIX}/bin
 
 post-install-docs-epag:
-	${MKDIR} ${DOCSDIR}/epag
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/epag
 	cd ${WRKSRC}/epag-3.09 \
 		&& ${INSTALL_DATA} ert.txt gdevepag.txt ChangeLog \
-			${DOCSDIR}/epag
+			${STAGEDIR}${DOCSDIR}/epag
 	cd ${WRKSRC}/epag-3.09 \
 		&& ${INSTALL_SCRIPT} psprint gsepagif.sh \
-			${DOCSDIR}/epag
+			${STAGEDIR}${DOCSDIR}/epag
 
 post-extract: post-extract-epag
 pre-build: pre-build-epag

Modified: head/print/ghostscript7/files/Makefile.eplaser
==============================================================================
--- head/print/ghostscript7/files/Makefile.eplaser	Thu Jul 24 16:33:10 2014	(r362828)
+++ head/print/ghostscript7/files/Makefile.eplaser	Sun Nov 23 06:14:21 2014	(r373122)
@@ -18,9 +18,9 @@ pre-build-eplaser:
 			${WRKSRC}/eplaser/gdevesmv.c ${WRKSRC}/src
 
 post-install-docs-eplaser:
-	${MKDIR} ${DOCSDIR}/eplaser
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/eplaser
 	${INSTALL_DATA} ${WRKSRC}/eplaser/readme-eplaser-705.euc	\
-		${DOCSDIR}/eplaser
+		${STAGEDIR}${DOCSDIR}/eplaser
 
 post-extract: post-extract-eplaser
 pre-build: pre-build-eplaser

Modified: head/print/ghostscript7/files/Makefile.gdi
==============================================================================
--- head/print/ghostscript7/files/Makefile.gdi	Thu Jul 24 16:33:10 2014	(r362828)
+++ head/print/ghostscript7/files/Makefile.gdi	Sun Nov 23 06:14:21 2014	(r373122)
@@ -11,8 +11,8 @@ post-extract-gdi:
 		${DISTDIR}/${DIST_SUBDIR}/Samsung-SmartGDI-all-GS.orig.tar.gz
 
 post-install-docs-gdi:
-	${MKDIR} ${DOCSDIR}/gdi
-	${INSTALL_DATA} ${WRKSRC}/src/README ${DOCSDIR}/gdi
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/gdi
+	${INSTALL_DATA} ${WRKSRC}/src/README ${STAGEDIR}${DOCSDIR}/gdi
 
 post-extract: post-extract-gdi
 post-install-docs: post-install-docs-gdi

Modified: head/print/ghostscript7/files/Makefile.lips
==============================================================================
--- head/print/ghostscript7/files/Makefile.lips	Thu Jul 24 16:33:10 2014	(r362828)
+++ head/print/ghostscript7/files/Makefile.lips	Sun Nov 23 06:14:21 2014	(r373122)
@@ -19,9 +19,9 @@ pre-build-lips:
 		${WRKSRC}/src
 
 post-install-docs-lips:
-	${MKDIR} ${DOCSDIR}/lips
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/lips
 	${INSTALL_DATA} ${WRKSRC}/gdevlips-2.4.0/Gdevlips.htm	\
-		${DOCSDIR}/lips
+		${STAGEDIR}${DOCSDIR}/lips
 
 post-extract: post-extract-lips
 pre-build: pre-build-lips

Modified: head/print/ghostscript7/files/Makefile.lxm3200
==============================================================================
--- head/print/ghostscript7/files/Makefile.lxm3200	Thu Jul 24 16:33:10 2014	(r362828)
+++ head/print/ghostscript7/files/Makefile.lxm3200	Sun Nov 23 06:14:21 2014	(r373122)
@@ -13,10 +13,10 @@ pre-build-lxm3200:
 	${LN} -s -f ${WRKSRC}/lxm3200/gdevlx32.c ${WRKSRC}/src
 
 post-install-docs-lxm3200:
-	${MKDIR} ${DOCSDIR}/lxm3200
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/lxm3200
 	cd ${WRKSRC}/lxm3200-tweaked-20030501 \
 		&& ${INSTALL_DATA} README RELEASE_NOTES Z12-Z31-QuickSetup \
-			${DOCSDIR}/lxm3200
+			${STAGEDIR}${DOCSDIR}/lxm3200
 
 post-extract: post-extract-lxm3200
 pre-build: pre-build-lxm3200

Modified: head/print/ghostscript7/files/Makefile.md2k
==============================================================================
--- head/print/ghostscript7/files/Makefile.md2k	Thu Jul 24 16:33:10 2014	(r362828)
+++ head/print/ghostscript7/files/Makefile.md2k	Sun Nov 23 06:14:21 2014	(r373122)
@@ -15,9 +15,9 @@ pre-build-md2k:
 	${LN} -s -f ${WRKSRC}/gdevmd2k-0.2a/gdevmd2k.c ${WRKSRC}/src
 
 post-install-docs-md2k:
-	${MKDIR} ${DOCSDIR}/md2k
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/md2k
 	${INSTALL_DATA} ${WRKSRC}/gdevmd2k-0.2a/README.jis	\
-		${DOCSDIR}/md2k
+		${STAGEDIR}${DOCSDIR}/md2k
 
 post-extract: post-extract-md2k
 pre-build: pre-build-md2k

Modified: head/print/ghostscript7/files/Makefile.mjc
==============================================================================
--- head/print/ghostscript7/files/Makefile.mjc	Thu Jul 24 16:33:10 2014	(r362828)
+++ head/print/ghostscript7/files/Makefile.mjc	Sun Nov 23 06:14:21 2014	(r373122)
@@ -18,9 +18,9 @@ pre-build-mjc:
 		${WRKSRC}/mjc/mjvtbl.c ${WRKSRC}/src
 
 post-install-docs-mjc:
-	${MKDIR} ${DOCSDIR}/mjc
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/mjc
 	cd ${WRKSRC}/mjc && ${INSTALL_DATA} MJ700V2C.FAQ README.mjc	\
-		README.mje README.noz cpem.doc ${DOCSDIR}/mjc
+		README.mje README.noz cpem.doc ${STAGEDIR}${DOCSDIR}/mjc
 
 post-extract: post-extract-mjc
 pre-build: pre-build-mjc

Modified: head/print/ghostscript7/files/Makefile.pcl3
==============================================================================
--- head/print/ghostscript7/files/Makefile.pcl3	Thu Jul 24 16:33:10 2014	(r362828)
+++ head/print/ghostscript7/files/Makefile.pcl3	Sun Nov 23 06:14:21 2014	(r373122)
@@ -6,7 +6,6 @@ MASTER_SITES+=	http://home.vrweb.de/~mar
 DISTFILES+=	pcl3-3.3.tar.gz:pcl3
 EXTRADEVMKFILE+=	${WRKSRC}/pcl3/src/contrib.mak-7.00.add
 PORTDOCS+=	pcl3
-MAN1+=		gs-pcl3.1 pcl3opts.1
 
 post-extract-pcl3:
 	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/pcl3-3.3.tar.gz
@@ -15,24 +14,25 @@ post-extract-pcl3:
 
 post-install-pcl3:
 .if ${PORT_OPTIONS:MX11} 
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/pcl3opts ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/pcl3opts ${STAGEDIR}${PREFIX}/bin
 .endif
-	cd ${WRKSRC}/pcl3/doc \
-		&& ${INSTALL_MAN} gs-pcl3.1 pcl3opts.1 ${MANPREFIX}/man/man1
-	${MKDIR} ${DATADIR}/${PORTVERSION}/pcl3
+	cd ${WRKSRC}/pcl3/doc && \
+	    ${INSTALL_MAN} gs-pcl3.1 pcl3opts.1 \
+		${STAGEDIR}${MANPREFIX}/man/man1
+	${MKDIR} ${STAGEDIR}${DATADIR}/${PORTVERSION}/pcl3
 	cd ${WRKSRC}/pcl3 && ${INSTALL_DATA} NEWS BUGS README		\
 		lib/example.mcf lib/if-pcl3 ps/calign.ps ps/dumppdd.ps	\
 		ps/levels-test.ps ps/margins-A4.ps			\
 		ps/margins-A4Rotated.ps ps/margins-Env10Rotated.ps	\
 		ps/margins-EnvDLRotated.ps ps/margins-Letter.ps		\
 		ps/margins-LetterRotated.ps				\
-		${DATADIR}/${PORTVERSION}/pcl3
+		${STAGEDIR}${DATADIR}/${PORTVERSION}/pcl3
 
 post-install-docs-pcl3:
-	${MKDIR} ${DOCSDIR}/pcl3
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/pcl3
 	cd ${WRKSRC}/pcl3 && ${INSTALL_DATA} NEWS doc/gs-pcl3.html	\
 		doc/how-to-report.txt doc/pcl3opts.html			\
-		${DOCSDIR}/pcl3
+		${STAGEDIR}${DOCSDIR}/pcl3
 
 post-extract: post-extract-pcl3
 post-install: post-install-pcl3

Modified: head/print/ghostscript7/files/patch-src-Makefile.in
==============================================================================
--- head/print/ghostscript7/files/patch-src-Makefile.in	Thu Jul 24 16:33:10 2014	(r362828)
+++ head/print/ghostscript7/files/patch-src-Makefile.in	Sun Nov 23 06:14:21 2014	(r373122)
@@ -1,17 +1,18 @@
 --- src/Makefile.in.orig	2003-04-30 03:33:31.000000000 +0900
-+++ src/Makefile.in	2008-06-21 02:23:18.000000000 +0900
-@@ -50,8 +50,8 @@
++++ src/Makefile.in	2014-11-23 15:06:07.000000000 +0900
+@@ -50,8 +50,9 @@
  # initialization files (gs_*.ps) and the fonts.
  
  INSTALL = $(GLSRCDIR)/instcopy -c
 -INSTALL_PROGRAM = $(INSTALL) -m 755
 -INSTALL_DATA = $(INSTALL) -m 644
-+INSTALL_PROGRAM = ${BSD_INSTALL_SCRIPT}
++INSTALL_PROGRAM = ${BSD_INSTALL_PROGRAM}
++INSTALL_SCRIPT = ${BSD_INSTALL_SCRIPT}
 +INSTALL_DATA = ${BSD_INSTALL_DATA}
  
  prefix = @prefix@
  exec_prefix = @exec_prefix@
-@@ -142,7 +142,7 @@
+@@ -142,7 +143,7 @@
  # some older JPEG streams that violate the standard. If the JPEG
  # library built from local sources, the patch will be applied.
  
@@ -20,7 +21,7 @@
  JPEG_NAME=jpeg
  
  # Define the directory where the PNG library sources are stored,
-@@ -150,14 +150,14 @@
+@@ -150,14 +151,14 @@
  # You may need to change this if the libpng version changes.
  # See libpng.mak for more information.
  
@@ -37,7 +38,7 @@
  ZSRCDIR=@ZLIBDIR@
  #ZLIB_NAME=gz
  ZLIB_NAME=z
-@@ -197,12 +197,12 @@
+@@ -197,12 +198,12 @@
  CCLD=$(CC)
  
  # Define the general cc flags, warnings and such.
@@ -52,7 +53,7 @@
  CFLAGS_DEBUG=-g -O
  CFLAGS_PROFILE=-pg @OPT_CFLAGS@
  CFLAGS_SO=-fPIC
-@@ -218,7 +218,7 @@
+@@ -218,7 +219,7 @@
  # We don't include -ansi, because this gets in the way of the platform-
  #   specific stuff that <math.h> typically needs; nevertheless, we expect
  #   gcc to accept ANSI-style function prototypes and function definitions.
@@ -61,7 +62,7 @@
  
  # defines from autoconf; note that we don't use these at present.
  ACDEFS=@DEFS@
-@@ -232,9 +232,9 @@
+@@ -232,9 +233,9 @@
  #	-R /usr/local/xxx/lib:/usr/local/lib
  # giving the full path names of the shared library directories.
  # XLDFLAGS can be set from the command line.
@@ -73,7 +74,7 @@
  
  # Define any extra libraries to link into the executable.
  # ISC Unix 2.2 wants -linet.
-@@ -302,10 +302,10 @@
+@@ -302,10 +303,10 @@
  
  # If POSIX sync primitives are used, also change the STDLIBS to include
  # the pthread library.
@@ -86,7 +87,7 @@
  
  # programs we use
  RM=rm -f
-@@ -410,6 +410,7 @@
+@@ -410,6 +411,7 @@
  
  # ---------------- End of platform-specific section ---------------- #
  

Added: head/print/ghostscript7/files/patch-src-unixinst.mak
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/print/ghostscript7/files/patch-src-unixinst.mak	Sun Nov 23 06:14:21 2014	(r373122)
@@ -0,0 +1,117 @@
+--- src/unixinst.mak.orig	2003-01-17 09:49:05.000000000 +0900
++++ src/unixinst.mak	2014-11-23 15:05:32.000000000 +0900
+@@ -30,24 +30,24 @@
+ # rules, just in case bindir or scriptdir is a subdirectory of any of these.
+ 
+ install-exec: $(GS_XE)
+-	-mkdir -p $(datadir)
+-	-mkdir -p $(gsdir)
+-	-mkdir -p $(gsdatadir)
+-	-mkdir -p $(bindir)
+-	$(INSTALL_PROGRAM) $(GS_XE) $(bindir)/$(GS)
++	-mkdir -p $(DESTDIR)$(datadir)
++	-mkdir -p $(DESTDIR)$(gsdir)
++	-mkdir -p $(DESTDIR)$(gsdatadir)
++	-mkdir -p $(DESTDIR)$(bindir)
++	$(INSTALL_PROGRAM) $(GS_XE) $(DESTDIR)$(bindir)/$(GS)
+ 
+ install-scripts: $(PSLIBDIR)/gsnd
+-	-mkdir -p $(datadir)
+-	-mkdir -p $(gsdir)
+-	-mkdir -p $(gsdatadir)
+-	-mkdir -p $(scriptdir)
++	-mkdir -p $(DESTDIR)$(datadir)
++	-mkdir -p $(DESTDIR)$(gsdir)
++	-mkdir -p $(DESTDIR)$(gsdatadir)
++	-mkdir -p $(DESTDIR)$(scriptdir)
+ 	$(SH) -c 'for f in \
+ gsbj gsdj gsdj500 gslj gslp gsnd \
+ bdftops dvipdf eps2eps font2c \
+ pdf2dsc pdf2ps pdfopt pf2afm pfbtopfa printafm \
+ ps2ascii ps2epsi ps2pdf ps2pdf12 ps2pdf13 ps2pdf14 ps2pdfwr ps2ps wftopfa \
+ fixmswrd.pl lprsetup.sh pj-gs.sh pv.sh sysvlp.sh unix-lpr.sh ;\
+-	do if ( test -f $(PSLIBDIR)/$$f ); then $(INSTALL_PROGRAM) $(PSLIBDIR)/$$f $(scriptdir); fi;\
++	do if ( test -f $(PSLIBDIR)/$$f ); then $(INSTALL_SCRIPT) $(PSLIBDIR)/$$f $(DESTDIR)$(scriptdir); fi;\
+ 	done'
+ 
+ PSDOCDIR=$(PSLIBDIR)/../doc
+@@ -60,10 +60,10 @@
+ # one file from each subdirectory just as a sanity check.
+ 
+ install-libdata: 
+-	-mkdir -p $(datadir)
+-	-mkdir -p $(gsdir)
+-	-mkdir -p $(gsdatadir)
+-	-mkdir -p $(gsdatadir)/lib
++	-mkdir -p $(DESTDIR)$(datadir)
++	-mkdir -p $(DESTDIR)$(gsdir)
++	-mkdir -p $(DESTDIR)$(gsdatadir)
++	-mkdir -p $(DESTDIR)$(gsdatadir)/lib
+ 	$(SH) -c 'for f in \
+ Fontmap Fontmap.GS \
+ CIDFnmap CIDFnmap.Ore CIDFnmap.ARP CIDFnmap.Bae CIDFnmap.Koc \
+@@ -83,13 +83,13 @@
+ viewpcx.ps viewpbm.ps viewps2a.ps \
+ winmaps.ps wftopfa.ps wrfont.ps zeroline.ps \
+ pdf2dsc.ps pdfopt.ps ;\
+-	do if ( test -f $(PSLIBDIR)/$$f ); then $(INSTALL_DATA) $(PSLIBDIR)/$$f $(gsdatadir)/lib; fi;\
++	do if ( test -f $(PSLIBDIR)/$$f ); then $(INSTALL_DATA) $(PSLIBDIR)/$$f $(DESTDIR)$(gsdatadir)/lib; fi;\
+ 	done'
+ 	$(SH) -c 'for f in $(PSLIBDIR)/gs_*.ps $(PSLIBDIR)/pdf*.ps;\
+-	do $(INSTALL_DATA) $$f $(gsdatadir)/lib ;\
++	do $(INSTALL_DATA) $$f $(DESTDIR)$(gsdatadir)/lib ;\
+ 	done'
+ 	$(SH) -c 'for f in $(PSLIBDIR)/*.ppd $(PSLIBDIR)/*.rpd $(PSLIBDIR)/*.upp $(PSLIBDIR)/*.xbm $(PSLIBDIR)/*.xpm;\
+-	do $(INSTALL_DATA) $$f $(gsdatadir)/lib ;\
++	do $(INSTALL_DATA) $$f $(DESTDIR)$(gsdatadir)/lib ;\
+ 	done'
+ 
+ # install html documentation
+@@ -106,20 +106,20 @@
+ 	   Psfiles.htm Public.htm Readme.htm Release.htm \
+ 	   Source.htm Tester.htm Unix-lpr.htm Use.htm Xfonts.htm
+ install-doc: $(PSDOCDIR)/News.htm
+-	-mkdir -p $(docdir)
++	-mkdir -p $(DESTDIR)$(docdir)
+ 	$(SH) -c 'for f in $(DOC_PAGES) ;\
+-	do if ( test -f $(PSDOCDIR)/$$f ); then $(INSTALL_DATA) $(PSDOCDIR)/$$f $(docdir); fi;\
++	do if ( test -f $(PSDOCDIR)/$$f ); then $(INSTALL_DATA) $(PSDOCDIR)/$$f $(DESTDIR)$(docdir); fi;\
+ 	done'
+ 
+ # install the man pages for each locale
+-MAN_LCDIRS=. de
++MAN_LCDIRS=.
+ MAN1_LINKS_PS2PS=eps2eps
+ MAN1_LINKS_PS2PDF=ps2pdf12 ps2pdf13
+ MAN1_LINKS_GSLP=gsbj gsdj gsdj500 gslj
+ install-man: $(PSMANDIR)/gs.1
+-	$(SH) -c 'test -d $(mandir) || mkdir -p $(mandir)'
++	$(SH) -c 'test -d $(DESTDIR)$(mandir) || mkdir -p $(DESTDIR)$(mandir)'
+ 	$(SH) -c 'for d in $(MAN_LCDIRS) ;\
+-	do man1dir=$(mandir)/$$d/man$(man1ext) ;\
++	do man1dir=$(DESTDIR)$(mandir)/$$d/man$(man1ext) ;\
+ 	  ( test -d $$man1dir || mkdir -p $$man1dir ) ;\
+ 	  for f in $(PSMANDIR)/$$d/*.1 ;\
+ 	    do $(INSTALL_DATA) $$f $$man1dir ;\
+@@ -146,17 +146,17 @@
+ 
+ # install the example files
+ install-examples:
+-	-mkdir -p $(exdir)
++	-mkdir -p $(DESTDIR)$(exdir)
+ 	for f in \
+ alphabet.ps colorcir.ps doretree.ps escher.ps golfer.ps \
+ grayalph.ps snowflak.ps tiger.ps vasarely.ps waterfal.ps \
+ ridt91.eps ;\
+-	do $(INSTALL_DATA) $(PSEXDIR)/$$f $(exdir) ;\
++	do $(INSTALL_DATA) $(PSEXDIR)/$$f $(DESTDIR)$(exdir) ;\
+ 	done
+-	-mkdir -p $(exdir)/cjk
++	-mkdir -p $(DESTDIR)$(exdir)/cjk
+ 	for f in \
+ all_ac1.ps all_ag1.ps all_aj1.ps all_aj2.ps all_ak1.ps \
+ gscjk_ac.ps gscjk_ag.ps gscjk_aj.ps gscjk_ak.ps \
+ iso2022.ps;\
+-	do $(INSTALL_DATA) $(PSEXDIR)/cjk/$$f $(exdir)/cjk ;\
++	do $(INSTALL_DATA) $(PSEXDIR)/cjk/$$f $(DESTDIR)$(exdir)/cjk ;\
+ 	done

Modified: head/print/ghostscript7/files/patch-src:unix-dll.mak
==============================================================================
--- head/print/ghostscript7/files/patch-src:unix-dll.mak	Thu Jul 24 16:33:10 2014	(r362828)
+++ head/print/ghostscript7/files/patch-src:unix-dll.mak	Sun Nov 23 06:14:21 2014	(r373122)
@@ -1,5 +1,5 @@
---- src/unix-dll.mak.orig	Wed Oct 17 19:11:23 2001
-+++ src/unix-dll.mak	Sat Feb  9 04:53:18 2002
+--- src/unix-dll.mak.orig	2003-01-17 09:49:05.000000000 +0900
++++ src/unix-dll.mak	2014-11-23 14:43:44.000000000 +0900
 @@ -48,11 +48,9 @@
  
  # shared library
@@ -43,17 +43,34 @@
   STDIO_IMPLEMENTATION=c\
   DISPLAY_DEV=$(DD)$(SOOBJRELDIR)/display.dev\
   BINDIR=$(BINDIR)/$(SOBINRELDIR)\
-@@ -106,11 +100,9 @@
- 	-mkdir $(libdir)
- 	$(INSTALL_PROGRAM) $(GSSOC) $(bindir)/$(GSSOC_XENAME)
- 	$(INSTALL_PROGRAM) $(GSSOX) $(bindir)/$(GSSOX_XENAME)
+@@ -98,19 +92,17 @@
+ 	$(MAKE) $(SODEFS) GENOPT='-DDEBUG' CFLAGS='$(CFLAGS_DEBUG) $(CFLAGS_SO) $(GCFLAGS) $(XCFLAGS)' $(GSSOC) $(GSSOX)
+ 
+ install-so: so
+-	-mkdir -p $(prefix)
+-	-mkdir -p $(datadir)
+-	-mkdir -p $(gsdir)
+-	-mkdir -p $(gsdatadir)
+-	-mkdir -p $(bindir)
+-	-mkdir -p $(libdir)
+-	$(INSTALL_PROGRAM) $(GSSOC) $(bindir)/$(GSSOC_XENAME)
+-	$(INSTALL_PROGRAM) $(GSSOX) $(bindir)/$(GSSOX_XENAME)
 -	$(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME_MAJOR_MINOR)
-+	$(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR) $(libdir)/$(GS_SONAME_MAJOR)
- 	$(RM_) $(libdir)/$(GS_SONAME)
+-	$(RM_) $(libdir)/$(GS_SONAME)
 -	ln -s $(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME)
 -	$(RM_) $(libdir)/$(GS_SONAME_MAJOR)
 -	ln -s $(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME_MAJOR)
-+	ln -s $(GS_SONAME_MAJOR) $(libdir)/$(GS_SONAME)
++	-mkdir -p $(DESTDIR)$(prefix)
++	-mkdir -p $(DESTDIR)$(datadir)
++	-mkdir -p $(DESTDIR)$(gsdir)
++	-mkdir -p $(DESTDIR)$(gsdatadir)
++	-mkdir -p $(DESTDIR)$(bindir)
++	-mkdir -p $(DESTDIR)$(libdir)
++	$(INSTALL_PROGRAM) $(GSSOC) $(DESTDIR)$(bindir)/$(GSSOC_XENAME)
++	$(INSTALL_PROGRAM) $(GSSOX) $(DESTDIR)$(bindir)/$(GSSOX_XENAME)
++	$(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR)
++	$(RM_) $(DESTDIR)$(libdir)/$(GS_SONAME)
++	ln -s $(GS_SONAME_MAJOR) $(DESTDIR)$(libdir)/$(GS_SONAME)
  
  soinstall: install-so install-scripts install-data
  

Modified: head/print/ghostscript7/pkg-plist
==============================================================================
--- head/print/ghostscript7/pkg-plist	Thu Jul 24 16:33:10 2014	(r362828)
+++ head/print/ghostscript7/pkg-plist	Sun Nov 23 06:14:21 2014	(r373122)
@@ -34,6 +34,31 @@ bin/pv.sh
 bin/sysvlp.sh
 bin/unix-lpr.sh
 bin/wftopfa
+man/man1/ansi2knr.1.gz
+man/man1/dvipdf.1.gz
+man/man1/eps2eps.1.gz
+man/man1/font2c.1.gz
+man/man1/gs.1.gz
+man/man1/gsbj.1.gz
+man/man1/gsdj.1.gz
+man/man1/gsdj500.1.gz
+man/man1/gslj.1.gz
+man/man1/gslp.1.gz
+man/man1/gsnd.1.gz
+man/man1/pdf2dsc.1.gz
+man/man1/pdf2ps.1.gz
+man/man1/pdfopt.1.gz
+man/man1/pf2afm.1.gz
+man/man1/pfbtopfa.1.gz
+man/man1/printafm.1.gz
+man/man1/ps2ascii.1.gz
+man/man1/ps2epsi.1.gz
+man/man1/ps2pdf.1.gz
+man/man1/ps2pdf12.1.gz
+man/man1/ps2pdf13.1.gz
+man/man1/ps2pdfwr.1.gz
+man/man1/ps2ps.1.gz
+man/man1/wftopfa.1.gz
 %%SHLIB%%lib/libgs.so
 %%SHLIB%%lib/libgs.so.%%SHLIB_VER%%
 %%DATADIR%%/%%GS_VERSION%%/doc/API.htm
@@ -335,6 +360,8 @@ bin/wftopfa
 %%GS_pcl3%%%%DATADIR%%/%%GS_VERSION%%/pcl3/margins-Letter.ps
 %%GS_pcl3%%%%DATADIR%%/%%GS_VERSION%%/pcl3/margins-LetterRotated.ps
 %%GS_pcl3%%@dirrm %%DATADIR%%/%%GS_VERSION%%/pcl3
+%%GS_pcl3%%man/man1/gs-pcl3.1.gz
+%%GS_pcl3%%man/man1/pcl3opts.1.gz
 @dirrm %%DATADIR%%/%%GS_VERSION%%/lib
 @dirrm %%DATADIR%%/%%GS_VERSION%%/examples/cjk
 @dirrm %%DATADIR%%/%%GS_VERSION%%/examples
