From owner-svn-ports-head@FreeBSD.ORG Thu Jul 25 09:25:19 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id DDD3DDB0; Thu, 25 Jul 2013 09:25:18 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C8B2C2AA2; Thu, 25 Jul 2013 09:25:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6P9PIIb057709; Thu, 25 Jul 2013 09:25:18 GMT (envelope-from hrs@svn.freebsd.org) Received: (from hrs@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6P9PH7L057700; Thu, 25 Jul 2013 09:25:17 GMT (envelope-from hrs@svn.freebsd.org) Message-Id: <201307250925.r6P9PH7L057700@svn.freebsd.org> From: Hiroki Sato Date: Thu, 25 Jul 2013 09:25:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r323630 - in head/print: ghostscript7 ghostscript7/files ghostscript8 ghostscript8/files ghostscript9 ghostscript9-agpl ghostscript9-agpl/files ghostscript9/files 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: Thu, 25 Jul 2013 09:25:19 -0000 Author: hrs Date: Thu Jul 25 09:25:16 2013 New Revision: 323630 URL: http://svnweb.freebsd.org/changeset/ports/323630 Log: Set ${MASTERDIR} to ${.CURDIR} and use it for .include "files/foo". Changes in r323629 broke ghostscript*-nox11. Pointed out by: bapt Modified: head/print/ghostscript7/Makefile head/print/ghostscript7/files/Makefile.drivers_post head/print/ghostscript8/Makefile head/print/ghostscript8/files/Makefile.drivers_post head/print/ghostscript9-agpl/Makefile head/print/ghostscript9-agpl/files/Makefile.drivers_post head/print/ghostscript9/Makefile head/print/ghostscript9/files/Makefile.drivers_post Modified: head/print/ghostscript7/Makefile ============================================================================== --- head/print/ghostscript7/Makefile Thu Jul 25 09:03:33 2013 (r323629) +++ head/print/ghostscript7/Makefile Thu Jul 25 09:25:16 2013 (r323630) @@ -82,7 +82,8 @@ post-extract: post-extract-all USE_GNOME= gtk12 .endif -.include "files/Makefile.drivers_post" +MASTERDIR?= ${.CURDIR} +.include "${MASTERDIR}/files/Makefile.drivers_post" .for D in ${OPTIONS_DEFINE:MGS_*:S/^GS_//} \ ${OPTIONS_MULTI_X11:MGS_*:S/^GS_//} \ Modified: head/print/ghostscript7/files/Makefile.drivers_post ============================================================================== --- head/print/ghostscript7/files/Makefile.drivers_post Thu Jul 25 09:03:33 2013 (r323629) +++ head/print/ghostscript7/files/Makefile.drivers_post Thu Jul 25 09:25:16 2013 (r323630) @@ -3,17 +3,17 @@ # dmprt specific .if ${PORT_OPTIONS:MGS_dmprt} -.include "files/Makefile.dmprt" +.include "${MASTERDIR}/files/Makefile.dmprt" .endif # epag specific .if ${PORT_OPTIONS:MGS_epag} -.include "files/Makefile.epag" +.include "${MASTERDIR}/files/Makefile.epag" .endif # pcl3 specific .if ${PORT_OPTIONS:MGS_pcl3} -.include "files/Makefile.pcl3" +.include "${MASTERDIR}/files/Makefile.pcl3" .endif # vgalib specific @@ -64,35 +64,35 @@ CONFLICTS_INSTALL+= ghostscript7-[0-9]* ${PORT_OPTIONS:MGS_cdj880} || \ ${PORT_OPTIONS:MGS_cdj890} || \ ${PORT_OPTIONS:MGS_cdj1600} -.include "files/Makefile.cdj880" +.include "${MASTERDIR}/files/Makefile.cdj880" .endif .if ${PORT_OPTIONS:MGS_cdj970} -.include "files/Makefile.cdj970" +.include "${MASTERDIR}/files/Makefile.cdj970" .endif -.include "files/Makefile.gprint" +.include "${MASTERDIR}/files/Makefile.gprint" .if ${PORT_OPTIONS:MGS_md2k} || \ ${PORT_OPTIONS:MGS_md5k} -.include "files/Makefile.md2k" +.include "${MASTERDIR}/files/Makefile.md2k" .endif .if ${PORT_OPTIONS:MGS_md50Mono} || \ ${PORT_OPTIONS:MGS_md50Eco} || \ ${PORT_OPTIONS:MGS_md1xMono} -.include "files/Makefile.alps" +.include "${MASTERDIR}/files/Makefile.alps" .endif .if ${PORT_OPTIONS:MGS_bj10v} || \ ${PORT_OPTIONS:Mbj10vh} -.include "files/Makefile.bj10v" +.include "${MASTERDIR}/files/Makefile.bj10v" .endif .if ${PORT_OPTIONS:MGS_bjccmyk} || \ ${PORT_OPTIONS:MGS_bjccolor} || \ ${PORT_OPTIONS:MGS_bjcgray} || \ ${PORT_OPTIONS:MGS_bjcmono} -.include "files/Makefile.bjc250" +.include "${MASTERDIR}/files/Makefile.bjc250" .endif .if ${PORT_OPTIONS:MGS_lbp1310} || \ @@ -101,7 +101,7 @@ CONFLICTS_INSTALL+= ghostscript7-[0-9]* ${PORT_OPTIONS:MGS_lbp1710} || \ ${PORT_OPTIONS:MGS_lbp1810} || \ ${PORT_OPTIONS:MGS_lbp1910} -.include "files/Makefile.cpca" +.include "${MASTERDIR}/files/Makefile.cpca" .endif .if ${PORT_OPTIONS:MGS_lips2p} || \ @@ -113,7 +113,7 @@ CONFLICTS_INSTALL+= ghostscript7-[0-9]* ${PORT_OPTIONS:MGS_lp2000} || \ ${PORT_OPTIONS:MGS_npdl} || \ ${PORT_OPTIONS:MGS_rpdl} -.include "files/Makefile.lips" +.include "${MASTERDIR}/files/Makefile.lips" .endif .if ${PORT_OPTIONS:MGS_alc8600} || \ @@ -160,33 +160,33 @@ CONFLICTS_INSTALL+= ghostscript7-[0-9]* ${PORT_OPTIONS:MGS_lp9600} || \ ${PORT_OPTIONS:MGS_lp8600} || \ ${PORT_OPTIONS:MGS_lp1800} -.include "files/Makefile.eplaser" +.include "${MASTERDIR}/files/Makefile.eplaser" .endif .if ${PORT_OPTIONS:MGS_mjc180} || \ ${PORT_OPTIONS:MGS_mjc360} || \ ${PORT_OPTIONS:MGS_mjc720} || \ ${PORT_OPTIONS:MGS_mj500c} -.include "files/Makefile.mjc" +.include "${MASTERDIR}/files/Makefile.mjc" .endif .if ${PORT_OPTIONS:MGS_gdi} -.include "files/Makefile.gdi" +.include "${MASTERDIR}/files/Makefile.gdi" .endif .if ${PORT_OPTIONS:MGS_lxm3200} -.include "files/Makefile.lxm3200" +.include "${MASTERDIR}/files/Makefile.lxm3200" .endif .if ${PORT_OPTIONS:MGS_lx5000} -.include "files/Makefile.lx5000" +.include "${MASTERDIR}/files/Makefile.lx5000" .endif .if ${PORT_OPTIONS:MGS_lex2050} || \ ${PORT_OPTIONS:MGS_lex3200} || \ ${PORT_OPTIONS:MGS_lex5700} || \ ${PORT_OPTIONS:MGS_lex7000} -.include "files/Makefile.lex7000" +.include "${MASTERDIR}/files/Makefile.lex7000" .endif # pre-defined order Modified: head/print/ghostscript8/Makefile ============================================================================== --- head/print/ghostscript8/Makefile Thu Jul 25 09:03:33 2013 (r323629) +++ head/print/ghostscript8/Makefile Thu Jul 25 09:25:16 2013 (r323630) @@ -94,7 +94,9 @@ EXCLUDE_DIRS= jbig2dec jpeg expat jasper .include "Makefile.drivers" .include -.include "files/Makefile.drivers_post" + +MASTERDIR?= ${.CURDIR} +.include "${MASTERDIR}/files/Makefile.drivers_post" .for D in ${OPTIONS_DEFINE:MGS_*:S/^GS_//} \ ${OPTIONS_MULTI_X11:MGS_*:S/^GS_//} \ Modified: head/print/ghostscript8/files/Makefile.drivers_post ============================================================================== --- head/print/ghostscript8/files/Makefile.drivers_post Thu Jul 25 09:03:33 2013 (r323629) +++ head/print/ghostscript8/files/Makefile.drivers_post Thu Jul 25 09:25:16 2013 (r323630) @@ -3,12 +3,12 @@ # dmprt specific .if ${PORT_OPTIONS:MGS_dmprt} -.include "files/Makefile.dmprt" +.include "${MASTERDIR}/files/Makefile.dmprt" .endif # epag specific .if ${PORT_OPTIONS:MGS_epag} -.include "files/Makefile.epag" +.include "${MASTERDIR}/files/Makefile.epag" .endif EPAG_BASE= epag @@ -24,7 +24,7 @@ post-extract: post-extract-epag # pcl3 specific .if ${PORT_OPTIONS:MGS_pcl3} -.include "files/Makefile.pcl3" +.include "${MASTERDIR}/files/Makefile.pcl3" .endif # cups specific Modified: head/print/ghostscript9-agpl/Makefile ============================================================================== --- head/print/ghostscript9-agpl/Makefile Thu Jul 25 09:03:33 2013 (r323629) +++ head/print/ghostscript9-agpl/Makefile Thu Jul 25 09:25:16 2013 (r323630) @@ -96,7 +96,9 @@ EXCLUDE_DIRS= freetype jbig2dec jpeg exp .include "Makefile.drivers" .include -.include "files/Makefile.drivers_post" + +MASTERDIR?= ${.CURDIR} +.include "${MASTERDIR}/files/Makefile.drivers_post" .for D in ${OPTIONS_DEFINE:MGS_*:S/^GS_//} \ ${OPTIONS_MULTI_X11:MGS_*:S/^GS_//} \ Modified: head/print/ghostscript9-agpl/files/Makefile.drivers_post ============================================================================== --- head/print/ghostscript9-agpl/files/Makefile.drivers_post Thu Jul 25 09:03:33 2013 (r323629) +++ head/print/ghostscript9-agpl/files/Makefile.drivers_post Thu Jul 25 09:25:16 2013 (r323630) @@ -3,12 +3,12 @@ # dmprt specific .if ${PORT_OPTIONS:MGS_dmprt} -.include "files/Makefile.dmprt" +.include "${MASTERDIR}/files/Makefile.dmprt" .endif # epag specific .if ${PORT_OPTIONS:MGS_epag} -.include "files/Makefile.epag" +.include "${MASTERDIR}/files/Makefile.epag" .endif EPAG_BASE= epag @@ -24,7 +24,7 @@ post-extract: post-extract-epag # pcl3 specific .if ${PORT_OPTIONS:MGS_pcl3} -.include "files/Makefile.pcl3" +.include "${MASTERDIR}/files/Makefile.pcl3" .endif # cups specific Modified: head/print/ghostscript9/Makefile ============================================================================== --- head/print/ghostscript9/Makefile Thu Jul 25 09:03:33 2013 (r323629) +++ head/print/ghostscript9/Makefile Thu Jul 25 09:25:16 2013 (r323630) @@ -98,7 +98,9 @@ EXCLUDE_DIRS= freetype jbig2dec jpeg exp .include "Makefile.drivers" .include -.include "files/Makefile.drivers_post" + +MASTERDIR?= ${.CURDIR} +.include "${MASTERDIR}/files/Makefile.drivers_post" .for D in ${OPTIONS_DEFINE:MGS_*:S/^GS_//} \ ${OPTIONS_MULTI_X11:MGS_*:S/^GS_//} \ Modified: head/print/ghostscript9/files/Makefile.drivers_post ============================================================================== --- head/print/ghostscript9/files/Makefile.drivers_post Thu Jul 25 09:03:33 2013 (r323629) +++ head/print/ghostscript9/files/Makefile.drivers_post Thu Jul 25 09:25:16 2013 (r323630) @@ -3,12 +3,12 @@ # dmprt specific .if ${PORT_OPTIONS:MGS_dmprt} -.include "files/Makefile.dmprt" +.include "${MASTERDIR}/files/Makefile.dmprt" .endif # epag specific .if ${PORT_OPTIONS:MGS_epag} -.include "files/Makefile.epag" +.include "${MASTERDIR}/files/Makefile.epag" .endif EPAG_BASE= epag @@ -24,7 +24,7 @@ post-extract: post-extract-epag # pcl3 specific .if ${PORT_OPTIONS:MGS_pcl3} -.include "files/Makefile.pcl3" +.include "${MASTERDIR}/files/Makefile.pcl3" .endif # cups specific