Make this package looking more like the other gcc packages.

Most user visible change is: this version of gcc is now installed
in its own directory hierachy.

Else and among other things:
- remove build dependency on bison.
- install info files.
- remove per OPSYS PLISTs.
- example mk file style changed to match with other gcc packages.
- ...

Bump PKGREVISION.

6 files changed, 92 insertions, 623 deletions

diff --git a/lang/gcc-ssp/MESSAGE b/lang/gcc-ssp/MESSAGE
index b87c753ffa0..bb6b91a8cab 100644
--- a/lang/gcc-ssp/MESSAGE
+++ b/lang/gcc-ssp/MESSAGE
@@ -1,9 +1,9 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2002/09/24 12:30:07 wiz Exp $
+$NetBSD: MESSAGE,v 1.3 2003/08/09 12:43:01 seb Exp $
 
-To use ${PKGNAME} invoke "${MAKE}" like this:
-
-${MAKE} MAKECONF=${PREFIX}/etc/${PKGBASENAME}.mk [...]
+To use ${PKGNAME} include
+"${PREFIX}/share/examples/${PKGNAME_NOREV}/mk.conf"
+in your BSD style makefile.
 
 This compiler can not compile the NetBSD kernel easily at this moment.
 ===========================================================================
diff --git a/lang/gcc-ssp/MESSAGE.SunOS b/lang/gcc-ssp/MESSAGE.SunOS
deleted file mode 100644
index 2738012ca9a..00000000000
--- a/lang/gcc-ssp/MESSAGE.SunOS
+++ /dev/null
@@ -1,7 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.SunOS,v 1.2 2002/09/24 12:30:07 wiz Exp $
-
-To avoid conflicts with e.g. Sun WorkShop the GNU C compiler can only be
-invoked as "gcc" but not as "cc".
-
-===========================================================================
diff --git a/lang/gcc-ssp/Makefile b/lang/gcc-ssp/Makefile
index 108ca51ebbb..cbbfeddbd44 100644
--- a/lang/gcc-ssp/Makefile
+++ b/lang/gcc-ssp/Makefile
@@ -1,12 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2003/07/17 21:44:25 grant Exp $
+# $NetBSD: Makefile,v 1.28 2003/08/09 12:43:01 seb Exp $
 
 DISTNAME=		gcc-2.95.3
-GCC_VERSION=		2.95.3
 PKGNAME=		gcc-ssp-2.95.3.13
-PKGVERSION=		${GCC_VERSION}
-PKGREVISION=
-PKGBASENAME=		gcc-ssp
-WRKSRC=			${WRKDIR}/objdir
+PKGREVISION=		1
 CATEGORIES=		lang security
 MASTER_SITES=		${MASTER_SITE_GNU:=gcc/}
 
@@ -20,8 +16,9 @@ PATCHFILES=		gcc-2.95.3-diff-2002-08-29.gz
 SSP_PATCH=		protector-2.95.3-13.tar.gz
 DISTFILES+=		${DISTNAME}.tar.gz ${SSP_PATCH}
 SITES_protector-2.95.3-13.tar.gz=	http://www.trl.ibm.com/projects/security/ssp/gcc2_95_3/
-PATCHDIR=		../gcc/patches
-GCC_FILESDIR=		${FILESDIR}/../../gcc/files
+
+PATCHDIR=		${.CURDIR}/../gcc/patches
+GCC_FILESDIR=		${.CURDIR}/../gcc/files
 
 #ONLY_FOR_PLATFORM=	NetBSD-*-i386 NetBSD-*-sparc
 #
@@ -31,70 +28,79 @@ GCC_FILESDIR=		${FILESDIR}/../../gcc/files
 #			NetBSD-*-prep NetBSD-*-bebox NetBSD-*-ofppc \
 #			NetBSD-*-amigappc NetBSD-*-sandpoint
 
-BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
-
+USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
 USE_GMAKE=		YES
+
 HAS_CONFIGURE=		YES
-CONFIGURE_ARGS=		--host=${MACHINE_GNU_PLATFORM} \
-			--prefix=${GCC_PREFIX} \
-			--enable-shared
-CONFIGURE_SCRIPT=	${SRCDIR}/configure
-INFO_FILES=		# Not instal info files.
+CONFIGURE_SCRIPT=	${WRKSRC}/configure
+CONFIGURE_ARGS=		--host=${MACHINE_GNU_PLATFORM}
+CONFIGURE_ARGS+=	--prefix=${GCC_PREFIX}
+CONFIGURE_ARGS+=	--enable-shared
+
+CONFIGURE_DIRS=		${WRKDIR}/objdir
+BUILD_DIRS=		${CONFIGURE_DIRS}
+
+FILES_SUBST+=		PKGNAME_NOREV=${PKGNAME_NOREV} GCC_PREFIX=${GCC_PREFIX}
+MESSAGE_SUBST+=		PKGNAME_NOREV=${PKGNAME_NOREV}
 
