3 files changed, 23 insertions, 37 deletions

diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index 3cae3bf11103..2b61bded0ec3 100644
--- a/lang/gcc34/Makefile
+++ b/lang/gcc34/Makefile
@@ -8,11 +8,11 @@
 
 PORTNAME=	gcc
 PORTVERSION=	3.4.6
-PORTREVISION=	20060221
+PORTEPOCH=	1
 CATEGORIES=	lang
-VERSIONSTRING=	3.4-${PORTREVISION}
+VERSIONSTRING=	${PORTVERSION}
 MASTER_SITES=	${MASTER_SITE_GCC}
-MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
+MASTER_SITE_SUBDIR=	releases/gcc-${VERSIONSTRING}
 DISTFILES=	gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-g77-${VERSIONSTRING}${EXTRACT_SUFX} \
@@ -22,7 +22,8 @@ DISTFILES=	gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
 MAINTAINER?=	gerald@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 3.4
 
-LATEST_LINK?=	gcc34${PKGNAMESUFFIX}
+SUFFIX=		34
+LATEST_LINK?=	gcc${SUFFIX}${PKGNAMESUFFIX}
 USE_BISON=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -46,7 +47,6 @@ USE_GCC=	3.3+
 
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
-SUFFIX=		34
 TARGLIB=	${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-nls \
@@ -58,21 +58,15 @@ CONFIGURE_ARGS=	--disable-nls \
 		--infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX}
 CONFIGURE_ENV=	RANLIB=:
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
-.if defined(WANT_SHAREDLIBS)
-CONFIGURE_ARGS+=	--enable-shared
+ALL_TARGET=	bootstrap-lean
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	${TARGLIB}
 SUB_LIST=	TARGLIB="${TARGLIB}"
 SUB_FILES=	gcc.sh
 RC_D_SH=	etc/rc.d/gcc${SUFFIX}.sh
-PLIST_FILES+=	${RC_D_SH}
-.else
-CONFIGURE_ARGS+=	--disable-shared
 .if ${OSVERSION} < 500000 && ${ARCH} == alpha
 CXXFLAGS+=	-fPIC
 .endif
-.endif
-ALL_TARGET=	bootstrap-lean
 PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} \
 		SUFFIX=${SUFFIX}
 MAN1=		cpp${SUFFIX}.1 \
@@ -108,9 +102,8 @@ check: build
 	cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check
 
 post-install:
-.if defined(WANT_SHAREDLIBS)
+	-@${MKDIR} ${PREFIX}/etc/rc.d
 	${INSTALL_SCRIPT} ${WRKDIR}/gcc.sh ${PREFIX}/${RC_D_SH}
-.endif
 	# man pages can only be generated if Perl >= 5.6 is installed;
 	# fake them otherwise.
 	for mp in ${_MANPAGES}; do \
@@ -118,9 +111,6 @@ post-install:
 	done
 .for f in c++ g77 gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++
 	# gij and jv-convert, for example, are not built on all platforms.
-	if [ -e ${PREFIX}/bin/${f}${SUFFIX} ]; then \
-	  ${STRIP_CMD} ${PREFIX}/bin/${f}${SUFFIX}; \
-	fi
 	if [ -e ${PREFIX}/man/man1/${f}.1 ]; then \
 	  ${MV} -f ${PREFIX}/man/man1/${f}.1 \
 	           ${PREFIX}/man/man1/${f}${SUFFIX}.1; \
