Welcome the new lang/gcc port! This shall track our preferred version

of GCC (usually an upstream release).  It starts out as GCC 4.6.1 and
is thus in conflict with lang/gcc46 and will move towards later minor
versions of GCC 4.6 and then on to GCC 4.7.

lang/gcc will provide gcc46, g++46, gfortran46 etc. exactly like
lang/gcc46 with which it is interchangible.

This is also planned to be in sync with our existing USE_FORTRAN knob
so that users have the option of using this port, rarely updated, or
the corresponding lang/gcc46 which follows weekly upstream snapshots.

On the way rename %%GCC_VER%% in pkg-plist to %%GCC_VERSION%% and
make the Makefile machinery a bit more generic to minimize differences
between lang/gcc ports based on releases and those based on snapshots.

PR:		156857

4 files changed, 31 insertions, 21 deletions

diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 95e3d58ad88e..9bd7eca1aa25 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -1,16 +1,16 @@
 # ex:ts=8
-# Ports collection makefile for:	gcc46
-# Date created:				2010-04-25
+# Ports collection makefile for:	gcc
+# Date created:				2011-09-25
 # Whom:					Gerald Pfeifer <gerald@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	gcc
-PORTVERSION=	4.6.2.20110916
+PORTVERSION=	4.6.1
 CATEGORIES=	lang java
 MASTER_SITES=	${MASTER_SITE_GCC}
-MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
+MASTER_SITE_SUBDIR=	releases/gcc-${VERSIONSTRING}
 DISTFILES=	gcc-${VERSIONSTRING}${EXTRACT_SUFX}
 
 MAINTAINER=	gerald@FreeBSD.org
@@ -25,7 +25,12 @@ RUN_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
 BUILD_DEPENDS+=	runtest:${PORTSDIR}/misc/dejagnu
 .endif
 
