Update to the 20060617 snapshot of GCC 4.2.0.

Employ the new USE_LDCONFIG feature, which allows us to get rid of the
various, much more manual and error-prone hacks we needed so far.

Reviewed by:	flz (for lang/gcc40)

4 files changed, 21 insertions, 41 deletions

diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index c5511ac38475..2ccfbf995ae7 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.2.0
-PORTREVISION=	20060610
+PORTREVISION=	20060617
 CATEGORIES=	lang java
 VERSIONSTRING=	4.2-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -71,11 +71,7 @@ CONFIGURE_ARGS+=	--enable-java-awt=xlib,gtk
 .endif
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 ALL_TARGET=	bootstrap
-INSTALLS_SHLIB=	yes
-LDCONFIG_DIRS=	${TARGLIB}
-SUB_LIST=	TARGLIB="${TARGLIB}"
-SUB_FILES=	gcc.sh
-RC_D_SH=	etc/rc.d/gcc${SUFFIX}.sh
+USE_LDCONFIG=	${TARGLIB}
 PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} \
 		SUFFIX=${SUFFIX}
 MAN1=		cpp${SUFFIX}.1 \
@@ -146,8 +142,7 @@ check: build
 	cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check
 
 post-install:
-	-@${MKDIR} ${PREFIX}/etc/rc.d
-	${INSTALL_SCRIPT} ${WRKDIR}/gcc.sh ${PREFIX}/${RC_D_SH}
+	-@${MKDIR} ${PREFIX}/libdata/ldconfig
 	# man pages can only be generated if Perl >= 5.6 is installed;
 	# fake them otherwise.
 	for mp in ${_MANPAGES}; do \
