From owner-svn-ports-all@FreeBSD.ORG Mon Oct 1 03:46:22 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 92EF1106564A; Mon, 1 Oct 2012 03:46:22 +0000 (UTC) (envelope-from gerald@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7D96A8FC14; Mon, 1 Oct 2012 03:46:22 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q913kMMr074296; Mon, 1 Oct 2012 03:46:22 GMT (envelope-from gerald@svn.freebsd.org) Received: (from gerald@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q913kM3k074292; Mon, 1 Oct 2012 03:46:22 GMT (envelope-from gerald@svn.freebsd.org) Message-Id: <201210010346.q913kM3k074292@svn.freebsd.org> From: Gerald Pfeifer Date: Mon, 1 Oct 2012 03:46:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r305091 - head/lang/gcc48 X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Oct 2012 03:46:22 -0000 Author: gerald Date: Mon Oct 1 03:46:21 2012 New Revision: 305091 URL: http://svn.freebsd.org/changeset/ports/305091 Log: Forward port revision 282369 [1] which carried the following description: 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. On the way, update to the 20120930 snapshot of GCC 4.8.0. Submitted by: jkim [1] Modified: head/lang/gcc48/Makefile head/lang/gcc48/distinfo head/lang/gcc48/pkg-plist Modified: head/lang/gcc48/Makefile ============================================================================== --- head/lang/gcc48/Makefile Mon Oct 1 03:03:19 2012 (r305090) +++ head/lang/gcc48/Makefile Mon Oct 1 03:46:21 2012 (r305091) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gcc -PORTVERSION= 4.8.0.20120909 +PORTVERSION= 4.8.0.20120930 CATEGORIES= lang java MASTER_SITES= ${MASTER_SITE_GCC} MASTER_SITE_SUBDIR= snapshots/${VERSIONSTRING} @@ -20,7 +20,10 @@ RUN_DEPENDS+= ${LOCALBASE}/bin/as:${PORT BUILD_DEPENDS+= runtest:${PORTSDIR}/misc/dejagnu .endif +# VERSIONSTRING relates to downloads, GCC_VERSION and SUFFIX to names +# of executables and directories once installed. VERSIONSTRING= ${PORTVERSION:C/([0-9]+\.[0-9]+).*\.([0-9]+)/\1-\2/} +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 powerpc powerpc64 sparc64 @@ -73,7 +76,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 \ Modified: head/lang/gcc48/distinfo ============================================================================== --- head/lang/gcc48/distinfo Mon Oct 1 03:03:19 2012 (r305090) +++ head/lang/gcc48/distinfo Mon Oct 1 03:46:21 2012 (r305091) @@ -1,2 +1,2 @@ -SHA256 (gcc-4.8-20120909.tar.bz2) = 7afd0b9143a541702f767d69610b5648e7e97fdd66b02ca910175e0bad2b31c0 -SIZE (gcc-4.8-20120909.tar.bz2) = 79532225 +SHA256 (gcc-4.8-20120930.tar.bz2) = a5fe63ac539933edc9912394a6755f53d914e53ca63f0cc0eea6aa9753838189 +SIZE (gcc-4.8-20120930.tar.bz2) = 79806276 Modified: head/lang/gcc48/pkg-plist ============================================================================== --- head/lang/gcc48/pkg-plist Mon Oct 1 03:03:19 2012 (r305090) +++ head/lang/gcc48/pkg-plist Mon Oct 1 03:46:21 2012 (r305091) @@ -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%%-gcc-ar%%SUFFIX%% bin/%%GNU_HOST%%-gcc-nm%%SUFFIX%% bin/%%GNU_HOST%%-gcc-ranlib%%SUFFIX%% @@ -17,16 +17,16 @@ bin/gcc-ranlib%%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%% @@ -50,8 +50,8 @@ share/gcc-%%GCC_VER%%/python/libstdcxx/v %%JAVA%%bin/jv-convert%%SUFFIX%% %%JAVA%%bin/rebuild-gcj-db%%SUFFIX%% %%JAVA%%libdata/pkgconfig/libgcj-4.8.pc -%%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