merge from HEAD

8 files changed, 54 insertions, 40 deletions

diff --git a/mk/bulk/bsd.bulk-pkg.mk b/mk/bulk/bsd.bulk-pkg.mk
index 70f9bb90e7b..4eb29358f2c 100644
--- a/mk/bulk/bsd.bulk-pkg.mk
+++ b/mk/bulk/bsd.bulk-pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.bulk-pkg.mk,v 1.65 2004/11/16 18:34:12 jlam Exp $
+#	$NetBSD: bsd.bulk-pkg.mk,v 1.65.2.1 2004/11/23 20:54:12 tv Exp $
 
 #
 # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@NetBSD.org>
@@ -150,7 +150,7 @@ bulk-cache:
 .else
 	@${ECHO_MSG} "BULK> Extracting database for SPECIFIC_PKGS subset of pkgsrc"
 	@${ECHO_MSG} "      along with their dependencies"
-.for __tmp__ in ${SUBDIR} ${BULK_PREREQ} lang/perl58 pkgtools/pkglint
+.for __tmp__ in ${SUBDIR} ${BULK_PREREQ} ${PERL5_PKGSRCDIR:C|.*/([^/]*/[^/]*)$|\1|} pkgtools/pkglint
 	cd ${PKGSRCDIR}/${__tmp__} && ../../mk/scripts/mkdatabase -a -f ${BULK_DBFILE}
 .endfor
 	@${ECHO_MSG} "BULK> Extracting dependency tree file"
diff --git a/mk/bulk/build b/mk/bulk/build
index 1f8868c174b..d0fac1b43a8 100644
--- a/mk/bulk/build
+++ b/mk/bulk/build
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: build,v 1.45 2004/11/16 18:34:12 jlam Exp $
+# $NetBSD: build,v 1.45.2.1 2004/11/23 20:54:12 tv Exp $
 
 #
 # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@NetBSD.org>
@@ -189,6 +189,7 @@ fi
 fail=no
 if [ -d pkgtools/pkglint ]; then
 	cd pkgtools/pkglint
+	PERL5_PKGSRCDIR=`${BMAKE} show-var VARNAME=PERL5_PKGSRCDIR` || fail=yes
 	BULK_DBFILE=`${BMAKE} show-var VARNAME=BULK_DBFILE` || fail=yes
 	DEPENDSTREEFILE=`${BMAKE} show-var VARNAME=DEPENDSTREEFILE` || fail=yes
 	DEPENDSFILE=`${BMAKE} show-var VARNAME=DEPENDSFILE` || fail=yes
