[24500] branches/dp2mp-move/base

[source_changes at macosforge.org]

Revision: 24500
          http://trac.macosforge.org/projects/macports/changeset/24500
Author:   jmpp at macports.org
Date:     2007-04-26 16:26:46 -0700 (Thu, 26 Apr 2007)

Log Message:
-----------

More autoconfiscated variables renaming. Also adapting the ${prefix} tree structure (mtree)
to a new ${prefix}/var/macports layout, rather than the legacy ${prefix}/var/db/dports
(not only aint dports cool no more... but also, we don't just keep 'db' stuff in that path).

Modified Paths:
--------------
    branches/dp2mp-move/base/config/Makefile
    branches/dp2mp-move/base/doc/Makefile
    branches/dp2mp-move/base/doc/prefix.mtree.in

Modified: branches/dp2mp-move/base/config/Makefile
===================================================================
--- branches/dp2mp-move/base/config/Makefile	2007-04-26 22:15:14 UTC (rev 24499)
+++ branches/dp2mp-move/base/config/Makefile	2007-04-26 23:26:46 UTC (rev 24500)
@@ -9,5 +9,5 @@
 distclean: clean
 
 install::
-	$(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${DESTDIR}${portconfigdir}
-	$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 mp_version ${DESTDIR}${portconfigdir}
+	$(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${DESTDIR}${mpconfigdir}
+	$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 mp_version ${DESTDIR}${mpconfigdir}

Modified: branches/dp2mp-move/base/doc/Makefile
===================================================================
--- branches/dp2mp-move/base/doc/Makefile	2007-04-26 22:15:14 UTC (rev 24499)
+++ branches/dp2mp-move/base/doc/Makefile	2007-04-26 23:26:46 UTC (rev 24500)
@@ -18,7 +18,7 @@
 
 install:
 	$(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}
-	$(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${DESTDIR}${portconfigdir}
+	$(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${DESTDIR}${mpconfigdir}
 
 	cat prefix.mtree | $(MTREE) -U -e -p ${INSTALLDIR} > /dev/null
 	if test -L "${INSTALLDIR}/man" ; then \
@@ -30,28 +30,28 @@
 	fi
 
 	# Install the macports.conf file. If it's already installed, upgrade it
-	if test ! -e ${DESTDIR}/${portconfigdir}/macports.conf ; then \
+	if test ! -e ${DESTDIR}/${mpconfigdir}/macports.conf ; then \
 		set -x; \
-		$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 macports.conf ${DESTDIR}${portconfigdir}; \
+		$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 macports.conf ${DESTDIR}${mpconfigdir}; \
 	else \
-		sed -e s/rsync.darwinports.org/rsync.macports.org/ ${DESTDIR}${portconfigdir}/macports.conf > ${DESTDIR}${portconfigdir}/macports.conf.tmp && \
-			mv ${DESTDIR}${portconfigdir}/macports.conf.tmp ${DESTDIR}${portconfigdir}mac/macports.conf; \
+		sed -e s/rsync.darwinports.org/rsync.macports.org/ ${DESTDIR}${mpconfigdir}/macports.conf > ${DESTDIR}${mpconfigdir}/macports.conf.tmp && \
+			mv ${DESTDIR}${mpconfigdir}/macports.conf.tmp ${DESTDIR}${mpconfigdir}mac/macports.conf; \
 	fi
 
 	# Install the sources.conf file. If it's already installed, upgrade it
-	if test ! -e ${DESTDIR}${portconfigdir}/sources.conf ; then \
+	if test ! -e ${DESTDIR}${mpconfigdir}/sources.conf ; then \
 		set -x; \
-		$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 sources.conf ${DESTDIR}${portconfigdir}; \
+		$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 sources.conf ${DESTDIR}${mpconfigdir}; \
 	else \
-		sed -e s/rsync.darwinports.org/rsync.macports.org/ ${DESTDIR}${portconfigdir}/sources.conf > ${DESTDIR}${portconfigdir}/sources.conf.tmp && \
-			mv ${DESTDIR}${portconfigdir}/sources.conf.tmp ${DESTDIR}${portconfigdir}/sources.conf; \
+		sed -e s/rsync.darwinports.org/rsync.macports.org/ ${DESTDIR}${mpconfigdir}/sources.conf > ${DESTDIR}${mpconfigdir}/sources.conf.tmp && \
+			mv ${DESTDIR}${mpconfigdir}/sources.conf.tmp ${DESTDIR}${mpconfigdir}/sources.conf; \
 	fi
 
-	$(SILENT)if test ! -e ${DESTDIR}${portconfigdir}/variants.conf ; then \
+	$(SILENT)if test ! -e ${DESTDIR}${mpconfigdir}/variants.conf ; then \
 		set -x; \
-		$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 variants.conf ${DESTDIR}${portconfigdir}; \
+		$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 variants.conf ${DESTDIR}${mpconfigdir}; \
 	fi
-	$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 prefix.mtree ${DESTDIR}${portconfigdir}
+	$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 prefix.mtree ${DESTDIR}${mpconfigdir}
 	$(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}/share/macports/resources/port1.0/install
 	$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 prefix.mtree ${INSTALLDIR}/share/macports/resources/port1.0/install/
 	$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 macosx.mtree ${INSTALLDIR}/share/macports/resources/port1.0/install/

Modified: branches/dp2mp-move/base/doc/prefix.mtree.in
===================================================================
--- branches/dp2mp-move/base/doc/prefix.mtree.in	2007-04-26 22:15:14 UTC (rev 24499)
+++ branches/dp2mp-move/base/doc/prefix.mtree.in	2007-04-26 23:26:46 UTC (rev 24500)
@@ -236,12 +236,10 @@
         ..
     ..
     var
-        db
-            dports
-                distfiles
-                ..
-                receipts
-                ..
+        macports
+            distfiles
+	    ..
+            receipts
             ..
         ..
     ..

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070426/2e733830/attachment.html