3 files changed, 21 insertions, 25 deletions

diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile
index 62f77cf5bb44..b8364152fa39 100644
--- a/lang/gcc40/Makefile
+++ b/lang/gcc40/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.0.1
-PORTREVISION=	20050514
+PORTREVISION=	20050521
 CATEGORIES=	lang java
 VERSIONSTRING=	4.0-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -138,7 +138,12 @@ post-build:
 check: build
 	cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check
 
-post-install: fake-manpages
+post-install:
+	# man pages can only be generated if Perl >= 5.6 is installed;
+	# fake them otherwise.
+	for mp in ${_MANPAGES}; do \
+	  ${TEST} -e $${mp} || ${TOUCH} ${TOUCH_FLAGS} $${mp}; \
+	done
 .for f in c++ gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ gcj gcjh gij jv-scan jcf-dump jv-convert jar grepjar rmic rmiregistry
 	# gij and jv-convert, for example, are not built on all platforms.
 	if [ -e ${PREFIX}/bin/${f}${SUFFIX} ]; then \
@@ -178,10 +183,3 @@ cklatest:
 .endfor
 
 .include <bsd.port.post.mk>
-
-fake-manpages:
-	# man pages can only be generated if Perl >= 5.6 is installed, so
-	# fake them on 4.x systems.
-.for mp in ${_MANPAGES}
-	( ${TEST} -e ${mp} || ${TOUCH} ${TOUCH_FLAGS} ${mp} )
-.endfor
diff --git a/lang/gcc40/distinfo b/lang/gcc40/distinfo
index 8957028bb73a..e765bdb1ac9f 100644
--- a/lang/gcc40/distinfo
+++ b/lang/gcc40/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.0-20050514.tar.bz2) = d37afa168591baad614bffb4b847246c
-SIZE (gcc-core-4.0-20050514.tar.bz2) = 13388829
-MD5 (gcc-g++-4.0-20050514.tar.bz2) = 6d77385bc9af0a60eb14f24e388a1190
-SIZE (gcc-g++-4.0-20050514.tar.bz2) = 2660580
-MD5 (gcc-java-4.0-20050514.tar.bz2) = 44bdb6b6ad72bf460e57fb036154b82c
-SIZE (gcc-java-4.0-20050514.tar.bz2) = 5936555
-MD5 (gcc-objc-4.0-20050514.tar.bz2) = 40128e001be0330c342ef43ba8528fa2
-SIZE (gcc-objc-4.0-20050514.tar.bz2) = 177819
-MD5 (gcc-testsuite-4.0-20050514.tar.bz2) = d6bff288e5e8d15e1a8fd078d5d1c2cc
-SIZE (gcc-testsuite-4.0-20050514.tar.bz2) = 3052248
-MD5 (gcc-fortran-4.0-20050514.tar.bz2) = 1df83bb3510c2db13ffdea6298db13a8
-SIZE (gcc-fortran-4.0-20050514.tar.bz2) = 571051
+MD5 (gcc-core-4.0-20050521.tar.bz2) = 3cf03d90791666b2052af4559dcad8e6
+SIZE (gcc-core-4.0-20050521.tar.bz2) = 13402956
+MD5 (gcc-g++-4.0-20050521.tar.bz2) = 792ef92e274c86f8f8e373be27619f95
+SIZE (gcc-g++-4.0-20050521.tar.bz2) = 2661571
+MD5 (gcc-java-4.0-20050521.tar.bz2) = 3fe59727ff0ac65a6f4ffc5b3c08941a
+SIZE (gcc-java-4.0-20050521.tar.bz2) = 5937512
+MD5 (gcc-objc-4.0-20050521.tar.bz2) = 14ee573cab749c3b71649b3d4423acc3
+SIZE (gcc-objc-4.0-20050521.tar.bz2) = 177752
+MD5 (gcc-testsuite-4.0-20050521.tar.bz2) = f128cbe25ba45e3c11dd0b27308a129c
+SIZE (gcc-testsuite-4.0-20050521.tar.bz2) = 3056053
+MD5 (gcc-fortran-4.0-20050521.tar.bz2) = 63c833e54c0cccdf754cc616dcdbdaa9
+SIZE (gcc-fortran-4.0-20050521.tar.bz2) = 573849
diff --git a/lang/gcc40/pkg-plist b/lang/gcc40/pkg-plist
index 225b033ca724..1e54e358141c 100644
--- a/lang/gcc40/pkg-plist
+++ b/lang/gcc40/pkg-plist
@@ -31,14 +31,12 @@ include/mf-runtime.h
 %%LIBJAVA%%bin/grmiregistry40
 %%LIBJAVA%%bin/jv-convert40
 %%LIBJAVA%%include/ffi.h
-%%LIBJAVA%%lib/libffi.a
-%%LIBJAVA%%lib/libgij.a
 %%LIBJAVA%%lib/logging.properties
 %%LIBJAVA%%lib/security/classpath.security
 %%LIBJAVA%%lib/security/libgcj.security
-%%LIBJAVA%%@dirrm lib/security
-%%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar
 %%LIBJAVA%%libdata/pkgconfig/libgcj.pc
+%%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar
+%%LIBJAVA%%@dirrm lib/security
 @comment Insert PLIST.lib here
 @comment -=[ begin PLIST.lib ]=-
 @comment -=[ end PLIST.lib ]=-