- Add LICENSE.

- Make MAKE_JOBS_SAFE=yes.
- Replace OPTIONS with OPTIONSng.  Bump PORTREVISION because a package created
  with Makefile.drivers r1.8 had some inconsistent default values.

3 files changed, 55 insertions, 58 deletions

diff --git a/print/ghostscript8/files/Makefile.drivers_post b/print/ghostscript8/files/Makefile.drivers_post
index 8743937da04d..5894b9ab4ecb 100644
--- a/print/ghostscript8/files/Makefile.drivers_post
+++ b/print/ghostscript8/files/Makefile.drivers_post
@@ -1,41 +1,13 @@
 # $FreeBSD$
 # pre/postprocessing driver variables
 
-# define defaults which depend on WITHOUT_*/WITH_*
-.for D in X11 SVGALIB ICONV
-.if !defined(WITHOUT_${D})
-OPTIONS_${D}_DEFAULT=	on
-.else
-OPTIONS_${D}_DEFAULT=	off
-.endif
-.endfor
-.for D in SVGALIB CAIRO CUPS GTK
-.if !defined(WITH_${D})
-OPTIONS_${D}_DEFAULT=	off
-.else
-OPTIONS_${D}_DEFAULT=	on
-.endif
-.endfor
-
-# makesum needs lowest common multiple
-.if make(makesum)
-OPTIONS_X11_DEFAULT=	on
-OPTIONS_GTK_DEFAULT=	on
-OPTIONS_SVGALIB_DEFAULT=on
-OPTIONS_ICONV_DEFAULT=	on
-OPTIONS_CAIRO_DEFAULT=	on
-OPTIONS_CUPS_DEFAULT=	on
-OPTIONS_GS_DEFAULT_ON=	on
-OPTIONS_GS_DEFAULT_OFF=	on
-.endif
-
 # dmprt specific
-.if !defined(WITHOUT_GS_dmprt)
+.if ${PORT_OPTIONS:MGS_dmprt}
 .include "${FILESDIR}/Makefile.dmprt"
 .endif
 
 # epag specific
-.if !defined(WITHOUT_GS_epag)
+.if ${PORT_OPTIONS:MGS_epag}
 .include "${FILESDIR}/Makefile.epag"
 .endif
 
@@ -51,7 +23,7 @@ post-extract-epag:
 post-extract: post-extract-epag
 
 # pcl3 specific
-.if !defined(WITHOUT_GS_pcl3)
+.if ${PORT_OPTIONS:MGS_pcl3}
 .include "${FILESDIR}/Makefile.pcl3"
 .endif
 
@@ -60,13 +32,10 @@ CUPS_DEVS= cups
 .undef _CUPS_DEVS
 
 .for D in ${CUPS_DEVS}
-.if defined(WITHOUT_CUPS) || defined(WITHOUT_GS_${D})
-.undef WITH_GS_${D}
-.elif defined(WITH_GS_${D})
-_CUPS_DEVS+= ${D}
-.elif ${OPTIONS_CUPS_DEFAULT} == "on"
+.if ${PORT_OPTIONS:MCUPS} && ${PORT_OPTIONS:MGS_${D}}
 _CUPS_DEVS+= ${D}
-WITH_GS_${D}=yes
+.else
+PORT_OPTIONS:=	${PORT_OPTIONS:NGS_${D}}
 .endif
 .endfor
 
@@ -82,13 +51,8 @@ VGA_DEVS= lvga256 vgalib
 .undef _VGA_DEVS
 
 .for D in ${VGA_DEVS}
-.if defined(WITHOUT_SVGALIB) || defined(WITHOUT_GS_${D})
-.undef WITH_GS_${D}
-.elif defined(WITH_GS_${D})
-_VGA_DEVS+= ${D}
-.elif ${OPTIONS_SVGALIB_DEFAULT} == "on"
+.if ${PORT_OPTIONS:MGS_${D}}
 _VGA_DEVS+= ${D}
-WITH_GS_${D}=yes
 .endif
 .endfor
 
@@ -97,18 +61,15 @@ LIB_DEPENDS+=	vga.1:${PORTSDIR}/graphics/svgalib
 .endif
 
 # x11 specific
-X11_DEVS= x11 x11alpha x11cmyk x11cmyk2 x11cmyk4 x11cmyk8 x11gray2	\
+X11_DEVS= x11 x11alpha x11cmyk x11cmyk2 x11cmyk4 x11cmyk8 x11gray2 \
 	x11gray4 x11mono x11rg16x x11rg32x display
 .undef _X11_DEVS
 
 .for D in ${X11_DEVS}
-.if defined(WITHOUT_X11) || defined(WITHOUT_GS_${D})
-. undef WITH_GS_${D}
-.elif defined(WITH_GS_${D})
-_X11_DEVS+= ${D}
-.elif ${OPTIONS_X11_DEFAULT} == "on"
+.if ${PORT_OPTIONS:MX11} && ${PORT_OPTIONS:MGS_${D}}
 _X11_DEVS+= ${D}
-WITH_GS_${D}=yes
+.else
+PORT_OPTIONS:=	${PORT_OPTIONS:NGS_${D}}
 .endif
 .endfor
 
