diff options
| author | tv <tv@pkgsrc.org> | 2005-01-10 16:15:24 +0000 |
|---|---|---|
| committer | tv <tv@pkgsrc.org> | 2005-01-10 16:15:24 +0000 |
| commit | faf99f470ba42d328f1d0684375daf68a2c9d2fe (patch) | |
| tree | be96a418140dc9999174e984bc9109878c4db876 | |
| parent | 9a6df373e464441b86fec5ba96dce04a84516988 (diff) | |
| download | pkgsrc-faf99f470ba42d328f1d0684375daf68a2c9d2fe.tar.gz | |
sync with HEAD
35 files changed, 219 insertions, 198 deletions
diff --git a/mk/AIX.pkg.dist b/mk/AIX.pkg.dist index 171d9447e9a..fc3e9115777 100644 --- a/mk/AIX.pkg.dist +++ b/mk/AIX.pkg.dist @@ -1,5 +1,5 @@ # Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp -# $NetBSD: AIX.pkg.dist,v 1.25.2.1 2004/12/31 20:25:30 tv Exp $ +# $NetBSD: AIX.pkg.dist,v 1.25.2.2 2005/01/10 16:15:24 tv Exp $ # /set type=dir uname=root gname=system mode=0755 @@ -688,6 +688,10 @@ LC_MESSAGES .. .. + my_MM + LC_MESSAGES + .. + .. nb LC_MESSAGES .. diff --git a/mk/BSDOS.pkg.dist b/mk/BSDOS.pkg.dist index e59a85e1fef..b1192f39a78 100644 --- a/mk/BSDOS.pkg.dist +++ b/mk/BSDOS.pkg.dist @@ -1,5 +1,5 @@ # Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp -# $NetBSD: BSDOS.pkg.dist,v 1.25.2.1 2004/12/31 20:25:30 tv Exp $ +# $NetBSD: BSDOS.pkg.dist,v 1.25.2.2 2005/01/10 16:15:24 tv Exp $ # /set type=dir uname=root gname=wheel mode=0755 @@ -688,6 +688,10 @@ LC_MESSAGES .. .. + my_MM + LC_MESSAGES + .. + .. nb LC_MESSAGES .. diff --git a/mk/Darwin.pkg.dist b/mk/Darwin.pkg.dist index d7333a424ab..5a45f91e7ad 100644 --- a/mk/Darwin.pkg.dist +++ b/mk/Darwin.pkg.dist @@ -1,5 +1,5 @@ # Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp -# $NetBSD: Darwin.pkg.dist,v 1.60.2.1 2004/12/31 20:25:30 tv Exp $ +# $NetBSD: Darwin.pkg.dist,v 1.60.2.2 2005/01/10 16:15:24 tv Exp $ # /set type=dir uname=root gname=wheel mode=0755 @@ -738,6 +738,10 @@ LC_MESSAGES .. .. + my_MM + LC_MESSAGES + .. + .. nb LC_MESSAGES .. diff --git a/mk/Darwin.x11.dist b/mk/Darwin.x11.dist index 0ae777edbaf..d21300774b0 100644 --- a/mk/Darwin.x11.dist +++ b/mk/Darwin.x11.dist @@ -1,4 +1,4 @@ -# $NetBSD: Darwin.x11.dist,v 1.33 2004/09/07 15:47:16 wiz Exp $ +# $NetBSD: Darwin.x11.dist,v 1.33.4.1 2005/01/10 16:15:24 tv Exp $ # FreeBSD Id: BSD.x11.dist,v 1.2 1997/06/10 07:55:10 asami Exp # @@ -494,6 +494,10 @@ LC_MESSAGES .. .. + my_MM + LC_MESSAGES + .. + .. nb LC_MESSAGES .. diff --git a/mk/DragonFly.pkg.dist b/mk/DragonFly.pkg.dist index 2728a962058..323822fb454 100644 --- a/mk/DragonFly.pkg.dist +++ b/mk/DragonFly.pkg.dist @@ -1,4 +1,4 @@ -# $NetBSD: DragonFly.pkg.dist,v 1.1.2.1 2004/12/31 20:25:30 tv Exp $ +# $NetBSD: DragonFly.pkg.dist,v 1.1.2.2 2005/01/10 16:15:24 tv Exp $ # /set type=dir uname=root gname=wheel mode=0755 @@ -737,6 +737,10 @@ LC_MESSAGES .. .. + my_MM + LC_MESSAGES + .. + .. nb LC_MESSAGES .. diff --git a/mk/DragonFly.x11.dist b/mk/DragonFly.x11.dist index 0430330a904..8295150c10d 100644 --- a/mk/DragonFly.x11.dist +++ b/mk/DragonFly.x11.dist @@ -1,4 +1,4 @@ -# $NetBSD: DragonFly.x11.dist,v 1.1 2004/10/31 22:05:02 wiz Exp $ +# $NetBSD: DragonFly.x11.dist,v 1.1.2.1 2005/01/10 16:15:24 tv Exp $ # FreeBSD Id: BSD.x11.dist,v 1.2 1997/06/10 07:55:10 asami Exp # @@ -494,6 +494,10 @@ LC_MESSAGES .. .. + my_MM + LC_MESSAGES + .. + .. nb LC_MESSAGES .. diff --git a/mk/FreeBSD.pkg.dist b/mk/FreeBSD.pkg.dist index c9da899b41b..31a9d9cd862 100644 --- a/mk/FreeBSD.pkg.dist +++ b/mk/FreeBSD.pkg.dist @@ -1,4 +1,4 @@ -# $NetBSD: FreeBSD.pkg.dist,v 1.51.2.1 2004/12/31 20:25:30 tv Exp $ +# $NetBSD: FreeBSD.pkg.dist,v 1.51.2.2 2005/01/10 16:15:24 tv Exp $ # /set type=dir uname=root gname=wheel mode=0755 @@ -737,6 +737,10 @@ LC_MESSAGES .. .. + my_MM + LC_MESSAGES + .. + .. nb LC_MESSAGES .. diff --git a/mk/FreeBSD.x11.dist b/mk/FreeBSD.x11.dist index 88f135013ba..2a16f3a6c86 100644 --- a/mk/FreeBSD.x11.dist +++ b/mk/FreeBSD.x11.dist @@ -1,4 +1,4 @@ -# $NetBSD: FreeBSD.x11.dist,v 1.9 2004/09/07 15:47:16 wiz Exp $ +# $NetBSD: FreeBSD.x11.dist,v 1.9.4.1 2005/01/10 16:15:24 tv Exp $ # FreeBSD Id: BSD.x11.dist,v 1.2 1997/06/10 07:55:10 asami Exp # @@ -494,6 +494,10 @@ LC_MESSAGES .. .. + my_MM + LC_MESSAGES + .. + .. nb LC_MESSAGES .. diff --git a/mk/IRIX.pkg.dist b/mk/IRIX.pkg.dist index 029245884a2..5ed251bd3b5 100644 --- a/mk/IRIX.pkg.dist +++ b/mk/IRIX.pkg.dist @@ -1,4 +1,4 @@ -# $NetBSD: IRIX.pkg.dist,v 1.50.2.1 2004/12/31 20:25:30 tv Exp $ +# $NetBSD: IRIX.pkg.dist,v 1.50.2.2 2005/01/10 16:15:24 tv Exp $ # /set type=dir uname=root gname=sys mode=0755 @@ -737,6 +737,10 @@ LC_MESSAGES .. .. + my_MM + LC_MESSAGES + .. + .. nb LC_MESSAGES .. diff --git a/mk/IRIX.x11.dist b/mk/IRIX.x11.dist index 8ba8e7ca76a..b67de9710cd 100644 --- a/mk/IRIX.x11.dist +++ b/mk/IRIX.x11.dist @@ -1,4 +1,4 @@ -# $NetBSD: IRIX.x11.dist,v 1.13 2004/09/07 15:47:16 wiz Exp $ +# $NetBSD: IRIX.x11.dist,v 1.13.4.1 2005/01/10 16:15:24 tv Exp $ # FreeBSD Id: BSD.x11.dist,v 1.2 1997/06/10 07:55:10 asami Exp # @@ -466,6 +466,10 @@ LC_MESSAGES .. .. + my_MM + LC_MESSAGES + .. + .. nb LC_MESSAGES .. diff --git a/mk/Interix.pkg.dist b/mk/Interix.pkg.dist index 2ac1e3a493b..30a43a1c68c 100644 --- a/mk/Interix.pkg.dist +++ b/mk/Interix.pkg.dist @@ -1,5 +1,5 @@ # Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp -# $NetBSD: Interix.pkg.dist,v 1.15.2.1 2004/12/31 20:25:30 tv Exp $ +# $NetBSD: Interix.pkg.dist,v 1.15.2.2 2005/01/10 16:15:24 tv Exp $ # /set type=dir uid=197108 gid=131616 mode=0775 @@ -734,6 +734,10 @@ LC_MESSAGES .. .. + my_MM + LC_MESSAGES + .. + .. nb LC_MESSAGES .. diff --git a/mk/Interix.x11.dist b/mk/Interix.x11.dist index a6cff95ad55..82d624725f1 100644 --- a/mk/Interix.x11.dist +++ b/mk/Interix.x11.dist @@ -1,4 +1,4 @@ -# $NetBSD: Interix.x11.dist,v 1.4 2004/09/07 15:47:16 wiz Exp $ +# $NetBSD: Interix.x11.dist,v 1.4.4.1 2005/01/10 16:15:25 tv Exp $ # FreeBSD Id: BSD.x11.dist,v 1.2 1997/06/10 07:55:10 asami Exp # @@ -494,6 +494,10 @@ LC_MESSAGES .. .. + my_MM + LC_MESSAGES + .. + .. nb LC_MESSAGES .. diff --git a/mk/Linux.pkg.dist b/mk/Linux.pkg.dist index 67654cd0cef..002704d67ad 100644 --- a/mk/Linux.pkg.dist +++ b/mk/Linux.pkg.dist @@ -1,5 +1,5 @@ # Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp -# $NetBSD: Linux.pkg.dist,v 1.67.2.1 2004/12/31 20:25:30 tv Exp $ +# $NetBSD: Linux.pkg.dist,v 1.67.2.2 2005/01/10 16:15:25 tv Exp $ # /set type=dir uname=root gname=sys mode=0755 @@ -738,6 +738,10 @@ LC_MESSAGES .. .. + my_MM + LC_MESSAGES + .. + .. nb LC_MESSAGES .. diff --git a/mk/Linux.x11.dist b/mk/Linux.x11.dist index 2e5326b33e7..138ac76dcda 100644 --- a/mk/Linux.x11.dist +++ b/mk/Linux.x11.dist @@ -1,4 +1,4 @@ -# $NetBSD: Linux.x11.dist,v 1.39 2004/09/07 15:47:16 wiz Exp $ +# $NetBSD: Linux.x11.dist,v 1.39.4.1 2005/01/10 16:15:25 tv Exp $ # FreeBSD Id: BSD.x11.dist,v 1.2 1997/06/10 07:55:10 asami Exp # @@ -494,6 +494,10 @@ LC_MESSAGES .. .. + my_MM + LC_MESSAGES + .. + .. nb LC_MESSAGES .. diff --git a/mk/NetBSD.pkg.dist b/mk/NetBSD.pkg.dist index 747d0f49571..7ae128d9232 100644 --- a/mk/NetBSD.pkg.dist +++ b/mk/NetBSD.pkg.dist @@ -1,5 +1,5 @@ # Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp -# $NetBSD: NetBSD.pkg.dist,v 1.78.2.1 2004/12/31 20:25:30 tv Exp $ +# $NetBSD: NetBSD.pkg.dist,v 1.78.2.2 2005/01/10 16:15:25 tv Exp $ # /set type=dir uname=root gname=wheel mode=0755 @@ -734,6 +734,10 @@ LC_MESSAGES .. .. + my_MM + LC_MESSAGES + .. + .. nb LC_MESSAGES .. diff --git a/mk/NetBSD.x11.dist b/mk/NetBSD.x11.dist index ba9a9234614..9f25f8cdc50 100644 --- a/mk/NetBSD.x11.dist +++ b/mk/NetBSD.x11.dist @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.x11.dist,v 1.40 2004/09/07 15:47:16 wiz Exp $ +# $NetBSD: NetBSD.x11.dist,v 1.40.4.1 2005/01/10 16:15:25 tv Exp $ # FreeBSD Id: BSD.x11.dist,v 1.2 1997/06/10 07:55:10 asami Exp # @@ -494,6 +494,10 @@ LC_MESSAGES .. .. + my_MM + LC_MESSAGES + .. + .. nb LC_MESSAGES .. diff --git a/mk/OSF1.pkg.dist b/mk/OSF1.pkg.dist index 37215f15800..4af4904a569 100644 --- a/mk/OSF1.pkg.dist +++ b/mk/OSF1.pkg.dist @@ -1,4 +1,4 @@ -# $NetBSD: OSF1.pkg.dist,v 1.1.2.1 2004/12/31 20:25:30 tv Exp $ +# $NetBSD: OSF1.pkg.dist,v 1.1.2.2 2005/01/10 16:15:25 tv Exp $ # /set type=dir uname=root gname=system mode=0755 @@ -737,6 +737,10 @@ LC_MESSAGES .. .. + my_MM + LC_MESSAGES + .. + .. nb LC_MESSAGES .. diff --git a/mk/OpenBSD.pkg.dist b/mk/OpenBSD.pkg.dist index 4b20d24498d..fdd58b4b4e2 100644 --- a/mk/OpenBSD.pkg.dist +++ b/mk/OpenBSD.pkg.dist @@ -1,4 +1,4 @@ -# $NetBSD: OpenBSD.pkg.dist,v 1.50.2.1 2004/12/31 20:25:30 tv Exp $ +# $NetBSD: OpenBSD.pkg.dist,v 1.50.2.2 2005/01/10 16:15:25 tv Exp $ # /set type=dir uname=root gname=wheel mode=0755 @@ -737,6 +737,10 @@ LC_MESSAGES .. .. + my_MM + LC_MESSAGES + .. + .. nb LC_MESSAGES .. diff --git a/mk/OpenBSD.x11.dist b/mk/OpenBSD.x11.dist index e14bb82df6c..332f6570e64 100644 --- a/mk/OpenBSD.x11.dist +++ b/mk/OpenBSD.x11.dist @@ -1,4 +1,4 @@ -# $NetBSD: OpenBSD.x11.dist,v 1.27 2004/09/07 15:47:16 wiz Exp $ +# $NetBSD: OpenBSD.x11.dist,v 1.27.4.1 2005/01/10 16:15:25 tv Exp $ # OpenBSD: BSD.x11.dist,v 1.4 2002/06/09 06:15:15 todd Exp # FreeBSD: BSD.x11.dist,v 1.2 1997/06/10 07:55:10 asami Exp @@ -494,6 +494,10 @@ LC_MESSAGES .. .. + my_MM + LC_MESSAGES + .. + .. nb LC_MESSAGES .. diff --git a/mk/SunOS.pkg.dist b/mk/SunOS.pkg.dist index 34987cf9de5..41bb303ee5e 100644 --- a/mk/SunOS.pkg.dist +++ b/mk/SunOS.pkg.dist @@ -1,5 +1,5 @@ # Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp -# $NetBSD: SunOS.pkg.dist,v 1.72.2.1 2004/12/31 20:25:30 tv Exp $ +# $NetBSD: SunOS.pkg.dist,v 1.72.2.2 2005/01/10 16:15:25 tv Exp $ # /set type=dir uname=root gname=sys mode=0755 @@ -298,6 +298,10 @@ LC_MESSAGES .. .. + my_MM + LC_MESSAGES + .. + .. nb LC_MESSAGES .. diff --git a/mk/SunOS.x11.dist b/mk/SunOS.x11.dist index affed9a1d9f..5a3699b2eff 100644 --- a/mk/SunOS.x11.dist +++ b/mk/SunOS.x11.dist @@ -1,4 +1,4 @@ -# $NetBSD: SunOS.x11.dist,v 1.40 2004/09/07 15:47:16 wiz Exp $ +# $NetBSD: SunOS.x11.dist,v 1.40.4.1 2005/01/10 16:15:25 tv Exp $ # FreeBSD Id: BSD.x11.dist,v 1.2 1997/06/10 07:55:10 asami Exp # @@ -388,6 +388,10 @@ LC_MESSAGES .. .. + my_MM + LC_MESSAGES + .. + .. nb LC_MESSAGES .. diff --git a/mk/UnixWare.pkg.dist b/mk/UnixWare.pkg.dist index 1a7df05f59c..59222ee720b 100644 --- a/mk/UnixWare.pkg.dist +++ b/mk/UnixWare.pkg.dist @@ -1,6 +1,6 @@ # Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp # NetBSD: SunOS.pkg.dist,v 1.64 2004/04/01 12:19:09 jmmv Exp -# $NetBSD: UnixWare.pkg.dist,v 1.9.2.1 2004/12/31 20:25:30 tv Exp $ +# $NetBSD: UnixWare.pkg.dist,v 1.9.2.2 2005/01/10 16:15:25 tv Exp $ # /set type=dir uname=root gname=sys mode=0755 @@ -299,6 +299,10 @@ LC_MESSAGES .. .. + my_MM + LC_MESSAGES + .. + .. nb LC_MESSAGES .. diff --git a/mk/apache.mk b/mk/apache.mk index 2ae9f53bf1f..89014807a22 100644 --- a/mk/apache.mk +++ b/mk/apache.mk @@ -1,4 +1,4 @@ -# $NetBSD: apache.mk,v 1.6 2004/07/06 22:49:16 wiz Exp $ +# $NetBSD: apache.mk,v 1.6.4.1 2005/01/10 16:15:25 tv Exp $ # # This Makefile fragment handles Apache dependencies and make variables, # and is meant to be included by packages that require Apache either at @@ -13,7 +13,7 @@ # The available user variables are: # # PKG_APACHE_DEFAULT is a user-settable variable whose value is the default -# apache server to use. Possible values are apache13, apache2 and apache6. +# apache server to use. Possible values are apache13 and apache2. # If there is already a version of apache installed this will have no # effect. # @@ -36,7 +36,7 @@ APACHE_MK= # defined PKG_APACHE_DEFAULT?= # empty -_PKG_APACHES?= apache13 apache2 apache6 +_PKG_APACHES?= apache13 apache2 .if defined(PKG_APACHE_ACCEPTED) . for _ap_ in ${PKG_APACHE_ACCEPTED} @@ -59,7 +59,6 @@ _PKG_APACHE_DEFAULT?= apache13 _APACHE_PKGBASE.apache13= apache-1\* _APACHE_PKGBASE.apache2= apache-2\* -_APACHE_PKGBASE.apache6= apache6 # Mark the acceptable apaches and check which apache packages are installed. .for _ap_ in ${_PKG_APACHE_ACCEPTED} @@ -111,15 +110,12 @@ _PKG_APACHE= "none" BUILDLINK_DEPENDS.apache13?= apache-1.3* BUILDLINK_DEPENDS.apache2?= apache-2* -BUILDLINK_DEPENDS.apache6?= apache6* .if ${_PKG_APACHE} == "apache13" _APACHE_PKGSRCDIR= ../../www/apache .elif ${_PKG_APACHE} == "apache2" _APACHE_PKGSRCDIR= ../../www/apache2 _APACHE_BL_SRCDIR= ${_APACHE_PKGSRCDIR} -.elif ${_PKG_APACHE} == "apache6" -_APACHE_PKGSRCDIR= ../../www/apache6 .endif _APACHE_BL_SRCDIR?= ../../www/apache diff --git a/mk/bdb.buildlink3.mk b/mk/bdb.buildlink3.mk index c85710d9330..6cdecaacf7e 100644 --- a/mk/bdb.buildlink3.mk +++ b/mk/bdb.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: bdb.buildlink3.mk,v 1.12 2004/11/15 17:54:49 jlam Exp $ +# $NetBSD: bdb.buildlink3.mk,v 1.12.2.1 2005/01/10 16:15:25 tv Exp $ # # This Makefile fragment is meant to be included by packages that # require a Berkeley DB implementation. bdb.buildlink3.mk will: @@ -11,11 +11,22 @@ # There are two variables that can be used to tweak the selection of # the Berkeley DB implementation: # -# BDB_DEFAULT is a user-settable variable whose value is the default -# Berkeley DB implementation to use. +# BDB_DEFAULT is a user-settable variable whose value represents the +# package we use when either a db-1.85 interface isn't required, +# or a db-1.85 interface is required, but it's not built-in. +# +# BDB185_DEFAULT is a user-settable variable whose value represents the +# package we use when a db-1.85 interface is required. It defaults +# to "db1" if it's built-in, or to ${BDB_DEFAULT} otherwise. # # BDB_ACCEPTED is a package-settable list of Berkeley DB implementations # that may be used by the package. +# +# Note for when databases/db1 is imported: +# (1) Remove the section that conditionally sets the default +# value for BDB185_DEFAULT and always set it to be "db1". +# (2) Remove the special case for ${BDB_TYPE} == "db1" at the end. +# (3) Move mk/db1.builtin.mk to databases/db1/builtin.mk. BDB_BUILDLINK3_MK:= ${BDB_BUILDLINK3_MK}+ @@ -34,100 +45,60 @@ USE_DB185?= no USE_DB185?= yes . endif -BDB_DEFAULT?= # empty -BDB_ACCEPTED?= ${_BDB_PKGS} - # _BDB_PKGS is an exhaustive list of all of the Berkeley DB -# implementations that may be used with bdb.buildlink3.mk, in order -# of precedence. +# implementations that may be used with bdb.buildlink3.mk. # -. if !empty(USE_DB185:M[yY][eE][sS]) +_BDB_PKGS?= db1 db2 db3 db4 + +BDB_DEFAULT?= db4 +BDB_ACCEPTED?= ${_BDB_PKGS} + CHECK_BUILTIN.db1:= yes -. include "../../mk/db1.builtin.mk" +. include "../../mk/db1.builtin.mk" CHECK_BUILTIN.db1:= no -. if defined(IS_BUILTIN.db1) && !empty(IS_BUILTIN.db1:M[yY][eE][sS]) -# Prefer the builtin db1 support if we requested it -_BDB_PKGS?= db1 db4 db3 db2 -. else -_BDB_PKGS?= db4 db3 db2 db1 -. endif +. if defined(IS_BUILTIN.db1) && !empty(IS_BUILTIN.db1:M[yY][eE][sS]) +BDB185_DEFAULT?= db1 . else -_BDB_PKGS?= db4 db3 db2 +BDB185_DEFAULT?= ${BDB_DEFAULT} . endif -_BDB_PKGBASE.db2= db -_BDB_PKGSRCDIR.db2= ../../databases/db +_BDB_PKGBASE.db2= db +_BDB_PKGSRCDIR.db2= ../../databases/db . for _bdb_ in ${_BDB_PKGS} _BDB_PKGBASE.${_bdb_}?= ${_bdb_} _BDB_PKGSRCDIR.${_bdb_}?= ../../databases/${_bdb_} . endfor -_BDB_DEFAULT= ${BDB_DEFAULT} -_BDB_ACCEPTED= ${BDB_ACCEPTED} - -# Mark the acceptable Berkeley DB packages and check which, if any, are -# already installed. -# -. for _bdb_ in ${_BDB_ACCEPTED} -_BDB_OK.${_bdb_}= yes -. if !defined(_BDB_INSTALLED.${_bdb_}) -_BDB_INSTALLED.${_bdb_}!= \ - if ${PKG_INFO} -qe ${_BDB_PKGBASE.${_bdb_}}; then \ - ${ECHO} "yes"; \ - else \ - ${ECHO} "no"; \ - fi -MAKEFLAGS+= _BDB_INSTALLED.${_bdb_}=${_BDB_INSTALLED.${_bdb_}} -. endif -. endfor - -. if defined(USE_BUILTIN.db1) -_BDB_OK.db1= ${USE_BUILTIN.db1} -_BDB_INSTALLED.db1= ${USE_BUILTIN.db1} -. else -_BDB_OK.db1= no -_BDB_INSTALLED.db1= no -. endif +_BDB_DEFAULT= ${BDB_DEFAULT} +_BDB185_DEFAULT= ${BDB185_DEFAULT} +_BDB_ACCEPTED= ${BDB_ACCEPTED} . if !defined(_BDB_TYPE) -# -# Prefer the default one if it's accepted,... -# -. if !empty(_BDB_DEFAULT) && \ - defined(_BDB_OK.${_BDB_DEFAULT}) && \ - !empty(_BDB_OK.${_BDB_DEFAULT}:M[yY][eE][sS]) +. if !empty(USE_DB185:M[yY][eE][sS]) +_BDB_TYPE= ${_BDB185_DEFAULT} +. else _BDB_TYPE= ${_BDB_DEFAULT} . endif -# -# ...otherwise, use one of the installed Berkeley DB packages,... -# -. for _bdb_ in ${_BDB_ACCEPTED} -. if !empty(_BDB_INSTALLED.${_bdb_}:M[yY][eE][sS]) -_BDB_TYPE?= ${_bdb_} -. endif -. endfor -# -# ...otherwise, just use the first accepted Berkeley DB package. -# -. for _bdb_ in ${_BDB_ACCEPTED} -_BDB_TYPE?= ${_bdb_} -. endfor -_BDB_TYPE?= none -MAKEFLAGS+= _BDB_TYPE=${_BDB_TYPE} . endif +. if !empty(_BDB_ACCEPTED:M${_BDB_TYPE}) BDB_TYPE= ${_BDB_TYPE} -BUILD_DEFS+= BDB_TYPE -BUILD_DEFS+= BDBBASE +. else +BDB_TYPE= none +. endif # Define some public variables to refer to package-specific variables. BDBBASE= ${BUILDLINK_PREFIX.${_BDB_PKGBASE.${BDB_TYPE}}} BDB_LIBS= ${BUILDLINK_LDADD.${_BDB_PKGBASE.${BDB_TYPE}}} +BUILD_DEFS+= BDB_TYPE +BUILD_DEFS+= BDBBASE + .endif # BDB_BUILDLINK3_MK .if ${BDB_TYPE} == "none" -PKG_FAIL_REASON= "No acceptable Berkeley DB implementation found." +PKG_FAIL_REASON= \ + "${_BDB_TYPE} is not an acceptable Berkeley DB type for ${PKGNAME}." .elif ${BDB_TYPE} == "db1" BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndb1} BUILDLINK_PACKAGES+= db1 diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 08fc1a2749d..b4641ab6baa 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1540.2.9 2004/12/31 20:25:30 tv Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1540.2.10 2005/01/10 16:15:25 tv Exp $ # # This file is in the public domain. # @@ -362,6 +362,8 @@ ALL_ENV+= CPPFLAGS=${CPPFLAGS:Q} 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+= FC=${FC:Q} ALL_ENV+= FFLAGS=${FFLAGS:Q} ALL_ENV+= LDFLAGS=${LDFLAGS:Q} ALL_ENV+= LINKER_RPATH_FLAG=${LINKER_RPATH_FLAG:Q} @@ -1095,8 +1097,6 @@ _REAL_TARGETS.wrapper+= wrapper-message pre-wrapper do-wrapper post-wrapper CONFIGURE_ENV+= ${ALL_ENV} CONFIGURE_ENV+= ac_given_INSTALL="`${TYPE} ${INSTALL} | ${AWK} '{ print $$NF }'` -c -o ${BINOWN} -g ${BINGRP}" CONFIGURE_ENV+= AWK=${AWK:Q} -CONFIGURE_ENV+= F77=${FC:Q} -CONFIGURE_ENV+= FC=${FC:Q} CONFIGURE_ENV+= INSTALL="`${TYPE} ${INSTALL} | ${AWK} '{ print $$NF }'` -c -o ${BINOWN} -g ${BINGRP}" CONFIGURE_ENV+= MAKE=${MAKE_PROGRAM:T:Q} CONFIGURE_ENV+= M4=${M4:Q} diff --git a/mk/bsd.pkg.use.mk b/mk/bsd.pkg.use.mk index b0d4a975ece..b002584ca94 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.4 2004/12/31 20:25:30 tv Exp $ +# $NetBSD: bsd.pkg.use.mk,v 1.1.2.5 2005/01/10 16:15:25 tv Exp $ # # Turn USE_* macros into proper depedency logic. Included near the top of # bsd.pkg.mk, after bsd.prefs.mk. @@ -104,10 +104,6 @@ DEPENDS+= f2c>=20001205nb3:../../lang/f2c . endif FC= ${PKG_FC} F77= ${PKG_FC} -CONFIGURE_ENV+= F77="${F77}" -CONFIGURE_ENV+= FFLAGS="${FFLAGS:M*}" -MAKE_ENV+= F77="${F77}" -MAKE_ENV+= FC="${FC}" .endif ### USE_LIBTOOL, PKG_[SH]LIBTOOL diff --git a/mk/compiler.mk b/mk/compiler.mk index 110a38f5ddd..0dcabb24735 100644 --- a/mk/compiler.mk +++ b/mk/compiler.mk @@ -1,4 +1,4 @@ -# $NetBSD: compiler.mk,v 1.38.2.3 2004/11/30 15:10:47 tv Exp $ +# $NetBSD: compiler.mk,v 1.38.2.4 2005/01/10 16:15:25 tv Exp $ # # This Makefile fragment implements handling for supported C/C++/Fortran # compilers. @@ -10,15 +10,15 @@ # pkgsrc to build packages. # # Valid values are: -# distcc distributed C/C++ (chainable) +# ccc Compaq C Compilers (Tru64) # ccache compiler cache (chainable) +# distcc distributed C/C++ (chainable) # gcc GNU # mipspro Silicon Graphics, Inc. MIPSpro (n32/n64) # mipspro-ucode Silicon Graphics, Inc. MIPSpro (o32) # sunpro Sun Microsystems, Inc. WorkShip/Forte/Sun # ONE Studio # xlc IBM's XL C/C++ compiler suite -# ccc Compaq C Compilers (Tru64) # # The default is "gcc". You can use ccache and/or distcc with an # appropriate PKGSRC_COMPILER setting, e.g. "ccache distcc gcc". diff --git a/mk/compiler/ccache.mk b/mk/compiler/ccache.mk index deb3f791993..e563d6d4f0c 100644 --- a/mk/compiler/ccache.mk +++ b/mk/compiler/ccache.mk @@ -1,4 +1,4 @@ -# $NetBSD: ccache.mk,v 1.20.2.2 2004/11/30 15:06:35 tv Exp $ +# $NetBSD: ccache.mk,v 1.20.2.3 2005/01/10 16:15:25 tv Exp $ .if !defined(COMPILER_CCACHE_MK) COMPILER_CCACHE_MK= defined @@ -65,9 +65,9 @@ BUILD_DEPENDS+= ccache-[0-9]*:../../devel/ccache # BUILD_ENV+= CCACHE_HASHCC=${CC_VERSION_STRING:Q} -.if defined(CCACHE_DIR) && !empty(CCACHE_DIR) +. if defined(CCACHE_DIR) && !empty(CCACHE_DIR) BUILD_ENV+= CCACHE_DIR=${CCACHE_DIR:Q} -.endif +. endif # Create symlinks for the compiler into ${WRKDIR}. . for _var_ in ${_CCACHE_VARS} diff --git a/mk/compiler/distcc.mk b/mk/compiler/distcc.mk index a05ef586cfd..e53bfd638c8 100644 --- a/mk/compiler/distcc.mk +++ b/mk/compiler/distcc.mk @@ -1,4 +1,4 @@ -# $NetBSD: distcc.mk,v 1.21.2.2 2004/11/30 15:06:35 tv Exp $ +# $NetBSD: distcc.mk,v 1.21.2.3 2005/01/10 16:15:25 tv Exp $ .if !defined(COMPILER_DISTCC_MK) COMPILER_DISTCC_MK= defined @@ -60,15 +60,15 @@ PREPEND_PATH+= ${_DISTCC_DIR}/bin # Add the dependency on distcc. BUILD_DEPENDS+= distcc-[0-9]*:../../devel/distcc -.if defined(DISTCC_HOSTS) && !empty(DISTCC_HOSTS) +. if defined(DISTCC_HOSTS) && !empty(DISTCC_HOSTS) BUILD_ENV+= DISTCC_HOSTS=${DISTCC_HOSTS:Q} -.endif -.if defined(DISTCC_SSH) && !empty(DISTCC_SSH) +. endif +. if defined(DISTCC_SSH) && !empty(DISTCC_SSH) BUILD_ENV+= DISTCC_SSH=${DISTCC_SSH:Q} -.endif -.if defined(DISTCC_VERBOSE) && !empty(DISTCC_VERBOSE) +. endif +. if defined(DISTCC_VERBOSE) && !empty(DISTCC_VERBOSE) BUILD_ENV+= DISTCC_VERBOSE=${DISTCC_VERBOSE:Q} -.endif +. endif # Create symlinks for the compiler into ${WRKDIR}. . for _var_ in ${_DISTCC_VARS} diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf index 47fdc5256e3..5e2005e0a8b 100644 --- a/mk/defaults/mk.conf +++ b/mk/defaults/mk.conf @@ -1,4 +1,4 @@ -# $NetBSD: mk.conf,v 1.14.2.4 2004/12/31 20:25:30 tv Exp $ +# $NetBSD: mk.conf,v 1.14.2.5 2005/01/10 16:15:25 tv Exp $ # # A file providing defaults for pkgsrc and the packages collection. @@ -672,38 +672,38 @@ AMANDA_VAR?= ${VARBASE}/amanda # Default: ${VARBASE}/amanda #APACHE_CUSTOM_CFLAGS= -# Used in apache and apache6 to pass extra CFLAGS to the compiler during +# Used in apache to pass extra CFLAGS to the compiler during # the build. # Possible: any legal compiler flags, e.g. -O6 -DHARD_SERVER_LIMIT=512 # Default: not defined #APACHE_PERF_TUNING= YES -# Used in apache and apache6 to optimize for maximum performance. +# Used in apache to optimize for maximum performance. # Possible: not defined, YES # Default: not defined APACHE_USER?= www -# Used in apache, apache2, apache6, isap, and smb2www to specify the user +# Used in apache, apache2, isap, and smb2www to specify the user # allowed to execute the `suexec' wrapper. Expected to be the user the # httpd server normally runs as. # Possible: any user name # Default: www APACHE_GROUP?= www -# Used in apache, apache2, apache6, squirrelmail, and iasp to specify +# Used in apache, apache2, squirrelmail, and iasp to specify # the default group of the user allowed to execute the `suexec' wrapper. # Expected to be the group the httpd server normally runs as. # Possible: any group name # Default: www #APACHE_SUEXEC_CONFIGURE_ARGS= --suexec-uidmin=1000 -# Used in apache, apache2, and apache6 to specify additional suexec options +# Used in apache and apache2 to specify additional suexec options # to be passed to the configure script. # Possible: any --suexec-* options recognized by the Apache configure script. # Default: not defined APACHE_SUEXEC_DOCROOT?= ${LOCALBASE}/share/httpd/htdocs -# Used in apache, apache2, and apache6 to specify the document space in +# Used in apache and apache2 to specify the document space in # which suexec will be allowed to work. # Possible: Any valid directory # Default: ${LOCALBASE}/share/httpd/htdocs diff --git a/mk/dlopen.builtin.mk b/mk/dlopen.builtin.mk index ff963f2df2e..22b1b3e0506 100644 --- a/mk/dlopen.builtin.mk +++ b/mk/dlopen.builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: dlopen.builtin.mk,v 1.6.2.4 2004/12/31 20:25:30 tv Exp $ +# $NetBSD: dlopen.builtin.mk,v 1.6.2.5 2005/01/10 16:15:25 tv Exp $ .for _lib_ in dl . if !defined(_BLNK_LIB_FOUND.${_lib_}) @@ -17,7 +17,7 @@ BUILDLINK_VARS+= _BLNK_LIB_FOUND.${_lib_} .if !defined(IS_BUILTIN.dl) IS_BUILTIN.dl= no -. if exists(/usr/include/dlfcn.h) +. if exists(/usr/include/dlfcn.h) || exists(/opt/gcc.3.3/include/dlfcn.h) IS_BUILTIN.dl= yes . endif BUILDLINK_VARS+= IS_BUILTIN.dl diff --git a/mk/install/install b/mk/install/install index a28fb956c8a..39781a08694 100644 --- a/mk/install/install +++ b/mk/install/install @@ -1,6 +1,6 @@ # start of install # -# $NetBSD: install,v 1.32 2004/10/11 22:04:19 reed Exp $ +# $NetBSD: install,v 1.32.2.1 2005/01/10 16:15:25 tv Exp $ if [ -z "${CONF_FILES}" -a -z "${CONF_FILES_PERMS}" -a \ -z "${SUPPORT_FILES}" -a -z "${SUPPORT_FILES_PERMS}" -o \ @@ -105,6 +105,15 @@ PRE-INSTALL) fi done fi + if ! msgempty; then + ${ECHO} "===========================================================================" + msgprint + ${ECHO} "" + ${ECHO} "===========================================================================" + fi + if [ ${_pkg_exit} -gt 0 ]; then + exit ${_pkg_exit} + fi # Create package directories at pre-install time. # diff --git a/mk/krb5.buildlink3.mk b/mk/krb5.buildlink3.mk index 7183369d552..63195a747d4 100644 --- a/mk/krb5.buildlink3.mk +++ b/mk/krb5.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: krb5.buildlink3.mk,v 1.7 2004/03/30 18:09:43 jlam Exp $ +# $NetBSD: krb5.buildlink3.mk,v 1.7.6.1 2005/01/10 16:15:25 tv Exp $ # # This Makefile fragment is meant to be included by packages that # require a Kerberos 5 implementation. krb5.buildlink3.mk will: @@ -20,7 +20,7 @@ KRB5_BUILDLINK3_MK:= ${KRB5_BUILDLINK3_MK}+ .include "../../mk/bsd.prefs.mk" .if !empty(KRB5_BUILDLINK3_MK:M+) -KRB5_DEFAULT?= # empty +KRB5_DEFAULT?= heimdal KRB5_ACCEPTED?= ${_KRB5_PKGS} # This is an exhaustive list of all of the Kerberos 5 implementations @@ -31,70 +31,30 @@ _KRB5_PKGS?= heimdal mit-krb5 _KRB5_DEFAULT= ${KRB5_DEFAULT} _KRB5_ACCEPTED= ${KRB5_ACCEPTED} -# Mark the acceptable Kerberos 5 packages and check which, if any, are -# already installed. -# -. for _krb5_ in ${_KRB5_ACCEPTED} -_KRB5_OK.${_krb5_}= yes -. if !defined(_KRB5_INSTALLED.${_krb5_}) -_KRB5_INSTALLED.${_krb5_}!= \ - if ${PKG_INFO} -qe ${_krb5_}; then \ - ${ECHO} "yes"; \ - else \ - ${ECHO} "no"; \ - fi -MAKEFLAGS+= _KRB5_INSTALLED.${_krb5_}=${_KRB5_INSTALLED.${_krb5_}} -. endif -. endfor +_KRB5_TYPE?= ${_KRB5_DEFAULT} -. if !defined(_KRB5_TYPE) -# -# Prefer the default one if it's accepted,... -# -. if !empty(_KRB5_DEFAULT) && \ - defined(_KRB5_OK.${_KRB5_DEFAULT}) && \ - !empty(_KRB5_OK.${_KRB5_DEFAULT}:M[yY][eE][sS]) -_KRB5_TYPE= ${_KRB5_DEFAULT} -. endif -# -# ...otherwise, use one of the installed Kerberos 5 packages,... -# -. for _krb5_ in ${_KRB5_ACCEPTED} -. if !empty(_KRB5_INSTALLED.${_krb5_}:M[yY][eE][sS]) -_KRB5_TYPE?= ${_krb5_} -. else -_KRB5_FIRSTACCEPTED?= ${_krb5_} -. endif -. endfor -# -# ...otherwise, just use the first accepted Kerberos 5 package. -# -. if defined(_KRB5_FIRSTACCEPTED) -_KRB5_TYPE?= ${_KRB5_FIRSTACCEPTED} -. endif -_KRB5_TYPE?= none -MAKEFLAGS+= _KRB5_TYPE=${_KRB5_TYPE} +. if !empty(_KRB5_ACCEPTED:M${_KRB5_TYPE}) +KRB5_TYPE= ${_KRB5_TYPE} +. else +KRB5_TYPE= none . endif +KRB5BASE= ${BUILDLINK_PREFIX.${KRB5_TYPE}} -KRB5_TYPE= ${_KRB5_TYPE} BUILD_DEFS+= KRB5_TYPE +BUILD_DEFS+= KRB5BASE -.endif # KRB5_BUILDLINK3_MK - -.if ${KRB5_TYPE} == "none" -PKG_FAIL_REASON= "No acceptable Kerberos 5 implementation found." -.else -# # Packages that use Kerberos are automatically categorized as restricted # packages. # CRYPTO+= uses Kerberos encryption code -. if ${KRB5_TYPE} == "heimdal" -KRB5BASE= ${BUILDLINK_PREFIX.heimdal} -. include "../../security/heimdal/buildlink3.mk" -. elif ${KRB5_TYPE} == "mit-krb5" -KRB5BASE= ${BUILDLINK_PREFIX.mit-krb5} -. include "../../security/mit-krb5/buildlink3.mk" -. endif + +.endif # KRB5_BUILDLINK3_MK + +.if ${KRB5_TYPE} == "none" +PKG_FAIL_REASON= \ + "${_KRB5_TYPE} is not an acceptable Kerberos 5 type for ${PKGNAME}." +.elif ${KRB5_TYPE} == "heimdal" +. include "../../security/heimdal/buildlink3.mk" +.elif ${KRB5_TYPE} == "mit-krb5" +. include "../../security/mit-krb5/buildlink3.mk" .endif -BUILD_DEFS+= KRB5BASE diff --git a/mk/wrapper/bsd.wrapper.mk b/mk/wrapper/bsd.wrapper.mk index 0a25dcbec53..a9e84a2452a 100644 --- a/mk/wrapper/bsd.wrapper.mk +++ b/mk/wrapper/bsd.wrapper.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.wrapper.mk,v 1.12.2.5 2004/12/09 17:15:01 tv Exp $ +# $NetBSD: bsd.wrapper.mk,v 1.12.2.6 2005/01/10 16:15:25 tv Exp $ # # Copyright (c) 2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -217,11 +217,7 @@ _WRAP_LOGIC.${_wrappee_}?= ${_WRAP_LOGIC} _WRAP_SCAN.${_wrappee_}?= ${_WRAP_SCAN} _WRAP_TRANSFORM.${_wrappee_}?= ${_WRAP_TRANSFORM} _WRAP_TRANSFORM_SED.${_wrappee_}?= ${_WRAP_TRANSFORM_SED} -. if !empty(_WRAP_TRANSFORM_SED.${_wrappee_}) -_WRAP_SKIP_TRANSFORM.${_wrappee_}?= no -. else _WRAP_SKIP_TRANSFORM.${_wrappee_}?= ${_WRAP_SKIP_TRANSFORM} -. endif .endfor # _WRAPPEES .if !empty(PKGSRC_COMPILER:Maix-xlc) diff --git a/mk/wrapper/logic b/mk/wrapper/logic index e575b42aa23..ce35477d581 100644 --- a/mk/wrapper/logic +++ b/mk/wrapper/logic @@ -1,4 +1,4 @@ -# $NetBSD: logic,v 1.6.2.1 2004/12/09 17:15:01 tv Exp $ +# $NetBSD: logic,v 1.6.2.2 2005/01/10 16:15:25 tv Exp $ # # Copyright (c) 2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -216,9 +216,14 @@ while ! queue_is_empty argbuf; do shquote "$arg"; cachearg="$shquoted" case $arg in -*|/*) - arg=`$echo "X$arg" | $Xsed $transform_sed` - $debug_log $wrapperlog " (logic) to: $arg" - addtocache=yes + case $transform_sed in + "") ;; + *) + arg=`$echo "X$arg" | $Xsed $transform_sed` + $debug_log $wrapperlog " (logic) to: $arg" + addtocache=yes + ;; + esac ;; *) $debug_log $wrapperlog " (logic) to: $arg [untransformed]" |