-MESSAGE_SUBST+=		MAKE=${MAKE} \
-			PKGBASENAME=${PKGBASENAME}
-PLIST_SUBST+=		PKGBASENAME=${PKGBASENAME}
-SRCDIR=			${WRKDIR}/${DISTNAME}
+INFO_DIR=		${GCC_PREFIX:S|^${PREFIX}/||}/info
+INFO_FILES=		chill.info cpp.info g77.info gcc.info
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} != "SunOS"
-CONFIGURE_ARGS+=	--with-gnu-as --with-gnu-ld
-GCC_PREFIX=		${LOCALBASE}/${PKGBASENAME}
+.if ${OPSYS} == "SunOS"
+.  if ${CC:M*gcc*} == ""
+ALL_TARGET=		bootstrap
+.  endif
+# we know it's a GNU toolchain on Linux and the BSDs.
+.elif ${OPSYS:M*BSD} != "" || ${OPSYS} == "Linux"
+CONFIGURE_ARGS+=	--with-gnu-as
+CONFIGURE_ARGS+=	--with-gnu-ld
 .else
+# play it safe, force a bootstrap build if we don't know for sure it
+# is gcc.
 .  if ${CC:M*gcc*} == ""
 ALL_TARGET=		bootstrap
 .  endif
-GCC_PREFIX=		${LOCALBASE}
-PLIST_SRC=		${PKGDIR}/PLIST.SunOS
-PLIST_SUBST+=		GCC_VERSION=${GCC_VERSION}
-CONFLICTS+=		gcc-[0-9]* pgcc-[0-9]*
 .endif
 
