kballard / macports fork watch download tarball
public
Description: Git mirror of the MacPorts svn repo
Homepage: http://www.macports.org
Clone URL: git://github.com/kballard/macports.git
Search Repo: 
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. r32364).



git-svn-id: http://svn.macports.org/repository/macports/trunk@32365 
d073be05-634f-4543-b044-5fe20cf6d1d6
Juan Manuel Palacios (author)
Thu Dec 27 12:31:52 -0800 2007
commit  f8e578ec20104e340d26a9edde2f9b5295a89477
tree    012070ca4ec6f6eb3b4c148843946eac2946cd0c
parent  ea3f87459e85e0958ecdc2f44049767ce1de0b20
0
base/configure.ac 
...
1
2
3
4
 
5
6
7
8
9
 
10
 
 
 
 
11
12
13
14
15
16
17
 
...
1
2
3
 
4
5
6
7
8
 
9
10
11
12
13
14
15
 
 
 
16
17
18
 
0
@@ -1,17 +1,18 @@
0
 dnl Process this file with autoconf to produce a configure script.
0
 dnl $Id$
0
 AC_PREREQ(2.52)
0
-AC_INIT([MacPorts], [esyscmd(cat config/mp_version | tr -d '\n')], [macports-dev@lists.macosforge.org], [macports])
0
+AC_INIT([MacPorts], [esyscmd(cat config/macports_version | tr -d '\n')], [macports-dev@lists.macosforge.org], [macports])
0
 AC_CONFIG_SRCDIR([src/pextlib1.0/Pextlib.c])
0
 AC_CONFIG_HEADERS([src/config.h])
0
 AC_CANONICAL_SYSTEM
0
 
0
-# 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)
0
+# Read in the MacPorts version from the base/config/macports_vesion file
0
 AC_MSG_CHECKING(MacPorts version)
0
+MACPORTS_VERSION=$(cat config/macports_version | tr -d '\n')
0
+AC_MSG_RESULT([$MACPORTS_VERSION])
0
+AC_SUBST(MACPORTS_VERSION)
0
+# Read the old, floating point format version, which we still use internally, and export it for the $macports::autoconf::macports_version variable
0
 MP_VERSION=$(cat config/mp_version | tr -d '\n')
0
-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/'`
0
-AC_MSG_RESULT([$VER])
0
-AC_SUBST(VER)
0
 AC_SUBST(MP_VERSION)
0
 
0
 # Check user PATH for MP paths, and remove as necessary.
0
base/portmgr/fedora/macports.spec.in 
...
1
2
3
 
4
5
6
 
...
1
2
 
3
4
5
6
 
0
@@ -1,6 +1,6 @@
0
 Summary: MacPorts allows installing software on Mac OS X (and other platforms)
0
 Name: macports
0
-Version: @VER@
0
+Version: @MACPORTS_VERSION@
0
 Release: 0%{?dist}
0
 License: BSD
0
 Group: System Environment/Base
0
base/portmgr/freebsd/Makefile.in 
...
6
7
8
9
 
10
11
12
 
...
6
7
8
 
9
10
11
12
 
0
@@ -6,7 +6,7 @@
0
 #
0
 
0
 PORTNAME=  macports
0
-PORTVERSION=	@VER@
0
+PORTVERSION=	@MACPORTS_VERSION@
0
 CATEGORIES=  sysutils
0
 MASTER_SITES=  http://svn.macosforge.org/repository/macports/distfiles/MacPorts/
0
 DISTNAME=  MacPorts-${PORTVERSION}

Comments

    No one has commented yet.