Make this package similar to lang/gcc{,3}.

User visible changes:
- Install in ${GCC_PREFIX} for all platforms.
- Install example mk.conf in ${PREFIX}/share/examples/${PKGNAME_NOREV}/mk.conf.

Rewrite the Makefile to adopt a look and feel similar to those of
lang/gcc{,3}: convert to USE_NEW_TEXINFO, USE_PKG_INSTALL for FILE_SUBST,
mostly dynamic PLIST, platform independent MESSAGE, ...

Bump PKGREVISION.

7 files changed, 71 insertions, 710 deletions

diff --git a/lang/pgcc/MESSAGE b/lang/pgcc/MESSAGE
index bc22d468360..71e3d056fca 100644
--- a/lang/pgcc/MESSAGE
+++ b/lang/pgcc/MESSAGE
@@ -1,8 +1,8 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2002/03/14 14:54:48 wiz Exp $
+$NetBSD: MESSAGE,v 1.2 2003/07/21 12:48:43 seb Exp $
 
-To use ${PKGNAME} invoke "${MAKE}" like this:
-
-${MAKE} MAKECONF=${PREFIX}/etc/${PKGNAME}.mk [...]
+To use ${PKGNAME} include
+"${PREFIX}/share/examples/${PKGNAME_NOREV}/mk.conf"
+in your BSD style makefile.
 
 ===========================================================================
diff --git a/lang/pgcc/MESSAGE.SunOS b/lang/pgcc/MESSAGE.SunOS
deleted file mode 100644
index c12dd14926d..00000000000
--- a/lang/pgcc/MESSAGE.SunOS
+++ /dev/null
@@ -1,7 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.SunOS,v 1.1 2002/03/14 14:54:48 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/pgcc/Makefile b/lang/pgcc/Makefile
index 2a21d5e583b..2f4c246d3fc 100644
--- a/lang/pgcc/Makefile
+++ b/lang/pgcc/Makefile
@@ -1,89 +1,101 @@
-# $NetBSD: Makefile,v 1.21 2003/06/11 20:50:55 abs Exp $
+# $NetBSD: Makefile,v 1.22 2003/07/21 12:48:44 seb Exp $
 
 DISTNAME=		gcc-2.95.2
 PKGNAME=		pgcc-2.95.2.1
-WRKSRC=			${WRKDIR}/objdir
+PKGREVISION=		1
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_GNU:=gcc/}
 
 PATCH_SITES=		http://goof.com/pcg/data/source/
-PATCHFILES=		gcc-${PGCC_VERSION}-${PKGNAME}.diff.gz
-PATCH_DIST_ARGS=	-d ${SRCDIR} -s -p1 -E
+PATCHFILES=		gcc-${PGCC_VERSION}-${PKGNAME_NOREV}.diff.gz
+PATCH_DIST_STRIP+=	-p1
 
 MAINTAINER=		jmcneill@invisible.yi.org
 HOMEPAGE=		http://goof.com/pcg/
 COMMENT=		Pentium GNU Compiler Collection
 
-BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
-
 # 'Pentium GCC' is optimized for the Intel Pentium processor, but should
 # work on all platforms on which GCC works.
 ONLY_FOR_PLATFORM=	NetBSD-*-arm NetBSD-*-arm32 NetBSD-*-i386	\
 			NetBSD-*-m68k NetBSD-*-sparc SunOS-*-*
 
+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
+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}
+
+USE_NEW_TEXINFO=	YES
+INFO_DIR=		${GCC_PREFIX:S|^${PREFIX}/||}/info
 INFO_FILES=		chill.info cpp.info g77.info gcc.info
 
 # For pgcc, GCC_VERSION is actually the name of a subdirectory in the gcc
 # library tree.  We keep the odd name to keep this Makefile in-sync with
 # lang/gcc/Makefile.  PGCC_VERSION is set to the actual version of pgcc.
 #