@@ -118,7 +79,7 @@ CONFIGURE_ARGS+=--with-x \
 		--x-includes=${X11BASE}/include \
 		--x-libraries=${X11BASE}/lib
 CONFLICTS_INSTALL+=	ghostscript8-nox11-[0-9]*
-.if defined(WITH_GTK)
+.if ${PORT_OPTIONS:MGTK2}
 USE_GNOME=	atk gdkpixbuf2 glib20 gtk20
 CONFIGURE_ARGS+=--enable-gtk
 .else
@@ -135,13 +96,10 @@ ICONV_DEVS= oprp opvp
 .undef _ICONV_DEVS
 
 .for D in ${ICONV_DEVS}
-.if defined(WITHOUT_ICONV) || defined(WITHOUT_GS_${D})
-.undef WITH_GS_${D}
-.elif defined(WITH_GS_${D})
-_ICONV_DEVS+= ${D}
-.elif ${OPTIONS_ICONV_DEFAULT} == "on"
+.if ${PORT_OPTIONS:MICONV} && ${PORT_OPTIONS:MGS_${D}}
 _ICONV_DEVS+= ${D}
-WITH_GS_${D}=yes
+.else
+PORT_OPTIONS:=	${PORT_OPTIONS:NGS_${D}}
 .endif
 .endfor
 
@@ -154,7 +112,15 @@ CONFIGURE_ARGS+=--with-libiconv=no
 .endif
 
 # cairo specific
-.if defined(WITH_GS_cairo)
+.for D in cairo
+.if ${PORT_OPTIONS:MCAIRO} && ${PORT_OPTIONS:MGS_${D}}
+_CAIRO_DEVS+=	${D}
+.else
+PORT_OPTIONS:=	${PORT_OPTIONS:NGS_${D}}
+.endif
+.endfor
+
+.if defined(_CAIRO_DEVS)
 LIB_DEPENDS+=	cairo.2:${PORTSDIR}/graphics/cairo
 CONFIGURE_ARGS+=	--enable-cairo
 .else
diff --git a/print/ghostscript8/files/patch-base-ijs.mak b/print/ghostscript8/files/patch-base-ijs.mak
new file mode 100644
index 000000000000..26e407247ede
--- /dev/null
+++ b/print/ghostscript8/files/patch-base-ijs.mak
@@ -0,0 +1,20 @@
+--- base/ijs.mak.orig	2012-06-13 02:06:36.000000000 +0900
++++ base/ijs.mak	2012-06-13 02:07:44.000000000 +0900
+@@ -41,7 +41,7 @@
+ ijs.clean : ijs.config-clean ijs.clean-not-config-clean
+ 
+ ### WRONG.  MUST DELETE OBJ AND GEN FILES SELECTIVELY.
+-ijs.clean-not-config-clean :
++ijs.clean-not-config-clean : $(ECHOGS_XE)
+ #	echo $(IJSSRC) $(IJSGEN) $(IJSOBJ) $(IJSO_)
+ 	$(EXP)$(ECHOGS_XE) $(IJSSRC) $(IJSGEN) $(IJSOBJ) $(IJSO_)
+ 	$(RM_) $(IJSOBJ)*.$(OBJ)
+@@ -61,7 +61,7 @@
+ ijs_client_h=$(IJSSRC)$(D)ijs_client.h
+ ijs_server_h=$(IJSSRC)$(D)ijs_server.h
+ 
+-$(IJSOBJ)ijs.$(OBJ) : $(IJSSRC)ijs.c $(IJSDEP) $(ijs_h)
++$(IJSOBJ)ijs.$(OBJ) : $(ECHOGS_XE) $(IJSSRC)ijs.c $(IJSDEP) $(ijs_h)
+ #	echo $(IJS_CCFLAGS)
+ 	$(EXP)$(ECHOGS_XE) $(IJS_CCFLAGS)
+ 	$(IJS_CC) $(IJSO_)ijs.$(OBJ) $(C_) $(IJSSRC)ijs.c
diff --git a/print/ghostscript8/files/patch-contrib-contrib.mak b/print/ghostscript8/files/patch-contrib-contrib.mak
new file mode 100644
index 000000000000..f255865761a5
--- /dev/null
+++ b/print/ghostscript8/files/patch-contrib-contrib.mak
@@ -0,0 +1,11 @@
+--- contrib/contrib.mak.orig	2012-06-13 01:22:12.000000000 +0900
++++ contrib/contrib.mak	2012-06-13 01:22:40.000000000 +0900
+@@ -956,7 +956,7 @@
+ $(GLOBJ)gdevdmpr.$(OBJ) : $(JAPSRC)gdevdmpr.c $(JAPSRC)dviprlib.h $(PDEVH)
+ 	$(GLCC) $(O_)$@ $(C_) $(JAPSRC)gdevdmpr.c
+ 
+-$(GLOBJ)dviprlib.$(OBJ) : $(JAPSRC)dviprlib.c $(JAPSRC)dviprlib.h
++$(GLOBJ)dviprlib.$(OBJ) : $(arch_h) $(stdio__h) $(JAPSRC)dviprlib.c $(JAPSRC)dviprlib.h
+ 	$(GLCC) $(O_)$@ $(C_) $(JAPSRC)dviprlib.c
+ 
+ extra-dmprt-install: