3 files changed, 17 insertions, 23 deletions

diff --git a/lang/gcc33/Makefile b/lang/gcc33/Makefile
index c109fbee9693..3439e14fc03a 100644
--- a/lang/gcc33/Makefile
+++ b/lang/gcc33/Makefile
@@ -6,7 +6,7 @@
 # $FreeBSD$
 #
 
-SNAPDATE=2003-12-01
+SNAPDATE=2003-12-08
 
 PORTNAME=	gcc
 PORTVERSION=	3.3.3
@@ -61,7 +61,7 @@ CONFIGURE_ARGS=	--disable-nls \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/${GCC_REV}
 #CONFIGURE_ARGS+=	--program-suffix=33
 #	Java
-CONFIGURE_ARGS+=	--with-system-zlib #--includedir=${TARGLIB}/include/Java -libdir=${TARGLIB}
+CONFIGURE_ARGS+=	--with-system-zlib
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 .if defined(WANT_SHAREDLIBS)
 CONFIGURE_ARGS+=	--enable-shared
@@ -119,9 +119,6 @@ post-build:
 check: build
 	cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check
 
-pre-install:
-	${MKDIR} ${PREFIX}/info
-
 post-install:
 	@${RM} -f ${PREFIX}/bin/c++ ${PREFIX}/bin/${CONFIGURE_TARGET}-c++
 	@(for prog in \
@@ -162,9 +159,6 @@ post-install:
 	-${MV} -f ${PREFIX}/lib/libgcj.* ${TARGLIB}
 	${RM} -f ${PREFIX}/lib/libiberty.a
 	${RM} -f ${TARGLIB}/*.la
-.for info in ${INFO}
-	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
-.endfor
 # I am sick and tired of the anonyance that man pages can only be generated if
 # perl 5.6 is installed.  This is becoming a royal PITA on non-5-CURRENT systems
 	for mp in ${_MANPAGES} ; do \
@@ -172,11 +166,11 @@ post-install:
 	    done
 	cd ${PREFIX} ;\
 	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
-	    	>${WRKDIR}/PLIST.gcc-lib
+	    	>${WRKDIR}/PLIST.lib
 	cd ${PREFIX} ;\
 	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type d \
-	    	| sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcc-lib
-	(${ECHO_CMD} "@unexec rmdir %D/lib/gcc-lib/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc-lib 2>&1 || true") >> ${WRKDIR}/PLIST.gcc-lib
+	    	| sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib
+	(${ECHO_CMD} "@unexec rmdir %D/lib/gcc-lib/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc-lib 2>&1 || true") >> ${WRKDIR}/PLIST.lib
 	# Handle GCJ include files.
 	${RM} -f ${WRKDIR}/PLIST.gcj-inc
 .for inc in ${PREFIX}/include/gcj ${PREFIX}/include/gnu ${PREFIX}/include/java ${PREFIX}/include/javax
@@ -187,14 +181,14 @@ post-install:
 	    	| sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcj-inc
 .endfor
 	${ECHO_CMD} "r ${TMPPLIST}"		> ${WRKDIR}/ex.script
-	${ECHO_CMD} "/Insert PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "/Insert PLIST.lib"		>> ${WRKDIR}/ex.script
 	${ECHO_CMD} "d"				>> ${WRKDIR}/ex.script
-	${ECHO_CMD} "r ${WRKDIR}/PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "r ${WRKDIR}/PLIST.lib"	>> ${WRKDIR}/ex.script
 	${ECHO_CMD} "/Insert PLIST.gcj-inc"	>> ${WRKDIR}/ex.script
 	${ECHO_CMD} "d"				>> ${WRKDIR}/ex.script
 	${ECHO_CMD} "r ${WRKDIR}/PLIST.gcj-inc"	>> ${WRKDIR}/ex.script
 	${ECHO_CMD} "x!"			>> ${WRKDIR}/ex.script
-	${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-gcc-lib
+	${CP} -p ${TMPPLIST} ${TMPPLIST}.pre
 	cd ${WRKDIR} ; ex < ex.script
 
 cklatest:
diff --git a/lang/gcc33/distinfo b/lang/gcc33/distinfo
index 174f3e06f8b3..93077e4b6eff 100644
--- a/lang/gcc33/distinfo
+++ b/lang/gcc33/distinfo
@@ -1,7 +1,7 @@
-MD5 (gcc-core-3.3-20031201.tar.bz2) = 63f8f3031fd6ef4218ba4a9406d84945
-MD5 (gcc-g++-3.3-20031201.tar.bz2) = 740884e69457630c1a275b149c15d35d
-MD5 (gcc-g77-3.3-20031201.tar.bz2) = 34aa94681b2f1f149b9ff999f3b08ce0
-MD5 (gcc-java-3.3-20031201.tar.bz2) = 8ce5de51984fae300f1ca824921e5a4b
-MD5 (gcc-objc-3.3-20031201.tar.bz2) = 11c98b2077ed1968c7e20e65f6430302
-MD5 (gcc-testsuite-3.3-20031201.tar.bz2) = 3528b91196d9e9d2822efb4fe83332f5
+MD5 (gcc-core-3.3-20031208.tar.bz2) = 1928044a1a0e7a6b43013505b06ddd2c
+MD5 (gcc-g++-3.3-20031208.tar.bz2) = 37efe9d68c616e7a2d6c61e1ca5f8b01
+MD5 (gcc-g77-3.3-20031208.tar.bz2) = 50095bac32e2de1f35e18fe8a83d7494
+MD5 (gcc-java-3.3-20031208.tar.bz2) = 01810c365af8c8fc4d4d1d48851fbbe0
+MD5 (gcc-objc-3.3-20031208.tar.bz2) = a7f5ed4c553ffb9fae29d51d3e1b44c1
+MD5 (gcc-testsuite-3.3-20031208.tar.bz2) = e548f4760a63bc2b5c9e4c0e2e910728
 MD5 (bounds-checking-gcc-3.3.2-1.00.patch.bz2) = 991e7bed74a324a15a0d80e27c0e1249
diff --git a/lang/gcc33/pkg-plist b/lang/gcc33/pkg-plist
index c1a7dbfc597a..8fa16e6be73d 100644
--- a/lang/gcc33/pkg-plist
+++ b/lang/gcc33/pkg-plist
@@ -35,9 +35,9 @@ lib/lib-org-xml-sax.a
 lib/lib-org-w3c-dom.la
 lib/lib-org-w3c-dom.a
 share/java/libgcj-%%GCC_VER%%.jar
-@comment Insert PLIST.gcc-lib here
-@comment -=[ begin PLIST.gcc-lib ]=-
-@comment -=[ end PLIST.gcc-lib ]=-
+@comment Insert PLIST.lib here
+@comment -=[ begin PLIST.lib ]=-
+@comment -=[ end PLIST.lib ]=-
 @comment Insert PLIST.gcj-inc here
 @comment -=[ begin PLIST.gcj-inc ]=-
 @comment -=[ end PLIST.gcj-inc ]=-