pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk Merge pkgviews-mk branch into the HEAD by running:
details: https://anonhg.NetBSD.org/pkgsrc/rev/65620780f7df
branches: trunk
changeset: 460627:65620780f7df
user: jlam <jlam%pkgsrc.org@localhost>
date: Tue Sep 02 06:59:37 2003 +0000
description:
Merge pkgviews-mk branch into the HEAD by running:
cd pkgsrc/mk
cvs update -Pd -A
cvs update -Pd -j pkgviews-mk-base -j pkgviews-mk
diffstat:
mk/Darwin.pkg.dist | 2 +-
mk/Darwin.x11.dist | 2 +-
mk/FreeBSD.pkg.dist | 2 +-
mk/IRIX.pkg.dist | 2 +-
mk/IRIX.x11.dist | 2 +-
mk/Linux.pkg.dist | 2 +-
mk/Linux.x11.dist | 2 +-
mk/NetBSD.pkg.dist | 2 +-
mk/NetBSD.x11.dist | 2 +-
mk/OpenBSD.pkg.dist | 2 +-
mk/OpenBSD.x11.dist | 2 +-
mk/SunOS.pkg.dist | 2 +-
mk/SunOS.x11.dist | 2 +-
mk/bsd.pkg.defaults.mk | 18 +-
mk/bsd.pkg.install.mk | 8 +-
mk/bsd.pkg.mk | 425 +++++++++--
mk/bsd.prefs.mk | 56 +-
mk/buildlink2/NOTES | 2 +-
mk/buildlink2/bsd.buildlink2.mk | 27 +-
mk/buildlink2/gen-transform.sh | 12 +-
mk/buildlink2/libtool-fix-la | 2 +-
mk/buildlink2/libtool.sh | 2 +-
mk/buildlink2/wrapper.sh | 2 +-
mk/buildlink3/README | 159 ++++
mk/buildlink3/TODO | 43 +
mk/buildlink3/bsd.buildlink3.mk | 1285 ++++++++++++++++++++++++++++++++++++
mk/buildlink3/gen-transform.sh | 223 ++++++
mk/buildlink3/ld-post-cache | 11 +
mk/buildlink3/ld-post-logic | 14 +
mk/buildlink3/libtool-do-install | 25 +
mk/buildlink3/libtool-fix-la | 275 +++++++
mk/buildlink3/libtool-post-cache | 12 +
mk/buildlink3/libtool-post-logic | 57 +
mk/buildlink3/libtool.sh | 98 ++
mk/buildlink3/logic | 75 ++
mk/buildlink3/marshall | 13 +
mk/buildlink3/post-cache | 4 +
mk/buildlink3/pre-cache | 3 +
mk/buildlink3/sunpro-cc-post-cache | 12 +
mk/buildlink3/sunpro-cc-post-logic | 30 +
mk/buildlink3/wrapper.sh | 67 +
mk/bulk/bsd.bulk-pkg.mk | 10 +-
mk/bulk/mksandbox | 2 +-
mk/bulk/post-build | 2 +-
mk/bulk/pre-build | 56 +-
mk/bulk/tflat | 2 +-
mk/defs.Darwin.mk | 2 +-
mk/defs.FreeBSD.mk | 2 +-
mk/defs.IRIX.mk | 2 +-
mk/defs.Linux.mk | 2 +-
mk/defs.NetBSD.mk | 2 +-
mk/defs.OpenBSD.mk | 2 +-
mk/defs.SunOS.mk | 3 +-
mk/emacs.mk | 2 +-
mk/gcc.buildlink2.mk | 2 +-
mk/install/deinstall | 51 +-
mk/install/header | 10 +-
mk/install/install | 42 +-
mk/install/install-info | 4 +-
mk/java-vm.mk | 2 +-
mk/pthread.buildlink2.mk | 2 +-
mk/scripts/genindex.awk | 2 +-
mk/subst.mk | 2 +-
mk/texinfo.mk | 2 +-
mk/tools.mk | 2 +-
mk/x11.buildlink2.mk | 24 -
66 files changed, 3005 insertions(+), 215 deletions(-)
diffs (truncated from 4141 to 300 lines):
diff -r 9c55da34a0bd -r 65620780f7df mk/Darwin.pkg.dist
--- a/mk/Darwin.pkg.dist Tue Sep 02 06:16:33 2003 +0000
+++ b/mk/Darwin.pkg.dist Tue Sep 02 06:59:37 2003 +0000
@@ -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.35 2003/08/27 10:55:50 wiz Exp $
+# $NetBSD: Darwin.pkg.dist,v 1.36 2003/09/02 06:59:37 jlam Exp $
#
/set type=dir uname=root gname=wheel mode=0755
diff -r 9c55da34a0bd -r 65620780f7df mk/Darwin.x11.dist
--- a/mk/Darwin.x11.dist Tue Sep 02 06:16:33 2003 +0000
+++ b/mk/Darwin.x11.dist Tue Sep 02 06:59:37 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Darwin.x11.dist,v 1.24 2003/08/27 10:55:51 wiz Exp $
+# $NetBSD: Darwin.x11.dist,v 1.25 2003/09/02 06:59:37 jlam Exp $
# FreeBSD Id: BSD.x11.dist,v 1.2 1997/06/10 07:55:10 asami Exp
#
diff -r 9c55da34a0bd -r 65620780f7df mk/FreeBSD.pkg.dist
--- a/mk/FreeBSD.pkg.dist Tue Sep 02 06:16:33 2003 +0000
+++ b/mk/FreeBSD.pkg.dist Tue Sep 02 06:59:37 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: FreeBSD.pkg.dist,v 1.26 2003/08/27 10:55:51 wiz Exp $
+# $NetBSD: FreeBSD.pkg.dist,v 1.27 2003/09/02 06:59:38 jlam Exp $
#
/set type=dir uname=root gname=wheel mode=0755
diff -r 9c55da34a0bd -r 65620780f7df mk/IRIX.pkg.dist
--- a/mk/IRIX.pkg.dist Tue Sep 02 06:16:33 2003 +0000
+++ b/mk/IRIX.pkg.dist Tue Sep 02 06:59:37 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: IRIX.pkg.dist,v 1.25 2003/08/27 10:55:51 wiz Exp $
+# $NetBSD: IRIX.pkg.dist,v 1.26 2003/09/02 06:59:38 jlam Exp $
#
/set type=dir uname=root gname=sys mode=0755
diff -r 9c55da34a0bd -r 65620780f7df mk/IRIX.x11.dist
--- a/mk/IRIX.x11.dist Tue Sep 02 06:16:33 2003 +0000
+++ b/mk/IRIX.x11.dist Tue Sep 02 06:59:37 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: IRIX.x11.dist,v 1.4 2003/08/27 10:55:51 wiz Exp $
+# $NetBSD: IRIX.x11.dist,v 1.5 2003/09/02 06:59:38 jlam Exp $
# FreeBSD Id: BSD.x11.dist,v 1.2 1997/06/10 07:55:10 asami Exp
#
diff -r 9c55da34a0bd -r 65620780f7df mk/Linux.pkg.dist
--- a/mk/Linux.pkg.dist Tue Sep 02 06:16:33 2003 +0000
+++ b/mk/Linux.pkg.dist Tue Sep 02 06:59:37 2003 +0000
@@ -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.42 2003/08/27 10:55:51 wiz Exp $
+# $NetBSD: Linux.pkg.dist,v 1.43 2003/09/02 06:59:38 jlam Exp $
#
/set type=dir uname=root gname=sys mode=0755
diff -r 9c55da34a0bd -r 65620780f7df mk/Linux.x11.dist
--- a/mk/Linux.x11.dist Tue Sep 02 06:16:33 2003 +0000
+++ b/mk/Linux.x11.dist Tue Sep 02 06:59:37 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Linux.x11.dist,v 1.30 2003/08/27 10:55:51 wiz Exp $
+# $NetBSD: Linux.x11.dist,v 1.31 2003/09/02 06:59:39 jlam Exp $
# FreeBSD Id: BSD.x11.dist,v 1.2 1997/06/10 07:55:10 asami Exp
#
diff -r 9c55da34a0bd -r 65620780f7df mk/NetBSD.pkg.dist
--- a/mk/NetBSD.pkg.dist Tue Sep 02 06:16:33 2003 +0000
+++ b/mk/NetBSD.pkg.dist Tue Sep 02 06:59:37 2003 +0000
@@ -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.52 2003/08/27 10:55:51 wiz Exp $
+# $NetBSD: NetBSD.pkg.dist,v 1.53 2003/09/02 06:59:39 jlam Exp $
#
/set type=dir uname=root gname=wheel mode=0755
diff -r 9c55da34a0bd -r 65620780f7df mk/NetBSD.x11.dist
--- a/mk/NetBSD.x11.dist Tue Sep 02 06:16:33 2003 +0000
+++ b/mk/NetBSD.x11.dist Tue Sep 02 06:59:37 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.x11.dist,v 1.31 2003/08/27 10:55:51 wiz Exp $
+# $NetBSD: NetBSD.x11.dist,v 1.32 2003/09/02 06:59:39 jlam Exp $
# FreeBSD Id: BSD.x11.dist,v 1.2 1997/06/10 07:55:10 asami Exp
#
diff -r 9c55da34a0bd -r 65620780f7df mk/OpenBSD.pkg.dist
--- a/mk/OpenBSD.pkg.dist Tue Sep 02 06:16:33 2003 +0000
+++ b/mk/OpenBSD.pkg.dist Tue Sep 02 06:59:37 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: OpenBSD.pkg.dist,v 1.25 2003/08/27 10:55:51 wiz Exp $
+# $NetBSD: OpenBSD.pkg.dist,v 1.26 2003/09/02 06:59:39 jlam Exp $
#
/set type=dir uname=root gname=wheel mode=0755
diff -r 9c55da34a0bd -r 65620780f7df mk/OpenBSD.x11.dist
--- a/mk/OpenBSD.x11.dist Tue Sep 02 06:16:33 2003 +0000
+++ b/mk/OpenBSD.x11.dist Tue Sep 02 06:59:37 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: OpenBSD.x11.dist,v 1.18 2003/08/27 10:55:51 wiz Exp $
+# $NetBSD: OpenBSD.x11.dist,v 1.19 2003/09/02 06:59:40 jlam 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
diff -r 9c55da34a0bd -r 65620780f7df mk/SunOS.pkg.dist
--- a/mk/SunOS.pkg.dist Tue Sep 02 06:16:33 2003 +0000
+++ b/mk/SunOS.pkg.dist Tue Sep 02 06:59:37 2003 +0000
@@ -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.47 2003/08/27 10:55:51 wiz Exp $
+# $NetBSD: SunOS.pkg.dist,v 1.48 2003/09/02 06:59:40 jlam Exp $
#
/set type=dir uname=root gname=sys mode=0755
diff -r 9c55da34a0bd -r 65620780f7df mk/SunOS.x11.dist
--- a/mk/SunOS.x11.dist Tue Sep 02 06:16:33 2003 +0000
+++ b/mk/SunOS.x11.dist Tue Sep 02 06:59:37 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: SunOS.x11.dist,v 1.31 2003/08/27 10:55:52 wiz Exp $
+# $NetBSD: SunOS.x11.dist,v 1.32 2003/09/02 06:59:41 jlam Exp $
# FreeBSD Id: BSD.x11.dist,v 1.2 1997/06/10 07:55:10 asami Exp
#
diff -r 9c55da34a0bd -r 65620780f7df mk/bsd.pkg.defaults.mk
--- a/mk/bsd.pkg.defaults.mk Tue Sep 02 06:16:33 2003 +0000
+++ b/mk/bsd.pkg.defaults.mk Tue Sep 02 06:59:37 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.defaults.mk,v 1.176 2003/08/24 01:58:56 taca Exp $
+# $NetBSD: bsd.pkg.defaults.mk,v 1.177 2003/09/02 06:59:41 jlam Exp $
#
# A file providing defaults for pkgsrc and the packages collection.
@@ -153,6 +153,12 @@
# Possible: any directories
# Default: none
+PKG_INSTALLATION_PREFS?= overwrite pkgviews
+# This is a whitespace-separated list of installation types to try when
+# building a package, in order of preference.
+# Possible: any of: overwrite, pkgviews
+# Default: overwrite pkgviews
+
PACKAGES?= ${_PKGSRCDIR}/packages
# Store generated packages on a per-architecture base
# Possible: any path you like
@@ -1465,6 +1471,16 @@
# Possible: YES, not defined
# Default: not defined
+PKG_INSTALLATION_TYPES?= overwrite
+# This is a whitespace-separated list of installation types supported
+# by the package.
+#
+# *NOTE*: This variable *must* be set in the package Makefile *before*
+# the inclusion of bsd.prefs.mk.
+#
+# Possible: any of: overwrite, pkgviews
+# Default: overwrite
+
#PKG_JVM=
# Used to choose a java virtual machine for packages which use Java.
# ${JAVA_HOME} will be set based on this choice, if unset
diff -r 9c55da34a0bd -r 65620780f7df mk/bsd.pkg.install.mk
--- a/mk/bsd.pkg.install.mk Tue Sep 02 06:16:33 2003 +0000
+++ b/mk/bsd.pkg.install.mk Tue Sep 02 06:59:37 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.install.mk,v 1.45 2003/08/30 22:53:39 jlam Exp $
+# $NetBSD: bsd.pkg.install.mk,v 1.46 2003/09/02 06:59:41 jlam Exp $
#
# This Makefile fragment is included by package Makefiles to use the common
# INSTALL/DEINSTALL scripts. To use this Makefile fragment, simply:
@@ -62,9 +62,12 @@
FILES_SUBST+= PREFIX=${PREFIX}
FILES_SUBST+= LOCALBASE=${LOCALBASE}
FILES_SUBST+= X11BASE=${X11BASE}
-FILES_SUBST+= PKG_SYSCONFBASE=${PKG_SYSCONFBASE}
+FILES_SUBST+= PKG_SYSCONFBASE=${_PKG_SYSCONFBASE}
+FILES_SUBST+= PKG_SYSCONFDEPOTBASE=${PKG_SYSCONFDEPOTBASE}
+FILES_SUBST+= PKG_SYSCONFVIEWBASE=${PKG_SYSCONFVIEWBASE}
FILES_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
FILES_SUBST+= PKGBASE=${PKGBASE}
+FILES_SUBST+= PKG_INSTALLATION_TYPE=${PKG_INSTALLATION_TYPE}
# PKG_USERS represents the users to create for the package. It is a
# space-separated list of elements of the form
@@ -246,6 +249,7 @@
FILES_SUBST+= HEAD=${HEAD:Q}
FILES_SUBST+= ID=${ID:Q}
FILES_SUBST+= INSTALL_INFO=${INSTALL_INFO:Q}
+FILES_SUBST+= LINKFARM=${LINKFARM:Q}
FILES_SUBST+= LN=${LN:Q}
FILES_SUBST+= MKDIR=${MKDIR:Q}
FILES_SUBST+= MV=${MV:Q}
diff -r 9c55da34a0bd -r 65620780f7df mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk Tue Sep 02 06:16:33 2003 +0000
+++ b/mk/bsd.pkg.mk Tue Sep 02 06:59:37 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1251 2003/08/31 10:29:16 wiz Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1252 2003/09/02 06:59:42 jlam Exp $
#
# This file is in the public domain.
#
@@ -87,14 +87,58 @@
INTERACTIVE_STAGE?= none
-# Set the default BUILDLINK_DIR, BUILDLINK_X11PKG_DIR, BUILDLINK_X11_DIR so
-# that if no buildlink2.mk files are included, then they still point to
-# where headers and libraries for installed packages and X11R6 may be found.
+# PKG_INSTALLATION_TYPE can only be one of two values: "pkgviews" or
+# "overwrite".
+#
+.if (${PKG_INSTALLATION_TYPE} != "pkgviews") && \
+ (${PKG_INSTALLATION_TYPE} != "overwrite")
+PKG_FAIL_REASON+= "PKG_INSTALLATION_TYPE must be \`\`pkgviews'' or \`\`overwrite''."
+.endif
+
+.if empty(PKG_INSTALLATION_TYPES:M${PKG_INSTALLATION_TYPE})
+PKG_FAIL_REASON+= "This package doesn't support PKG_INSTALLATION_TYPE=${PKG_INSTALLATION_TYPE}."
+.endif
+
+# The style of PLISTs that are used by the installed package.
+# Possible: dynamic, static
+#
+.if ${PKG_INSTALLATION_TYPE} == "pkgviews"
+PLIST_TYPE?= dynamic
+.elif ${PKG_INSTALLATION_TYPE} == "overwrite"
+PLIST_TYPE?= static
+.else
+PLIST_TYPE?= static
+.endif
+
+# PLIST_TYPE can only be one of two values: "dynamic" or "static". If we
+# don't explicitly ask for "static", assume "dynamic".
#
-USE_BUILDLINK2?= no # default to not using buildlink2
+.if (${PLIST_TYPE} != "dynamic") && (${PLIST_TYPE} != "static")
+PKG_FAIL_REASON+= "PLIST_TYPE must be \`\`dynamic'' or \`\`static''."
+.endif
+
+.if (${PKG_INSTALLATION_TYPE} == "overwrite") && (${PLIST_TYPE} != "static")
+PKG_FAIL_REASON+= "PLIST_TYPE must be \`\`static'' for \`\`overwrite'' packages."
+.endif
+
+USE_BUILDLINK2?= no # default to not using buildlink2
+USE_BUILDLINK3?= no # defualt to not using buildlink3
+.if ${PKG_INSTALLATION_TYPE} == "pkgviews"
+USE_BUILDLINK3= yes # pkgviews requires buildlink3
+.endif
+.if empty(USE_BUILDLINK2:M[nN][oO]) && empty(USE_BUILDLINK3:M[nN][oO])
+PKG_FAIL_REASON+= "Please undefine USE_BUILDLINK2 or USE_BUILDLINK3."
+.endif
+
+.if !empty(USE_BUILDLINK3:M[nN][oO])
+#
+# Set the default BUILDLINK_DIR, BUILDLINK_X11_DIR so that if no
+# buildlink2.mk files are included, then they still point to where headers
+# and libraries for installed packages and X11R6 may be found.
+#
BUILDLINK_DIR?= ${LOCALBASE}
-BUILDLINK_X11PKG_DIR?= ${X11BASE}
BUILDLINK_X11_DIR?= ${X11BASE}
+.endif
.if defined(USE_IMAKE)
USE_X11BASE?= implied
@@ -121,19 +165,43 @@
_OPSYS_NEEDS_XPKGWEDGE?= no
.endif
-.if defined(USE_X11BASE)
-. if !empty(_OPSYS_NEEDS_XPKGWEDGE:M[yY][eE][sS])
+.if ${PKG_INSTALLATION_TYPE} == "overwrite"
+. if defined(USE_X11BASE)
+. if !empty(_OPSYS_NEEDS_XPKGWEDGE:M[yY][eE][sS])
BUILD_DEPENDS+= xpkgwedge>=1.5:../../pkgtools/xpkgwedge
-BUILDLINK_X11PKG_DIR= ${LOCALBASE}
-. endif
+. endif
PREFIX= ${X11PREFIX}
-.elif defined(USE_CROSSBASE)
+. elif defined(USE_CROSSBASE)
PREFIX= ${CROSSBASE}
NO_MTREE= yes
-.else
+. else
PREFIX= ${LOCALBASE}
+. endif
+.elif ${PKG_INSTALLATION_TYPE} == "pkgviews"
+PREFIX= ${DEPOTBASE}/${PKGNAME}
+NO_MTREE= yes
.endif
+.if empty(DEPOT_SUBDIR)
+PKG_FAIL_REASON+= "DEPOT_SUBDIR may not be empty."
+.endif
+
+.if ${PKG_INSTALLATION_TYPE} == "pkgviews"
+#
+# _PLIST_IGNORE_FILES basically mirrors the list of ignored files found
+# in pkg_views(1). It's used by the dynamic PLIST generator to skip
+# adding the named files to the PLIST.
Home |
Main Index |
Thread Index |
Old Index