-PGCC_VERSION=		${PKGNAME:C/.*-//}
-GCC_VERSION=		${PKGNAME}
-MESSAGE_SUBST+=		MAKE=${MAKE}
-PLIST_SUBST+=		GCC_VERSION=${GCC_VERSION}
-SRCDIR=			${WRKDIR}/${DISTNAME}
+PGCC_VERSION=	${PKGNAME:C/.*-//:C/nb[0-9]*$//}
+GCC_ARCHDIR=	${GCC_PREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}
+GCC_VERSION=	${PKGNAME}
 
 .include "../../mk/bsd.prefs.mk"
 
-.if (${OPSYS} != SunOS)
-CONFIGURE_ARGS+=	--with-gnu-as --with-gnu-ld --infodir=${PREFIX}/info
+GCC_PREFIX=		${PREFIX}/${PKGNAME_NOREV}
+PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
 
-GCC_PREFIX=		${LOCALBASE}/${PKGNAME}
-.if ${MACHINE_PLATFORM:MNetBSD-*-sparc}
-PLIST_SRC=		${PKGDIR}/PLIST.NetBSD-sparc
-PLIST_SRC+=		${PKGDIR}/PLIST
-.endif
-.else
-.if (${CC} != gcc)
+.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
 .endif
-GCC_PREFIX=		${LOCALBASE}
-PLIST_SRC=		${PKGDIR}/PLIST.SunOS
-MESSAGE=		${PKGDIR}/MESSAGE.SunOS
-CONFLICTS+=		gcc-[0-9]* pgcc-[0-9]*
-.endif
+
+FILES_SUBST+=		GCC_PREFIX=${GCC_PREFIX}
+FILES_SUBST+=		PKGNAME_NOREV=${PKGNAME_NOREV}
+MESSAGE_SUBST+=		PKGNAME_NOREV=${PKGNAME_NOREV}
 
 post-extract:
-	${MKDIR} ${WRKSRC}
-	${CP} ${FILESDIR}/netbsd*.ml ${WRKSRC}/../${DISTNAME}/libstdc++/config
+	${CP} ${FILESDIR}/netbsd*.ml ${WRKSRC}/libstdc++/config
 
-post-patch:
-	${ECHO} "bogus" >${WRKSRC}/../${DISTNAME}/gcc/cstamp-h.in
+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#@@PKGNAME@@#${PKGNAME}#g' \
-		 -e 's#@@PREFIX@@#${PREFIX}#g' \
-	   <$$FILE >${WRKDIR}/`basename $$FILE`; \
-	done
-.endif
+	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/gcc.mk > ${WRKDIR}/gcc.mk
 
-.if (${OPSYS} != SunOS)
 post-install:
-	${RM} -f ${GCC_PREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/curses.h ${PREFIX}/${PKGNAME}/bin/cc
-	${LN} -s gcc ${PREFIX}/${PKGNAME}/bin/cc
-	${INSTALL_DATA} ${WRKDIR}/gcc.mk ${PREFIX}/etc/${PKGNAME}.mk
+.if (${OPSYS} == "SunOS")
+	-cd ${GCC_ARCHDIR}/include && ${RM} -f fixed && ${RMDIR} v7 v9
+.else
+	${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/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
 
 # Make bootstrap with compiler != gcc possible.
diff --git a/lang/pgcc/PLIST b/lang/pgcc/PLIST
index da822116ae9..c5314c0a392 100644
--- a/lang/pgcc/PLIST
+++ b/lang/pgcc/PLIST
@@ -1,320 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2002/03/14 14:54:48 wiz Exp $
-${PKGNAME}/${MACHINE_GNU_PLATFORM}/include/_G_config.h
-${PKGNAME}/bin/${MACHINE_GNU_PLATFORM}-gcc
-${PKGNAME}/bin/c++
-${PKGNAME}/bin/c++filt
-${PKGNAME}/bin/cc
-${PKGNAME}/bin/chill
-${PKGNAME}/bin/cpp
-${PKGNAME}/bin/g++
-${PKGNAME}/bin/g77
-${PKGNAME}/bin/gcc
-${PKGNAME}/bin/gcj
-${PKGNAME}/bin/gcjh
-${PKGNAME}/bin/gcov
-${PKGNAME}/bin/jcf-dump
-${PKGNAME}/bin/jv-scan
-${PKGNAME}/bin/protoize
-${PKGNAME}/bin/unprotoize
-${PKGNAME}/include/g++-3/PlotFile.h
-${PKGNAME}/include/g++-3/SFile.h
-${PKGNAME}/include/g++-3/algo.h
-${PKGNAME}/include/g++-3/algobase.h
-${PKGNAME}/include/g++-3/algorithm
-${PKGNAME}/include/g++-3/alloc.h
-${PKGNAME}/include/g++-3/bitset
-${PKGNAME}/include/g++-3/builtinbuf.h
-${PKGNAME}/include/g++-3/bvector.h
-${PKGNAME}/include/g++-3/cassert
-${PKGNAME}/include/g++-3/cctype
-${PKGNAME}/include/g++-3/cerrno
-${PKGNAME}/include/g++-3/cfloat
-${PKGNAME}/include/g++-3/ciso646
-${PKGNAME}/include/g++-3/climits
-${PKGNAME}/include/g++-3/clocale
-${PKGNAME}/include/g++-3/cmath
-${PKGNAME}/include/g++-3/complex
-${PKGNAME}/include/g++-3/complex.h
-${PKGNAME}/include/g++-3/csetjmp
-${PKGNAME}/include/g++-3/csignal
-${PKGNAME}/include/g++-3/cstdarg
-${PKGNAME}/include/g++-3/cstddef
-${PKGNAME}/include/g++-3/cstdio
-${PKGNAME}/include/g++-3/cstdlib
-${PKGNAME}/include/g++-3/cstring
-${PKGNAME}/include/g++-3/ctime
-${PKGNAME}/include/g++-3/cwchar
-${PKGNAME}/include/g++-3/cwctype
-${PKGNAME}/include/g++-3/defalloc.h
-${PKGNAME}/include/g++-3/deque
-${PKGNAME}/include/g++-3/deque.h
-${PKGNAME}/include/g++-3/editbuf.h
-${PKGNAME}/include/g++-3/floatio.h
-${PKGNAME}/include/g++-3/fstream
-${PKGNAME}/include/g++-3/fstream.h
-${PKGNAME}/include/g++-3/function.h
-${PKGNAME}/include/g++-3/functional
-${PKGNAME}/include/g++-3/hash_map
-${PKGNAME}/include/g++-3/hash_map.h
-${PKGNAME}/include/g++-3/hash_set
-${PKGNAME}/include/g++-3/hash_set.h
-${PKGNAME}/include/g++-3/hashtable.h
-${PKGNAME}/include/g++-3/heap.h
-${PKGNAME}/include/g++-3/indstream.h
-${PKGNAME}/include/g++-3/iolibio.h
-${PKGNAME}/include/g++-3/iomanip
-${PKGNAME}/include/g++-3/iomanip.h
-${PKGNAME}/include/g++-3/iosfwd
-${PKGNAME}/include/g++-3/iostdio.h
-${PKGNAME}/include/g++-3/iostream
-${PKGNAME}/include/g++-3/iostream.h
-${PKGNAME}/include/g++-3/iostreamP.h
-${PKGNAME}/include/g++-3/istream.h
-${PKGNAME}/include/g++-3/iterator
-${PKGNAME}/include/g++-3/iterator.h
-${PKGNAME}/include/g++-3/libio.h
-${PKGNAME}/include/g++-3/libioP.h
-${PKGNAME}/include/g++-3/list
-${PKGNAME}/include/g++-3/list.h
-${PKGNAME}/include/g++-3/map
-${PKGNAME}/include/g++-3/map.h
-${PKGNAME}/include/g++-3/memory
-${PKGNAME}/include/g++-3/multimap.h
-${PKGNAME}/include/g++-3/multiset.h
-${PKGNAME}/include/g++-3/numeric
-${PKGNAME}/include/g++-3/ostream.h
-${PKGNAME}/include/g++-3/pair.h
-${PKGNAME}/include/g++-3/parsestream.h
-${PKGNAME}/include/g++-3/pfstream.h
-${PKGNAME}/include/g++-3/procbuf.h
-${PKGNAME}/include/g++-3/pthread_alloc
-${PKGNAME}/include/g++-3/pthread_alloc.h
-${PKGNAME}/include/g++-3/queue
-${PKGNAME}/include/g++-3/rope
-${PKGNAME}/include/g++-3/rope.h
-${PKGNAME}/include/g++-3/ropeimpl.h
-${PKGNAME}/include/g++-3/set
-${PKGNAME}/include/g++-3/set.h
-${PKGNAME}/include/g++-3/slist
-${PKGNAME}/include/g++-3/slist.h
-${PKGNAME}/include/g++-3/stack
-${PKGNAME}/include/g++-3/stack.h
-${PKGNAME}/include/g++-3/std/bastring.cc
-${PKGNAME}/include/g++-3/std/bastring.h
-${PKGNAME}/include/g++-3/std/complext.cc
-${PKGNAME}/include/g++-3/std/complext.h
-${PKGNAME}/include/g++-3/std/dcomplex.h
-${PKGNAME}/include/g++-3/std/fcomplex.h
-${PKGNAME}/include/g++-3/std/gslice.h
-${PKGNAME}/include/g++-3/std/gslice_array.h
-${PKGNAME}/include/g++-3/std/indirect_array.h
-${PKGNAME}/include/g++-3/std/ldcomplex.h
-${PKGNAME}/include/g++-3/std/mask_array.h
-${PKGNAME}/include/g++-3/std/slice.h
-${PKGNAME}/include/g++-3/std/slice_array.h
-${PKGNAME}/include/g++-3/std/std_valarray.h
-${PKGNAME}/include/g++-3/std/straits.h
-${PKGNAME}/include/g++-3/std/valarray_array.h
-${PKGNAME}/include/g++-3/std/valarray_array.tcc
-${PKGNAME}/include/g++-3/std/valarray_meta.h
-${PKGNAME}/include/g++-3/stdexcept
-${PKGNAME}/include/g++-3/stdiostream.h
-${PKGNAME}/include/g++-3/stl.h
-${PKGNAME}/include/g++-3/stl_algo.h
-${PKGNAME}/include/g++-3/stl_algobase.h
-${PKGNAME}/include/g++-3/stl_alloc.h
-${PKGNAME}/include/g++-3/stl_bvector.h
-${PKGNAME}/include/g++-3/stl_config.h
-${PKGNAME}/include/g++-3/stl_construct.h
-${PKGNAME}/include/g++-3/stl_deque.h
-${PKGNAME}/include/g++-3/stl_function.h
-${PKGNAME}/include/g++-3/stl_hash_fun.h
-${PKGNAME}/include/g++-3/stl_hash_map.h
-${PKGNAME}/include/g++-3/stl_hash_set.h
-${PKGNAME}/include/g++-3/stl_hashtable.h
-${PKGNAME}/include/g++-3/stl_heap.h
-${PKGNAME}/include/g++-3/stl_iterator.h
-${PKGNAME}/include/g++-3/stl_list.h
-${PKGNAME}/include/g++-3/stl_map.h
-${PKGNAME}/include/g++-3/stl_multimap.h
-${PKGNAME}/include/g++-3/stl_multiset.h
-${PKGNAME}/include/g++-3/stl_numeric.h
-${PKGNAME}/include/g++-3/stl_pair.h
-${PKGNAME}/include/g++-3/stl_queue.h
-${PKGNAME}/include/g++-3/stl_raw_storage_iter.h
-${PKGNAME}/include/g++-3/stl_relops.h
-${PKGNAME}/include/g++-3/stl_rope.h
-${PKGNAME}/include/g++-3/stl_set.h
-${PKGNAME}/include/g++-3/stl_slist.h
-${PKGNAME}/include/g++-3/stl_stack.h
-${PKGNAME}/include/g++-3/stl_tempbuf.h
-${PKGNAME}/include/g++-3/stl_tree.h
-${PKGNAME}/include/g++-3/stl_uninitialized.h
-${PKGNAME}/include/g++-3/stl_vector.h
-${PKGNAME}/include/g++-3/stream.h
-${PKGNAME}/include/g++-3/streambuf.h
-${PKGNAME}/include/g++-3/strfile.h
-${PKGNAME}/include/g++-3/string
-${PKGNAME}/include/g++-3/strstream
-${PKGNAME}/include/g++-3/strstream.h
-${PKGNAME}/include/g++-3/tempbuf.h
-${PKGNAME}/include/g++-3/tree.h
-${PKGNAME}/include/g++-3/type_traits.h
-${PKGNAME}/include/g++-3/utility
-${PKGNAME}/include/g++-3/valarray
-${PKGNAME}/include/g++-3/vector
-${PKGNAME}/include/g++-3/vector.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/SYSCALLS.c.X
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/cc1
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/cc1chill
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/cc1obj
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/cc1plus
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/chillrt0.o
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/collect2
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/cpp
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/f771
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/README
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/exception
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/float.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/g2c.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/iso646.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/limits.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/math.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/new
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/new.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/objc/NXConstStr.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/objc/Object.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/objc/Protocol.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/objc/encoding.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/objc/hash.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/objc/objc-api.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/objc/objc-list.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/objc/objc.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/objc/sarray.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/objc/thr.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/objc/typedstream.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/proto.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/stdarg.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/stdbool.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/stddef.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/syslimits.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/typeinfo
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-alpha.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-arc.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-c4x.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-clipper.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-h8300.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-i860.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-i960.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-m32r.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-m88k.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-mips.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-mn10200.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-mn10300.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-pa.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-ppc.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-pyr.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-sh.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-sparc.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-spur.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-v850.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/varargs.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/jc1
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/jvgenmain
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/libchill.a
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/libg2c.a
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/libgcc.a
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/libobjc.a
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/libstdc++.a
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/libstdc++.so
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/specs
-${PKGNAME}/lib/libiberty.a
-${PKGNAME}/lib/libstdc++.a.2.10
-${PKGNAME}/lib/libstdc++.so.2
-${PKGNAME}/lib/libstdc++.so.2.10
-${PKGNAME}/man/man1/cccp.1
-${PKGNAME}/man/man1/g++.1
-${PKGNAME}/man/man1/g77.1
-${PKGNAME}/man/man1/gcc.1
-etc/${PKGNAME}.mk
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/chill.info
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/cpp.info
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/g77.info
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/gcc.info
-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
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/g77.info
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/cpp.info
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/chill.info
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/gcc.info
-@dirrm ${PKGNAME}/man/man1
-@dirrm ${PKGNAME}/man
-@dirrm ${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/objc
-@dirrm ${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include
-@dirrm ${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}
-@dirrm ${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}
-@dirrm ${PKGNAME}/lib/gcc-lib
-@dirrm ${PKGNAME}/lib
-@dirrm ${PKGNAME}/include/g++-3/std
-@dirrm ${PKGNAME}/include/g++-3
-@dirrm ${PKGNAME}/include
-@dirrm ${PKGNAME}/bin
-@dirrm ${PKGNAME}/${MACHINE_GNU_PLATFORM}/include
-@dirrm ${PKGNAME}/${MACHINE_GNU_PLATFORM}
-@dirrm ${PKGNAME}
+@comment $NetBSD: PLIST,v 1.2 2003/07/21 12:48:44 seb Exp $
+share/examples/${PKGNAME}/mk.conf
+@dirrm share/examples/${PKGNAME}
diff --git a/lang/pgcc/PLIST.NetBSD-sparc b/lang/pgcc/PLIST.NetBSD-sparc
deleted file mode 100644
index 71d784b8c58..00000000000
--- a/lang/pgcc/PLIST.NetBSD-sparc
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST.NetBSD-sparc,v 1.1 2002/03/14 14:54:48 wiz Exp $
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/crtbegin.o
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/crtbeginS.o
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/crtend.o
-${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/crtendS.o
diff --git a/lang/pgcc/PLIST.SunOS b/lang/pgcc/PLIST.SunOS
deleted file mode 100644
index 9183cc5862d..00000000000
--- a/lang/pgcc/PLIST.SunOS
+++ /dev/null
@@ -1,320 +0,0 @@
-@comment $NetBSD: PLIST.SunOS,v 1.1 2002/03/14 14:54:48 wiz 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
-bin/protoize
-bin/unprotoize
-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/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
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/chill.info
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/cpp.info
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/g77.info
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/gcc.info
-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
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/g77.info
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/cpp.info
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/chill.info
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/gcc.info
-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}/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}/specs
-lib/libiberty.a
-lib/libstdc++.a.2.10.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/pgcc/files/gcc.mk b/lang/pgcc/files/gcc.mk
index 04a0320fb5d..9584caf552d 100644
--- a/lang/pgcc/files/gcc.mk
+++ b/lang/pgcc/files/gcc.mk
@@ -1,9 +1,7 @@
-# make configuration file for @@PKGNAME@@
+# $NetBSD: gcc.mk,v 1.2 2003/07/21 12:48:46 seb Exp $
+#
+# make configuration file for @PKGNAME_NOREV@
 
-CC=	@@PREFIX@@/@@PKGNAME@@/bin/cc
-CPP=	@@PREFIX@@/@@PKGNAME@@/bin/cpp
-CXX=	@@PREFIX@@/@@PKGNAME@@/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++