Upgrade to the 1-July-2002 GCC 3.1.1 pre-release snapshot.

Note that with this update we loose the .info files.
I am sick and tired of dealing with them and most of all makeinfo --no-split
isn't working.

3 files changed, 37 insertions, 37 deletions

diff --git a/lang/gcc31/Makefile b/lang/gcc31/Makefile
index e1f0404..e39dcaf 100644
--- a/lang/gcc31/Makefile
+++ b/lang/gcc31/Makefile
@@ -6,7 +6,7 @@
 # $FreeBSD$
 #
 
-SNAPDATE=	2002-06-17
+SNAPDATE=	2002-07-01
 SNAPVER=	${SNAPDATE:S/-//g}
 
 PORTNAME=	gcc
@@ -33,18 +33,11 @@ LATEST_LINK=	gcc31
 
 USE_BZIP2=	yes
 
-.if defined(NETWINDER_SS)
-BUILD_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm
-
-EXTRACT_CMD=		rpm2cpio
-EXTRACT_BEFORE_ARGS=
-EXTRACT_AFTER_ARGS=	|cpio -idum
-EXTRACT_ONLY=
-.endif
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
 # do not require Gcc 3.1 to compile -- or we have an infinate loop on RELENG_4.
 USE_GCC=	X
+NOMANCOMPRESS=	yes	# to hard to deal with differences on 5-cur and releng4
 
 .include <bsd.port.pre.mk>
 
@@ -67,7 +60,7 @@ USE_GMAKE=	yes
 USE_BISON=	yes
 CONFIGURE_ARGS=	--disable-nls --with-gnu-as --with-gnu-ld \
 		--with-gxx-include-dir=${TARGLIB}/include/g++
-#CONFIGURE_ARGS+=	--program-prefix=e
+#CONFIGURE_ARGS+=	--program-suffix=31
 CONFIGURE_ARGS+=	--disable-libgcj	# does not bootstrap now
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 .if defined(WANT_SHAREDLIBS)
@@ -81,10 +74,10 @@ CONFIGURE_ARGS+= --enable-threads
 CONFIGURE_ARGS+= --enable-threads=posix
 .endif
 ALL_TARGET=	bootstrap
-#MAN1=		cpp31.1 g++31.1 g77-31.1 gcc31.1 gcov31.1 \
-#		gcj31.1 gcjh31.1 gij.1 \
-#		jcf-dump31.1 jv-scan31.1 jv-convert.1
-#MAN7=		fsf-funding.7 gfdl.7 gpl.7
+MAN1=		cpp31.1 g++31.1 g77-31.1 gcc31.1 gcov31.1 \
+		gcj31.1 gcjh31.1 gij.1 \
+		jcf-dump31.1 jv-scan31.1 jv-convert.1
+MAN7=		fsf-funding.7 gfdl.7 gpl.7
 
 pre-fetch:
 	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
@@ -125,15 +118,15 @@ post-install:
 	done )
 .for file in gcc g++ cpp g++filt gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ gcj gcjh jv-scan jcf-dump jar grepjar
 	${MV} -f ${PREFIX}/bin/${file} ${PREFIX}/bin/${file}31
