cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert r303635 to fix an wrong OPTIONS handling and resolve svgalib dependency

Browse Source 
in the case of !amd64 && !i386 in another way.

Pointed out by:	crees
Pointy hat to:	hrs
This commit is contained in:
Hiroki Sato 2012-09-04 19:05:49 +00:00
parent e39f0668ce
commit 12b5de378c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=303669
6 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
print/ghostscript8/Makefile
View File

@ -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

2
print/ghostscript8/Makefile.drivers
View File

@ -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 \

4
print/ghostscript8/files/Makefile.drivers_post
View File

@ -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

4
print/ghostscript9/Makefile
View File

@ -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

2
print/ghostscript9/Makefile.drivers
View File

@ -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 \

4
print/ghostscript9/files/Makefile.drivers_post
View File

@ -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