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

Hiroki Sato hrs at FreeBSD.org
Mon Apr 29 20:12:18 UTC 2013 

Author: hrs
Date: Mon Apr 29 20:12:16 2013
New Revision: 316845
URL: http://svnweb.freebsd.org/changeset/ports/316845

Log:
  Resurrect print/ghostscript7*.  Ghostscript 7.x is incompatible with 8.x
  and 9.x in terms of CJK character support and they are still in demand.
  While I am here, the following changes have been added:
  
  - Add LICENSE.
  - Use OPTIONS_DEFINE for ghostscript drivers.
  - Add MAKE_JOBS_SAFE=yes.
  
  Discussed with:	bapt

Added:
  head/print/ghostscript7/
     - copied from r315308, head/print/ghostscript7/
  head/print/ghostscript7-commfont/
     - copied from r315308, head/print/ghostscript7-commfont/
  head/print/ghostscript7-jpnfont/
     - copied from r315308, head/print/ghostscript7-jpnfont/
  head/print/ghostscript7-korfont/
     - copied from r315308, head/print/ghostscript7-korfont/
  head/print/ghostscript7-nox11/
     - copied from r315308, head/print/ghostscript7-nox11/
  head/print/ghostscript7/files/Makefile.drivers_post   (contents, props changed)
  head/print/ghostscript7/files/patch-pcl3-src-contrib.mak-7.00.add   (contents, props changed)
  head/print/ghostscript7/files/patch-src-cpca_gdev.mak   (contents, props changed)
  head/print/ghostscript7/files/patch-src-icclib.mak   (contents, props changed)
  head/print/ghostscript7/files/patch-src-ijs.mak   (contents, props changed)
  head/print/ghostscript7/files/patch-src-int.mak   (contents, props changed)
  head/print/ghostscript7/files/patch-src-lib.mak   (contents, props changed)
Modified:
  head/MOVED
  head/print/Makefile
  head/print/ghostscript7-commfont/Makefile
  head/print/ghostscript7-commfont/files/pkg-message.in
  head/print/ghostscript7-jpnfont/Makefile
  head/print/ghostscript7-korfont/Makefile
  head/print/ghostscript7-nox11/Makefile
  head/print/ghostscript7/Makefile
  head/print/ghostscript7/Makefile.drivers
  head/print/ghostscript7/distinfo
  head/print/ghostscript7/files/Makefile.epag
  head/print/ghostscript7/files/Makefile.pcl3
  head/print/ghostscript7/files/patch-lips:gdevlips.mak
  head/print/ghostscript7/files/patch-src:gdevdmpr.mak
  head/print/ghostscript7/pkg-plist

Modified: head/MOVED
==============================================================================
--- head/MOVED	Mon Apr 29 20:03:38 2013	(r316844)
+++ head/MOVED	Mon Apr 29 20:12:16 2013	(r316845)
@@ -4181,11 +4181,6 @@ devel/geany-plugin-gdb||2013-03-21|Remov
 www/kompozer||2013-03-22|Has expired: Dead upstream
 graphics/fpc-fpvectorial||2013-03-23|Removed from freepascal packages distribution
 databases/akonadi-google|deskutils/kdepim4-runtime|2013-03-24|Merged into deskutils/kdepim4-runtime
-print/ghostscript7|print/ghostscript9|2013-03-26|ghostscript 7 is outdated consider using a newer version
-print/ghostscript7-nox11|print/ghostscript9-nox11|2013-03-26|ghostscript 7 is outdated consider using a newer version
-print/ghostscript7-commfont|print/ghostscript9|2013-03-26|ghostscript 7 is outdated consider using a newer version
-print/ghostscript7-jpnfont|print/ghostscript9|2013-03-26|ghostscript 7 is outdated consider using a newer version
-print/ghostscript7-korfont|print/ghostscript9|2013-03-26|ghostscript 7 is outdated consider using a newer version
 www/pecl-zendoptimizerplus|www/pecl-zendopcache|2013-03-27|Renamed
 print/kdeutils4-printer-applet|print/kde4-print-manager|2013-03-27|Superseded by print/kde4-print-manager
 print/system-config-printer-kde|print/kde4-print-manager|2013-03-27|Superseded by print/kde4-print-manager

Modified: head/print/Makefile
==============================================================================
--- head/print/Makefile	Mon Apr 29 20:03:38 2013	(r316844)
+++ head/print/Makefile	Mon Apr 29 20:12:16 2013	(r316845)
@@ -77,6 +77,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	Tue Mar 26 15:43:09 2013	(r315308)
+++ head/print/ghostscript7-commfont/Makefile	Mon Apr 29 20:12:16 2013	(r316845)
@@ -1,15 +1,12 @@
-# New ports collection makefile for:	ghostscript-gnu-commfont
-# Date created:		Dec 24 2001
-# Whom:			Tomokatsu SAITO <saito at a2z.co.jp>
-#
+# Created by: Tomokatsu SAITO <saito at a2z.co.jp>
 # $FreeBSD$
-#
 
-PORTNAME=	ghostscript7-commfont
+PORTNAME=	ghostscript
 PORTVERSION=	7.07
 PORTREVISION=	11
 CATEGORIES=	print
 MASTER_SITES=	# empty
+PKGNAMESUFFIX=	7-commfont
 DISTFILES=	# empty
 
 MAINTAINER=	doceng at FreeBSD.org
@@ -26,10 +23,14 @@ PLIST_SUB=	GS_RESDIR="${GS_RESDIR}"
 PKGMESSAGE=	${WRKDIR}/pkg-message
 DEPENDS_ARGS+=	-DA4
 # set these forcibly
