pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/tv-derecurse]: pkgsrc/mk sync with HEAD
details: https://anonhg.NetBSD.org/pkgsrc/rev/c9bc9c2f1287
branches: tv-derecurse
changeset: 483976:c9bc9c2f1287
user: tv <tv%pkgsrc.org@localhost>
date: Mon Dec 20 20:46:00 2004 +0000
description:
sync with HEAD
diffstat:
mk/bsd.pkg.use.mk | 12 ++++++------
mk/bsd.sites.mk | 5 ++---
mk/bulk/build | 4 ++--
mk/db1.builtin.mk | 3 ++-
mk/defaults/mk.conf | 11 +++++++++--
mk/java-vm.mk | 4 ++--
mk/platform/Darwin.mk | 11 ++++++++++-
mk/tools.mk | 23 ++++++++++++++++++++++-
mk/wrapper/transform-xlc-cc | 7 ++++---
9 files changed, 59 insertions(+), 21 deletions(-)
diffs (235 lines):
diff -r 85d1726a4f05 -r c9bc9c2f1287 mk/bsd.pkg.use.mk
--- a/mk/bsd.pkg.use.mk Thu Dec 09 17:15:01 2004 +0000
+++ b/mk/bsd.pkg.use.mk Mon Dec 20 20:46:00 2004 +0000
@@ -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 @@
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 @@
.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 -r 85d1726a4f05 -r c9bc9c2f1287 mk/bsd.sites.mk
--- a/mk/bsd.sites.mk Thu Dec 09 17:15:01 2004 +0000
+++ b/mk/bsd.sites.mk Mon Dec 20 20:46:00 2004 +0000
@@ -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 @@
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 @@
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 -r 85d1726a4f05 -r c9bc9c2f1287 mk/bulk/build
--- a/mk/bulk/build Thu Dec 09 17:15:01 2004 +0000
+++ b/mk/bulk/build Mon Dec 20 20:46:00 2004 +0000
@@ -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@localhost>
@@ -83,7 +83,7 @@
exit 0
;;
- --mirror_only )
+ --mirror_only|-m )
mirror_only=yes
target=mirror-distfiles
shift
diff -r 85d1726a4f05 -r c9bc9c2f1287 mk/db1.builtin.mk
--- a/mk/db1.builtin.mk Thu Dec 09 17:15:01 2004 +0000
+++ b/mk/db1.builtin.mk Mon Dec 20 20:46:00 2004 +0000
@@ -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-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 -r 85d1726a4f05 -r c9bc9c2f1287 mk/defaults/mk.conf
--- a/mk/defaults/mk.conf Thu Dec 09 17:15:01 2004 +0000
+++ b/mk/defaults/mk.conf Mon Dec 20 20:46:00 2004 +0000
@@ -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 @@
# 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 @@
# 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 -r 85d1726a4f05 -r c9bc9c2f1287 mk/java-vm.mk
--- a/mk/java-vm.mk Thu Dec 09 17:15:01 2004 +0000
+++ b/mk/java-vm.mk Mon Dec 20 20:46:00 2004 +0000
@@ -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 @@
#
.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 -r 85d1726a4f05 -r c9bc9c2f1287 mk/platform/Darwin.mk
--- a/mk/platform/Darwin.mk Thu Dec 09 17:15:01 2004 +0000
+++ b/mk/platform/Darwin.mk Mon Dec 20 20:46:00 2004 +0000
@@ -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 @@
_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 -r 85d1726a4f05 -r c9bc9c2f1287 mk/tools.mk
--- a/mk/tools.mk Thu Dec 09 17:15:01 2004 +0000
+++ b/mk/tools.mk Mon Dec 20 20:46:00 2004 +0000
@@ -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 @@
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 -r 85d1726a4f05 -r c9bc9c2f1287 mk/wrapper/transform-xlc-cc
--- a/mk/wrapper/transform-xlc-cc Thu Dec 09 17:15:01 2004 +0000
+++ b/mk/wrapper/transform-xlc-cc Mon Dec 20 20:46:00 2004 +0000
@@ -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 @@
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
;;
######################################################################
Home |
Main Index |
Thread Index |
Old Index