@@ -230,6 +231,7 @@ echo "----------------------------------"
 # make sure we have values for these very important
 # variables
 if [ $fail = "yes" -o \
+	-z "$PERL5_PKGSRCDIR" -o \
 	-z "$BULK_DBFILE" -o \
 	-z "$DEPENDSTREEFILE" -o \
 	-z "$DEPENDSFILE" -o \
@@ -355,7 +357,7 @@ echo "Post processing bulk build results..."
 #rm $DEPENDSTREEFILE $DEPENDSFILE $SUPPORTSFILE $INDEXFILE $ORDERFILE
 
 # Perl was wiped, reinstall it!
-( cd lang/perl58 && ${BMAKE} bulk-install )
+( cd pkgtools/pkglint && cd ${PERL5_PKGSRCDIR} && ${BMAKE} bulk-install )
 perl mk/bulk/post-build | ${MAIL_CMD} -s "pkgsrc ${OPSYS} ${OS_VERSION}/${MACHINE_ARCH} bulk build results `date +%Y-%m-%d`" $ADMIN
 
 # Done!
diff --git a/mk/bulk/post-build b/mk/bulk/post-build
index 9098c965b38..f825f167ad8 100644
--- a/mk/bulk/post-build
+++ b/mk/bulk/post-build
@@ -1,5 +1,5 @@
 #!/usr/pkg/bin/perl
-# $NetBSD: post-build,v 1.47 2004/11/22 12:53:56 wiz Exp $
+# $NetBSD: post-build,v 1.47.2.1 2004/11/23 20:54:12 tv Exp $
 #
 # Collect stuff after a pkg bulk build
 #
@@ -93,7 +93,7 @@ system("mkdir -p ${FTP}");
 
 # Copy over the output from the build process
 chdir($USR_PKGSRC);
-system("find . -name $BROKENFILE -o -name $BROKENWRKLOG -print | $GTAR -T - -plcf - | (cd $FTP; $GTAR -plxf -)");
+system("find . -name $BROKENFILE -print -o -name $BROKENWRKLOG -print | $GTAR -T - -plcf - | (cd $FTP; $GTAR -plxf -)");
 
 # Copy over the cache files used during the build
 foreach my $f ($BULK_DBFILE, $DEPENDSTREEFILE, $DEPENDSFILE, $SUPPORTSFILE, $INDEXFILE, $ORDERFILE) {
diff --git a/mk/compiler/ccc.mk b/mk/compiler/ccc.mk
index 5e503b2666b..0d880193feb 100644
--- a/mk/compiler/ccc.mk
+++ b/mk/compiler/ccc.mk
@@ -1,4 +1,4 @@
-# $NetBSD: ccc.mk,v 1.2 2004/11/20 05:54:36 grant Exp $
+# $NetBSD: ccc.mk,v 1.2.2.1 2004/11/23 20:54:12 tv Exp $
 
 .if !defined(COMPILER_CCC_MK)
 COMPILER_CCC_MK=	defined
@@ -10,34 +10,36 @@ COMPILER_CCC_MK=	defined
 # requested by the package in USE_LANGUAGES.
 # 
 
-LANGUAGES.ccc=	c
+LANGUAGES.ccc=		c
 .if exists(/usr/lib/cmplrs/cxx)
-LANGUAGES.ccc+=	c++
+LANGUAGES.ccc+=		c++
 .endif
-_LANGUAGES.ccc=	# empty
+_LANGUAGES.ccc=		# empty
 .for _lang_ in ${USE_LANGUAGES}
 _LANGUAGES.ccc+=	${LANGUAGES.ccc:M${_lang_}}
 .endfor
 
-_CCC_DIR=		${WRKDIR}/.ccc
-_CCC_LINKS=		# empty
+_CCC_DIR=	${WRKDIR}/.ccc
+_CCC_LINKS=	# empty
 .if exists(/usr/bin/cc)
-_CCC_CC=		${_CCC_DIR}/cc
+_CCC_CC=	${_CCC_DIR}/cc
 _CCC_LINKS+=	_CCC_CC
-PKG_CC=			${_CCC_CC}
-CC=			${PKG_CC:T}
+PKG_CC=		${_CCC_CC}
+CC=		${PKG_CC:T}
+CCPATH=		/usr/bin/cc
 .endif
 
 .if exists(/usr/bin/cxx)
-_CCC_CXX=		${_CCC_DIR}/cxx
-_CCC_LINKS+=		_CCC_CXX
-PKG_CXX=		${_CCC_CXX}
-CXX=			${PKG_CXX:T}
+_CCC_CXX=	${_CCC_DIR}/cxx
+_CCC_LINKS+=	_CCC_CXX
+PKG_CXX=	${_CCC_CXX}
+CXX=		${PKG_CXX:T}
+CXXPATH=	/usr/bin/cxx
 .endif
 
-.if exists(/usr/bin/cc) && !defined(CC_VERSION_STRING)
-CC_VERSION_STRING!=	/usr/bin/cc -V 2>&1 | awk '{print; exit(0);}'
-CC_VERSION!=		/usr/bin/cc -V 2>&1 | awk '{print "CCC-"$3; exit(0);}'
+.if exists(${CCPATH}) && !defined(CC_VERSION_STRING)
+CC_VERSION_STRING!=	${CCPATH} -V 2>&1 | awk '{print; exit(0);}'
+CC_VERSION!=		${CCPATH} -V 2>&1 | awk '{print "CCC-"$3; exit(0);}'
 .else
 CC_VERSION_STRING?=	${CC_VERSION}
 CC_VERSION?=		CCC
diff --git a/mk/compiler/gcc.mk b/mk/compiler/gcc.mk
index 26334089deb..009ca31b1f6 100644
--- a/mk/compiler/gcc.mk
+++ b/mk/compiler/gcc.mk
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.74 2004/11/22 22:24:47 wiz Exp $
+# $NetBSD: gcc.mk,v 1.74.2.1 2004/11/23 20:54:12 tv Exp $
 
 .if !defined(COMPILER_GCC_MK)
 COMPILER_GCC_MK=	defined
@@ -346,6 +346,7 @@ _GCC_CC=	${_GCC_DIR}/bin/gcc
 _GCC_LINKS+=	_GCC_CC
 PKG_CC=		${_GCC_CC}
 CC=		${PKG_CC:T}
+CCPATH=		${_GCCBINDIR}/gcc
 .endif
 .if exists(${_GCCBINDIR}/cpp) && ${OPSYS} != "Darwin"
 _GCC_CPP=	${_GCC_DIR}/bin/cpp
@@ -358,6 +359,7 @@ _GCC_CXX=	${_GCC_DIR}/bin/g++
 _GCC_LINKS+=	_GCC_CXX
 PKG_CXX=	${_GCC_CXX}
 CXX=		${PKG_CXX:T}
+CXXPATH=	${_GCCBINDIR}/g++
 .endif
 .if exists(${_GCCBINDIR}/g77)
 _GCC_FC=	${_GCC_DIR}/bin/g77
@@ -365,6 +367,8 @@ _GCC_LINKS+=	_GCC_FC
 PKG_FC=		${_GCC_FC}
 FC=		${PKG_FC:T}
 F77=		${PKG_FC:T}
+FCPATH=		${_GCCBINDIR}/g77
+F77PATH=	${_GCCBINDIR}/g77
 .endif
 
 # Pass the required flags to imake to tell it we're using gcc on Solaris.
@@ -373,11 +377,11 @@ IMAKEOPTS+=	-DHasGcc2=YES -DHasGcc2ForCplusplus=YES
 .endif
 
 .if !empty(_USE_PKGSRC_GCC:M[yY][eE][sS])
-.  if exists(${_GCCBINDIR}/gcc)
-CC_VERSION_STRING!=	${_GCCBINDIR}/gcc -v 2>&1
+.  if exists(${CCPATH})
+CC_VERSION_STRING!=	${CCPATH} -v 2>&1
 CC_VERSION!=		\
-	if ${_GCCBINDIR}/gcc -dumpversion > /dev/null 2>&1; then	\
-		${ECHO} "gcc-`${_GCCBINDIR}/gcc -dumpversion`";		\
+	if ${CCPATH} -dumpversion > /dev/null 2>&1; then		\
+		${ECHO} "gcc-`${CCPATH} -dumpversion`";			\
 	else								\
 		${ECHO} "gcc-${_GCC_REQD}";				\
 	fi
diff --git a/mk/compiler/mipspro.mk b/mk/compiler/mipspro.mk
index cccaa5d6a53..f6995f70f40 100644
--- a/mk/compiler/mipspro.mk
+++ b/mk/compiler/mipspro.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mipspro.mk,v 1.26 2004/09/21 15:01:41 jlam Exp $
+# $NetBSD: mipspro.mk,v 1.26.2.1 2004/11/23 20:54:12 tv Exp $
 
 .if !defined(COMPILER_MIPSPRO_MK)
 COMPILER_MIPSPRO_MK=	defined
@@ -24,18 +24,20 @@ _MIPSPRO_CC=		${_MIPSPRO_DIR}/bin/cc
 _MIPSPRO_LINKS+=	_MIPSPRO_CC
 PKG_CC=			${_MIPSPRO_CC}
 CC=			${PKG_CC:T}
+CCPATH=			${MIPSPROBASE}/bin/cc
 .endif
 .if exists(${MIPSPROBASE}/bin/CC)
 _MIPSPRO_CXX=		${_MIPSPRO_DIR}/bin/CC
 _MIPSPRO_LINKS+=	_MIPSPRO_CXX
 PKG_CXX=		${_MIPSPRO_CXX}
 CXX=			${PKG_CXX:T}
+CXXPATH=		${MIPSPROBASE}/bin/CC
 .endif
 
-.if exists(${MIPSPROBASE}/bin/cc)
+.if exists(${CCPATH})
 # MIPSpro Compilers: Version 7.3.1.2m
-CC_VERSION_STRING!=	${MIPSPROBASE}/bin/cc -version 2>&1 || ${TRUE}
-CC_VERSION!=		${MIPSPROBASE}/bin/cc -version 2>&1 | ${GREP} '^MIPSpro'
+CC_VERSION_STRING!=	${CCPATH} -version 2>&1 || ${TRUE}
+CC_VERSION!=		${CCPATH} -version 2>&1 | ${GREP} '^MIPSpro'
 .else
 CC_VERSION_STRING?=	${CC_VERSION}
 CC_VERSION?=		MIPSpro Compilers
diff --git a/mk/compiler/sunpro.mk b/mk/compiler/sunpro.mk
index 9bd69b67e7e..67a2f769987 100644
--- a/mk/compiler/sunpro.mk
+++ b/mk/compiler/sunpro.mk
@@ -1,4 +1,4 @@
-# $NetBSD: sunpro.mk,v 1.22 2004/09/21 15:01:41 jlam Exp $
+# $NetBSD: sunpro.mk,v 1.22.2.1 2004/11/23 20:54:12 tv Exp $
 
 .if !defined(COMPILER_SUNPRO_MK)
 COMPILER_SUNPRO_MK=	defined
@@ -24,12 +24,14 @@ _SUNPRO_CC=	${_SUNPRO_DIR}/bin/cc
 _SUNPRO_LINKS+=	_SUNPRO_CC
 PKG_CC=		${_SUNPRO_CC}
 CC=		${PKG_CC:T}
+CCPATH=		${SUNWSPROBASE}/bin/cc
 .endif
 .if exists(${SUNWSPROBASE}/bin/CC)
 _SUNPRO_CXX=	${_SUNPRO_DIR}/bin/CC
 _SUNPRO_LINKS+=	_SUNPRO_CXX
 PKG_CXX=	${_SUNPRO_CXX}
 CXX=		${PKG_CXX:T}
+CXXPATH=	${SUNWSPROBASE}/bin/CC
 .endif
 
 # SunPro passes rpath directives to the linker using "-R".
@@ -41,9 +43,9 @@ _COMPILER_RPATH_FLAG=	-R
 # SunPro compiler must be passed certain flags to compile/link 64-bit code.
 _COMPILER_ABI_FLAG.64=	-xtarget=ultra -xarch=v9
 
-.if exists(${SUNWSPROBASE}/bin/cc)
-CC_VERSION_STRING!=	${SUNWSPROBASE}/bin/cc -V 2>&1 || ${TRUE}
-CC_VERSION!=		${SUNWSPROBASE}/bin/cc -V 2>&1 | ${GREP} '^cc'
+.if exists(${CCPATH})
+CC_VERSION_STRING!=	${CCPATH} -V 2>&1 || ${TRUE}
+CC_VERSION!=		${CCPATH} -V 2>&1 | ${GREP} '^cc'
 .else
 CC_VERSION_STRING?=	${CC_VERSION}
 CC_VERSION?=		cc: Sun C
diff --git a/mk/compiler/xlc.mk b/mk/compiler/xlc.mk
index 2ab19194572..969a4e61210 100644
--- a/mk/compiler/xlc.mk
+++ b/mk/compiler/xlc.mk
@@ -1,4 +1,4 @@
-# $NetBSD: xlc.mk,v 1.2 2004/10/06 13:56:46 grant Exp $
+# $NetBSD: xlc.mk,v 1.2.2.1 2004/11/23 20:54:12 tv Exp $
 
 .if !defined(COMPILER_XLC_MK)
 COMPILER_XLC_MK=	defined
@@ -11,8 +11,8 @@ XLCBASE?=	/opt/ibmcmp/vacpp/6.0
 # _LANGUAGES.<compiler> is ${LANGUAGES.<compiler>} restricted to the ones
 # requested by the package in USE_LANGUAGES.
 #
-LANGUAGES.xlc=	c c++
-_LANGUAGES.xlc=	# empty
+LANGUAGES.xlc=		c c++
+_LANGUAGES.xlc=		# empty
 .for _lang_ in ${USE_LANGUAGES}
 _LANGUAGES.xlc+=	${LANGUAGES.xlc:M${_lang_}}
 .endfor
@@ -24,16 +24,18 @@ _XLC_CC=	${_XLC_DIR}/bin/xlc
 _XLC_LINKS+=	_XLC_CC
 PKG_CC=		${_XLC_CC}
 CC=		${PKG_CC:T}
+CCPATH=		${XLCBASE}/bin/xlc
 .endif
 .if exists(${XLCBASE}/bin/xlc++)
 _XLC_CXX=	${_XLC_DIR}/bin/xlc++
 _XLC_LINKS+=	_XLC_CXX
 PKG_CXX=	${_XLC_CXX}
 CXX=		${PKG_CXX:T}
+CXXPATH=	${XLCBASE}/bin/xlc++
 .endif
 
-.if exists(${XLCBASE}/bin/xlc)
-CC_VERSION_STRING!=	${XLCBASE}/bin/xlc -V 2>&1 | ${GREP} 'IBM XL C.*for' | ${SED} -e 's/^ *//' || ${TRUE}
+.if exists(${CCPATH})
+CC_VERSION_STRING!=	${CCPATH} -V 2>&1 | ${GREP} 'IBM XL C.*for' | ${SED} -e 's/^ *//' || ${TRUE}
 CC_VERSION=		${CC_VERSION_STRING}
 .else
 CC_VERSION_STRING?=	${CC_VERSION}