Bump to 2.95.3 to synchronize with lang/gcc.

3 files changed, 145 insertions, 191 deletions

diff --git a/lang/gcc-ssp/Makefile b/lang/gcc-ssp/Makefile
index 27d9e67a968..3da77792515 100644
--- a/lang/gcc-ssp/Makefile
+++ b/lang/gcc-ssp/Makefile
@@ -1,22 +1,22 @@
-# $NetBSD: Makefile,v 1.5 2001/11/29 01:12:39 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 2002/01/04 05:57:22 kent Exp $
 
-DISTNAME=		gcc-2.95.2
-GCC_VERSION=		2.95.2
-PKGNAME=		gcc-ssp-2.95.2
-PKGREVISION=		3
+DISTNAME=		gcc-2.95.3
+GCC_VERSION=		2.95.3
+PKGNAME=		gcc-ssp-2.95.3
+PKGREVISION=		
 PKGBASENAME=		gcc-ssp
 CATEGORIES=		lang security
 MASTER_SITES=		${MASTER_SITE_GNU:=gcc/}
 
-MAINTAINER=		kent@netbsd.org
+MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.trl.ibm.com/projects/security/ssp/
 COMMENT=		GNU Compiler Collection with Stack-smashing protection
 
-MASTER_SITES+=		http://www.trl.ibm.com/projects/security/ssp/gcc2_95_2/
-SSP_PATCH=		protector-2.95.2-2.tar.gz
+MASTER_SITES+=		http://www.trl.ibm.com/projects/security/ssp/gcc2_95_3/
+SSP_PATCH=		protector-2.95.3-2.tar.gz
 DISTFILES+=		${DISTNAME}.tar.gz ${SSP_PATCH}
 PATCHDIR=		../gcc/patches
-GCC_FILESDIR=		../gcc/files
+GCC_FILESDIR=		${FILESDIR}/../../gcc/files
 
 BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
 
@@ -26,7 +26,6 @@ BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
 # Build error for NetBSD/alpha
 NOT_FOR_PLATFORM=	NetBSD-*-alpha
 
-
 .include "../../mk/bsd.prefs.mk"
 
 .if (${OPSYS} == "NetBSD") && (${OBJECT_FMT} == "ELF")
@@ -41,11 +40,11 @@ CONFIGURE_ARGS=		--host=${MACHINE_GCC_PLATFORM} \
 			--prefix=${GCC_PREFIX} \
 			--enable-shared
 CONFIGURE_SCRIPT=	${SRCDIR}/configure
+INFO_FILES=		# Not instal info files.
 
 MESSAGE_SUBST+=		MAKE=${MAKE} \
 			PKGBASENAME=${PKGBASENAME}
-PLIST_SUBST+=		GCC_VERSION=${GCC_VERSION} \
-			MACHINE_GCC_PLATFORM=${MACHINE_GCC_PLATFORM} \
+PLIST_SUBST+=		MACHINE_GCC_PLATFORM=${MACHINE_GCC_PLATFORM} \
 			PKGBASENAME=${PKGBASENAME}
 SRCDIR=			${WRKDIR}/${DISTNAME}
 WRKSRC=			${WRKDIR}/objdir
@@ -54,13 +53,16 @@ WRKSRC=			${WRKDIR}/objdir
 
 .if (${OPSYS} != SunOS)
 CONFIGURE_ARGS+=	--with-gnu-as --with-gnu-ld
+
 GCC_PREFIX=		${LOCALBASE}/${PKGBASENAME}
 .if ${MACHINE_PLATFORM:MNetBSD-*-sparc}
 PLIST_SRC=		${PKGDIR}/PLIST.NetBSD-sparc
 PLIST_SRC+=		${PKGDIR}/PLIST
 .endif
 .else
+.if (${CC} != gcc)
 ALL_TARGET=		bootstrap
+.endif
 GCC_PREFIX=		${LOCALBASE}
 PLIST_SRC=		${PKGDIR}/PLIST.SunOS
 MESSAGE=		${PKGDIR}/MESSAGE.SunOS
