(1) Move _sedsubplist generation later, just before it is used. The

    old location caused some variables (most notably CONFIGURE_TARGET)
    to be undefined.
PR:	10724

(2) Fix comment about CONFIGURE_TARGET.
Submitted by:	OKAZAKI Tetsurou <okazaki@be.to>

(3) Add comment to FETCH_CMD test indicating that it *is* intentional
    that all 3.x versions use "fetch -A" -- people using the upgrade
    kit won't have their ${OSVERSION} updated.

(4) Add MASTER_SITE_TCLTK which is, well, Tcl/Tk master sites.
Submitted by:	Bill "the typo picker" Fumerola <billf@jade.chc-chimes.com>

(5) Add new variable FORBIDDEN indicating that the port shouldn't be
    built -- this is different from BROKEN, which now means we think
    it's broken but the user should be more than happy if it actually
    works.

(6) Add support for system/upgrade kit version check.  The file
    /var/db/pkg/.mkversion is compared to the BSDPORTMKVERSION
    variable (basically the date a bsd.port.mk with an incompatible
    change is committed).  If the system is too old, bsd.port.mk will
    urge the user to install an upgrade kit.
Submitted by:	billf (some parts)
Reviewed by:	the ports list

(7) Remove "ac_cv_path_CC=${CC}" from configure's envirenment, it's
    supposed to find this stuff by itself (and if it doesn't then it's
    an individual port's responsibility to add it).
Reported by:	Archie Cobbs <archie@whistle.com>

BSDPORTMKVERSION is bumped (actually initialized) to 19990327, by the way.

1 files changed, 42 insertions, 11 deletions

diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 6c6f9db8068b..ec37bc6f85b8 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1,7 +1,7 @@
 #-*- mode: Fundamental; tab-width: 4; -*-
 # ex:ts=4
 #
-#	$Id: bsd.port.mk,v 1.306 1999/03/08 07:23:10 asami Exp $
+#	$Id: bsd.port.mk,v 1.307 1999/03/09 11:27:34 asami Exp $
 #	$NetBSD: $
 #
 #	bsd.port.mk - 940820 Jordan K. Hubbard.
@@ -332,7 +332,7 @@ OpenBSD_MAINTAINER=	imp@OpenBSD.ORG
 #				  HAS_CONFIGURE.
 # CONFIGURE_SCRIPT - Name of configure script (defaults: configure).
 # CONFIGURE_TARGET - The name of target to call when GNU_CONFIGURE is
-#				  defined (default: ${MACHINE_ARCH}--freebsd).
+#				  defined (default: ${MACHINE_ARCH}--freebsd${OSREL}).
 # CONFIGURE_ARGS - Pass these args to configure if ${HAS_CONFIGURE} is set
 #				  (default: "--prefix=${PREFIX} ${CONFIGURE_TARGET}" if
 #				  GNU_CONFIGURE is set, empty otherwise).
@@ -653,6 +653,7 @@ MAKEFILE?=		Makefile
 MAKE_ENV+=		PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} MOTIFLIB="${MOTIFLIB}" CFLAGS="${CFLAGS}" LIBDIR="${LIBDIR}"
 
 .if exists(/usr/bin/fetch)
+# avoid -A for 2.2 -- it's not ported to that branch
 .if ${OSVERSION} < 300000
 FETCH_CMD?=		/usr/bin/fetch
 .else
@@ -810,12 +811,6 @@ TRUE?=		/usr/bin/true
 # Used to print all the '===>' style prompts - override this to turn them off.
 ECHO_MSG?=		${ECHO}
 
-.for sub in ${PLIST_SUB}
-_sedsubplist!=	sym=`${ECHO} "${sub}" | ${SED} -e 's/=.*//'`; \
-		val=`${ECHO} "${sub}" | ${SED} -e 's/^[^=][^=]*=//'`; \
-		echo "${_sedsubplist} -e s!%%$${sym}%%!$${val}!g"
-.endfor
-
 ALL_TARGET?=		all
 INSTALL_TARGET?=	install
 
@@ -895,6 +890,15 @@ MASTER_SITE_PORTS_JP+=	\
 	ftp://ftp.ics.es.osaka-u.ac.jp/pub/mirrors/FreeBSD-jp/ports-jp/LOCAL_PORTS/%SUBDIR%/ \
 	ftp://ftp.t-cnet.or.jp/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/%SUBDIR%/
 
