diff options
author | hrs <hrs@FreeBSD.org> | 2013-07-25 17:25:16 +0800 |
---|---|---|
committer | hrs <hrs@FreeBSD.org> | 2013-07-25 17:25:16 +0800 |
commit | e46b62b937dd9a4300c2982756f846ed7084e4e9 (patch) | |
tree | 886b186feb69d2b11179001661835abf3f7fe432 /print | |
parent | 9e88f8de7382e30b4ba40ffc369a77a3c5e59d83 (diff) | |
download | freebsd-ports-gnome-e46b62b937dd9a4300c2982756f846ed7084e4e9.tar.gz freebsd-ports-gnome-e46b62b937dd9a4300c2982756f846ed7084e4e9.tar.zst freebsd-ports-gnome-e46b62b937dd9a4300c2982756f846ed7084e4e9.zip |
Set ${MASTERDIR} to ${.CURDIR} and use it for .include "files/foo".
Changes in r323629 broke ghostscript*-nox11.
Pointed out by: bapt
Diffstat (limited to 'print')
-rw-r--r-- | print/ghostscript7/Makefile | 3 | ||||
-rw-r--r-- | print/ghostscript7/files/Makefile.drivers_post | 36 | ||||
-rw-r--r-- | print/ghostscript8/Makefile | 4 | ||||
-rw-r--r-- | print/ghostscript8/files/Makefile.drivers_post | 6 | ||||
-rw-r--r-- | print/ghostscript9-agpl/Makefile | 4 | ||||
-rw-r--r-- | print/ghostscript9-agpl/files/Makefile.drivers_post | 6 | ||||
-rw-r--r-- | print/ghostscript9/Makefile | 4 | ||||
-rw-r--r-- | print/ghostscript9/files/Makefile.drivers_post | 6 |
8 files changed, 38 insertions, 31 deletions
diff --git a/print/ghostscript7/Makefile b/print/ghostscript7/Makefile index aa02b04407ef..a260e4a5871d 100644 --- a/print/ghostscript7/Makefile +++ b/print/ghostscript7/Makefile @@ -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_//} \ diff --git a/print/ghostscript7/files/Makefile.drivers_post b/print/ghostscript7/files/Makefile.drivers_post index 00254eba0e2c..24147c9d9419 100644 --- a/print/ghostscript7/files/Makefile.drivers_post +++ b/print/ghostscript7/files/Makefile.drivers_post @@ -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 diff --git a/print/ghostscript8/Makefile b/print/ghostscript8/Makefile index f5e23505bccb..2eb675f8f5b4 100644 --- a/print/ghostscript8/Makefile +++ b/print/ghostscript8/Makefile @@ -94,7 +94,9 @@ EXCLUDE_DIRS= jbig2dec jpeg expat jasper libpng tiff zlib .include "Makefile.drivers" .include <bsd.port.options.mk> -.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_//} \ diff --git a/print/ghostscript8/files/Makefile.drivers_post b/print/ghostscript8/files/Makefile.drivers_post index b4a62b0b155f..b1290667cc4c 100644 --- a/print/ghostscript8/files/Makefile.drivers_post +++ b/print/ghostscript8/files/Makefile.drivers_post @@ -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 diff --git a/print/ghostscript9-agpl/Makefile b/print/ghostscript9-agpl/Makefile index 3625a4eb6f6b..1850c953bf14 100644 --- a/print/ghostscript9-agpl/Makefile +++ b/print/ghostscript9-agpl/Makefile @@ -96,7 +96,9 @@ EXCLUDE_DIRS= freetype jbig2dec jpeg expat jasper lcms libpng tiff zlib .include "Makefile.drivers" .include <bsd.port.options.mk> -.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_//} \ diff --git a/print/ghostscript9-agpl/files/Makefile.drivers_post b/print/ghostscript9-agpl/files/Makefile.drivers_post index 30acb96978b8..0c80c084a449 100644 --- a/print/ghostscript9-agpl/files/Makefile.drivers_post +++ b/print/ghostscript9-agpl/files/Makefile.drivers_post @@ -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 diff --git a/print/ghostscript9/Makefile b/print/ghostscript9/Makefile index 63dbd254f41a..2c79297fb5c3 100644 --- a/print/ghostscript9/Makefile +++ b/print/ghostscript9/Makefile @@ -98,7 +98,9 @@ EXCLUDE_DIRS= freetype jbig2dec jpeg expat jasper lcms lcms2 libpng tiff zlib .include "Makefile.drivers" .include <bsd.port.options.mk> -.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_//} \ diff --git a/print/ghostscript9/files/Makefile.drivers_post b/print/ghostscript9/files/Makefile.drivers_post index e342f9d8ef60..76e71f71df0e 100644 --- a/print/ghostscript9/files/Makefile.drivers_post +++ b/print/ghostscript9/files/Makefile.drivers_post @@ -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 |