Update to the 20050625 snapshot of GCC 4.1.0.

Directly install libraries into a port-specific location instead of
moving them there after the original installation.  This is simpler
and also avoids the problem where the port would overwrite/remove an
existing copy of libiberty.a, which boils down to a true conflict.

3 files changed, 15 insertions, 28 deletions

diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index b42447a00f77..d99062f2a50d 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.1.0
-PORTREVISION=	20050618
+PORTREVISION=	20050625
 CATEGORIES=	lang java
 VERSIONSTRING=	4.1-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -67,6 +67,7 @@ CONFIGURE_ARGS+=	--disable-nls \
 		--with-system-zlib \
 		--with-libiconv-prefix=${LOCALBASE} \
 		--program-suffix=${SUFFIX} \
+		--libdir=${TARGLIB} \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/
 .if defined(WITH_FORTRAN)
 CONFIGURE_ARGS+=	--with-gmp=${LOCALBASE}
@@ -76,7 +77,6 @@ MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 CONFIGURE_ARGS+=	--enable-shared
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/lib ${TARGLIB}
-EXTRA_LIBS=	libgcc_s
 .else
 CONFIGURE_ARGS+=	--disable-shared
 .endif
@@ -106,14 +106,12 @@ CONFIGURE_ARGS+=	--disable-libgcj
 PLIST_SUB+=	LIBJAVA="@comment "
 .else
 PLIST_SUB+=	LIBJAVA=""
-EXTRA_LIBS+=	libffi libgcj libgij
 .endif
 
 .if defined(WITH_FORTRAN)
 MAN1+=	gfortran${SUFFIX}.1
 INFO+=	gfortran
 PLIST_SUB+=	FORTRAN=""
-EXTRA_LIBS+=	libgfortran libgfortranbegin
 .else
 PLIST_SUB+=	FORTRAN="@comment "
 .endif
@@ -157,12 +155,7 @@ post-install:
 	           ${PREFIX}/man/man1/${f}${SUFFIX}.1; \
 	fi
 .endfor
-	# These libraries are moved from PREFIX/lib to avoid conflicts with
-	# the stock compiler.
-.for f in libstdc++ libsupc++ libobjc libmudflap libmudflapth ${EXTRA_LIBS}
-	${MV} -f ${PREFIX}/lib/${f}.* ${TARGLIB}
-.endfor
-	${RM} -f ${PREFIX}/lib/libiberty.a ${TARGLIB}/*.la
+	${RM} -f ${TARGLIB}/*.la
 	${RM} -f ${PREFIX}/man/man7/fsf-funding.7 \
 	         ${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7
 	# Add target libraries and include files to packaging list.
diff --git a/lang/gcc48/distinfo b/lang/gcc48/distinfo
index 67730fbe8187..2e0ce2e7095e 100644
--- a/lang/gcc48/distinfo
+++ b/lang/gcc48/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.1-20050618.tar.bz2) = 8731567c68f7b42af1ef518ad94b07b4
-SIZE (gcc-core-4.1-20050618.tar.bz2) = 13791794
-MD5 (gcc-g++-4.1-20050618.tar.bz2) = bd86160fc28c23d76aaa2139e04389cb
-SIZE (gcc-g++-4.1-20050618.tar.bz2) = 2706868
-MD5 (gcc-java-4.1-20050618.tar.bz2) = 8019f7104faf5964aa94a04851e92fa3
-SIZE (gcc-java-4.1-20050618.tar.bz2) = 6049074
-MD5 (gcc-objc-4.1-20050618.tar.bz2) = c049806d63a38460c2f6354e5afe0a0b
-SIZE (gcc-objc-4.1-20050618.tar.bz2) = 186114
-MD5 (gcc-testsuite-4.1-20050618.tar.bz2) = ca9c53e49fd269c39ae069ef6dbc7896
-SIZE (gcc-testsuite-4.1-20050618.tar.bz2) = 3130606
-MD5 (gcc-fortran-4.1-20050618.tar.bz2) = 71825e55f5583a5d846c4e0ae7627c6f
-SIZE (gcc-fortran-4.1-20050618.tar.bz2) = 590362
+MD5 (gcc-core-4.1-20050625.tar.bz2) = 5f1e8530241bc457826433e5ce0db95b
+SIZE (gcc-core-4.1-20050625.tar.bz2) = 13793204
+MD5 (gcc-g++-4.1-20050625.tar.bz2) = 78375d4014d54c25add3da3e48a46c9e
+SIZE (gcc-g++-4.1-20050625.tar.bz2) = 2705423
+MD5 (gcc-java-4.1-20050625.tar.bz2) = 29b4c1a7b93a4f7ee298da8cd5cc9e21
+SIZE (gcc-java-4.1-20050625.tar.bz2) = 6051914
+MD5 (gcc-objc-4.1-20050625.tar.bz2) = 29c2016caa1050b74a2769440505f33e
+SIZE (gcc-objc-4.1-20050625.tar.bz2) = 185999
+MD5 (gcc-testsuite-4.1-20050625.tar.bz2) = d86fba32ccf0393df6cc16c0afd46264
+SIZE (gcc-testsuite-4.1-20050625.tar.bz2) = 3157841
+MD5 (gcc-fortran-4.1-20050625.tar.bz2) = b9a8bd5dc8c9137611f2aaf9fd6b9ec3
+SIZE (gcc-fortran-4.1-20050625.tar.bz2) = 593368
diff --git a/lang/gcc48/pkg-plist b/lang/gcc48/pkg-plist
index 8bb953ca9cde..8ceb9e28799d 100644
--- a/lang/gcc48/pkg-plist
+++ b/lang/gcc48/pkg-plist
@@ -27,12 +27,6 @@ include/mf-runtime.h
 %%LIBJAVA%%bin/grmiregistry41
 %%LIBJAVA%%bin/jv-convert41
 %%LIBJAVA%%include/ffi.h
-%%LIBJAVA%%lib/logging.properties
-%%LIBJAVA%%lib/gcj-%%GCC_VER%%/classmap.db
-%%LIBJAVA%%lib/security/classpath.security
-%%LIBJAVA%%lib/security/libgcj.security
-%%LIBJAVA%%@dirrm lib/gcj-%%GCC_VER%%
-%%LIBJAVA%%@dirrm lib/security
 %%LIBJAVA%%libdata/pkgconfig/libgcj.pc
 %%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar
 @comment Insert PLIST.lib here