[33046] branches/release_1_6/base

jmpp at macports.org jmpp at macports.org
Wed Jan 16 22:16:26 PST 2008 

Revision: 33046
          http://trac.macosforge.org/projects/macports/changeset/33046
Author:   jmpp at macports.org
Date:     2008-01-16 22:16:24 -0800 (Wed, 16 Jan 2008)

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

Adapt config/mp_version & config/macports_version for the upcoming 1.6.1 release, regen configure.

Modified Paths:
--------------
    branches/release_1_6/base/config/macports_version
    branches/release_1_6/base/config/mp_version
    branches/release_1_6/base/configure

Modified: branches/release_1_6/base/config/macports_version
===================================================================
--- branches/release_1_6/base/config/macports_version	2008-01-17 06:11:54 UTC (rev 33045)
+++ branches/release_1_6/base/config/macports_version	2008-01-17 06:16:24 UTC (rev 33046)
@@ -1 +1 @@
-1.7.0
+1.6.1

Modified: branches/release_1_6/base/config/mp_version
===================================================================
--- branches/release_1_6/base/config/mp_version	2008-01-17 06:11:54 UTC (rev 33045)
+++ branches/release_1_6/base/config/mp_version	2008-01-17 06:16:24 UTC (rev 33046)
@@ -1 +1 @@
-1.600
+1.610

Modified: branches/release_1_6/base/configure
===================================================================
--- branches/release_1_6/base/configure	2008-01-17 06:11:54 UTC (rev 33045)
+++ branches/release_1_6/base/configure	2008-01-17 06:16:24 UTC (rev 33046)
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for MacPorts 1.600.
+# Generated by GNU Autoconf 2.61 for MacPorts 1.6.1.
 #
 # Report bugs to <macports-dev at lists.macosforge.org>.
 #
@@ -574,8 +574,8 @@
 # Identity of this package.
 PACKAGE_NAME='MacPorts'
 PACKAGE_TARNAME='macports'
-PACKAGE_VERSION='1.600'
-PACKAGE_STRING='MacPorts 1.600'
+PACKAGE_VERSION='1.6.1'
+PACKAGE_STRING='MacPorts 1.6.1'
 PACKAGE_BUGREPORT='macports-dev at lists.macosforge.org'
 
 ac_unique_file="src/pextlib1.0/Pextlib.c"
@@ -665,8 +665,9 @@
 target_cpu
 target_vendor
 target_os
+MACPORTS_VERSION
+MP_VERSION
 SW_VERS
-VER
 CC
 CFLAGS
 LDFLAGS
@@ -1299,7 +1300,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures MacPorts 1.600 to adapt to many kinds of systems.
+\`configure' configures MacPorts 1.6.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1369,7 +1370,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of MacPorts 1.600:";;
+     short | recursive ) echo "Configuration of MacPorts 1.6.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1495,7 +1496,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-MacPorts configure 1.600
+MacPorts configure 1.6.1
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1509,7 +1510,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by MacPorts $as_me 1.600, which was
+It was created by MacPorts $as_me 1.6.1, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2023,6 +2024,17 @@
     NONENONEs,x,x, &&
   program_prefix=${target_alias}-
 
+# Read in the MacPorts version from the base/config/macports_vesion file
+{ echo "$as_me:$LINENO: checking MacPorts version" >&5
+echo $ECHO_N "checking MacPorts version... $ECHO_C" >&6; }
+MACPORTS_VERSION=1.6.1
+{ echo "$as_me:$LINENO: result: $MACPORTS_VERSION" >&5
+echo "${ECHO_T}$MACPORTS_VERSION" >&6; }
+
+# Read the old, floating point format version, which we still use internally, and export it for the $macports::autoconf::macports_version variable
+MP_VERSION=$(cat config/mp_version | tr -d '\n')
+
+
 # Check user PATH for MP paths, and remove as necessary.
 
 	oldprefix=$prefix
@@ -2145,15 +2157,6 @@
     ;;
 esac
 
-# translate mp_version (1.600) to regular version (1.6.0)
-{ echo "$as_me:$LINENO: checking MacPorts version" >&5
-echo $ECHO_N "checking MacPorts version... $ECHO_C" >&6; }
-MP_VERSION=`cat config/mp_version | tr -d '\n'`
-VER=`echo $MP_VERSION | sed -e 's/\([0-9]\)\.\([0-9]\)0\{0,1\}\([0-9][1-9]\{0,1\}\)0\{0,1\}/\1.\2.\3/'`
-{ echo "$as_me:$LINENO: result: $VER" >&5
-echo "${ECHO_T}$VER" >&6; }
-
-
 # Checks for programs.
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -11996,6 +11999,7 @@
 # If sqlite3 package isn't installed, configure and install sqlite3 package.
 if test "$with_included_sqlite3" = "yes"; then
 	OUR_INCLUDED_PACKAGES="$OUR_INCLUDED_PACKAGES sqlite-3.1.3"
+	INCLUDES="$INCLUDES -I../sqlite-3.1.3"
 	subdirs="$subdirs src/sqlite-3.1.3"
 
 	# Extract sqlite3 package
@@ -12522,7 +12526,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by MacPorts $as_me 1.600, which was
+This file was extended by MacPorts $as_me 1.6.1, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -12571,7 +12575,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-MacPorts config.status 1.600
+MacPorts config.status 1.6.1
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -12805,8 +12809,9 @@
 target_cpu!$target_cpu$ac_delim
 target_vendor!$target_vendor$ac_delim
 target_os!$target_os$ac_delim
+MACPORTS_VERSION!$MACPORTS_VERSION$ac_delim
+MP_VERSION!$MP_VERSION$ac_delim
 SW_VERS!$SW_VERS$ac_delim
-VER!$VER$ac_delim
 CC!$CC$ac_delim
 CFLAGS!$CFLAGS$ac_delim
 LDFLAGS!$LDFLAGS$ac_delim
@@ -12852,7 +12857,6 @@
 OBJC_LIBS!$OBJC_LIBS$ac_delim
 OBJC_PTHREAD_LIBS!$OBJC_PTHREAD_LIBS$ac_delim
 OBJC_PTHREAD_CFLAGS!$OBJC_PTHREAD_CFLAGS$ac_delim
-OBJC_FOUNDATION!$OBJC_FOUNDATION$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -12894,6 +12898,7 @@
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+OBJC_FOUNDATION!$OBJC_FOUNDATION$ac_delim
 OBJC_FOUNDATION_LDFLAGS!$OBJC_FOUNDATION_LDFLAGS$ac_delim
 OBJC_FOUNDATION_CPPFLAGS!$OBJC_FOUNDATION_CPPFLAGS$ac_delim
 OBJC_FOUNDATION_LIBS!$OBJC_FOUNDATION_LIBS$ac_delim
@@ -12953,7 +12958,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 57; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 58; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

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

More information about the macports-changes mailing list