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/e17d021a2687
branches: tv-derecurse
changeset: 484000:e17d021a2687
user: tv <tv%pkgsrc.org@localhost>
date: Mon Mar 21 15:43:00 2005 +0000
description:
sync with HEAD
diffstat:
mk/bsd.pkg.mk | 16 +++++++-
mk/bsd.sites.mk | 45 ++++++++----------------
mk/bulk/bsd.bulk-pkg.mk | 71 +++++++++++++++++++++++----------------
mk/defaults/mk.conf | 83 +++++++++++++++++++++++++++++++---------------
mk/emacs.mk | 4 +-
mk/java-env.mk | 28 +++++++-------
mk/nroff.buildlink3.mk | 17 +++++++++
mk/pgsql.buildlink3.mk | 10 +++-
mk/platform/AIX.mk | 28 +++++++++------
mk/platform/BSDOS.mk | 8 +--
mk/platform/Darwin.mk | 8 +--
mk/platform/DragonFly.mk | 8 +--
mk/platform/FreeBSD.mk | 8 +--
mk/platform/IRIX.mk | 8 +--
mk/platform/Interix.mk | 29 +++++++++-------
mk/platform/Linux.mk | 8 +--
mk/platform/NetBSD.mk | 8 +--
mk/platform/OSF1.mk | 4 +-
mk/platform/OpenBSD.mk | 8 +--
mk/platform/SunOS.mk | 8 +--
mk/platform/UnixWare.mk | 9 +---
mk/tools.mk | 5 +-
mk/wrapper/bsd.wrapper.mk | 7 ++-
23 files changed, 239 insertions(+), 189 deletions(-)
diffs (truncated from 1001 to 300 lines):
diff -r c05b1a932e1d -r e17d021a2687 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk Sun Mar 06 02:47:42 2005 +0000
+++ b/mk/bsd.pkg.mk Mon Mar 21 15:43:00 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1540.2.25 2005/03/02 19:38:26 tv Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1540.2.26 2005/03/21 15:43:00 tv Exp $
#
# This file is in the public domain.
#
@@ -136,6 +136,10 @@
BUILD_DEFS_FIXED+= NO_BIN_ON_FTP NO_BIN_ON_CDROM
BUILD_DEFS_FIXED+= ${OSVERSION_SPECIFIC:DOSVERSION_SPECIFIC}
+.if (defined(INSTALL_UNSTRIPPED) && !empty(INSTALL_UNSTRIPPED:M[yY][eE][sS])) || defined(DEBUG_FLAGS)
+_INSTALL_UNSTRIPPED= # set (flag used by platform/*.mk)
+.endif
+
##### Non-overridable constants
# Latest versions of tools required for correct pkgsrc operation.
@@ -369,9 +373,16 @@
ALL_ENV+= CXX=${CXX:Q}
ALL_ENV+= CXXFLAGS=${CXXFLAGS:Q}
ALL_ENV+= COMPILER_RPATH_FLAG=${COMPILER_RPATH_FLAG:Q}
-ALL_ENV+= F77=${F77:Q}
+ALL_ENV+= F77=${FC:Q}
ALL_ENV+= FC=${FC:Q}
ALL_ENV+= FFLAGS=${FFLAGS:Q}
+ALL_ENV+= LANG=C
+ALL_ENV+= LC_COLLATE=C
+ALL_ENV+= LC_CTYPE=C
+ALL_ENV+= LC_MESSAGES=C
+ALL_ENV+= LC_MONETARY=C
+ALL_ENV+= LC_NUMERIC=C
+ALL_ENV+= LC_TIME=C
ALL_ENV+= LDFLAGS=${LDFLAGS:Q}
ALL_ENV+= LINKER_RPATH_FLAG=${LINKER_RPATH_FLAG:Q}
ALL_ENV+= PATH=${PATH:Q}:${LOCALBASE}/bin:${X11BASE}/bin
@@ -735,6 +746,7 @@
PKGBASE="${PKGBASE}" \
${AWK} '/^$$/ { next } \
/^\#.*/ { next } \
+ $$1 !~ ENVIRON["PKGBASE"] && $$1 !~ /\{/ { next } \
{ s = sprintf("${PKG_ADMIN} pmatch \"%s\" %s && ${ECHO} \"*** WARNING - %s vulnerability in %s - see %s for more information ***\"", $$1, ENVIRON["PKGNAME"], $$2,
ENVIRON["PKGNAME"], $$3); system(s); } \
' < ${PKGVULNDIR}/pkg-vulnerabilities || ${ECHO} 'could not check pkg-vulnerabilities file'
diff -r c05b1a932e1d -r e17d021a2687 mk/bsd.sites.mk
--- a/mk/bsd.sites.mk Sun Mar 06 02:47:42 2005 +0000
+++ b/mk/bsd.sites.mk Mon Mar 21 15:43:00 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sites.mk,v 1.20.2.6 2005/02/25 14:46:51 tv Exp $
+# $NetBSD: bsd.sites.mk,v 1.20.2.7 2005/03/21 15:43:00 tv Exp $
#
# Default MASTER_SITES
@@ -7,6 +7,7 @@
MASTER_SITE_XCONTRIB+= \
ftp://ftp.gwdg.de/pub/x11/x.org/contrib/ \
+ ftp://sunsite.doc.ic.ac.uk/sites/ftp.x.org/contrib/ \
ftp://sunsite.sut.ac.jp/pub/archives/X11/contrib/ \
ftp://sunsite.icm.edu.pl/pub/X11/contrib/ \
ftp://sunsite.cnlab-switch.ch/mirror/X11/contrib/ \
@@ -55,18 +56,14 @@
http://cran.uk.r-project.org/src/ \
http://cran.us.r-project.org/src/ \
http://lib.stat.cmu.edu/R/CRAN/src/ \
- ftp://ftp.biostat.washington.edu/mirrors/R/CRAN/src/ \
- http://cran.stat.wisc.edu/src/ \
- http://SunSITE.auc.dk/R/src/ \
http://www.stat.unipg.it/pub/stat/statlib/R/CRAN/src/ \
ftp://ftp.u-aizu.ac.jp/pub/lang/R/CRAN/src/ \
- ftp://dola.snu.ac.kr/pub/R/CRAN/src/ \
http://stat.ethz.ch/CRAN/src/ \
http://www.stats.bris.ac.uk/R/src/
MASTER_SITE_TEX_CTAN+= \
ftp://ftp.funet.fi/pub/TeX/CTAN/ \
- ftp://ftp.tex.ac.uk/public/ctan/tex-archive/ \
+ ftp://ftp.tex.ac.uk/tex-archive/ \
ftp://ftp.dante.de/tex-archive/
MASTER_SITE_SUNSITE+= \
@@ -96,15 +93,19 @@
MASTER_SITE_SOURCEFORGE+= \
http://belnet.dl.sourceforge.net/sourceforge/ \
- http://cesnet.dl.sourceforge.net/sourceforge/ \
+ http://citkit.dl.sourceforge.net/sourceforge/ \
+ http://cogent.dl.sourceforge.net/sourceforge/ \
+ http://easynews.dl.sourceforge.net/sourceforge/ \
http://heanet.dl.sourceforge.net/sourceforge/ \
http://internap.dl.sourceforge.net/sourceforge/ \
http://jaist.dl.sourceforge.net/sourceforge/ \
+ http://kent.dl.sourceforge.net/sourceforge/ \
http://mesh.dl.sourceforge.net/sourceforge/ \
+ http://nchc.dl.sourceforge.net/sourceforge/ \
http://optusnet.dl.sourceforge.net/sourceforge/ \
http://ovh.dl.sourceforge.net/sourceforge/ \
http://puzzle.dl.sourceforge.net/sourceforge/ \
- http://umn.dl.sourceforge.net/sourceforge/ \
+ http://switch.dl.sourceforge.net/sourceforge/ \
http://unc.dl.sourceforge.net/sourceforge/ \
http://voxel.dl.sourceforge.net/sourceforge/ \
ftp://ftp2.sourceforge.net/pub/sourceforge/
@@ -112,21 +113,19 @@
# http://sf.gds.tuwien.ac.at/
MASTER_SITE_SUSE+= \
- http://altruistic.lbl.gov/mirrors/suse/${MACHINE_ARCH}/${SUSE_VERSION}/suse/ \
ftp://rpmfind.net/linux/SuSE-Linux/${MACHINE_ARCH}/update/${SUSE_VERSION}/ \
ftp://fr.rpmfind.net/linux/SuSE-Linux/${MACHINE_ARCH}/update/${SUSE_VERSION}/ \
ftp://fr2.rpmfind.net/linux/SuSE-Linux/${MACHINE_ARCH}/update/${SUSE_VERSION}/ \
ftp://speakeasy.rpmfind.net/linux/SuSE-Linux/${MACHINE_ARCH}/update/${SUSE_VERSION}/ \
- ftp://ftp.duth.gr/pub/suse/${MACHINE_ARCH}/${SUSE_VERSION}/suse/ \
+ ftp://ftp.duth.gr/pub/suse/suse/${MACHINE_ARCH}/${SUSE_VERSION}/suse/ \
ftp://ftp.kddlabs.co.jp/Linux/packages/SuSE/suse/${MACHINE_ARCH}/${SUSE_VERSION}/suse/ \
ftp://sunsite.cnlab-switch.ch/mirror/SuSE/suse/${MACHINE_ARCH}/${SUSE_VERSION}/suse/ \
- ftp://ftp.mirror.ac.uk/sites/ftp.suse.com/pub/suse/${MACHINE_ARCH}/${SUSE_VERSION}/suse/ \
+ ftp://ftp.mirror.ac.uk/sites/ftp.suse.com/${MACHINE_ARCH}/${SUSE_VERSION}/suse/ \
ftp://mirror.mcs.anl.gov/pub/ftp.suse.com/${MACHINE_ARCH}/${SUSE_VERSION}/suse/
MASTER_SITE_MOZILLA+= \
ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/ \
ftp://ftp.fu-berlin.de/unix/network/www/mozilla/releases/ \
- ftp://sunsite.utk.edu/pub/netscape-source/ \
ftp://ftp.informatik.uni-bonn.de/pub/www/mozilla/ \
ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/ftp.mozilla.org/pub/ \
ftp://sunsite.auc.dk/pub/mozilla/ \
@@ -141,47 +140,33 @@
MASTER_SITE_XEMACS+= \
ftp://ftp.xemacs.org/pub/xemacs/ \
ftp://ftp.dti.ad.jp/pub/unix/editor/xemacs/ \
- ftp://ftp.jaist.ac.jp/pub/GNU/xemacs/ \
ftp://ftp.pasteur.fr/pub/computing/xemacs/ \
http://public.planetmirror.com.au/pub/xemacs/ \
ftp://mirror.aarnet.edu.au/pub/xemacs/ \
ftp://mirror.cict.fr/xemacs/ \
- ftp://mirror.nucba.ac.jp/mirror/xemacs/ \
ftp://ring.aist.go.jp/pub/text/xemacs/ \
ftp://ring.asahi-net.or.jp/pub/text/xemacs/
MASTER_SITE_APACHE+= \
http://www.apache.org/dist/ \
http://mirrors.midco.net/pub/apache.org/ \
- http://apache.mirror.digitalspace.net/ \
- http://apache.mirrorcentral.com/dist/ \
- http://www.rge.com/pub/infosystems/apache/ \
http://mirrors.ccs.neu.edu/Apache/dist/ \
- http://www.apache.inetcosmos.org/dist/ \
- http://www.ibiblio.org/pub/packages/infosystems/WWW/servers/apache/ \
- http://apache.ttlhost.com/ \
+ http://www.ibiblio.org/pub/mirrors/apache/ \
http://apache.towardex.com/ \
- http://mirrors.theonlinerecordstore.com/apache/ \
http://apache.oregonstate.edu/ \
- http://mirror.telentente.com/pub/apache/dist/ \
http://www.tux.org/pub/net/apache/dist/ \
http://apache.secsup.org/dist/ \
http://ftp.epix.net/apache/ \
http://public.planetmirror.com.au/pub/apache/dist/ \
+ http://apache.osuosl.org/ \
ftp://ftp.rge.com/pub/infosystems/apache/ \
ftp://ftp.epix.net/pub/apache/ \
ftp://ftp.ccs.neu.edu/net/mirrors/Apache/dist/ \
ftp://ftp.tux.org/pub/net/apache/dist/ \
- ftp://ftp.apache.inetcosmos.org/pub/apache/dist/ \
- ftp://www.ibiblio.org/pub/packages/infosystems/WWW/servers/apache/ \
- ftp://ftp.knowledge.com/pub/mirrors/apache/dist/ \
- ftp://ftp.sunsite.utk.edu/pub/apache/dist/ \
+ ftp://www.ibiblio.org/pub/mirrors/apache/ \
ftp://ftp.oregonstate.edu/pub/apache/ \
ftp://apache.secsup.org/pub/apache/dist/ \
- ftp://mirror.telentente.com/pub/apache/dist/ \
- ftp://mirrors.midco.net/pub/apache.org/ \
- ftp://ftp.fu-berlin.de/unix/network/www/apache/ \
- http://nagoya.apache.org/mirror/ \
+ ftp://ftp.fu-berlin.de/unix/network/www/apache/
MASTER_SITE_DEBIAN+= \
http://ftp.debian.org/debian/ \
diff -r c05b1a932e1d -r e17d021a2687 mk/bulk/bsd.bulk-pkg.mk
--- a/mk/bulk/bsd.bulk-pkg.mk Sun Mar 06 02:47:42 2005 +0000
+++ b/mk/bulk/bsd.bulk-pkg.mk Mon Mar 21 15:43:00 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.bulk-pkg.mk,v 1.65.2.4 2005/02/11 15:27:57 tv Exp $
+# $NetBSD: bsd.bulk-pkg.mk,v 1.65.2.5 2005/03/21 15:43:00 tv Exp $
#
# Copyright (c) 1999, 2000 Hubert Feyrer <hubertf%NetBSD.org@localhost>
@@ -143,6 +143,12 @@
# by default, clean up any broken packages
_PRESERVE_WRKDIR?= no
+# create an escaped version of PKGPATH. We do this because
+# in several places we want to be able to use something like
+# foo/bar.baz++ in a regular expression but have it be interpreted
+# literally. So, turn it into foo\/bar\.baz\+\+
+_ESCPKGPATH= ${PKGPATH:C@\/@\\/@g:C@\+@\\+@g:C@\.@\\.@g:Q}
+
# build the cache files used as part of a full bulk build
# Note: we have to install the BULK_PREREQ packages _before_
# extracting the depends tree because some packages like
@@ -297,7 +303,7 @@
${ECHO_MSG} "BULK> Full rebuild in progress..." ; \
${ECHO_MSG} "BULK> Cleaning package and its depends" ;\
if [ "${USE_BULK_CACHE}" = "yes" ]; then \
- for pkgdir in ${PKGPATH} `${GREP} "^${PKGPATH} " ${DEPENDSFILE} | ${SED} -e 's;^.*:;;g'`; do \
+ for pkgdir in ${PKGPATH} `${SED} -n -e "/^${_ESCPKGPATH} / s;^[^:]*:;;p" ${DEPENDSFILE}`; do \
${DO} (cd ${PKGSRCDIR}/$$pkgdir && ${MAKE} clean) ; \
done ;\
else \
@@ -315,7 +321,9 @@
fi; \
if ${PKG_INFO} -qe $$pkgname ; then \
${SHCOMMENT} "Remove only unneeded pkgs" ; \
- if ${EGREP} "^${PKGPATH} .* $$pkgdir( |$$)" ${DEPENDSFILE} >/dev/null 2>&1; then \
+ pkgdir2=`${ECHO} "$$pkgdir" | ${AWK} '{gsub(/\//,"\\\\/"); gsub(/\+/,"\\\\+"); gsub(/ /,"\\\\ "); gsub(/\./,"\\\\."); print}'` ; \
+ tmp=`${SED} -n -e "/^${_ESCPKGPATH} .* $$pkgdir2 / s;.*;yes;p" ${DEPENDSFILE}` ; \
+ if test "X$$tmp" = "Xyes" ; then \
${ECHO_MSG} "BULK> ${PKGNAME} requires installed package $$pkgname ($$pkgdir) to build." ;\
else \
case "${BULK_PREREQ}" in \
@@ -345,7 +353,7 @@
if [ "${USE_BULK_CACHE}" = "yes" ]; then \
${SHCOMMENT} "Install required depends via binarypkgs XXX" ; \
${ECHO_MSG} "BULK> Installing packages which are required to build ${PKGNAME}." ;\
- for pkgdir in `${GREP} "^${PKGPATH} " ${DEPENDSFILE} | ${SED} -e 's;^.*:;;g'` ${BULK_PREREQ} ; do \
+ for pkgdir in `${SED} -n -e "/^${_ESCPKGPATH} / s;^[^:]*:;;p" ${DEPENDSFILE}` ${BULK_PREREQ} ; do \
pkgname=`${GREP} "^$$pkgdir " ${INDEXFILE} | ${AWK} '{print $$2}'` ; \
if [ -z "$$pkgname" ]; then continue ; fi ;\
pkgfile=${PACKAGES}/All/$${pkgname}${PKG_SUFX} ;\
@@ -396,32 +404,35 @@
nbrokenby=0;\
if [ "${USE_BULK_CACHE}" = "yes" ]; then \
${ECHO_MSG} "BULK> Marking all packages which depend upon ${PKGNAME} as broken:"; \
- for pkgdir in `${GREP} "^${PKGPATH} " ${SUPPORTSFILE} | ${SED} -e 's;^.*:;;g'`; do \
- pkgname=`${GREP} "^$$pkgdir " ${INDEXFILE} | ${AWK} '{print $$2}'` ;\
- if [ -z "$$pkgname" ]; then pkgname=unknown ; fi ; \
- ${ECHO_MSG} "BULK> marking package that requires ${PKGNAME} as broken: $$pkgname ($$pkgdir)";\
- pkgerr="-1"; \
- pkgignore=`(cd ${PKGSRCDIR}/$$pkgdir && ${MAKE} show-var VARNAME=PKG_FAIL_REASON)`; \
- pkgskip=`(cd ${PKGSRCDIR}/$$pkgdir && ${MAKE} show-var VARNAME=PKG_SKIP_REASON)`; \
- if [ ! -z "$${pkgignore}$${pkgskip}" -a ! -f ${PKGSRCDIR}/$$pkgdir/${BROKENFILE} ]; then \
- ${ECHO_MSG} "BULK> $$pkgname ($$pkgdir) may not be packaged because:" >> ${PKGSRCDIR}/$$pkgdir/${BROKENFILE};\
- ${ECHO_MSG} "BULK> $$pkgignore" >> ${PKGSRCDIR}/$$pkgdir/${BROKENFILE};\
- ${ECHO_MSG} "BULK> $$pkgskip" >> ${PKGSRCDIR}/$$pkgdir/${BROKENFILE};\
- if [ -z "`(cd ${PKGSRCDIR}/$$pkgdir && ${MAKE} show-var VARNAME=BROKEN)`" ]; then \
- pkgerr="0"; \
- else \
- pkgerr="1"; \
+ tmp=`${SED} -n -e "/^${_ESCPKGPATH} / s;^[^:]*:[ ]*;;p" ${SUPPORTSFILE}` ; \
+ if test -n "$$tmp" ; then \
+ for pkgdir in $$tmp ; do \
+ pkgname=`${GREP} "^$$pkgdir " ${INDEXFILE} | ${AWK} '{print $$2}'` ;\
+ if [ -z "$$pkgname" ]; then pkgname=unknown ; fi ; \
+ ${ECHO_MSG} "BULK> marking package that requires ${PKGNAME} as broken: $$pkgname ($$pkgdir)";\
+ pkgerr="-1"; \
+ pkgignore=`(cd ${PKGSRCDIR}/$$pkgdir && ${MAKE} show-var VARNAME=PKG_FAIL_REASON)`; \
+ pkgskip=`(cd ${PKGSRCDIR}/$$pkgdir && ${MAKE} show-var VARNAME=PKG_SKIP_REASON)`; \
+ if [ ! -z "$${pkgignore}$${pkgskip}" -a ! -f ${PKGSRCDIR}/$$pkgdir/${BROKENFILE} ]; then \
+ ${ECHO_MSG} "BULK> $$pkgname ($$pkgdir) may not be packaged because:" >> ${PKGSRCDIR}/$$pkgdir/${BROKENFILE};\
+ ${ECHO_MSG} "BULK> $$pkgignore" >> ${PKGSRCDIR}/$$pkgdir/${BROKENFILE};\
+ ${ECHO_MSG} "BULK> $$pkgskip" >> ${PKGSRCDIR}/$$pkgdir/${BROKENFILE};\
+ if [ -z "`(cd ${PKGSRCDIR}/$$pkgdir && ${MAKE} show-var VARNAME=BROKEN)`" ]; then \
+ pkgerr="0"; \
+ else \
+ pkgerr="1"; \
+ fi; \
fi; \
- fi; \
- ${ECHO_MSG} "BULK> $$pkgname ($$pkgdir) is broken because it depends upon ${PKGNAME} (${PKGPATH}) which is broken." \
- >> ${PKGSRCDIR}/$$pkgdir/${BROKENFILE};\
- ${ECHO_MSG} "Please view the <a href=\"../../${PKGPATH}/${BROKENFILE}\">build log for ${PKGNAME}</a>.<br />" \
- >> ${PKGSRCDIR}/$$pkgdir/${BROKENFILE};\
- nbrokenby=`expr $$nbrokenby + 1`;\
- if ${GREP} -q " $$pkgdir/${BROKENFILE}" ${PKGSRCDIR}/${BROKENFILE} ; then :; else \
- ${ECHO} " $$pkgerr $$pkgdir/${BROKENFILE} 0 " >> ${PKGSRCDIR}/${BROKENFILE} ;\
- fi ;\
- done ;\
+ ${ECHO_MSG} "BULK> $$pkgname ($$pkgdir) is broken because it depends upon ${PKGNAME} (${PKGPATH}) which is broken." \
+ >> ${PKGSRCDIR}/$$pkgdir/${BROKENFILE};\
+ ${ECHO_MSG} "Please view the <a href=\"../../${PKGPATH}/${BROKENFILE}\">build log for ${PKGNAME}</a>.<br />" \
+ >> ${PKGSRCDIR}/$$pkgdir/${BROKENFILE};\
+ nbrokenby=`expr $$nbrokenby + 1`;\
+ if ${GREP} -q " $$pkgdir/${BROKENFILE}" ${PKGSRCDIR}/${BROKENFILE} ; then :; else \
+ ${ECHO} " $$pkgerr $$pkgdir/${BROKENFILE} 0 " >> ${PKGSRCDIR}/${BROKENFILE} ;\
+ fi ;\
+ done ;\
+ fi ;\
fi ;\
nerrors=`${GREP} -c '^\*\*\* Error code' ${BROKENFILE} || true`; \
if [ -f ${INTERACTIVE_COOKIE} ]; then \
@@ -434,7 +445,7 @@
yes|YES) ;; \
*) ${ECHO_MSG} "BULK> Cleaning packages and its depends"; \
if [ "${USE_BULK_CACHE}" = "yes" ]; then \
- for pkgdir in ${PKGPATH} `${GREP} "^${PKGPATH} " ${DEPENDSFILE} | ${SED} -e 's;^.*:;;g'`; do \
+ for pkgdir in ${PKGPATH} `${SED} -n -e "/^${_ESCPKGPATH} / s;^[^:]*:;;p" ${DEPENDSFILE}`; do \
${DO} (cd ${PKGSRCDIR}/$$pkgdir && ${MAKE} clean) ; \
Home |
Main Index |
Thread Index |
Old Index