3 files changed, 15 insertions, 33 deletions

diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile
index 82e95906c51d..9c401e43c0c2 100644
--- a/lang/gcc40/Makefile
+++ b/lang/gcc40/Makefile
@@ -8,11 +8,11 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.0.4
-PORTREVISION=	20070114
+PORTEPOCH=	1
 CATEGORIES=	lang
-VERSIONSTRING=	4.0-${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-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
@@ -23,7 +23,6 @@ COMMENT?=	GNU Compiler Collection 4.0
 
 SUFFIX=		40
 LATEST_LINK?=	gcc${SUFFIX}${PKGNAMESUFFIX}
-USE_BISON=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
@@ -111,9 +110,4 @@ post-install:
 	${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/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.*${PORTVERSION:C/.[0-9]+$//}"
-.endfor
-
 .include <bsd.port.post.mk>
diff --git a/lang/gcc40/distinfo b/lang/gcc40/distinfo
index 206a756776eb..5f4e60d38eed 100644
--- a/lang/gcc40/distinfo
+++ b/lang/gcc40/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.0-20070114.tar.bz2) = 846cae28ec53366e744e7ba7a937cb74
-SHA256 (gcc-core-4.0-20070114.tar.bz2) = 9e532abb60cca78c6028af719086ebf5cee8c8ca77310fe1ee740a3d62432637
-SIZE (gcc-core-4.0-20070114.tar.bz2) = 13787071
-MD5 (gcc-g++-4.0-20070114.tar.bz2) = e529829b3f17b7fec23e4e041afa88ce
-SHA256 (gcc-g++-4.0-20070114.tar.bz2) = a10e8bf530d14da365ecac984851531e976ab01d58666d6671bdc6429a193522
-SIZE (gcc-g++-4.0-20070114.tar.bz2) = 2722585
-MD5 (gcc-objc-4.0-20070114.tar.bz2) = 8be557c03a798af382e0fba5e53ef62a
-SHA256 (gcc-objc-4.0-20070114.tar.bz2) = 6b7092ea7818910d32bf77837763bba2c1cc9121b9441e9c3e8fef7fb90aee1f
-SIZE (gcc-objc-4.0-20070114.tar.bz2) = 180114
-MD5 (gcc-testsuite-4.0-20070114.tar.bz2) = 59fb99f054136cbc1f0dc4645aff8519
-SHA256 (gcc-testsuite-4.0-20070114.tar.bz2) = ad98087e32a3714bd51de32dd32a1d4139ca97b1a7b99bcbc4f08346aa3fdc04
-SIZE (gcc-testsuite-4.0-20070114.tar.bz2) = 3269979
+MD5 (gcc-core-4.0.4.tar.bz2) = 193e0a7a471cca70e374974bc5a60137
+SHA256 (gcc-core-4.0.4.tar.bz2) = e9bf58c761a4f988311aef6b41f12fd5c7e51d09477468fb73826aecc1be32e7
+SIZE (gcc-core-4.0.4.tar.bz2) = 15583411
+MD5 (gcc-g++-4.0.4.tar.bz2) = 5c79e6af5b49dd9cfd22001f3856f447
+SHA256 (gcc-g++-4.0.4.tar.bz2) = c1ff47701a5dc77690fe9e687001546b54f03b7383a89d5b4b11178aaf31f76e
+SIZE (gcc-g++-4.0.4.tar.bz2) = 2698519
+MD5 (gcc-objc-4.0.4.tar.bz2) = df19999fc0e1f715f66d8a6c097a6aaa
+SHA256 (gcc-objc-4.0.4.tar.bz2) = 6f3b376b1f5f54816cab27f4dc5d168e8cc91c7705a740321d406b80bc584c56
+SIZE (gcc-objc-4.0.4.tar.bz2) = 242758
+MD5 (gcc-testsuite-4.0.4.tar.bz2) = d33261f41392b6163645130580cbb7c2
+SHA256 (gcc-testsuite-4.0.4.tar.bz2) = 15c7db7bc8fd6703a2410e9eb3a46befeaf541e1f45a029b83ed12cbd1ed2265
+SIZE (gcc-testsuite-4.0.4.tar.bz2) = 3153551
diff --git a/lang/gcc40/files/patch-gengtype-yacc.y b/lang/gcc40/files/patch-gengtype-yacc.y
deleted file mode 100644
index 4afaae159533..000000000000
--- a/lang/gcc40/files/patch-gengtype-yacc.y
+++ /dev/null
@@ -1,12 +0,0 @@
---- gcc/gengtype-yacc.y.orig	Fri Sep 20 00:33:24 2002
-+++ gcc/gengtype-yacc.y	Tue Apr 22 09:11:27 2003
-@@ -24,6 +24,9 @@
- #include "system.h"
- #include "gengtype.h"
- #define YYERROR_VERBOSE
-+
-+#define malloc xmalloc
-+#define realloc xrealloc
- %}
- 
- %union {