3 files changed, 47 insertions, 46 deletions

diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile
index 08e9dfa2924a..535c5ea6a06f 100644
--- a/lang/gcc41/Makefile
+++ b/lang/gcc41/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.1.0
-PORTREVISION=	20051202
+PORTREVISION=	20051209
 CATEGORIES=	lang java
 VERSIONSTRING=	4.1-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -84,7 +84,8 @@ LDCONFIG_DIRS=	${TARGLIB}
 CONFIGURE_ARGS+=	--disable-shared
 .endif
 ALL_TARGET=	bootstrap-lean
-PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET}
+PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} \
+		SUFFIX=${SUFFIX}
 MAN1=		cpp${SUFFIX}.1 \
 		g++${SUFFIX}.1 \
 		gcc${SUFFIX}.1 \
diff --git a/lang/gcc41/distinfo b/lang/gcc41/distinfo
index 0ce8a83985c7..9c01e5e0208a 100644
--- a/lang/gcc41/distinfo
+++ b/lang/gcc41/distinfo
@@ -1,18 +1,18 @@
-MD5 (gcc-core-4.1-20051202.tar.bz2) = 540d3478f21413893cd5929de80f6f81
-SHA256 (gcc-core-4.1-20051202.tar.bz2) = 47768eaa9b9f2cad457f95109c59f011924094ae5f4db5df67e10b7cd41b2e61
-SIZE (gcc-core-4.1-20051202.tar.bz2) = 14775222
-MD5 (gcc-g++-4.1-20051202.tar.bz2) = 90422c9305c1116e870a49196e770b20
-SHA256 (gcc-g++-4.1-20051202.tar.bz2) = 0ac173957e412e0c747454138a8e358406a7aa9c1f10d11e90c688e2ef75bbae
-SIZE (gcc-g++-4.1-20051202.tar.bz2) = 3816892
-MD5 (gcc-objc-4.1-20051202.tar.bz2) = 6b688bc5f990aab8a6eaaa18d90f632f
-SHA256 (gcc-objc-4.1-20051202.tar.bz2) = 678fca8a64610fb63f2bb89a558462828ef43233de1ff4ba85ded9282da2db8a
-SIZE (gcc-objc-4.1-20051202.tar.bz2) = 190402
-MD5 (gcc-testsuite-4.1-20051202.tar.bz2) = b06ee8f791193b5ecf6c0bc38bdf3ed7
-SHA256 (gcc-testsuite-4.1-20051202.tar.bz2) = 865a0566a2203e5a9be7f845acabea3fac39ca4a976fd80cd0646029a9f79661
-SIZE (gcc-testsuite-4.1-20051202.tar.bz2) = 3491070
-MD5 (gcc-fortran-4.1-20051202.tar.bz2) = afb1b78613fceba5a14d5df0f8d81e04
-SHA256 (gcc-fortran-4.1-20051202.tar.bz2) = c68985bf49e3053b59fd397bf6a3e715fc7e5a341d94b53646d6b7a540cf649b
-SIZE (gcc-fortran-4.1-20051202.tar.bz2) = 724265
-MD5 (gcc-java-4.1-20051202.tar.bz2) = 6df75c205de36312597cef356374bb26
-SHA256 (gcc-java-4.1-20051202.tar.bz2) = c3f21e90ecb9b5dad6a41dc9cb6e3d6afaa27dee2d3c5ebaff1ca05979df0c8a
-SIZE (gcc-java-4.1-20051202.tar.bz2) = 9067925
+MD5 (gcc-core-4.1-20051209.tar.bz2) = d0959720240111f1e82d20600c90693c
+SHA256 (gcc-core-4.1-20051209.tar.bz2) = 3c48da8ea34cf43b30b24e244dfb2d4f75441cd930b0122c935610d1673f0809
+SIZE (gcc-core-4.1-20051209.tar.bz2) = 14788622
+MD5 (gcc-g++-4.1-20051209.tar.bz2) = e58df096aea7d7629d291fa18d6fb99b
+SHA256 (gcc-g++-4.1-20051209.tar.bz2) = f3c67f0170f0570b11557ecfb1a11bf71ecbd01507ac736edc024bd32a7276d0
+SIZE (gcc-g++-4.1-20051209.tar.bz2) = 3817291
+MD5 (gcc-objc-4.1-20051209.tar.bz2) = d6b257b0b2f433c7ffbf8ee4a445662e
+SHA256 (gcc-objc-4.1-20051209.tar.bz2) = b9f63f32a77310a3b47263ed0fafb162249804580ac0f46be3d047b57d49228c
+SIZE (gcc-objc-4.1-20051209.tar.bz2) = 190377
+MD5 (gcc-testsuite-4.1-20051209.tar.bz2) = b20d0862a6248826a24e45746e120164
+SHA256 (gcc-testsuite-4.1-20051209.tar.bz2) = b6dd3a384af9281bc3add9abdd2679288664097c6c63f4b68c7b8b68130ce462
+SIZE (gcc-testsuite-4.1-20051209.tar.bz2) = 3505840
+MD5 (gcc-fortran-4.1-20051209.tar.bz2) = 79d6023dc706dbf2c462e8cf3c3cdc98
+SHA256 (gcc-fortran-4.1-20051209.tar.bz2) = dcda1359c59921af933a3dfef84d222fa9a899ba699301138c6196ba848a74a4
+SIZE (gcc-fortran-4.1-20051209.tar.bz2) = 721869
+MD5 (gcc-java-4.1-20051209.tar.bz2) = f6bae5603a2a7a837883a26634324e92
+SHA256 (gcc-java-4.1-20051209.tar.bz2) = aaafa51f3eb988add4c987fb84f4d0d43c94111df18f75ac34c89d07aa3e7b0d
+SIZE (gcc-java-4.1-20051209.tar.bz2) = 9071276
diff --git a/lang/gcc41/pkg-plist b/lang/gcc41/pkg-plist
index 52eb89adf358..85974006f10b 100644
--- a/lang/gcc41/pkg-plist
+++ b/lang/gcc41/pkg-plist
@@ -1,37 +1,37 @@
 @comment $FreeBSD$
