5 files changed, 12 insertions, 15 deletions
diff --git a/print/ghostscript8/files/Makefile.dmprt b/print/ghostscript8/files/Makefile.dmprt
index 5166a6cd6fc6..cdc04a23af07 100644
--- a/print/ghostscript8/files/Makefile.dmprt
+++ b/print/ghostscript8/files/Makefile.dmprt
@@ -3,6 +3,6 @@
 post-install-dmprt:
 	cd ${FILESDIR} && \
 		${INSTALL_DATA} lqx70ch.upp lqx70cl.upp lqx70cm.upp \
-		${DATADIR}/${PORTVERSION}/lib
+		${STAGEDIR}${DATADIR}/${PORTVERSION}/lib
 
 post-install: post-install-dmprt
diff --git a/print/ghostscript8/files/Makefile.drivers_post b/print/ghostscript8/files/Makefile.drivers_post
index b1290667cc4c..75ffa4cde2f0 100644
--- a/print/ghostscript8/files/Makefile.drivers_post
+++ b/print/ghostscript8/files/Makefile.drivers_post
@@ -40,7 +40,7 @@ PORT_OPTIONS:=	${PORT_OPTIONS:NGS_${D}}
 .endfor
 
 .if defined(_CUPS_DEVS)
-LIB_DEPENDS+=	cupsimage.2:${PORTSDIR}/print/cups-image
+LIB_DEPENDS+=	libcupsimage.so:${PORTSDIR}/print/cups-image
 CONFIGURE_ARGS+=	--enable-cups
 .else
 CONFIGURE_ARGS+=	--disable-cups
@@ -61,7 +61,7 @@ OPTIONS_UNSET+=	${PORT_OPTIONS:MGS_${D}}
 .endfor
 
 .if defined(_VGA_DEVS)
-LIB_DEPENDS+=	vga.1:${PORTSDIR}/graphics/svgalib
+LIB_DEPENDS+=	libvga.so:${PORTSDIR}/graphics/svgalib
 .endif
 
 # x11 specific
@@ -109,8 +109,7 @@ PORT_OPTIONS:=	${PORT_OPTIONS:NGS_${D}}
 
 .if defined(_ICONV_DEVS)
 USES+=		iconv
-CONFIGURE_ARGS+=--with-libiconv=gnu
-EXTRALIBS+=	-liconv
+CONFIGURE_ARGS+=--with-libiconv=maybe
 .else
 CONFIGURE_ARGS+=--with-libiconv=no
 .endif
@@ -125,7 +124,7 @@ PORT_OPTIONS:=	${PORT_OPTIONS:NGS_${D}}
 .endfor
 
 .if defined(_CAIRO_DEVS)
-LIB_DEPENDS+=	cairo:${PORTSDIR}/graphics/cairo
+LIB_DEPENDS+=	libcairo.so:${PORTSDIR}/graphics/cairo
 CONFIGURE_ARGS+=	--enable-cairo
 .else
 CONFIGURE_ARGS+=	--disable-cairo
diff --git a/print/ghostscript8/files/Makefile.epag b/print/ghostscript8/files/Makefile.epag
index 283b4886a461..cb3324d16109 100644
--- a/print/ghostscript8/files/Makefile.epag
+++ b/print/ghostscript8/files/Makefile.epag
@@ -17,7 +17,7 @@ post-build-epag:
 		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} Makefile
 
 post-install-epag:
-	${INSTALL_PROGRAM} ${WRKSRC}/${EPAG_NAME}/ert ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/${EPAG_NAME}/ert ${STAGEDIR}${PREFIX}/bin
 
 pre-build: pre-build-epag
 post-build: post-build-epag
diff --git a/print/ghostscript8/files/Makefile.pcl3 b/print/ghostscript8/files/Makefile.pcl3
index ad19ffdc8017..b36b4d60e85a 100644
--- a/print/ghostscript8/files/Makefile.pcl3
+++ b/print/ghostscript8/files/Makefile.pcl3
@@ -4,8 +4,6 @@ PORTDOCS+=	pcl3
 PORTDOC_FILES+= pcl3/NEWS pcl3/BUGS pcl3/README pcl3/gs-pcl3.html	\
 	pcl3/how-to-report.txt pcl3/pcl3opts.html
 
-MAN1+=	gs-pcl3.1 pcl3opts.1
-
 post-build-pcl3:
 	cd ${WRKSRC} && \
 		${CC} ${CFLAGS} -I./obj -I./soobj -I./base \
@@ -14,8 +12,8 @@ post-build-pcl3:
 		contrib/pcl3/eprn/mediasize.c contrib/pcl3/src/pclsize.c
 
 post-install-pcl3:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/pcl3opts ${PREFIX}/bin
-	${MKDIR} ${DATADIR}/${PORTVERSION}/pcl3
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/pcl3opts ${STAGEDIR}${PREFIX}/bin
+	${MKDIR} ${STAGEDIR}${DATADIR}/${PORTVERSION}/pcl3
 	cd ${WRKSRC}/contrib/pcl3 && \
 		${INSTALL_DATA} lib/example.mcf lib/if-pcl3		\
 			ps/calign.ps ps/dumppdd.ps ps/levels-test.ps	\
@@ -24,9 +22,10 @@ post-install-pcl3:
 			ps/margins-EnvDLRotated.ps			\
 			ps/margins-Letter.ps				\
 			ps/margins-LetterRotated.ps			\
-			${DATADIR}/${PORTVERSION}/pcl3
+			${STAGEDIR}${DATADIR}/${PORTVERSION}/pcl3
 	cd ${WRKSRC}/contrib/pcl3/doc && \
-		${INSTALL_MAN} gs-pcl3.1 pcl3opts.1 ${MANPREFIX}/man/man1
+		${INSTALL_MAN} gs-pcl3.1 pcl3opts.1 \
+		    ${STAGEDIR}${MANPREFIX}/man/man1
 
 post-install-docs-pcl3:
 	${MKDIR} ${WRKSRC}/contrib/pcl3
diff --git a/print/ghostscript8/files/pkg-message.in b/print/ghostscript8/files/pkg-message.in
index 728b686c5372..6026529d9348 100644
--- a/print/ghostscript8/files/pkg-message.in
+++ b/print/ghostscript8/files/pkg-message.in
@@ -4,5 +4,4 @@ This program may be provided by either print/dvips or print/dvipsk-tetex
 tetex things).
 
 Also note that FAPIfontmap and FAPIcidfmap in
-%%DATADIR%%/%%PORTVERSION%%/Resource/Init have to be configured first if
-WITH_FT_BRIDGE is enabled.
+%%DATADIR%%/%%PORTVERSION%%/Resource/Init have to be configured first.