sync with HEAD

9 files changed, 59 insertions, 21 deletions

diff --git a/mk/bsd.pkg.use.mk b/mk/bsd.pkg.use.mk
index 10a830d1357..f0a0c37c425 100644
--- a/mk/bsd.pkg.use.mk
+++ b/mk/bsd.pkg.use.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.use.mk,v 1.1.2.2 2004/11/28 20:11:32 tv Exp $
+#	$NetBSD: bsd.pkg.use.mk,v 1.1.2.3 2004/12/20 20:46:00 tv Exp $
 #
 # Turn USE_* macros into proper depedency logic.  Included near the top of
 # bsd.pkg.mk, after bsd.prefs.mk.
@@ -126,7 +126,11 @@ _SHLIBTOOL?=		${PKG_SHLIBTOOL}
 LIBTOOL?=		${PKG_LIBTOOL}
 SHLIBTOOL?=		${PKG_SHLIBTOOL}
 .if defined(USE_LIBTOOL)
-BUILD_DEPENDS+=		libtool-base>=${_OPSYS_LIBTOOL_REQD:U1.5.10nb1}:../../devel/libtool-base
+.  if defined(USE_FORTRAN)
+LIBTOOL_REQD?=		1.5.10nb7
+.  endif
+LIBTOOL_REQD?=		1.5.10nb1
+BUILD_DEPENDS+=		libtool-base>=${_OPSYS_LIBTOOL_REQD:U${LIBTOOL_REQD}}:../../devel/libtool-base
 CONFIGURE_ENV+=		LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}"
 MAKE_ENV+=		LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}"
 LIBTOOL_OVERRIDE?=	libtool */libtool */*/libtool
@@ -192,16 +196,12 @@ ${_PERL5_DEPMETHOD}+=	${_PERL5_DEPENDS}:${PERL5_PKGSRCDIR}
 .if defined(USE_PERL5) && (${USE_PERL5} == "run")
 .  if !defined(PERL5_SITELIB) || !defined(PERL5_SITEARCH) || !defined(PERL5_ARCHLIB)
 .    if exists(${PERL5})
-.      if exists(${LOCALBASE}/share/mk/bsd.perl.mk)
-.        include "${LOCALBASE}/share/mk/bsd.perl.mk"
-.      else
 PERL5_SITELIB!=		eval `${PERL5} -V:installsitelib 2>/dev/null`; \
 			${ECHO} $${installsitelib}
 PERL5_SITEARCH!=	eval `${PERL5} -V:installsitearch 2>/dev/null`; \
 			${ECHO} $${installsitearch}
 PERL5_ARCHLIB!=		eval `${PERL5} -V:installarchlib 2>/dev/null`; \
 			${ECHO} $${installarchlib}
-.      endif # !exists(bsd.perl.mk)
 .      if ${PKG_INSTALLATION_TYPE} == "overwrite"
 _PERL5_PREFIX!=		eval `${PERL5} -V:prefix 2>/dev/null`; \
 			${ECHO} $${prefix}
diff --git a/mk/bsd.sites.mk b/mk/bsd.sites.mk
index 6a6a96ddf78..752a00c771e 100644
--- a/mk/bsd.sites.mk
+++ b/mk/bsd.sites.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sites.mk,v 1.20.2.4 2004/12/09 17:15:01 tv Exp $
+# $NetBSD: bsd.sites.mk,v 1.20.2.5 2004/12/20 20:46:00 tv Exp $
 #
 # Default MASTER_SITES
 
@@ -49,7 +49,7 @@ MASTER_SITE_GNUSTEP+=   \
 	http://ftp.easynet.nl/mirror/GNUstep/
 
 MASTER_SITE_PERL_CPAN+= \
-	ftp://cpan.pair.com/pub/CPAN/modules/by-module/ \
+	ftp://cpan.pair.com/modules/by-module/ \
 	ftp://mirrors.cloud9.net/mirrors/CPAN/modules/by-module/ \
 	ftp://ftp.uvsq.fr/pub/perl/CPAN/modules/by-module/ \
 	ftp://ftp.gmd.de/mirrors/CPAN/modules/by-module/ \
@@ -114,7 +114,6 @@ MASTER_SITE_GNOME+=     \
 	ftp://ftp.mirror.ac.uk/sites/ftp.gnome.org/pub/
 
 MASTER_SITE_SOURCEFORGE+=	\
-	http://aleron.dl.sourceforge.net/sourceforge/ \
 	http://belnet.dl.sourceforge.net/sourceforge/ \
 	http://cesnet.dl.sourceforge.net/sourceforge/ \
 	http://heanet.dl.sourceforge.net/sourceforge/ \
diff --git a/mk/bulk/build b/mk/bulk/build
index d0fac1b43a8..4c46c7fc700 100644
--- a/mk/bulk/build
+++ b/mk/bulk/build
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: build,v 1.45.2.1 2004/11/23 20:54:12 tv Exp $
+# $NetBSD: build,v 1.45.2.2 2004/12/20 20:46:00 tv Exp $
 
 #
 # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@NetBSD.org>
@@ -83,7 +83,7 @@ while [ ${#} -ge 1 ] ; do
 		exit 0
 		;;
 
-	--mirror_only )
+	--mirror_only|-m )
 		mirror_only=yes
 		target=mirror-distfiles
 		shift
diff --git a/mk/db1.builtin.mk b/mk/db1.builtin.mk
index 76da2ca5d0e..c577c92088e 100644
--- a/mk/db1.builtin.mk
+++ b/mk/db1.builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: db1.builtin.mk,v 1.5.2.2 2004/12/03 19:15:00 tv Exp $
+# $NetBSD: db1.builtin.mk,v 1.5.2.3 2004/12/20 20:46:00 tv Exp $
 
 .for _lib_ in db db1
 .  if !defined(_BLNK_LIB_FOUND.${_lib_})
@@ -81,6 +81,7 @@ BUILDLINK_TARGETS+=	buildlink-db1-db185-h
 buildlink-db1-db185-h:
 	${_PKG_SILENT}${_PKG_DEBUG}					\
 	if ${TEST} ! -f ${BUILDLINK_DIR}/include/db_185.h; then		\
+		${MKDIR} -p ${BUILDLINK_DIR}/include;			\
 		${LN} -fs ${_inc_} ${BUILDLINK_DIR}/include/db_185.h;	\
 	fi
 .      endif
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf
index 5a66b0e6a24..55a40a0cf20 100644
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.14.2.2 2004/11/28 20:11:32 tv Exp $
+# $NetBSD: mk.conf,v 1.14.2.3 2004/12/20 20:46:00 tv Exp $
 #
 
 # A file providing defaults for pkgsrc and the packages collection.
@@ -1859,6 +1859,13 @@ QPOPPER_USER?= pop
 # Possible: defined, not defined
 # Default: not defined
 
+#QPOPPER_SPOOL_DIR=
+# Used by qpopper package to define the mail spool directory,
+# overriding the hardcoded directories searched for by the configure
+# script.
+# Possible: any location on an appropriate filesystem.
+# Default: not defined
+
 #QPOPPER_USE_DRAC=
 # Used in qpopper package to enable drac support.
 # Possible: yes or no, not defined.
@@ -2236,7 +2243,7 @@ XEN12_USE_COM2?=	NO
 # Australia.
 #
 #MASTER_SITE_CYGWIN=	http://planetmirror.com/pub/sourceware/cygwin/
-#MASTER_SITE_GNOME=	http://public.planetmirror.com.au/pub/GNOME/
+#MASTER_SITE_GNOME=	http://public.planetmirror.com.au/pub/gnome/
 #MASTER_SITE_GNU=	http://public.planetmirror.com.au/pub/gnu/
 #MASTER_SITE_MOZILLA=	http://public.planetmirror.com.au/pub/mozilla/releases/
 #MASTER_SITE_PERL_CPAN=	ftp://mirror.aarnet.edu.au/pub/cpan/modules/by-module/
diff --git a/mk/java-vm.mk b/mk/java-vm.mk
index 08c448e1e5d..1e54729edac 100644
--- a/mk/java-vm.mk
+++ b/mk/java-vm.mk
@@ -1,4 +1,4 @@
-# $NetBSD: java-vm.mk,v 1.34.2.1 2004/11/22 22:48:05 tv Exp $
+# $NetBSD: java-vm.mk,v 1.34.2.2 2004/12/20 20:46:00 tv Exp $
 #
 # This Makefile fragment handles Java dependencies and make variables,
 # and is meant to be included by packages that require Java either at
@@ -193,7 +193,7 @@ _PKG_JVM=	${_PKG_JVM_FIRSTACCEPTED}
 #
 .if !defined(_PKG_JVM)
 # force an error
-PKG_FAIL_REASON=	"no acceptable JVM found"
+PKG_SKIP_REASON=	"no acceptable JVM found"
 _PKG_JVM=		"none"
 .endif
 
diff --git a/mk/platform/Darwin.mk b/mk/platform/Darwin.mk
index 8e6b43c6bfe..d092d03fc1a 100644
--- a/mk/platform/Darwin.mk
+++ b/mk/platform/Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Darwin.mk,v 1.4 2004/11/16 18:04:00 tv Exp $
+# $NetBSD: Darwin.mk,v 1.4.2.1 2004/12/20 20:46:00 tv Exp $
 #
 # Variable definitions for the Darwin operating system.
 
@@ -157,6 +157,15 @@ LOCALBASE?=		${DESTDIR}/usr/pkg
 _OPSYS_MAX_CMDLEN!=	/usr/sbin/sysctl -n kern.argmax
 .endif
 
+# Darwin 7.7.x has poll() in libc, but no poll.h. Try to help GNU
+# configure packages that break because of this by pretending that
+# there is no poll().
+.if defined(GNU_CONFIGURE)
+.  if !exists(/usr/include/poll.h) && !exists(/usr/include/sys/poll.h)
+CONFIGURE_ENV+=		ac_cv_func_poll=no
+.  endif
+.endif
+
 # If games are to be installed setgid, then SETGIDGAME is set to 'yes'
 # (it defaults to 'no' as per bsd.pkg.defaults.mk).
 # Set the group and mode to meaningful values in that case (defaults to
diff --git a/mk/tools.mk b/mk/tools.mk
index c22822a8bfb..547654acdbc 100644
--- a/mk/tools.mk
+++ b/mk/tools.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.mk,v 1.46.2.1 2004/11/22 22:48:05 tv Exp $
+# $NetBSD: tools.mk,v 1.46.2.2 2004/12/20 20:46:00 tv Exp $
 #
 # This Makefile creates a ${TOOLS_DIR} directory and populates the bin
 # subdir with tools that hide the ones outside of ${TOOLS_DIR}.
@@ -385,6 +385,27 @@ ${TOOLS_DIR}/bin/make:
 	fi
 .endif
 
+# Always create a ${TOOLS_DIR}/bin/rpcgen to wrap the real rpcgen.
+# The wrapper will correctly set the CPP environment variable to a
+# stat((2)able path to a C preprocessor, then rely on the PATH to
+# find and invoke the real rpcgen.
+#
+override-tools: ${TOOLS_DIR}/bin/rpcgen
+.if !target(${TOOLS_DIR}/bin/rpcgen)
+${TOOLS_DIR}/bin/rpcgen:
+	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
+	${_PKG_SILENT}${_PKG_DEBUG}					\
+	( ${ECHO} '#!${TOOLS_SHELL}';					\
+	  ${ECHO} 'wrapperlog="$${TOOLS_WRAPPER_LOG-${_TOOLS_WRAP_LOG}}"'; \
+	  ${ECHO} 'CPP="${WRAPPER_BINDIR}/cpp"; export CPP';		\
+	  PATH=`${ECHO} "${PATH}" | ${SED} -e "s,.*${.TARGET:H}:,,"`;	\
+	  ${ECHO} "PATH=\"$$PATH\"; export PATH";			\
+	  ${ECHO} '${ECHO} "<.> rpcgen $$*" >> $$wrapperlog';		\
+	  ${ECHO} 'rpcgen "$$@"';					\
+	) > ${.TARGET}
+	${_PKG_SILENT}${_PKG_DEBUG}${CHMOD} +x ${.TARGET}
+.endif
+
 .if defined(USE_TBL) && !empty(USE_TBL:M[yY][eE][sS])
 .  if exists(/usr/bin/tbl)
 _TOOLS_PROGNAME.tbl=	/usr/bin/tbl
diff --git a/mk/wrapper/transform-xlc-cc b/mk/wrapper/transform-xlc-cc
index cef8eb33be2..ceab5093287 100644
--- a/mk/wrapper/transform-xlc-cc
+++ b/mk/wrapper/transform-xlc-cc
@@ -1,4 +1,4 @@
-# $NetBSD: transform-xlc-cc,v 1.1.2.1 2004/12/09 17:15:01 tv Exp $
+# $NetBSD: transform-xlc-cc,v 1.1.2.2 2004/12/20 20:46:00 tv Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -58,9 +58,10 @@ case $arg in
 	split_arg=yes
         ;;
 # -qnocommon is the xlc argument to allocate uninitialized globals in
-# the data section.
--fno-common)
+# the data section for PIC.
+-fno-common|-fPIC)
 	arg=-qnocommon
+	msg_log $wrapperlog "   (transform-xlc-cc) to: $arg"
 	addtocache=yes
 	;;
 ######################################################################