diff options
| author | asami <asami@FreeBSD.org> | 2000-01-17 12:40:00 +0000 |
|---|---|---|
| committer | asami <asami@FreeBSD.org> | 2000-01-17 12:40:00 +0000 |
| commit | 75c64e99ffd36918dd8231d3452759ad3770a9ed (patch) | |
| tree | 7e0de0c1a08b171fa2b0110375e67ad8625628f8 /www | |
| parent | 48e2dab45cf2b8c920be21bbabfddf4bf0a33ebc (diff) | |
| download | FreeBSD-ports-75c64e99ffd36918dd8231d3452759ad3770a9ed.zip FreeBSD-ports-75c64e99ffd36918dd8231d3452759ad3770a9ed.tar.gz | |
Do not include bsd.port.pre.mk twice (once in the slave and once in the
master). This is done by defining a variable "PRE_MK_INCLUDED" in the slave
before including ${MASTERDIR}/Makefile, and have the master check it before
including any necessary macro files.
Diffstat (limited to 'www')
| -rw-r--r-- | www/bsdi-netscape47-communicator/Makefile | 3 | ||||
| -rw-r--r-- | www/bsdi-netscape47-navigator/Makefile | 1 | ||||
| -rw-r--r-- | www/netscape4-communicator/Makefile | 5 | ||||
| -rw-r--r-- | www/netscape47-communicator/Makefile | 3 | ||||
| -rw-r--r-- | www/netscape47-navigator/Makefile | 1 | ||||
| -rw-r--r-- | www/netscape48-communicator/Makefile | 5 |
6 files changed, 18 insertions, 0 deletions
diff --git a/www/bsdi-netscape47-communicator/Makefile b/www/bsdi-netscape47-communicator/Makefile index a429018..ecbadab 100644 --- a/www/bsdi-netscape47-communicator/Makefile +++ b/www/bsdi-netscape47-communicator/Makefile @@ -6,7 +6,9 @@ # $FreeBSD$ # +.if !defined(PRE_MK_INCLUDED) .include <bsd.port.pre.mk> +.endif .if ${ARCH} == "i386" MASTER_SITES?= ftp://ftp.netscape.com./pub/communicator/english/4.7/unix/unsupported/freebsd/complete_install/ @@ -30,4 +32,5 @@ BROWSER_VER= 4.7 INFILE_HEAD?= 'Communicator,4.7.0.19990915' NO_AUTOADMIN= yes +PRE_MK_INCLUDED= yes .include "${MASTERDIR}/Makefile" diff --git a/www/bsdi-netscape47-navigator/Makefile b/www/bsdi-netscape47-navigator/Makefile index 82cdb76..2a82cc4 100644 --- a/www/bsdi-netscape47-navigator/Makefile +++ b/www/bsdi-netscape47-navigator/Makefile @@ -21,4 +21,5 @@ ONLY_FOR_ARCHS= i386 alpha BROWSER= navigator INFILE_HEAD= 'Navigator,4.7.0.19990915' +PRE_MK_INCLUDED= yes .include "${.CURDIR}/../netscape47-communicator/Makefile" diff --git a/www/netscape4-communicator/Makefile b/www/netscape4-communicator/Makefile index 94c04a5..415d2ab 100644 --- a/www/netscape4-communicator/Makefile +++ b/www/netscape4-communicator/Makefile @@ -96,4 +96,9 @@ do-install: post-install: ${CAT} ${PKGDIR}/DESCR +# hack to allow slave ports to include bsd.port.pre.mk and then this file +.if defined(PRE_MK_INCLUDED) +.include <bsd.port.post.mk> +.else .include <bsd.port.mk> +.endif diff --git a/www/netscape47-communicator/Makefile b/www/netscape47-communicator/Makefile index a429018..ecbadab 100644 --- a/www/netscape47-communicator/Makefile +++ b/www/netscape47-communicator/Makefile @@ -6,7 +6,9 @@ # $FreeBSD$ # +.if !defined(PRE_MK_INCLUDED) .include <bsd.port.pre.mk> +.endif .if ${ARCH} == "i386" MASTER_SITES?= ftp://ftp.netscape.com./pub/communicator/english/4.7/unix/unsupported/freebsd/complete_install/ @@ -30,4 +32,5 @@ BROWSER_VER= 4.7 INFILE_HEAD?= 'Communicator,4.7.0.19990915' NO_AUTOADMIN= yes +PRE_MK_INCLUDED= yes .include "${MASTERDIR}/Makefile" diff --git a/www/netscape47-navigator/Makefile b/www/netscape47-navigator/Makefile index 82cdb76..2a82cc4 100644 --- a/www/netscape47-navigator/Makefile +++ b/www/netscape47-navigator/Makefile @@ -21,4 +21,5 @@ ONLY_FOR_ARCHS= i386 alpha BROWSER= navigator INFILE_HEAD= 'Navigator,4.7.0.19990915' +PRE_MK_INCLUDED= yes .include "${.CURDIR}/../netscape47-communicator/Makefile" diff --git a/www/netscape48-communicator/Makefile b/www/netscape48-communicator/Makefile index 94c04a5..415d2ab 100644 --- a/www/netscape48-communicator/Makefile +++ b/www/netscape48-communicator/Makefile @@ -96,4 +96,9 @@ do-install: post-install: ${CAT} ${PKGDIR}/DESCR +# hack to allow slave ports to include bsd.port.pre.mk and then this file +.if defined(PRE_MK_INCLUDED) +.include <bsd.port.post.mk> +.else .include <bsd.port.mk> +.endif |
