3 files changed, 20 insertions, 24 deletions

diff --git a/lang/gcc-ooo/Makefile b/lang/gcc-ooo/Makefile
index 313c30835b6c..5f5893001f68 100644
--- a/lang/gcc-ooo/Makefile
+++ b/lang/gcc-ooo/Makefile
@@ -6,24 +6,24 @@
 # $FreeBSD$
 #
 
-SNAPDATE=	2003-05-08
-SNAPVER=	${SNAPDATE:S/-//g}
+SNAPDATE=	2003-05-14
 #CVS_DATE=	${SNAPDATE} 18:53:04 EDT
 
 PORTNAME=	gcc
 PORTVERSION=	3.3
-PORTREVISION=	${SNAPVER}
+PORTREVISION=	${SNAPDATE:S/-//g}
 CATEGORIES=	lang java
+VERSIONSTRING=	${PORTVERSION}
 MASTER_SITES=	${MASTER_SITE_GCC}
-MASTER_SITE_SUBDIR=	snapshots
+MASTER_SITE_SUBDIR=	releases/gcc-${VERSIONSTRING}
 .if !defined(CVS_DATE)
 DISTFILES=	\
-		gcc-core-${PORTVERSION}-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-testsuite-${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}
+		gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
+		gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
+		gcc-g77-${VERSIONSTRING}${EXTRACT_SUFX} \
+		gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} \
+		gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
+		gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
 .endif
 
 MAINTAINER?=	ports@FreeBSD.org
@@ -43,16 +43,14 @@ NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 
 GCC_REV=	${PORTVERSION:C/\.0$//}
-#SRCDIR=		${WRKDIR}/gcc-${GCC_REV}
-SRCDIR=		${WRKDIR}/gcc-${PORTVERSION}-${SNAPVER}
+SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
 TARGLIB=	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${GCC_REV}
 GCJINC=		${PREFIX}/include/gcj
 GNUINC=		${PREFIX}/include/gnu
 JAVAINC=	${PREFIX}/include/java
 JAVAINC2=	${PREFIX}/include/javax
-PLIST_SUB=	GCC_REV=${GCC_REV} GNU_HOST=${CONFIGURE_TARGET}  \
-		SNAPVER=${SNAPVER}
+PLIST_SUB=	GCC_REV=${GCC_REV} GNU_HOST=${CONFIGURE_TARGET}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_BISON=	yes
@@ -78,7 +76,8 @@ CONFIGURE_ARGS+=	--enable-threads=posix
 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
+		jcf-dump33.1 jv-scan33.1 jv-convert33.1 \
+		rmic33.1 rmiregistry33.1
 MAN7=		fsf-funding.7 gfdl.7 gpl.7
 
 pre-fetch:
diff --git a/lang/gcc-ooo/distinfo b/lang/gcc-ooo/distinfo
index 449cf6fc5f64..417b04f2d4a6 100644
--- a/lang/gcc-ooo/distinfo
+++ b/lang/gcc-ooo/distinfo
@@ -1,6 +1,6 @@
-MD5 (gcc-core-3.3-20030508.tar.bz2) = 76120a3b9b37bbcd5098f35b27801d3d
-MD5 (gcc-testsuite-3.3-20030508.tar.bz2) = fe37307f6c94f55e4cd802182f9c25d4
-MD5 (gcc-g++-3.3-20030508.tar.bz2) = 97e8c3cacb4d15d134c08f2a1f8a8435
-MD5 (gcc-g77-3.3-20030508.tar.bz2) = e4aea3f0329c4ac66675056a2d67b37d
-MD5 (gcc-java-3.3-20030508.tar.bz2) = 2dfc1c6fd36523c639d56b1d210b2537
-MD5 (gcc-objc-3.3-20030508.tar.bz2) = b3606f43b67a78393d695adff5633caa
+MD5 (gcc-core-3.3.tar.bz2) = 9bed3c54a109e71c04967b1eab469aee
+MD5 (gcc-g++-3.3.tar.bz2) = 61a97a05bb40fd3280376d58f88cf147
+MD5 (gcc-g77-3.3.tar.bz2) = 36ce1fafb8498f9e40ded5dbad5ddac6
+MD5 (gcc-java-3.3.tar.bz2) = 8c789ac16cd54925c52fad174b5b533e
+MD5 (gcc-objc-3.3.tar.bz2) = 3eb06192c9e3521a2a2d70e1b73cb900
+MD5 (gcc-testsuite-3.3.tar.bz2) = c4b5e9aa0f46ce34559f14d11f5b9044
diff --git a/lang/gcc-ooo/pkg-plist b/lang/gcc-ooo/pkg-plist
index f04ee2faba35..9f1df09afe4e 100644
--- a/lang/gcc-ooo/pkg-plist
+++ b/lang/gcc-ooo/pkg-plist
@@ -37,7 +37,6 @@ lib/lib-org-w3c-dom.a
 share/java/libgcj-3.3.jar
 @dirrm share/java/classes
 @dirrm share/java
-@comment not needed post-libstdc++-v3:	%%GNU_HOST%%/include/_G_config.h
 @comment Insert PLIST.gcc-lib here
 @comment -=[ begin PLIST.gcc-lib ]=-
 @comment -=[ end PLIST.gcc-lib ]=-
@@ -65,5 +64,3 @@ info/fastjar.info
 @exec install-info %D/info/gccint.info %D/info/dir
 @exec install-info %D/info/gcj.info %D/info/dir
 @exec install-info %D/info/fastjar.info %D/info/dir
-@comment @dirrm %%GNU_HOST%%/include
-@comment @dirrm %%GNU_HOST%%