Fix and enable for Solaris platform.

2 files changed, 15 insertions, 8 deletions

diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index c1dd92298c2..8591552b6a9 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2002/01/03 21:39:54 tron Exp $
+# $NetBSD: Makefile,v 1.33 2002/01/09 16:33:32 seb Exp $
 
 # Make sure that the version number in "Makefile.gcc" matches this.
 DISTNAME=		gcc-2.95.3
@@ -13,7 +13,7 @@ BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
 
 # The platforms listed below are the only tested platforms so far.
 # If you get gcc working on other platforms, then please add them.
-ONLY_FOR_PLATFORM=	NetBSD-*-i386
+ONLY_FOR_PLATFORM=	NetBSD-*-i386 SunOS-*-*
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -33,6 +33,7 @@ INFO_FILES=		chill.info cpp.info g77.info gcc.info
 
 MESSAGE_SUBST+=		MAKE=${MAKE}
 PLIST_SUBST+=		MACHINE_GCC_PLATFORM=${MACHINE_GCC_PLATFORM}
+PLIST_SUBST+=		GCC_VERSION=${PKGVERSION}
 SRCDIR=			${WRKDIR}/${DISTNAME}
 WRKSRC=			${WRKDIR}/objdir
 
@@ -87,6 +88,12 @@ post-install:
 	${LN} -s gcc ${PREFIX}/${PKGNAME}/bin/cc
 	${RM} -f ${GCC_PREFIX}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/curses.h
 	${INSTALL_DATA} ${WRKDIR}/gcc.mk ${PREFIX}/etc/${PKGNAME}.mk
+.else
+# remove empy file and directory that show up when one
+# does make install; make deinstall; make install
+post-install:
+	${RM} -f ${GCC_PREFIX}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/fixed
+	-${RMDIR} ${GCC_PREFIX}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/v7
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/gcc/PLIST.SunOS b/lang/gcc/PLIST.SunOS
index c15137c6533..4e21a896aa9 100644
--- a/lang/gcc/PLIST.SunOS
+++ b/lang/gcc/PLIST.SunOS
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.SunOS,v 1.1 2001/11/01 00:32:24 zuntum Exp $
+@comment $NetBSD: PLIST.SunOS,v 1.2 2002/01/09 16:33:33 seb Exp $
 ${MACHINE_GCC_PLATFORM}/include/_G_config.h
 ${MACHINE_GCC_PLATFORM}/include/assert.h
 bin/${MACHINE_GCC_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_GCC_PLATFORM}/${GCC_VERSION}/SYSCALLS.c.X
 lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/cc1
 lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/cc1chill
 lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/cc1obj
 lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/cc1plus
 lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/chillrt0.o
 lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/collect2
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/cpp
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/cpp0
 lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/crt1.o
 lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/crtbegin.o
 lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/crtend.o
@@ -293,9 +291,11 @@ lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/libg2c.a
 lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/libgcc.a
 lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/libobjc.a
 lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/libstdc++.a
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/libstdc++.so
 lib/gcc-lib/${MACHINE_GCC_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