-VERSIONSTRING=	${PORTVERSION:C/([0-9]+\.[0-9]+).*\.([0-9]+)/\1-\2/}
+CONFLICTS=	gcc-4.6.[2-9]*
+
+# VERSIONSTRING relates to downloads, GCC_VERSION and SUFFIX to names
+# of executables and directories once installed.
+VERSIONSTRING=	${PORTVERSION}
+GCC_VERSION=	${PORTVERSION:C/(.+)\.[0-9]{8}/\1/}
 SUFFIX=		${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
 LATEST_LINK=	gcc${SUFFIX}${PKGNAMESUFFIX}
 ONLY_FOR_ARCHS=	amd64 i386 ia64 powerpc sparc64
@@ -75,7 +80,7 @@ CONFIGURE_ARGS+=--disable-nls \
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 ALL_TARGET=	bootstrap-lean
 USE_LDCONFIG=	${TARGLIB}
-PLIST_SUB=	GCC_VER=${PORTVERSION:C/(.+)\.[0-9]+/\1/} \
+PLIST_SUB=	GCC_VERSION=${GCC_VERSION} \
 		GNU_HOST=${CONFIGURE_TARGET} \
 		SUFFIX=${SUFFIX}
 MAN1=		cpp${SUFFIX}.1 \
diff --git a/lang/gcc/distinfo b/lang/gcc/distinfo
index d8d954de3c19..14add683a634 100644
--- a/lang/gcc/distinfo
+++ b/lang/gcc/distinfo
@@ -1,4 +1,4 @@
-SHA256 (gcc-4.6-20110916.tar.bz2) = 347e2c07241f023428c6efaeae2aa44cf8a4bbb316606e4037c4e076625c7cd0
-SIZE (gcc-4.6-20110916.tar.bz2) = 68078036
+SHA256 (gcc-4.6.1.tar.bz2) = 8eebf51c908151d1f1a3756c8899c5e71572e8469a547ad72a1ef16a08a31b59
+SIZE (gcc-4.6.1.tar.bz2) = 71688404
 SHA256 (ecj-4.5.jar) = 98fd128f1d374d9e42fd9d4836bdd249c6d511ebc6c0df17fbc1b9df96c3d781
 SIZE (ecj-4.5.jar) = 1470676
diff --git a/lang/gcc/pkg-descr b/lang/gcc/pkg-descr
index d9dcae413f8e..e2ba591daf6d 100644
--- a/lang/gcc/pkg-descr
+++ b/lang/gcc/pkg-descr
@@ -2,6 +2,11 @@ GCC, the GNU Compiler Collection, supports a number of languages.  This
 port installs the C, C++, Fortran and Java front ends as gcc46, g++46,
 gfortran46, and gcj46, respectively.
 
+It can be used interchangibly with the lang/gcc46 port which tracks
+weekly upstream snapshots whereas this port will be updated less
+frequently, mostly in sync with upstream releases, and will move to
+lang/gcc47 and later over time.
+
 WWW: http://gcc.gnu.org/
 
 Gerald Pfeifer <gerald@FreeBSD.org>
diff --git a/lang/gcc/pkg-plist b/lang/gcc/pkg-plist
index d9851de1fd80..c43d639a499d 100644
--- a/lang/gcc/pkg-plist
+++ b/lang/gcc/pkg-plist
@@ -2,7 +2,7 @@
 bin/%%GNU_HOST%%-c++%%SUFFIX%%
 bin/%%GNU_HOST%%-g++%%SUFFIX%%
 bin/%%GNU_HOST%%-gcc%%SUFFIX%%
-bin/%%GNU_HOST%%-gcc-%%GCC_VER%%
+bin/%%GNU_HOST%%-gcc-%%GCC_VERSION%%
 bin/%%GNU_HOST%%-gfortran%%SUFFIX%%
 bin/c++%%SUFFIX%%
 bin/cpp%%SUFFIX%%
@@ -11,16 +11,16 @@ bin/gcc%%SUFFIX%%
 bin/gcov%%SUFFIX%%
 bin/gfortran%%SUFFIX%%
 info/gcc%%SUFFIX%%/dir
-%%JAVA%%share/gcc-%%GCC_VER%%/python/libjava/aotcompile.py
-%%JAVA%%share/gcc-%%GCC_VER%%/python/libjava/classfile.py
-%%JAVA%%@dirrm share/gcc-%%GCC_VER%%/python/libjava
-share/gcc-%%GCC_VER%%/python/libstdcxx/__init__.py
-share/gcc-%%GCC_VER%%/python/libstdcxx/v6/__init__.py
-share/gcc-%%GCC_VER%%/python/libstdcxx/v6/printers.py
-@dirrm share/gcc-%%GCC_VER%%/python/libstdcxx/v6
-@dirrm share/gcc-%%GCC_VER%%/python/libstdcxx
-@dirrm share/gcc-%%GCC_VER%%/python
-@dirrm share/gcc-%%GCC_VER%%
+%%JAVA%%share/gcc-%%GCC_VERSION%%/python/libjava/aotcompile.py
+%%JAVA%%share/gcc-%%GCC_VERSION%%/python/libjava/classfile.py
+%%JAVA%%@dirrm share/gcc-%%GCC_VERSION%%/python/libjava
+share/gcc-%%GCC_VERSION%%/python/libstdcxx/__init__.py
+share/gcc-%%GCC_VERSION%%/python/libstdcxx/v6/__init__.py
+share/gcc-%%GCC_VERSION%%/python/libstdcxx/v6/printers.py
+@dirrm share/gcc-%%GCC_VERSION%%/python/libstdcxx/v6
+@dirrm share/gcc-%%GCC_VERSION%%/python/libstdcxx
+@dirrm share/gcc-%%GCC_VERSION%%/python
+@dirrm share/gcc-%%GCC_VERSION%%
 %%JAVA%%bin/%%GNU_HOST%%-gcj%%SUFFIX%%
 %%JAVA%%bin/aot-compile%%SUFFIX%%
 %%JAVA%%bin/gappletviewer%%SUFFIX%%
@@ -45,8 +45,8 @@ share/gcc-%%GCC_VER%%/python/libstdcxx/v6/printers.py
 %%JAVA%%bin/rebuild-gcj-db%%SUFFIX%%
 %%JAVA%%libdata/pkgconfig/libgcj-4.6.pc
 %%JAVA%%share/java/ecj.jar
-%%JAVA%%share/java/libgcj-%%GCC_VER%%.jar
-%%JAVA%%share/java/libgcj-tools-%%GCC_VER%%.jar
+%%JAVA%%share/java/libgcj-%%GCC_VERSION%%.jar
+%%JAVA%%share/java/libgcj-tools-%%GCC_VERSION%%.jar
 @exec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi
 @unexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi
 @comment Insert PLIST.lib here