@@ -69,7 +71,12 @@ CONFLICTS+=		gcc-[0-9]* pgcc-[0-9]*
 
 post-extract:
 	${MKDIR} ${WRKSRC}
-	${CP} ${GCC_FILESDIR}/netbsd*.ml ${WRKSRC}/../${DISTNAME}/libstdc++/config
+	cd ${WRKSRC}/../${DISTNAME}/gcc/config; \
+	${CP} ${GCC_FILESDIR}/xm-netbsd.h .; \
+	for ARCH in arm arm i386 m68k sh sparc vax; do \
+	  ${MKDIR} $${ARCH}; \
+	  ${CP} ${GCC_FILESDIR}/$${ARCH}_netbsd-elf.h $${ARCH}/netbsd-elf.h; \
+	done
 
 post-patch:
 	${ECHO} "bogus" >${WRKSRC}/../${DISTNAME}/gcc/cstamp-h.in
@@ -86,22 +93,27 @@ post-build:
 		 -e 's#@@PREFIX@@#${PREFIX}#g' \
 	   <$$FILE >${WRKDIR}/`basename $$FILE`; \
 	done
+	@echo "===> Check whether stack protection works or not"
 	${WRKSRC}/gcc/xgcc -B${WRKSRC}/gcc/ -O2 -o ${WRKDIR}/buffer ${FILESDIR}/buffer.c
 	ulimit -c 0 && ${WRKDIR}/buffer abcdefghijklmnopqrstuvwxyz  2> ${WRKDIR}/output || true
-	@if [ x"`cat ${WRKDIR}/output`" = "x: stack smashing attack in function main" ]; then \
+	@if [ x"`/bin/cat ${WRKDIR}/output`" = "x: stack smashing attack in function main" ]; then \
 	    echo "---- Stack protection succeeded."; \
 	    exit 0; \
 	else \
-	    echo "*** Stack protection failed."; \
+	    echo "**** Stack protection failed."; \
 	    exit 1; \
 	fi
 .endif
 
+pre-install:
+#	${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${INSTALL_FILE} any PRE-INSTALL
+
 .if (${OPSYS} != SunOS)
 post-install:
+	${RM} -f ${GCC_PREFIX}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/curses.h ${PREFIX}/${PKGBASENAME}/bin/cc
 	${LN} -s gcc ${PREFIX}/${PKGBASENAME}/bin/cc
-	${RM} -f ${GCC_PREFIX}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/curses.h
 	${INSTALL_DATA} ${WRKDIR}/gcc.mk ${PREFIX}/etc/${PKGBASENAME}.mk
+	${RM} -fr ${GCC_PREFIX}/info
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/gcc-ssp/PLIST b/lang/gcc-ssp/PLIST
index a1aa3e4e693..2f19c172d9f 100644
--- a/lang/gcc-ssp/PLIST
+++ b/lang/gcc-ssp/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:23:20 zuntum Exp $
-${PKGBASENAME}/${MACHINE_GCC_PLATFORM}/include/_G_config.h
-${PKGBASENAME}/bin/${MACHINE_GCC_PLATFORM}-gcc
+@comment $NetBSD: PLIST,v 1.2 2002/01/04 05:57:22 kent Exp $
+etc/gcc-ssp.mk
 ${PKGBASENAME}/bin/c++
 ${PKGBASENAME}/bin/c++filt
 ${PKGBASENAME}/bin/cc
@@ -12,10 +11,10 @@ ${PKGBASENAME}/bin/gcc
 ${PKGBASENAME}/bin/gcj
 ${PKGBASENAME}/bin/gcjh
 ${PKGBASENAME}/bin/gcov
+${PKGBASENAME}/bin/${MACHINE_GCC_PLATFORM}-gcc
 ${PKGBASENAME}/bin/jcf-dump
 ${PKGBASENAME}/bin/jv-scan
