Fix build problem on Solaris.

The fix was provided by minoura@netbsd.org

2 files changed, 14 insertions, 12 deletions

diff --git a/lang/gcc-ssp/Makefile b/lang/gcc-ssp/Makefile
index f16ab702d43..5e08b52448d 100644
--- a/lang/gcc-ssp/Makefile
+++ b/lang/gcc-ssp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/05/14 14:01:34 yyamano Exp $
+# $NetBSD: Makefile,v 1.13 2002/07/13 10:08:49 kent Exp $
 
 DISTNAME=		gcc-2.95.3
 GCC_VERSION=		2.95.3
@@ -56,8 +56,9 @@ ALL_TARGET=		bootstrap
 .endif
 GCC_PREFIX=		${LOCALBASE}
 PLIST_SRC=		${PKGDIR}/PLIST.SunOS
+PLIST_SUBST+=		GCC_VERSION=${GCC_VERSION}
 MESSAGE=		${PKGDIR}/MESSAGE.SunOS
-#CONFLICTS+=		gcc-[0-9]* pgcc-[0-9]*
+CONFLICTS+=		gcc-[0-9]* pgcc-[0-9]*
 .endif
 
 post-extract:
@@ -72,16 +73,17 @@ post-extract:
 	  ${CP} $${FILE} $${ARCH}/$${DEST}; \
 	done; \
 	cd ${WRKSRC}/../${DISTNAME}; \
-	for i in gcc/config/alpha/netbsd-elf.h gcc/config/arm/t-netbsd gcc/config/mips/x-netbsd libf2c/libF77/dtime_.c libf2c/libF77/etime_.c; do \
+	for i in gcc/config/alpha/netbsd-elf.h gcc/config/arm/t-netbsd \
+		gcc/config/mips/x-netbsd libf2c/libF77/dtime_.c libf2c/libF77/etime_.c; do \
 	  ${RM} $${i};\
 	done
 
 post-patch:
 	${ECHO} "bogus" >${WRKSRC}/../${DISTNAME}/gcc/cstamp-h.in
-	cd ${WRKDIR} && /usr/bin/tar zxf ${_DISTDIR}/${SSP_PATCH}
+	cd ${WRKDIR} && ${GTAR} xzf ${_DISTDIR}/${SSP_PATCH}
 	${CP} ${WRKDIR}/protector.c ${WRKDIR}/protector.h ${WRKDIR}/${DISTNAME}/gcc/
-	${PATCH} -d ${WRKDIR}/${DISTNAME} --forward --quiet -E < ${WRKDIR}/protector.dif
-	${PATCH} -d ${WRKDIR}/${DISTNAME} --forward --quiet -E < ${WRKDIR}/protectonly.dif
+	${PATCH} -p0 -d ${WRKDIR}/${DISTNAME} --forward --quiet -E < ${WRKDIR}/protector.dif
+	${PATCH} -p0 -d ${WRKDIR}/${DISTNAME} --forward --quiet -E < ${WRKDIR}/protectonly.dif
 
 .if (${OPSYS} != SunOS)
 post-build:
diff --git a/lang/gcc-ssp/PLIST.SunOS b/lang/gcc-ssp/PLIST.SunOS
index 52ff73a2a09..3c976712c0d 100644
--- a/lang/gcc-ssp/PLIST.SunOS
+++ b/lang/gcc-ssp/PLIST.SunOS
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.SunOS,v 1.2 2002/03/29 10:47:59 kent Exp $
+@comment $NetBSD: PLIST.SunOS,v 1.3 2002/07/13 10:08:50 kent Exp $
 ${MACHINE_GNU_PLATFORM}/include/_G_config.h
 ${MACHINE_GNU_PLATFORM}/include/assert.h
 bin/${MACHINE_GNU_PLATFORM}-gcc
@@ -14,8 +14,6 @@ bin/gcjh
 bin/gcov
 bin/jcf-dump
 bin/jv-scan
-bin/protoize
-bin/unprotoize
 include/g++-3/PlotFile.h
 include/g++-3/SFile.h
 include/g++-3/algo.h
@@ -97,6 +95,7 @@ include/g++-3/set
 include/g++-3/set.h
 include/g++-3/slist
 include/g++-3/slist.h
+include/g++-3/sstream
 include/g++-3/stack
 include/g++-3/stack.h
 include/g++-3/std/bastring.cc
@@ -222,14 +221,13 @@ info/gcc.info-6
 info/gcc.info-7
 info/gcc.info-8
 info/gcc.info-9
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/SYSCALLS.c.X
 lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/cc1
 lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/cc1chill
 lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/cc1obj
 lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/cc1plus
 lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/chillrt0.o
 lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/collect2
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/cpp
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/cpp0
 lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/crt1.o
 lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/crtbegin.o
 lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/crtend.o
@@ -293,9 +291,11 @@ lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/libg2c.a
 lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/libgcc.a
 lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/libobjc.a
 lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/libstdc++.a
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/libstdc++.so
 lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/specs
 lib/libiberty.a
-lib/libstdc++.a.2.10.0
+lib/libstdc++.a.2.10.0nb1
+lib/libstdc++.so.2.10.0nb1
 man/man1/cccp.1
 man/man1/g++.1
 man/man1/g77.1