- Wipe x11* items out from driver config dialog when WITHOUT_X11 is defined

- Fix MASTER_SITES

PR:		43707
Submitted by:	Ports Fury

3 files changed, 18 insertions, 3 deletions

diff --git a/print/ghostscript-afpl/Makefile b/print/ghostscript-afpl/Makefile
index 56385d3482de..30c320f05e9d 100644
--- a/print/ghostscript-afpl/Makefile
+++ b/print/ghostscript-afpl/Makefile
@@ -18,7 +18,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:gs_srcs,gs_fonts,gprint,bjc250/} \
 		http://www.ucatv.ne.jp/~taeko/software/gs/:lips \
 		http://www.humblesoft.com/pub/:epag \
 		http://www.epkowa.on.arena.ne.jp/pips/data/gs65_304/:eplaser \
-		http://www.ceres.dti.ne.jp/~owatanab/gdevnpdl/:npdl \
+		http://www.hi.is.uec.ac.jp/~osamuw/gdevnpdl/:npdl \
 		http://www.linuxprinting.org/download/printing/samsung-gdi/:gdi \
 		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/fonts/:fonts \
 		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/gs704/
@@ -398,8 +398,13 @@ do-configure:
 .if defined(BATCH) || defined(PACKAGE_BUILDING)
 	${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.batch
 .else
+.if defined(WITHOUT_X11)
+	${GREP} -v '^  "x11' ${SCRIPTDIR}/configure > ${WRKDIR}/configure
+	${SETENV} ${SCRIPTS_ENV} ${SH} ${WRKDIR}/configure
+.else
 	${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
 .endif
+.endif
 
 post-configure:
 	${ECHO_MSG} ">>> in post-configure ..."
diff --git a/print/ghostscript-gpl/Makefile b/print/ghostscript-gpl/Makefile
index 56385d3482de..30c320f05e9d 100644
--- a/print/ghostscript-gpl/Makefile
+++ b/print/ghostscript-gpl/Makefile
@@ -18,7 +18,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:gs_srcs,gs_fonts,gprint,bjc250/} \
 		http://www.ucatv.ne.jp/~taeko/software/gs/:lips \
 		http://www.humblesoft.com/pub/:epag \
 		http://www.epkowa.on.arena.ne.jp/pips/data/gs65_304/:eplaser \
-		http://www.ceres.dti.ne.jp/~owatanab/gdevnpdl/:npdl \
+		http://www.hi.is.uec.ac.jp/~osamuw/gdevnpdl/:npdl \
 		http://www.linuxprinting.org/download/printing/samsung-gdi/:gdi \
 		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/fonts/:fonts \
 		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/gs704/
@@ -398,8 +398,13 @@ do-configure:
 .if defined(BATCH) || defined(PACKAGE_BUILDING)
 	${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.batch
 .else
+.if defined(WITHOUT_X11)
+	${GREP} -v '^  "x11' ${SCRIPTDIR}/configure > ${WRKDIR}/configure
+	${SETENV} ${SCRIPTS_ENV} ${SH} ${WRKDIR}/configure
+.else
 	${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
 .endif
+.endif
 
 post-configure:
 	${ECHO_MSG} ">>> in post-configure ..."
diff --git a/print/ghostscript8/Makefile b/print/ghostscript8/Makefile
index 56385d3482de..30c320f05e9d 100644
--- a/print/ghostscript8/Makefile
+++ b/print/ghostscript8/Makefile
@@ -18,7 +18,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:gs_srcs,gs_fonts,gprint,bjc250/} \
 		http://www.ucatv.ne.jp/~taeko/software/gs/:lips \
 		http://www.humblesoft.com/pub/:epag \
 		http://www.epkowa.on.arena.ne.jp/pips/data/gs65_304/:eplaser \
-		http://www.ceres.dti.ne.jp/~owatanab/gdevnpdl/:npdl \
+		http://www.hi.is.uec.ac.jp/~osamuw/gdevnpdl/:npdl \
 		http://www.linuxprinting.org/download/printing/samsung-gdi/:gdi \
 		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/fonts/:fonts \
 		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/gs704/
@@ -398,8 +398,13 @@ do-configure:
 .if defined(BATCH) || defined(PACKAGE_BUILDING)
 	${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.batch
 .else
+.if defined(WITHOUT_X11)
+	${GREP} -v '^  "x11' ${SCRIPTDIR}/configure > ${WRKDIR}/configure
+	${SETENV} ${SCRIPTS_ENV} ${SH} ${WRKDIR}/configure
+.else
 	${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
 .endif
+.endif
 
 post-configure:
 	${ECHO_MSG} ">>> in post-configure ..."