-${PKGBASENAME}/bin/protoize
-${PKGBASENAME}/bin/unprotoize
+${PKGBASENAME}/${MACHINE_GCC_PLATFORM}/include/_G_config.h
 ${PKGBASENAME}/include/g++-3/PlotFile.h
 ${PKGBASENAME}/include/g++-3/SFile.h
 ${PKGBASENAME}/include/g++-3/algo.h
@@ -97,6 +96,7 @@ ${PKGBASENAME}/include/g++-3/set
 ${PKGBASENAME}/include/g++-3/set.h
 ${PKGBASENAME}/include/g++-3/slist
 ${PKGBASENAME}/include/g++-3/slist.h
+${PKGBASENAME}/include/g++-3/sstream
 ${PKGBASENAME}/include/g++-3/stack
 ${PKGBASENAME}/include/g++-3/stack.h
 ${PKGBASENAME}/include/g++-3/std/bastring.cc
@@ -164,158 +164,61 @@ ${PKGBASENAME}/include/g++-3/utility
 ${PKGBASENAME}/include/g++-3/valarray
 ${PKGBASENAME}/include/g++-3/vector
 ${PKGBASENAME}/include/g++-3/vector.h
-@unexec install-info --delete --info-dir=%D/info %D/${PKGBASENAME}/info/chill.info
-${PKGBASENAME}/info/chill.info
-@exec install-info --info-dir=%D/info %D/${PKGBASENAME}/info/chill.info
-@unexec install-info --delete --info-dir=%D/info %D/${PKGBASENAME}/info/cpp.info
-${PKGBASENAME}/info/cpp.info
-${PKGBASENAME}/info/cpp.info-1
-${PKGBASENAME}/info/cpp.info-2
-${PKGBASENAME}/info/cpp.info-3
-@exec install-info --info-dir=%D/info %D/${PKGBASENAME}/info/cpp.info
-@unexec install-info --delete --info-dir=%D/info %D/${PKGBASENAME}/info/g77.info
-${PKGBASENAME}/info/g77.info
-${PKGBASENAME}/info/g77.info-1
-${PKGBASENAME}/info/g77.info-10
-${PKGBASENAME}/info/g77.info-11
-${PKGBASENAME}/info/g77.info-12
-${PKGBASENAME}/info/g77.info-13
-${PKGBASENAME}/info/g77.info-14
-${PKGBASENAME}/info/g77.info-15
-${PKGBASENAME}/info/g77.info-16
-${PKGBASENAME}/info/g77.info-17
-${PKGBASENAME}/info/g77.info-18
-${PKGBASENAME}/info/g77.info-19
-${PKGBASENAME}/info/g77.info-2
-${PKGBASENAME}/info/g77.info-20
-${PKGBASENAME}/info/g77.info-21
-${PKGBASENAME}/info/g77.info-3
-${PKGBASENAME}/info/g77.info-4
-${PKGBASENAME}/info/g77.info-5
-${PKGBASENAME}/info/g77.info-6
-${PKGBASENAME}/info/g77.info-7
-${PKGBASENAME}/info/g77.info-8
-${PKGBASENAME}/info/g77.info-9
-@exec install-info --info-dir=%D/info %D/${PKGBASENAME}/info/g77.info
-@unexec install-info --delete --info-dir=%D/info %D/${PKGBASENAME}/info/gcc.info
-${PKGBASENAME}/info/gcc.info
-${PKGBASENAME}/info/gcc.info-1
-${PKGBASENAME}/info/gcc.info-10
-${PKGBASENAME}/info/gcc.info-11
-${PKGBASENAME}/info/gcc.info-12
-${PKGBASENAME}/info/gcc.info-13
-${PKGBASENAME}/info/gcc.info-14
-${PKGBASENAME}/info/gcc.info-15
-${PKGBASENAME}/info/gcc.info-16
-${PKGBASENAME}/info/gcc.info-17
-${PKGBASENAME}/info/gcc.info-18
-${PKGBASENAME}/info/gcc.info-19
-${PKGBASENAME}/info/gcc.info-2
-${PKGBASENAME}/info/gcc.info-20
-${PKGBASENAME}/info/gcc.info-21
-${PKGBASENAME}/info/gcc.info-22
-${PKGBASENAME}/info/gcc.info-23
-${PKGBASENAME}/info/gcc.info-24
-${PKGBASENAME}/info/gcc.info-25
-${PKGBASENAME}/info/gcc.info-26
-${PKGBASENAME}/info/gcc.info-27
-${PKGBASENAME}/info/gcc.info-28
-${PKGBASENAME}/info/gcc.info-29
-${PKGBASENAME}/info/gcc.info-3
-${PKGBASENAME}/info/gcc.info-30
-${PKGBASENAME}/info/gcc.info-4
-${PKGBASENAME}/info/gcc.info-5
-${PKGBASENAME}/info/gcc.info-6
-${PKGBASENAME}/info/gcc.info-7
-${PKGBASENAME}/info/gcc.info-8
-${PKGBASENAME}/info/gcc.info-9
-@exec install-info --info-dir=%D/info %D/${PKGBASENAME}/info/gcc.info
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/SYSCALLS.c.X
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/cc1
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/cc1chill
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/cc1obj
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/cc1plus
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/chillrt0.o
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/collect2
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/cpp
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/f771
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/README
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/exception
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/float.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/g2c.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/iso646.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/limits.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/math.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/new
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/new.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/objc/NXConstStr.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/objc/Object.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/objc/Protocol.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/objc/encoding.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/objc/hash.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/objc/objc-api.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/objc/objc-list.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/objc/objc.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/objc/sarray.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/objc/thr.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/objc/typedstream.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/proto.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/stdarg.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/stdbool.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/stddef.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/syslimits.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/typeinfo
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-alpha.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-arc.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-c4x.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-clipper.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-h8300.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-i860.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-i960.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-m32r.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-m88k.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-mips.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-mn10200.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-mn10300.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-pa.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-ppc.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-pyr.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-sh.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-sparc.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-spur.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-v850.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/varargs.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/jc1
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/jvgenmain
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/libchill.a
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/libg2c.a
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/libgcc.a
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/libobjc.a
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/libstdc++.a
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/libstdc++.so
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/specs
+${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/cc1
+${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/cc1chill
+${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/cc1obj
+${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/cc1plus
+${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/chillrt0.o
+${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/collect2
+${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/cpp0
+${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/f771
+${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/README
+${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/exception
+${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/float.h
+${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/g2c.h
+${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/limits.h
+${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/math.h
+${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/new
+${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/new.h
+${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/objc/NXConstStr.h
+${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/objc/Object.h
+${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/objc/Protocol.h
+${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/objc/encoding.h
+${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/objc/hash.h
+${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/objc/objc-api.h
+${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/objc/objc-list.h
+${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/objc/objc.h
+${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/objc/sarray.h
+${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/objc/thr.h
+${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/objc/typedstream.h
+${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/syslimits.h
+${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/typeinfo
+${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/jc1
+${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/jvgenmain
+${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/libchill.a
+${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/libg2c.a
+${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/libgcc.a
+${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/libobjc.a
+${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/libstdc++.a
+${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/specs
 ${PKGBASENAME}/lib/libiberty.a
-${PKGBASENAME}/lib/libstdc++.a.2.10
-${PKGBASENAME}/lib/libstdc++.so.2
-${PKGBASENAME}/lib/libstdc++.so.2.10
+${PKGBASENAME}/lib/libstdc++.a.2.10.0nb1
 ${PKGBASENAME}/man/man1/cccp.1
 ${PKGBASENAME}/man/man1/g++.1
 ${PKGBASENAME}/man/man1/g77.1
 ${PKGBASENAME}/man/man1/gcc.1
-etc/${PKGBASENAME}.mk
 @dirrm ${PKGBASENAME}/man/man1
 @dirrm ${PKGBASENAME}/man
-@dirrm ${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/objc
-@dirrm ${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include
-@dirrm ${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}
+@dirrm ${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/objc
+@dirrm ${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include
+@dirrm ${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}
 @dirrm ${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}
 @dirrm ${PKGBASENAME}/lib/gcc-lib
 @dirrm ${PKGBASENAME}/lib
-@dirrm ${PKGBASENAME}/info
 @dirrm ${PKGBASENAME}/include/g++-3/std
 @dirrm ${PKGBASENAME}/include/g++-3
 @dirrm ${PKGBASENAME}/include
-@dirrm ${PKGBASENAME}/bin
 @dirrm ${PKGBASENAME}/${MACHINE_GCC_PLATFORM}/include
 @dirrm ${PKGBASENAME}/${MACHINE_GCC_PLATFORM}
+@dirrm ${PKGBASENAME}/bin
 @dirrm ${PKGBASENAME}
diff --git a/lang/gcc-ssp/distinfo b/lang/gcc-ssp/distinfo
index 00ae5a5c7b5..fff2553a62f 100644
--- a/lang/gcc-ssp/distinfo
+++ b/lang/gcc-ssp/distinfo
@@ -1,32 +1,71 @@
-$NetBSD: distinfo,v 1.2 2001/06/30 16:16:11 kent Exp $
+$NetBSD: distinfo,v 1.3 2002/01/04 05:57:21 kent Exp $
 
-SHA1 (gcc-2.95.2.tar.gz) = c3da103de3fa97c78ccc1b4fdc29fa25bf26a6c8
-Size (gcc-2.95.2.tar.gz) = 12885815 bytes
-SHA1 (protector-2.95.2-2.tar.gz) = 7b906b45e4e08e414ec8bca611d5371d82994401
-Size (protector-2.95.2-2.tar.gz) = 17034 bytes
-SHA1 (patch-aa) = bae789b2acbcae4cf8876d116c80ec8e4b3da359
-SHA1 (patch-ab) = 8895083742d7a2acedee1d1405a9fe2d44fbb3c3
-SHA1 (patch-ac) = 3dddca70bd3860afdfb066d4b59a144dd7c2a520
-SHA1 (patch-ad) = e09ff41ba073b2fd1cbdd15a555ddc3b99938c92
-SHA1 (patch-ae) = 7e675a8fea9c45169deac34eae5a9e23ec6c1d77
-SHA1 (patch-af) = 8a6b6b9cbd94001523102a788fdfe7f3638309eb
-SHA1 (patch-ag) = 7619a10501280a121da4813e021a33a948e7f7b4
-SHA1 (patch-ah) = fb50a9fe36b00096a2d98c27ad0a9d14dd58db70
-SHA1 (patch-ai) = 6b377f16fcefcf90d34192b10344c75f5a43d848
-SHA1 (patch-aj) = 20ea2627f79292c8127d1ddc317ce75e45506721
-SHA1 (patch-ak) = d92aa879ddb87c100b2168bd58307c32a08ed54b
-SHA1 (patch-al) = 5dc1df948449be6b076be783c44359663c95f0e0
-SHA1 (patch-am) = 575252905cdfa59f814c8b39e9733fa658061f9f
-SHA1 (patch-an) = 98e4a21e5ee1f1c7ce86387278b17bd12cea2c49
-SHA1 (patch-ao) = 8aa4b32592ab491309a0daecd2ea4c08498ce072
-SHA1 (patch-ap) = b86c3ab571f69d5d96bfe770e76f9ad6111b4116
-SHA1 (patch-aq) = 08d9dc73e49a504dd3c74c87f8fee0bd2e0d3e70
-SHA1 (patch-ar) = 07e3e3d4b74518793aed7388d72a57cc70d2fd59
-SHA1 (patch-as) = 7144acf5b568b4487f790ee61c1d510754aa9827
-SHA1 (patch-at) = 3a9aa67b107126ad247352aa5f34bb02fa9ae6a5
-SHA1 (patch-au) = b11c3982d0ee9bcdd42b5ac320033f5772c1933d
-SHA1 (patch-av) = fac14cc43a451671ee825961c24870426991f4c7
-SHA1 (patch-aw) = 6a793c8735e167dbcab1c33248438a6ac8057717
-SHA1 (patch-ax) = 242d5219ba8b0debe038e186deecc980f9bf9a3f
-SHA1 (patch-ay) = eaaf536efdee990fa6970b1281fed4c6f2621c26
-SHA1 (patch-az) = 67d507f29492b3bc7a11551a1344aff3b8bb56fe
+SHA1 (gcc-2.95.3.tar.gz) = 535d27038d161c0e7c2662702e11a48aa97ef622
+Size (gcc-2.95.3.tar.gz) = 12911721 bytes
+SHA1 (protector-2.95.3-2.tar.gz) = 97ff5cb082cd1cd072035365b342a55e30d638e2
+Size (protector-2.95.3-2.tar.gz) = 17026 bytes
+SHA1 (patch-aa) = 58b0bbe43ec33d869620951adf17f3b3d1d7cae6
+SHA1 (patch-ab) = 6e94571b40a4467a2ec49195eae929578ae385cb
+SHA1 (patch-ac) = 8eb86bb15d80a0c4c1694ac5f5ad9fcb509a23f4
+SHA1 (patch-ad) = 53f6d5b00e54811ae0cba6da0918c7ac33ef47f3
+SHA1 (patch-ae) = 8c258f4645b281e9fb6c463353966d7f99dce293
+SHA1 (patch-af) = 5f1beea05beba940a431b3fedd68c93090497ee2
+SHA1 (patch-ag) = 5a99e0fb14e1102e14eb65142174ab60521897ec
+SHA1 (patch-ah) = e1d0b853cf722e2e4e3ca89e89c598f1dd0a89fc
+SHA1 (patch-ai) = 761942a066722300c6ec6ad24e7720459d059aaf
+SHA1 (patch-aj) = 411dc24f223777549bbcf357e40715b3285f65ec
+SHA1 (patch-ak) = 8fd02ad352f458cf095bf59640241db7fc001d6c
+SHA1 (patch-al) = 521337e7e7cdea057728ce90340554f128efa389
+SHA1 (patch-am) = b4e1ff86321ea0469efb88d8c27e4c81d31f5d31
+SHA1 (patch-an) = 5671a6c3e241e7067dc84cb5ecc35f28c3bf0479
+SHA1 (patch-ao) = d50d4599d43618d826db5ec2bce172bb84d22a04
+SHA1 (patch-ap) = 1afe83fbb457a8bd52af1d7eba8b1e102e14b8bd
+SHA1 (patch-aq) = 3e9dc8f1db71279b3dec60113cda7d606b2cef44
+SHA1 (patch-ar) = 6931f66c7960ccf42f95ecf3eff6f71ab85b9288
+SHA1 (patch-as) = 2d5c8dc13ab3912eef7c176b4270b55de4f90cb2
+SHA1 (patch-at) = 5d1850f722950f8fe5c0c10a837be5b0b219cff0
+SHA1 (patch-au) = 76a58ce7441cfe2cbe34fb4e2df468ab7c73612b
+SHA1 (patch-av) = e29d6c130655960e8cb8813958f54cf79e198f9f
+SHA1 (patch-aw) = 89764d60cab30ccd662225d96c5eed556cd1a828
+SHA1 (patch-ax) = 5b7884595d001e72b29656fd31e67e85a519e9d3
+SHA1 (patch-ay) = 140f0bd4fdb73700df71152a76206807d4371bf0
+SHA1 (patch-az) = 7b21d67e5f2e8fcf6970311ace41d136c5e4570a
+SHA1 (patch-ba) = 26b5d269c13c23b2d0b0021a4824164e291885c3
+SHA1 (patch-bb) = 1b3f0ebc1e05e9e03d6a5727234ee419179904d9
+SHA1 (patch-bc) = 9e6641d255cab3fb96cb16eadc23d18d5d0cc4f2
+SHA1 (patch-bd) = 6f4f008b2477a4470f19baafcad45acb02d4e1a3
+SHA1 (patch-be) = 0d9081117fd2e5bae34a15710d17ab5499d291e6
+SHA1 (patch-bf) = 6f3b5cfe80905d2d10e999fa9fdc1e997eaa84d1
+SHA1 (patch-bg) = 047627fd56f11ce98cefcd707e1e85f605a63d84
+SHA1 (patch-bh) = e68e3079b32e54aeb4fa4cbbd29c35b60b23b470
+SHA1 (patch-bi) = c740a4ca2fe691d81a3572d5671663d10234c8bd
+SHA1 (patch-bj) = 8002b1130cbab87aaeb5e22411f5f3a81b5eccc7
+SHA1 (patch-bk) = f05d7bcf44cf1321a00203d7926d1dcbcc2f715f
+SHA1 (patch-bl) = 5252fa84cf4d149b56935b84e812d1ec6778c0b0
+SHA1 (patch-bm) = 2f809c2a253d7dcf2cecb625a57d869a7408262b
+SHA1 (patch-bn) = 9f7a3f3c2430b1ea4d796661d2bee25a4dc9211e
+SHA1 (patch-bo) = 88f3d4420ed166d36b08d0525bfa32860540e0bf
+SHA1 (patch-bp) = 470b76077a4c1af84418c73408a334fb88aeecfd
+SHA1 (patch-bq) = 586998a819641e3c7f13adb5775ad796061387fd
+SHA1 (patch-br) = 084a7b25a67a9b6790d6cd276c214bbc71b8fed5
+SHA1 (patch-bs) = 642475b0229c8e8304bede44685f2f4b84695da2
+SHA1 (patch-bt) = 936cbebd8bc33ff1aafe32a6b4936e2a11935345
+SHA1 (patch-bu) = 2070a2312874bd372e433b106c2a65dd373c006d
+SHA1 (patch-bv) = 6e730e66a6dbfa5bc5e540957437aff772822379
+SHA1 (patch-bw) = ece2a0010e9424299bfe35ff9d00a6e65e4f619c
+SHA1 (patch-bx) = 6f69f1609ee84f7697b46794bdafda19fc72de5b
+SHA1 (patch-by) = d6bff5f8febc9f1977dbb5b6bd130d080c83e290
+SHA1 (patch-bz) = a86748447b8175c3c6358121c09ea82276cdc9be
+SHA1 (patch-ca) = 82ce840447c02765e3e19934be8a7aad73f1388b
+SHA1 (patch-cb) = a9fb1b8a0e422b85fc400811817367d1b4f2f2ad
+SHA1 (patch-cc) = bcdbc0cadc6d9416d008ca48db61572711cbf368
+SHA1 (patch-cd) = 3f1f3f8381719f555f50badb571d6e440f7e7fe1
+SHA1 (patch-ce) = 405cf1c6c822a37532cc2e4af0e0e076f87751b6
+SHA1 (patch-cf) = 0de67345c249905c5e8c518be645b639106fd354
+SHA1 (patch-cg) = c0b0ce75ce22b63caa49f46fa676afecd9489d1b
+SHA1 (patch-ch) = 76031a61b0dab8cba715e250b82bcb4fd8e4cdac
+SHA1 (patch-ci) = 567509e55a9fdba64e2c62188bd09286a7b004c3
+SHA1 (patch-cj) = c8e7d14703d6546e5989801a6fdffaee5932165d
+SHA1 (patch-ck) = eeada159352f6a957ba8bc10f1e6d074f56aa300
+SHA1 (patch-cl) = 1ebf7761e708ca5327c7b7e0426c1544640712ac
+SHA1 (patch-cm) = 66b86c09726bed590ba80ce4d8d01a5ad71724c8