From owner-svn-ports-head@FreeBSD.ORG Mon Jul 15 17:17:02 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 6B2FE866; Mon, 15 Jul 2013 17:17:02 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 4CCCDBE5; Mon, 15 Jul 2013 17:17:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6FHH2cs079839; Mon, 15 Jul 2013 17:17:02 GMT (envelope-from hrs@svn.freebsd.org) Received: (from hrs@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6FHH1p1079834; Mon, 15 Jul 2013 17:17:01 GMT (envelope-from hrs@svn.freebsd.org) Message-Id: <201307151717.r6FHH1p1079834@svn.freebsd.org> From: Hiroki Sato Date: Mon, 15 Jul 2013 17:17:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r323070 - in head/print: ghostscript7 ghostscript8 ghostscript9 ghostscript9-agpl X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Jul 2013 17:17:02 -0000 Author: hrs Date: Mon Jul 15 17:17:01 2013 New Revision: 323070 URL: http://svnweb.freebsd.org/changeset/ports/323070 Log: Fix drivers.mak generation. It did not work with X11, iconv, and svgalib device drivers after OPTIONS_{MULTI,GROUP} conversion. Reported by: Gert Doering Modified: head/print/ghostscript7/Makefile head/print/ghostscript8/Makefile head/print/ghostscript9-agpl/Makefile head/print/ghostscript9/Makefile Modified: head/print/ghostscript7/Makefile ============================================================================== --- head/print/ghostscript7/Makefile Mon Jul 15 16:58:06 2013 (r323069) +++ head/print/ghostscript7/Makefile Mon Jul 15 17:17:01 2013 (r323070) @@ -3,7 +3,7 @@ PORTNAME= ghostscript PORTVERSION= 7.07 -PORTREVISION= 27 +PORTREVISION= 28 CATEGORIES= print MASTER_SITES= SF/ghostscript/gnu-gs/${PORTVERSION}:gs_srcs \ ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/gs${PORTVERSION:S/.//}/:gs_srcs \ @@ -85,7 +85,9 @@ USE_GNOME= gtk12 .include .include "${FILESDIR}/Makefile.drivers_post" -.for D in ${OPTIONS_DEFINE:MGS_*:S/^GS_//} +.for D in ${OPTIONS_DEFINE:MGS_*:S/^GS_//} \ + ${OPTIONS_MULTI_X11:MGS_*:S/^GS_//} \ + ${OPTIONS_GROUP_SVGALIB:MGS_*:S/^GS_//} .if ${PORT_OPTIONS:MGS_${D}} PLIST_SUB+= GS_${D}="" .else @@ -128,7 +130,9 @@ pre-build-drivers.mak: .for N in ${DEVS_LIST} @${ECHO_CMD} 'DEVICE_${N}=' >> ${WRKSRC}/src/drivers.mak .endfor -.for D in ${OPTIONS_DEFINE:MGS_*:S/^GS_//} +.for D in ${OPTIONS_DEFINE:MGS_*:S/^GS_//} \ + ${OPTIONS_MULTI_X11:MGS_*:S/^GS_//} \ + ${OPTIONS_GROUP_SVGALIB:MGS_*:S/^GS_//} .for N in ${DEVS_LIST} .if ${PORT_OPTIONS:MGS_${D}} .if !defined(OPTIONS_UNSET) || !${OPTIONS_UNSET:MGS_${D}} Modified: head/print/ghostscript8/Makefile ============================================================================== --- head/print/ghostscript8/Makefile Mon Jul 15 16:58:06 2013 (r323069) +++ head/print/ghostscript8/Makefile Mon Jul 15 17:17:01 2013 (r323070) @@ -3,7 +3,7 @@ PORTNAME= ghostscript PORTVERSION= 8.71 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= print MASTER_SITES= http://downloads.ghostscript.com/public/:gs_srcs \ SF/ghostscript/GPL%20Ghostscript/${PORTVERSION}:gs_srcs \ @@ -96,7 +96,10 @@ EXCLUDE_DIRS= jbig2dec jpeg expat jasper .include .include "${FILESDIR}/Makefile.drivers_post" -.for D in ${OPTIONS_DEFINE:MGS_*:S/^GS_//} +.for D in ${OPTIONS_DEFINE:MGS_*:S/^GS_//} \ + ${OPTIONS_MULTI_X11:MGS_*:S/^GS_//} \ + ${OPTIONS_GROUP_ICONV:MGS_*:S/^GS_//} \ + ${OPTIONS_GROUP_SVGALIB:MGS_*:S/^GS_//} .if ${PORT_OPTIONS:MGS_${D}} PLIST_SUB+= GS_${D}="" .else @@ -150,7 +153,10 @@ pre-build-drivers.mak: .for N in ${DEVS_LIST} @${ECHO_CMD} 'DEVICE_${N}=' >> ${WRKSRC}/base/drivers.mak .endfor -.for D in ${OPTIONS_DEFINE:MGS_*:S/^GS_//} +.for D in ${OPTIONS_DEFINE:MGS_*:S/^GS_//} \ + ${OPTIONS_MULTI_X11:MGS_*:S/^GS_//} \ + ${OPTIONS_GROUP_ICONV:MGS_*:S/^GS_//} \ + ${OPTIONS_GROUP_SVGALIB:MGS_*:S/^GS_//} .for N in ${DEVS_LIST} .if ${PORT_OPTIONS:MGS_${D}} .if !defined(OPTIONS_UNSET) || !${OPTIONS_UNSET:MGS_${D}} Modified: head/print/ghostscript9-agpl/Makefile ============================================================================== --- head/print/ghostscript9-agpl/Makefile Mon Jul 15 16:58:06 2013 (r323069) +++ head/print/ghostscript9-agpl/Makefile Mon Jul 15 17:17:01 2013 (r323070) @@ -2,7 +2,7 @@ PORTNAME= ghostscript PORTVERSION= 9.07 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= print MASTER_SITES= http://downloads.ghostscript.com/public/:gs_srcs \ SF/ghostscript/GPL%20Ghostscript/${PORTVERSION}:gs_srcs \ @@ -98,7 +98,10 @@ EXCLUDE_DIRS= freetype jbig2dec jpeg exp .include .include "${FILESDIR}/Makefile.drivers_post" -.for D in ${OPTIONS_DEFINE:MGS_*:S/^GS_//} +.for D in ${OPTIONS_DEFINE:MGS_*:S/^GS_//} \ + ${OPTIONS_MULTI_X11:MGS_*:S/^GS_//} \ + ${OPTIONS_GROUP_ICONV:MGS_*:S/^GS_//} \ + ${OPTIONS_GROUP_SVGALIB:MGS_*:S/^GS_//} .if ${PORT_OPTIONS:MGS_${D}} PLIST_SUB+= GS_${D}="" .else @@ -148,7 +151,10 @@ pre-build-drivers.mak: .for N in ${DEVS_LIST} @${ECHO_CMD} '${N:S/^/DEVICE_/:S/^DEVICE_DISPLAY_DEV/DISPLAY_DEV/}=' >> ${WRKSRC}/base/drivers.mak .endfor -.for D in ${OPTIONS_DEFINE:MGS_*:S/^GS_//} +.for D in ${OPTIONS_DEFINE:MGS_*:S/^GS_//} \ + ${OPTIONS_MULTI_X11:MGS_*:S/^GS_//} \ + ${OPTIONS_GROUP_ICONV:MGS_*:S/^GS_//} \ + ${OPTIONS_GROUP_SVGALIB:MGS_*:S/^GS_//} .for N in ${DEVS_LIST} .if ${PORT_OPTIONS:MGS_${D}} .if !defined(OPTIONS_UNSET) || !${OPTIONS_UNSET:MGS_${D}} Modified: head/print/ghostscript9/Makefile ============================================================================== --- head/print/ghostscript9/Makefile Mon Jul 15 16:58:06 2013 (r323069) +++ head/print/ghostscript9/Makefile Mon Jul 15 17:17:01 2013 (r323070) @@ -2,7 +2,7 @@ PORTNAME= ghostscript PORTVERSION= 9.06 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= print MASTER_SITES= http://downloads.ghostscript.com/public/:gs_srcs \ SF/ghostscript/GPL%20Ghostscript/${PORTVERSION}:gs_srcs \ @@ -100,7 +100,10 @@ EXCLUDE_DIRS= freetype jbig2dec jpeg exp .include .include "${FILESDIR}/Makefile.drivers_post" -.for D in ${OPTIONS_DEFINE:MGS_*:S/^GS_//} +.for D in ${OPTIONS_DEFINE:MGS_*:S/^GS_//} \ + ${OPTIONS_MULTI_X11:MGS_*:S/^GS_//} \ + ${OPTIONS_GROUP_ICONV:MGS_*:S/^GS_//} \ + ${OPTIONS_GROUP_SVGALIB:MGS_*:S/^GS_//} .if ${PORT_OPTIONS:MGS_${D}} PLIST_SUB+= GS_${D}="" .else @@ -150,7 +153,10 @@ pre-build-drivers.mak: .for N in ${DEVS_LIST} @${ECHO_CMD} '${N:S/^/DEVICE_/:S/^DEVICE_DISPLAY_DEV/DISPLAY_DEV/}=' >> ${WRKSRC}/base/drivers.mak .endfor -.for D in ${OPTIONS_DEFINE:MGS_*:S/^GS_//} +.for D in ${OPTIONS_DEFINE:MGS_*:S/^GS_//} \ + ${OPTIONS_MULTI_X11:MGS_*:S/^GS_//} \ + ${OPTIONS_GROUP_ICONV:MGS_*:S/^GS_//} \ + ${OPTIONS_GROUP_SVGALIB:MGS_*:S/^GS_//} .for N in ${DEVS_LIST} .if ${PORT_OPTIONS:MGS_${D}} .if !defined(OPTIONS_UNSET) || !${OPTIONS_UNSET:MGS_${D}}