From owner-svn-ports-all@FreeBSD.ORG Tue Sep 4 19:05:49 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D0D49106564A; Tue, 4 Sep 2012 19:05:49 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id BB8A78FC18; Tue, 4 Sep 2012 19:05:49 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q84J5nEl004440; Tue, 4 Sep 2012 19:05:49 GMT (envelope-from hrs@svn.freebsd.org) Received: (from hrs@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q84J5ncs004432; Tue, 4 Sep 2012 19:05:49 GMT (envelope-from hrs@svn.freebsd.org) Message-Id: <201209041905.q84J5ncs004432@svn.freebsd.org> From: Hiroki Sato Date: Tue, 4 Sep 2012 19:05:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r303669 - in head/print: ghostscript8 ghostscript8/files ghostscript9 ghostscript9/files X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Sep 2012 19:05:49 -0000 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 .include "Makefile.drivers" +.include .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 .include "Makefile.drivers" +.include .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