4 files changed, 28 insertions, 24 deletions

diff --git a/lang/gnat-gcc43/Makefile b/lang/gnat-gcc43/Makefile
index 904506322bb9..c5621695fd1f 100644
--- a/lang/gnat-gcc43/Makefile
+++ b/lang/gnat-gcc43/Makefile
@@ -1,17 +1,18 @@
 # ex:ts=8
 #
-# Ports collection makefile for:   gnat-gcc
-# Date created:         9 Jul 2006
-# Whom:                 Karel Miklav <karel@lovetemple.net>
+# Ports collection makefile for: gnat-gcc
+# Date created:		9 Jul 2006
+# Whom:			Karel Miklav <karel@lovetemple.net>
 #
 # $FreeBSD$
 #
 
 PORTNAME=		gnat-gcc
-PORTVERSION=		4.2.0
+PORTVERSION=		4.3.0
 CATEGORIES=		lang
-MASTER_SITES=		GCC/snapshots/${versionstring} \
-			CENKES:boot http://lovetemple.net/data/:boot
+MASTER_SITES=		${MASTER_SITE_GCC} \
+			http://lovetemple.net/data/:boot
+MASTER_SITE_SUBDIR=	snapshots/${versionstring}
 DISTFILES=		gcc-core-${versionstring}${EXTRACT_SUFX} \
 			gcc-ada-${versionstring}${EXTRACT_SUFX} \
 			gcc-testsuite-${versionstring}${EXTRACT_SUFX} \
@@ -20,6 +21,9 @@ DISTFILES=		gcc-core-${versionstring}${EXTRACT_SUFX} \
 MAINTAINER=		karel@lovetemple.net
 COMMENT=		The GNU Ada Compiler system
 
+LIB_DEPENDS=		gmp.7:${PORTSDIR}/math/libgmp4 \
+			mpfr.1:${PORTSDIR}/math/mpfr
+
 ONLY_FOR_ARCHS=		i386
 
 USE_BZIP2=		yes
@@ -28,7 +32,7 @@ USE_ICONV=		yes
 USE_PERL5_BUILD=	yes # Needed for man pages.
 USE_BISON=		yes
 
-CONFLICTS=		gcc-4.2.*
+CONFLICTS=		gcc-4.3.*
 WRKSRC=			${WRKDIR}/build
 
 MAN1=			cpp${gcc_suffix}.1 \
@@ -50,15 +54,16 @@ LATEST_LINK=		${PORTNAME}${gcc_suffix}
 
 .include <bsd.port.pre.mk>
 
