svn commit: r303669 - in head/print: ghostscript8 ghostscript8/files ghostscript9 ghostscript9/files

[Hiroki Sato]

Author: hrs
Date: Tue Sep  4 19:05:49 2012
New Revision: 303669
URL: http://svn.freebsd.org/changeset/ports/303669

Log:
  Revert r303635 to fix an wrong OPTIONS handling and resolve svgalib dependency
  in the case of !amd64 && !i386 in another way.
  
  Pointed out by:	crees
  Pointy hat to:	hrs

Modified:
  head/print/ghostscript8/Makefile
  head/print/ghostscript8/Makefile.drivers
  head/print/ghostscript8/files/Makefile.drivers_post
  head/print/ghostscript9/Makefile
  head/print/ghostscript9/Makefile.drivers
  head/print/ghostscript9/files/Makefile.drivers_post

Modified: head/print/ghostscript8/Makefile
==============================================================================
--- head/print/ghostscript8/Makefile	Tue Sep  4 19:03:45 2012	(r303668)
+++ head/print/ghostscript8/Makefile	Tue Sep  4 19:05:49 2012	(r303669)
@@ -90,8 +90,8 @@ MLINKS=		gslp.1 gsbj.1 \
 CIDFONTDIR=	${DATADIR}/${PORTVERSION}/Resource
 EXCLUDE_DIRS=	jbig2dec jpeg expat jasper libpng tiff zlib
 
-.include <bsd.port.pre.mk>
 .include "Makefile.drivers"
+.include <bsd.port.pre.mk>
 .include "${FILESDIR}/Makefile.drivers_post"
 
 .for D in ${OPTIONS_DEFINE:MGS_*:S/^GS_//}
@@ -171,10 +171,12 @@ pre-build-drivers.mak:
 .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}/base/drivers.mak
 .endfor
 .endif
+.endif
 .endfor
 .endfor
 

Modified: head/print/ghostscript8/Makefile.drivers
==============================================================================
--- head/print/ghostscript8/Makefile.drivers	Tue Sep  4 19:03:45 2012	(r303668)
+++ head/print/ghostscript8/Makefile.drivers	Tue Sep  4 19:05:49 2012	(r303669)
@@ -13,11 +13,9 @@ OPTIONS_X11= \
 	GS_x11rg16x \
 	GS_x11rg32x
 
-.if ${ARCH:Mamd64} || ${ARCH:Mi386}
 OPTIONS_SVGALIB= \
 	GS_lvga256 \
 	GS_vgalib
-.endif
 
 OPTIONS_ICONV= \
 	GS_oprp \

Modified: head/print/ghostscript8/files/Makefile.drivers_post
==============================================================================
--- head/print/ghostscript8/files/Makefile.drivers_post	Tue Sep  4 19:03:45 2012	(r303668)
+++ head/print/ghostscript8/files/Makefile.drivers_post	Tue Sep  4 19:05:49 2012	(r303669)
@@ -52,7 +52,11 @@ VGA_DEVS= lvga256 vgalib
 
 .for D in ${VGA_DEVS}
 .if ${PORT_OPTIONS:MGS_${D}}
+.if ${ARCH:Mamd64} || ${ARCH:Mi386}
 _VGA_DEVS+= ${D}
+.else
+OPTIONS_UNSET+=	${PORT_OPTIONS:MGS_${D}}
+.endif
 .endif
 .endfor
 

Modified: head/print/ghostscript9/Makefile
==============================================================================
--- head/print/ghostscript9/Makefile	Tue Sep  4 19:03:45 2012	(r303668)
+++ head/print/ghostscript9/Makefile	Tue Sep  4 19:05:49 2012	(r303669)
@@ -95,8 +95,8 @@ MLINKS=		gslp.1 gsbj.1 \
 
 EXCLUDE_DIRS=	freetype jbig2dec jpeg expat jasper libpng tiff zlib
 
-.include <bsd.port.pre.mk>
 .include "Makefile.drivers"
+.include <bsd.port.pre.mk>
 .include "${FILESDIR}/Makefile.drivers_post"
 
 .for D in ${OPTIONS_DEFINE:MGS_*:S/^GS_//}
@@ -172,10 +172,12 @@ pre-build-drivers.mak:
 .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 ${${N:S/^/DEVICE_/:S/^DEVICE_DISPLAY_DEV/DISPLAY_DEV/}:M${D}.dev}
 	@${ECHO_CMD} '${N:S/^/DEVICE_/:S/^DEVICE_DISPLAY_DEV/DISPLAY_DEV/}+= $$(DD)${D}.dev'  >> ${WRKSRC}/base/drivers.mak
 .endfor
 .endif
+.endif
 .endfor
 .endfor
 

Modified: head/print/ghostscript9/Makefile.drivers
==============================================================================
--- head/print/ghostscript9/Makefile.drivers	Tue Sep  4 19:03:45 2012	(r303668)
+++ head/print/ghostscript9/Makefile.drivers	Tue Sep  4 19:05:49 2012	(r303669)
@@ -13,11 +13,9 @@ OPTIONS_X11= \
 	GS_x11rg16x \
 	GS_x11rg32x
 
-.if ${ARCH:Mamd64} || ${ARCH:Mi386}
 OPTIONS_SVGALIB= \
 	GS_lvga256 \
 	GS_vgalib
-.endif
 
 OPTIONS_ICONV= \
 	GS_oprp \

Modified: head/print/ghostscript9/files/Makefile.drivers_post
==============================================================================
--- head/print/ghostscript9/files/Makefile.drivers_post	Tue Sep  4 19:03:45 2012	(r303668)
+++ head/print/ghostscript9/files/Makefile.drivers_post	Tue Sep  4 19:05:49 2012	(r303669)
@@ -52,7 +52,11 @@ VGA_DEVS= lvga256 vgalib
 
 .for D in ${VGA_DEVS}
 .if ${PORT_OPTIONS:MGS_${D}}
+.if ${ARCH:Mamd64} || ${ARCH:Mi386}
 _VGA_DEVS+= ${D}
+.else
+OPTIONS_UNSET+=	${PORT_OPTIONS:MGS_${D}}
+.endif
 .endif
 .endfor