Update to 3.2.1 release, and fix packaging.

4 files changed, 49 insertions, 42 deletions

diff --git a/lang/gcc32/Makefile b/lang/gcc32/Makefile
index fb0808e3a25..e4d0a80ad93 100644
--- a/lang/gcc32/Makefile
+++ b/lang/gcc32/Makefile
@@ -6,31 +6,26 @@
 # $FreeBSD$
 #
 
-SNAPDATE=	2002-09-02
+SNAPDATE=	2002-11-19
 SNAPVER=	${SNAPDATE:S/-//g}
-#CVS_DATE=	${SNAPDATE} 23:46:00 EDT
 
 PORTNAME=	gcc
-PORTVERSION=	3.2
+PORTVERSION=	3.2.1
 PORTREVISION=	${SNAPVER}
 CATEGORIES=	lang java
 MASTER_SITES=	${MASTER_SITE_GCC}
-MASTER_SITE_SUBDIR=	snapshots/${SNAPDATE}
-.if !defined(CVS_DATE)
-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}
-.endif
+MASTER_SITE_SUBDIR=	releases/gcc-${PORTVERSION}
+DISTFILES=	gcc-core-${PORTVERSION}${EXTRACT_SUFX} \
+		gcc-g++-${PORTVERSION}${EXTRACT_SUFX} \
+		gcc-g77-${PORTVERSION}${EXTRACT_SUFX} \
+		gcc-java-${PORTVERSION}${EXTRACT_SUFX} \
+		gcc-objc-${PORTVERSION}${EXTRACT_SUFX}
 
-PATCH_SITES=	ftp://relay.nuxi.com/obrien/
-PATCHFILES=	port_gcc32_${SNAPDATE}.diff
+#PATCH_SITES=	ftp://relay.nuxi.com/obrien/
+#PATCHFILES=	port_gcc32_${SNAPDATE}.diff
 
 MAINTAINER=	ports@FreeBSD.org
 
-NO_CDROM=	'dated material'
 LATEST_LINK=	gcc32
 
 USE_BZIP2=	yes
@@ -49,10 +44,8 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsdaout${OSREL}
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .endif
 
-#GCC_REV=	${PORTVERSION:C/\.0$//}
-GCC_REV=	3.2.1
-#SRCDIR=		${WRKDIR}/gcc-${GCC_REV}
-SRCDIR=		${WRKDIR}/gcc-${SNAPVER}
+GCC_REV=	${PORTVERSION:C/\.0$//}
+SRCDIR=		${WRKDIR}/gcc-${GCC_REV}
 WRKSRC=		${WRKDIR}/build
 TARGLIB=	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${GCC_REV}
 PLIST_SUB=	GCC_REV=${GCC_REV} GNU_HOST=${CONFIGURE_TARGET}  \
@@ -163,11 +156,9 @@ post-install:
 	-${MV} -f ${PREFIX}/lib/libgcj.* ${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
+.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}
diff --git a/lang/gcc32/distinfo b/lang/gcc32/distinfo
index 0bc29d0c1a5..319ae221182 100644
--- a/lang/gcc32/distinfo
+++ b/lang/gcc32/distinfo
@@ -1,6 +1,5 @@
-MD5 (gcc-core-20020902.tar.bz2) = 15477fbd165cf9bdd6cd1734f6fcd04d
-MD5 (gcc-g++-20020902.tar.bz2) = ab6dd2245efb4cd18b67afdd992365bf
-MD5 (gcc-g77-20020902.tar.bz2) = fecb733d70cc945fa11a6f4649aadc79
-MD5 (gcc-java-20020902.tar.bz2) = 46febeac9257bac79c10ee494dfee7a3
-MD5 (gcc-objc-20020902.tar.bz2) = 6793803176f7f915f3382f0f75a82bdf
-MD5 (port_gcc32_2002-09-02.diff) = f81458356519cdeb80ad7483d81e63f5
+MD5 (gcc-core-3.2.1.tar.bz2) = e87b2970e96c54b8e45d11bb41a3e915
+MD5 (gcc-g++-3.2.1.tar.bz2) = 8164fb818bed5ab11d0f6a2800aafb23
+MD5 (gcc-g77-3.2.1.tar.bz2) = db0b9bd892cdba585e0694050a8abcd8
+MD5 (gcc-java-3.2.1.tar.bz2) = 46cb5368ab181df7288b186597871db2
+MD5 (gcc-objc-3.2.1.tar.bz2) = 5c82691527eeec787917041e0598627a
diff --git a/lang/gcc32/files/patch-vc b/lang/gcc32/files/patch-vc
new file mode 100644
index 00000000000..dc20a8edec7
--- /dev/null
+++ b/lang/gcc32/files/patch-vc
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Mon Oct  7 13:47:05 2002
++++ Makefile.in	Fri Nov 22 14:23:28 2002
+@@ -154,7 +154,7 @@
+ 	then echo $$r/texinfo/makeinfo/makeinfo ; \
+ 	else if (makeinfo --version \
+ 	  | egrep 'texinfo[^0-9]*([1-3][0-9]|[4-9])') >/dev/null 2>&1; \
+-        then echo makeinfo; else echo $$s/missing makeinfo; fi; fi`
++        then echo makeinfo --no-split ; else echo $$s/missing makeinfo; fi; fi`
+ 
+ # This just becomes part of the MAKEINFO definition passed down to
+ # sub-makes.  It lets flags be given on the command line while still
diff --git a/lang/gcc32/pkg-plist b/lang/gcc32/pkg-plist
index 44b27f15f55..32d1c6f9c71 100644
--- a/lang/gcc32/pkg-plist
+++ b/lang/gcc32/pkg-plist
@@ -18,17 +18,23 @@ bin/grepjar32
 @comment Insert PLIST.gcc-lib here
 @comment -=[ begin PLIST.gcc-lib ]=-
 @comment -=[ end PLIST.gcc-lib ]=-
-@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
+@unexec install-info --delete %D/info/cpp.info %D/info/dir
+@unexec install-info --delete %D/info/cppinternals.info %D/info/dir
+@unexec install-info --delete %D/info/g77.info %D/info/dir
+@unexec install-info --delete %D/info/gcc.info %D/info/dir
+@unexec install-info --delete %D/info/gccint.info %D/info/dir
+@unexec install-info --delete %D/info/gcj.info %D/info/dir
+info/cpp.info
+info/cppinternals.info
+info/g77.info
+info/gcc.info
+info/gccint.info
+info/gcj.info
+@exec install-info %D/info/cpp.info %D/info/dir
+@exec install-info %D/info/cppinternals.info %D/info/dir
+@exec install-info %D/info/g77.info %D/info/dir
+@exec install-info %D/info/gcc.info %D/info/dir
+@exec install-info %D/info/gccint.info %D/info/dir
+@exec install-info %D/info/gcj.info %D/info/dir
 @comment @dirrm %%GNU_HOST%%/include
 @comment @dirrm %%GNU_HOST%%