-gcc_snapshot=		20070307
+gcc_snapshot=		20070518
 versionstring=		${PORTVERSION:C/\.[0-9]*$//}-${gcc_snapshot}
 srcdir=			${WRKDIR}/gcc-${versionstring}
-gcc_suffix=		42
+gcc_suffix=		43
 fsf_mans=		fsf-funding gfdl gpl
 fsf_suffix=		-${PORTNAME}${gcc_suffix}
 targlib=		${PREFIX}/lib/gcc-${PORTVERSION}
 gcc_link=		${PREFIX}/bin/gcc${gcc_suffix}/gcc
 boot_stamp=		${ARCH}-freebsd-${OSREL:C/\.[0-9.]*//}
+check_target=		check
 
 PATCH_WRKSRC=		${srcdir}
 
diff --git a/lang/gnat-gcc43/distinfo b/lang/gnat-gcc43/distinfo
index cee9342f1dd3..8642bb6d3008 100644
--- a/lang/gnat-gcc43/distinfo
+++ b/lang/gnat-gcc43/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.2-20070307.tar.bz2) = a142c5c2b46d2d6cdff8a06df4a31c63
-SHA256 (gcc-core-4.2-20070307.tar.bz2) = 0fb6dca2ab41cc9b41984f3c6d81d6241e93126f9f96c26ce13f9db4cd423bc8
-SIZE (gcc-core-4.2-20070307.tar.bz2) = 15957365
-MD5 (gcc-ada-4.2-20070307.tar.bz2) = 0d543d218d6d6cf13d8dfb0ca125bb1d
-SHA256 (gcc-ada-4.2-20070307.tar.bz2) = 19331f2614d251fe902f636385d86f4e4170ff8c72a1229c896d4e444ad5c67e
-SIZE (gcc-ada-4.2-20070307.tar.bz2) = 4748161
-MD5 (gcc-testsuite-4.2-20070307.tar.bz2) = 11d7aca1995fe9e8c5277ed6a50483ec
-SHA256 (gcc-testsuite-4.2-20070307.tar.bz2) = 8dee29d5143442582a37be771f07033f6a7448bb303f0c594ea8484a09f522ed
-SIZE (gcc-testsuite-4.2-20070307.tar.bz2) = 3836944
+MD5 (gcc-core-4.3-20070518.tar.bz2) = 176f3d054e4f360644f7da8a674144b5
+SHA256 (gcc-core-4.3-20070518.tar.bz2) = 95f9ccacec0209020403f41a0a8f51e90ec5cfacf1cee9275d677c3a25b45dc6
+SIZE (gcc-core-4.3-20070518.tar.bz2) = 17259423
+MD5 (gcc-ada-4.3-20070518.tar.bz2) = 5cb6e5507ef7d53b1f171588ba8c9720
+SHA256 (gcc-ada-4.3-20070518.tar.bz2) = 5787f9dea27e5499da4886271120ae83bb2b682a7d04940464a9645d8686ce5c
+SIZE (gcc-ada-4.3-20070518.tar.bz2) = 4981310
+MD5 (gcc-testsuite-4.3-20070518.tar.bz2) = 4a450c3558b822628b0ca362306b9ab6
+SHA256 (gcc-testsuite-4.3-20070518.tar.bz2) = a80bda0aa95367f470eb12a999cf967aabc4a9e558436beb652503898f28a7a2
+SIZE (gcc-testsuite-4.3-20070518.tar.bz2) = 4040620
 MD5 (gnat-gcc41-boot-i386-freebsd-4.tbz) = a9848cbeb6a0dca57cbe312e1546b79e
 SIZE (gnat-gcc41-boot-i386-freebsd-4.tbz) = 11508394
 MD5 (gnat-gcc41-boot-i386-freebsd-5.tbz) = e439eaefcafdf6056896a16a89671a9e
diff --git a/lang/gnat-gcc43/files/patch-gcc-ada-Makefile.in b/lang/gnat-gcc43/files/patch-gcc-ada-Makefile.in
index 390980406659..aa0ce43485be 100644
--- a/lang/gnat-gcc43/files/patch-gcc-ada-Makefile.in
+++ b/lang/gnat-gcc43/files/patch-gcc-ada-Makefile.in
@@ -1,10 +1,10 @@
---- gcc/ada/Makefile.in.orig	Sun Oct 22 00:57:17 2006
-+++ gcc/ada/Makefile.in	Sun Oct 22 00:57:43 2006
-@@ -842,7 +842,7 @@
-   mlib-tgt.adb<mlib-tgt-linux.adb
+--- gcc/ada/Makefile.in.orig	Wed May  9 06:22:48 2007
++++ gcc/ada/Makefile.in	Wed May  9 06:31:51 2007
+@@ -855,7 +855,7 @@
    GNATLIB_SHARED = gnatlib-shared-dual
  
--  THREADSLIB= -lc_r
+   EH_MECHANISM=-gcc
+-  THREADSLIB= -lpthread
 +  THREADSLIB= ${PTHREAD_LIBS}
    GMEM_LIB = gmemlib
    PREFIX_OBJS = $(PREFIX_REAL_OBJS)
diff --git a/lang/gnat-gcc43/pkg-plist b/lang/gnat-gcc43/pkg-plist
index 397ec1cbee75..6f2d834366e7 100644
--- a/lang/gnat-gcc43/pkg-plist
+++ b/lang/gnat-gcc43/pkg-plist
@@ -16,7 +16,6 @@ bin/gcc%%SUFFIX%%/gnatmake
 bin/gcc%%SUFFIX%%/gnatname
 bin/gcc%%SUFFIX%%/gnatprep
 bin/gcc%%SUFFIX%%/gnatxref
-bin/gcc%%SUFFIX%%/gprmake
 bin/gcc%%SUFFIX%%/%%GNU_HOST%%-gcc-%%GCC_VER%%
 bin/gcc%%SUFFIX%%/%%GNU_HOST%%-gcc%%SUFFIX%%
 info/gcc%%SUFFIX%%/dir