diff options
| author | Satoshi Asami <asami@FreeBSD.org> | 2000-01-17 12:40:00 +0000 |
|---|---|---|
| committer | Satoshi Asami <asami@FreeBSD.org> | 2000-01-17 12:40:00 +0000 |
| commit | 23c0de20b065b4680065b8801fa4dbad19abd9ca (patch) | |
| tree | 980e667588739e64d32ee796e35e3a4caea2000c /www | |
| parent | Upgrade to the 2000-01-10 GCC 2.96 development snapshot. (diff) | |
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.
Notes
Notes:
svn path=/head/; revision=24794
Diffstat (limited to '')
| -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 a42901864cb5..ecbadab9ba4f 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 82cdb7640a67..2a82cc487df5 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 94c04a5be102..415d2ab4602f 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 a42901864cb5..ecbadab9ba4f 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 82cdb7640a67..2a82cc487df5 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 94c04a5be102..415d2ab4602f 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 |