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/55edce2e8d55
branches: tv-derecurse
changeset: 483973:55edce2e8d55
user: tv <tv%pkgsrc.org@localhost>
date: Fri Dec 03 19:15:00 2004 +0000
description:
sync with HEAD
diffstat:
mk/bsd.pkg.mk | 12 ++++++++----
mk/bsd.sites.mk | 8 +++++++-
mk/buildlink3/PKGVIEWS_UG | 4 ++--
mk/buildlink3/README | 6 +++---
mk/db1.builtin.mk | 26 ++++++++++++++++----------
mk/dlopen.builtin.mk | 4 +++-
mk/platform/UnixWare.mk | 4 ++--
7 files changed, 41 insertions(+), 23 deletions(-)
diffs (216 lines):
diff -r c6da629886fc -r 55edce2e8d55 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk Tue Nov 30 15:10:47 2004 +0000
+++ b/mk/bsd.pkg.mk Fri Dec 03 19:15:00 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1540.2.6 2004/11/23 20:39:19 tv Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1540.2.7 2004/12/03 19:15:00 tv Exp $
#
# This file is in the public domain.
#
@@ -91,9 +91,9 @@
##### Others
_DISTDIR?= ${DISTDIR}/${DIST_SUBDIR}
-ALL_TARGET?= all
BUILD_DEFS?= # empty
BUILD_DEPENDS?= # empty
+BUILD_TARGET?= all
DEPENDS?= # empty
DESCR_SRC?= ${PKGDIR}/DESCR
DIGEST_ALGORITHM?= SHA1
@@ -199,6 +199,10 @@
. endif
.endif # NO_PKGTOOLS_REQD_CHECK
+.if defined(ALL_TARGET)
+PKG_FAIL_REASON+='ALL_TARGET is deprecated and must be replaced with BUILD_TARGET.'
+.endif
+
.if defined(NO_WRKSUBDIR)
PKG_FAIL_REASON+='NO_WRKSUBDIR has been deprecated - please replace it with an explicit'
PKG_FAIL_REASON+='assignment of WRKSRC= $${WRKDIR}'
@@ -2449,7 +2453,7 @@
SUBST_SED.pkgconfig= ${PKGCONFIG_OVERRIDE_SED}
.endif
-# By adding this target, it makes sure the the above PREREQ's work.
+# By adding this target, it makes sure the above PREREQ's work.
.PHONY: pre-configure-override
pre-configure-override: ${_CONFIGURE_PREREQ}
@@ -2539,7 +2543,7 @@
.if !target(do-build)
do-build:
. for DIR in ${BUILD_DIRS}
- ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}cd ${DIR} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS} -f ${MAKEFILE} ${ALL_TARGET}
+ ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}cd ${DIR} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS} -f ${MAKEFILE} ${BUILD_TARGET}
. endfor
.endif
diff -r c6da629886fc -r 55edce2e8d55 mk/bsd.sites.mk
--- a/mk/bsd.sites.mk Tue Nov 30 15:10:47 2004 +0000
+++ b/mk/bsd.sites.mk Fri Dec 03 19:15:00 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sites.mk,v 1.20.2.2 2004/11/30 15:06:34 tv Exp $
+# $NetBSD: bsd.sites.mk,v 1.20.2.3 2004/12/03 19:15:00 tv Exp $
#
# Default MASTER_SITES
@@ -298,6 +298,12 @@
http://mirrors.xmission.com/cygwin/ \
ftp://ftp.ring.gr.jp/archives/pc/gnu-win32/ \
ftp://ftp.funet.fi/pub/mirrors/cygwin.com/pub/cygwin/
+
+MASTER_SITE_IFARCHIVE+= \
+ http://ifarchive.jmac.org/if-archive/ \
+ http://ifarchive.flavorplex.com/if-archive/ \
+ http://ifarchive.heanet.ie/if-archive/ \
+ http://ifarchive.giga.or.at/if-archive/
# The primary backup site.
MASTER_SITE_BACKUP?= \
diff -r c6da629886fc -r 55edce2e8d55 mk/buildlink3/PKGVIEWS_UG
--- a/mk/buildlink3/PKGVIEWS_UG Tue Nov 30 15:10:47 2004 +0000
+++ b/mk/buildlink3/PKGVIEWS_UG Fri Dec 03 19:15:00 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: PKGVIEWS_UG,v 1.1 2004/01/29 06:03:15 jlam Exp $
+$NetBSD: PKGVIEWS_UG,v 1.1.8.1 2004/12/03 19:15:00 tv Exp $
0 User's Guide to pkgviews
==========================
@@ -44,7 +44,7 @@
This creates pkgviews packages instead of overwrite packages for any
packages that support it. The packages that do support pkgviews
-can be identified by searching the package Makefile for the the
+can be identified by searching the package Makefile for the
following line:
PKG_INSTALLATION_TYPES= overwrite pkgviews
diff -r c6da629886fc -r 55edce2e8d55 mk/buildlink3/README
--- a/mk/buildlink3/README Tue Nov 30 15:10:47 2004 +0000
+++ b/mk/buildlink3/README Fri Dec 03 19:15:00 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: README,v 1.4 2003/09/09 09:13:20 jlam Exp $
+$NetBSD: README,v 1.4.10.1 2004/12/03 19:15:00 tv Exp $
0 Package Views
===============
@@ -46,7 +46,7 @@
implementation of package views. In September 2003, Johnny Lam
integrated the functionality on the pkgviews branch into modern
pkgsrc. As part of the integration, a new buildlink3 framework was
-created so that the the ability to isolate builds from differences in
+created so that the ability to isolate builds from differences in
the environment wouldn't be lost.
@@ -68,7 +68,7 @@
The pkg_install tools have been enhanced to handle both binary depoted
packages and binary "overwrite" packages. The pkgsrc internals have
been modified to allow building and installing depoted packages and to
-automatically add a depoted package in the the default view.
+automatically add a depoted package in the default view.
"Overwrite" packages shouldn't be affected by the changes, and can be
freely mixed with pkgviews packages.
diff -r c6da629886fc -r 55edce2e8d55 mk/db1.builtin.mk
--- a/mk/db1.builtin.mk Tue Nov 30 15:10:47 2004 +0000
+++ b/mk/db1.builtin.mk Fri Dec 03 19:15:00 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: db1.builtin.mk,v 1.5.2.1 2004/11/28 20:11:32 tv Exp $
+# $NetBSD: db1.builtin.mk,v 1.5.2.2 2004/12/03 19:15:00 tv Exp $
.for _lib_ in db db1
. if !defined(_BLNK_LIB_FOUND.${_lib_})
@@ -15,6 +15,8 @@
.endfor
.undef _lib_
+_DB_H_HEADERS= /usr/include/db.h /usr/include/db1/db.h
+
.if !defined(IS_BUILTIN.db1)
IS_BUILTIN.db1= no
#
@@ -22,7 +24,7 @@
# else it doesn't support db-1.85 databases.
#
_BLNK_NATIVE_DB1_OK= no
-. for _inc_ in /usr/include/db.h /usr/include/db1/db.h
+. for _inc_ in ${_DB_H_HEADERS}
. if exists(${_inc_})
_BLNK_NATIVE_DB1_OK.${_inc_}!= \
if ${GREP} -q "^\#define.*HASHVERSION.*2$$" ${_inc_}; then \
@@ -56,11 +58,11 @@
.if !empty(CHECK_BUILTIN.db1:M[nN][oO])
. if !empty(USE_BUILTIN.db1:M[yY][eE][sS])
BUILDLINK_PREFIX.db1= /usr
-. if exists(/usr/include/db.h)
-BUILDLINK_INCDIRS.db1= include
-. elif exists(/usr/include/db1/db.h)
-BUILDLINK_INCDIRS.db1= include/db1
-. endif
+. for _inc_ in ${_DB_H_HEADERS}
+. if exists(${_inc_})
+BUILDLINK_INCDIRS.db1?= ${_inc_:H:S/^${BUILDLINK_PREFIX.db1}\///}
+. endif
+. endfor
. if !empty(_BLNK_LIB_FOUND.db:M[yY][eE][sS])
BUILDLINK_LDADD.db1= -ldb
. elif !empty(_BLNK_LIB_FOUND.db1:M[yY][eE][sS])
@@ -73,12 +75,16 @@
BUILDLINK_LIBS.db1= ${BUILDLINK_LDADD.db1}
BUILDLINK_TARGETS+= buildlink-db1-db185-h
-. if !target(buildlink-db1-db185-h)
+. for _inc_ in ${_DB_H_HEADERS}
+. if !target(buildlink-db1-db185-h)
.PHONY: buildlink-db1-db185-h
buildlink-db1-db185-h:
${_PKG_SILENT}${_PKG_DEBUG} \
- ${ECHO} "#include <db.h>" > ${BUILDLINK_DIR}/include/db_185.h
-. endif
+ if ${TEST} ! -f ${BUILDLINK_DIR}/include/db_185.h; then \
+ ${LN} -fs ${_inc_} ${BUILDLINK_DIR}/include/db_185.h; \
+ fi
+. endif
+. endfor
. endif # USE_BUILTIN.db1 == yes
.endif # CHECK_BUILTIN.db1
diff -r c6da629886fc -r 55edce2e8d55 mk/dlopen.builtin.mk
--- a/mk/dlopen.builtin.mk Tue Nov 30 15:10:47 2004 +0000
+++ b/mk/dlopen.builtin.mk Fri Dec 03 19:15:00 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: dlopen.builtin.mk,v 1.6.2.2 2004/11/28 20:11:32 tv Exp $
+# $NetBSD: dlopen.builtin.mk,v 1.6.2.3 2004/12/03 19:15:00 tv Exp $
.for _lib_ in dl
. if !defined(_BLNK_LIB_FOUND.${_lib_})
@@ -71,6 +71,8 @@
# scripts already check for -ldl themselves.
#
BUILDLINK_LDADD.dl= -ldl
+. else
+BUILDLINK_TRANSFORM+= rm:-ldl
. endif
. if !empty(_DLOPEN_REQUIRE_PTHREADS:M[yY][eE][sS])
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
diff -r c6da629886fc -r 55edce2e8d55 mk/platform/UnixWare.mk
--- a/mk/platform/UnixWare.mk Tue Nov 30 15:10:47 2004 +0000
+++ b/mk/platform/UnixWare.mk Fri Dec 03 19:15:00 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: UnixWare.mk,v 1.4 2004/11/16 18:04:00 tv Exp $
+# $NetBSD: UnixWare.mk,v 1.4.2.1 2004/12/03 19:15:00 tv Exp $
#
# Variable definitions for the UnixWare 7 operating system.
@@ -132,7 +132,7 @@
#
# The native linker for UnixWare doesn't really support an option to pass
# rpath directives, but pretend it does anyway since the wrapper scripts
-# will correctly convert it into the the proper LD_RUN_PATH variable.
+# will correctly convert it into the proper LD_RUN_PATH variable.
#
_USE_RPATH= yes # add rpath to LDFLAGS
Home |
Main Index |
Thread Index |
Old Index