+GCC_PREFIX=	${PREFIX}/${PKGNAME_NOREV}
+GCC_VERSION=	${DISTNAME:C/^.*-//}
+GCC_ARCHDIR=	${GCC_PREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}
+PLIST_SRC=	${WRKDIR}/PLIST_DYNAMIC
+
 post-extract:
 	${MKDIR} ${WRKSRC}
-	cd ${WRKSRC}/../${DISTNAME}/gcc/config; \
-	${CP} ${GCC_FILESDIR}/xm-netbsd.h .; \
-	${CP} ${GCC_FILESDIR}/xm-target64.h .; \
-	for FILE in ${GCC_FILESDIR}/*_* ; do \
-	  ARCH=`basename $${FILE} | ${CUT} -d_ -f1`; \
-	  DEST=`basename $${FILE} | ${SED} -e "s/$${ARCH}_//"`; \
-	  ${MKDIR} $${ARCH}; \
-	  ${CP} $${FILE} $${ARCH}/$${DEST}; \
+	${CP} ${GCC_FILESDIR}/xm-netbsd.h ${WRKSRC}/gcc/config
+	${CP} ${GCC_FILESDIR}/xm-target64.h ${WRKSRC}/gcc/config
+	for file in ${GCC_FILESDIR}/*_* ; do \
+		arch=`${BASENAME} $${file} | ${SED} -e "s/_.*//"`;	\
+		dest=`${BASENAME} $${file} | ${SED} -e "s/$${arch}_//"`; \
+		${MKDIR} ${WRKSRC}/gcc/config/$${arch};			\
+		${CP} $${file} ${WRKSRC}/gcc/config/$${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 \
-	  ${RM} $${i};\
-	done
+	${RM} ${WRKSRC}/gcc/config/alpha/netbsd-elf.h
+	${RM} ${WRKSRC}/gcc/config/arm/t-netbsd
+	${RM} ${WRKSRC}/gcc/config/mips/x-netbsd
+	${RM} ${WRKSRC}/libf2c/libF77/dtime_.c
+	${RM} ${WRKSRC}/libf2c/libF77/etime_.c
 
 post-patch:
-	${ECHO} "bogus" >${WRKSRC}/../${DISTNAME}/gcc/cstamp-h.in
 	cd ${WRKDIR} && ${PAX} -O -zrf ${_DISTDIR}/${SSP_PATCH}
-	${CP} ${WRKDIR}/protector.c ${WRKDIR}/protector.h ${WRKDIR}/${DISTNAME}/gcc/
-	${PATCH} -p0 -d ${WRKDIR}/${DISTNAME} --forward --quiet -E < ${WRKDIR}/protector.dif
-	${PATCH} -p0 -d ${WRKDIR}/${DISTNAME} --forward --quiet -E < ${WRKDIR}/protectonly.dif
+	${CP} ${WRKDIR}/protector.c ${WRKDIR}/protector.h ${WRKSRC}/gcc/
+	${PATCH} -p0 -d ${WRKSRC} --forward --quiet -E < ${WRKDIR}/protector.dif
+	${PATCH} -p0 -d ${WRKSRC} --forward --quiet -E < ${WRKDIR}/protectonly.dif
+
+pre-configure:
+	${MKDIR} ${BUILD_DIRS}
+	cd ${WRKSRC} && contrib/egcs_update --touch
 
-.if ${OPSYS} != "SunOS"
 post-build:
-	for FILE in ${FILESDIR}/gcc.mk; do \
-	  ${SED} -e 's#@@MAKE@@#${MAKE}#g' \
-		 -e 's#@@PKGBASENAME@@#${PKGBASENAME}#g' \
-		 -e 's#@@PREFIX@@#${PREFIX}#g' \
-	   <$$FILE >${WRKDIR}/`basename $$FILE`; \
-	done
+	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/gcc.mk > ${WRKDIR}/gcc.mk
+.if ${OPSYS} != "SunOS"
 	@${ECHO} "===> Check whether stack protection works or not"
-	${WRKSRC}/gcc/xgcc -B${WRKSRC}/gcc/ -O2 -o ${WRKDIR}/buffer ${FILESDIR}/buffer.c
+	${BUILD_DIRS}/gcc/xgcc -B${BUILD_DIRS}/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 \
 	    ${ECHO} "===> Stack protection succeeded."; \
@@ -105,24 +111,31 @@ post-build:
 	fi
 .endif
 
-pre-install:
-#	${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${INSTALL_FILE} any PRE-INSTALL
-#	This is not needed because of no info.
-
-.if ${OPSYS} != "SunOS"
-post-install:
-	${RM} -f ${GCC_PREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/curses.h ${PREFIX}/${PKGBASENAME}/bin/cc
-	${LN} -s gcc ${PREFIX}/${PKGBASENAME}/bin/cc
-	${INSTALL_DATA} ${WRKDIR}/gcc.mk ${PREFIX}/etc/${PKGBASENAME}.mk
-	${RM} -fr ${GCC_PREFIX}/info
+.if ${OPSYS} == "SunOS" 
+# 
+# remove empty file and directories that show up when one does: 
+#       make install; make deinstall; make install
+# 
+post-install: 
+	-cd ${GCC_ARCHDIR}/include && ${RM} -f fixed && ${RMDIR} v7 v9
 .else
-# remove empy file and directories that show up when one
-# does make install; make deinstall; make install
 post-install:
-	-cd ${GCC_PREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include && \
-	${RM} -f fixed && \
-	${RMDIR} v7 v9
+.  if exists(/usr/include/g++/FlexLexer.h)
+	${LN} -fs /usr/include/g++/FlexLexer.h				\
+		${GCC_PREFIX}/include/g++-3/FlexLexer.h
+.  endif
+	 ${RM} -f ${GCC_ARCHDIR}/include/curses.h ${GCC_PREFIX}/bin/cc
 .endif
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/${PKGNAME_NOREV}
+	${INSTALL_DATA} ${WRKDIR}/gcc.mk ${PREFIX}/share/examples/${PKGNAME_NOREV}/mk.conf
+	${LN} -s gcc ${GCC_PREFIX}/bin/cc
+	${CP} -f ${PKGDIR}/PLIST ${PLIST_SRC}
+	${FIND} ${GCC_PREFIX} \( -type f -o -type l \) -print		\
+		| ${SORT} | ${SED} -e "s,${PREFIX}/,,g"			\
+		>> ${PLIST_SRC}
+	${FIND} ${GCC_PREFIX} -type d -print				\
+		| ${SORT} -r | ${SED} -e "s,${PREFIX}/,@dirrm ,g"	\
+		>> ${PLIST_SRC}
 
 .include "../../mk/bsd.pkg.mk"
 
diff --git a/lang/gcc-ssp/PLIST b/lang/gcc-ssp/PLIST
index f636a5bdf6a..bdfed7871f6 100644
--- a/lang/gcc-ssp/PLIST
+++ b/lang/gcc-ssp/PLIST
@@ -1,226 +1,3 @@
-@comment $NetBSD: PLIST,v 1.5 2002/10/06 13:38:56 dmcmahill Exp $
-etc/gcc-ssp.mk
-${PKGBASENAME}/bin/c++
-${PKGBASENAME}/bin/c++filt
-${PKGBASENAME}/bin/cc
-${PKGBASENAME}/bin/chill
-${PKGBASENAME}/bin/cpp
-${PKGBASENAME}/bin/g++
-${PKGBASENAME}/bin/g77
-${PKGBASENAME}/bin/gcc
-${PKGBASENAME}/bin/gcj
-${PKGBASENAME}/bin/gcjh
-${PKGBASENAME}/bin/gcov
-${PKGBASENAME}/bin/${MACHINE_GNU_PLATFORM}-gcc
-${PKGBASENAME}/bin/jcf-dump
-${PKGBASENAME}/bin/jv-scan
-${PKGBASENAME}/${MACHINE_GNU_PLATFORM}/include/_G_config.h
-${PKGBASENAME}/include/g++-3/PlotFile.h
-${PKGBASENAME}/include/g++-3/SFile.h
-${PKGBASENAME}/include/g++-3/algo.h
-${PKGBASENAME}/include/g++-3/algobase.h
-${PKGBASENAME}/include/g++-3/algorithm
-${PKGBASENAME}/include/g++-3/alloc.h
-${PKGBASENAME}/include/g++-3/bitset
-${PKGBASENAME}/include/g++-3/builtinbuf.h
-${PKGBASENAME}/include/g++-3/bvector.h
-${PKGBASENAME}/include/g++-3/cassert
-${PKGBASENAME}/include/g++-3/cctype
-${PKGBASENAME}/include/g++-3/cerrno
-${PKGBASENAME}/include/g++-3/cfloat
-${PKGBASENAME}/include/g++-3/ciso646
-${PKGBASENAME}/include/g++-3/climits
-${PKGBASENAME}/include/g++-3/clocale
-${PKGBASENAME}/include/g++-3/cmath
-${PKGBASENAME}/include/g++-3/complex
-${PKGBASENAME}/include/g++-3/complex.h
-${PKGBASENAME}/include/g++-3/csetjmp
-${PKGBASENAME}/include/g++-3/csignal
-${PKGBASENAME}/include/g++-3/cstdarg
-${PKGBASENAME}/include/g++-3/cstddef
-${PKGBASENAME}/include/g++-3/cstdio
-${PKGBASENAME}/include/g++-3/cstdlib
-${PKGBASENAME}/include/g++-3/cstring
-${PKGBASENAME}/include/g++-3/ctime
-${PKGBASENAME}/include/g++-3/cwchar
-${PKGBASENAME}/include/g++-3/cwctype
-${PKGBASENAME}/include/g++-3/defalloc.h
-${PKGBASENAME}/include/g++-3/deque
-${PKGBASENAME}/include/g++-3/deque.h
-${PKGBASENAME}/include/g++-3/editbuf.h
-${PKGBASENAME}/include/g++-3/floatio.h
-${PKGBASENAME}/include/g++-3/fstream
-${PKGBASENAME}/include/g++-3/fstream.h
-${PKGBASENAME}/include/g++-3/function.h
-${PKGBASENAME}/include/g++-3/functional
-${PKGBASENAME}/include/g++-3/hash_map
-${PKGBASENAME}/include/g++-3/hash_map.h
-${PKGBASENAME}/include/g++-3/hash_set
-${PKGBASENAME}/include/g++-3/hash_set.h
-${PKGBASENAME}/include/g++-3/hashtable.h
-${PKGBASENAME}/include/g++-3/heap.h
-${PKGBASENAME}/include/g++-3/indstream.h
-${PKGBASENAME}/include/g++-3/iolibio.h
-${PKGBASENAME}/include/g++-3/iomanip
-${PKGBASENAME}/include/g++-3/iomanip.h
-${PKGBASENAME}/include/g++-3/iosfwd
-${PKGBASENAME}/include/g++-3/iostdio.h
-${PKGBASENAME}/include/g++-3/iostream
-${PKGBASENAME}/include/g++-3/iostream.h
-${PKGBASENAME}/include/g++-3/iostreamP.h
-${PKGBASENAME}/include/g++-3/istream.h
-${PKGBASENAME}/include/g++-3/iterator
-${PKGBASENAME}/include/g++-3/iterator.h
-${PKGBASENAME}/include/g++-3/libio.h
-${PKGBASENAME}/include/g++-3/libioP.h
-${PKGBASENAME}/include/g++-3/list
-${PKGBASENAME}/include/g++-3/list.h
-${PKGBASENAME}/include/g++-3/map
-${PKGBASENAME}/include/g++-3/map.h
-${PKGBASENAME}/include/g++-3/memory
-${PKGBASENAME}/include/g++-3/multimap.h
-${PKGBASENAME}/include/g++-3/multiset.h
-${PKGBASENAME}/include/g++-3/numeric
-${PKGBASENAME}/include/g++-3/ostream.h
-${PKGBASENAME}/include/g++-3/pair.h
-${PKGBASENAME}/include/g++-3/parsestream.h
-${PKGBASENAME}/include/g++-3/pfstream.h
-${PKGBASENAME}/include/g++-3/procbuf.h
-${PKGBASENAME}/include/g++-3/pthread_alloc
-${PKGBASENAME}/include/g++-3/pthread_alloc.h
-${PKGBASENAME}/include/g++-3/queue
-${PKGBASENAME}/include/g++-3/rope
-${PKGBASENAME}/include/g++-3/rope.h
-${PKGBASENAME}/include/g++-3/ropeimpl.h
-${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
-${PKGBASENAME}/include/g++-3/std/bastring.h
-${PKGBASENAME}/include/g++-3/std/complext.cc
-${PKGBASENAME}/include/g++-3/std/complext.h
-${PKGBASENAME}/include/g++-3/std/dcomplex.h
-${PKGBASENAME}/include/g++-3/std/fcomplex.h
-${PKGBASENAME}/include/g++-3/std/gslice.h
-${PKGBASENAME}/include/g++-3/std/gslice_array.h
-${PKGBASENAME}/include/g++-3/std/indirect_array.h
-${PKGBASENAME}/include/g++-3/std/ldcomplex.h
-${PKGBASENAME}/include/g++-3/std/mask_array.h
-${PKGBASENAME}/include/g++-3/std/slice.h
-${PKGBASENAME}/include/g++-3/std/slice_array.h
-${PKGBASENAME}/include/g++-3/std/std_valarray.h
-${PKGBASENAME}/include/g++-3/std/straits.h
-${PKGBASENAME}/include/g++-3/std/valarray_array.h
-${PKGBASENAME}/include/g++-3/std/valarray_array.tcc
-${PKGBASENAME}/include/g++-3/std/valarray_meta.h
-${PKGBASENAME}/include/g++-3/stdexcept
-${PKGBASENAME}/include/g++-3/stdiostream.h
-${PKGBASENAME}/include/g++-3/stl.h
-${PKGBASENAME}/include/g++-3/stl_algo.h
-${PKGBASENAME}/include/g++-3/stl_algobase.h
-${PKGBASENAME}/include/g++-3/stl_alloc.h
-${PKGBASENAME}/include/g++-3/stl_bvector.h
-${PKGBASENAME}/include/g++-3/stl_config.h
-${PKGBASENAME}/include/g++-3/stl_construct.h
-${PKGBASENAME}/include/g++-3/stl_deque.h
-${PKGBASENAME}/include/g++-3/stl_function.h
-${PKGBASENAME}/include/g++-3/stl_hash_fun.h
-${PKGBASENAME}/include/g++-3/stl_hash_map.h
-${PKGBASENAME}/include/g++-3/stl_hash_set.h
-${PKGBASENAME}/include/g++-3/stl_hashtable.h
-${PKGBASENAME}/include/g++-3/stl_heap.h
-${PKGBASENAME}/include/g++-3/stl_iterator.h
-${PKGBASENAME}/include/g++-3/stl_list.h
-${PKGBASENAME}/include/g++-3/stl_map.h
-${PKGBASENAME}/include/g++-3/stl_multimap.h
-${PKGBASENAME}/include/g++-3/stl_multiset.h
-${PKGBASENAME}/include/g++-3/stl_numeric.h
-${PKGBASENAME}/include/g++-3/stl_pair.h
-${PKGBASENAME}/include/g++-3/stl_queue.h
-${PKGBASENAME}/include/g++-3/stl_raw_storage_iter.h
-${PKGBASENAME}/include/g++-3/stl_relops.h
-${PKGBASENAME}/include/g++-3/stl_rope.h
-${PKGBASENAME}/include/g++-3/stl_set.h
-${PKGBASENAME}/include/g++-3/stl_slist.h
-${PKGBASENAME}/include/g++-3/stl_stack.h
-${PKGBASENAME}/include/g++-3/stl_tempbuf.h
-${PKGBASENAME}/include/g++-3/stl_tree.h
-${PKGBASENAME}/include/g++-3/stl_uninitialized.h
-${PKGBASENAME}/include/g++-3/stl_vector.h
-${PKGBASENAME}/include/g++-3/stream.h
-${PKGBASENAME}/include/g++-3/streambuf.h
-${PKGBASENAME}/include/g++-3/strfile.h
-${PKGBASENAME}/include/g++-3/string
-${PKGBASENAME}/include/g++-3/strstream
-${PKGBASENAME}/include/g++-3/strstream.h
-${PKGBASENAME}/include/g++-3/tempbuf.h
-${PKGBASENAME}/include/g++-3/tree.h
-${PKGBASENAME}/include/g++-3/type_traits.h
-${PKGBASENAME}/include/g++-3/utility
-${PKGBASENAME}/include/g++-3/valarray
-${PKGBASENAME}/include/g++-3/vector
-${PKGBASENAME}/include/g++-3/vector.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/cc1
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/cc1chill
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/cc1obj
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/cc1plus
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/chillrt0.o
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/collect2
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/cpp0
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/f771
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/README
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/exception
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/float.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/g2c.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/limits.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/math.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/new
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/new.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/objc/NXConstStr.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/objc/Object.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/objc/Protocol.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/objc/encoding.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/objc/hash.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/objc/objc-api.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/objc/objc-list.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/objc/objc.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/objc/sarray.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/objc/thr.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/objc/typedstream.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/syslimits.h
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/typeinfo
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/jc1
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/jvgenmain
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/libchill.a
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/libg2c.a
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/libgcc.a
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/libobjc.a
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/libstdc++.a
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/libstdc++.so
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/specs
-${PKGBASENAME}/lib/libiberty.a
-${PKGBASENAME}/lib/libstdc++.a.4.0
-${PKGBASENAME}/lib/libstdc++.so.4.0
-${PKGBASENAME}/man/man1/cccp.1
-${PKGBASENAME}/man/man1/g++.1
-${PKGBASENAME}/man/man1/g77.1
-${PKGBASENAME}/man/man1/gcc.1
-@dirrm ${PKGBASENAME}/man/man1
-@dirrm ${PKGBASENAME}/man
-@dirrm ${PKGBASENAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/objc
-@dirrm ${PKGBASENAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include
-@dirrm ${PKGBASENAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}
-@dirrm ${PKGBASENAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}
-@dirrm ${PKGBASENAME}/lib/gcc-lib
-@dirrm ${PKGBASENAME}/lib
-@dirrm ${PKGBASENAME}/include/g++-3/std
-@dirrm ${PKGBASENAME}/include/g++-3
-@dirrm ${PKGBASENAME}/include
-@dirrm ${PKGBASENAME}/${MACHINE_GNU_PLATFORM}/include
-@dirrm ${PKGBASENAME}/${MACHINE_GNU_PLATFORM}
-@dirrm ${PKGBASENAME}/bin
-@dirrm ${PKGBASENAME}
+@comment $NetBSD: PLIST,v 1.6 2003/08/09 12:43:02 seb Exp $
+share/examples/${PKGNAME}/mk.conf
+@dirrm share/examples/${PKGNAME}
diff --git a/lang/gcc-ssp/PLIST.SunOS b/lang/gcc-ssp/PLIST.SunOS
deleted file mode 100644
index efdf46ddd86..00000000000
--- a/lang/gcc-ssp/PLIST.SunOS
+++ /dev/null
@@ -1,312 +0,0 @@
-@comment $NetBSD: PLIST.SunOS,v 1.4 2002/10/06 13:38:56 dmcmahill Exp $
-${MACHINE_GNU_PLATFORM}/include/_G_config.h
-${MACHINE_GNU_PLATFORM}/include/assert.h
-bin/${MACHINE_GNU_PLATFORM}-gcc
-bin/c++
-bin/c++filt
-bin/chill
-bin/cpp
-bin/g++
-bin/g77
-bin/gcc
-bin/gcj
-bin/gcjh
-bin/gcov
-bin/jcf-dump
-bin/jv-scan
-include/g++-3/PlotFile.h
-include/g++-3/SFile.h
-include/g++-3/algo.h
-include/g++-3/algobase.h
-include/g++-3/algorithm
-include/g++-3/alloc.h
-include/g++-3/bitset
-include/g++-3/builtinbuf.h
-include/g++-3/bvector.h
-include/g++-3/cassert
-include/g++-3/cctype
-include/g++-3/cerrno
-include/g++-3/cfloat
-include/g++-3/ciso646
-include/g++-3/climits
-include/g++-3/clocale
-include/g++-3/cmath
-include/g++-3/complex
-include/g++-3/complex.h
-include/g++-3/csetjmp
-include/g++-3/csignal
-include/g++-3/cstdarg
-include/g++-3/cstddef
-include/g++-3/cstdio
-include/g++-3/cstdlib
-include/g++-3/cstring
-include/g++-3/ctime
-include/g++-3/cwchar
-include/g++-3/cwctype
-include/g++-3/defalloc.h
-include/g++-3/deque
-include/g++-3/deque.h
-include/g++-3/editbuf.h
-include/g++-3/floatio.h
-include/g++-3/fstream
-include/g++-3/fstream.h
-include/g++-3/function.h
-include/g++-3/functional
-include/g++-3/hash_map
-include/g++-3/hash_map.h
-include/g++-3/hash_set
-include/g++-3/hash_set.h
-include/g++-3/hashtable.h
-include/g++-3/heap.h
-include/g++-3/indstream.h
-include/g++-3/iolibio.h
-include/g++-3/iomanip
-include/g++-3/iomanip.h
-include/g++-3/iosfwd
-include/g++-3/iostdio.h
-include/g++-3/iostream
-include/g++-3/iostream.h
-include/g++-3/iostreamP.h
-include/g++-3/istream.h
-include/g++-3/iterator
-include/g++-3/iterator.h
-include/g++-3/libio.h
-include/g++-3/libioP.h
-include/g++-3/list
-include/g++-3/list.h
-include/g++-3/map
-include/g++-3/map.h
-include/g++-3/memory
-include/g++-3/multimap.h
-include/g++-3/multiset.h
-include/g++-3/numeric
-include/g++-3/ostream.h
-include/g++-3/pair.h
-include/g++-3/parsestream.h
-include/g++-3/pfstream.h
-include/g++-3/procbuf.h
-include/g++-3/pthread_alloc
-include/g++-3/pthread_alloc.h
-include/g++-3/queue
-include/g++-3/rope
-include/g++-3/rope.h
-include/g++-3/ropeimpl.h
-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
-include/g++-3/std/bastring.h
-include/g++-3/std/complext.cc
-include/g++-3/std/complext.h
-include/g++-3/std/dcomplex.h
-include/g++-3/std/fcomplex.h
-include/g++-3/std/gslice.h
-include/g++-3/std/gslice_array.h
-include/g++-3/std/indirect_array.h
-include/g++-3/std/ldcomplex.h
-include/g++-3/std/mask_array.h
-include/g++-3/std/slice.h
-include/g++-3/std/slice_array.h
-include/g++-3/std/std_valarray.h
-include/g++-3/std/straits.h
-include/g++-3/std/valarray_array.h
-include/g++-3/std/valarray_array.tcc
-include/g++-3/std/valarray_meta.h
-include/g++-3/stdexcept
-include/g++-3/stdiostream.h
-include/g++-3/stl.h
-include/g++-3/stl_algo.h
-include/g++-3/stl_algobase.h
-include/g++-3/stl_alloc.h
-include/g++-3/stl_bvector.h
-include/g++-3/stl_config.h
-include/g++-3/stl_construct.h
-include/g++-3/stl_deque.h
-include/g++-3/stl_function.h
-include/g++-3/stl_hash_fun.h
-include/g++-3/stl_hash_map.h
-include/g++-3/stl_hash_set.h
-include/g++-3/stl_hashtable.h
-include/g++-3/stl_heap.h
-include/g++-3/stl_iterator.h
-include/g++-3/stl_list.h
-include/g++-3/stl_map.h
-include/g++-3/stl_multimap.h
-include/g++-3/stl_multiset.h
-include/g++-3/stl_numeric.h
-include/g++-3/stl_pair.h
-include/g++-3/stl_queue.h
-include/g++-3/stl_raw_storage_iter.h
-include/g++-3/stl_relops.h
-include/g++-3/stl_rope.h
-include/g++-3/stl_set.h
-include/g++-3/stl_slist.h
-include/g++-3/stl_stack.h
-include/g++-3/stl_tempbuf.h
-include/g++-3/stl_tree.h
-include/g++-3/stl_uninitialized.h
-include/g++-3/stl_vector.h
-include/g++-3/stream.h
-include/g++-3/streambuf.h
-include/g++-3/strfile.h
-include/g++-3/string
-include/g++-3/strstream
-include/g++-3/strstream.h
-include/g++-3/tempbuf.h
-include/g++-3/tree.h
-include/g++-3/type_traits.h
-include/g++-3/utility
-include/g++-3/valarray
-include/g++-3/vector
-include/g++-3/vector.h
-info/chill.info
-info/cpp.info
-info/cpp.info-1
-info/cpp.info-2
-info/cpp.info-3
-info/g77.info
-info/g77.info-1
-info/g77.info-10
-info/g77.info-11
-info/g77.info-12
-info/g77.info-13
-info/g77.info-14
-info/g77.info-15
-info/g77.info-16
-info/g77.info-17
-info/g77.info-18
-info/g77.info-19
-info/g77.info-2
-info/g77.info-20
-info/g77.info-21
-info/g77.info-3
-info/g77.info-4
-info/g77.info-5
-info/g77.info-6
-info/g77.info-7
-info/g77.info-8
-info/g77.info-9
-info/gcc.info
-info/gcc.info-1
-info/gcc.info-10
-info/gcc.info-11
-info/gcc.info-12
-info/gcc.info-13
-info/gcc.info-14
-info/gcc.info-15
-info/gcc.info-16
-info/gcc.info-17
-info/gcc.info-18
-info/gcc.info-19
-info/gcc.info-2
-info/gcc.info-20
-info/gcc.info-21
-info/gcc.info-22
-info/gcc.info-23
-info/gcc.info-24
-info/gcc.info-25
-info/gcc.info-26
-info/gcc.info-27
-info/gcc.info-28
-info/gcc.info-29
-info/gcc.info-3
-info/gcc.info-30
-info/gcc.info-4
-info/gcc.info-5
-info/gcc.info-6
-info/gcc.info-7
-info/gcc.info-8
-info/gcc.info-9
-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}/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
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/crti.o
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/crtn.o
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/f771
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/gcrt1.o
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/gmon.o
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/README
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/assert.h
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/curses.h
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/exception
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/g2c.h
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/iso646.h
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/limits.h
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/math.h
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/new
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/new.h
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/objc/NXConstStr.h
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/objc/Object.h
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/objc/Protocol.h
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/objc/encoding.h
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/objc/hash.h
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/objc/objc-api.h
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/objc/objc-list.h
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/objc/objc.h
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/objc/sarray.h
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/objc/thr.h
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/objc/typedstream.h
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/proto.h
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/stdarg.h
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/stdbool.h
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/stddef.h
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/sys/stream.h
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/syslimits.h
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/typeinfo
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-alpha.h
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-arc.h
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-c4x.h
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-clipper.h
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-h8300.h
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-i860.h
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-i960.h
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-m32r.h
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-m88k.h
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-mips.h
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-mn10200.h
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-mn10300.h
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-pa.h
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-ppc.h
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-pyr.h
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-sh.h
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-sparc.h
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-spur.h
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-v850.h
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/varargs.h
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/jc1
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/jvgenmain
-lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/libchill.a
-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.4.0
-lib/libstdc++.so.4.0
-man/man1/cccp.1
-man/man1/g++.1
-man/man1/g77.1
-man/man1/gcc.1
-@dirrm lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/sys
-@dirrm lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/objc
-@dirrm lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include
-@dirrm lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}
-@dirrm lib/gcc-lib/${MACHINE_GNU_PLATFORM}
-@dirrm lib/gcc-lib
-@dirrm include/g++-3/std
-@dirrm include/g++-3
-@dirrm ${MACHINE_GNU_PLATFORM}/include
-@dirrm ${MACHINE_GNU_PLATFORM}
diff --git a/lang/gcc-ssp/files/gcc.mk b/lang/gcc-ssp/files/gcc.mk
index 524d272f68b..4d7d2ab586f 100644
--- a/lang/gcc-ssp/files/gcc.mk
+++ b/lang/gcc-ssp/files/gcc.mk
@@ -1,9 +1,7 @@
-# make configuration file for @@PKGBASENAME@@
+# $NetBSD: gcc.mk,v 1.4 2003/08/09 12:43:03 seb Exp $
+#
+# make configuration file for @PKGNAME_NOREV@
 
-CC=	@@PREFIX@@/@@PKGBASENAME@@/bin/cc
-CPP=	@@PREFIX@@/@@PKGBASENAME@@/bin/cpp
-CXX=	@@PREFIX@@/@@PKGBASENAME@@/bin/c++
-
-.if exists(/etc/mk.conf)
-.include "/etc/mk.conf"
-.endif
+CC=	@GCC_PREFIX@/bin/cc
+CPP=	@GCC_PREFIX@/bin/cpp
+CXX=	@GCC_PREFIX@/bin/c++