diff --git a/lang/gcc46/distinfo b/lang/gcc46/distinfo
index 1b0cc6f71810..3a381f9f9fdf 100644
--- a/lang/gcc46/distinfo
+++ b/lang/gcc46/distinfo
@@ -1,18 +1,18 @@
-MD5 (gcc-core-4.2-20060610.tar.bz2) = 6138c3dd51a6af95c5a0aaaf9b2e7169
-SHA256 (gcc-core-4.2-20060610.tar.bz2) = 0af934ee0961a3826aee2b73fe078be372d102eb3f49dad3c36b77825b83c836
-SIZE (gcc-core-4.2-20060610.tar.bz2) = 15646481
-MD5 (gcc-g++-4.2-20060610.tar.bz2) = 140bb97e8c4111dd388108abf46c2f74
-SHA256 (gcc-g++-4.2-20060610.tar.bz2) = 15d9eccf472fec256408732e3c05f3853ab970360fb68b7e9a0a68cd4f1a03b2
-SIZE (gcc-g++-4.2-20060610.tar.bz2) = 3928187
-MD5 (gcc-objc-4.2-20060610.tar.bz2) = 6c7071313af2414c0f95311b0f5f3193
-SHA256 (gcc-objc-4.2-20060610.tar.bz2) = 9b3fc1397a033faca1b3f359a43b1b1edea0e97328f107f25c6bb58101d2abba
-SIZE (gcc-objc-4.2-20060610.tar.bz2) = 191872
-MD5 (gcc-testsuite-4.2-20060610.tar.bz2) = e4af801f5a5d48cf347103014f1a42ae
-SHA256 (gcc-testsuite-4.2-20060610.tar.bz2) = c08dab0c8a328fe1ba189ea86d9d618e18279b4ecf0b2f99f351e2229fece2d5
-SIZE (gcc-testsuite-4.2-20060610.tar.bz2) = 3689461
-MD5 (gcc-fortran-4.2-20060610.tar.bz2) = 2f24507cabf8dc07c2ba0309ff381008
-SHA256 (gcc-fortran-4.2-20060610.tar.bz2) = f3e542437f1dafc57e01c7dd22b538f3da3fcc0a045abdf63f19c1e6d6be362f
-SIZE (gcc-fortran-4.2-20060610.tar.bz2) = 815417
-MD5 (gcc-java-4.2-20060610.tar.bz2) = fa533c9177ec5cd3eab34d2fa0b71ccb
-SHA256 (gcc-java-4.2-20060610.tar.bz2) = 138c6a583c5574bee509d831ec25883855f571909e8c0be35bcdf37b2a0ce5fd
-SIZE (gcc-java-4.2-20060610.tar.bz2) = 10038379
+MD5 (gcc-core-4.2-20060617.tar.bz2) = a90c32d1a765721f66ce26f676b29c94
+SHA256 (gcc-core-4.2-20060617.tar.bz2) = bf03570aaca92fda00f06bb19513a2562733a0258c61177c63ae9455d8f47cec
+SIZE (gcc-core-4.2-20060617.tar.bz2) = 15645543
+MD5 (gcc-g++-4.2-20060617.tar.bz2) = ad2d8b1a1161e26ceec6e0b9d4be430c
+SHA256 (gcc-g++-4.2-20060617.tar.bz2) = a6bfdd33a1bf15df55f80a2c8e1b8b6eb29ea29fe4658b6bca29c54bf3f65bde
+SIZE (gcc-g++-4.2-20060617.tar.bz2) = 4708570
+MD5 (gcc-objc-4.2-20060617.tar.bz2) = e0266374d32f248d160d0797d607d95f
+SHA256 (gcc-objc-4.2-20060617.tar.bz2) = 2cfa5e9a0970bcd12ec10af21e989cfdbea761de5eb904dca621533a61fb2c88
+SIZE (gcc-objc-4.2-20060617.tar.bz2) = 191837
+MD5 (gcc-testsuite-4.2-20060617.tar.bz2) = 366400c327ff4d0725446290aa1fb01a
+SHA256 (gcc-testsuite-4.2-20060617.tar.bz2) = ea7d1140e92a7961801c0d43928361711e34c9e465875d0dcd06305ce8503e12
+SIZE (gcc-testsuite-4.2-20060617.tar.bz2) = 3696071
+MD5 (gcc-fortran-4.2-20060617.tar.bz2) = ab1cc25b7dd3bbc5985583528f38db0a
+SHA256 (gcc-fortran-4.2-20060617.tar.bz2) = 20c32854cea6a06c83004089b8f96f8dcc5f5fb70dff83656a0b1f19e06bda12
+SIZE (gcc-fortran-4.2-20060617.tar.bz2) = 816259
+MD5 (gcc-java-4.2-20060617.tar.bz2) = 54dd1372463d55f39e5b32778b077fce
+SHA256 (gcc-java-4.2-20060617.tar.bz2) = ce505296b9a5e856257cc0ac3f7ffffc9a0ce029d673ace6e78de28fde12ab35
+SIZE (gcc-java-4.2-20060617.tar.bz2) = 10042905
diff --git a/lang/gcc46/files/gcc.sh.in b/lang/gcc46/files/gcc.sh.in
deleted file mode 100644
index 987e9531e371..000000000000
--- a/lang/gcc46/files/gcc.sh.in
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-start)
-	ldconfig -m %%TARGLIB%%
-	;;
-stop)
-	;;
-*)
-	echo "Usage: ${0##*/} { start | stop }" >&2
-	exit 64
-	;;
-esac
-exit 0
diff --git a/lang/gcc46/pkg-plist b/lang/gcc46/pkg-plist
index a91a2ff44794..85546997a0d0 100644
--- a/lang/gcc46/pkg-plist
+++ b/lang/gcc46/pkg-plist
@@ -9,7 +9,6 @@ bin/%%GNU_HOST%%-c++%%SUFFIX%%
 bin/%%GNU_HOST%%-g++%%SUFFIX%%
 bin/%%GNU_HOST%%-gcc-%%GCC_VER%%
 bin/%%GNU_HOST%%-gcc%%SUFFIX%%
-etc/rc.d/gcc%%SUFFIX%%.sh
 include/omp.h
 info/gcc%%SUFFIX%%/dir
 %%FORTRAN%%bin/gfortran%%SUFFIX%%