[27625] branches/release_1_5/base

Fri Aug 10 15:08:48 PDT 2007

Revision: 27625
          http://trac.macosforge.org/projects/macports/changeset/27625
Author:   jmpp at macports.org
Date:     2007-08-10 15:08:47 -0700 (Fri, 10 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-27620,27622-27624 via svnmerge from 
http://svn.macports.org/repository/macports/trunk/base

........
  r27617 | jmpp at macports.org | 2007-08-10 16:57:11 -0400 (Fri, 10 Aug 2007) | 1 line
  
  Provide the configure.ac file with an Id.
........
  r27618 | jmpp at macports.org | 2007-08-10 17:12:35 -0400 (Fri, 10 Aug 2007) | 1 line
  
  Sed rules taking care of dp based comments in the macports.conf file were wrecking havoc for those using /opt/dports or similar as their prefix, nuke them.
........
  r27620 | jmpp at macports.org | 2007-08-10 17:37:15 -0400 (Fri, 10 Aug 2007) | 1 line
  
  Bring ChangeLog up to date and provide placeholder date for final 1.5.1 release.
........
  r27622 | jmpp at macports.org | 2007-08-10 17:55:43 -0400 (Fri, 10 Aug 2007) | 1 line
  
  Fix make test target by providing a placeholder.
........

Modified Paths:
--------------
    branches/release_1_5/base/ChangeLog
    branches/release_1_5/base/Makefile.in
    branches/release_1_5/base/configure.ac
    branches/release_1_5/base/portmgr/dmg/preflight
    branches/release_1_5/base/src/tclobjc1.0/Makefile.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-27510
   + /trunk/base:1-26681,26683-26803,26805,26807-26812,26814-26864,26867-27517,27529-27620,27622-27624

Modified: branches/release_1_5/base/ChangeLog
===================================================================

--- branches/release_1_5/base/ChangeLog	2007-08-10 22:05:56 UTC (rev 27624)
+++ branches/release_1_5/base/ChangeLog	2007-08-10 22:08:47 UTC (rev 27625)
@@ -4,12 +4,32 @@
 ###
 
 
-Unreleased:
+Release 1.5.1 (DAY-August-2007 at rREV by jmpp):
 
+    - Remove sed rules taking care of dp based comments in the macports.conf file from the upgrade target in base/Makefile.in,
+      they were causing problems for people with /opt/dports or similar prefixes (jmpp in r27618).
+
+    - Facelift to the PortIndex2MySQL.tcl script to make it selfcontained and work with the new macports1.0 api to
+      generate SQL statements with information extracted from Portfiles (jmpp in r27415).
+
+    - Always print the livecheck regex in debug mode, not only when it fails (ryandesign in r27379).
+
+    - Detect some mtree violations within ${prefix}. Test can be overriden by "destroot.violate_mtree yes" in a Portfile
+      (mww in r27199).
+
+    - Fix version comparison in MacPorts initialization to properly detect Tcl versions 8.4.7 and later (sfiera in r27127).
+
+    - Fix double de-escaping of livecheck.regex inadvertently introduced in r26041 (eridius in r27079).
+
+    - Added new Portfile options to the configure stage for selecting compiler(s) (mww in r27018, r27021, r27022 and r27053)
+
+    - New logic in the upgrade target to account for cases where the old and new versions consist of different
+      numbers of segments (sfiera in r26921).
+
+    - Remove dead OpenDarwin mirrors from our mirrors list (jmpp in r26903)
+
     - New tests for violations of common directory structure (and option to override them for special cases)
 
-    - Added new options to configure for selecting compiler(s)
-
     - Added new variable ${os.major} that contains the Darwin major version (eridius r26693, ticket #12224).
 
 

Modified: branches/release_1_5/base/Makefile.in
===================================================================
--- branches/release_1_5/base/Makefile.in	2007-08-10 22:05:56 UTC (rev 27624)
+++ branches/release_1_5/base/Makefile.in	2007-08-10 22:08:47 UTC (rev 27625)
@@ -73,7 +73,6 @@
 ## 6) stray quotes are removed from the value of the rsync_options key in old conf files;
 ## 7) useless --delete option is removed from the default rsync flags (--delete is implied by --delete-after);
 ## 8) references to the old ports.conf(5) man page are updated to the new macports.conf(5) page;
-## 9) finally, move remaining instances of any form of our new name (which by this time should only remain in comments, if at all) to our new name.
 	[ ! \( -f ${sysconfdir}/macports/ports.conf -a ! -f ${UPGRADECHECK} \) ] || { \
 		mv -v ${sysconfdir}/macports/ports.conf ${sysconfdir}/macports/macports.conf.mpsaved; \
 		sed 's/etc\/ports/etc\/macports/g' ${sysconfdir}/macports/macports.conf.mpsaved > ${sysconfdir}/macports/macports.conf.tmp && \
@@ -92,8 +91,6 @@
 			mv -v ${sysconfdir}/macports/macports.conf.tmp ${sysconfdir}/macports/macports.conf; \
 		sed 's/ ports.conf(5)/ macports.conf(5)/g' ${sysconfdir}/macports/macports.conf > ${sysconfdir}/macports/macports.conf.tmp && \
 			mv -v ${sysconfdir}/macports/macports.conf.tmp ${sysconfdir}/macports/macports.conf; \
-		sed 's/[Dd]\(arwin\)\{0,1\}[Pp]\(orts\)\{0,1\}/MacPorts/g' ${sysconfdir}/macports/macports.conf > ${sysconfdir}/macports/macports.conf.tmp && \
-			mv -v ${sysconfdir}/macports/macports.conf.tmp ${sysconfdir}/macports/macports.conf; \
 	}
 
 # Check for existance of the main sources file and perform a couple of replacements on it, backing it up first:
@@ -116,7 +113,6 @@
 ## 6) stray quotes are removed from the value of the rsync_options key in old conf files;
 ## 7) useless --delete option is removed from the default rsync flags (--delete is implied by --delete-after);
 ## 8) references to the old ports.conf(5) man page are updated to the new macports.conf(5) page;
-## 9) finally, move remaining instances of any form of our new name (which by this time should only remain in comments, if at all) to our new name.
 	[ ! \( -f $${HOME}/.macports/ports.conf -a ! -f ${UPGRADECHECK} \) ] || { \
 		mv -v $${HOME}/.macports/ports.conf $${HOME}/.macports/macports.conf.mpsaved; \
 		sed 's/etc\/ports/etc\/macports/g' $${HOME}/.macports/macports.conf.mpsaved > $${HOME}/.macports/macports.conf.tmp && \
@@ -135,8 +131,6 @@
 			mv -v $${HOME}/.macports/macports.conf.tmp $${HOME}/.macports/macports.conf; \
 		sed 's/ ports.conf(5)/ macports.conf(5)/g' $${HOME}/.macports/macports.conf > $${HOME}/.macports/macports.conf.tmp && \
 			mv -v $${HOME}/.macports/macports.conf.tmp $${HOME}/.macports/macports.conf; \
-		sed 's/[Dd]\(arwin\)\{0,1\}[Pp]\(orts\)\{0,1\}/MacPorts/g' $${HOME}/.macports/macports.conf > $${HOME}/.macports/macports.conf.tmp && \
-			mv -v $${HOME}/.macports/macports.conf.tmp $${HOME}/.macports/macports.conf; \
 	}
 
 # Upgrade success announcement (meaning we're done ;):

Modified: branches/release_1_5/base/configure.ac
===================================================================
--- branches/release_1_5/base/configure.ac	2007-08-10 22:05:56 UTC (rev 27624)
+++ branches/release_1_5/base/configure.ac	2007-08-10 22:08:47 UTC (rev 27625)
@@ -1,4 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
+dnl $Id$
 AC_PREREQ(2.52)
 AC_INIT([MacPorts], [esyscmd(cat config/mp_version | tr -d '\n')], [macports-dev at lists.macosforge.org], [macports])
 AC_CONFIG_SRCDIR([src/pextlib1.0/Pextlib.c])

Modified: branches/release_1_5/base/portmgr/dmg/preflight
===================================================================
--- branches/release_1_5/base/portmgr/dmg/preflight	2007-08-10 22:05:56 UTC (rev 27624)
+++ branches/release_1_5/base/portmgr/dmg/preflight	2007-08-10 22:08:47 UTC (rev 27625)
@@ -86,8 +86,6 @@
     mv -v /opt/local/etc/macports/macports.conf.tmp /opt/local/etc/macports/macports.conf
   sed 's/ ports.conf(5)/ macports.conf(5)/g' /opt/local/etc/macports/macports.conf > /opt/local/etc/macports/macports.conf.tmp && \
     mv -v /opt/local/etc/macports/macports.conf.tmp /opt/local/etc/macports/macports.conf
-  sed 's/[Dd]\(arwin\)\{0,1\}[Pp]\(orts\)\{0,1\}/MacPorts/g' /opt/local/etc/macports/macports.conf > /opt/local/etc/macports/macports.conf.tmp && \
-    mv -v /opt/local/etc/macports/macports.conf.tmp /opt/local/etc/macports/macports.conf
 }
 
 [ ! \( -f /opt/local/etc/macports/sources.conf -a ! -f ${UPGRADECHECK} \) ] || {
@@ -116,8 +114,6 @@
     mv -v ${HOME}/.macports/macports.conf.tmp ${HOME}/.macports/macports.conf
   sed 's/ ports.conf(5)/ macports.conf(5)/g' ${HOME}/.macports/macports.conf > ${HOME}/.macports/macports.conf.tmp && \
     mv -v ${HOME}/.macports/macports.conf.tmp ${HOME}/.macports/macports.conf
-   sed 's/[Dd]\(arwin\)\{0,1\}[Pp]\(orts\)\{0,1\}/MacPorts/g' ${HOME}/.macports/macports.conf > ${HOME}/.macports/macports.conf.tmp && \
-    mv -v ${HOME}/.macports/macports.conf.tmp ${HOME}/.macports/macports.conf
 }
 
 [ -f ${UPGRADECHECK} ] || {

Modified: branches/release_1_5/base/src/tclobjc1.0/Makefile.in
===================================================================
--- branches/release_1_5/base/src/tclobjc1.0/Makefile.in	2007-08-10 22:05:56 UTC (rev 27624)
+++ branches/release_1_5/base/src/tclobjc1.0/Makefile.in	2007-08-10 22:08:47 UTC (rev 27625)
@@ -12,3 +12,5 @@
 
 distclean::
 	rm -f Makefile
+
+test:

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