Add the base/config/macports_version file holding the 1.7.0 version number (for trunk), with limited usage for the time being:

* Read it in for the autoconf @MACPORTS_VERSION@ variable;
 * Stop the Snoopy talk in configure.ac to convert the floating point format to a regular versions, reading base/config/macports_version directly instead;
 * Switch files with @VER@ substitution over to @MACPORTS_VERSION@.

The $macports::autoconf::macports_version will still read from @MP_VERSION@, the floating point format,
until a good logic for selfupdate magically emerges (cf. https://trac.macports.org/changeset/32364).

git-svn-id: https://svn.macports.org/repository/macports/trunk/base@32365 d073be05-634f-4543-b044-5fe20cf6d1d6
This commit is contained in:
Juan Manuel Palacios
2007-12-27 20:31:52 +00:00
parent a0ce737684
commit 02d52eb349
4 changed files with 9 additions and 7 deletions
+1
View File
@@ -0,0 +1 @@
1.7.0
+6 -5
View File
@@ -1,17 +1,18 @@
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@lists.macosforge.org], [macports])
AC_INIT([MacPorts], [esyscmd(cat config/macports_version | tr -d '\n')], [macports-dev@lists.macosforge.org], [macports])
AC_CONFIG_SRCDIR([src/pextlib1.0/Pextlib.c])
AC_CONFIG_HEADERS([src/config.h])
AC_CANONICAL_SYSTEM
# Read in the MacPorts version from the base/config/mp_vesion file and translate it (e.g. 1.600) to regular version (1.6.0)
# Read in the MacPorts version from the base/config/macports_vesion file
AC_MSG_CHECKING(MacPorts version)
MACPORTS_VERSION=$(cat config/macports_version | tr -d '\n')
AC_MSG_RESULT([$MACPORTS_VERSION])
AC_SUBST(MACPORTS_VERSION)
# 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')
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/'`
AC_MSG_RESULT([$VER])
AC_SUBST(VER)
AC_SUBST(MP_VERSION)
# Check user PATH for MP paths, and remove as necessary.
+1 -1
View File
@@ -1,6 +1,6 @@
Summary: MacPorts allows installing software on Mac OS X (and other platforms)
Name: macports
Version: @VER@
Version: @MACPORTS_VERSION@
Release: 0%{?dist}
License: BSD
Group: System Environment/Base
+1 -1
View File
@@ -6,7 +6,7 @@
#
PORTNAME= macports
PORTVERSION= @VER@
PORTVERSION= @MACPORTS_VERSION@
CATEGORIES= sysutils
MASTER_SITES= http://svn.macosforge.org/repository/macports/distfiles/MacPorts/
DISTNAME= MacPorts-${PORTVERSION}