pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk Remove USE_MTREE support. Keep one copy (the NetBSD...
details: https://anonhg.NetBSD.org/pkgsrc/rev/fccb87f8219a
branches: trunk
changeset: 530608:fccb87f8219a
user: joerg <joerg%pkgsrc.org@localhost>
date: Mon Jul 02 14:54:09 2007 +0000
description:
Remove USE_MTREE support. Keep one copy (the NetBSD version) for
the purpose of print-PLIST in plist/common-dirs.mtree.
Discussed with wiz@, no objections on tech-pkg@.
diffstat:
mk/bsd.pkg.use.mk | 9 +-
mk/bulk/pre-build | 10 +-
mk/flavor/pkg/metadata.mk | 8 +-
mk/install/bsd.install-vars.mk | 6 +-
mk/install/install.mk | 13 +-
mk/platform/AIX.pkg.dist | 1297 --------------------------------------
mk/platform/BSDOS.pkg.dist | 1297 --------------------------------------
mk/platform/Darwin.pkg.dist | 1347 ---------------------------------------
mk/platform/Darwin.x11.dist | 741 ---------------------
mk/platform/DragonFly.pkg.dist | 1346 ---------------------------------------
mk/platform/DragonFly.x11.dist | 741 ---------------------
mk/platform/FreeBSD.pkg.dist | 1346 ---------------------------------------
mk/platform/FreeBSD.x11.dist | 741 ---------------------
mk/platform/HPUX.pkg.dist | 1346 ---------------------------------------
mk/platform/IRIX.pkg.dist | 1346 ---------------------------------------
mk/platform/IRIX.x11.dist | 667 -------------------
mk/platform/Interix.pkg.dist | 1343 ---------------------------------------
mk/platform/Interix.x11.dist | 741 ---------------------
mk/platform/Linux.pkg.dist | 1347 ---------------------------------------
mk/platform/Linux.x11.dist | 741 ---------------------
mk/platform/NetBSD.pkg.dist | 1343 ---------------------------------------
mk/platform/NetBSD.x11.dist | 741 ---------------------
mk/platform/OSF1.pkg.dist | 1346 ---------------------------------------
mk/platform/OpenBSD.pkg.dist | 1346 ---------------------------------------
mk/platform/OpenBSD.x11.dist | 741 ---------------------
mk/platform/SunOS.pkg.dist | 1351 ---------------------------------------
mk/platform/SunOS.x11.dist | 741 ---------------------
mk/platform/UnixWare.pkg.dist | 1352 ----------------------------------------
mk/plist/common-dirs.mtree | 1343 +++++++++++++++++++++++++++++++++++++++
mk/plist/print-plist.mk | 6 +-
30 files changed, 1360 insertions(+), 25383 deletions(-)
diffs (truncated from 26960 to 300 lines):
diff -r 34b5c713cae7 -r fccb87f8219a mk/bsd.pkg.use.mk
--- a/mk/bsd.pkg.use.mk Mon Jul 02 14:06:22 2007 +0000
+++ b/mk/bsd.pkg.use.mk Mon Jul 02 14:54:09 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.use.mk,v 1.42 2007/03/02 09:08:34 wiz Exp $
+# $NetBSD: bsd.pkg.use.mk,v 1.43 2007/07/02 14:54:09 joerg Exp $
#
# Turn USE_* macros into proper depedency logic. Included near the top of
# bsd.pkg.mk, after bsd.prefs.mk.
@@ -41,11 +41,8 @@
MAKE_FLAGS+= CC=${CC:Q} CXX=${CXX:Q}
.endif
-.if defined(USE_X11BASE)
-_MTREE_FILE?= ${PKGSRCDIR}/mk/platform/${OPSYS}.x11.dist
-. if ${X11_TYPE} != "modular"
-. include "../../mk/x11.buildlink3.mk"
-. endif
+.if defined(USE_X11BASE) && ${X11_TYPE} != "modular"
+. include "../../mk/x11.buildlink3.mk"
.endif
.if ${PKG_INSTALLATION_TYPE} == "pkgviews"
diff -r 34b5c713cae7 -r fccb87f8219a mk/bulk/pre-build
--- a/mk/bulk/pre-build Mon Jul 02 14:06:22 2007 +0000
+++ b/mk/bulk/pre-build Mon Jul 02 14:54:09 2007 +0000
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: pre-build,v 1.67 2007/05/20 23:33:06 kristerw Exp $
+# $NetBSD: pre-build,v 1.68 2007/07/02 14:54:09 joerg Exp $
#
# Clean up system to be ready for bulk pkg build
#
@@ -82,7 +82,7 @@
# On non-NetBSD platforms we need to keep the bootstrap-files!
if [ x"$BMAKE" = x"bmake" ]; then
( cd "$LOCALBASE" && tar cf /tmp/$$.tar \
- sbin/mtree sbin/pkg_add sbin/pkg_admin sbin/pkg_create \
+ sbin/pkg_add sbin/pkg_admin sbin/pkg_create \
sbin/pkg_delete sbin/pkg_info sbin/pkg_view sbin/linkfarm \
share/mk/sys.mk share/mk/bsd.dep.mk share/mk/bsd.depall.mk \
share/mk/bsd.files.mk share/mk/bsd.hostprog.mk \
@@ -104,8 +104,8 @@
man/man1/tar.1 man/man1/nbsed.1 man/man1/pkg_add.1 \
man/man1/pkg_admin.1 man/man1/pkg_create.1 \
man/man1/pkg_delete.1 man/man1/pkg_info.1 \
- man/man1/pkg_view.1 man/man1/linkfarm.1 man/cat8/mtree.0 \
- man/man8/mtree.8 man/cat7/packages.0 etc/mk.conf )
+ man/man1/pkg_view.1 man/man1/linkfarm.1 man/cat7/packages.0 \
+ etc/mk.conf )
fi
#
@@ -262,7 +262,7 @@
if [ x"$BMAKE" = x"bmake" ]; then
for pkg in archivers/pax devel/bmake devel/mk-files lang/nawk \
net/tnftp pkgtools/bootstrap-mk-files pkgtools/bootstrap-extras \
- pkgtools/tnftp pkgtools/mtree pkgtools/pax pkgtools/pkg_install \
+ pkgtools/tnftp pkgtools/pax pkgtools/pkg_install \
sysutils/install-sh textproc/nbsed; do
mkdir -p "${BULKFILESDIR}/${pkg}"
echo "Don't blow away bootstrap-pkgsrc stuff!" \
diff -r 34b5c713cae7 -r fccb87f8219a mk/flavor/pkg/metadata.mk
--- a/mk/flavor/pkg/metadata.mk Mon Jul 02 14:06:22 2007 +0000
+++ b/mk/flavor/pkg/metadata.mk Mon Jul 02 14:54:09 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: metadata.mk,v 1.23 2007/06/04 00:07:48 heinz Exp $
+# $NetBSD: metadata.mk,v 1.24 2007/07/02 14:54:10 joerg Exp $
######################################################################
### The targets below are all PRIVATE.
@@ -331,9 +331,6 @@
_PKG_CREATE_ARGS+= ${_MESSAGE_FILE:D -D ${_MESSAGE_FILE}}
_PKG_CREATE_ARGS+= -d ${_DESCR_FILE}
_PKG_CREATE_ARGS+= -f ${_DEPENDS_PLIST}
-.if defined(USE_MTREE)
-_PKG_CREATE_ARGS+= -m ${_MTREE_FILE}}
-.endif
_PKG_CREATE_ARGS+= ${PKG_PRESERVE:D -n ${_PRESERVE_FILE}}
_PKG_CREATE_ARGS+= -S ${_SIZE_ALL_FILE}
_PKG_CREATE_ARGS+= -s ${_SIZE_PKG_FILE}
@@ -370,9 +367,6 @@
_CONTENTS_TARGETS+= ${_PRESERVE_FILE}
_CONTENTS_TARGETS+= ${_SIZE_ALL_FILE}
_CONTENTS_TARGETS+= ${_SIZE_PKG_FILE}
-.if defined(USE_MTRE)
-_CONTENTS_TARGETS+= ${_MTREE_FILE}
-.endif
${_CONTENTS_FILE}: ${_CONTENTS_TARGETS}
${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
diff -r 34b5c713cae7 -r fccb87f8219a mk/install/bsd.install-vars.mk
--- a/mk/install/bsd.install-vars.mk Mon Jul 02 14:06:22 2007 +0000
+++ b/mk/install/bsd.install-vars.mk Mon Jul 02 14:54:09 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.install-vars.mk,v 1.6 2007/04/19 16:52:03 joerg Exp $
+# $NetBSD: bsd.install-vars.mk,v 1.7 2007/07/02 14:54:10 joerg Exp $
#
# This Makefile fragment is included separately by bsd.pkg.mk and
# defines some variables which must be defined earlier than where
@@ -12,10 +12,6 @@
# the "real" installation should start.
#
-.if defined(USE_MTREE)
-USE_TOOLS+= mtree:bootstrap
-.endif
-
# If MANZ is defined, then we want the final man pages to be compressed.
# If MANZ is not defined, then we want the final man pages to be
# uncompressed.
diff -r 34b5c713cae7 -r fccb87f8219a mk/install/install.mk
--- a/mk/install/install.mk Mon Jul 02 14:06:22 2007 +0000
+++ b/mk/install/install.mk Mon Jul 02 14:54:09 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: install.mk,v 1.42 2007/04/19 18:16:36 xtraeme Exp $
+# $NetBSD: install.mk,v 1.43 2007/07/02 14:54:10 joerg Exp $
#
# This file provides the code for the "install" phase.
#
@@ -203,12 +203,9 @@
### install-makedirs (PRIVATE)
######################################################################
### install-makedirs is a target to create directories expected to
-### exist prior to installation. If a package sets INSTALLATION_DIRS,
-### then it's known to pre-create all of the directories that it needs
-### at install-time, so we don't need mtree to do it for us.
+### exist prior to installation. The package is supposed to create
+### all directories not listed in INSTALLATION_DIRS.
###
-_MTREE_FILE?= ${PKGSRCDIR}/mk/platform/${OPSYS}.pkg.dist
-_MTREE_ARGS?= -U -f ${_MTREE_FILE} -d -e -p
# A shell command that creates the directory ${DESTDIR}${PREFIX}/$$dir
# with appropriate permissions and ownership.
@@ -229,10 +226,6 @@
.PHONY: install-makedirs
install-makedirs:
${RUN} ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}
-.if defined(USE_MTREE)
- ${RUN} [ ! -f ${_MTREE_FILE} ] || \
- ${MTREE} ${_MTREE_ARGS} ${DESTDIR}${PREFIX}/
-.endif
.if defined(INSTALLATION_DIRS) && !empty(INSTALLATION_DIRS)
@${STEP_MSG} "Creating installation directories"
${RUN} \
diff -r 34b5c713cae7 -r fccb87f8219a mk/platform/AIX.pkg.dist
--- a/mk/platform/AIX.pkg.dist Mon Jul 02 14:06:22 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1297 +0,0 @@
-# Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp
-# $NetBSD: AIX.pkg.dist,v 1.28 2007/02/20 18:57:05 wiz Exp $
-#
-
-/set type=dir uname=root gname=system mode=0755
-.
- bin
- ..
- emul
- ..
- etc
- rc.d
- ..
- ..
- include
- ..
- info
- ..
- lib
- pkgconfig
- ..
- ..
- libdata
- tcl
- ..
- ..
- libexec
- cgi-bin
- ..
- ..
- man
- bg
- cat1
- ..
- cat2
- ..
- cat3
- ..
- cat4
- ..
- cat5
- ..
- cat6
- ..
- cat7
- ..
- cat8
- ..
- cat9
- ..
- catl
- ..
- catn
- ..
- man1
- ..
- man2
- ..
- man3
- ..
- man4
- ..
- man5
- ..
- man6
- ..
- man7
- ..
- man8
- ..
- man9
- ..
- manl
- ..
- mann
- ..
- ..
- cat1
- ..
- cat2
- ..
- cat3
- ..
- cat4
- ..
- cat5
- ..
- cat6
- ..
- cat7
- ..
- cat8
- ..
- cat9
- ..
- catl
- ..
- catn
- ..
- cs
- cat1
- ..
- cat2
- ..
- cat3
- ..
- cat4
- ..
- cat5
- ..
- cat6
- ..
- cat7
- ..
- cat8
- ..
- cat9
- ..
- catl
- ..
- catn
- ..
- man1
- ..
- man2
- ..
- man3
- ..
- man4
- ..
- man5
- ..
- man6
- ..
- man7
- ..
- man8
- ..
- man9
- ..
- manl
- ..
- mann
- ..
- ..
- de
- cat1
- ..
- cat2
- ..
Home |
Main Index |
Thread Index |
Old Index