-bin/c++41
-bin/cpp41
-bin/g++41
-bin/gcc41
-bin/gcov41
-bin/%%GNU_HOST%%-c++41
-bin/%%GNU_HOST%%-g++41
+bin/c++%%SUFFIX%%
+bin/cpp%%SUFFIX%%
+bin/g++%%SUFFIX%%
+bin/gcc%%SUFFIX%%
+bin/gcov%%SUFFIX%%
+bin/%%GNU_HOST%%-c++%%SUFFIX%%
+bin/%%GNU_HOST%%-g++%%SUFFIX%%
 bin/%%GNU_HOST%%-gcc-%%GCC_VER%%
-bin/%%GNU_HOST%%-gcc41
-bin/gccbug41
+bin/%%GNU_HOST%%-gcc%%SUFFIX%%
+bin/gccbug%%SUFFIX%%
 include/mf-runtime.h
 include/ssp/ssp.h
 include/ssp/string.h
 include/ssp/stdio.h
 include/ssp/unistd.h
 @unexec rmdir %D/include/ssp 2>/dev/null || true
-%%FORTRAN%%bin/gfortran41
-%%FORTRAN%%bin/%%GNU_HOST%%-gfortran41
-%%JAVA%%bin/addr2name.awk41
-%%JAVA%%bin/fastjar41
-%%JAVA%%bin/gcj41
-%%JAVA%%bin/gcj-dbtool41
-%%JAVA%%bin/gcjh41
-%%JAVA%%bin/gij41
-%%JAVA%%bin/gjnih41
-%%JAVA%%bin/grepjar41
-%%JAVA%%bin/grmic41
-%%JAVA%%bin/grmiregistry41
-%%JAVA%%bin/jv-convert41
-%%JAVA%%bin/jv-scan41
-%%JAVA%%bin/jcf-dump41
-%%JAVA%%bin/%%GNU_HOST%%-gcj41
-%%JAVA%%bin/%%GNU_HOST%%-gcjh41
+%%FORTRAN%%bin/gfortran%%SUFFIX%%
+%%FORTRAN%%bin/%%GNU_HOST%%-gfortran%%SUFFIX%%
+%%JAVA%%bin/addr2name.awk%%SUFFIX%%
+%%JAVA%%bin/fastjar%%SUFFIX%%
+%%JAVA%%bin/gcj%%SUFFIX%%
+%%JAVA%%bin/gcj-dbtool%%SUFFIX%%
+%%JAVA%%bin/gcjh%%SUFFIX%%
+%%JAVA%%bin/gij%%SUFFIX%%
+%%JAVA%%bin/gjnih%%SUFFIX%%
+%%JAVA%%bin/grepjar%%SUFFIX%%
+%%JAVA%%bin/grmic%%SUFFIX%%
+%%JAVA%%bin/grmiregistry%%SUFFIX%%
+%%JAVA%%bin/jv-convert%%SUFFIX%%
+%%JAVA%%bin/jv-scan%%SUFFIX%%
+%%JAVA%%bin/jcf-dump%%SUFFIX%%
+%%JAVA%%bin/%%GNU_HOST%%-gcj%%SUFFIX%%
+%%JAVA%%bin/%%GNU_HOST%%-gcjh%%SUFFIX%%
 %%JAVA%%include/ffi.h
 %%JAVA%%libdata/pkgconfig/libgcj.pc
 %%JAVA%%share/java/libgcj-%%GCC_VER%%.jar