-	-( ${TEST} -e ${PREFIX}/man/man1/${file}.1 \
-		&& ${MV} -f ${PREFIX}/man/man1/${file}.1 \
+	( ${TEST} ! -e ${PREFIX}/man/man1/${file}.1 \
+		|| ${MV} -f ${PREFIX}/man/man1/${file}.1 \
 		${PREFIX}/man/man1/${file}31.1 )
 .endfor
 .for file in g77
 	${MV} -f ${PREFIX}/bin/${file} ${PREFIX}/bin/${file}-31
-	-( ${TEST} -e ${PREFIX}/man/man1/${file}.1 \
-		&& ${MV} -f ${PREFIX}/man/man1/${file}.1 \
-		${PREFIX}/man/man1/${file}-31.1
+	( ${TEST} ! -e ${PREFIX}/man/man1/${file}.1 \
+		|| ${MV} -f ${PREFIX}/man/man1/${file}.1 \
+		${PREFIX}/man/man1/${file}-31.1 )
 .endfor
 	${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${SNAPVER}
 	# These 3 libraries are moved from PREFIX/lib to avoid conflicts
@@ -144,9 +137,16 @@ post-install:
 	-${MV} -f ${PREFIX}/lib/ieee ${TARGLIB}
 	${RM} -f ${PREFIX}/lib/libiberty.a
 	${RM} -f ${TARGLIB}/*.la
+# I am sick and tired of this .info shit, makeinfo --no-split isn't working
+	@cd ${PREFIX}/info ; ${RM} -f cpp.* cppinternals.* g77.* gcc.* gccint.* gcj.*
 #.for info in cpp cppinternals g77 gcc gcj
 #	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}
+	( ${TEST} -e ${mp} && ${TOUCH} ${TOUCH_FLAGS} ${mp} )
+.endfor
 	cd ${PREFIX} ;\
 	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
 	    	>${WRKDIR}/PLIST.gcc-lib
diff --git a/lang/gcc31/distinfo b/lang/gcc31/distinfo
index 5f40092..6353205 100644
--- a/lang/gcc31/distinfo
+++ b/lang/gcc31/distinfo
@@ -1,6 +1,6 @@
-MD5 (gcc-core-20020617.tar.bz2) = 529d777975b4670216cc88ac34871897
-MD5 (gcc-g++-20020617.tar.bz2) = d9e2f1a5451c46da3c81bcfd4b96eb59
-MD5 (gcc-g77-20020617.tar.bz2) = c15938ffc1b60ce0728aa8cc6448c149
-MD5 (gcc-java-20020617.tar.bz2) = 328e5737a550d6d8016de739d4b9f25e
-MD5 (gcc-objc-20020617.tar.bz2) = 40cc434eb0488d0ab7cbaf1e615ba285
-MD5 (port_gcc31_2002-06-17.diff) = 699cc8efaf2c819e5625bd48d2fbc46b
+MD5 (gcc-core-20020701.tar.bz2) = 3bec43c2211b6351a8b578c9caa2bbc1
+MD5 (gcc-g++-20020701.tar.bz2) = 20f8807c3c558433b799c0581e355d4d
+MD5 (gcc-g77-20020701.tar.bz2) = 17d3c957c76b144f29188cc7fa6a05f8
+MD5 (gcc-java-20020701.tar.bz2) = 20dc919b8aeff2e89622f356058052e2
+MD5 (gcc-objc-20020701.tar.bz2) = 78ae98871a3c7ab074479f43078caf7a
+MD5 (port_gcc31_2002-07-01.diff) = f1ecb89e83fec7fa8cd0e4e277d59a48
diff --git a/lang/gcc31/pkg-plist b/lang/gcc31/pkg-plist
index c98834f..4373bfe 100644
--- a/lang/gcc31/pkg-plist
+++ b/lang/gcc31/pkg-plist
@@ -18,17 +18,17 @@ bin/grepjar31
 @comment Insert PLIST.gcc-lib here
 @comment -=[ begin PLIST.gcc-lib ]=-
 @comment -=[ end PLIST.gcc-lib ]=-
-@comment	@unexec install-info --delete %D/info/cppinternals.info %D/info/dir
-@comment	@unexec install-info --delete %D/info/gcc.info %D/info/dir
-@comment	@unexec install-info --delete %D/info/g77.info %D/info/dir
-@comment	info/cpp.info
-@comment	info/cppinternals.info
-@comment	info/g77.info
-@comment	info/gcc.info
-@comment	info/gcj.info
-@comment	@exec install-info %D/info/cppinternals.info %D/info/dir
-@comment	@exec install-info %D/info/g77.info %D/info/dir
-@comment	@exec install-info %D/info/gcc.info %D/info/dir
-@comment	@exec install-info %D/info/gcj.info %D/info/dir
+@comment I AM TIRED OF THIS .INFO CRAP	@unexec install-info --delete %D/info/cppinternals.info %D/info/dir
+@comment I AM TIRED OF THIS .INFO CRAP	@unexec install-info --delete %D/info/gcc.info %D/info/dir
+@comment I AM TIRED OF THIS .INFO CRAP	@unexec install-info --delete %D/info/g77.info %D/info/dir
+@comment I AM TIRED OF THIS .INFO CRAP	info/cpp.info
+@comment I AM TIRED OF THIS .INFO CRAP	info/cppinternals.info
+@comment I AM TIRED OF THIS .INFO CRAP	info/g77.info
+@comment I AM TIRED OF THIS .INFO CRAP	info/gcc.info
+@comment I AM TIRED OF THIS .INFO CRAP	info/gcj.info
+@comment I AM TIRED OF THIS .INFO CRAP	@exec install-info %D/info/cppinternals.info %D/info/dir
+@comment I AM TIRED OF THIS .INFO CRAP	@exec install-info %D/info/g77.info %D/info/dir
+@comment I AM TIRED OF THIS .INFO CRAP	@exec install-info %D/info/gcc.info %D/info/dir
+@comment I AM TIRED OF THIS .INFO CRAP	@exec install-info %D/info/gcj.info %D/info/dir
 @comment @dirrm %%GNU_HOST%%/include
 @comment @dirrm %%GNU_HOST%%