Add x11 option to the various ghostscript packages, and get rid

of the separate ghostscript*x11* packages.

52 files changed, 570 insertions, 641 deletions

diff --git a/print/Makefile b/print/Makefile
index 27b6858ad4c..81e7d554856 100644
--- a/print/Makefile
+++ b/print/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.139 2005/11/29 22:39:48 minskim Exp $
+# $NetBSD: Makefile,v 1.140 2005/12/09 20:30:16 wiz Exp $
 #
 
 COMMENT=	Desktop publishing
@@ -36,11 +36,7 @@ SUBDIR+=	foomatic-gswrapper
 SUBDIR+=	ghostscript
 SUBDIR+=	ghostscript-afpl
 SUBDIR+=	ghostscript-esp
-SUBDIR+=	ghostscript-esp-nox11
 SUBDIR+=	ghostscript-gnu
-SUBDIR+=	ghostscript-gnu-nox11
-SUBDIR+=	ghostscript-gnu-x11
-SUBDIR+=	ghostscript-nox11
 SUBDIR+=	gimp-print
 SUBDIR+=	gimp-print-cups
 SUBDIR+=	gimp-print-escputil
diff --git a/print/ghostscript-esp-nox11/DESCR b/print/ghostscript-esp-nox11/DESCR
deleted file mode 100644
index eecdad9f844..00000000000
--- a/print/ghostscript-esp-nox11/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-Ghostscript is the well-known PostScript interpreter which is available for
-all common and most esoteric platforms and supports many different printers
-and some displays.
-
-This package contains ESP Ghostscript, which is a separately maintained
-distribution of GNU Ghostscript and distributed under the terms of the GNU
-Public License.  ESP Ghostscript incorporates the CUPS raster printer
-driver and a large number of contributed Ghostscript printer drivers.
-
-This package is built without support for X11 displays.
diff --git a/print/ghostscript-esp-nox11/Makefile b/print/ghostscript-esp-nox11/Makefile
deleted file mode 100644
index 944f91c0606..00000000000
--- a/print/ghostscript-esp-nox11/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2005/11/27 17:05:56 adrianp Exp $
-
-.include "../../print/ghostscript-esp/Makefile.common"
-
-PKGNAME=	ghostscript-esp-nox11-${GS_VERS}
-PKGREVISION=	1
-COMMENT=	ESP/CUPS Postscript interpreter without X11 drivers
-
-CONFIGURE_ARGS+=	--without-x
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/print/ghostscript-esp/Makefile b/print/ghostscript-esp/Makefile
index 5088304eb74..16793d647ea 100644
--- a/print/ghostscript-esp/Makefile
+++ b/print/ghostscript-esp/Makefile
@@ -1,12 +1,108 @@
-# $NetBSD: Makefile,v 1.11 2005/11/27 17:05:29 adrianp Exp $
-
-.include "Makefile.common"
+# $NetBSD: Makefile,v 1.12 2005/12/09 20:30:16 wiz Exp $
 
+DISTNAME=	espgs-${GS_VERS}-source
 PKGNAME=	ghostscript-esp-${GS_VERS}
 PKGREVISION=	1
+BASEGS_VERS=	8.15
+GS_VERS=	${BASEGS_VERS}.1
+CATEGORIES=	print
+ESP_SITES=	http://ftp.easysw.com/pub/ghostscript/ \
+		ftp://ftp.easysw.com/pub/ghostscript/ \
+		ftp://ftp2.easysw.com/pub/ghostscript/ \
+		ftp://ftp3.easysw.com/pub/ghostscript/ \
+		http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/ghostscript/ \
+		ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/ghostscript/ \
+		ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/ghostscript/ \
+		http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/ghostscript/
+MASTER_SITES=   ${ESP_SITES:=${GS_VERS}/}
+EXTRACT_SUFX=   .tar.bz2
+
+MAINTAINER=	jlam@NetBSD.org
 COMMENT=	ESP/CUPS Postscript interpreter