+MASTER_SITE_TCLTK+= \
+	ftp://ftp.scriptics.com/pub/tcl/%SUBDIR%/ \
+	ftp://mirror.neosoft.com/pub/tcl/mirror/ftp.scriptics.com/%SUBDIR%/ \
+	ftp://sunsite.utk.edu/pub/tcl/%SUBDIR%/ \
+	ftp://ftp.funet.fi/pub/languages/tcl/tcl/%SUBDIR%/ \
+	ftp://ftp.cs.tu-berlin.de/pub/tcl/distrib/%SUBDIR%/ \
+	ftp://ftp.srcc.msu.su/mirror/ftp.scriptics.com/pub/tcl/%SUBDIR%/ \
+	ftp://ftp.lip6.fr/pub/tcl/distrib/%SUBDIR%/
+
 # Empty declaration to avoid "variable MASTER_SITES recursive" error
 MASTER_SITES?=
 PATCH_SITES?=
@@ -1133,7 +1137,12 @@ _MANPAGES:=	${_MANPAGES:S/$/.gz/}
 #
 # Don't build a port on an ELF machine if it's broken for ELF.
 #
-# Don't build a port if it's broken.
+# Don't build a port if it's broken, unless we're running a parallel
+# build (in case it's fixed).
+#
+# Don't build a port if it's forbidden for whatever reason.
+#
+# Don't build a port if the system is too old.
 ################################################################
 
 OLDSYSTCL!=	${ECHO} /usr/include/tcl.h /usr/lib/libtcl??.so.*.*
@@ -1153,6 +1162,18 @@ IGNORE=	": You have an old file \(${file}\) that could cause problems for some p
 .endfor
 .endif
 
+# You need an upgrade kit or make world newer than this
+BSDPORTMKVERSION=	19990327
+VERSIONFILE=	${PKG_DBDIR}/.mkversion
+.if exists(${VERSIONFILE})
+SYSTEMVERSION!=	cat ${VERSIONFILE}
+.else
+SYSTEMVERSION=	0
+.endif
+.if ${BSDPORTMKVERSION} > ${SYSTEMVERSION}
+IGNORE=	": Your system is too old to use this bsd.port.mk.  You need a fresh make world or an upgrade kit.  Please go to http://www.freebsd.org/ports/ or a mirror site and follow the instructions"
+.endif
+
 .if defined(ONLY_FOR_ARCHS)
 .for __ARCH in ${ONLY_FOR_ARCHS}
 .if ${MACHINE_ARCH:M${__ARCH}} != ""
@@ -1201,10 +1222,14 @@ IGNORE=	"defines NO_EXTRACT, which is obsoleted.  Try changing it to EXTRACT_ONL
 IGNORE=	"defines NO_CONFIGURE, which is obsoleted"
 .elif defined(NO_PATCH)
 IGNORE=	"defines NO_PATCH, which is obsoleted"
-.elif (defined(BROKEN_ELF) && (${PORTOBJFORMAT} == "elf"))
+.elif defined(BROKEN_ELF) && (${PORTOBJFORMAT} == "elf") && \
+	  !defined(PARALLEL_PACKAGE_BUILD)
 IGNORE=	"is broken for ELF: ${BROKEN_ELF}"
 .elif defined(BROKEN) && !defined(PARALLEL_PACKAGE_BUILD)
+# try building even if marked BROKEN
 IGNORE=	"is marked as broken: ${BROKEN}"
+.elif defined(FORBIDDEN)
+IGNORE=	"is forbidden: ${FORBIDDEN}"
 .endif
 
 .if (defined(MANUAL_PACKAGE_BUILD) && defined(PACKAGE_BUILDING) && !defined(PARALLEL_PACKAGE_BUILD))
@@ -1467,7 +1492,7 @@ do-configure:
 		  ${SCRIPTDIR}/configure; \
 	fi
 .if defined(HAS_CONFIGURE)
-	@(cd ${WRKSRC} && CC="${CC}" CXX="${CXX}" ac_cv_path_CC="${CC}" \
+	@(cd ${WRKSRC} && CC="${CC}" CXX="${CXX}" \
 	    CFLAGS="${CFLAGS}" \
 	    INSTALL="/usr/bin/install -c -o ${BINOWN} -g ${BINGRP}" \
 	    INSTALL_DATA="${INSTALL_DATA}" \
@@ -2205,6 +2230,12 @@ pretty-print-run-depends-list:
 # Generate packing list.  Also tests to make sure all required package
 # files exist.
 
+.for sub in ${PLIST_SUB}
+_sedsubplist!=	sym=`${ECHO} "${sub}" | ${SED} -e 's/=.*//'`; \
+		val=`${ECHO} "${sub}" | ${SED} -e 's/^[^=][^=]*=//'`; \
+		echo "${_sedsubplist} -e s!%%$${sym}%%!$${val}!g"
+.endfor
+
 .if !target(generate-plist)
 generate-plist:
 	@${ECHO_MSG} "===>   Generating temporary packing list"