[27890] branches/release_1_5/base

[source_changes at macosforge.org]

Revision: 27890
          http://trac.macosforge.org/projects/macports/changeset/27890
Author:   jmpp at macports.org
Date:     2007-08-15 12:19:56 -0700 (Wed, 15 Aug 2007)

Log Message:
-----------
Merged revisions 26683-26692,26695-26708,26712-26718,26720,26724-26729,26732-26736,26738-26743,26745-26752,26754-26764,26766-26803,26805,26807-26808,26810,26815-26828,26830-26841,26843-26849,26852-26862,26867-26869,26871-26902,26904-26920,26922-26936,26938-26939,26941,26943-26975,26977-27017,27019-27020,27023,27027-27042,27045-27052,27054-27064,27066-27078,27081-27109,27111-27121,27123-27126,27128-27139,27141-27198,27200,27203-27294,27298-27312,27314-27378,27380-27404,27406-27414,27416-27509,27511-27517,27529-27616,27619,27623-27641,27643,27645-27646,27648-27708,27712-27718,27721-27772,27774-27778,27780-27822,27827-27849,27851-27874,27877-27889 via svnmerge from 
http://svn.macports.org/repository/macports/trunk/base

........
  r27887 | jmpp at macports.org | 2007-08-15 14:45:26 -0400 (Wed, 15 Aug 2007) | 9 lines
  
  
  Include ${prefix}/src in the default hierarchy as requested by afb for generated rpms.
  Also do not install the ${prefix}/etc/macports/prefix.mtree file as we're not using that
  copy any longer, the real thing lives in ${prefix}/share/macports/resources/port1.0/install.
  
  While at it, provide a MAN1 variable in the Makefile to mimick existing MAN5 & MAN7, even
  though none of them are used ;-) Consistency++!
........
  r27889 | jmpp at macports.org | 2007-08-15 15:16:55 -0400 (Wed, 15 Aug 2007) | 1 line
  
  Include the new src dir in porthier(7).
........

Modified Paths:
--------------
    branches/release_1_5/base/doc/Makefile
    branches/release_1_5/base/doc/porthier.7
    branches/release_1_5/base/doc/prefix.mtree.in

Property Changed:
----------------
    branches/release_1_5/base/


Property changes on: branches/release_1_5/base
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/base:1-26681,26683-26803,26805,26807-26812,26814-26864,26867-27517,27529-27620,27622-27710,27712-27824,27827-27876
   + /trunk/base:1-26681,26683-26803,26805,26807-26812,26814-26864,26867-27517,27529-27620,27622-27710,27712-27824,27827-27889

Modified: branches/release_1_5/base/doc/Makefile
===================================================================
--- branches/release_1_5/base/doc/Makefile	2007-08-15 19:16:55 UTC (rev 27889)
+++ branches/release_1_5/base/doc/Makefile	2007-08-15 19:19:56 UTC (rev 27890)
@@ -1,3 +1,4 @@
+MAN1=		port.1
 MAN5=		macports.conf.5
 MAN7=		portfile.7 portstyle.7 porthier.7 portgroup.7
 INSTALLDIR=	${DESTDIR}${prefix}
@@ -42,7 +43,6 @@
 		$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 variants.conf ${DESTDIR}${mpconfigdir}; \
 	fi
 
-	$(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/release_1_5/base/doc/porthier.7
===================================================================
--- branches/release_1_5/base/doc/porthier.7	2007-08-15 19:16:55 UTC (rev 27889)
+++ branches/release_1_5/base/doc/porthier.7	2007-08-15 19:19:56 UTC (rev 27890)
@@ -75,6 +75,14 @@
 misc system-wide ASCII text files
 .El
 .Pp
+.It Pa src/
+source code
+.Pp
+.Bl -tag -width "macports/" -compact
+.It Pa macports/
+MacPorts package building topdir
+.Pp
+.El
 .It Pa var/
 multi-purpose log, temporary, transient, and spool files
 .Pp

Modified: branches/release_1_5/base/doc/prefix.mtree.in
===================================================================
--- branches/release_1_5/base/doc/prefix.mtree.in	2007-08-15 19:16:55 UTC (rev 27889)
+++ branches/release_1_5/base/doc/prefix.mtree.in	2007-08-15 19:19:56 UTC (rev 27890)
@@ -235,6 +235,8 @@
         skel
         ..
     ..
+    src
+    ..
     var
         macports
             distfiles

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