+HOMEPAGE=	http://www.cups.org/ghostscript.html
+
+CONFLICTS+=	ghostscript{,-nox11}-[0-9]*
+CONFLICTS+=	ghostscript-afpl-[0-9]*
+CONFLICTS+=	ghostscript-esp{,-nox11}-[0-9]*
+CONFLICTS+=	ghostscript-gnu{,-nox11,-x11}-[0-9]*
+
+DEPENDS+=	ghostscript-fonts>=6.0:../../fonts/ghostscript-fonts
+
+WRKSRC=			${WRKDIR}/${DISTNAME:S/-source//}
+USE_PKGINSTALL=		yes
+USE_TOOLS+=		gmake pkg-config
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--enable-cups
+CONFIGURE_ARGS+=	--with-ijs
+CONFIGURE_ARGS+=	--without-omni
+CONFIGURE_ARGS+=	--with-drivers=ALL
+
+DIST_SUBDIR=		ghostscript
+GS_SRCS=		${DISTNAME}${EXTRACT_SUFX}
+DISTFILES+=		${GS_SRCS}
+EXTRACT_ONLY=		${GS_SRCS}
+
+# Adobe's JPEG implementation in their PDF/PS documents is non-standard,
+# so we can't use an already installed libjpeg.so.
+#
+JPEG_SRCS=		jpegsrc.v6b.tar.gz
+JPEG_WRKSRC=		${WRKDIR}/jpeg-6b
+SITES_${JPEG_SRCS}=	ftp://ftp.uu.net/graphics/jpeg/
+DISTFILES+=		${JPEG_SRCS}
+EXTRACT_ONLY+=		${JPEG_SRCS}
+
+.include "options.mk"
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
+GCC_REQD+=	3.0
+.endif
+
+.if defined(PAPERSIZE) && (${PAPERSIZE} == "A4" || ${PAPERSIZE} == "a4")
+CFLAGS+=		-DA4
+.endif
+CFLAGS+=		-DHAVE_MKSTEMP=1
+
+REPLACE_PERL=		lib/fixmswrd.pl
+
+CUPS_CONFDIR?=		${PKG_SYSCONFBASEDIR}/cups
+CUPS_EGDIR=		${PREFIX}/share/examples/cups
+CUPS_MODEL_DIR=		${PREFIX}/share/cups/model
+DOCDIR=			${PREFIX}/share/doc/ghostscript
+
+PLIST_SUBST+=		GS_VERS=${BASEGS_VERS:Q}
+
+CONF_FILES=	${CUPS_EGDIR}/pstoraster.convs ${CUPS_CONFDIR}/pstoraster.convs
+
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../print/cups/buildlink3.mk"
+.include "../../print/gimp-print-lib/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+
+post-extract:
+	${MKDIR} ${WRKSRC}/bin
+	${MKDIR} ${WRKSRC}/obj
+	${RM} -f ${WRKSRC}/jpeg
+	${LN} -s ${JPEG_WRKSRC} ${WRKSRC}/jpeg
+
+post-install:
+	${INSTALL_PROGRAM_DIR} ${PREFIX}/libexec/cups/filter
+	${INSTALL_SCRIPT} ${WRKSRC}/pstoraster/pstopxl			\
+		${PREFIX}/libexec/cups/filter
+	${INSTALL_SCRIPT} ${WRKSRC}/pstoraster/pstoraster		\
+		${PREFIX}/libexec/cups/filter
+	${INSTALL_DATA_DIR} ${CUPS_MODEL_DIR}
+	${INSTALL_DATA} ${WRKSRC}/pstoraster/pxlcolor.ppd ${CUPS_MODEL_DIR}
+	${INSTALL_DATA} ${WRKSRC}/pstoraster/pxlmono.ppd ${CUPS_MODEL_DIR}
+	${INSTALL_DATA_DIR} ${CUPS_EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/pstoraster/pstoraster.convs ${CUPS_EGDIR}
 
-CONFIGURE_ARGS+=	--with-x
+SUBST_CLASSES+=         ps2epsi-sh
+SUBST_MESSAGE.ps2epsi-sh=   "Fixing ps2epsi shell."
+SUBST_FILES.ps2epsi-sh=     lib/ps2epsi
+SUBST_SED.ps2epsi-sh=       -e 's|/bin/sh|${SH}|'
+SUBST_STAGE.ps2epsi-sh=     post-patch
 
-.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/ghostscript-esp/Makefile.common b/print/ghostscript-esp/Makefile.common
deleted file mode 100644
index a42c1fb1e50..00000000000
--- a/print/ghostscript-esp/Makefile.common
+++ /dev/null
@@ -1,106 +0,0 @@
-# $NetBSD: Makefile.common,v 1.27 2005/12/05 20:50:52 rillig Exp $
-
-DISTNAME=	espgs-${GS_VERS}-source
-BASEGS_VERS=	8.15
-GS_VERS=	${BASEGS_VERS}.1
-CATEGORIES=	print
-ESP_SITES=	http://ftp.easysw.com/pub/ghostscript/ \
-		ftp://ftp.easysw.com/pub/ghostscript/ \
-		ftp://ftp2.easysw.com/pub/ghostscript/ \
-		ftp://ftp3.easysw.com/pub/ghostscript/ \
-		http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/ghostscript/ \
-		ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/ghostscript/ \
-		ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/ghostscript/ \
-		http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/ghostscript/
-MASTER_SITES=   ${ESP_SITES:=${GS_VERS}/}
-EXTRACT_SUFX=   .tar.bz2
-
-MAINTAINER=	jlam@NetBSD.org
-HOMEPAGE=	http://www.cups.org/ghostscript.html
-
-CONFLICTS+=	ghostscript{,-nox11}-[0-9]*
-CONFLICTS+=	ghostscript-afpl-[0-9]*
-CONFLICTS+=	ghostscript-esp{,-nox11}-[0-9]*
-CONFLICTS+=	ghostscript-gnu{,-nox11,-x11}-[0-9]*
-
-DEPENDS+=	ghostscript-fonts>=6.0:../../fonts/ghostscript-fonts
-
-WRKSRC=			${WRKDIR}/${DISTNAME:S/-source//}
-USE_PKGINSTALL=		yes
-USE_TOOLS+=		gmake pkg-config
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--enable-cups
-CONFIGURE_ARGS+=	--with-ijs
-CONFIGURE_ARGS+=	--without-omni
-CONFIGURE_ARGS+=	--with-drivers=ALL
-
-DIST_SUBDIR=		ghostscript
-GS_SRCS=		${DISTNAME}${EXTRACT_SUFX}
-DISTFILES+=		${GS_SRCS}
-EXTRACT_ONLY=		${GS_SRCS}
-
-# Adobe's JPEG implementation in their PDF/PS documents is non-standard,
-# so we can't use an already installed libjpeg.so.
-#
-JPEG_SRCS=		jpegsrc.v6b.tar.gz
-JPEG_WRKSRC=		${WRKDIR}/jpeg-6b
-SITES_${JPEG_SRCS}=	ftp://ftp.uu.net/graphics/jpeg/
-DISTFILES+=		${JPEG_SRCS}
-EXTRACT_ONLY+=		${JPEG_SRCS}
-
-DISTINFO_FILE=		${.CURDIR}/../ghostscript-esp/distinfo
-FILESDIR=		${.CURDIR}/../ghostscript-esp/files
-PATCHDIR=		${.CURDIR}/../ghostscript-esp/patches
-PLIST_SRC=		${.CURDIR}/../ghostscript-esp/PLIST
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-GCC_REQD+=	3.0
-.endif
-
-.if defined(PAPERSIZE) && (${PAPERSIZE} == "A4" || ${PAPERSIZE} == "a4")
-CFLAGS+=		-DA4
-.endif
-CFLAGS+=		-DHAVE_MKSTEMP=1
-
-REPLACE_PERL=		lib/fixmswrd.pl
-
-CUPS_CONFDIR?=		${PKG_SYSCONFBASEDIR}/cups
-CUPS_EGDIR=		${PREFIX}/share/examples/cups
-CUPS_MODEL_DIR=		${PREFIX}/share/cups/model
-DOCDIR=			${PREFIX}/share/doc/ghostscript
-
-PLIST_SUBST+=		GS_VERS=${BASEGS_VERS:Q}
-
-CONF_FILES=	${CUPS_EGDIR}/pstoraster.convs ${CUPS_CONFDIR}/pstoraster.convs
-
-.include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/tiff/buildlink3.mk"
-.include "../../print/cups/buildlink3.mk"
-.include "../../print/gimp-print-lib/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-
-post-extract:
-	${MKDIR} ${WRKSRC}/bin
-	${MKDIR} ${WRKSRC}/obj
-	${RM} -f ${WRKSRC}/jpeg
-	${LN} -s ${JPEG_WRKSRC} ${WRKSRC}/jpeg
-
-post-install:
-	${INSTALL_PROGRAM_DIR} ${PREFIX}/libexec/cups/filter
-	${INSTALL_SCRIPT} ${WRKSRC}/pstoraster/pstopxl			\
-		${PREFIX}/libexec/cups/filter
-	${INSTALL_SCRIPT} ${WRKSRC}/pstoraster/pstoraster		\
-		${PREFIX}/libexec/cups/filter
-	${INSTALL_DATA_DIR} ${CUPS_MODEL_DIR}
-	${INSTALL_DATA} ${WRKSRC}/pstoraster/pxlcolor.ppd ${CUPS_MODEL_DIR}
-	${INSTALL_DATA} ${WRKSRC}/pstoraster/pxlmono.ppd ${CUPS_MODEL_DIR}
-	${INSTALL_DATA_DIR} ${CUPS_EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/pstoraster/pstoraster.convs ${CUPS_EGDIR}
-
-SUBST_CLASSES+=         ps2epsi-sh
-SUBST_MESSAGE.ps2epsi-sh=   "Fixing ps2epsi shell."
-SUBST_FILES.ps2epsi-sh=     lib/ps2epsi
-SUBST_SED.ps2epsi-sh=       -e 's|/bin/sh|${SH}|'
-SUBST_STAGE.ps2epsi-sh=     post-patch
diff --git a/print/ghostscript-esp/options.mk b/print/ghostscript-esp/options.mk
new file mode 100644
index 00000000000..1918659bead
--- /dev/null
+++ b/print/ghostscript-esp/options.mk
@@ -0,0 +1,14 @@
+# $NetBSD: options.mk,v 1.1 2005/12/09 20:30:16 wiz Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.ghostscript-esp
+PKG_SUPPORTED_OPTIONS=	x11
+PKG_SUGGESTED_OPTIONS=	x11
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mx11)
+CONFIGURE_ARGS+=	--with-x
+.include "../../mk/x11.buildlink3.mk"
+.else
+CONFIGURE_ARGS+=        --without-x
+.endif
diff --git a/print/ghostscript-gnu-nox11/DESCR b/print/ghostscript-gnu-nox11/DESCR
deleted file mode 100644
index 28e5687c882..00000000000
--- a/print/ghostscript-gnu-nox11/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-Ghostscript is the well-known PostScript interpreter which is available for
-all common and most esoteric platforms and supports many different printers
-and some displays.
-
-This package contains GNU Ghostscript, which is released under the terms
-of the GNU General Public License, and is built without support
-for X11 displays.
diff --git a/print/ghostscript-gnu-nox11/Makefile b/print/ghostscript-gnu-nox11/Makefile
deleted file mode 100644
index e6a10315ed7..00000000000
--- a/print/ghostscript-gnu-nox11/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:52 rillig Exp $
-
-PKGNAME=	ghostscript-gnu-nox11-${GS_VERS}
-PKGREVISION=	1
-COMMENT=	GNU Postscript interpreter without X11 drivers
-
-CONFIGURE_ARGS+=	--without-x
-
-.include "../../print/ghostscript-gnu/Makefile.common"
diff --git a/print/ghostscript-gnu-x11/DESCR b/print/ghostscript-gnu-x11/DESCR
deleted file mode 100644
index 092160ee32e..00000000000
--- a/print/ghostscript-gnu-x11/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-Ghostscript is the well-known PostScript interpreter which is available for
-all common and most esoteric platforms and supports many different printers
-and some displays.
-
-This package contains GNU Ghostscript, which is released under the terms
-of the GNU General Public License, and is built with only support
-for X11 displays, the IJS client device, and image format devices,
-e.g. JPEG, PNG, TIFF, PDF, PS.
diff --git a/print/ghostscript-gnu-x11/Makefile b/print/ghostscript-gnu-x11/Makefile
deleted file mode 100644
index 5bf768e914a..00000000000
--- a/print/ghostscript-gnu-x11/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:53 rillig Exp $
-
-PKGNAME=	ghostscript-gnu-x11-${GS_VERS}
-COMMENT=	GNU Postscript interpreter with X11 and image drivers only
-
-CONFIGURE_ARGS+=	--with-x
-
-# Based on the definitions for the DEVICE_DEVS* from ${WRKSRC}/src/devs.mak,
-# we clear the ones related to printer devices and preserve the display and
-# image devices.
-#
-.for N in 2 3 4 6 16 17 18 19 20
-MAKE_FLAGS+=	DEVICE_DEVS${N}=
-.endfor
-
-# We keep the IJS client driver as it's a modular driver, and allows us some
-# access to real printers.
-#
-MAKE_FLAGS+=	DEVICE_DEVS5="\$$(DD)ijs.dev"
-
-.include "../../mk/x11.buildlink3.mk"
-.include "../../print/ghostscript-gnu/Makefile.common"
diff --git a/print/ghostscript-gnu/Makefile b/print/ghostscript-gnu/Makefile
index 88bd302a43f..46de3c159dc 100644
--- a/print/ghostscript-gnu/Makefile
+++ b/print/ghostscript-gnu/Makefile
@@ -1,10 +1,98 @@
-# $NetBSD: Makefile,v 1.8 2005/11/27 17:06:36 adrianp Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/09 20:30:16 wiz Exp $
 
+DISTNAME=	ghostscript-${GS_VERS}
 PKGNAME=	ghostscript-gnu-${GS_VERS}
 PKGREVISION=	1
+GS_VERS=	8.15
+CATEGORIES=	print
+MASTER_SITES+=	${MASTER_SITE_SOURCEFORGE:=ghostscript/} \
+		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/gs${GS_VERS:S/.//}/
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	GNU Postscript interpreter with all drivers
+HOMEPAGE=	http://www.cs.wisc.edu/~ghost/index.html
+
+CONFLICTS+=	ghostscript{,-nox11}-[0-9]*
+CONFLICTS+=	ghostscript-afpl-[0-9]*
+CONFLICTS+=	ghostscript-esp{,-nox11}-[0-9]*
+CONFLICTS+=	ghostscript-gnu{,-nox11,-x11}-[0-9]*
+
+DEPENDS+=	ghostscript-fonts>=6.0:../../fonts/ghostscript-fonts
+
+USE_TOOLS+=		gmake
+GNU_CONFIGURE=		YES
+CONFIGURE_ARGS+=	--with-ijs
+
+DIST_SUBDIR=		ghostscript
+GS_SRCS=		${DISTNAME}${EXTRACT_SUFX}
+DISTFILES+=		${GS_SRCS}
+EXTRACT_ONLY=		${GS_SRCS}
+
+# Adobe's JPEG implementation in their PDF/PS documents is non-standard,
+# so we can't use an already installed libjpeg.so.
+#
+JPEG_SRCS=		jpegsrc.v6b.tar.gz
+JPEG_WRKSRC=		${WRKDIR}/jpeg-6b
+SITES_${JPEG_SRCS}=	ftp://ftp.uu.net/graphics/jpeg/
+DISTFILES+=		${JPEG_SRCS}
+EXTRACT_ONLY+=		${JPEG_SRCS}
+
+DISTINFO_FILE=		${.CURDIR}/../../print/ghostscript-gnu/distinfo
+FILESDIR=		${.CURDIR}/../../print/ghostscript-gnu/files
+PATCHDIR=		${.CURDIR}/../../print/ghostscript-gnu/patches
+PLIST_SRC=		${.CURDIR}/../../print/ghostscript-gnu/PLIST
+
+.include "options.mk"
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "Interix"
+MAKE_FLAGS+=		XLIBS="Xt SM ICE Xext X11"
+.endif
+
+.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
+GCC_REQD+=		3.0
+.endif
+
+.if defined(PAPERSIZE) && (${PAPERSIZE} == "A4" || ${PAPERSIZE} == "a4")
+CFLAGS+=		-DA4
+.endif
+CFLAGS+=		-DHAVE_MKSTEMP=1
+
+MAKE_FLAGS+=		XCFLAGS=${CFLAGS:M*:Q}
+MAKE_FLAGS+=		XLDFLAGS=${LDFLAGS:M*:Q}
+
+REPLACE_PERL=		lib/fixmswrd.pl
+
+GS_RESOURCEDIR=		${PREFIX}/share/ghostscript/Resource
+GSDATADIR=		${PREFIX}/share/ghostscript/${GS_VERS}
+DOCDIR=			${PREFIX}/share/doc/ghostscript
+HTMLDIR=		${PREFIX}/share/doc/html/ghostscript
+LIBDIR=			${GSDATADIR}/lib
+
+PLIST_SUBST+=		GS_VERS=${GS_VERS:Q}
+
+.include "../../mk/compiler.mk"
+
+.if !empty(PKGSRC_COMPILER:Mmipspro*)
+CFLAGS+=		-c99
+.endif
+
+post-extract:
+	${MKDIR} ${WRKSRC}/bin
+	${MKDIR} ${WRKSRC}/obj
+	${RM} -f ${WRKSRC}/jpeg
+	${LN} -s ${JPEG_WRKSRC} ${WRKSRC}/jpeg
+	cd ${WRKSRC}/lib; for f in gs_res.ps; do				\
+		${SED}  -e "s|/Resource/|${GS_RESOURCEDIR}/|g"		\
+			$${f} > $${f}.fixed;				\
+		${MV} -f $${f}.fixed $${f};				\
+	done
 
-CONFIGURE_ARGS+=	--with-x
+# Reinstall the gs binary so that it's properly stripped.
+post-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/gs ${PREFIX}/bin/gs
 
-.include "../../mk/x11.buildlink3.mk"
-.include "Makefile.common"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/print/ghostscript-gnu/Makefile.common b/print/ghostscript-gnu/Makefile.common
deleted file mode 100644
index a2d2d7c7593..00000000000
--- a/print/ghostscript-gnu/Makefile.common
+++ /dev/null
@@ -1,93 +0,0 @@
-# $NetBSD: Makefile.common,v 1.26 2005/12/05 20:50:52 rillig Exp $
-
-DISTNAME=	ghostscript-${GS_VERS}
-GS_VERS=	8.15
-CATEGORIES=	print
-MASTER_SITES+=	${MASTER_SITE_SOURCEFORGE:=ghostscript/} \
-		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/gs${GS_VERS:S/.//}/
-EXTRACT_SUFX=	.tar.bz2
-
-MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://www.cs.wisc.edu/~ghost/index.html
-
-CONFLICTS+=	ghostscript{,-nox11}-[0-9]*
-CONFLICTS+=	ghostscript-afpl-[0-9]*
-CONFLICTS+=	ghostscript-esp{,-nox11}-[0-9]*
-CONFLICTS+=	ghostscript-gnu{,-nox11,-x11}-[0-9]*
-
-DEPENDS+=	ghostscript-fonts>=6.0:../../fonts/ghostscript-fonts
-
-USE_TOOLS+=		gmake
-GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--with-ijs
-
-DIST_SUBDIR=		ghostscript
-GS_SRCS=		${DISTNAME}${EXTRACT_SUFX}
-DISTFILES+=		${GS_SRCS}
-EXTRACT_ONLY=		${GS_SRCS}
-
-# Adobe's JPEG implementation in their PDF/PS documents is non-standard,
-# so we can't use an already installed libjpeg.so.
-#
-JPEG_SRCS=		jpegsrc.v6b.tar.gz
-JPEG_WRKSRC=		${WRKDIR}/jpeg-6b
-SITES_${JPEG_SRCS}=	ftp://ftp.uu.net/graphics/jpeg/
-DISTFILES+=		${JPEG_SRCS}
-EXTRACT_ONLY+=		${JPEG_SRCS}
-
-DISTINFO_FILE=		${.CURDIR}/../../print/ghostscript-gnu/distinfo
-FILESDIR=		${.CURDIR}/../../print/ghostscript-gnu/files
-PATCHDIR=		${.CURDIR}/../../print/ghostscript-gnu/patches
-PLIST_SRC=		${.CURDIR}/../../print/ghostscript-gnu/PLIST
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Interix"
-MAKE_FLAGS+=		XLIBS="Xt SM ICE Xext X11"
-.endif
-
-.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-GCC_REQD+=		3.0
-.endif
-
-.if defined(PAPERSIZE) && (${PAPERSIZE} == "A4" || ${PAPERSIZE} == "a4")
-CFLAGS+=		-DA4
-.endif
-CFLAGS+=		-DHAVE_MKSTEMP=1
-
-MAKE_FLAGS+=		XCFLAGS=${CFLAGS:M*:Q}
-MAKE_FLAGS+=		XLDFLAGS=${LDFLAGS:M*:Q}
-
-REPLACE_PERL=		lib/fixmswrd.pl
-
-GS_RESOURCEDIR=		${PREFIX}/share/ghostscript/Resource
-GSDATADIR=		${PREFIX}/share/ghostscript/${GS_VERS}
-DOCDIR=			${PREFIX}/share/doc/ghostscript
-HTMLDIR=		${PREFIX}/share/doc/html/ghostscript
-LIBDIR=			${GSDATADIR}/lib
-
-PLIST_SUBST+=		GS_VERS=${GS_VERS:Q}
-
-.include "../../mk/compiler.mk"
-
-.if !empty(PKGSRC_COMPILER:Mmipspro*)
-CFLAGS+=		-c99
-.endif
-
-post-extract:
-	${MKDIR} ${WRKSRC}/bin
-	${MKDIR} ${WRKSRC}/obj
-	${RM} -f ${WRKSRC}/jpeg
-	${LN} -s ${JPEG_WRKSRC} ${WRKSRC}/jpeg
-	cd ${WRKSRC}/lib; for f in gs_res.ps; do				\
-		${SED}  -e "s|/Resource/|${GS_RESOURCEDIR}/|g"		\
-			$${f} > $${f}.fixed;				\
-		${MV} -f $${f}.fixed $${f};				\
-	done
-
-# Reinstall the gs binary so that it's properly stripped.
-post-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/gs ${PREFIX}/bin/gs
-
-.include "../../graphics/png/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/print/ghostscript-gnu/options.mk b/print/ghostscript-gnu/options.mk
new file mode 100644
index 00000000000..a8cb65205fc
--- /dev/null
+++ b/print/ghostscript-gnu/options.mk
@@ -0,0 +1,14 @@
+# $NetBSD: options.mk,v 1.1 2005/12/09 20:30:16 wiz Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.ghostscript-gnu
+PKG_SUPPORTED_OPTIONS=	x11
+PKG_SUGGESTED_OPTIONS=	x11
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mx11)
+CONFIGURE_ARGS+=	--with-x
+.include "../../mk/x11.buildlink3.mk"
+.else
+CONFIGURE_ARGS+=        --without-x
+.endif
diff --git a/print/ghostscript-nox11/DESCR b/print/ghostscript-nox11/DESCR
deleted file mode 100644
index 5251691e989..00000000000
--- a/print/ghostscript-nox11/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-Ghostscript is the well-known PostScript interpreter which is available for
-all common and most esoteric platforms and supports many different printers
-and some displays.
-
-This version of Ghostscript includes support for the Japanese Vector Font
-library and contains a full installation without the X11 drivers.
diff --git a/print/ghostscript-nox11/Makefile b/print/ghostscript-nox11/Makefile
deleted file mode 100644
index 40a098c2b99..00000000000
--- a/print/ghostscript-nox11/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2005/11/27 17:08:31 adrianp Exp $
-
-PKGNAME=	ghostscript-nox11-${GS_VERS}
-PKGREVISION=	6
-COMMENT=	Aladdin Postscript interpreter without X11 drivers
-
-.include "Makefile.common"
diff --git a/print/ghostscript-nox11/Makefile.common b/print/ghostscript-nox11/Makefile.common
deleted file mode 100644
index bcb170b4c3d..00000000000
--- a/print/ghostscript-nox11/Makefile.common
+++ /dev/null
@@ -1,305 +0,0 @@
-# $NetBSD: Makefile.common,v 1.61 2005/12/05 20:50:53 rillig Exp $
-
-DISTNAME=		ghostscript-${GS_VERS}
-GS_VERS=		6.01
-CATEGORIES=		print
-MASTER_SITES+=		${MASTER_SITE_SOURCEFORGE:=ghostscript/} \
-			ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/aladdin/gs${GS_VERS:S/.//}/
-EXTRACT_SUFX=		.tar.bz2
-
-MAINTAINER=		tech-pkg@NetBSD.org
-HOMEPAGE=		http://www.cs.wisc.edu/~ghost/index.html
-
-CONFLICTS+=		ghostscript{,-nox11}-[0-9]*
-CONFLICTS+=		ghostscript-afpl-[0-9]*
-CONFLICTS+=		ghostscript-esp{,-nox11}-[0-9]*
-CONFLICTS+=		ghostscript-gnu{,-nox11,-x11}-[0-9]*
-CONFLICTS+=		hpijs-[0-9]*
-
-DEPENDS+=		ghostscript-fonts>=6.0:../../fonts/ghostscript-fonts
-DEPENDS+=		watanabe-vfont-19930318:../../fonts/watanabe_vfont
-
-WRKSRC=			${WRKDIR}/gs${GS_VERS}
-USE_TOOLS+=		gmake
-GNU_CONFIGURE=		yes
-
-GS_SRCS=		${DISTNAME}${EXTRACT_SUFX}
-DISTFILES+=		${GS_SRCS}
-EXTRACT_ONLY=		${GS_SRCS}
-
-# Adobe's JPEG implementation in their PDF/PS documents is non-standard,
-# so we can't use an already installed libjpeg.so.
-#
-JPEG_SRCS=		jpegsrc.v6b.tar.gz
-JPEG_WRKSRC=		${WRKDIR}/jpeg-6b
-SITES_${JPEG_SRCS}=	ftp://ftp.uu.net/graphics/jpeg/ \
-			ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/3rdparty/
-DISTFILES+=		${JPEG_SRCS}
-EXTRACT_ONLY+=		${JPEG_SRCS}
-
-# VFlib & Japanese PDF patch
-PATCH_SITES=		http://www.sat.t.u-tokyo.ac.jp/~hideyuki/Ghostscript/
-PATCHFILES=		gs${GS_VERS}-jpdf-exp.patch.gz
-PATCH_DIST_STRIP=	-p1
-
-# PostScript source to decode encrypted PDF files
-PDF_SEC=		pdf_sec.ps
-SITES_${PDF_SEC}=	http://www.ozemail.com.au/~geoffk/pdfencrypt/
-DISTFILES+=		${PDF_SEC}
-
-# Gimp-print/STP drivers for photo-quality inkjet output
-GIMPPRINT=		gimp-print-4.2.0
-GIMPPRINT_SRCS=		${GIMPPRINT}.tar.gz
-GIMPPRINT_WRKSRC=	${WRKDIR}/${GIMPPRINT}
-SITES_${GIMPPRINT_SRCS}=	${MASTER_SITE_SOURCEFORGE:=gimp-print/}
-DISTFILES+=			${GIMPPRINT_SRCS}
-EXTRACT_ONLY+=			${GIMPPRINT_SRCS}
-GIMPPRINT_CONFIGURE_ARGS=	${CONFIGURE_ARGS} --without-gimp --with-ghost
-
-# Drivers from the HP Inkjet Project (IJS/HPIJS)
-HPIJS_DRV=		hpijs-1.0.2
-HPIJS_SRCS=		${HPIJS_DRV}.tar.gz
-HPIJS_WRKSRC=		${WRKDIR}/${HPIJS_DRV}
-HPIJS_GSFILES=		gdevijs.c gdevijs.h
-HPIJS_GSFILES+=		ijs.c ijs.h ijs_client.c ijs_client.h ijs_exec_unix.c
-HPIJS_GSFILES+=		unistd_.h
-SITES_${HPIJS_SRCS}=	${MASTER_SITE_SOURCEFORGE:=hpinkjet/}
-DISTFILES+=		${HPIJS_SRCS}
-EXTRACT_ONLY+=		${HPIJS_SRCS}
-HPIJS_CONFIGURE_ARGS=	${CONFIGURE_ARGS}
-
-# Additional driver for several HP deskjets
-HPDJ_DRV=		hpdj-2.6
-SITES_${HPDJ_DRV}.tar.gz=	ftp://ftp.sbs.de/pub/graphics/ghostscript/pcl3/
-DISTFILES+=		${HPDJ_DRV}.tar.gz
-EXTRACT_ONLY+=		${HPDJ_DRV}.tar.gz
-
-# I don't know the primary destribution sites of these drivers....
-DMPRT_DRV=		dmprt-2.01
-SITES_${DMPRT_DRV}.tar.gz=	ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/
-DISTFILES+=		${DMPRT_DRV}.tar.gz
-EXTRACT_ONLY+=		${DMPRT_DRV}.tar.gz
-
-BJ10V_DRV=		gdev10v
-DISTFILES+=		${BJ10V_DRV}.tar.gz
-EXTRACT_ONLY+=		${BJ10V_DRV}.tar.gz
-
-# EPSON MJ-700V2C
-MJC_DRV=		gdevmjc-0.8
-DISTFILES+=		${MJC_DRV}.tar.gz
-EXTRACT_ONLY+=		${MJC_DRV}.tar.gz
-
-# Alps MD5000 printer 600dpi monochrome mode
-MD5000_DRV=		gdevalps-0.2
-DISTFILES+=		${MD5000_DRV}.tar.gz
-EXTRACT_ONLY+=		${MD5000_DRV}.tar.gz
-
-# Alps MD-2000/2010/4000/1300/1500/5000
-MD2000_DRV=		gdevmd2k-0.2a
-SITES_${MD2000_DRV}.tar.gz=	http://plaza26.mbn.or.jp/~higamasa/gdevmd2k/
-DISTFILES+=		${MD2000_DRV}.tar.gz
-EXTRACT_ONLY+=		${MD2000_DRV}.tar.gz
-
-# Canon LIPS II+, III, IV; EPSON ESC/Page; NEC NPDL drivers
-LIPS_DRV=		gdevlips-2.3.6
-SITES_${LIPS_DRV}.tar.gz=	http://www.bukka.p.chiba-u.ac.jp/~ohmori/gs/
-DISTFILES+=		${LIPS_DRV}.tar.gz
-EXTRACT_ONLY+=		${LIPS_DRV}.tar.gz
-
-# Ricoh RPDL
-RPDL_DRV=		gdevrpdl
-SITES_${RPDL_DRV}.tar.gz=	http://home.jp.FreeBSD.org/~mita/LOCAL_PORTS/
-DISTFILES+=		${RPDL_DRV}.tar.gz
-EXTRACT_ONLY+=		${RPDL_DRV}.tar.gz
-
-# Kyocera Prescribe
-PRESCR_DRV=		gdevprsc-0.4
-SITES_${PRESCR_DRV}.tar.gz=	${MASTER_SITE_LOCAL}
-DISTFILES+=		${PRESCR_DRV}.tar.gz
-EXTRACT_ONLY+=		${PRESCR_DRV}.tar.gz
-
-# Samsung SmartGDI laser printers
-GDI_DRV=		samsung-gdi-driver
-SITES_${GDI_DRV}.tar.gz=	http://www.linuxprinting.org/download/printing/
-DISTFILES+=		${GDI_DRV}.tar.gz
-EXTRACT_ONLY+=		${GDI_DRV}.tar.gz
-
-DISTINFO_FILE=		${.CURDIR}/../../print/ghostscript-nox11/distinfo
-FILESDIR=		${.CURDIR}/../../print/ghostscript-nox11/files
-PATCHDIR=		${.CURDIR}/../../print/ghostscript-nox11/patches
-PLIST_SRC=		${.CURDIR}/../../print/ghostscript-nox11/PLIST
-
-DIST_SUBDIR=		ghostscript
-MAKEFILE=		src/unix-gcc.mak
-BUILD_TARGET=		std
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-GCC_REQD+=		2.95.3
-.elif ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-GCC_REQD+=		3.0
-.endif
-
-.if defined(ZOULARISBASE)
-LDFLAGS+=	-L${ZOULARISBASE}/lib ${COMPILER_RPATH_FLAG}${ZOULARISBASE}/lib
-.endif
-
-.if defined(PAPERSIZE) && (${PAPERSIZE} == "A4" || ${PAPERSIZE} == "a4")
-CFLAGS+=		-DA4
-.endif
-CFLAGS+=		-DHAVE_MKSTEMP=1
-
-XLIBS?=			# empty
-GS_DISPLAY_DEVICE?=	# empty
-
-MAKE_FLAGS+=		CFLAGS=${CFLAGS:M*:Q}
-MAKE_FLAGS+=		LDFLAGS=${LDFLAGS:M*:Q}
-MAKE_FLAGS+=		GS_DISPLAY_DEVICE=${GS_DISPLAY_DEVICE:Q}
-MAKE_FLAGS+=		XINCLUDE= XLIBDIRS= XLIBS=${XLIBS:Q}
-
-.if ${OPSYS} == "SunOS"
-LDFLAGS+=		-L${LOCALBASE}/bsd/lib ${COMPILER_RPATH_FLAG}${LOCALBASE}/bsd/lib
-.endif
-
-# Define whether this platform has floating point hardware:
-#	FPU_TYPE=2 means floating point is faster than fixed point.
-# (This is the case on some RISCs with multiple instruction dispatch.)
-#	FPU_TYPE=1 means floating point is at worst only slightly slower
-# than fixed point.
-#	FPU_TYPE=0 means that floating point may be considerably slower.
-#	FPU_TYPE=-1 means that floating point is always much slower than
-# fixed point.
-#
-FPU_TYPE?=		1
-MAKE_FLAGS+=		FPU_TYPE=${FPU_TYPE:Q}
-
-PLIST_SUBST+=		GS_VERS=${GS_VERS}vflib
-
-MAKEFRAGS=		${FILESDIR}/devs.nox11
-REPLACE_PERL=		lib/fixmswrd.pl
-
-GSDATADIR=		${PREFIX}/share/ghostscript/${GS_VERS}vflib
-DOCDIR=			${PREFIX}/share/doc/ghostscript
-HTMLDIR=		${PREFIX}/share/doc/html/ghostscript
-LIBDIR=			${GSDATADIR}/lib
-
-GS_CONF_PREREQ=		# empty
-
-contrib-drivers:
-	cd ${WRKSRC}/src; ${PAX} -rf ${WRKDIR}/${HPDJ_DRV}/hpdj.tar
-	${MV} ${WRKSRC}/src/gs-hpdj.1 ${WRKSRC}/man
-	cd ${WRKDIR}; ${CP} gdevdmpr.c gdevdmpr.mak		${WRKSRC}/src
-	cd ${WRKDIR}; ${CP} dviprlib.*				${WRKSRC}/src
-	cd ${WRKDIR}/${BJ10V_DRV}; ${CP} gdev10v.c gdev10v.mak	${WRKSRC}/src
-	cd ${WRKDIR}/${MJC_DRV}; ${CP} *.[ch] gdevmjc.mak	${WRKSRC}/src
-	cd ${WRKDIR}/${LIPS_DRV}; ${CP} *			${WRKSRC}/src
-	cd ${WRKDIR}/${RPDL_DRV}; ${CP} gdevrpdl.c gdevrpdl.mak	${WRKSRC}/src
-	cd ${WRKDIR}/${MD5000_DRV}; \
-		${CP} gdevalps.c gdevalps.mak-5.50		${WRKSRC}/src
-	cd ${WRKDIR}/${MD2000_DRV}; \
-		${CP} gdevmd2k.c gdevmd2k.mak-5.8x		${WRKSRC}/src
-	cd ${WRKDIR}/${PRESCR_DRV}; \
-		${CP} gdevprsc.c gdevprsc.mak			${WRKSRC}/src
-	cd ${WRKDIR}; ${CP} gdevgdi.c				${WRKSRC}/src
-
-post-extract: contrib-drivers
-	${RM} -f ${WRKSRC}/jpeg
-	${LN} -s ${JPEG_WRKSRC} ${WRKSRC}/jpeg
-	${RM} -f ${WRKSRC}/lib/${PDF_SEC}
-	${LN} -s ${_DISTDIR}/${PDF_SEC} ${WRKSRC}/lib/${PDF_SEC}
-
-post-patch:
-	if [ ! -f ${WRKDIR}/dmp_site.ps.bak ]; then			\
-		${MV} ${WRKDIR}/dmp_site.ps ${WRKDIR}/dmp_site.ps.bak;	\
-	fi
-	${SED}	-e "s|epsimage\.src|${GSDATADIR}/lib/escp_24.src|g"	\
-		${WRKDIR}/dmp_site.ps.bak > ${WRKDIR}/dmp_site.ps
-
-GS_CONF_PREREQ+=	hpijs-configure
-hpijs-configure:
-	cd ${HPIJS_WRKSRC} &&						\
-	${SETENV} CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}"	\
-		${CONFIGURE_ENV}					\
-		${CONFIGURE_SCRIPT} ${HPIJS_CONFIGURE_ARGS} &&		\
-	${CP} ${HPIJS_GSFILES} ${WRKSRC}/src &&				\
-	${HEAD} -518 contrib.mak | ${TAIL} -20				\
-		>> ${WRKSRC}/src/contrib.mak
-
-GS_BUILD_PREREQ+=	hpijs-build
-hpijs-build:
-	cd ${HPIJS_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} all
-
-GS_INSTALL_PREREQ+=	hpijs-install
-hpijs-install:
-	cd ${HPIJS_WRKSRC} &&						\
-	${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} install docdir=${HTMLDIR}/hpijs
-
-GS_CONF_PREREQ+=	gimpprint-configure
-gimpprint-configure:
-	cd ${GIMPPRINT_WRKSRC} &&					\
-	${SETENV} CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}"	\
-		${GIMPPRINT_CONFIGURE_ENV}				\
-		${CONFIGURE_SCRIPT} ${GIMPPRINT_CONFIGURE_ARGS} &&	\
-	cd ${GIMPPRINT_WRKSRC}/src/ghost &&				\
-	${SETENV} ${MAKE_ENV} SED=${SED} ${MAKE_PROGRAM} all-local &&		\
-	( ${ECHO} '#ifndef GIMPPRINT_VERSION_FIX';			\
-	  ${ECHO} '#define GIMPPRINT_VERSION_FIX';			\
-	  ${EGREP} '#define (VERSION|RELEASE_DATE)' ../../config.h;	\
-	  ${ECHO} '#endif /* GIMPPRINT_VERSION_FIX */';			\
-	) >> gdevstp-print.h;						\
-	${CP} *.c *.h ${WRKSRC}/src &&					\
-	${CAT} contrib.mak.addon.old >> ${WRKSRC}/src/contrib.mak
-
-do-configure: ${GS_CONF_PREREQ}
-	#
-	# Append build rules for extra drivers to contrib.mak
-	#
-	${CAT}	${WRKSRC}/src/contrib.mak-5.94.add			\
-		${WRKSRC}/src/gdevlips.mak				\
-		${WRKSRC}/src/gdev10v.mak				\
-		${WRKSRC}/src/gdevmjc.mak				\
-		${WRKSRC}/src/gdevrpdl.mak				\
-		${WRKSRC}/src/gdevdmpr.mak				\
-		${WRKSRC}/src/gdevalps.mak-5.50				\
-		${WRKSRC}/src/gdevmd2k.mak-5.8x				\
-		${WRKSRC}/src/gdevprsc.mak				\
-		>> ${WRKSRC}/src/contrib.mak
-	#
-	# Prepend device list to unix-gcc.mak
-	#
-	( if [ -n "${GS_DISPLAY_DEVICE:Q}" ]; then			\
-		${ECHO} 'DEVICE_DEVS=	$$(DD)${GS_DISPLAY_DEVICE}';	\
-		${ECHO} '';						\
-	  fi;								\
-	  ${CAT} ${MAKEFRAGS} ${WRKSRC}/src/unix-gcc.mak		\
-	) > ${WRKDIR}/unix-gcc.mak
-	${MV} -f ${WRKDIR}/unix-gcc.mak ${WRKSRC}/src
-
-post-build: ${GS_BUILD_PREREQ}
-
-post-install: ${GS_INSTALL_PREREQ}
-
-post-install:
-	strip ${PREFIX}/bin/gs
-	${INSTALL_DATA_DIR} ${DOCDIR}
-	${INSTALL_DATA} ${GIMPPRINT_WRKSRC}/src/ghost/README		\
-		${DOCDIR}/README.stp
-	${INSTALL_DATA} ${WRKDIR}/${LIPS_DRV}/Gdevlips.htm ${HTMLDIR}
-	${INSTALL_DATA} ${WRKDIR}/${BJ10V_DRV}/gdev10v.jis ${DOCDIR}
-	${INSTALL_DATA} ${WRKDIR}/gdevdmpr.sj ${DOCDIR}
-	${INSTALL_DATA} ${WRKDIR}/dmp_init.ps ${LIBDIR}
-	${INSTALL_DATA} ${WRKDIR}/dmp_site.ps ${LIBDIR}
-	${INSTALL_DATA} ${WRKDIR}/escp_24.src ${LIBDIR}
-	${INSTALL_DATA} ${WRKDIR}/testpage.ps ${LIBDIR}
-	${INSTALL_DATA} ${WRKDIR}/${PRESCR_DRV}/gdevprsc.?? ${DOCDIR}
-	${INSTALL_DATA_DIR} ${DOCDIR}/${MJC_DRV}
-	${INSTALL_DATA} ${WRKDIR}/${MJC_DRV}/README.mjc ${DOCDIR}/${MJC_DRV}
-	${INSTALL_DATA} ${WRKDIR}/${MJC_DRV}/README.noz ${DOCDIR}/${MJC_DRV}
-	${INSTALL_DATA} ${WRKDIR}/${MJC_DRV}/README.mje ${DOCDIR}/${MJC_DRV}
-	${INSTALL_DATA} ${WRKDIR}/${MJC_DRV}/cpem.doc ${DOCDIR}/${MJC_DRV}
-	${INSTALL_DATA} ${WRKDIR}/${MJC_DRV}/MJ700V2C.FAQ ${DOCDIR}/${MJC_DRV}
-
-.include "../../graphics/png/buildlink3.mk"
-.include "../../print/ja-vflib-lib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/print/ghostscript/Makefile b/print/ghostscript/Makefile
index 42def2114e9..73568cf84be 100644
--- a/print/ghostscript/Makefile
+++ b/print/ghostscript/Makefile
@@ -1,13 +1,301 @@
-# $NetBSD: Makefile,v 1.16 2005/11/27 17:07:29 adrianp Exp $
+# $NetBSD: Makefile,v 1.17 2005/12/09 20:30:16 wiz Exp $
 
-PKGNAME=	ghostscript-${GS_VERS}
-PKGREVISION=	6
-COMMENT=	Aladdin Postscript interpreter
+DISTNAME=		ghostscript-${GS_VERS}
+PKGREVISION=		6
+GS_VERS=		6.01
+CATEGORIES=		print
+MASTER_SITES+=		${MASTER_SITE_SOURCEFORGE:=ghostscript/} \
+			ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/aladdin/gs${GS_VERS:S/.//}/
+EXTRACT_SUFX=		.tar.bz2
 
-GS_DISPLAY_DEVICE=	x11.dev
-XLIBS=			Xt SM ICE Xext X11
+MAINTAINER=		tech-pkg@NetBSD.org
+COMMENT=		Aladdin Postscript interpreter
+HOMEPAGE=		http://www.cs.wisc.edu/~ghost/index.html
 
-.include "../../mk/x11.buildlink3.mk"
-.include "../../print/ghostscript-nox11/Makefile.common"
+DEPENDS+=		ghostscript-fonts>=6.0:../../fonts/ghostscript-fonts
+DEPENDS+=		watanabe-vfont-19930318:../../fonts/watanabe_vfont
 
-MAKEFRAGS+=		${FILESDIR}/devs.x11
+CONFLICTS+=		ghostscript{,-nox11}-[0-9]*
+CONFLICTS+=		ghostscript-afpl-[0-9]*
+CONFLICTS+=		ghostscript-esp{,-nox11}-[0-9]*
+CONFLICTS+=		ghostscript-gnu{,-nox11,-x11}-[0-9]*
+CONFLICTS+=		hpijs-[0-9]*
+
+WRKSRC=			${WRKDIR}/gs${GS_VERS}
+USE_TOOLS+=		gmake
+GNU_CONFIGURE=		yes
+
+GS_SRCS=		${DISTNAME}${EXTRACT_SUFX}
+DISTFILES+=		${GS_SRCS}
+EXTRACT_ONLY=		${GS_SRCS}
+
+# Adobe's JPEG implementation in their PDF/PS documents is non-standard,
+# so we can't use an already installed libjpeg.so.
+#
+JPEG_SRCS=		jpegsrc.v6b.tar.gz
+JPEG_WRKSRC=		${WRKDIR}/jpeg-6b
+SITES_${JPEG_SRCS}=	ftp://ftp.uu.net/graphics/jpeg/ \
+			ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/3rdparty/
+DISTFILES+=		${JPEG_SRCS}
+EXTRACT_ONLY+=		${JPEG_SRCS}
+
+# VFlib & Japanese PDF patch
+PATCH_SITES=		http://www.sat.t.u-tokyo.ac.jp/~hideyuki/Ghostscript/
+PATCHFILES=		gs${GS_VERS}-jpdf-exp.patch.gz
+PATCH_DIST_STRIP=	-p1
+
+# PostScript source to decode encrypted PDF files
+PDF_SEC=		pdf_sec.ps
+SITES_${PDF_SEC}=	http://www.ozemail.com.au/~geoffk/pdfencrypt/
+DISTFILES+=		${PDF_SEC}
+
+# Gimp-print/STP drivers for photo-quality inkjet output
+GIMPPRINT=		gimp-print-4.2.0
+GIMPPRINT_SRCS=		${GIMPPRINT}.tar.gz
+GIMPPRINT_WRKSRC=	${WRKDIR}/${GIMPPRINT}
+SITES_${GIMPPRINT_SRCS}=	${MASTER_SITE_SOURCEFORGE:=gimp-print/}
+DISTFILES+=			${GIMPPRINT_SRCS}
+EXTRACT_ONLY+=			${GIMPPRINT_SRCS}
+GIMPPRINT_CONFIGURE_ARGS=	${CONFIGURE_ARGS} --without-gimp --with-ghost
+
+# Drivers from the HP Inkjet Project (IJS/HPIJS)
+HPIJS_DRV=		hpijs-1.0.2
+HPIJS_SRCS=		${HPIJS_DRV}.tar.gz
+HPIJS_WRKSRC=		${WRKDIR}/${HPIJS_DRV}
+HPIJS_GSFILES=		gdevijs.c gdevijs.h
+HPIJS_GSFILES+=		ijs.c ijs.h ijs_client.c ijs_client.h ijs_exec_unix.c
+HPIJS_GSFILES+=		unistd_.h
+SITES_${HPIJS_SRCS}=	${MASTER_SITE_SOURCEFORGE:=hpinkjet/}
+DISTFILES+=		${HPIJS_SRCS}
+EXTRACT_ONLY+=		${HPIJS_SRCS}
+HPIJS_CONFIGURE_ARGS=	${CONFIGURE_ARGS}
+
+# Additional driver for several HP deskjets
+HPDJ_DRV=		hpdj-2.6
+SITES_${HPDJ_DRV}.tar.gz=	ftp://ftp.sbs.de/pub/graphics/ghostscript/pcl3/
+DISTFILES+=		${HPDJ_DRV}.tar.gz
+EXTRACT_ONLY+=		${HPDJ_DRV}.tar.gz
+
+# I don't know the primary destribution sites of these drivers....
+DMPRT_DRV=		dmprt-2.01
+SITES_${DMPRT_DRV}.tar.gz=	ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/
+DISTFILES+=		${DMPRT_DRV}.tar.gz
+EXTRACT_ONLY+=		${DMPRT_DRV}.tar.gz
+
+BJ10V_DRV=		gdev10v
+DISTFILES+=		${BJ10V_DRV}.tar.gz
+EXTRACT_ONLY+=		${BJ10V_DRV}.tar.gz
+
+# EPSON MJ-700V2C
+MJC_DRV=		gdevmjc-0.8
+DISTFILES+=		${MJC_DRV}.tar.gz
+EXTRACT_ONLY+=		${MJC_DRV}.tar.gz
+
+# Alps MD5000 printer 600dpi monochrome mode
+MD5000_DRV=		gdevalps-0.2
+DISTFILES+=		${MD5000_DRV}.tar.gz
+EXTRACT_ONLY+=		${MD5000_DRV}.tar.gz
+
+# Alps MD-2000/2010/4000/1300/1500/5000
+MD2000_DRV=		gdevmd2k-0.2a
+SITES_${MD2000_DRV}.tar.gz=	http://plaza26.mbn.or.jp/~higamasa/gdevmd2k/
+DISTFILES+=		${MD2000_DRV}.tar.gz
+EXTRACT_ONLY+=		${MD2000_DRV}.tar.gz
+
+# Canon LIPS II+, III, IV; EPSON ESC/Page; NEC NPDL drivers
+LIPS_DRV=		gdevlips-2.3.6
+SITES_${LIPS_DRV}.tar.gz=	http://www.bukka.p.chiba-u.ac.jp/~ohmori/gs/
+DISTFILES+=		${LIPS_DRV}.tar.gz
+EXTRACT_ONLY+=		${LIPS_DRV}.tar.gz
+
+# Ricoh RPDL
+RPDL_DRV=		gdevrpdl
+SITES_${RPDL_DRV}.tar.gz=	http://home.jp.FreeBSD.org/~mita/LOCAL_PORTS/
+DISTFILES+=		${RPDL_DRV}.tar.gz
+EXTRACT_ONLY+=		${RPDL_DRV}.tar.gz
+
+# Kyocera Prescribe
+PRESCR_DRV=		gdevprsc-0.4
+SITES_${PRESCR_DRV}.tar.gz=	${MASTER_SITE_LOCAL}
+DISTFILES+=		${PRESCR_DRV}.tar.gz
+EXTRACT_ONLY+=		${PRESCR_DRV}.tar.gz
+
+# Samsung SmartGDI laser printers
+GDI_DRV=		samsung-gdi-driver
+SITES_${GDI_DRV}.tar.gz=	http://www.linuxprinting.org/download/printing/
+DISTFILES+=		${GDI_DRV}.tar.gz
+EXTRACT_ONLY+=		${GDI_DRV}.tar.gz
+
+DIST_SUBDIR=		ghostscript
+MAKEFILE=		src/unix-gcc.mak
+BUILD_TARGET=		std
+
+MAKEFRAGS=		${FILESDIR}/devs.nox11
+
+.include "options.mk"
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+GCC_REQD+=		2.95.3
+.elif ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
+GCC_REQD+=		3.0
+.endif
+
+.if defined(PAPERSIZE) && (${PAPERSIZE} == "A4" || ${PAPERSIZE} == "a4")
+CFLAGS+=		-DA4
+.endif
+CFLAGS+=		-DHAVE_MKSTEMP=1
+
+MAKE_FLAGS+=		CFLAGS=${CFLAGS:M*:Q}
+MAKE_FLAGS+=		LDFLAGS=${LDFLAGS:M*:Q}
+MAKE_FLAGS+=		GS_DISPLAY_DEVICE=${GS_DISPLAY_DEVICE:Q}
+MAKE_FLAGS+=		XINCLUDE= XLIBDIRS= XLIBS=${XLIBS:Q}
+
+.if ${OPSYS} == "SunOS"
+LDFLAGS+=		-L${LOCALBASE}/bsd/lib ${COMPILER_RPATH_FLAG}${LOCALBASE}/bsd/lib
+.endif
+
+# Define whether this platform has floating point hardware:
+#	FPU_TYPE=2 means floating point is faster than fixed point.
+# (This is the case on some RISCs with multiple instruction dispatch.)
+#	FPU_TYPE=1 means floating point is at worst only slightly slower
+# than fixed point.
+#	FPU_TYPE=0 means that floating point may be considerably slower.
+#	FPU_TYPE=-1 means that floating point is always much slower than
+# fixed point.
+#
+FPU_TYPE?=		1
+MAKE_FLAGS+=		FPU_TYPE=${FPU_TYPE:Q}
+
+PLIST_SUBST+=		GS_VERS=${GS_VERS}vflib
+REPLACE_PERL=		lib/fixmswrd.pl
+
+GSDATADIR=		${PREFIX}/share/ghostscript/${GS_VERS}vflib
+DOCDIR=			${PREFIX}/share/doc/ghostscript
+HTMLDIR=		${PREFIX}/share/doc/html/ghostscript
+LIBDIR=			${GSDATADIR}/lib
+
+GS_CONF_PREREQ=		# empty
+
+.PHONY: contrib-drivers
+contrib-drivers:
+	cd ${WRKSRC}/src; ${PAX} -rf ${WRKDIR}/${HPDJ_DRV}/hpdj.tar
+	${MV} ${WRKSRC}/src/gs-hpdj.1 ${WRKSRC}/man
+	cd ${WRKDIR}; ${CP} gdevdmpr.c gdevdmpr.mak		${WRKSRC}/src
+	cd ${WRKDIR}; ${CP} dviprlib.*				${WRKSRC}/src
+	cd ${WRKDIR}/${BJ10V_DRV}; ${CP} gdev10v.c gdev10v.mak	${WRKSRC}/src
+	cd ${WRKDIR}/${MJC_DRV}; ${CP} *.[ch] gdevmjc.mak	${WRKSRC}/src
+	cd ${WRKDIR}/${LIPS_DRV}; ${CP} *			${WRKSRC}/src
+	cd ${WRKDIR}/${RPDL_DRV}; ${CP} gdevrpdl.c gdevrpdl.mak	${WRKSRC}/src
+	cd ${WRKDIR}/${MD5000_DRV}; \
+		${CP} gdevalps.c gdevalps.mak-5.50		${WRKSRC}/src
+	cd ${WRKDIR}/${MD2000_DRV}; \
+		${CP} gdevmd2k.c gdevmd2k.mak-5.8x		${WRKSRC}/src
+	cd ${WRKDIR}/${PRESCR_DRV}; \
+		${CP} gdevprsc.c gdevprsc.mak			${WRKSRC}/src
+	cd ${WRKDIR}; ${CP} gdevgdi.c				${WRKSRC}/src
+
+post-extract: contrib-drivers
+	${RM} -f ${WRKSRC}/jpeg
+	${LN} -s ${JPEG_WRKSRC} ${WRKSRC}/jpeg
+	${RM} -f ${WRKSRC}/lib/${PDF_SEC}
+	${LN} -s ${_DISTDIR}/${PDF_SEC} ${WRKSRC}/lib/${PDF_SEC}
+
+post-patch:
+	if [ ! -f ${WRKDIR}/dmp_site.ps.bak ]; then			\
+		${MV} ${WRKDIR}/dmp_site.ps ${WRKDIR}/dmp_site.ps.bak;	\
+	fi
+	${SED}	-e "s|epsimage\.src|${GSDATADIR}/lib/escp_24.src|g"	\
+		${WRKDIR}/dmp_site.ps.bak > ${WRKDIR}/dmp_site.ps
+
+GS_CONF_PREREQ+=	hpijs-configure
+.PHONY: hpijs-configure
+hpijs-configure:
+	cd ${HPIJS_WRKSRC} &&						\
+	${SETENV} CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}"	\
+		${CONFIGURE_ENV}					\
+		${CONFIGURE_SCRIPT} ${HPIJS_CONFIGURE_ARGS} &&		\
+	${CP} ${HPIJS_GSFILES} ${WRKSRC}/src &&				\
+	${HEAD} -518 contrib.mak | ${TAIL} -20				\
+		>> ${WRKSRC}/src/contrib.mak
+
+GS_BUILD_PREREQ+=	hpijs-build
+.PHONY: hpijs-build
+hpijs-build:
+	cd ${HPIJS_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} all
+
+GS_INSTALL_PREREQ+=	hpijs-install
+.PHONY: hpijs-install
+hpijs-install:
+	cd ${HPIJS_WRKSRC} &&						\
+	${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} install docdir=${HTMLDIR}/hpijs
+
+GS_CONF_PREREQ+=	gimpprint-configure
+.PHONY: gimpprint-configure
+gimpprint-configure:
+	cd ${GIMPPRINT_WRKSRC} &&					\
+	${SETENV} CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}"	\
+		${GIMPPRINT_CONFIGURE_ENV}				\
+		${CONFIGURE_SCRIPT} ${GIMPPRINT_CONFIGURE_ARGS} &&	\
+	cd ${GIMPPRINT_WRKSRC}/src/ghost &&				\
+	${SETENV} ${MAKE_ENV} SED=${SED} ${MAKE_PROGRAM} all-local &&		\
+	( ${ECHO} '#ifndef GIMPPRINT_VERSION_FIX';			\
+	  ${ECHO} '#define GIMPPRINT_VERSION_FIX';			\
+	  ${EGREP} '#define (VERSION|RELEASE_DATE)' ../../config.h;	\
+	  ${ECHO} '#endif /* GIMPPRINT_VERSION_FIX */';			\
+	) >> gdevstp-print.h;						\
+	${CP} *.c *.h ${WRKSRC}/src &&					\
+	${CAT} contrib.mak.addon.old >> ${WRKSRC}/src/contrib.mak
+
+do-configure: ${GS_CONF_PREREQ}
+	#
+	# Append build rules for extra drivers to contrib.mak
+	#
+	${CAT}	${WRKSRC}/src/contrib.mak-5.94.add			\
+		${WRKSRC}/src/gdevlips.mak				\
+		${WRKSRC}/src/gdev10v.mak				\
+		${WRKSRC}/src/gdevmjc.mak				\
+		${WRKSRC}/src/gdevrpdl.mak				\
+		${WRKSRC}/src/gdevdmpr.mak				\
+		${WRKSRC}/src/gdevalps.mak-5.50				\
+		${WRKSRC}/src/gdevmd2k.mak-5.8x				\
+		${WRKSRC}/src/gdevprsc.mak				\
+		>> ${WRKSRC}/src/contrib.mak
+	#
+	# Prepend device list to unix-gcc.mak
+	#
+	( if [ -n "${GS_DISPLAY_DEVICE:Q}" ]; then			\
+		${ECHO} 'DEVICE_DEVS=	$$(DD)${GS_DISPLAY_DEVICE}';	\
+		${ECHO} '';						\
+	  fi;								\
+	  ${CAT} ${MAKEFRAGS} ${WRKSRC}/src/unix-gcc.mak		\
+	) > ${WRKDIR}/unix-gcc.mak
+	${MV} -f ${WRKDIR}/unix-gcc.mak ${WRKSRC}/src
+
+post-build: ${GS_BUILD_PREREQ}
+
+post-install: ${GS_INSTALL_PREREQ}
+
+post-install:
+	strip ${PREFIX}/bin/gs
+	${INSTALL_DATA_DIR} ${DOCDIR}
+	${INSTALL_DATA} ${GIMPPRINT_WRKSRC}/src/ghost/README		\
+		${DOCDIR}/README.stp
+	${INSTALL_DATA} ${WRKDIR}/${LIPS_DRV}/Gdevlips.htm ${HTMLDIR}
+	${INSTALL_DATA} ${WRKDIR}/${BJ10V_DRV}/gdev10v.jis ${DOCDIR}
+	${INSTALL_DATA} ${WRKDIR}/gdevdmpr.sj ${DOCDIR}
+	${INSTALL_DATA} ${WRKDIR}/dmp_init.ps ${LIBDIR}
+	${INSTALL_DATA} ${WRKDIR}/dmp_site.ps ${LIBDIR}
+	${INSTALL_DATA} ${WRKDIR}/escp_24.src ${LIBDIR}
+	${INSTALL_DATA} ${WRKDIR}/testpage.ps ${LIBDIR}
+	${INSTALL_DATA} ${WRKDIR}/${PRESCR_DRV}/gdevprsc.?? ${DOCDIR}
+	${INSTALL_DATA_DIR} ${DOCDIR}/${MJC_DRV}
+	${INSTALL_DATA} ${WRKDIR}/${MJC_DRV}/README.mjc ${DOCDIR}/${MJC_DRV}
+	${INSTALL_DATA} ${WRKDIR}/${MJC_DRV}/README.noz ${DOCDIR}/${MJC_DRV}
+	${INSTALL_DATA} ${WRKDIR}/${MJC_DRV}/README.mje ${DOCDIR}/${MJC_DRV}
+	${INSTALL_DATA} ${WRKDIR}/${MJC_DRV}/cpem.doc ${DOCDIR}/${MJC_DRV}
+	${INSTALL_DATA} ${WRKDIR}/${MJC_DRV}/MJ700V2C.FAQ ${DOCDIR}/${MJC_DRV}
+
+.include "../../graphics/png/buildlink3.mk"
+.include "../../print/ja-vflib-lib/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/print/ghostscript-nox11/PLIST b/print/ghostscript/PLIST
index bf484bb723a..dbbed280ed9 100644
--- a/print/ghostscript-nox11/PLIST
+++ b/print/ghostscript/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2002/12/23 16:27:39 cjep Exp $
+@comment $NetBSD: PLIST,v 1.1 2005/12/09 20:30:16 wiz Exp $
 bin/bdftops
 bin/dvipdf
 bin/eps2eps
diff --git a/print/ghostscript-nox11/distinfo b/print/ghostscript/distinfo
index af8061394ff..493b252d9cc 100644
--- a/print/ghostscript-nox11/distinfo
+++ b/print/ghostscript/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2005/12/07 15:48:55 joerg Exp $
+$NetBSD: distinfo,v 1.4 2005/12/09 20:30:16 wiz Exp $
 
 SHA1 (ghostscript/ghostscript-6.01.tar.bz2) = 405a8ab16453a8c3f846eae2aa4abbea6a093300
 RMD160 (ghostscript/ghostscript-6.01.tar.bz2) = cbf5a1774726ba0b165ab539cb7ef16f2596f210
diff --git a/print/ghostscript-nox11/files/devs.nox11 b/print/ghostscript/files/devs.nox11
index f2784ad82a7..70ad65f1f06 100644
--- a/print/ghostscript-nox11/files/devs.nox11
+++ b/print/ghostscript/files/devs.nox11
@@ -1,4 +1,4 @@
-# $NetBSD: devs.nox11,v 1.6 2005/05/28 13:07:11 dillo Exp $
+# $NetBSD: devs.nox11,v 1.1 2005/12/09 20:30:16 wiz Exp $
 #
 # non-X11 drivers for Ghostscript
 
diff --git a/print/ghostscript-nox11/files/devs.x11 b/print/ghostscript/files/devs.x11
index 5aac77fbadc..ac4ada742f2 100644
--- a/print/ghostscript-nox11/files/devs.x11
+++ b/print/ghostscript/files/devs.x11
@@ -1,4 +1,4 @@
-# $NetBSD: devs.x11,v 1.2 2005/05/28 13:07:11 dillo Exp $
+# $NetBSD: devs.x11,v 1.1 2005/12/09 20:30:16 wiz Exp $
 #
 # X11 drivers for Ghostscript
 
diff --git a/print/ghostscript/options.mk b/print/ghostscript/options.mk
new file mode 100644
index 00000000000..803cc73935a
--- /dev/null
+++ b/print/ghostscript/options.mk
@@ -0,0 +1,17 @@
+# $NetBSD: options.mk,v 1.1 2005/12/09 20:30:16 wiz Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.ghostscript
+PKG_SUPPORTED_OPTIONS=	x11
+PKG_SUGGESTED_OPTIONS=	x11
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mx11)
+XLIBS=			Xt SM ICE Xext X11
+GS_DISPLAY_DEVICE=	x11.dev
+MAKEFRAGS+=		${FILESDIR}/devs.x11
+.include "../../mk/x11.buildlink3.mk"
+.else
+XLIBS?=			# empty
+GS_DISPLAY_DEVICE?=	# empty
+.endif
diff --git a/print/ghostscript-nox11/patches/patch-ab b/print/ghostscript/patches/patch-ab
index c8e792fdc90..038c289c7c0 100644
--- a/print/ghostscript-nox11/patches/patch-ab
+++ b/print/ghostscript/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/05/07 02:04:34 jlam Exp $
+$NetBSD: patch-ab,v 1.1 2005/12/09 20:30:16 wiz Exp $
 
 --- lib/gs_init.ps.orig	Mon May  1 20:24:46 2000
 +++ lib/gs_init.ps	Mon May  1 20:26:23 2000
diff --git a/print/ghostscript-nox11/patches/patch-ac b/print/ghostscript/patches/patch-ac
index caa01a225ac..cb26ff59e2b 100644
--- a/print/ghostscript-nox11/patches/patch-ac
+++ b/print/ghostscript/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/05/07 02:04:35 jlam Exp $
+$NetBSD: patch-ac,v 1.1 2005/12/09 20:30:16 wiz Exp $
 
 --- lib/gs_statd.ps.orig	Thu Mar  9 23:01:55 2000
 +++ lib/gs_statd.ps	Mon May  1 20:26:23 2000
diff --git a/print/ghostscript-nox11/patches/patch-ad b/print/ghostscript/patches/patch-ad
index 977b918ae3d..b95b01e3de1 100644
--- a/print/ghostscript-nox11/patches/patch-ad
+++ b/print/ghostscript/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1.1.1 2000/05/07 02:04:35 jlam Exp $
+$NetBSD: patch-ad,v 1.1 2005/12/09 20:30:16 wiz Exp $
 
 --- src/contrib.mak-5.94.add.orig	Sat Oct 16 16:20:06 1999
 +++ src/contrib.mak-5.94.add	Mon May  1 20:26:23 2000
diff --git a/print/ghostscript-nox11/patches/patch-ae b/print/ghostscript/patches/patch-ae
index 47008d7694d..e2246f8d232 100644
--- a/print/ghostscript-nox11/patches/patch-ae
+++ b/print/ghostscript/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.3 2001/12/20 22:31:10 jlam Exp $
+$NetBSD: patch-ae,v 1.1 2005/12/09 20:30:16 wiz Exp $
 
 --- src/contrib.mak.orig	Thu Mar 16 03:09:42 2000
 +++ src/contrib.mak
diff --git a/print/ghostscript-nox11/patches/patch-af b/print/ghostscript/patches/patch-af
index 02c8e1113e3..c555db066a6 100644
--- a/print/ghostscript-nox11/patches/patch-af
+++ b/print/ghostscript/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1.1.1 2000/05/07 02:04:35 jlam Exp $
+$NetBSD: patch-af,v 1.1 2005/12/09 20:30:16 wiz Exp $
 
 --- src/gdev10v.mak.orig	Mon May  1 20:24:43 2000
 +++ src/gdev10v.mak	Mon May  1 20:26:23 2000
diff --git a/print/ghostscript-nox11/patches/patch-ag b/print/ghostscript/patches/patch-ag
index 606cd91ca46..2de9df8f821 100644
--- a/print/ghostscript-nox11/patches/patch-ag
+++ b/print/ghostscript/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.1.1.1 2000/05/07 02:04:35 jlam Exp $
+$NetBSD: patch-ag,v 1.1 2005/12/09 20:30:16 wiz Exp $
 
 --- src/gdevalps.mak-5.50.orig	Mon May  1 20:24:43 2000
 +++ src/gdevalps.mak-5.50	Mon May  1 20:26:23 2000
diff --git a/print/ghostscript-nox11/patches/patch-ah b/print/ghostscript/patches/patch-ah
index b3f805b2db2..f0374c36436 100644
--- a/print/ghostscript-nox11/patches/patch-ah
+++ b/print/ghostscript/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.2 2001/12/20 22:31:10 jlam Exp $
+$NetBSD: patch-ah,v 1.1 2005/12/09 20:30:16 wiz Exp $
 
 --- src/gdevcd8.c.orig	Thu Mar  9 03:40:40 2000
 +++ src/gdevcd8.c
diff --git a/print/ghostscript-nox11/patches/patch-ai b/print/ghostscript/patches/patch-ai
index 5100b1386b7..9749fea816d 100644
--- a/print/ghostscript-nox11/patches/patch-ai
+++ b/print/ghostscript/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.1.1.1 2000/05/07 02:04:35 jlam Exp $
+$NetBSD: patch-ai,v 1.1 2005/12/09 20:30:16 wiz Exp $
 
 --- src/gdevdmpr.mak.orig	Mon May  1 20:24:43 2000
 +++ src/gdevdmpr.mak	Mon May  1 20:26:23 2000
diff --git a/print/ghostscript-nox11/patches/patch-aj b/print/ghostscript/patches/patch-aj
index 09af3ddd085..92e20fb2a03 100644
--- a/print/ghostscript-nox11/patches/patch-aj
+++ b/print/ghostscript/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.1.1.1 2000/05/07 02:04:35 jlam Exp $
+$NetBSD: patch-aj,v 1.1 2005/12/09 20:30:16 wiz Exp $
 
 --- src/gdevlips.mak.orig	Mon May  1 20:24:43 2000
 +++ src/gdevlips.mak	Mon May  1 20:26:23 2000
diff --git a/print/ghostscript-nox11/patches/patch-ak b/print/ghostscript/patches/patch-ak
index 8f634be2e6b..3b8e5b7cdf2 100644
--- a/print/ghostscript-nox11/patches/patch-ak
+++ b/print/ghostscript/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.1.1.1 2000/05/07 02:04:35 jlam Exp $
+$NetBSD: patch-ak,v 1.1 2005/12/09 20:30:16 wiz Exp $
 
 --- src/gdevmjc.c.orig	Mon May  1 20:24:43 2000
 +++ src/gdevmjc.c	Mon May  1 20:31:17 2000
diff --git a/print/ghostscript-nox11/patches/patch-al b/print/ghostscript/patches/patch-al
index 283590470d9..1053b7cc9cc 100644
--- a/print/ghostscript-nox11/patches/patch-al
+++ b/print/ghostscript/patches/patch-al
@@ -1,4 +1,4 @@
-$NetBSD: patch-al,v 1.1.1.1 2000/05/07 02:04:35 jlam Exp $
+$NetBSD: patch-al,v 1.1 2005/12/09 20:30:16 wiz Exp $
 
 --- src/gdevmjc.mak.orig	Mon May  1 20:24:43 2000
 +++ src/gdevmjc.mak	Mon May  1 20:34:56 2000
diff --git a/print/ghostscript-nox11/patches/patch-am b/print/ghostscript/patches/patch-am
index 8775c909a66..ed1b6bae01a 100644
--- a/print/ghostscript-nox11/patches/patch-am
+++ b/print/ghostscript/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.1.1.1 2000/05/07 02:04:35 jlam Exp $
+$NetBSD: patch-am,v 1.1 2005/12/09 20:30:16 wiz Exp $
 
 --- src/gdevmsxf.c.orig	Mon May  1 20:24:46 2000
 +++ src/gdevmsxf.c	Mon May  1 20:26:23 2000
diff --git a/print/ghostscript-nox11/patches/patch-an b/print/ghostscript/patches/patch-an
index cfd95c48b9f..91ee5607096 100644
--- a/print/ghostscript-nox11/patches/patch-an
+++ b/print/ghostscript/patches/patch-an
@@ -1,4 +1,4 @@
-$NetBSD: patch-an,v 1.1.1.1 2000/05/07 02:04:35 jlam Exp $
+$NetBSD: patch-an,v 1.1 2005/12/09 20:30:16 wiz Exp $
 
 --- src/gdevps.c.orig	Fri Mar 10 02:45:50 2000
 +++ src/gdevps.c	Mon May  1 20:26:23 2000
diff --git a/print/ghostscript-nox11/patches/patch-ao b/print/ghostscript/patches/patch-ao
index d6f2511c80b..362909680a0 100644
--- a/print/ghostscript-nox11/patches/patch-ao
+++ b/print/ghostscript/patches/patch-ao
@@ -1,4 +1,4 @@
-$NetBSD: patch-ao,v 1.1.1.1 2000/05/07 02:04:35 jlam Exp $
+$NetBSD: patch-ao,v 1.1 2005/12/09 20:30:16 wiz Exp $
 
 --- src/gdevrpdl.mak.orig	Mon May  1 20:36:35 2000
 +++ src/gdevrpdl.mak	Mon May  1 22:00:17 2000
diff --git a/print/ghostscript-nox11/patches/patch-ap b/print/ghostscript/patches/patch-ap
index da52b2fa14f..43703594d52 100644
--- a/print/ghostscript-nox11/patches/patch-ap
+++ b/print/ghostscript/patches/patch-ap
@@ -1,4 +1,4 @@
-$NetBSD: patch-ap,v 1.2 2000/05/08 05:20:54 itohy Exp $
+$NetBSD: patch-ap,v 1.1 2005/12/09 20:30:16 wiz Exp $
 
 --- src/genarch.c.orig	Thu Mar  9 03:40:41 2000
 +++ src/genarch.c	Mon May  1 20:26:24 2000
diff --git a/print/ghostscript-nox11/patches/patch-aq b/print/ghostscript/patches/patch-aq
index b80c54650d6..87c31dd70fb 100644
--- a/print/ghostscript-nox11/patches/patch-aq
+++ b/print/ghostscript/patches/patch-aq
@@ -1,4 +1,4 @@
-$NetBSD: patch-aq,v 1.1.1.1 2000/05/07 02:04:35 jlam Exp $
+$NetBSD: patch-aq,v 1.1 2005/12/09 20:30:16 wiz Exp $
 
 --- src/gp_unifs.c.orig	Thu Mar  9 03:40:41 2000
 +++ src/gp_unifs.c	Mon May  1 20:26:24 2000
diff --git a/print/ghostscript-nox11/patches/patch-ar b/print/ghostscript/patches/patch-ar
index 271837a90a4..d136a9ba0e5 100644
--- a/print/ghostscript-nox11/patches/patch-ar
+++ b/print/ghostscript/patches/patch-ar
@@ -1,4 +1,4 @@
-$NetBSD: patch-ar,v 1.1.1.1 2000/05/07 02:04:35 jlam Exp $
+$NetBSD: patch-ar,v 1.1 2005/12/09 20:30:16 wiz Exp $
 
 --- src/pagecount.c.orig	Sun Nov 15 06:33:04 1998
 +++ src/pagecount.c	Mon May  1 20:26:24 2000
diff --git a/print/ghostscript-nox11/patches/patch-as b/print/ghostscript/patches/patch-as
index c5736066c02..f6da5b21f0e 100644
--- a/print/ghostscript-nox11/patches/patch-as
+++ b/print/ghostscript/patches/patch-as
@@ -1,4 +1,4 @@
-$NetBSD: patch-as,v 1.1.1.1 2000/05/07 02:04:35 jlam Exp $
+$NetBSD: patch-as,v 1.1 2005/12/09 20:30:16 wiz Exp $
 
 --- src/unix-end.mak.orig	Thu Mar  9 03:40:44 2000
 +++ src/unix-end.mak	Mon May  1 20:26:24 2000
diff --git a/print/ghostscript-nox11/patches/patch-at b/print/ghostscript/patches/patch-at
index 6b3bf3f44cb..0201afa26c9 100644
--- a/print/ghostscript-nox11/patches/patch-at
+++ b/print/ghostscript/patches/patch-at
@@ -1,4 +1,4 @@
-$NetBSD: patch-at,v 1.4 2001/12/20 22:31:10 jlam Exp $
+$NetBSD: patch-at,v 1.1 2005/12/09 20:30:16 wiz Exp $
 
 --- src/unix-gcc.mak.orig	Thu Dec 20 00:32:55 2001
 +++ src/unix-gcc.mak
diff --git a/print/ghostscript-nox11/patches/patch-au b/print/ghostscript/patches/patch-au
index 446856e8977..8c05610d29f 100644
--- a/print/ghostscript-nox11/patches/patch-au
+++ b/print/ghostscript/patches/patch-au
@@ -1,4 +1,4 @@
-$NetBSD: patch-au,v 1.1.1.1 2000/05/07 02:04:35 jlam Exp $
+$NetBSD: patch-au,v 1.1 2005/12/09 20:30:16 wiz Exp $
 
 --- src/unixinst.mak.orig	Mon May  1 20:24:46 2000
 +++ src/unixinst.mak	Mon May  1 20:26:24 2000
diff --git a/print/ghostscript-nox11/patches/patch-av b/print/ghostscript/patches/patch-av
index bfaeb5ecf44..149f2fab635 100644
--- a/print/ghostscript-nox11/patches/patch-av
+++ b/print/ghostscript/patches/patch-av
@@ -1,4 +1,4 @@
-$NetBSD: patch-av,v 1.1.1.1 2000/05/07 02:04:35 jlam Exp $
+$NetBSD: patch-av,v 1.1 2005/12/09 20:30:16 wiz Exp $
 
 --- src/zmedia2.c.orig	Thu Mar  9 03:40:45 2000
 +++ src/zmedia2.c	Mon May  1 20:26:24 2000
diff --git a/print/ghostscript-nox11/patches/patch-aw b/print/ghostscript/patches/patch-aw
index d128e1c5ade..f1a17ce4cfc 100644
--- a/print/ghostscript-nox11/patches/patch-aw
+++ b/print/ghostscript/patches/patch-aw
@@ -1,4 +1,4 @@
-$NetBSD: patch-aw,v 1.1 2000/10/04 13:17:08 jlam Exp $
+$NetBSD: patch-aw,v 1.1 2005/12/09 20:30:16 wiz Exp $
 
 --- src/gdevlbp8.c.orig	Thu Mar  9 03:40:41 2000
 +++ src/gdevlbp8.c
diff --git a/print/ghostscript-nox11/patches/patch-ay b/print/ghostscript/patches/patch-ay
index 76146d297a4..ebf74c47c61 100644
--- a/print/ghostscript-nox11/patches/patch-ay
+++ b/print/ghostscript/patches/patch-ay
@@ -1,4 +1,4 @@
-$NetBSD: patch-ay,v 1.1 2001/12/20 22:31:10 jlam Exp $
+$NetBSD: patch-ay,v 1.1 2005/12/09 20:30:16 wiz Exp $
 
 --- src/gdevgdi.c.orig	Thu Feb  8 23:51:11 2001
 +++ src/gdevgdi.c
diff --git a/print/ghostscript-nox11/patches/patch-az b/print/ghostscript/patches/patch-az
index ebdb5c6f2c0..73aee83fb9b 100644
--- a/print/ghostscript-nox11/patches/patch-az
+++ b/print/ghostscript/patches/patch-az
@@ -1,4 +1,4 @@
-$NetBSD: patch-az,v 1.2 2002/11/26 21:48:21 cjep Exp $
+$NetBSD: patch-az,v 1.1 2005/12/09 20:30:16 wiz Exp $
 --- ../gimp-print-4.2.0/src/ghost/Makefile.in.orig	Thu Oct 24 18:17:52 2002
 +++ ../gimp-print-4.2.0/src/ghost/Makefile.in	Thu Oct 24 18:18:25 2002
 @@ -316,22 +316,22 @@
diff --git a/print/ghostscript-nox11/patches/patch-ba b/print/ghostscript/patches/patch-ba
index 4ab4ce3b1c3..665af86e118 100644
--- a/print/ghostscript-nox11/patches/patch-ba
+++ b/print/ghostscript/patches/patch-ba
@@ -1,4 +1,4 @@
-$NetBSD: patch-ba,v 1.1 2005/11/27 17:08:31 adrianp Exp $
+$NetBSD: patch-ba,v 1.1 2005/12/09 20:30:16 wiz Exp $
 
 --- lib/pj-gs.sh.orig	2000-03-09 08:40:40.000000000 +0000
 +++ lib/pj-gs.sh
diff --git a/print/ghostscript-nox11/patches/patch-bb b/print/ghostscript/patches/patch-bb
index 2e974cc3b23..91446ac0e9a 100644
--- a/print/ghostscript-nox11/patches/patch-bb
+++ b/print/ghostscript/patches/patch-bb
@@ -1,4 +1,4 @@
-$NetBSD: patch-bb,v 1.1 2005/11/27 17:08:31 adrianp Exp $
+$NetBSD: patch-bb,v 1.1 2005/12/09 20:30:16 wiz Exp $
 
 --- lib/ps2epsi.orig	2000-03-09 08:40:40.000000000 +0000
 +++ lib/ps2epsi
diff --git a/print/ghostscript-nox11/patches/patch-bc b/print/ghostscript/patches/patch-bc
index b1704066f4b..0b7218bcb34 100644
--- a/print/ghostscript-nox11/patches/patch-bc
+++ b/print/ghostscript/patches/patch-bc
@@ -1,4 +1,4 @@
-$NetBSD: patch-bc,v 1.1 2005/11/27 17:08:31 adrianp Exp $
+$NetBSD: patch-bc,v 1.1 2005/12/09 20:30:16 wiz Exp $
 
 --- lib/pv.sh.orig	2000-03-09 08:40:40.000000000 +0000
 +++ lib/pv.sh
diff --git a/print/ghostscript-nox11/patches/patch-bd b/print/ghostscript/patches/patch-bd
index 095c843cd62..18124fe2f15 100644
--- a/print/ghostscript-nox11/patches/patch-bd
+++ b/print/ghostscript/patches/patch-bd
@@ -1,4 +1,4 @@
-$NetBSD: patch-bd,v 1.1 2005/11/27 17:08:31 adrianp Exp $
+$NetBSD: patch-bd,v 1.1 2005/12/09 20:30:16 wiz Exp $
 
 --- lib/sysvlp.sh.orig	2000-03-09 08:40:40.000000000 +0000
 +++ lib/sysvlp.sh
diff --git a/print/ghostscript-nox11/patches/patch-be b/print/ghostscript/patches/patch-be
index 806beb6fa56..7bcf2bc3e57 100644
--- a/print/ghostscript-nox11/patches/patch-be
+++ b/print/ghostscript/patches/patch-be
@@ -1,4 +1,4 @@
-$NetBSD: patch-be,v 1.1 2005/12/07 15:48:55 joerg Exp $
+$NetBSD: patch-be,v 1.1 2005/12/09 20:30:16 wiz Exp $
 
 --- src/dviprlib.c.orig	2005-12-06 21:32:25.000000000 +0000
 +++ src/dviprlib.c
diff --git a/print/ghostscript-nox11/patches/patch-bug-workaround b/print/ghostscript/patches/patch-bug-workaround
index 63c9aad42a6..4bdcc4dc02e 100644
--- a/print/ghostscript-nox11/patches/patch-bug-workaround
+++ b/print/ghostscript/patches/patch-bug-workaround
@@ -1,4 +1,4 @@
-$NetBSD: patch-bug-workaround,v 1.1.1.1 2000/05/07 02:04:35 jlam Exp $
+$NetBSD: patch-bug-workaround,v 1.1 2005/12/09 20:30:16 wiz Exp $
 
 I haven't found out the cause of the trouble of