-USE_GHOSTSCRIPT=7
+USE_GHOSTSCRIPT_RUN=7
 
 CONFLICTS=	ghostscript8-[0-9]* \
-		ghostscript8-nox11-[0-9]*
+		ghostscript8-nox11-[0-9]* \
+		ghostscript9-[0-9]* \
+		ghostscript9-nox11-[0-9]* \
+		ghostscript9-agpl-[0-9]* \
+		ghostscript9-agpl-nox11-[0-9]*
 
 CMAPDIR?=	${LOCALBASE}/share/fonts/adobe-cmaps
 GS_RESDIR?=	share/ghostscript/Resource

Modified: head/print/ghostscript7-commfont/files/pkg-message.in
==============================================================================
--- head/print/ghostscript7-commfont/files/pkg-message.in	Tue Mar 26 15:43:09 2013	(r315308)
+++ head/print/ghostscript7-commfont/files/pkg-message.in	Mon Apr 29 20:12:16 2013	(r316845)
@@ -11,4 +11,3 @@ The CJK font selection will be performed
 So, to use CIDFnmap you have to make sure that there is no font file that
 has the same name as you want to customize in Resource/Font and
 Resource/CIDFont.
-

Modified: head/print/ghostscript7-jpnfont/Makefile
==============================================================================
--- head/print/ghostscript7-jpnfont/Makefile	Tue Mar 26 15:43:09 2013	(r315308)
+++ head/print/ghostscript7-jpnfont/Makefile	Mon Apr 29 20:12:16 2013	(r316845)
@@ -1,15 +1,12 @@
-# New ports collection makefile for:	ghostscript
-# Date created:		14 Jan 2002
-# Whom:			Mita Yoshio <mita at FreeBSD.org>
-#
+# Created by: Mita Yoshio <mita at FreeBSD.org>
 # $FreeBSD$
-#
 
-PORTNAME=	ghostscript7-jpnfont
+PORTNAME=	ghostscript
 PORTVERSION=	7.07
 PORTREVISION=	9
-CATEGORIES=	print japanese
+CATEGORIES=	japanese print
 MASTER_SITES=	# empty
+PKGNAMESUFFIX=	7-jpnfont
 DISTFILES=	# empty
 
 MAINTAINER=	doceng at FreeBSD.org

Modified: head/print/ghostscript7-korfont/Makefile
==============================================================================
--- head/print/ghostscript7-korfont/Makefile	Tue Mar 26 15:43:09 2013	(r315308)
+++ head/print/ghostscript7-korfont/Makefile	Mon Apr 29 20:12:16 2013	(r316845)
@@ -1,15 +1,12 @@
-# New ports collection makefile for:	ghostscript
-# Date created:		14 Jan 2002
-# Whom:			Mita Yoshio <mita at FreeBSD.org>
-#
+# Created by: Mita Yoshio <mita at FreeBSD.org>
 # $FreeBSD$
-#
 
-PORTNAME=	ghostscript7-korfont
+PORTNAME=	ghostscript
 PORTVERSION=	7.07
 PORTREVISION=	6
-CATEGORIES=	print korean
+CATEGORIES=	korean print
 MASTER_SITES=	# empty
+PKGNAMESUFFIX=	7-korfont
 DISTFILES=	# empty
 
 MAINTAINER=	doceng at FreeBSD.org

Modified: head/print/ghostscript7-nox11/Makefile
==============================================================================
--- head/print/ghostscript7-nox11/Makefile	Tue Mar 26 15:43:09 2013	(r315308)
+++ head/print/ghostscript7-nox11/Makefile	Mon Apr 29 20:12:16 2013	(r316845)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:   ghostscript-gnu-nox11
-# Date created:		23 February 2001
-# Whom:			nik
-#
+# Created by: Nik Clayton <nik at FreeBSD.org>
 # $FreeBSD$
-#
 
 WITHOUT_X11=	yes
 
 MASTERDIR=	${.CURDIR}/../ghostscript7
 
-.include        "${MASTERDIR}/Makefile"
+.include "${MASTERDIR}/Makefile"

Modified: head/print/ghostscript7/Makefile
==============================================================================
--- head/print/ghostscript7/Makefile	Tue Mar 26 15:43:09 2013	(r315308)
+++ head/print/ghostscript7/Makefile	Mon Apr 29 20:12:16 2013	(r316845)
@@ -1,57 +1,59 @@
-# New ports collection makefile for:	ghostscript
-# Date created:		Tue Jun 10 21:58:54 CEST 1997
-# Whom:			Andreas Klemm <andreas at klemm.gtn.com>
-#
+# Created by: Andreas Klemm <andreas at klemm.gtn.com>
 # $FreeBSD$
-#
 
-PORTNAME=	ghostscript7
+PORTNAME=	ghostscript
 PORTVERSION=	7.07
-PORTREVISION=	25
+PORTREVISION=	26
 CATEGORIES=	print
 MASTER_SITES=	SF/ghostscript/gnu-gs/${PORTVERSION}:gs_srcs \
