From owner-svn-ports-all@FreeBSD.ORG Wed Aug 22 00:41:38 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 12D7C106566B; Wed, 22 Aug 2012 00:41:38 +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 D80038FC08; Wed, 22 Aug 2012 00:41:37 +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 q7M0fbr8035537; Wed, 22 Aug 2012 00:41:37 GMT (envelope-from gerald@svn.freebsd.org) Received: (from gerald@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7M0fb1L035534; Wed, 22 Aug 2012 00:41:37 GMT (envelope-from gerald@svn.freebsd.org) Message-Id: <201208220041.q7M0fb1L035534@svn.freebsd.org> From: Gerald Pfeifer Date: Wed, 22 Aug 2012 00:41:37 +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: r302914 - head/lang/gcc46 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: Wed, 22 Aug 2012 00:41:38 -0000 Author: gerald Date: Wed Aug 22 00:41:37 2012 New Revision: 302914 URL: http://svn.freebsd.org/changeset/ports/302914 Log: Convert to the new options framework. Remove ABI version numbers for all library dependencies. Update to the 20120817 snapshot of GCC 4.6.4. Modified: head/lang/gcc46/Makefile head/lang/gcc46/distinfo Modified: head/lang/gcc46/Makefile ============================================================================== --- head/lang/gcc46/Makefile Wed Aug 22 00:12:21 2012 (r302913) +++ head/lang/gcc46/Makefile Wed Aug 22 00:41:37 2012 (r302914) @@ -7,7 +7,7 @@ # PORTNAME= gcc -PORTVERSION= 4.6.4.20120608 +PORTVERSION= 4.6.4.20120817 CATEGORIES= lang java MASTER_SITES= ${MASTER_SITE_GCC} MASTER_SITE_SUBDIR= snapshots/${VERSIONSTRING} @@ -16,9 +16,9 @@ DISTFILES= gcc-${VERSIONSTRING}${EXTRACT MAINTAINER= gerald@FreeBSD.org COMMENT= GNU Compiler Collection 4.6 -LIB_DEPENDS= gmp.10:${PORTSDIR}/math/gmp \ - mpfr.4:${PORTSDIR}/math/mpfr \ - mpc.2:${PORTSDIR}/math/mpc +LIB_DEPENDS= gmp:${PORTSDIR}/math/gmp \ + mpfr:${PORTSDIR}/math/mpfr \ + mpc:${PORTSDIR}/math/mpc RUN_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils .if defined(MAINTAINER_MODE) @@ -45,14 +45,13 @@ MAKE_JOBS_SAFE= yes PATCH_WRKSRC= ${SRCDIR} CONFIGURE_SCRIPT= ../${SRCDIR:S/${WRKDIR}\///}/configure -OPTIONS= JAVA "Enable the Java frontend (i386 and amd64 only)" on +OPTIONS_DEFINE_i386= JAVA +OPTIONS_DEFINE_amd64= JAVA +OPTIONS_DEFAULT_i386= JAVA +OPTIONS_DEFAULT_amd64= JAVA .include -.if ${ARCH} != i386 && ${ARCH} != amd64 -WITHOUT_JAVA= yes -.endif - .if ${ARCH} == "amd64" CONFIGURE_TARGET= x86_64-portbld-freebsd${OSREL} .else @@ -99,7 +98,7 @@ INFO= gcc${SUFFIX}/cpp \ INFO+= gcc${SUFFIX}/libquadmath .endif -.if ! defined(WITHOUT_JAVA) +.if ${PORT_OPTIONS:MJAVA} ECJ_JAR= ecj-4.5.jar MASTER_SITES+= ${MASTER_SITE_SOURCEWARE:S|$|:ecj|} MASTER_SITE_SUBDIR+= java/:ecj Modified: head/lang/gcc46/distinfo ============================================================================== --- head/lang/gcc46/distinfo Wed Aug 22 00:12:21 2012 (r302913) +++ head/lang/gcc46/distinfo Wed Aug 22 00:41:37 2012 (r302914) @@ -1,4 +1,4 @@ -SHA256 (gcc-4.6-20120608.tar.bz2) = d6961accd2e948f918ee2a95b1e61c9e4be8bfef230581ce15af200f252dffaf -SIZE (gcc-4.6-20120608.tar.bz2) = 68156953 +SHA256 (gcc-4.6-20120817.tar.bz2) = ad18f9a69b20b9aed14ccdfa44ec6005d0e8062ce3e84e44df50a734d8488b64 +SIZE (gcc-4.6-20120817.tar.bz2) = 68159550 SHA256 (ecj-4.5.jar) = 98fd128f1d374d9e42fd9d4836bdd249c6d511ebc6c0df17fbc1b9df96c3d781 SIZE (ecj-4.5.jar) = 1470676