[79241] trunk/base
jmr at macports.org
jmr at macports.org
Mon Jun 6 05:09:54 PDT 2011
Revision: 79241
http://trac.macports.org/changeset/79241
Author: jmr at macports.org
Date: 2011-06-06 05:09:53 -0700 (Mon, 06 Jun 2011)
Log Message:
-----------
separate dirs used only by base into another mtree file, so ports that install files there will trigger the warning
Modified Paths:
--------------
trunk/base/configure
trunk/base/configure.ac
trunk/base/doc/Makefile
trunk/base/doc/prefix.mtree.in
trunk/base/src/port/Makefile
Added Paths:
-----------
trunk/base/doc/base.mtree.in
Modified: trunk/base/configure
===================================================================
--- trunk/base/configure 2011-06-06 11:49:07 UTC (rev 79240)
+++ trunk/base/configure 2011-06-06 12:09:53 UTC (rev 79241)
@@ -9627,7 +9627,7 @@
# Output
-ac_config_files="$ac_config_files Doxyfile Makefile Mk/macports.autoconf.mk doc/prefix.mtree doc/macosx.mtree doc/macports.conf doc/pubkeys.conf portmgr/freebsd/Makefile src/Makefile src/macports1.0/macports_autoconf.tcl src/port1.0/port_autoconf.tcl src/registry2.0/registry_autoconf.tcl src/programs/Makefile src/macports1.0/macports_fastload.tcl setupenv.bash"
+ac_config_files="$ac_config_files Doxyfile Makefile Mk/macports.autoconf.mk doc/base.mtree doc/prefix.mtree doc/macosx.mtree doc/macports.conf doc/pubkeys.conf portmgr/freebsd/Makefile src/Makefile src/macports1.0/macports_autoconf.tcl src/port1.0/port_autoconf.tcl src/registry2.0/registry_autoconf.tcl src/programs/Makefile src/macports1.0/macports_fastload.tcl setupenv.bash"
ac_config_files="$ac_config_files src/pkg_mkindex.sh"
@@ -10340,6 +10340,7 @@
"Doxyfile") CONFIG_FILES="$CONFIG_FILES Doxyfile" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"Mk/macports.autoconf.mk") CONFIG_FILES="$CONFIG_FILES Mk/macports.autoconf.mk" ;;
+ "doc/base.mtree") CONFIG_FILES="$CONFIG_FILES doc/base.mtree" ;;
"doc/prefix.mtree") CONFIG_FILES="$CONFIG_FILES doc/prefix.mtree" ;;
"doc/macosx.mtree") CONFIG_FILES="$CONFIG_FILES doc/macosx.mtree" ;;
"doc/macports.conf") CONFIG_FILES="$CONFIG_FILES doc/macports.conf" ;;
Modified: trunk/base/configure.ac
===================================================================
--- trunk/base/configure.ac 2011-06-06 11:49:07 UTC (rev 79240)
+++ trunk/base/configure.ac 2011-06-06 12:09:53 UTC (rev 79241)
@@ -347,6 +347,7 @@
Doxyfile
Makefile
Mk/macports.autoconf.mk
+ doc/base.mtree
doc/prefix.mtree
doc/macosx.mtree
doc/macports.conf
Modified: trunk/base/doc/Makefile
===================================================================
--- trunk/base/doc/Makefile 2011-06-06 11:49:07 UTC (rev 79240)
+++ trunk/base/doc/Makefile 2011-06-06 12:09:53 UTC (rev 79241)
@@ -17,7 +17,7 @@
test:
distclean: clean
- rm -f macports.conf macosx.mtree prefix.mtree pubkeys.conf
+ rm -f macports.conf base.mtree macosx.mtree prefix.mtree pubkeys.conf
%.1.gz: %.1
gzip -c $^ > $@
@@ -32,7 +32,8 @@
$(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}
$(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${DESTDIR}${mpconfigdir}
- <prefix.mtree $(MTREE) -U -e -p ${INSTALLDIR} > /dev/null
+ < prefix.mtree $(MTREE) -U -e -p ${INSTALLDIR} > /dev/null
+ < base.mtree $(MTREE) -U -e -p ${INSTALLDIR} > /dev/null
if test -L "${INSTALLDIR}/man" ; then \
rm -f "${INSTALLDIR}/man"; \
fi
@@ -55,6 +56,7 @@
for m in ${MAN7}; do rm -f ${INSTALLDIR}/share/man/man7/$$m ; done
$(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}/share/macports/install
+ $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 base.mtree ${INSTALLDIR}/share/macports/install/
$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 prefix.mtree ${INSTALLDIR}/share/macports/install/
$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 macosx.mtree ${INSTALLDIR}/share/macports/install/
$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 port.1.gz ${INSTALLDIR}/share/man/man1
Added: trunk/base/doc/base.mtree.in
===================================================================
--- trunk/base/doc/base.mtree.in (rev 0)
+++ trunk/base/doc/base.mtree.in 2011-06-06 12:09:53 UTC (rev 79241)
@@ -0,0 +1,22 @@
+# $Id$
+#
+# MacPorts filesystem hierarchy, for internal use only. Changes to this file will not stick across installations.
+#
+
+/set type=dir uname=@DSTUSR@ gname=@DSTGRP@ mode=@DSTMODE@
+.
+ var
+ macports
+ build
+ ..
+ distfiles
+ ..
+ logs
+ ..
+ registry
+ ..
+ software
+ ..
+ ..
+ ..
+..
Modified: trunk/base/doc/prefix.mtree.in
===================================================================
--- trunk/base/doc/prefix.mtree.in 2011-06-06 11:49:07 UTC (rev 79240)
+++ trunk/base/doc/prefix.mtree.in 2011-06-06 12:09:53 UTC (rev 79241)
@@ -240,20 +240,6 @@
src
..
var
- macports
- build
- ..
- distfiles
- ..
- logs
- ..
- packages
- ..
- receipts
- ..
- registry
- ..
- ..
..
www
..
Modified: trunk/base/src/port/Makefile
===================================================================
--- trunk/base/src/port/Makefile 2011-06-06 11:49:07 UTC (rev 79240)
+++ trunk/base/src/port/Makefile 2011-06-06 12:09:53 UTC (rev 79241)
@@ -22,7 +22,8 @@
${edit} port.tcl > $@
mkdirs:
- <../../doc/prefix.mtree $(MTREE) -U -d -e -p ${INSTALLDIR} > /dev/null
+ < ../../doc/prefix.mtree $(MTREE) -U -d -e -p ${INSTALLDIR} > /dev/null
+ < ../../doc/base.mtree $(MTREE) -U -d -e -p ${INSTALLDIR} > /dev/null
clean:
rm -f ${SCRIPTS}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110606/9dc674ad/attachment-0001.html>
More information about the macports-changes
mailing list