diff options
| author | gerald <gerald@FreeBSD.org> | 2012-08-22 08:41:37 +0800 |
|---|---|---|
| committer | gerald <gerald@FreeBSD.org> | 2012-08-22 08:41:37 +0800 |
| commit | 85e84e1f85522129c1003765b0329f6615741b4c (patch) | |
| tree | 73c715a6fa0b4b8c464fdd8aafbda09ec600c5cf /lang | |
| parent | 6987657bdf9e14f39dcb13c300384d9ec27cc637 (diff) | |
| download | freebsd-ports-gnome-85e84e1f85522129c1003765b0329f6615741b4c.tar.gz freebsd-ports-gnome-85e84e1f85522129c1003765b0329f6615741b4c.tar.zst freebsd-ports-gnome-85e84e1f85522129c1003765b0329f6615741b4c.zip | |
Convert to the new options framework.
Remove ABI version numbers for all library dependencies.
Update to the 20120817 snapshot of GCC 4.6.4.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/gcc46/Makefile | 19 | ||||
| -rw-r--r-- | lang/gcc46/distinfo | 4 |
2 files changed, 11 insertions, 12 deletions
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile index 1665a26f9711..cf82e7d03c65 100644 --- a/lang/gcc46/Makefile +++ b/lang/gcc46/Makefile @@ -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_SUFX} 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 <bsd.port.pre.mk> -.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 diff --git a/lang/gcc46/distinfo b/lang/gcc46/distinfo index 9f1d45e3e4f0..dedd2c5a858b 100644 --- a/lang/gcc46/distinfo +++ b/lang/gcc46/distinfo @@ -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 |