Update to the first prerelease of GCC 3.3, which is only available as .tar.gz.

Adjust COMMENT and remove NO_CDROM. Reenable man pages.

3 files changed, 20 insertions, 38 deletions

diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index 330e0a716290..f2599479cc2f 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -6,7 +6,7 @@
 # $FreeBSD$
 #
 
-SNAPDATE=	2003-04-28
+SNAPDATE=	2003-05-06
 SNAPVER=	${SNAPDATE:S/-//g}
 #CVS_DATE=	${SNAPDATE} 18:53:04 EDT
 
@@ -15,23 +15,23 @@ PORTVERSION=	3.3
 PORTREVISION=	${SNAPVER}
 CATEGORIES=	lang java
 MASTER_SITES=	${MASTER_SITE_GCC}
-MASTER_SITE_SUBDIR=	snapshots/${SNAPDATE}
+MASTER_SITE_SUBDIR=	snapshots
 .if !defined(CVS_DATE)
+EXTRACT_SUFX=	.tar.gz
 DISTFILES=	\
-		gcc-core-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-g++-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-g77-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-java-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-objc-${SNAPVER}${EXTRACT_SUFX}
+		gcc-core-${PORTVERSION}-${SNAPVER}${EXTRACT_SUFX} \
+		gcc-g++-${PORTVERSION}-${SNAPVER}${EXTRACT_SUFX} \
+		gcc-g77-${PORTVERSION}-${SNAPVER}${EXTRACT_SUFX} \
+		gcc-java-${PORTVERSION}-${SNAPVER}${EXTRACT_SUFX} \
+		gcc-objc-${PORTVERSION}-${SNAPVER}${EXTRACT_SUFX}
 .endif
 
 MAINTAINER?=	ports@FreeBSD.org
-COMMENT?=	GNU Compiler Collection 3.3 (inprogress version)
+COMMENT?=	GNU Compiler Collection 3.3
 
-NO_CDROM=	'dated material'
 LATEST_LINK?=	gcc33${PKGNAMESUFFIX}
 
-USE_BZIP2=	yes
+#USE_BZIP2=	yes
 USE_REINPLACE=	yes
 
 PATCH_WRKSRC=	${SRCDIR}
@@ -44,7 +44,7 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 
 GCC_REV=	${PORTVERSION:C/\.0$//}
 #SRCDIR=		${WRKDIR}/gcc-${GCC_REV}
-SRCDIR=		${WRKDIR}/gcc-${SNAPVER}
+SRCDIR=		${WRKDIR}/gcc-${PORTVERSION}-${SNAPVER}
 WRKSRC=		${WRKDIR}/build
 TARGLIB=	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${GCC_REV}
 GCJINC=		${PREFIX}/include/gcj
@@ -77,11 +77,10 @@ CONFIGURE_ARGS+=	--enable-threads
 CONFIGURE_ARGS+=	--enable-threads=posix
 .endif
 ALL_TARGET=	bootstrap
-#MAN1=		cpp33.1 g++33.1 g77-33.1 gcc33.1 gcov33.1 \
-#		gcj33.1 gcjh33.1 gij33.1 grepjar33.1 jar33.1 \
-#		jcf-dump33.1 jv-scan33.1 jv-convert33.1
-MAN1=		g++33.1 grepjar33.1 jar33.1
-#MAN7=		fsf-funding.7 gfdl.7 gpl.7
+MAN1=		cpp33.1 g++33.1 g77-33.1 gcc33.1 gcov33.1 \
+		gcj33.1 gcjh33.1 gij33.1 grepjar33.1 jar33.1 \
+		jcf-dump33.1 jv-scan33.1 jv-convert33.1
+MAN7=		fsf-funding.7 gfdl.7 gpl.7
 
 pre-fetch:
 	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
diff --git a/lang/gcc46/distinfo b/lang/gcc46/distinfo
index 87cc90a2f7ca..083f084410d2 100644
--- a/lang/gcc46/distinfo
+++ b/lang/gcc46/distinfo
@@ -1,5 +1,5 @@
-MD5 (gcc-core-20030428.tar.bz2) = 96d797c8fb4bfe4e6cdd40d5a1174fae
-MD5 (gcc-g++-20030428.tar.bz2) = 9e3a0aae0b8d00ea8689336f3e760485
-MD5 (gcc-g77-20030428.tar.bz2) = 0fc819cc5652831a78f4cae2a89c5f6f
-MD5 (gcc-java-20030428.tar.bz2) = 69bacd070e57354377dd7fe0f3d77926
-MD5 (gcc-objc-20030428.tar.bz2) = 899e6c7ed077247a135cba5ad072ea81
+MD5 (gcc-core-3.3-20030506.tar.gz) = f81bc6abd89d30d37db378476d561564
+MD5 (gcc-g++-3.3-20030506.tar.gz) = c32d3adca9afefb269cc456b8692ee2f
+MD5 (gcc-g77-3.3-20030506.tar.gz) = 9c86a7e4526b3877dc86fb36423ee8b4
+MD5 (gcc-java-3.3-20030506.tar.gz) = 2df75e4c792648f69141cd6401b70160
+MD5 (gcc-objc-3.3-20030506.tar.gz) = 19e11a4aa8f09655dc2427bcceac79e4
diff --git a/lang/gcc46/files/patch-gengtype-yacc.y b/lang/gcc46/files/patch-gengtype-yacc.y
index cf227a4b58a6..4afaae159533 100644
--- a/lang/gcc46/files/patch-gengtype-yacc.y
+++ b/lang/gcc46/files/patch-gengtype-yacc.y
@@ -10,20 +10,3 @@
  %}
  
  %union {
-@@ -37,11 +40,11 @@
- %token <t>ENT_STRUCT
- %token ENT_EXTERNSTATIC
- %token ENT_YACCUNION
--%token GTY_TOKEN "GTY"
--%token UNION "union"
--%token STRUCT "struct"
--%token ENUM "enum"
--%token ALIAS "ptr_alias"
-+%token GTY_TOKEN
-+%token UNION
-+%token STRUCT
-+%token ENUM
-+%token ALIAS
- %token <s>PARAM_IS
- %token NUM
- %token PERCENTPERCENT "%%"