@@ -144,9 +134,4 @@ post-install:
 	${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc 2>&1 || true" >> ${WRKDIR}/PLIST.lib
 	cd ${WRKDIR} ; ${SED} -i -e "/PLIST.lib/ r PLIST.lib" ${TMPPLIST}
 
-cklatest:
-.for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/
-	@-ncftpls -l ${SITE} | ${GREP} 'LATEST.*3\.4'
-.endfor
-
 .include <bsd.port.post.mk>
diff --git a/lang/gcc34/distinfo b/lang/gcc34/distinfo
index 0e146c38dcea..316541d8ec07 100644
--- a/lang/gcc34/distinfo
+++ b/lang/gcc34/distinfo
@@ -1,15 +1,15 @@
-MD5 (gcc-core-3.4-20060221.tar.bz2) = 3d3f3e5bad80518b9db570f3b81ec985
-SHA256 (gcc-core-3.4-20060221.tar.bz2) = 5448bc26666d828268f19be839448092a36499ae3a21a70d84c7d58362262d24
-SIZE (gcc-core-3.4-20060221.tar.bz2) = 11390121
-MD5 (gcc-g++-3.4-20060221.tar.bz2) = 39fee9034ed28a45afb6b91587d65b8a
-SHA256 (gcc-g++-3.4-20060221.tar.bz2) = 7a65d8e286ef9e47f9da89338619b05f3fcfedec1a8caf9daf50dba6f7514073
-SIZE (gcc-g++-3.4-20060221.tar.bz2) = 2557859
-MD5 (gcc-g77-3.4-20060221.tar.bz2) = e8107d08d8e6799e7442ac86067079d1
-SHA256 (gcc-g77-3.4-20060221.tar.bz2) = 4548e09afd654246d408d3b5cdbfbad974ac8c7fd32de242795b78995c06cde6
-SIZE (gcc-g77-3.4-20060221.tar.bz2) = 915642
-MD5 (gcc-objc-3.4-20060221.tar.bz2) = 66f1ab1b49ed0b2d5e6cf6d3515f3d49
-SHA256 (gcc-objc-3.4-20060221.tar.bz2) = 49608c7ff64d55abb3de6c61425bb3687d3d340c6f21c76a12031dad66035090
-SIZE (gcc-objc-3.4-20060221.tar.bz2) = 148913
-MD5 (gcc-testsuite-3.4-20060221.tar.bz2) = 618cf2f7328fc27bca3c04c5d469f1a2
-SHA256 (gcc-testsuite-3.4-20060221.tar.bz2) = 512d549627f05cd66c6812cc4b99b70016bf133f6e6347acec9600416be7bffc
-SIZE (gcc-testsuite-3.4-20060221.tar.bz2) = 2742044
+MD5 (gcc-core-3.4.6.tar.bz2) = 5324ace5145b12afd9ca867af7ec084d
+SHA256 (gcc-core-3.4.6.tar.bz2) = 3aab171d86e5a6c14cb9de35467a0472a7d5ef1d5b79a1df72ca533f8e82a133
+SIZE (gcc-core-3.4.6.tar.bz2) = 13366790
+MD5 (gcc-g++-3.4.6.tar.bz2) = ef81fd74bc9fd964120af47243a1360f
+SHA256 (gcc-g++-3.4.6.tar.bz2) = f186937402752d25317adf2832b0b1d316334e158ae380471ab62509e4ea90b1
+SIZE (gcc-g++-3.4.6.tar.bz2) = 2511332
+MD5 (gcc-g77-3.4.6.tar.bz2) = eb4c248fa10a96e8d9edc9831c75a895
+SHA256 (gcc-g77-3.4.6.tar.bz2) = 4a8b841ce79c70abfb5c0f523b710d298fc80a6f1104dedece5617de21d6c762
+SIZE (gcc-g77-3.4.6.tar.bz2) = 908261
+MD5 (gcc-objc-3.4.6.tar.bz2) = 87453b6e9b32047de11ae933a985155f
+SHA256 (gcc-objc-3.4.6.tar.bz2) = 053061f7d828f73e1c6a6b9d2a4eeba8d1d8f64bd0a77d2df40091a429de1f5d
+SIZE (gcc-objc-3.4.6.tar.bz2) = 215655
+MD5 (gcc-testsuite-3.4.6.tar.bz2) = 32a1057b841b4782ae3f4be84a98c085
+SHA256 (gcc-testsuite-3.4.6.tar.bz2) = 87f8c7ca951fd13ea241328de2e0e1af8281f1aa3a68e5831e37ff746a256574
+SIZE (gcc-testsuite-3.4.6.tar.bz2) = 2646715
diff --git a/lang/gcc34/pkg-plist b/lang/gcc34/pkg-plist
index 6e2f599b4350..a3351d8b3e2d 100644
--- a/lang/gcc34/pkg-plist
+++ b/lang/gcc34/pkg-plist
@@ -10,6 +10,7 @@ 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
 libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1
 libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1plus
 libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/f771