diff options
| author | hrs <hrs@FreeBSD.org> | 2012-09-05 03:05:49 +0800 |
|---|---|---|
| committer | hrs <hrs@FreeBSD.org> | 2012-09-05 03:05:49 +0800 |
| commit | fa2c92347a3fabc470870afee61c0a3d7fc24752 (patch) | |
| tree | bad9b2a649b3513c5296a8be3713086c85aaec3b /print/ghostscript9 | |
| parent | 907cffefbbb898dd4d3f7c624eb8ba6873a6d6f1 (diff) | |
| download | freebsd-ports-graphics-fa2c92347a3fabc470870afee61c0a3d7fc24752.tar.gz freebsd-ports-graphics-fa2c92347a3fabc470870afee61c0a3d7fc24752.tar.zst freebsd-ports-graphics-fa2c92347a3fabc470870afee61c0a3d7fc24752.zip | |
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
Diffstat (limited to 'print/ghostscript9')
| -rw-r--r-- | print/ghostscript9/Makefile | 4 | ||||
| -rw-r--r-- | print/ghostscript9/Makefile.drivers | 2 | ||||
| -rw-r--r-- | print/ghostscript9/files/Makefile.drivers_post | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/print/ghostscript9/Makefile b/print/ghostscript9/Makefile index 09a0b821e3c..aace4e71085 100644 --- a/print/ghostscript9/Makefile +++ b/print/ghostscript9/Makefile @@ -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 diff --git a/print/ghostscript9/Makefile.drivers b/print/ghostscript9/Makefile.drivers index 6a1088da34b..5371b50ebbc 100644 --- a/print/ghostscript9/Makefile.drivers +++ b/print/ghostscript9/Makefile.drivers @@ -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 \ diff --git a/print/ghostscript9/files/Makefile.drivers_post b/print/ghostscript9/files/Makefile.drivers_post index 2f947d23ad1..09230870cc8 100644 --- a/print/ghostscript9/files/Makefile.drivers_post +++ b/print/ghostscript9/files/Makefile.drivers_post @@ -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 |