-		${MASTER_SITE_PORTS_JP:S/$/:ports_jp,ports_jp_gs/} \
-		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/gs${PORTVERSION:S/.//}/:gs_srcs
-MASTER_SITE_SUBDIR=	ghostscript/:gs_srcs,ports_jp_gs \
-			./:ports_jp
-DISTNAME=	${PORTNAME:S,7$,,}-${PORTVERSION}
+		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/gs${PORTVERSION:S/.//}/:gs_srcs \
+		${MASTER_SITE_PORTS_JP:S/$/:ports_jp,ports_jp_gs/}
+MASTER_SITE_SUBDIR= \
+		ghostscript/:gs_srcs \
+		./:ports_jp
+PKGNAMESUFFIX=	7
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:gs_srcs
-DIST_SUBDIR=	${PORTNAME:S,7$,,}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	doceng at FreeBSD.org
 COMMENT=	Ghostscript 7.x PostScript interpreter
 
-LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
+LICENSE=	GPLv2
+
+LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
 		png15:${PORTSDIR}/graphics/png
 RUN_DEPENDS=	${LOCALBASE}/share/ghostscript/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts
 
-# normazile WRKSRC so things like cups-pstoraster may work
-WRKSRC=		${WRKDIR}/${PORTNAME:S,7$,,}
-DATADIR=	${PREFIX}/share/${PORTNAME:S,7$,,}
-
 CONFLICTS_INSTALL=	gambc-[0-9]* ghostscript[89]-[0-9]* \
-			ghostscript[89]-*-[0-9]*
-
+			ghostscript[89]-nox11-[0-9]* \
+			ghostscript9-agpl-*-[0-9]*
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_LDCONFIG=	yes
 WANT_GNOME=	yes
+# normazile WRKSRC so things like cups-pstoraster may work
+WRKSRC=		${WRKDIR}/${PORTNAME}
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	${MAKE_ENV}
+CONFIGURE_ARGS=	--disable-compile-inits \
+		--with-ijs
 MAKE_ENV=	CFLAGS_STANDARD="${CFLAGS}" \
 		XCFLAGS="${XCFLAGS}" XLDFLAGS="${XLDFLAGS}" \
 		EXTRALIBS="${EXTRALIBS}"
-MAKE_JOBS_UNSAFE=	yes
-CONFIGURE_ENV=	${MAKE_ENV}
-
-CPPFLAGS+=	-DUPD_SIGNAL=0 -I. -I${WRKSRC}/gimp-print -I${LOCALBASE}/include/libpng \
-		-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
+MAKE_JOBS_SAFE=	yes
+CPPFLAGS+=	-fPIC -DUPD_SIGNAL=0 -I. -I${WRKSRC}/gimp-print		\
+		-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include	\
+		-I${LOCALBASE}/include/libpng15
 LDFLAGS+=	${XLDFLAGS}
-CONFIGURE_ARGS=	--disable-compile-inits \
-		--with-ijs
+XCFLAGS=	${PTHREAD_CFLAGS}
+XLDFLAGS=	-L${LOCALBASE}/lib -L${WRKSRC}/gimp-print ${PTHREAD_LIBS}
 PLIST_SUB=	GS_VERSION="${PORTVERSION}"
 
-OPTIONS=	A4SIZE	"Set A4 (not Letter) as a default paper size"	off \
-		X11	"X11 support"	on
+OPTIONS_DEFINE=	DOCS A4SIZE X11
+OPTIONS_DEFAULT=     A4SIZE X11
+NO_OPTIONS_SORT=yes
+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 \
@@ -64,239 +66,52 @@ MLINKS=		gslp.1 gsbj.1 \
 		ps2pdf.1 ps2pdf13.1 \
 		ps2ps.1 eps2eps.1
 
-XCFLAGS=	${PTHREAD_CFLAGS}
-XLDFLAGS=	-L${LOCALBASE}/lib -L${WRKSRC}/gimp-print ${PTHREAD_LIBS}
+post-extract-all:
+	${LN} -sf ${WRKDIR}/${DISTNAME} ${WRKDIR}/${PORTNAME}
+
+post-extract: post-extract-all
 
 .include "Makefile.drivers"
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-post-extract-all:
-	${LN} -sf ${WRKDIR}/${DISTNAME} ${WRKDIR}/${PORTNAME:S,7$,,}
+.if ${PORT_OPTIONS:MX11}
+USE_GNOME=	gtk12
+.endif
 
-post-extract: post-extract-all
+.include <bsd.port.pre.mk>
+.include "${FILESDIR}/Makefile.drivers_post"
 
-.for D in ${OPTIONS:MGS_*:S/^GS_//}
-.if !defined(WITHOUT_GS_${D})
+.for D in ${OPTIONS_DEFINE:MGS_*:S/^GS_//}
+.if ${PORT_OPTIONS:MGS_${D}}
 PLIST_SUB+=	GS_${D}=""
 .else
 PLIST_SUB+=	GS_${D}="@comment "
 .endif
 .endfor
 
-.if !defined(WITH_LETTERSIZE)
-.if defined(A4) || defined(WITH_A4SIZE)
+.if ${PORT_OPTIONS:MA4SIZE}
 XCFLAGS+=	-DA4
-MSG_PAPERSIZE=	"NOTE: Default paper size will be A4."
-.endif
 .endif
 
-.if defined(WITH_GS_lvga256) \
-	|| defined(WITH_GS_vgalib)
-. if defined(WITHOUT_SVGALIB)
-. warning drivers incompatible with WITHOUT_SVGALIB will be removed automatically
-. undef WITH_GS_lvga256
-. undef WITH_GS_vgalib
-. else
-LIB_DEPENDS+=	vga.1:${PORTSDIR}/graphics/svgalib
-. endif
-.endif
+# contributed uniprint profiles
+CONTRIB_UPP=	lqx70ch.upp lqx70cl.upp lqx70cm.upp \
+		stc740ih.upp stc740p.upp stc740pl.upp
 
-.if defined(WITH_GS_x11) \
-	|| defined(WITH_GS_x11alpha) \
-	|| defined(WITH_GS_x11cmyk) \
-	|| defined(WITH_GS_x11cmyk2) \
-	|| defined(WITH_GS_x11cmyk4) \
-	|| defined(WITH_GS_x11cmyk8) \
-	|| defined(WITH_GS_x11gray2) \
-	|| defined(WITH_GS_x11gray4) \
-	|| defined(WITH_GS_x11mono) \
-	|| defined(WITH_GS_x11rg16x) \
-	|| defined(WITH_GS_x11rg32x)
-. if defined(WITHOUT_X11)
-. warning drivers incompatible with WITHOUT_X11 will be removed automatically
-. undef WITH_GS_x11
-. undef WITH_GS_x11alpha
-. undef WITH_GS_x11cmyk
-. undef WITH_GS_x11cmyk2
-. undef WITH_GS_x11cmyk4
-. undef WITH_GS_x11cmyk8
-. undef WITH_GS_x11gray2
-. undef WITH_GS_x11gray4
-. undef WITH_GS_x11mono
-. undef WITH_GS_x11rg16x
-. undef WITH_GS_x11rg32x
-. endif
-USE_XORG=	xt xext
-CONFIGURE_ARGS+=--with-x \
-		--x-includes=${LOCALBASE}/include \
-		--x-libraries=${LOCALBASE}/lib
-CONFLICTS_INSTALL+=	ghostscript7-nox11-[0-9]*
-.else
-PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-nox11
-CONFIGURE_ARGS+=--without-x
-CONFLICTS_INSTALL+=	ghostscript7-[0-9]*
-.endif
 
-.if defined(WITH_SHLIB)
-.undef WITHOUT_X11
-USE_GNOME=	gtk12
+.if ${PORT_OPTIONS:MX11}
 MAKE_ENV+=	GS_SHLIB_VER="${SHLIB_VER}"
-ALL_TARGET=	so pcl3opts
-INSTALL_TARGET=	soinstall
-USE_LDCONFIG=	yes
 SHLIB_VER=	1
-PLIST_SUB+=	SHLIB="" SHLIB_VER="${SHLIB_VER}"
-.else
-ALL_TARGET=	all pcl3opts
-PLIST_SUB+=	SHLIB="@comment "
-.endif
-
-.if !defined(WITHOUT_GS_cdj670) \
-	&& !defined(WITHOUT_GS_cdj850) \
-	&& !defined(WITHOUT_GS_cdj880) \
-	&& !defined(WITHOUT_GS_cdj890) \
-	&& !defined(WITHOUT_GS_cdj1600)
-.include "${FILESDIR}/Makefile.cdj880"
-.endif
-.if !defined(WITHOUT_GS_pcl3)
-.include "${FILESDIR}/Makefile.pcl3"
-.endif
-.if !defined(WITHOUT_GS_cdj970)
-.include "${FILESDIR}/Makefile.cdj970"
-.endif
-
-.include "${FILESDIR}/Makefile.gprint"
-
-.if !defined(WITHOUT_GS_md2k) && !defined(WITHOUT_GS_md5k)
-.include "${FILESDIR}/Makefile.md2k"
-.endif
-
-.if !defined(WITHOUT_GS_md50Mono) \
-	&& !defined(WITHOUT_GS_md50Eco) \
-	&& !defined(WITHOUT_GS_md1xMono)
-.include "${FILESDIR}/Makefile.alps"
-.endif
-
-.if !defined(WITHOUT_GS_bj10v) && !defined(WITHOUT_bj10vh)
-.include "${FILESDIR}/Makefile.bj10v"
-.endif
-
-.if !defined(WITHOUT_GS_bjccmyk) \
-	&& !defined(WITHOUT_GS_bjccolor) \
-	&& !defined(WITHOUT_GS_bjcgray) \
-	&& !defined(WITHOUT_GS_bjcmono)
-.include "${FILESDIR}/Makefile.bjc250"
-.endif
-
-.if !defined(WITHOUT_GS_lbp1310) \
-	&& !defined(WITHOUT_GS_lbp1510) \
-	&& !defined(WITHOUT_GS_lbp1610) \
-	&& !defined(WITHOUT_GS_lbp1710) \
-	&& !defined(WITHOUT_GS_lbp1810) \
-	&& !defined(WITHOUT_GS_lbp1910)
-.include "${FILESDIR}/Makefile.cpca"
-.endif
-
-.if !defined(WITHOUT_GS_lips2p) \
-	&& !defined(WITHOUT_GS_lips3) \
-	&& !defined(WITHOUT_GS_lips4) \
-	&& !defined(WITHOUT_GS_bjc880j) \
-	&& !defined(WITHOUT_GS_lips4v) \
-	&& !defined(WITHOUT_GS_escpage) \
-	&& !defined(WITHOUT_GS_lp2000) \
-	&& !defined(WITHOUT_GS_npdl) \
-	&& !defined(WITHOUT_GS_rpdl)
-.include "${FILESDIR}/Makefile.lips"
-.endif
-
-.if !defined(WITHOUT_GS_dmprt)
-.include "${FILESDIR}/Makefile.dmprt"
-.endif
-
-.if !defined(WITHOUT_GS_epag)
-.include "${FILESDIR}/Makefile.epag"
-.endif
-
-.if !defined(WITHOUT_GS_alc8600) \
-	&& !defined(WITHOUT_GS_alc8500) \
-	&& !defined(WITHOUT_GS_alc2000) \
-	&& !defined(WITHOUT_GS_alc4000) \
-	&& !defined(WITHOUT_GS_alc1900) \
-	&& !defined(WITHOUT_GS_alc4100) \
-	&& !defined(WITHOUT_GS_lp9800c) \
-	&& !defined(WITHOUT_GS_lp9000c) \
-	&& !defined(WITHOUT_GS_lp9500c) \
-	&& !defined(WITHOUT_GS_lp8800c) \
-	&& !defined(WITHOUT_GS_lp8300c) \
-	&& !defined(WITHOUT_GS_lp8500c) \
-	&& !defined(WITHOUT_GS_lp3000c) \
-	&& !defined(WITHOUT_GS_lp8200c) \
-	&& !defined(WITHOUT_GS_lp8000c) \
-	&& !defined(WITHOUT_GS_epl6100) \
-	&& !defined(WITHOUT_GS_epl5900) \
-	&& !defined(WITHOUT_GS_epl5800) \
-	&& !defined(WITHOUT_GS_epl2050) \
-	&& !defined(WITHOUT_GS_epl2050p) \
-	&& !defined(WITHOUT_GS_epl2120) \
-	&& !defined(WITHOUT_GS_epl2500) \
-	&& !defined(WITHOUT_GS_epl2750) \
-	&& !defined(WITHOUT_GS_lp9000b) \
-	&& !defined(WITHOUT_GS_lp2500) \
-	&& !defined(WITHOUT_GS_lp9100) \
-	&& !defined(WITHOUT_GS_lp7900) \
-	&& !defined(WITHOUT_GS_lp7500) \
-	&& !defined(WITHOUT_GS_lp2400) \
-	&& !defined(WITHOUT_GS_lp2200) \
-	&& !defined(WITHOUT_GS_lp9400) \
-	&& !defined(WITHOUT_GS_lp8900) \
-	&& !defined(WITHOUT_GS_lp8700) \
-	&& !defined(WITHOUT_GS_lp8100) \
-	&& !defined(WITHOUT_GS_lp7700) \
-	&& !defined(WITHOUT_GS_lp8600f) \
-	&& !defined(WITHOUT_GS_lp8400f) \
-	&& !defined(WITHOUT_GS_lp8300f) \
-	&& !defined(WITHOUT_GS_lp1900) \
-	&& !defined(WITHOUT_GS_lp9600s) \
-	&& !defined(WITHOUT_GS_lp9300) \
-	&& !defined(WITHOUT_GS_lp9600) \
-	&& !defined(WITHOUT_GS_lp8600) \
-	&& !defined(WITHOUT_GS_lp1800)
-.include "${FILESDIR}/Makefile.eplaser"
-.endif
-
-.if !defined(WITHOUT_GS_mjc180) \
-	&& !defined(WITHOUT_GS_mjc360) \
-	&& !defined(WITHOUT_GS_mjc720) \
-	&& !defined(WITHOUT_GS_mj500c)
-.include "${FILESDIR}/Makefile.mjc"
-.endif
-
-.if !defined(WITHOUT_GS_gdi)
-.include "${FILESDIR}/Makefile.gdi"
-.endif
-
-.if !defined(WITHOUT_GS_lxm3200)
-.include "${FILESDIR}/Makefile.lxm3200"
-.endif
-
-.if !defined(WITHOUT_GS_lx5000)
-.include "${FILESDIR}/Makefile.lx5000"
+PLIST_SUB+=	SHLIB="" X11="" SHLIB_VER="${SHLIB_VER}"
+ALL_TARGET=	so
+INSTALL_TARGET=	soinstall
+.if ${PORT_OPTIONS:MGS_pcl3}
+ALL_TARGET+=	pcl3opts
 .endif
-
-.if !defined(WITHOUT_GS_lex2050) \
-	&& !defined(WITHOUT_GS_lex3200) \
-	&& !defined(WITHOUT_GS_lex5700) \
-	&& !defined(WITHOUT_GS_lex7000)
-.include "${FILESDIR}/Makefile.lex7000"
+.else
+ALL_TARGET=	all
+PLIST_SUB+=	SHLIB="@comment " X11="@comment "
 .endif
 
-# contributed uniprint profiles
-CONTRIB_UPP=	lqx70ch.upp lqx70cl.upp lqx70cm.upp \
-		stc740ih.upp stc740p.upp stc740pl.upp
-
-pre-everything::
-	@${ECHO_MSG} ${MSG_PAPERSIZE}
-
 post-patch:
 	${REINPLACE_CMD} -e 's|^DEVICE_DEVS|#DEVICE_DEVS|g' \
 		${WRKSRC}/src/unix-gcc.mak
@@ -306,12 +121,21 @@ post-patch:
 		${WRKSRC}/lib/gs_res.ps
 
 pre-build-drivers.mak:
-	@${ECHO_CMD} 'DEVICE_DEVS= \' > ${WRKSRC}/src/drivers.mak
-.for D in ${OPTIONS:MGS_*:S/^GS_//}
-.if defined(WITH_GS_${D})
-	@${ECHO_CMD} '$$(DD)${D}.dev \' >> ${WRKSRC}/src/drivers.mak
+	@${ECHO_CMD} '# automatically generated' > ${WRKSRC}/src/drivers.mak
+.for N in ${DEVS_LIST}
+	@${ECHO_CMD} 'DEVICE_${N}=' >> ${WRKSRC}/src/drivers.mak
+.endfor
+.for D in ${OPTIONS_DEFINE:MGS_*:S/^GS_//}
+.for N in ${DEVS_LIST}
+.if ${PORT_OPTIONS:MGS_${D}}
+.if !defined(OPTIONS_UNSET) || !${OPTIONS_UNSET:MGS_${D}}
+.for X in ${DEVICE_${N}:M${D}.dev}
+	@${ECHO_CMD} 'DEVICE_${N}+= $$(DD)${D}.dev'  >> ${WRKSRC}/src/drivers.mak
+.endfor
+.endif
 .endif
 .endfor
+.endfor
 
 pre-build-contrib_extra.mak:
 	${CAT} /dev/null ${EXTRADEVMKFILE} > ${WRKSRC}/src/contrib_extra.mak
@@ -325,10 +149,14 @@ pre-su-install:
 	${MKDIR} ${DATADIR}
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}
 
+post-install-docs:
+	${MKDIR} ${DOCSDIR}
+
 post-install:
-.if defined(WITH_SHLIB)
+	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}/${PORTVERSION}
+.if ${PORT_OPTIONS:MX11}
 	${STRIP_CMD} ${PREFIX}/bin/gsc ${PREFIX}/bin/gsx
-	${LN} -s -f gsc ${PREFIX}/bin/gs
+	${LN} -sf gsc ${PREFIX}/bin/gs
 .else
 	${STRIP_CMD} ${PREFIX}/bin/gs
 .endif
@@ -338,10 +166,7 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
 
-post-install-docs:
-	${MKDIR} ${DOCSDIR}
-
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 post-install: post-install-docs
 .endif
 

Modified: head/print/ghostscript7/Makefile.drivers
==============================================================================
--- head/print/ghostscript7/Makefile.drivers	Tue Mar 26 15:43:09 2013	(r315308)
+++ head/print/ghostscript7/Makefile.drivers	Mon Apr 29 20:12:16 2013	(r316845)
@@ -1,296 +1,775 @@
 # $FreeBSD$
 
-OPTIONS_GS_DEFAULT_ON=	on
-OPTIONS_GS_DEFAULT_OFF=	off
-
-.if !defined(WITHOUT_X11)
-OPTIONS_X11_DEFAULT=	on
-.else
-OPTIONS_X11_DEFAULT=	off
-.endif
-
-.if !defined(WITH_SVGALIB)
-OPTIONS_SVGALIB_DEFAULT=	off
-.else
-OPTIONS_SVGALIB_DEFAULT=	on
-.endif
-
-.if !defined(WITHOUT_ICONV)
-OPTIONS_ICONV_DEFAULT=	on
-.else
-OPTIONS_ICONV_DEFAULT=	off
-.endif
-
-.if make(makesum)
-OPTIONS_X11_DEFAULT=	on
-OPTIONS_SVGALIB_DEFAULT=on
-OPTIONS_GS_DEFAULT_ON=	on
-OPTIONS_GS_DEFAULT_OFF=	on
-.endif
-
 OPTIONS_X11= \
-GS_x11		"D: X Window System version 11, release >=4"	${OPTIONS_X11_DEFAULT} \
-GS_x11alpha	"D: X Window System masquer. alpha capability"	${OPTIONS_X11_DEFAULT} \
-GS_x11cmyk	"D: X Window System masquer. 1bit/plane CMYK"	${OPTIONS_X11_DEFAULT} \
-GS_x11cmyk2	"D: X Window System 2-bit-per-plane CMYK"	${OPTIONS_X11_DEFAULT} \
-GS_x11cmyk4	"D: X Window System 4-bit-per-plane CMYK"	${OPTIONS_X11_DEFAULT} \
-GS_x11cmyk8	"D: X Window System 8-bit-per-plane CMYK"	${OPTIONS_X11_DEFAULT} \
-GS_x11gray2	"D: X Window System 2-bit gray-scale"	${OPTIONS_X11_DEFAULT} \
-GS_x11gray4	"D: X Window System 4-bit gray-scale"	${OPTIONS_X11_DEFAULT} \
-GS_x11mono	"D: X Window System masquer. black-and-white"	${OPTIONS_X11_DEFAULT} \
-GS_x11rg16x	"D: X Window System G5/B5/R6 pixel layout"	${OPTIONS_X11_DEFAULT} \
-GS_x11rg32x	"D: X Window System G11/B10/R11 pixel layout"	${OPTIONS_X11_DEFAULT}
+	GS_x11 \
+	GS_x11alpha \
+	GS_x11cmyk \
+	GS_x11cmyk2 \
+	GS_x11cmyk4 \
+	GS_x11cmyk8 \
+	GS_x11gray2 \
+	GS_x11gray4 \
+	GS_x11mono \
+	GS_x11rg16x \
+	GS_x11rg32x
 
 OPTIONS_SVGALIB= \
-GS_lvga256	"D: SVGAlib, 256-color VGA modes"	${OPTIONS_SVGALIB_DEFAULT} \
-GS_vgalib	"D: SVGAlib, 16-color VGA modes"	${OPTIONS_SVGALIB_DEFAULT}
+	GS_lvga256 \
+	GS_vgalib
+
+OPTIONS_DEFINE+= \
+	${OPTIONS_X11} \
+	${OPTIONS_SVGALIB} \
+	GS_md2k \
+	GS_md5k \
+	GS_md50Mono \
+	GS_md50Eco \
+	GS_md1xMono \
+	GS_appledmp \
+	GS_iwhi \
+	GS_iwlo \
+	GS_iwlq \
+	GS_hl7x0 \
+	GS_hl1240 \
+	GS_hl1250 \
+	GS_bj10e \
+	GS_bj10v \
+	GS_bj10vh \
+	GS_bj200 \
+	GS_bjc600 \
+	GS_bjc800 \
+	GS_bjccmyk \
+	GS_bjccolor \
+	GS_bjcgray \
+	GS_bjcmono \
+	GS_lbp8 \
+	GS_lbp1310 \
+	GS_lbp1510 \
+	GS_lbp1610 \
+	GS_lbp1710 \
+	GS_lbp1810 \
+	GS_lbp1910 \
+	GS_lips2p \
+	GS_lips3 \
+	GS_lips4 \
+	GS_bjc880j \
+	GS_lips4v \
+	GS_m8510 \
+	GS_coslw2p \
+	GS_coslwxl \
+	GS_stp \
+	GS_uniprint \
+	GS_dmprt \
+	GS_lj250 \
+	GS_declj250 \
+	GS_ap3250 \
+	GS_epson \
+	GS_eps9mid \
+	GS_eps9high \
+	GS_lp8000 \
+	GS_epag \
+	GS_escpage \
+	GS_lp2000 \
+	GS_alc8600 \
+	GS_alc8500 \
+	GS_alc2000 \
+	GS_alc4000 \
+	GS_alc1900 \
+	GS_alc4100 \
+	GS_lp9800c \
+	GS_lp9000c \
+	GS_lp9500c \
+	GS_lp8800c \
+	GS_lp8300c \
+	GS_lp8500c \
+	GS_lp3000c \
+	GS_lp8200c \
+	GS_lp8000c \
+	GS_epl6100 \
+	GS_epl5900 \
+	GS_epl5800 \
+	GS_epl2050 \
+	GS_epl2050p \
+	GS_epl2120 \
+	GS_epl2500 \
+	GS_epl2750 \
+	GS_lp9000b \
+	GS_lp2500 \
+	GS_lp9100 \
+	GS_lp7900 \
+	GS_lp7500 \
+	GS_lp2400 \
+	GS_lp2200 \
+	GS_lp9400 \
+	GS_lp8900 \
+	GS_lp8700 \
+	GS_lp8100 \
+	GS_lp7700 \
+	GS_lp8600f \
+	GS_lp8400f \
+	GS_lp8300f \
+	GS_lp1900 \
+	GS_lp9600s \
+	GS_lp9300 \
+	GS_lp9600 \
+	GS_lp8600 \
+	GS_lp1800 \
+	GS_lq850 \
+	GS_epsonc \
+	GS_mjc180 \
+	GS_mjc360 \
+	GS_mjc720 \
+	GS_mj500c \
+	GS_st800 \
+	GS_stcolor \
+	GS_photoex \
+	GS_lp2563 \
+	GS_dnj650c \
+	GS_deskjet \
+	GS_djet500 \
+	GS_cdeskjet \
+	GS_djet500c \
+	GS_cdjcolor \
+	GS_cdjmono \
+	GS_cdj500 \
+	GS_cdj550 \
+	GS_cdj670 \
+	GS_cdj850 \
+	GS_cdj880 \
+	GS_cdj890 \
+	GS_cdj1600 \
+	GS_cdj970 \
+	GS_laserjet \
+	GS_ljetplus \
+	GS_ljet2p \
+	GS_ljet3 \
+	GS_ljet3d \
+	GS_ljet4 \
+	GS_ljet4d \
+	GS_lj4dith \
+	GS_cljet5 \
+	GS_cljet5c \
+	GS_cljet5pr \
+	GS_lj5mono \
+	GS_lj5gray \
+	GS_pj \
+	GS_pjetxl \
+	GS_pjxl \
+	GS_paintjet \
+	GS_pjxl300 \
+	GS_pxlmono \
+	GS_pxlcolor \
+	GS_pcl3 \
+	GS_ijs \
+	GS_ibmpro \
+	GS_jetp3852 \
+	GS_imagen \
+	GS_fs600 \
+	GS_lxm5700m \
+	GS_lxm3200 \
+	GS_lx5000 \
+	GS_lex2050 \
+	GS_lex3200 \
+	GS_lex5700 \
+	GS_lex7000 \
+	GS_cp50 \
+	GS_necp6 \
+	GS_npdl \
+	GS_oce9050 \
+	GS_oki182 \
+	GS_okiibm \
+	GS_atx23 \
+	GS_atx24 \
+	GS_atx38 \
+	GS_r4081 \
+	GS_rpdl \
+	GS_gdi \
+	GS_sj48 \
+	GS_t4693d2 \
+	GS_t4693d4 \
+	GS_t4693d8 \
+	GS_tek4696 \
+	GS_bmpmono \
+	GS_bmpgray \
+	GS_bmp16 \
+	GS_bmp256 \
+	GS_bmp16m \
+	GS_bmp32b \
+	GS_bmpsep1 \
+	GS_bmpsep8 \
+	GS_ccr \
+	GS_cgmmono \
+	GS_cgm8 \
+	GS_cgm24 \
+	GS_cif \
+	GS_dfaxhigh \
+	GS_dfaxlow \
+	GS_faxg3 \
+	GS_faxg32d \
+	GS_faxg4 \
+	GS_miff24 \
+	GS_inferno \
+	GS_jpeg \
+	GS_jpeggray \
+	GS_mgrmono \
+	GS_mgrgray2 \
+	GS_mgrgray4 \
+	GS_mgrgray8 \
+	GS_mgr4 \
+	GS_mgr8 \
+	GS_pcxmono \
+	GS_pcxgray \
+	GS_pcx16 \
+	GS_pcx256 \
+	GS_pcx24b \
+	GS_pcxcmyk \
+	GS_pdfwrite \
+	GS_bit \
+	GS_bitrgb \
+	GS_bitcmyk \
+	GS_plan9bm \
+	GS_pam \
+	GS_pbm \
+	GS_pbmraw \
+	GS_pgm \
+	GS_pgmraw \
+	GS_pgnm \
+	GS_pgnmraw \
+	GS_pnm \
+	GS_pnmraw \
+	GS_ppm \
+	GS_ppmraw \
+	GS_pkm \
+	GS_pkmraw \
+	GS_pksm \
+	GS_pksmraw \
+	GS_pngmono \
+	GS_pnggray \
+	GS_png16 \
+	GS_png256 \
+	GS_png16m \
+	GS_pngalpha \
+	GS_psmono \
+	GS_psgray \
+	GS_psrgb \
+	GS_pswrite \
+	GS_epswrite \
+	GS_sgirgb \
+	GS_sunhmono \
+	GS_tiffcrle \
+	GS_tiffg3 \
+	GS_tiffg32d \
+	GS_tiffg4 \
+	GS_tiff12nc \
+	GS_tiff24nc \
+	GS_tifflzw \
+	GS_tiffpack \
+	GS_bbox
 
-OPTIONS+=	${OPTIONS_X11}
-OPTIONS+=	${OPTIONS_SVGALIB}
+OPTIONS_DEFAULT+= \
+	${OPTIONS_X11} \
+	${OPTIONS_SVGALIB} \
+	GS_md2k \
+	GS_md5k \
+	GS_md50Mono \
+	GS_md50Eco \
+	GS_md1xMono \
+	GS_appledmp \
+	GS_iwhi \
+	GS_iwlo \
+	GS_iwlq \
+	GS_hl7x0 \
+	GS_hl1240 \
+	GS_hl1250 \
+	GS_bj10e \
+	GS_bj10v \
+	GS_bj10vh \
+	GS_bj200 \
+	GS_bjc600 \
+	GS_bjc800 \
+	GS_bjccmyk \
+	GS_bjccolor \
+	GS_bjcgray \
+	GS_bjcmono \
+	GS_lbp8 \
+	GS_lbp1310 \
+	GS_lbp1510 \
+	GS_lbp1610 \
+	GS_lbp1710 \
+	GS_lbp1810 \
+	GS_lbp1910 \
+	GS_lips2p \
+	GS_lips3 \
+	GS_lips4 \
+	GS_bjc880j \
+	GS_lips4v \
+	GS_m8510 \
+	GS_coslw2p \
+	GS_coslwxl \
+	GS_stp \
+	GS_uniprint \
+	GS_dmprt \
+	GS_lj250 \
+	GS_declj250 \
+	GS_ap3250 \
+	GS_epson \
+	GS_eps9mid \
+	GS_eps9high \
+	GS_lp8000 \
+	GS_epag \
+	GS_escpage \
+	GS_lp2000 \
+	GS_alc8600 \
+	GS_alc8500 \
+	GS_alc2000 \
+	GS_alc4000 \
+	GS_alc1900 \
+	GS_alc4100 \
+	GS_lp9800c \
+	GS_lp9000c \
+	GS_lp9500c \
+	GS_lp8800c \
+	GS_lp8300c \
+	GS_lp8500c \
+	GS_lp3000c \
+	GS_lp8200c \
+	GS_lp8000c \
+	GS_epl6100 \
+	GS_epl5900 \
+	GS_epl5800 \
+	GS_epl2050 \
+	GS_epl2050p \
+	GS_epl2120 \
+	GS_epl2500 \
+	GS_epl2750 \
+	GS_lp9000b \
+	GS_lp2500 \
+	GS_lp9100 \
+	GS_lp7900 \
+	GS_lp7500 \
+	GS_lp2400 \
+	GS_lp2200 \
+	GS_lp9400 \
+	GS_lp8900 \
+	GS_lp8700 \
+	GS_lp8100 \
+	GS_lp7700 \
+	GS_lp8600f \
+	GS_lp8400f \
+	GS_lp8300f \
+	GS_lp1900 \
+	GS_lp9600s \
+	GS_lp9300 \
+	GS_lp9600 \
+	GS_lp8600 \
+	GS_lp1800 \
+	GS_lq850 \
+	GS_epsonc \
+	GS_mjc180 \
+	GS_mjc360 \
+	GS_mjc720 \
+	GS_mj500c \
+	GS_st800 \
+	GS_stcolor \
+	GS_photoex \
+	GS_lp2563 \
+	GS_dnj650c \
+	GS_deskjet \
+	GS_djet500 \
+	GS_cdeskjet \
+	GS_djet500c \
+	GS_cdjcolor \
+	GS_cdjmono \
+	GS_cdj500 \
+	GS_cdj550 \
+	GS_cdj670 \
+	GS_cdj850 \
+	GS_cdj880 \
+	GS_cdj890 \
+	GS_cdj1600 \
+	GS_cdj970 \
+	GS_laserjet \
+	GS_ljetplus \
+	GS_ljet2p \
+	GS_ljet3 \
+	GS_ljet3d \
+	GS_ljet4 \
+	GS_ljet4d \
+	GS_lj4dith \
+	GS_cljet5 \
+	GS_cljet5c \
+	GS_cljet5pr \
+	GS_lj5mono \
+	GS_lj5gray \
+	GS_pj \
+	GS_pjetxl \
+	GS_pjxl \
+	GS_paintjet \
+	GS_pjxl300 \
+	GS_pxlmono \

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-ports-head mailing list