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

of the separate ghostscript*x11* packages.

3 files changed, 106 insertions, 97 deletions

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