(1) Pick up version file from /var/db if it exists there. I will

    commit a change to actually move the file in a couple of days.
    (Right now this file looks at both /var/db and /var/db/pkg.)
Requested by:	jkh

(2) Skip version test for 2.2.x, I don't intend to rebuild update kits
    anymore.

(3) sunsite.unc.edu -> metalab.unc.edu
Submitted by:	steve

(4) New variable ALWAYS_BUILD_DEPENDS, it will make your build go and
    rebuild all dependencies (except XFree86) regardless of
    executable/file/shlib test results.  It could be useful if you
    suspect that some of the dependencies are out of date but won't be
    flagged by the normal checks.
Reviewed by:	the ports list

1 files changed, 38 insertions, 5 deletions

diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index ec37bc6f85b..c57d1b58e9a 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.307 1999/03/09 11:27:34 asami Exp $
+#	$Id: bsd.port.mk,v 1.308 1999/03/29 07:07:59 asami Exp $
 #	$NetBSD: $
 #
 #	bsd.port.mk - 940820 Jordan K. Hubbard.
@@ -608,7 +608,9 @@ RUN_DEPENDS+=	perl${PERL_VERSION}:${PORTSDIR}/lang/perl5
 .endif
 .endif
 
-.if defined(USE_XLIB)
+# Don't try to build XFree86 even if ALWAYS_BUILD_DEPENDS is defined --
+# it's just too big....
+.if defined(USE_XLIB) && !defined(ALWAYS_BUILD_DEPENDS)
 LIB_DEPENDS+=	X11.6:${PORTSDIR}/x11/XFree86
 .endif
 
@@ -842,7 +844,7 @@ MASTER_SITE_TEX_CTAN+=  \
 	ftp://ftp.dante.de/tex-archive/%SUBDIR%/
 
 MASTER_SITE_SUNSITE+=	\
-	ftp://sunsite.unc.edu/pub/Linux/%SUBDIR%/ \
+	ftp://metalab.unc.edu/pub/Linux/%SUBDIR%/ \
 	ftp://ftp.infomagic.com/pub/mirrors/linux/sunsite/%SUBDIR%/ \
 	ftp://ftp.funet.fi/pub/mirrors/sunsite.unc.edu/pub/Linux/%SUBDIR%/
 
@@ -1162,9 +1164,14 @@ IGNORE=	": You have an old file \(${file}\) that could cause problems for some p
 .endfor
 .endif
 
+.if ${OSVERSION} >= 300000
 # You need an upgrade kit or make world newer than this
 BSDPORTMKVERSION=	19990327
+.if exists(/var/db/port.mkversion)
+VERSIONFILE=	/var/db/port.mkversion
+.else
 VERSIONFILE=	${PKG_DBDIR}/.mkversion
+.endif
 .if exists(${VERSIONFILE})
 SYSTEMVERSION!=	cat ${VERSIONFILE}
 .else
@@ -1173,6 +1180,7 @@ SYSTEMVERSION=	0
 .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
+.endif
 
 .if defined(ONLY_FOR_ARCHS)
 .for __ARCH in ${ONLY_FOR_ARCHS}
@@ -1988,6 +1996,12 @@ DEPENDS_TMP+=	${BUILD_DEPENDS}
 DEPENDS_TMP+=	${RUN_DEPENDS}
 .endif
 
+.if defined(ALWAYS_BUILD_DEPENDS)
+_DEPEND_ALWAYS=	1
+.else
+_DEPEND_ALWAYS=	0
+.endif
+
 _DEPENDS_USE:	.USE
 .if defined(DEPENDS_TMP)
 .if !defined(NO_DEPENDS)
@@ -2003,7 +2017,12 @@ _DEPENDS_USE:	.USE
 		if ${EXPR} "$$prog" : \\/ >/dev/null; then \
 			if [ -e "$$prog" ]; then \
 				${ECHO_MSG} "===>   ${PKGNAME} depends on file: $$prog - found"; \
-				notfound=0; \
+				if [ ${_DEPEND_ALWAYS} = 1 ]; then \
+					${ECHO_MSG} "       (but building it anyway)"; \
+					notfound=1; \
+				else \
+					notfound=0; \
+				fi; \
 			else \
 				${ECHO_MSG} "===>   ${PKGNAME} depends on file: $$prog - not found"; \
 				notfound=1; \
@@ -2011,7 +2030,12 @@ _DEPENDS_USE:	.USE
 		else \
 			if which "$$prog" > /dev/null 2>&1 ; then \
 				${ECHO_MSG} "===>   ${PKGNAME} depends on executable: $$prog - found"; \
-				notfound=0; \
+				if [ ${_DEPEND_ALWAYS} = 1 ]; then \
+					${ECHO_MSG} "       (but building it anyway)"; \
+					notfound=1; \
+				else \
+					notfound=0; \
+				fi; \
 			else \
 				${ECHO_MSG} "===>   ${PKGNAME} depends on executable: $$prog - not found"; \
 				notfound=1; \
@@ -2050,8 +2074,17 @@ lib-depends:
 		fi; \
 		if ${LDCONFIG} -r | ${GREP} -qwF -e "-l$$lib"; then \
 			${ECHO_MSG} "===>   ${PKGNAME} depends on shared library: $$lib - found"; \
+			if [ ${_DEPEND_ALWAYS} = 1 ]; then \
+				${ECHO_MSG} "       (but building it anyway)"; \
+				notfound=1; \
+			else \
+				notfound=0; \
+			fi; \
 		else \
 			${ECHO_MSG} "===>   ${PKGNAME} depends on shared library: $$lib - not found"; \
+			notfound=1; \
+		fi; \
+		if [ $$notfound != 0 ]; then \
 			${ECHO_MSG} "===>    Verifying $$target for $$lib in $$dir"; \
 			if [ ! -d "$$dir" ]; then \
 				${ECHO_MSG} "     >> No directory for $$lib.  Skipping.."; \