9 files changed, 69 insertions, 45 deletions

diff --git a/lang/gnat-gcc41/Makefile b/lang/gnat-gcc41/Makefile
index 248093643e68..c7cee3c08260 100644
--- a/lang/gnat-gcc41/Makefile
+++ b/lang/gnat-gcc41/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=		gnat-gcc
 PORTVERSION=	4.1.2
+PORTREVISION=	1
 CATEGORIES=		lang
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${versionstring}
@@ -47,11 +48,7 @@ LATEST_LINK=	${PORTNAME}${gcc_suffix}
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} > 700000
-BROKEN=		does not compile at 7.x
-.endif
-
-gcc_snapshot=	20060818
+gcc_snapshot=	20060901
 versionstring=	${PORTVERSION:C/\.[0-9]*$//}-${gcc_snapshot}
 srcdir=			${WRKDIR}/gcc-${versionstring}
 gcc_suffix=		41
@@ -73,7 +70,7 @@ CONFIGURE_ARGS=	--enable-languages="c,ada" \
 				--infodir=${PREFIX}/${INFO_PATH}/gcc${gcc_suffix}
 
 ALL_TARGET=		bootstrap-lean
-MAKE_ARGS+=		MAKEINFOFLAGS="--no-split"
+MAKE_ENV+=		MAKEINFOFLAGS="--no-split" PTHREAD_LIBS=${PTHREAD_LIBS}
 
 PLIST_SUB=		GCC_VER=${PORTVERSION} \
 				GNU_HOST=${CONFIGURE_TARGET} \
diff --git a/lang/gnat-gcc41/distinfo b/lang/gnat-gcc41/distinfo
index c48f1b2e07e0..5f0a5ee373aa 100644
--- a/lang/gnat-gcc41/distinfo
+++ b/lang/gnat-gcc41/distinfo
@@ -1,9 +1,9 @@
-MD5 (gcc-core-4.1-20060818.tar.bz2) = e450b204b83de10ea971e2aeda24e678
-SHA256 (gcc-core-4.1-20060818.tar.bz2) = e6cc4b93bb55f3b1b0e10d170cf676d722948d096b0af29c0a526eddadda3d53
-SIZE (gcc-core-4.1-20060818.tar.bz2) = 14957673
-MD5 (gcc-ada-4.1-20060818.tar.bz2) = 411397607272a36d2cafa40b78c39bdf
-SHA256 (gcc-ada-4.1-20060818.tar.bz2) = 8b6c2c0292e1b9524c3a930d6949fbdebe367d420c4298f9b2661d14ce2bc819
-SIZE (gcc-ada-4.1-20060818.tar.bz2) = 4628445
-MD5 (gcc-testsuite-4.1-20060818.tar.bz2) = 27d1ba3833f51ca9b34342e4a07b39a4
-SHA256 (gcc-testsuite-4.1-20060818.tar.bz2) = cdb4a07f40102f4fe207e29b094cd9ca47798c40083992d186a9731ca992b265
-SIZE (gcc-testsuite-4.1-20060818.tar.bz2) = 3567830
+MD5 (gcc-core-4.1-20060901.tar.bz2) = 5b8663c9b042eb5ab626d4c606924fa5
+SHA256 (gcc-core-4.1-20060901.tar.bz2) = 49bc7001a2ddf66795277adf14b129d19eff72a93e80be7e8ad6bad7d5fce2c5
+SIZE (gcc-core-4.1-20060901.tar.bz2) = 14963002
+MD5 (gcc-ada-4.1-20060901.tar.bz2) = 41eea5d77d67adeafa4462685c6262db
+SHA256 (gcc-ada-4.1-20060901.tar.bz2) = 2682cb2caecb726de5333b49f0307e7ca18c9434ff4ae38b7b6e2f8c3e4ef9ef
+SIZE (gcc-ada-4.1-20060901.tar.bz2) = 4627883
+MD5 (gcc-testsuite-4.1-20060901.tar.bz2) = a7ab2fd0c98b49c123fc9c1a12035fe7
+SHA256 (gcc-testsuite-4.1-20060901.tar.bz2) = ae7a81cc2fe55cd52d210a1793efa49b1e695eae5c9a070e7080f2447891fbe0
+SIZE (gcc-testsuite-4.1-20060901.tar.bz2) = 3571090
diff --git a/lang/gnat-gcc41/files/patch-gcc-ada-Makefile.in b/lang/gnat-gcc41/files/patch-gcc-ada-Makefile.in
new file mode 100644
index 000000000000..c99640561416
--- /dev/null
+++ b/lang/gnat-gcc41/files/patch-gcc-ada-Makefile.in
@@ -0,0 +1,11 @@
+--- gcc/ada/Makefile.in.orig	Fri Sep  8 00:21:56 2006
++++ gcc/ada/Makefile.in	Fri Sep  8 00:27:47 2006
+@@ -742,7 +742,7 @@
+   mlib-tgt.adb<mlib-tgt-linux.adb
+   GNATLIB_SHARED = gnatlib-shared-dual
+ 
+-  THREADSLIB= -lc_r
++  THREADSLIB= ${PTHREAD_LIBS}
+   GMEM_LIB = gmemlib
+   PREFIX_OBJS = $(PREFIX_REAL_OBJS)
+   LIBRARY_VERSION := $(LIB_VERSION)
diff --git a/lang/gnat-gcc42/Makefile b/lang/gnat-gcc42/Makefile
index 248093643e68..c7cee3c08260 100644
--- a/lang/gnat-gcc42/Makefile
+++ b/lang/gnat-gcc42/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=		gnat-gcc
 PORTVERSION=	4.1.2
+PORTREVISION=	1
 CATEGORIES=		lang
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${versionstring}
@@ -47,11 +48,7 @@ LATEST_LINK=	${PORTNAME}${gcc_suffix}
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} > 700000
-BROKEN=		does not compile at 7.x
-.endif
-
-gcc_snapshot=	20060818
+gcc_snapshot=	20060901
 versionstring=	${PORTVERSION:C/\.[0-9]*$//}-${gcc_snapshot}
 srcdir=			${WRKDIR}/gcc-${versionstring}
 gcc_suffix=		41
@@ -73,7 +70,7 @@ CONFIGURE_ARGS=	--enable-languages="c,ada" \
 				--infodir=${PREFIX}/${INFO_PATH}/gcc${gcc_suffix}
 
 ALL_TARGET=		bootstrap-lean
-MAKE_ARGS+=		MAKEINFOFLAGS="--no-split"
+MAKE_ENV+=		MAKEINFOFLAGS="--no-split" PTHREAD_LIBS=${PTHREAD_LIBS}
 
 PLIST_SUB=		GCC_VER=${PORTVERSION} \
 				GNU_HOST=${CONFIGURE_TARGET} \
diff --git a/lang/gnat-gcc42/distinfo b/lang/gnat-gcc42/distinfo
index c48f1b2e07e0..5f0a5ee373aa 100644
--- a/lang/gnat-gcc42/distinfo
+++ b/lang/gnat-gcc42/distinfo
@@ -1,9 +1,9 @@
-MD5 (gcc-core-4.1-20060818.tar.bz2) = e450b204b83de10ea971e2aeda24e678
-SHA256 (gcc-core-4.1-20060818.tar.bz2) = e6cc4b93bb55f3b1b0e10d170cf676d722948d096b0af29c0a526eddadda3d53
-SIZE (gcc-core-4.1-20060818.tar.bz2) = 14957673
-MD5 (gcc-ada-4.1-20060818.tar.bz2) = 411397607272a36d2cafa40b78c39bdf
-SHA256 (gcc-ada-4.1-20060818.tar.bz2) = 8b6c2c0292e1b9524c3a930d6949fbdebe367d420c4298f9b2661d14ce2bc819
-SIZE (gcc-ada-4.1-20060818.tar.bz2) = 4628445
-MD5 (gcc-testsuite-4.1-20060818.tar.bz2) = 27d1ba3833f51ca9b34342e4a07b39a4
-SHA256 (gcc-testsuite-4.1-20060818.tar.bz2) = cdb4a07f40102f4fe207e29b094cd9ca47798c40083992d186a9731ca992b265
-SIZE (gcc-testsuite-4.1-20060818.tar.bz2) = 3567830
+MD5 (gcc-core-4.1-20060901.tar.bz2) = 5b8663c9b042eb5ab626d4c606924fa5
+SHA256 (gcc-core-4.1-20060901.tar.bz2) = 49bc7001a2ddf66795277adf14b129d19eff72a93e80be7e8ad6bad7d5fce2c5
+SIZE (gcc-core-4.1-20060901.tar.bz2) = 14963002
+MD5 (gcc-ada-4.1-20060901.tar.bz2) = 41eea5d77d67adeafa4462685c6262db
+SHA256 (gcc-ada-4.1-20060901.tar.bz2) = 2682cb2caecb726de5333b49f0307e7ca18c9434ff4ae38b7b6e2f8c3e4ef9ef
+SIZE (gcc-ada-4.1-20060901.tar.bz2) = 4627883
+MD5 (gcc-testsuite-4.1-20060901.tar.bz2) = a7ab2fd0c98b49c123fc9c1a12035fe7
+SHA256 (gcc-testsuite-4.1-20060901.tar.bz2) = ae7a81cc2fe55cd52d210a1793efa49b1e695eae5c9a070e7080f2447891fbe0
+SIZE (gcc-testsuite-4.1-20060901.tar.bz2) = 3571090
diff --git a/lang/gnat-gcc42/files/patch-gcc-ada-Makefile.in b/lang/gnat-gcc42/files/patch-gcc-ada-Makefile.in
new file mode 100644
index 000000000000..c99640561416
--- /dev/null
+++ b/lang/gnat-gcc42/files/patch-gcc-ada-Makefile.in
@@ -0,0 +1,11 @@
+--- gcc/ada/Makefile.in.orig	Fri Sep  8 00:21:56 2006
++++ gcc/ada/Makefile.in	Fri Sep  8 00:27:47 2006
+@@ -742,7 +742,7 @@
+   mlib-tgt.adb<mlib-tgt-linux.adb
+   GNATLIB_SHARED = gnatlib-shared-dual
+ 
+-  THREADSLIB= -lc_r
++  THREADSLIB= ${PTHREAD_LIBS}
+   GMEM_LIB = gmemlib
+   PREFIX_OBJS = $(PREFIX_REAL_OBJS)
+   LIBRARY_VERSION := $(LIB_VERSION)
diff --git a/lang/gnat-gcc43/Makefile b/lang/gnat-gcc43/Makefile
index 248093643e68..c7cee3c08260 100644
--- a/lang/gnat-gcc43/Makefile
+++ b/lang/gnat-gcc43/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=		gnat-gcc
 PORTVERSION=	4.1.2
+PORTREVISION=	1
 CATEGORIES=		lang
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${versionstring}
@@ -47,11 +48,7 @@ LATEST_LINK=	${PORTNAME}${gcc_suffix}
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} > 700000
-BROKEN=		does not compile at 7.x
-.endif
-
-gcc_snapshot=	20060818
+gcc_snapshot=	20060901
 versionstring=	${PORTVERSION:C/\.[0-9]*$//}-${gcc_snapshot}
 srcdir=			${WRKDIR}/gcc-${versionstring}
 gcc_suffix=		41
@@ -73,7 +70,7 @@ CONFIGURE_ARGS=	--enable-languages="c,ada" \
 				--infodir=${PREFIX}/${INFO_PATH}/gcc${gcc_suffix}
 
 ALL_TARGET=		bootstrap-lean
-MAKE_ARGS+=		MAKEINFOFLAGS="--no-split"
+MAKE_ENV+=		MAKEINFOFLAGS="--no-split" PTHREAD_LIBS=${PTHREAD_LIBS}
 
 PLIST_SUB=		GCC_VER=${PORTVERSION} \
 				GNU_HOST=${CONFIGURE_TARGET} \
diff --git a/lang/gnat-gcc43/distinfo b/lang/gnat-gcc43/distinfo
index c48f1b2e07e0..5f0a5ee373aa 100644
--- a/lang/gnat-gcc43/distinfo
+++ b/lang/gnat-gcc43/distinfo
@@ -1,9 +1,9 @@
-MD5 (gcc-core-4.1-20060818.tar.bz2) = e450b204b83de10ea971e2aeda24e678
-SHA256 (gcc-core-4.1-20060818.tar.bz2) = e6cc4b93bb55f3b1b0e10d170cf676d722948d096b0af29c0a526eddadda3d53
-SIZE (gcc-core-4.1-20060818.tar.bz2) = 14957673
-MD5 (gcc-ada-4.1-20060818.tar.bz2) = 411397607272a36d2cafa40b78c39bdf
-SHA256 (gcc-ada-4.1-20060818.tar.bz2) = 8b6c2c0292e1b9524c3a930d6949fbdebe367d420c4298f9b2661d14ce2bc819
-SIZE (gcc-ada-4.1-20060818.tar.bz2) = 4628445
-MD5 (gcc-testsuite-4.1-20060818.tar.bz2) = 27d1ba3833f51ca9b34342e4a07b39a4
-SHA256 (gcc-testsuite-4.1-20060818.tar.bz2) = cdb4a07f40102f4fe207e29b094cd9ca47798c40083992d186a9731ca992b265
-SIZE (gcc-testsuite-4.1-20060818.tar.bz2) = 3567830
+MD5 (gcc-core-4.1-20060901.tar.bz2) = 5b8663c9b042eb5ab626d4c606924fa5
+SHA256 (gcc-core-4.1-20060901.tar.bz2) = 49bc7001a2ddf66795277adf14b129d19eff72a93e80be7e8ad6bad7d5fce2c5
+SIZE (gcc-core-4.1-20060901.tar.bz2) = 14963002
+MD5 (gcc-ada-4.1-20060901.tar.bz2) = 41eea5d77d67adeafa4462685c6262db
+SHA256 (gcc-ada-4.1-20060901.tar.bz2) = 2682cb2caecb726de5333b49f0307e7ca18c9434ff4ae38b7b6e2f8c3e4ef9ef
+SIZE (gcc-ada-4.1-20060901.tar.bz2) = 4627883
+MD5 (gcc-testsuite-4.1-20060901.tar.bz2) = a7ab2fd0c98b49c123fc9c1a12035fe7
+SHA256 (gcc-testsuite-4.1-20060901.tar.bz2) = ae7a81cc2fe55cd52d210a1793efa49b1e695eae5c9a070e7080f2447891fbe0
+SIZE (gcc-testsuite-4.1-20060901.tar.bz2) = 3571090
diff --git a/lang/gnat-gcc43/files/patch-gcc-ada-Makefile.in b/lang/gnat-gcc43/files/patch-gcc-ada-Makefile.in
new file mode 100644
index 000000000000..c99640561416
--- /dev/null
+++ b/lang/gnat-gcc43/files/patch-gcc-ada-Makefile.in
@@ -0,0 +1,11 @@
+--- gcc/ada/Makefile.in.orig	Fri Sep  8 00:21:56 2006
++++ gcc/ada/Makefile.in	Fri Sep  8 00:27:47 2006
+@@ -742,7 +742,7 @@
+   mlib-tgt.adb<mlib-tgt-linux.adb
+   GNATLIB_SHARED = gnatlib-shared-dual
+ 
+-  THREADSLIB= -lc_r
++  THREADSLIB= ${PTHREAD_LIBS}
+   GMEM_LIB = gmemlib
+   PREFIX_OBJS = $(PREFIX_REAL_OBJS)
+   LIBRARY_VERSION := $(LIB_VERSION)