Move remaining users of USE_CROSSBASE to just install into ${PREFIX}/cross.

To simplify infrastructure.

Ok joerg@

XXX: nios2-gcc3 loops endlessly during build, before and after change,
so untested.
XXX: nios2-gcc does not build on -current, in the same way before
and after the change, so untested.

24 files changed, 1937 insertions, 1956 deletions

diff --git a/cross/Makefile b/cross/Makefile
index d076f307259..125663a62f6 100644
--- a/cross/Makefile
+++ b/cross/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2015/12/10 23:07:21 ryoon Exp $
+# $NetBSD: Makefile,v 1.66 2016/06/19 16:20:27 wiz Exp $
 #
 
 COMMENT=	Cross-platform development utilities
@@ -15,10 +15,11 @@ SUBDIR+=	avr-libc
 SUBDIR+=	avrdude
 SUBDIR+=	bfd-crunchide
 SUBDIR+=	bfd-mdsetimage
-SUBDIR+=	binutils
 SUBDIR+=	binutils-mips-current
 SUBDIR+=	bossa
 SUBDIR+=	cc65
+SUBDIR+=	cross-binutils
+#SUBDIR+=	cross-libtool-base	# added here to keep pkglint happy
 SUBDIR+=	dasm
 SUBDIR+=	dfu-programmer
 SUBDIR+=	freemint-binutils
@@ -35,7 +36,6 @@ SUBDIR+=	h8300-elf-gcc34
 SUBDIR+=	h8300-hms-binutils
 SUBDIR+=	h8300-hms-gcc
 SUBDIR+=	icdprog
-#SUBDIR+=	libtool-base	# added here to keep pkglint happy
 SUBDIR+=	mingw
 SUBDIR+=	mingw-binutils
 SUBDIR+=	mingw-gcc
diff --git a/cross/bfd-crunchide/Makefile b/cross/bfd-crunchide/Makefile
index 5241c077d28..e7c9bc64765 100644
--- a/cross/bfd-crunchide/Makefile
+++ b/cross/bfd-crunchide/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2015/12/26 23:07:11 dholland Exp $
+# $NetBSD: Makefile,v 1.26 2016/06/19 16:20:27 wiz Exp $
 
 DISTNAME=	bfd-crunchide-1.2
 CATEGORIES=	cross
@@ -13,20 +13,21 @@ BUILDLINK_DEPMETHOD.cross-binutils=	build
 WRKSRC=		${WRKDIR}
 NO_CONFIGURE=	yes
 
-USE_CROSSBASE=	yes
-CPPFLAGS+=	-I${PREFIX}/include
+CPPFLAGS+=	-I${PREFIX}/cross/include
 MAKE_ENV+=	LIBS=${BFD_LIBS:Q}
 MAKE_ENV+=	${BSD_MAKE_ENV}
 USE_BSD_MAKEFILE=yes
+MAKE_FLAGS+=	PREFIX=${PREFIX}/cross
+MAKE_FLAGS+=	BINDIR=${PREFIX}/cross/bin
 
-BFD_LIBS=	${PREFIX}/lib/libbfd.a ${PREFIX}/lib/libiberty.a ${PREFIX}/lib/libintl.a
+BFD_LIBS=	${PREFIX}/cross/lib/libbfd.a ${PREFIX}/cross/lib/libiberty.a ${PREFIX}/cross/lib/libintl.a
 
-INSTALLATION_DIRS=	bin
+INSTALLATION_DIRS=	cross/bin
 
 do-extract:
 	@${MKDIR} ${WRKSRC}
 	@${CP} ${FILESDIR}/Makefile ${FILESDIR}/crunchide.1 ${FILESDIR}/crunchide.c \
 		${WRKSRC}
 
-.include "../../cross/binutils/buildlink3.mk"
+.include "../../cross/cross-binutils/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cross/bfd-crunchide/PLIST b/cross/bfd-crunchide/PLIST
index 743c793b696..e2db3c69166 100644
--- a/cross/bfd-crunchide/PLIST
+++ b/cross/bfd-crunchide/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:03:24 zuntum Exp $
-bin/crunchide
+@comment $NetBSD: PLIST,v 1.2 2016/06/19 16:20:27 wiz Exp $
+cross/bin/crunchide
diff --git a/cross/bfd-mdsetimage/Makefile b/cross/bfd-mdsetimage/Makefile
index f5ae7f15f27..f244ac76b21 100644
--- a/cross/bfd-mdsetimage/Makefile
+++ b/cross/bfd-mdsetimage/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2015/12/26 23:09:45 dholland Exp $
+# $NetBSD: Makefile,v 1.26 2016/06/19 16:20:27 wiz Exp $
 
 DISTNAME=	bfd-mdsetimage-1.15.1
 PKGREVISION=	1
@@ -10,19 +10,20 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Mdsetimage using libbfd, used for cross-building distributions
 LICENSE=	modified-bsd
 
-INSTALLATION_DIRS=	bin
+INSTALLATION_DIRS=	cross/bin
 
 WRKSRC=		${WRKDIR}
 NO_CONFIGURE=	yes
 
-USE_CROSSBASE=	yes
 BFD_VERSION=	2.9.1
-CPPFLAGS+=	-I${PREFIX}/include
+CPPFLAGS+=	-I${PREFIX}/cross/include
 MAKE_ENV+=	BFD_VERSION=${BFD_VERSION:Q} \
 		LIBS=${BFD_LIBS:Q}
+MAKE_FLAGS+=	PREFIX=${PREFIX}/cross
+MAKE_FLAGS+=	BINDIR=${PREFIX}/cross/bin
 
 FIX_RPATH+=	BFD_LIBS
-BFD_LIBS=	-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib -lbfd -liberty -lintl
+BFD_LIBS=	-L${PREFIX}/cross/lib ${COMPILER_RPATH_FLAG}${PREFIX}/cross/lib -lbfd -liberty -lintl
 
 USE_BSD_MAKEFILE=	yes
 
@@ -31,5 +32,5 @@ do-extract:
 	@${CP} ${FILESDIR}/Makefile ${FILESDIR}/mdsetimage.8 ${FILESDIR}/mdsetimage.c \
 		${WRKSRC}
 
-.include "../../cross/binutils/buildlink3.mk"
+.include "../../cross/cross-binutils/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cross/bfd-mdsetimage/PLIST b/cross/bfd-mdsetimage/PLIST
index 21db6d708ea..7315a6a3446 100644
--- a/cross/bfd-mdsetimage/PLIST
+++ b/cross/bfd-mdsetimage/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:03:25 zuntum Exp $
-bin/mdsetimage
+@comment $NetBSD: PLIST,v 1.2 2016/06/19 16:20:27 wiz Exp $
+cross/bin/mdsetimage
diff --git a/cross/mingw-binutils/Makefile b/cross/mingw-binutils/Makefile
index 8ed09f27002..1590ea86350 100644
--- a/cross/mingw-binutils/Makefile
+++ b/cross/mingw-binutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2012/10/09 17:32:33 marino Exp $
+# $NetBSD: Makefile,v 1.6 2016/06/19 16:20:27 wiz Exp $
 
 DISTNAME=	binutils-2.18
 PKGNAME=	mingw-${DISTNAME:S/-src//}
@@ -11,18 +11,18 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://mingw.sourceforge.net/
 COMMENT=	GNU binutils for win32 cross-development
 
-USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-USE_CROSSBASE=		yes
 USE_TOOLS+=		pax
 INFO_FILES=		yes
 
 BUILDLINK_TRANSFORM+=	rm:-Werror
 
+INSTALLATION_DIRS+=	cross/bin
+
 post-install:
 .for f in windres dllwrap
-	${LN} -fs ${PREFIX}/bin/${MINGW_TARGET}-${f} \
-                ${DESTDIR}${PREFIX}/${MINGW_TARGET}/bin/${f}
+	${LN} -fs ${PREFIX}/cross/bin/${MINGW_TARGET}-${f} \
+                ${DESTDIR}${PREFIX}/cross/${MINGW_TARGET}/bin/${f}
 .endfor
 
 .include "../../cross/mingw/Makefile.common"
diff --git a/cross/mingw-binutils/PLIST b/cross/mingw-binutils/PLIST
index 515c40aff7a..e985f41d812 100644
--- a/cross/mingw-binutils/PLIST
+++ b/cross/mingw-binutils/PLIST
@@ -1,125 +1,125 @@
-@comment $NetBSD: PLIST,v 1.2 2010/06/24 20:06:28 asau Exp $
-bin/${MINGW_TARGET}-addr2line
-bin/${MINGW_TARGET}-ar
-bin/${MINGW_TARGET}-as
-bin/${MINGW_TARGET}-c++filt
-bin/${MINGW_TARGET}-dlltool
-bin/${MINGW_TARGET}-dllwrap
-bin/${MINGW_TARGET}-gprof
-bin/${MINGW_TARGET}-ld
-bin/${MINGW_TARGET}-nm
-bin/${MINGW_TARGET}-objcopy
-bin/${MINGW_TARGET}-objdump
-bin/${MINGW_TARGET}-ranlib
-bin/${MINGW_TARGET}-readelf
-bin/${MINGW_TARGET}-size
-bin/${MINGW_TARGET}-strings
-bin/${MINGW_TARGET}-strip
-bin/${MINGW_TARGET}-windmc
-bin/${MINGW_TARGET}-windres
-${MINGW_TARGET}/bin/ar
-${MINGW_TARGET}/bin/as
-${MINGW_TARGET}/bin/dlltool
-${MINGW_TARGET}/bin/ld
-${MINGW_TARGET}/bin/nm
-${MINGW_TARGET}/bin/objcopy
-${MINGW_TARGET}/bin/objdump
-${MINGW_TARGET}/bin/ranlib
-${MINGW_TARGET}/bin/strip
-${MINGW_TARGET}/bin/windres
-${MINGW_TARGET}/bin/dllwrap
-${MINGW_TARGET}/lib/ldscripts/i386pe.x
-${MINGW_TARGET}/lib/ldscripts/i386pe.xbn
-${MINGW_TARGET}/lib/ldscripts/i386pe.xn
-${MINGW_TARGET}/lib/ldscripts/i386pe.xr
-${MINGW_TARGET}/lib/ldscripts/i386pe.xu
-info/as.info
-info/bfd.info
-info/binutils.info
-info/configure.info
-info/gprof.info
-info/ld.info
-info/standards.info
-man/man1/${MINGW_TARGET}-addr2line.1
-man/man1/${MINGW_TARGET}-ar.1
-man/man1/${MINGW_TARGET}-as.1
-man/man1/${MINGW_TARGET}-c++filt.1
-man/man1/${MINGW_TARGET}-dlltool.1
-man/man1/${MINGW_TARGET}-gprof.1
-man/man1/${MINGW_TARGET}-ld.1
-man/man1/${MINGW_TARGET}-nlmconv.1
-man/man1/${MINGW_TARGET}-nm.1
-man/man1/${MINGW_TARGET}-objcopy.1
-man/man1/${MINGW_TARGET}-objdump.1
-man/man1/${MINGW_TARGET}-ranlib.1
-man/man1/${MINGW_TARGET}-readelf.1
-man/man1/${MINGW_TARGET}-size.1
-man/man1/${MINGW_TARGET}-strings.1
-man/man1/${MINGW_TARGET}-strip.1
-man/man1/${MINGW_TARGET}-windmc.1
-man/man1/${MINGW_TARGET}-windres.1
-share/locale/da/LC_MESSAGES/bfd.mo
-share/locale/da/LC_MESSAGES/binutils.mo
-share/locale/da/LC_MESSAGES/gprof.mo
-share/locale/da/LC_MESSAGES/ld.mo
-share/locale/da/LC_MESSAGES/opcodes.mo
-share/locale/de/LC_MESSAGES/gprof.mo
-share/locale/de/LC_MESSAGES/opcodes.mo
-share/locale/es/LC_MESSAGES/bfd.mo
-share/locale/es/LC_MESSAGES/binutils.mo
-share/locale/es/LC_MESSAGES/gas.mo
-share/locale/es/LC_MESSAGES/gprof.mo
-share/locale/es/LC_MESSAGES/ld.mo
-share/locale/es/LC_MESSAGES/opcodes.mo
-share/locale/fi/LC_MESSAGES/binutils.mo
-share/locale/fi/LC_MESSAGES/gprof.mo
-share/locale/fi/LC_MESSAGES/ld.mo
-share/locale/fi/LC_MESSAGES/opcodes.mo
-share/locale/fr/LC_MESSAGES/bfd.mo
-share/locale/fr/LC_MESSAGES/binutils.mo
-share/locale/fr/LC_MESSAGES/gas.mo
-share/locale/fr/LC_MESSAGES/gprof.mo
-share/locale/fr/LC_MESSAGES/ld.mo
-share/locale/fr/LC_MESSAGES/opcodes.mo
-share/locale/ga/LC_MESSAGES/gprof.mo
-share/locale/ga/LC_MESSAGES/ld.mo
-share/locale/ga/LC_MESSAGES/opcodes.mo
-share/locale/id/LC_MESSAGES/gprof.mo
-share/locale/id/LC_MESSAGES/opcodes.mo
-share/locale/ja/LC_MESSAGES/bfd.mo
-share/locale/ja/LC_MESSAGES/binutils.mo
-share/locale/ms/LC_MESSAGES/gprof.mo
-share/locale/nl/LC_MESSAGES/opcodes.mo
-share/locale/pt_BR/LC_MESSAGES/gprof.mo
-share/locale/pt_BR/LC_MESSAGES/opcodes.mo
-share/locale/ro/LC_MESSAGES/bfd.mo
-share/locale/ro/LC_MESSAGES/binutils.mo
-share/locale/ro/LC_MESSAGES/opcodes.mo
-share/locale/ru/LC_MESSAGES/binutils.mo
-share/locale/rw/LC_MESSAGES/bfd.mo
-share/locale/rw/LC_MESSAGES/binutils.mo
-share/locale/rw/LC_MESSAGES/gas.mo
-share/locale/rw/LC_MESSAGES/gprof.mo
-share/locale/sv/LC_MESSAGES/bfd.mo
-share/locale/sv/LC_MESSAGES/binutils.mo
-share/locale/sv/LC_MESSAGES/gprof.mo
-share/locale/sv/LC_MESSAGES/ld.mo
-share/locale/sv/LC_MESSAGES/opcodes.mo
-share/locale/tr/LC_MESSAGES/bfd.mo
-share/locale/tr/LC_MESSAGES/binutils.mo
-share/locale/tr/LC_MESSAGES/gas.mo
-share/locale/tr/LC_MESSAGES/gprof.mo
-share/locale/tr/LC_MESSAGES/ld.mo
-share/locale/tr/LC_MESSAGES/opcodes.mo
-share/locale/uk/LC_MESSAGES/binutils.mo
-share/locale/vi/LC_MESSAGES/bfd.mo
-share/locale/vi/LC_MESSAGES/binutils.mo
-share/locale/vi/LC_MESSAGES/gprof.mo
-share/locale/vi/LC_MESSAGES/ld.mo
-share/locale/vi/LC_MESSAGES/opcodes.mo
-share/locale/zh_CN/LC_MESSAGES/bfd.mo
-share/locale/zh_CN/LC_MESSAGES/binutils.mo
-share/locale/zh_CN/LC_MESSAGES/ld.mo
-share/locale/zh_CN/LC_MESSAGES/opcodes.mo
-share/locale/zh_TW/LC_MESSAGES/binutils.mo
-share/locale/zh_TW/LC_MESSAGES/ld.mo
+@comment $NetBSD: PLIST,v 1.3 2016/06/19 16:20:27 wiz Exp $
+cross/bin/${MINGW_TARGET}-addr2line
+cross/bin/${MINGW_TARGET}-ar
+cross/bin/${MINGW_TARGET}-as
+cross/bin/${MINGW_TARGET}-c++filt
+cross/bin/${MINGW_TARGET}-dlltool
+cross/bin/${MINGW_TARGET}-dllwrap
+cross/bin/${MINGW_TARGET}-gprof
+cross/bin/${MINGW_TARGET}-ld
+cross/bin/${MINGW_TARGET}-nm
+cross/bin/${MINGW_TARGET}-objcopy
+cross/bin/${MINGW_TARGET}-objdump
+cross/bin/${MINGW_TARGET}-ranlib
+cross/bin/${MINGW_TARGET}-readelf
+cross/bin/${MINGW_TARGET}-size
+cross/bin/${MINGW_TARGET}-strings
+cross/bin/${MINGW_TARGET}-strip
+cross/bin/${MINGW_TARGET}-windmc
+cross/bin/${MINGW_TARGET}-windres
+cross/${MINGW_TARGET}/bin/ar
+cross/${MINGW_TARGET}/bin/as
+cross/${MINGW_TARGET}/bin/dlltool
+cross/${MINGW_TARGET}/bin/ld
+cross/${MINGW_TARGET}/bin/nm
+cross/${MINGW_TARGET}/bin/objcopy
+cross/${MINGW_TARGET}/bin/objdump
+cross/${MINGW_TARGET}/bin/ranlib
+cross/${MINGW_TARGET}/bin/strip
+cross/${MINGW_TARGET}/bin/windres
+cross/${MINGW_TARGET}/bin/dllwrap
+cross/${MINGW_TARGET}/lib/ldscripts/i386pe.x
+cross/${MINGW_TARGET}/lib/ldscripts/i386pe.xbn
+cross/${MINGW_TARGET}/lib/ldscripts/i386pe.xn
+cross/${MINGW_TARGET}/lib/ldscripts/i386pe.xr
+cross/${MINGW_TARGET}/lib/ldscripts/i386pe.xu
+cross/info/as.info
+cross/info/bfd.info
+cross/info/binutils.info
+cross/info/configure.info
+cross/info/gprof.info
+cross/info/ld.info
+cross/info/standards.info
+cross/man/man1/${MINGW_TARGET}-addr2line.1
+cross/man/man1/${MINGW_TARGET}-ar.1
+cross/man/man1/${MINGW_TARGET}-as.1
+cross/man/man1/${MINGW_TARGET}-c++filt.1
+cross/man/man1/${MINGW_TARGET}-dlltool.1
+cross/man/man1/${MINGW_TARGET}-gprof.1
+cross/man/man1/${MINGW_TARGET}-ld.1
+cross/man/man1/${MINGW_TARGET}-nlmconv.1
+cross/man/man1/${MINGW_TARGET}-nm.1
+cross/man/man1/${MINGW_TARGET}-objcopy.1
+cross/man/man1/${MINGW_TARGET}-objdump.1
+cross/man/man1/${MINGW_TARGET}-ranlib.1
+cross/man/man1/${MINGW_TARGET}-readelf.1
+cross/man/man1/${MINGW_TARGET}-size.1
+cross/man/man1/${MINGW_TARGET}-strings.1
+cross/man/man1/${MINGW_TARGET}-strip.1
+cross/man/man1/${MINGW_TARGET}-windmc.1
+cross/man/man1/${MINGW_TARGET}-windres.1
+cross/share/locale/da/LC_MESSAGES/bfd.mo
+cross/share/locale/da/LC_MESSAGES/binutils.mo
+cross/share/locale/da/LC_MESSAGES/gprof.mo
+cross/share/locale/da/LC_MESSAGES/ld.mo
+cross/share/locale/da/LC_MESSAGES/opcodes.mo
+cross/share/locale/de/LC_MESSAGES/gprof.mo
+cross/share/locale/de/LC_MESSAGES/opcodes.mo
+cross/share/locale/es/LC_MESSAGES/bfd.mo
+cross/share/locale/es/LC_MESSAGES/binutils.mo
+cross/share/locale/es/LC_MESSAGES/gas.mo
+cross/share/locale/es/LC_MESSAGES/gprof.mo
+cross/share/locale/es/LC_MESSAGES/ld.mo
+cross/share/locale/es/LC_MESSAGES/opcodes.mo
+cross/share/locale/fi/LC_MESSAGES/binutils.mo
+cross/share/locale/fi/LC_MESSAGES/gprof.mo
+cross/share/locale/fi/LC_MESSAGES/ld.mo
+cross/share/locale/fi/LC_MESSAGES/opcodes.mo
+cross/share/locale/fr/LC_MESSAGES/bfd.mo
+cross/share/locale/fr/LC_MESSAGES/binutils.mo
+cross/share/locale/fr/LC_MESSAGES/gas.mo
+cross/share/locale/fr/LC_MESSAGES/gprof.mo
+cross/share/locale/fr/LC_MESSAGES/ld.mo
+cross/share/locale/fr/LC_MESSAGES/opcodes.mo
+cross/share/locale/ga/LC_MESSAGES/gprof.mo
+cross/share/locale/ga/LC_MESSAGES/ld.mo
+cross/share/locale/ga/LC_MESSAGES/opcodes.mo
+cross/share/locale/id/LC_MESSAGES/gprof.mo
+cross/share/locale/id/LC_MESSAGES/opcodes.mo
+cross/share/locale/ja/LC_MESSAGES/bfd.mo
+cross/share/locale/ja/LC_MESSAGES/binutils.mo
+cross/share/locale/ms/LC_MESSAGES/gprof.mo
+cross/share/locale/nl/LC_MESSAGES/opcodes.mo
+cross/share/locale/pt_BR/LC_MESSAGES/gprof.mo
+cross/share/locale/pt_BR/LC_MESSAGES/opcodes.mo
+cross/share/locale/ro/LC_MESSAGES/bfd.mo
+cross/share/locale/ro/LC_MESSAGES/binutils.mo
+cross/share/locale/ro/LC_MESSAGES/opcodes.mo
+cross/share/locale/ru/LC_MESSAGES/binutils.mo
+cross/share/locale/rw/LC_MESSAGES/bfd.mo
+cross/share/locale/rw/LC_MESSAGES/binutils.mo
+cross/share/locale/rw/LC_MESSAGES/gas.mo
+cross/share/locale/rw/LC_MESSAGES/gprof.mo
+cross/share/locale/sv/LC_MESSAGES/bfd.mo
+cross/share/locale/sv/LC_MESSAGES/binutils.mo
+cross/share/locale/sv/LC_MESSAGES/gprof.mo
+cross/share/locale/sv/LC_MESSAGES/ld.mo
+cross/share/locale/sv/LC_MESSAGES/opcodes.mo
+cross/share/locale/tr/LC_MESSAGES/bfd.mo
+cross/share/locale/tr/LC_MESSAGES/binutils.mo
+cross/share/locale/tr/LC_MESSAGES/gas.mo
+cross/share/locale/tr/LC_MESSAGES/gprof.mo
+cross/share/locale/tr/LC_MESSAGES/ld.mo
+cross/share/locale/tr/LC_MESSAGES/opcodes.mo
+cross/share/locale/uk/LC_MESSAGES/binutils.mo
+cross/share/locale/vi/LC_MESSAGES/bfd.mo
+cross/share/locale/vi/LC_MESSAGES/binutils.mo
+cross/share/locale/vi/LC_MESSAGES/gprof.mo
+cross/share/locale/vi/LC_MESSAGES/ld.mo
+cross/share/locale/vi/LC_MESSAGES/opcodes.mo
+cross/share/locale/zh_CN/LC_MESSAGES/bfd.mo
+cross/share/locale/zh_CN/LC_MESSAGES/binutils.mo
+cross/share/locale/zh_CN/LC_MESSAGES/ld.mo
+cross/share/locale/zh_CN/LC_MESSAGES/opcodes.mo
+cross/share/locale/zh_TW/LC_MESSAGES/binutils.mo
+cross/share/locale/zh_TW/LC_MESSAGES/ld.mo
diff --git a/cross/mingw-gcc/Makefile b/cross/mingw-gcc/Makefile
index 8d8f32f6044..65debbd1501 100644
--- a/cross/mingw-gcc/Makefile
+++ b/cross/mingw-gcc/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2013/04/06 20:27:17 rodent Exp $
-#
+# $NetBSD: Makefile,v 1.5 2016/06/19 16:20:27 wiz Exp $
 
 DISTNAME=		mingw-gcc-${DIST_VERSION}
 PKGNAME=		${DISTNAME:S/-${DIST_VERSION}/-${GCC_VERSION}/}
@@ -14,9 +13,8 @@ HOMEPAGE=		http://mingw.sourceforge.net/
 COMMENT=		GNU C Compiler for win32 cross-development
 
 USE_TOOLS+=		gmake
-USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-USE_CROSSBASE=		yes
+GNU_CONFIGURE_PREFIX=	${PREFIX}/cross
 INFO_FILES=		yes
 
 WRKSRC=			${WRKDIR}/gcc-${DIST_VERSION}
@@ -36,13 +34,13 @@ post-install:
 		${MAKE_FLAGS} install-target-libobjc
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${INSTALL_ENV} ${GMAKE} \
 		${MAKE_FLAGS} install-target-libstdc++-v3
-	${INSTALL_PROGRAM_DIR} ${DESTDIR}${CROSSBASE}/${MINGW_TARGET}/bin
-	cd ${DESTDIR}${CROSSBASE}/bin && ${LN} -fs ${MINGW_TARGET}-gcc ${MINGW_TARGET}-cc
-	cd ${DESTDIR}${CROSSBASE} && ${LN} -fs bin/${MINGW_TARGET}-cpp ${MINGW_TARGET}/bin/cpp
-	cd ${DESTDIR}${CROSSBASE} && ${LN} -fs bin/${MINGW_TARGET}-cc  ${MINGW_TARGET}/bin/cc
-	cd ${DESTDIR}${CROSSBASE} && ${LN} -fs bin/${MINGW_TARGET}-gcc ${MINGW_TARGET}/bin/gcc
-	cd ${DESTDIR}${CROSSBASE} && ${LN} -fs bin/${MINGW_TARGET}-c++ ${MINGW_TARGET}/bin/c++
-	cd ${DESTDIR}${CROSSBASE} && ${LN} -fs bin/${MINGW_TARGET}-g++ ${MINGW_TARGET}/bin/g++
+	${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/cross/${MINGW_TARGET}/bin
+	cd ${DESTDIR}${PREFIX}/cross/bin && ${LN} -fs ${MINGW_TARGET}-gcc ${MINGW_TARGET}-cc
+	cd ${DESTDIR}${PREFIX}/cross && ${LN} -fs bin/${MINGW_TARGET}-cpp ${MINGW_TARGET}/bin/cpp
+	cd ${DESTDIR}${PREFIX}/cross && ${LN} -fs bin/${MINGW_TARGET}-cc  ${MINGW_TARGET}/bin/cc
+	cd ${DESTDIR}${PREFIX}/cross && ${LN} -fs bin/${MINGW_TARGET}-gcc ${MINGW_TARGET}/bin/gcc
+	cd ${DESTDIR}${PREFIX}/cross && ${LN} -fs bin/${MINGW_TARGET}-c++ ${MINGW_TARGET}/bin/c++
+	cd ${DESTDIR}${PREFIX}/cross && ${LN} -fs bin/${MINGW_TARGET}-g++ ${MINGW_TARGET}/bin/g++
 
 .include "../../cross/mingw/Makefile.common"
 .include "../../cross/mingw-binutils/buildlink3.mk"
diff --git a/cross/mingw-gcc/PLIST b/cross/mingw-gcc/PLIST
index acd3ad6defc..79887e855d9 100644
--- a/cross/mingw-gcc/PLIST
+++ b/cross/mingw-gcc/PLIST
@@ -1,316 +1,314 @@
-@comment $NetBSD: PLIST,v 1.3 2013/06/22 21:22:35 dholland Exp $
-bin/i386--mingw32-c++
-bin/i386--mingw32-cc
-bin/i386--mingw32-cpp
-bin/i386--mingw32-g++
-bin/i386--mingw32-gcc
-bin/i386--mingw32-gcc-3.4.5
-bin/i386--mingw32-gccbug
-bin/i386--mingw32-gcov
-i386--mingw32/bin/c++
-i386--mingw32/bin/cc
-i386--mingw32/bin/cpp
-i386--mingw32/bin/g++
-i386--mingw32/bin/gcc
-i386--mingw32/lib/libiberty.a
-i386--mingw32/lib/libobjc.la
-i386--mingw32/lib/libstdc++.la
-i386--mingw32/lib/libsupc++.la
-include/c++/3.4.5/algorithm
-include/c++/3.4.5/backward/algo.h
-include/c++/3.4.5/backward/algobase.h
-include/c++/3.4.5/backward/alloc.h
-include/c++/3.4.5/backward/backward_warning.h
-include/c++/3.4.5/backward/bvector.h
-include/c++/3.4.5/backward/complex.h
-include/c++/3.4.5/backward/defalloc.h
-include/c++/3.4.5/backward/deque.h
-include/c++/3.4.5/backward/fstream.h
-include/c++/3.4.5/backward/function.h
-include/c++/3.4.5/backward/hash_map.h
-include/c++/3.4.5/backward/hash_set.h
-include/c++/3.4.5/backward/hashtable.h
-include/c++/3.4.5/backward/heap.h
-include/c++/3.4.5/backward/iomanip.h
-include/c++/3.4.5/backward/iostream.h
-include/c++/3.4.5/backward/istream.h
-include/c++/3.4.5/backward/iterator.h
-include/c++/3.4.5/backward/list.h
-include/c++/3.4.5/backward/map.h
-include/c++/3.4.5/backward/multimap.h
-include/c++/3.4.5/backward/multiset.h
-include/c++/3.4.5/backward/new.h
-include/c++/3.4.5/backward/ostream.h
-include/c++/3.4.5/backward/pair.h
-include/c++/3.4.5/backward/queue.h
-include/c++/3.4.5/backward/rope.h
-include/c++/3.4.5/backward/set.h
-include/c++/3.4.5/backward/slist.h
-include/c++/3.4.5/backward/stack.h
-include/c++/3.4.5/backward/stream.h
-include/c++/3.4.5/backward/streambuf.h
-include/c++/3.4.5/backward/strstream
-include/c++/3.4.5/backward/tempbuf.h
-include/c++/3.4.5/backward/tree.h
-include/c++/3.4.5/backward/vector.h
-include/c++/3.4.5/bits/allocator.h
-include/c++/3.4.5/bits/atomicity.h
-include/c++/3.4.5/bits/basic_ios.h
-include/c++/3.4.5/bits/basic_ios.tcc
-include/c++/3.4.5/bits/basic_string.h
-include/c++/3.4.5/bits/basic_string.tcc
-include/c++/3.4.5/bits/boost_concept_check.h
-include/c++/3.4.5/bits/char_traits.h
-include/c++/3.4.5/bits/cmath.tcc
-include/c++/3.4.5/bits/codecvt.h
-include/c++/3.4.5/bits/concept_check.h
-include/c++/3.4.5/bits/concurrence.h
-include/c++/3.4.5/bits/cpp_type_traits.h
-include/c++/3.4.5/bits/deque.tcc
-include/c++/3.4.5/bits/fstream.tcc
-include/c++/3.4.5/bits/functexcept.h
-include/c++/3.4.5/bits/gslice.h
-include/c++/3.4.5/bits/gslice_array.h
-include/c++/3.4.5/bits/indirect_array.h
-include/c++/3.4.5/bits/ios_base.h
-include/c++/3.4.5/bits/istream.tcc
-include/c++/3.4.5/bits/list.tcc
-include/c++/3.4.5/bits/locale_classes.h
-include/c++/3.4.5/bits/locale_facets.h
-include/c++/3.4.5/bits/locale_facets.tcc
-include/c++/3.4.5/bits/localefwd.h
-include/c++/3.4.5/bits/mask_array.h
-include/c++/3.4.5/bits/ostream.tcc
-include/c++/3.4.5/bits/postypes.h
-include/c++/3.4.5/bits/slice_array.h
-include/c++/3.4.5/bits/sstream.tcc
-include/c++/3.4.5/bits/stl_algo.h
-include/c++/3.4.5/bits/stl_algobase.h
-include/c++/3.4.5/bits/stl_bvector.h
-include/c++/3.4.5/bits/stl_construct.h
-include/c++/3.4.5/bits/stl_deque.h
-include/c++/3.4.5/bits/stl_function.h
-include/c++/3.4.5/bits/stl_heap.h
-include/c++/3.4.5/bits/stl_iterator.h
-include/c++/3.4.5/bits/stl_iterator_base_funcs.h
-include/c++/3.4.5/bits/stl_iterator_base_types.h
-include/c++/3.4.5/bits/stl_list.h
-include/c++/3.4.5/bits/stl_map.h
-include/c++/3.4.5/bits/stl_multimap.h
-include/c++/3.4.5/bits/stl_multiset.h
-include/c++/3.4.5/bits/stl_numeric.h
-include/c++/3.4.5/bits/stl_pair.h
-include/c++/3.4.5/bits/stl_queue.h
-include/c++/3.4.5/bits/stl_raw_storage_iter.h
-include/c++/3.4.5/bits/stl_relops.h
-include/c++/3.4.5/bits/stl_set.h
-include/c++/3.4.5/bits/stl_stack.h
-include/c++/3.4.5/bits/stl_tempbuf.h
-include/c++/3.4.5/bits/stl_threads.h
-include/c++/3.4.5/bits/stl_tree.h
-include/c++/3.4.5/bits/stl_uninitialized.h
-include/c++/3.4.5/bits/stl_vector.h
-include/c++/3.4.5/bits/stream_iterator.h
-include/c++/3.4.5/bits/streambuf.tcc
-include/c++/3.4.5/bits/streambuf_iterator.h
-include/c++/3.4.5/bits/stringfwd.h
-include/c++/3.4.5/bits/type_traits.h
-include/c++/3.4.5/bits/valarray_after.h
-include/c++/3.4.5/bits/valarray_array.h
-include/c++/3.4.5/bits/valarray_array.tcc
-include/c++/3.4.5/bits/valarray_before.h
-include/c++/3.4.5/bits/vector.tcc
-include/c++/3.4.5/bitset
-include/c++/3.4.5/cassert
-include/c++/3.4.5/cctype
-include/c++/3.4.5/cerrno
-include/c++/3.4.5/cfloat
-include/c++/3.4.5/ciso646
-include/c++/3.4.5/climits
-include/c++/3.4.5/clocale
-include/c++/3.4.5/cmath
-include/c++/3.4.5/complex
-include/c++/3.4.5/csetjmp
-include/c++/3.4.5/csignal
-include/c++/3.4.5/cstdarg
-include/c++/3.4.5/cstddef
-include/c++/3.4.5/cstdio
-include/c++/3.4.5/cstdlib
-include/c++/3.4.5/cstring
-include/c++/3.4.5/ctime
-include/c++/3.4.5/cwchar
-include/c++/3.4.5/cwctype
-include/c++/3.4.5/cxxabi.h
-include/c++/3.4.5/debug/bitset
-include/c++/3.4.5/debug/debug.h
-include/c++/3.4.5/debug/deque
-include/c++/3.4.5/debug/formatter.h
-include/c++/3.4.5/debug/hash_map
-include/c++/3.4.5/debug/hash_map.h
-include/c++/3.4.5/debug/hash_multimap.h
-include/c++/3.4.5/debug/hash_multiset.h
-include/c++/3.4.5/debug/hash_set
-include/c++/3.4.5/debug/hash_set.h
-include/c++/3.4.5/debug/list
-include/c++/3.4.5/debug/map
-include/c++/3.4.5/debug/map.h
-include/c++/3.4.5/debug/multimap.h
-include/c++/3.4.5/debug/multiset.h
-include/c++/3.4.5/debug/safe_base.h
-include/c++/3.4.5/debug/safe_iterator.h
-include/c++/3.4.5/debug/safe_iterator.tcc
-include/c++/3.4.5/debug/safe_sequence.h
-include/c++/3.4.5/debug/set
-include/c++/3.4.5/debug/set.h
-include/c++/3.4.5/debug/string
-include/c++/3.4.5/debug/vector
-include/c++/3.4.5/deque
-include/c++/3.4.5/exception
-include/c++/3.4.5/exception_defines.h
-include/c++/3.4.5/ext/algorithm
-include/c++/3.4.5/ext/bitmap_allocator.h
-include/c++/3.4.5/ext/debug_allocator.h
-include/c++/3.4.5/ext/enc_filebuf.h
-include/c++/3.4.5/ext/functional
-include/c++/3.4.5/ext/hash_fun.h
-include/c++/3.4.5/ext/hash_map
-include/c++/3.4.5/ext/hash_set
-include/c++/3.4.5/ext/hashtable.h
-include/c++/3.4.5/ext/iterator
-include/c++/3.4.5/ext/malloc_allocator.h
-include/c++/3.4.5/ext/memory
-include/c++/3.4.5/ext/mt_allocator.h
-include/c++/3.4.5/ext/new_allocator.h
-include/c++/3.4.5/ext/numeric
-include/c++/3.4.5/ext/pod_char_traits.h
-include/c++/3.4.5/ext/pool_allocator.h
-include/c++/3.4.5/ext/rb_tree
-include/c++/3.4.5/ext/rope
-include/c++/3.4.5/ext/ropeimpl.h
-include/c++/3.4.5/ext/slist
-include/c++/3.4.5/ext/stdio_filebuf.h
-include/c++/3.4.5/ext/stdio_sync_filebuf.h
-include/c++/3.4.5/fstream
-include/c++/3.4.5/functional
-include/c++/3.4.5/i386--mingw32/bits/atomic_word.h
-include/c++/3.4.5/i386--mingw32/bits/basic_file.h
-include/c++/3.4.5/i386--mingw32/bits/c++allocator.h
-include/c++/3.4.5/i386--mingw32/bits/c++config.h
-include/c++/3.4.5/i386--mingw32/bits/c++io.h
-include/c++/3.4.5/i386--mingw32/bits/c++locale.h
-include/c++/3.4.5/i386--mingw32/bits/codecvt_specializations.h
-include/c++/3.4.5/i386--mingw32/bits/ctype_base.h
-include/c++/3.4.5/i386--mingw32/bits/ctype_inline.h
-include/c++/3.4.5/i386--mingw32/bits/ctype_noninline.h
-include/c++/3.4.5/i386--mingw32/bits/gthr-default.h
-include/c++/3.4.5/i386--mingw32/bits/gthr-posix.h
-include/c++/3.4.5/i386--mingw32/bits/gthr-single.h
-include/c++/3.4.5/i386--mingw32/bits/gthr.h
-include/c++/3.4.5/i386--mingw32/bits/messages_members.h
-include/c++/3.4.5/i386--mingw32/bits/os_defines.h
-include/c++/3.4.5/i386--mingw32/bits/stdc++.h.gch/O0g.gch
-include/c++/3.4.5/i386--mingw32/bits/stdc++.h.gch/O2g.gch
-include/c++/3.4.5/i386--mingw32/bits/time_members.h
-include/c++/3.4.5/iomanip
-include/c++/3.4.5/ios
-include/c++/3.4.5/iosfwd
-include/c++/3.4.5/iostream
-include/c++/3.4.5/istream
-include/c++/3.4.5/iterator
-include/c++/3.4.5/limits
-include/c++/3.4.5/list
-include/c++/3.4.5/locale
-include/c++/3.4.5/map
-include/c++/3.4.5/memory
-include/c++/3.4.5/new
-include/c++/3.4.5/numeric
-include/c++/3.4.5/ostream
-include/c++/3.4.5/queue
-include/c++/3.4.5/set
-include/c++/3.4.5/sstream
-include/c++/3.4.5/stack
-include/c++/3.4.5/stdexcept
-include/c++/3.4.5/streambuf
-include/c++/3.4.5/string
-include/c++/3.4.5/typeinfo
-include/c++/3.4.5/utility
-include/c++/3.4.5/valarray
-include/c++/3.4.5/vector
-info/cpp.info
-info/cppinternals.info
-info/gcc.info
-info/gccinstall.info
-info/gccint.info
-lib/gcc/i386--mingw32/3.4.5/crtbegin.o
-lib/gcc/i386--mingw32/3.4.5/crtend.o
-lib/gcc/i386--mingw32/3.4.5/include/README
-lib/gcc/i386--mingw32/3.4.5/include/emmintrin.h
-lib/gcc/i386--mingw32/3.4.5/include/float.h
-lib/gcc/i386--mingw32/3.4.5/include/iso646.h
-lib/gcc/i386--mingw32/3.4.5/include/limits.h
-lib/gcc/i386--mingw32/3.4.5/include/mm_malloc.h
-lib/gcc/i386--mingw32/3.4.5/include/mmintrin.h
-lib/gcc/i386--mingw32/3.4.5/include/objc/NXConstStr.h
-lib/gcc/i386--mingw32/3.4.5/include/objc/Object.h
-lib/gcc/i386--mingw32/3.4.5/include/objc/Protocol.h
-lib/gcc/i386--mingw32/3.4.5/include/objc/encoding.h
-lib/gcc/i386--mingw32/3.4.5/include/objc/hash.h
-lib/gcc/i386--mingw32/3.4.5/include/objc/objc-api.h
-lib/gcc/i386--mingw32/3.4.5/include/objc/objc-list.h
-lib/gcc/i386--mingw32/3.4.5/include/objc/objc.h
-lib/gcc/i386--mingw32/3.4.5/include/objc/sarray.h
-lib/gcc/i386--mingw32/3.4.5/include/objc/thr.h
-lib/gcc/i386--mingw32/3.4.5/include/objc/typedstream.h
-lib/gcc/i386--mingw32/3.4.5/include/pmmintrin.h
-lib/gcc/i386--mingw32/3.4.5/include/stdarg.h
-lib/gcc/i386--mingw32/3.4.5/include/stdbool.h
-lib/gcc/i386--mingw32/3.4.5/include/stddef.h
-lib/gcc/i386--mingw32/3.4.5/include/syslimits.h
-lib/gcc/i386--mingw32/3.4.5/include/unwind.h
-lib/gcc/i386--mingw32/3.4.5/include/varargs.h
-lib/gcc/i386--mingw32/3.4.5/include/xmmintrin.h
-lib/gcc/i386--mingw32/3.4.5/install-tools/gsyslimits.h
-lib/gcc/i386--mingw32/3.4.5/install-tools/include/README
-lib/gcc/i386--mingw32/3.4.5/install-tools/include/emmintrin.h
-lib/gcc/i386--mingw32/3.4.5/install-tools/include/float.h
-lib/gcc/i386--mingw32/3.4.5/install-tools/include/iso646.h
-lib/gcc/i386--mingw32/3.4.5/install-tools/include/limits.h
-lib/gcc/i386--mingw32/3.4.5/install-tools/include/mm_malloc.h
-lib/gcc/i386--mingw32/3.4.5/install-tools/include/mmintrin.h
-lib/gcc/i386--mingw32/3.4.5/install-tools/include/pmmintrin.h
-lib/gcc/i386--mingw32/3.4.5/install-tools/include/stdarg.h
-lib/gcc/i386--mingw32/3.4.5/install-tools/include/stdbool.h
-lib/gcc/i386--mingw32/3.4.5/install-tools/include/stddef.h
-lib/gcc/i386--mingw32/3.4.5/install-tools/include/unwind.h
-lib/gcc/i386--mingw32/3.4.5/install-tools/include/varargs.h
-lib/gcc/i386--mingw32/3.4.5/install-tools/include/xmmintrin.h
-lib/gcc/i386--mingw32/3.4.5/install-tools/mkheaders.conf
-lib/gcc/i386--mingw32/3.4.5/libgcc.a
-lib/gcc/i386--mingw32/3.4.5/libgcov.a
-lib/gcc/i386--mingw32/3.4.5/specs
-lib/libiberty.a
-libexec/gcc/i386--mingw32/3.4.5/cc1
-libexec/gcc/i386--mingw32/3.4.5/cc1obj
-libexec/gcc/i386--mingw32/3.4.5/cc1plus
-libexec/gcc/i386--mingw32/3.4.5/collect2
-libexec/gcc/i386--mingw32/3.4.5/install-tools/fixinc.sh
-libexec/gcc/i386--mingw32/3.4.5/install-tools/mkheaders
-man/man1/i386--mingw32-cpp.1
-man/man1/i386--mingw32-g++.1
-man/man1/i386--mingw32-gcc.1
-man/man1/i386--mingw32-gcov.1
-man/man7/fsf-funding.7
-man/man7/gfdl.7
-man/man7/gpl.7
-share/locale/be/LC_MESSAGES/gcc.mo
-share/locale/ca/LC_MESSAGES/gcc.mo
-share/locale/da/LC_MESSAGES/gcc.mo
-share/locale/de/LC_MESSAGES/gcc.mo
-share/locale/el/LC_MESSAGES/gcc.mo
-share/locale/es/LC_MESSAGES/gcc.mo
-share/locale/fr/LC_MESSAGES/gcc.mo
-share/locale/ja/LC_MESSAGES/gcc.mo
-share/locale/nl/LC_MESSAGES/gcc.mo
-share/locale/rw/LC_MESSAGES/gcc.mo
-share/locale/sv/LC_MESSAGES/gcc.mo
-share/locale/tr/LC_MESSAGES/gcc.mo
+@comment $NetBSD: PLIST,v 1.4 2016/06/19 16:20:27 wiz Exp $
+cross/bin/i386--mingw32-c++
+cross/bin/i386--mingw32-cc
+cross/bin/i386--mingw32-cpp
+cross/bin/i386--mingw32-g++
+cross/bin/i386--mingw32-gcc
+cross/bin/i386--mingw32-gcc-3.4.5
+cross/bin/i386--mingw32-gccbug
+cross/bin/i386--mingw32-gcov
+cross/i386--mingw32/bin/c++
+cross/i386--mingw32/bin/cc
+cross/i386--mingw32/bin/cpp
+cross/i386--mingw32/bin/g++
+cross/i386--mingw32/bin/gcc
+cross/i386--mingw32/lib/libiberty.a
+cross/i386--mingw32/lib/libobjc.la
+cross/i386--mingw32/lib/libstdc++.la
+cross/i386--mingw32/lib/libsupc++.la
+cross/include/c++/3.4.5/algorithm
+cross/include/c++/3.4.5/backward/algo.h
+cross/include/c++/3.4.5/backward/algobase.h
+cross/include/c++/3.4.5/backward/alloc.h
+cross/include/c++/3.4.5/backward/backward_warning.h
+cross/include/c++/3.4.5/backward/bvector.h
+cross/include/c++/3.4.5/backward/complex.h
+cross/include/c++/3.4.5/backward/defalloc.h
+cross/include/c++/3.4.5/backward/deque.h
+cross/include/c++/3.4.5/backward/fstream.h
+cross/include/c++/3.4.5/backward/function.h
+cross/include/c++/3.4.5/backward/hash_map.h
+cross/include/c++/3.4.5/backward/hash_set.h
+cross/include/c++/3.4.5/backward/hashtable.h
+cross/include/c++/3.4.5/backward/heap.h
+cross/include/c++/3.4.5/backward/iomanip.h
+cross/include/c++/3.4.5/backward/iostream.h
+cross/include/c++/3.4.5/backward/istream.h
+cross/include/c++/3.4.5/backward/iterator.h
+cross/include/c++/3.4.5/backward/list.h
+cross/include/c++/3.4.5/backward/map.h
+cross/include/c++/3.4.5/backward/multimap.h
+cross/include/c++/3.4.5/backward/multiset.h
+cross/include/c++/3.4.5/backward/new.h
+cross/include/c++/3.4.5/backward/ostream.h
+cross/include/c++/3.4.5/backward/pair.h
+cross/include/c++/3.4.5/backward/queue.h
+cross/include/c++/3.4.5/backward/rope.h
+cross/include/c++/3.4.5/backward/set.h
+cross/include/c++/3.4.5/backward/slist.h
+cross/include/c++/3.4.5/backward/stack.h
+cross/include/c++/3.4.5/backward/stream.h
+cross/include/c++/3.4.5/backward/streambuf.h
+cross/include/c++/3.4.5/backward/strstream
+cross/include/c++/3.4.5/backward/tempbuf.h
+cross/include/c++/3.4.5/backward/tree.h
+cross/include/c++/3.4.5/backward/vector.h
+cross/include/c++/3.4.5/bits/allocator.h
+cross/include/c++/3.4.5/bits/atomicity.h
+cross/include/c++/3.4.5/bits/basic_ios.h
+cross/include/c++/3.4.5/bits/basic_ios.tcc
+cross/include/c++/3.4.5/bits/basic_string.h
+cross/include/c++/3.4.5/bits/basic_string.tcc
+cross/include/c++/3.4.5/bits/boost_concept_check.h
+cross/include/c++/3.4.5/bits/char_traits.h
+cross/include/c++/3.4.5/bits/cmath.tcc
+cross/include/c++/3.4.5/bits/codecvt.h
+cross/include/c++/3.4.5/bits/concept_check.h
+cross/include/c++/3.4.5/bits/concurrence.h
+cross/include/c++/3.4.5/bits/cpp_type_traits.h
+cross/include/c++/3.4.5/bits/deque.tcc
+cross/include/c++/3.4.5/bits/fstream.tcc
+cross/include/c++/3.4.5/bits/functexcept.h
+cross/include/c++/3.4.5/bits/gslice.h
+cross/include/c++/3.4.5/bits/gslice_array.h
+cross/include/c++/3.4.5/bits/indirect_array.h
+cross/include/c++/3.4.5/bits/ios_base.h
+cross/include/c++/3.4.5/bits/istream.tcc
+cross/include/c++/3.4.5/bits/list.tcc
+cross/include/c++/3.4.5/bits/locale_classes.h
+cross/include/c++/3.4.5/bits/locale_facets.h
+cross/include/c++/3.4.5/bits/locale_facets.tcc
+cross/include/c++/3.4.5/bits/localefwd.h
+cross/include/c++/3.4.5/bits/mask_array.h
+cross/include/c++/3.4.5/bits/ostream.tcc
+cross/include/c++/3.4.5/bits/postypes.h
+cross/include/c++/3.4.5/bits/slice_array.h
+cross/include/c++/3.4.5/bits/sstream.tcc
+cross/include/c++/3.4.5/bits/stl_algo.h
+cross/include/c++/3.4.5/bits/stl_algobase.h
+cross/include/c++/3.4.5/bits/stl_bvector.h
+cross/include/c++/3.4.5/bits/stl_construct.h
+cross/include/c++/3.4.5/bits/stl_deque.h
+cross/include/c++/3.4.5/bits/stl_function.h
+cross/include/c++/3.4.5/bits/stl_heap.h
+cross/include/c++/3.4.5/bits/stl_iterator.h
+cross/include/c++/3.4.5/bits/stl_iterator_base_funcs.h
+cross/include/c++/3.4.5/bits/stl_iterator_base_types.h
+cross/include/c++/3.4.5/bits/stl_list.h
+cross/include/c++/3.4.5/bits/stl_map.h
+cross/include/c++/3.4.5/bits/stl_multimap.h
+cross/include/c++/3.4.5/bits/stl_multiset.h
+cross/include/c++/3.4.5/bits/stl_numeric.h
+cross/include/c++/3.4.5/bits/stl_pair.h
+cross/include/c++/3.4.5/bits/stl_queue.h
+cross/include/c++/3.4.5/bits/stl_raw_storage_iter.h
+cross/include/c++/3.4.5/bits/stl_relops.h
+cross/include/c++/3.4.5/bits/stl_set.h
+cross/include/c++/3.4.5/bits/stl_stack.h
+cross/include/c++/3.4.5/bits/stl_tempbuf.h
+cross/include/c++/3.4.5/bits/stl_threads.h
+cross/include/c++/3.4.5/bits/stl_tree.h
+cross/include/c++/3.4.5/bits/stl_uninitialized.h
+cross/include/c++/3.4.5/bits/stl_vector.h
+cross/include/c++/3.4.5/bits/stream_iterator.h
+cross/include/c++/3.4.5/bits/streambuf.tcc
+cross/include/c++/3.4.5/bits/streambuf_iterator.h
+cross/include/c++/3.4.5/bits/stringfwd.h
+cross/include/c++/3.4.5/bits/type_traits.h
+cross/include/c++/3.4.5/bits/valarray_after.h
+cross/include/c++/3.4.5/bits/valarray_array.h
+cross/include/c++/3.4.5/bits/valarray_array.tcc
+cross/include/c++/3.4.5/bits/valarray_before.h
+cross/include/c++/3.4.5/bits/vector.tcc
+cross/include/c++/3.4.5/bitset
+cross/include/c++/3.4.5/cassert
+cross/include/c++/3.4.5/cctype
+cross/include/c++/3.4.5/cerrno
+cross/include/c++/3.4.5/cfloat
+cross/include/c++/3.4.5/ciso646
+cross/include/c++/3.4.5/climits
+cross/include/c++/3.4.5/clocale
+cross/include/c++/3.4.5/cmath
+cross/include/c++/3.4.5/complex
+cross/include/c++/3.4.5/csetjmp
+cross/include/c++/3.4.5/csignal
+cross/include/c++/3.4.5/cstdarg
+cross/include/c++/3.4.5/cstddef
+cross/include/c++/3.4.5/cstdio
+cross/include/c++/3.4.5/cstdlib
+cross/include/c++/3.4.5/cstring
+cross/include/c++/3.4.5/ctime
+cross/include/c++/3.4.5/cwchar
+cross/include/c++/3.4.5/cwctype
+cross/include/c++/3.4.5/cxxabi.h
+cross/include/c++/3.4.5/debug/bitset
+cross/include/c++/3.4.5/debug/debug.h
+cross/include/c++/3.4.5/debug/deque
+cross/include/c++/3.4.5/debug/formatter.h
+cross/include/c++/3.4.5/debug/hash_map
+cross/include/c++/3.4.5/debug/hash_map.h
+cross/include/c++/3.4.5/debug/hash_multimap.h
+cross/include/c++/3.4.5/debug/hash_multiset.h
+cross/include/c++/3.4.5/debug/hash_set
+cross/include/c++/3.4.5/debug/hash_set.h
+cross/include/c++/3.4.5/debug/list
+cross/include/c++/3.4.5/debug/map
+cross/include/c++/3.4.5/debug/map.h
+cross/include/c++/3.4.5/debug/multimap.h
+cross/include/c++/3.4.5/debug/multiset.h
+cross/include/c++/3.4.5/debug/safe_base.h
+cross/include/c++/3.4.5/debug/safe_iterator.h
+cross/include/c++/3.4.5/debug/safe_iterator.tcc
+cross/include/c++/3.4.5/debug/safe_sequence.h
+cross/include/c++/3.4.5/debug/set
+cross/include/c++/3.4.5/debug/set.h
+cross/include/c++/3.4.5/debug/string
+cross/include/c++/3.4.5/debug/vector
+cross/include/c++/3.4.5/deque
+cross/include/c++/3.4.5/exception
+cross/include/c++/3.4.5/exception_defines.h
+cross/include/c++/3.4.5/ext/algorithm
+cross/include/c++/3.4.5/ext/bitmap_allocator.h
+cross/include/c++/3.4.5/ext/debug_allocator.h
+cross/include/c++/3.4.5/ext/enc_filebuf.h
+cross/include/c++/3.4.5/ext/functional
+cross/include/c++/3.4.5/ext/hash_fun.h
+cross/include/c++/3.4.5/ext/hash_map
+cross/include/c++/3.4.5/ext/hash_set
+cross/include/c++/3.4.5/ext/hashtable.h
+cross/include/c++/3.4.5/ext/iterator
+cross/include/c++/3.4.5/ext/malloc_allocator.h
+cross/include/c++/3.4.5/ext/memory
+cross/include/c++/3.4.5/ext/mt_allocator.h
+cross/include/c++/3.4.5/ext/new_allocator.h
+cross/include/c++/3.4.5/ext/numeric
+cross/include/c++/3.4.5/ext/pod_char_traits.h
+cross/include/c++/3.4.5/ext/pool_allocator.h
+cross/include/c++/3.4.5/ext/rb_tree
+cross/include/c++/3.4.5/ext/rope
+cross/include/c++/3.4.5/ext/ropeimpl.h
+cross/include/c++/3.4.5/ext/slist
+cross/include/c++/3.4.5/ext/stdio_filebuf.h
+cross/include/c++/3.4.5/ext/stdio_sync_filebuf.h
+cross/include/c++/3.4.5/fstream
+cross/include/c++/3.4.5/functional
+cross/include/c++/3.4.5/i386--mingw32/bits/atomic_word.h
+cross/include/c++/3.4.5/i386--mingw32/bits/basic_file.h
+cross/include/c++/3.4.5/i386--mingw32/bits/c++allocator.h
+cross/include/c++/3.4.5/i386--mingw32/bits/c++config.h
+cross/include/c++/3.4.5/i386--mingw32/bits/c++io.h
+cross/include/c++/3.4.5/i386--mingw32/bits/c++locale.h
+cross/include/c++/3.4.5/i386--mingw32/bits/codecvt_specializations.h
+cross/include/c++/3.4.5/i386--mingw32/bits/ctype_base.h
+cross/include/c++/3.4.5/i386--mingw32/bits/ctype_inline.h
+cross/include/c++/3.4.5/i386--mingw32/bits/ctype_noninline.h
+cross/include/c++/3.4.5/i386--mingw32/bits/gthr-default.h
+cross/include/c++/3.4.5/i386--mingw32/bits/gthr-posix.h
+cross/include/c++/3.4.5/i386--mingw32/bits/gthr-single.h
+cross/include/c++/3.4.5/i386--mingw32/bits/gthr.h
+cross/include/c++/3.4.5/i386--mingw32/bits/messages_members.h
+cross/include/c++/3.4.5/i386--mingw32/bits/os_defines.h
+cross/include/c++/3.4.5/i386--mingw32/bits/time_members.h
+cross/include/c++/3.4.5/iomanip
+cross/include/c++/3.4.5/ios
+cross/include/c++/3.4.5/iosfwd
+cross/include/c++/3.4.5/iostream
+cross/include/c++/3.4.5/istream
+cross/include/c++/3.4.5/iterator
+cross/include/c++/3.4.5/limits
+cross/include/c++/3.4.5/list
+cross/include/c++/3.4.5/locale
+cross/include/c++/3.4.5/map
+cross/include/c++/3.4.5/memory
+cross/include/c++/3.4.5/new
+cross/include/c++/3.4.5/numeric
+cross/include/c++/3.4.5/ostream
+cross/include/c++/3.4.5/queue
+cross/include/c++/3.4.5/set
+cross/include/c++/3.4.5/sstream
+cross/include/c++/3.4.5/stack
+cross/include/c++/3.4.5/stdexcept
+cross/include/c++/3.4.5/streambuf
+cross/include/c++/3.4.5/string
+cross/include/c++/3.4.5/typeinfo
+cross/include/c++/3.4.5/utility
+cross/include/c++/3.4.5/valarray
+cross/include/c++/3.4.5/vector
+cross/info/cpp.info
+cross/info/cppinternals.info
+cross/info/gcc.info
+cross/info/gccinstall.info
+cross/info/gccint.info
+cross/lib/gcc/i386--mingw32/3.4.5/crtbegin.o
+cross/lib/gcc/i386--mingw32/3.4.5/crtend.o
+cross/lib/gcc/i386--mingw32/3.4.5/include/README
+cross/lib/gcc/i386--mingw32/3.4.5/include/emmintrin.h
+cross/lib/gcc/i386--mingw32/3.4.5/include/float.h
+cross/lib/gcc/i386--mingw32/3.4.5/include/iso646.h
+cross/lib/gcc/i386--mingw32/3.4.5/include/limits.h
+cross/lib/gcc/i386--mingw32/3.4.5/include/mm_malloc.h
+cross/lib/gcc/i386--mingw32/3.4.5/include/mmintrin.h
+cross/lib/gcc/i386--mingw32/3.4.5/include/objc/NXConstStr.h
+cross/lib/gcc/i386--mingw32/3.4.5/include/objc/Object.h
+cross/lib/gcc/i386--mingw32/3.4.5/include/objc/Protocol.h
+cross/lib/gcc/i386--mingw32/3.4.5/include/objc/encoding.h
+cross/lib/gcc/i386--mingw32/3.4.5/include/objc/hash.h
+cross/lib/gcc/i386--mingw32/3.4.5/include/objc/objc-api.h
+cross/lib/gcc/i386--mingw32/3.4.5/include/objc/objc-list.h
+cross/lib/gcc/i386--mingw32/3.4.5/include/objc/objc.h
+cross/lib/gcc/i386--mingw32/3.4.5/include/objc/sarray.h
+cross/lib/gcc/i386--mingw32/3.4.5/include/objc/thr.h
+cross/lib/gcc/i386--mingw32/3.4.5/include/objc/typedstream.h
+cross/lib/gcc/i386--mingw32/3.4.5/include/pmmintrin.h
+cross/lib/gcc/i386--mingw32/3.4.5/include/stdarg.h
+cross/lib/gcc/i386--mingw32/3.4.5/include/stdbool.h
+cross/lib/gcc/i386--mingw32/3.4.5/include/stddef.h
+cross/lib/gcc/i386--mingw32/3.4.5/include/syslimits.h
+cross/lib/gcc/i386--mingw32/3.4.5/include/unwind.h
+cross/lib/gcc/i386--mingw32/3.4.5/include/varargs.h
+cross/lib/gcc/i386--mingw32/3.4.5/include/xmmintrin.h
+cross/lib/gcc/i386--mingw32/3.4.5/install-tools/gsyslimits.h
+cross/lib/gcc/i386--mingw32/3.4.5/install-tools/include/README
+cross/lib/gcc/i386--mingw32/3.4.5/install-tools/include/emmintrin.h
+cross/lib/gcc/i386--mingw32/3.4.5/install-tools/include/float.h
+cross/lib/gcc/i386--mingw32/3.4.5/install-tools/include/iso646.h
+cross/lib/gcc/i386--mingw32/3.4.5/install-tools/include/limits.h
+cross/lib/gcc/i386--mingw32/3.4.5/install-tools/include/mm_malloc.h
+cross/lib/gcc/i386--mingw32/3.4.5/install-tools/include/mmintrin.h
+cross/lib/gcc/i386--mingw32/3.4.5/install-tools/include/pmmintrin.h
+cross/lib/gcc/i386--mingw32/3.4.5/install-tools/include/stdarg.h
+cross/lib/gcc/i386--mingw32/3.4.5/install-tools/include/stdbool.h
+cross/lib/gcc/i386--mingw32/3.4.5/install-tools/include/stddef.h
+cross/lib/gcc/i386--mingw32/3.4.5/install-tools/include/unwind.h
+cross/lib/gcc/i386--mingw32/3.4.5/install-tools/include/varargs.h
+cross/lib/gcc/i386--mingw32/3.4.5/install-tools/include/xmmintrin.h
+cross/lib/gcc/i386--mingw32/3.4.5/install-tools/mkheaders.conf
+cross/lib/gcc/i386--mingw32/3.4.5/libgcc.a
+cross/lib/gcc/i386--mingw32/3.4.5/libgcov.a
+cross/lib/gcc/i386--mingw32/3.4.5/specs
+cross/lib/libiberty.a
+cross/libexec/gcc/i386--mingw32/3.4.5/cc1
+cross/libexec/gcc/i386--mingw32/3.4.5/cc1obj
+cross/libexec/gcc/i386--mingw32/3.4.5/cc1plus
+cross/libexec/gcc/i386--mingw32/3.4.5/collect2
+cross/libexec/gcc/i386--mingw32/3.4.5/install-tools/fixinc.sh
+cross/libexec/gcc/i386--mingw32/3.4.5/install-tools/mkheaders
+cross/man/man1/i386--mingw32-cpp.1
+cross/man/man1/i386--mingw32-g++.1
+cross/man/man1/i386--mingw32-gcc.1
+cross/man/man1/i386--mingw32-gcov.1
+cross/man/man7/fsf-funding.7
+cross/man/man7/gfdl.7
+cross/man/man7/gpl.7
+cross/share/locale/be/LC_MESSAGES/gcc.mo
+cross/share/locale/ca/LC_MESSAGES/gcc.mo
+cross/share/locale/da/LC_MESSAGES/gcc.mo
+cross/share/locale/de/LC_MESSAGES/gcc.mo
+cross/share/locale/el/LC_MESSAGES/gcc.mo
+cross/share/locale/es/LC_MESSAGES/gcc.mo
+cross/share/locale/fr/LC_MESSAGES/gcc.mo
+cross/share/locale/ja/LC_MESSAGES/gcc.mo
+cross/share/locale/nl/LC_MESSAGES/gcc.mo
+cross/share/locale/rw/LC_MESSAGES/gcc.mo
+cross/share/locale/sv/LC_MESSAGES/gcc.mo
+cross/share/locale/tr/LC_MESSAGES/gcc.mo
diff --git a/cross/mingw-runtime-bin/Makefile b/cross/mingw-runtime-bin/Makefile
index 80e72da9d2e..399479f8cff 100644
--- a/cross/mingw-runtime-bin/Makefile
+++ b/cross/mingw-runtime-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/04/19 01:15:20 asau Exp $
+# $NetBSD: Makefile,v 1.4 2016/06/19 16:20:27 wiz Exp $
 
 DISTNAME=	mingw-runtime-3.14
 PKGNAME=	mingw-runtime-bin-3.14
@@ -11,7 +11,6 @@ COMMENT=	GCC runtime libraries for win32 cross-development
 
 NO_BUILD=	yes
 NO_CONFIGURE=	yes
-USE_CROSSBASE=	yes
 USE_TOOLS+=	pax
 WRKSRC=		${WRKDIR}
 
@@ -19,7 +18,7 @@ INSTALLATION_DIRS+=	${MINGW_TARGET}
 
 do-install:
 	cd ${WRKSRC} && pax -rw -pp bin include lib \
-		${DESTDIR}${PREFIX}/${MINGW_TARGET}
+		${DESTDIR}${PREFIX}/cross/${MINGW_TARGET}
 
 .include "../../cross/mingw/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cross/mingw-runtime-bin/PLIST b/cross/mingw-runtime-bin/PLIST
index a3d8e06f7fd..d0a56e5e37b 100644
--- a/cross/mingw-runtime-bin/PLIST
+++ b/cross/mingw-runtime-bin/PLIST
@@ -1,91 +1,91 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/03/15 18:34:39 asau Exp $
-${MINGW_TARGET}/bin/mingwm10.dll
-${MINGW_TARGET}/include/assert.h
-${MINGW_TARGET}/include/conio.h
-${MINGW_TARGET}/include/complex.h
-${MINGW_TARGET}/include/ctype.h
-${MINGW_TARGET}/include/dir.h
-${MINGW_TARGET}/include/direct.h
-${MINGW_TARGET}/include/dirent.h
-${MINGW_TARGET}/include/dos.h
-${MINGW_TARGET}/include/errno.h
-${MINGW_TARGET}/include/excpt.h
-${MINGW_TARGET}/include/fcntl.h
-${MINGW_TARGET}/include/fenv.h
-${MINGW_TARGET}/include/float.h
-${MINGW_TARGET}/include/getopt.h
-${MINGW_TARGET}/include/gmon.h
-${MINGW_TARGET}/include/inttypes.h
-${MINGW_TARGET}/include/io.h
-${MINGW_TARGET}/include/libgen.h
-${MINGW_TARGET}/include/limits.h
-${MINGW_TARGET}/include/locale.h
-${MINGW_TARGET}/include/malloc.h
-${MINGW_TARGET}/include/math.h
-${MINGW_TARGET}/include/mbctype.h
-${MINGW_TARGET}/include/mbstring.h
-${MINGW_TARGET}/include/mem.h
-${MINGW_TARGET}/include/memory.h
-${MINGW_TARGET}/include/process.h
-${MINGW_TARGET}/include/profil.h
-${MINGW_TARGET}/include/profile.h
-${MINGW_TARGET}/include/search.h
-${MINGW_TARGET}/include/setjmp.h
-${MINGW_TARGET}/include/share.h
-${MINGW_TARGET}/include/signal.h
-${MINGW_TARGET}/include/stdint.h
-${MINGW_TARGET}/include/stdio.h
-${MINGW_TARGET}/include/stdlib.h
-${MINGW_TARGET}/include/string.h
-${MINGW_TARGET}/include/strings.h
-${MINGW_TARGET}/include/sys/fcntl.h
-${MINGW_TARGET}/include/sys/file.h
-${MINGW_TARGET}/include/sys/locking.h
-${MINGW_TARGET}/include/sys/param.h
-${MINGW_TARGET}/include/sys/stat.h
-${MINGW_TARGET}/include/sys/time.h
-${MINGW_TARGET}/include/sys/timeb.h
-${MINGW_TARGET}/include/sys/types.h
-${MINGW_TARGET}/include/sys/unistd.h
-${MINGW_TARGET}/include/sys/utime.h
-${MINGW_TARGET}/include/tchar.h
-${MINGW_TARGET}/include/time.h
-${MINGW_TARGET}/include/unistd.h
-${MINGW_TARGET}/include/utime.h
-${MINGW_TARGET}/include/values.h
-${MINGW_TARGET}/include/varargs.h
-${MINGW_TARGET}/include/wchar.h
-${MINGW_TARGET}/include/wctype.h
-${MINGW_TARGET}/include/_mingw.h
-${MINGW_TARGET}/lib/binmode.o
-${MINGW_TARGET}/lib/crt1.o
-${MINGW_TARGET}/lib/crt2.o
-${MINGW_TARGET}/lib/crtmt.o
-${MINGW_TARGET}/lib/crtst.o
-${MINGW_TARGET}/lib/CRT_fp10.o
-${MINGW_TARGET}/lib/CRT_fp8.o
-${MINGW_TARGET}/lib/CRT_noglob.o
-${MINGW_TARGET}/lib/dllcrt1.o
-${MINGW_TARGET}/lib/dllcrt2.o
-${MINGW_TARGET}/lib/gcrt1.o
-${MINGW_TARGET}/lib/gcrt2.o
-${MINGW_TARGET}/lib/libcoldname.a
-${MINGW_TARGET}/lib/libcrtdll.a
-${MINGW_TARGET}/lib/libgmon.a
-${MINGW_TARGET}/lib/libm.a
-${MINGW_TARGET}/lib/libmingw32.a
-${MINGW_TARGET}/lib/libmingwex.a
-${MINGW_TARGET}/lib/libmingwthrd.a
-${MINGW_TARGET}/lib/libmoldname.a
-${MINGW_TARGET}/lib/libmoldnamed.a
-${MINGW_TARGET}/lib/libmsvcr70.a
-${MINGW_TARGET}/lib/libmsvcr70d.a
-${MINGW_TARGET}/lib/libmsvcrt.a
-${MINGW_TARGET}/lib/libmsvcr71.a
-${MINGW_TARGET}/lib/libmsvcr71d.a
-${MINGW_TARGET}/lib/libmsvcrtd.a
-${MINGW_TARGET}/lib/libmsvcr80.a
-${MINGW_TARGET}/lib/libmsvcr80d.a
-${MINGW_TARGET}/lib/libmsvcr90.a
-${MINGW_TARGET}/lib/libmsvcr90d.a
-${MINGW_TARGET}/lib/txtmode.o
+@comment $NetBSD: PLIST,v 1.2 2016/06/19 16:20:27 wiz Exp $
+cross/${MINGW_TARGET}/bin/mingwm10.dll
+cross/${MINGW_TARGET}/include/assert.h
+cross/${MINGW_TARGET}/include/conio.h
+cross/${MINGW_TARGET}/include/complex.h
+cross/${MINGW_TARGET}/include/ctype.h
+cross/${MINGW_TARGET}/include/dir.h
+cross/${MINGW_TARGET}/include/direct.h
+cross/${MINGW_TARGET}/include/dirent.h
+cross/${MINGW_TARGET}/include/dos.h
+cross/${MINGW_TARGET}/include/errno.h
+cross/${MINGW_TARGET}/include/excpt.h
+cross/${MINGW_TARGET}/include/fcntl.h
+cross/${MINGW_TARGET}/include/fenv.h
+cross/${MINGW_TARGET}/include/float.h
+cross/${MINGW_TARGET}/include/getopt.h
+cross/${MINGW_TARGET}/include/gmon.h
+cross/${MINGW_TARGET}/include/inttypes.h
+cross/${MINGW_TARGET}/include/io.h
+cross/${MINGW_TARGET}/include/libgen.h
+cross/${MINGW_TARGET}/include/limits.h
+cross/${MINGW_TARGET}/include/locale.h
+cross/${MINGW_TARGET}/include/malloc.h
+cross/${MINGW_TARGET}/include/math.h
+cross/${MINGW_TARGET}/include/mbctype.h
+cross/${MINGW_TARGET}/include/mbstring.h
+cross/${MINGW_TARGET}/include/mem.h
+cross/${MINGW_TARGET}/include/memory.h
+cross/${MINGW_TARGET}/include/process.h
+cross/${MINGW_TARGET}/include/profil.h
+cross/${MINGW_TARGET}/include/profile.h
+cross/${MINGW_TARGET}/include/search.h
+cross/${MINGW_TARGET}/include/setjmp.h
+cross/${MINGW_TARGET}/include/share.h
+cross/${MINGW_TARGET}/include/signal.h
+cross/${MINGW_TARGET}/include/stdint.h
+cross/${MINGW_TARGET}/include/stdio.h
+cross/${MINGW_TARGET}/include/stdlib.h
+cross/${MINGW_TARGET}/include/string.h
+cross/${MINGW_TARGET}/include/strings.h
+cross/${MINGW_TARGET}/include/sys/fcntl.h
+cross/${MINGW_TARGET}/include/sys/file.h
+cross/${MINGW_TARGET}/include/sys/locking.h
+cross/${MINGW_TARGET}/include/sys/param.h
+cross/${MINGW_TARGET}/include/sys/stat.h
+cross/${MINGW_TARGET}/include/sys/time.h
+cross/${MINGW_TARGET}/include/sys/timeb.h
+cross/${MINGW_TARGET}/include/sys/types.h
+cross/${MINGW_TARGET}/include/sys/unistd.h
+cross/${MINGW_TARGET}/include/sys/utime.h
+cross/${MINGW_TARGET}/include/tchar.h
+cross/${MINGW_TARGET}/include/time.h
+cross/${MINGW_TARGET}/include/unistd.h
+cross/${MINGW_TARGET}/include/utime.h
+cross/${MINGW_TARGET}/include/values.h
+cross/${MINGW_TARGET}/include/varargs.h
+cross/${MINGW_TARGET}/include/wchar.h
+cross/${MINGW_TARGET}/include/wctype.h
+cross/${MINGW_TARGET}/include/_mingw.h
+cross/${MINGW_TARGET}/lib/binmode.o
+cross/${MINGW_TARGET}/lib/crt1.o
+cross/${MINGW_TARGET}/lib/crt2.o
+cross/${MINGW_TARGET}/lib/crtmt.o
+cross/${MINGW_TARGET}/lib/crtst.o
+cross/${MINGW_TARGET}/lib/CRT_fp10.o
+cross/${MINGW_TARGET}/lib/CRT_fp8.o
+cross/${MINGW_TARGET}/lib/CRT_noglob.o
+cross/${MINGW_TARGET}/lib/dllcrt1.o
+cross/${MINGW_TARGET}/lib/dllcrt2.o
+cross/${MINGW_TARGET}/lib/gcrt1.o
+cross/${MINGW_TARGET}/lib/gcrt2.o
+cross/${MINGW_TARGET}/lib/libcoldname.a
+cross/${MINGW_TARGET}/lib/libcrtdll.a
+cross/${MINGW_TARGET}/lib/libgmon.a
+cross/${MINGW_TARGET}/lib/libm.a
+cross/${MINGW_TARGET}/lib/libmingw32.a
+cross/${MINGW_TARGET}/lib/libmingwex.a
+cross/${MINGW_TARGET}/lib/libmingwthrd.a
+cross/${MINGW_TARGET}/lib/libmoldname.a
+cross/${MINGW_TARGET}/lib/libmoldnamed.a
+cross/${MINGW_TARGET}/lib/libmsvcr70.a
+cross/${MINGW_TARGET}/lib/libmsvcr70d.a
+cross/${MINGW_TARGET}/lib/libmsvcrt.a
+cross/${MINGW_TARGET}/lib/libmsvcr71.a
+cross/${MINGW_TARGET}/lib/libmsvcr71d.a
+cross/${MINGW_TARGET}/lib/libmsvcrtd.a
+cross/${MINGW_TARGET}/lib/libmsvcr80.a
+cross/${MINGW_TARGET}/lib/libmsvcr80d.a
+cross/${MINGW_TARGET}/lib/libmsvcr90.a
+cross/${MINGW_TARGET}/lib/libmsvcr90d.a
+cross/${MINGW_TARGET}/lib/txtmode.o
diff --git a/cross/mingw-w32api-bin/Makefile b/cross/mingw-w32api-bin/Makefile
index 55d7a51a8dd..595e9c51b26 100644
--- a/cross/mingw-w32api-bin/Makefile
+++ b/cross/mingw-w32api-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/04/19 01:15:46 asau Exp $
+# $NetBSD: Makefile,v 1.4 2016/06/19 16:20:27 wiz Exp $
 
 DISTNAME=		w32api-3.11
 PKGNAME=		mingw-w32api-bin-3.11
@@ -11,7 +11,6 @@ COMMENT=		GCC libraries for win32 cross-development
 
 NO_BUILD=		yes
 NO_CONFIGURE=		yes
-USE_CROSSBASE=		yes
 USE_TOOLS+=		pax
 WRKSRC=			${WRKDIR}
 
@@ -19,7 +18,7 @@ INSTALLATION_DIRS+=	${MINGW_TARGET}
 
 do-install:
 	cd ${WRKSRC} && pax -rw -pp include lib \
-		${DESTDIR}${PREFIX}/${MINGW_TARGET}
+		${DESTDIR}${PREFIX}/cross/${MINGW_TARGET}
 
 .include "../../cross/mingw/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cross/mingw-w32api-bin/PLIST b/cross/mingw-w32api-bin/PLIST
index 16e29563750..0c860ca3e8f 100644
--- a/cross/mingw-w32api-bin/PLIST
+++ b/cross/mingw-w32api-bin/PLIST
@@ -1,459 +1,459 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/03/15 18:34:41 asau Exp $
-${MINGW_TARGET}/include/accctrl.h
-${MINGW_TARGET}/include/aclapi.h
-${MINGW_TARGET}/include/aclui.h
-${MINGW_TARGET}/include/adsprop.h
-${MINGW_TARGET}/include/afxres.h
-${MINGW_TARGET}/include/amaudio.h
-${MINGW_TARGET}/include/amvideo.h
-${MINGW_TARGET}/include/audevcod.h
-${MINGW_TARGET}/include/aviriff.h
-${MINGW_TARGET}/include/aygshell.h
-${MINGW_TARGET}/include/basetsd.h
-${MINGW_TARGET}/include/basetyps.h
-${MINGW_TARGET}/include/bdatypes.h
-${MINGW_TARGET}/include/cderr.h
-${MINGW_TARGET}/include/cguid.h
-${MINGW_TARGET}/include/cmnquery.h
-${MINGW_TARGET}/include/comcat.h
-${MINGW_TARGET}/include/commctrl.h
-${MINGW_TARGET}/include/commdlg.h
-${MINGW_TARGET}/include/control.h
-${MINGW_TARGET}/include/cpl.h
-${MINGW_TARGET}/include/cplext.h
-${MINGW_TARGET}/include/custcntl.h
-${MINGW_TARGET}/include/d3d9.h
-${MINGW_TARGET}/include/d3d9caps.h
-${MINGW_TARGET}/include/d3d9types.h
-${MINGW_TARGET}/include/dbt.h
-${MINGW_TARGET}/include/dde.h
-${MINGW_TARGET}/include/ddeml.h
-${MINGW_TARGET}/include/ddk/atm.h
-${MINGW_TARGET}/include/ddk/batclass.h
-${MINGW_TARGET}/include/ddk/cfg.h
-${MINGW_TARGET}/include/ddk/cfgmgr32.h
-${MINGW_TARGET}/include/ddk/d4drvif.h
-${MINGW_TARGET}/include/ddk/d4iface.h
-${MINGW_TARGET}/include/ddk/ddkmapi.h
-${MINGW_TARGET}/include/ddk/hidclass.h
-${MINGW_TARGET}/include/ddk/hidpi.h
-${MINGW_TARGET}/include/ddk/hidsdi.h
-${MINGW_TARGET}/include/ddk/hidsdi.h
-${MINGW_TARGET}/include/ddk/hidusage.h
-${MINGW_TARGET}/include/ddk/kbdmou.h
-${MINGW_TARGET}/include/ddk/mcd.h
-${MINGW_TARGET}/include/ddk/miniport.h
-${MINGW_TARGET}/include/ddk/minitape.h
-${MINGW_TARGET}/include/ddk/mountdev.h
-${MINGW_TARGET}/include/ddk/mountmgr.h
-${MINGW_TARGET}/include/ddk/ndis.h
-${MINGW_TARGET}/include/ddk/ndisguid.h
-${MINGW_TARGET}/include/ddk/ndistapi.h
-${MINGW_TARGET}/include/ddk/ndiswan.h
-${MINGW_TARGET}/include/ddk/netevent.h
-${MINGW_TARGET}/include/ddk/netpnp.h
-${MINGW_TARGET}/include/ddk/newdev.h
-${MINGW_TARGET}/include/ddk/ntapi.h
-${MINGW_TARGET}/include/ddk/ntdd8042.h
-${MINGW_TARGET}/include/ddk/ntddbeep.h
-${MINGW_TARGET}/include/ddk/ntddcdrm.h
-${MINGW_TARGET}/include/ddk/ntddcdvd.h
-${MINGW_TARGET}/include/ddk/ntddchgr.h
-${MINGW_TARGET}/include/ddk/ntdddisk.h
-${MINGW_TARGET}/include/ddk/ntddk.h
-${MINGW_TARGET}/include/ddk/ntddkbd.h
-${MINGW_TARGET}/include/ddk/ntddmou.h
-${MINGW_TARGET}/include/ddk/ntddndis.h
-${MINGW_TARGET}/include/ddk/ntddpar.h
-${MINGW_TARGET}/include/ddk/ntddpcm.h
-${MINGW_TARGET}/include/ddk/ntddscsi.h
-${MINGW_TARGET}/include/ddk/ntddser.h
-${MINGW_TARGET}/include/ddk/ntddstor.h
-${MINGW_TARGET}/include/ddk/ntddtape.h
-${MINGW_TARGET}/include/ddk/ntddtdi.h
-${MINGW_TARGET}/include/ddk/ntddvdeo.h
-${MINGW_TARGET}/include/ddk/ntddvol.h
-${MINGW_TARGET}/include/ddk/ntifs.h
-${MINGW_TARGET}/include/ddk/ntpoapi.h
-${MINGW_TARGET}/include/ddk/ntstatus.h
-${MINGW_TARGET}/include/ddk/parallel.h
-${MINGW_TARGET}/include/ddk/pfhook.h
-${MINGW_TARGET}/include/ddk/poclass.h
-${MINGW_TARGET}/include/ddk/scsi.h
-${MINGW_TARGET}/include/ddk/scsiscan.h
-${MINGW_TARGET}/include/ddk/scsiwmi.h
-${MINGW_TARGET}/include/ddk/smbus.h
-${MINGW_TARGET}/include/ddk/srb.h
-${MINGW_TARGET}/include/ddk/storport.h
-${MINGW_TARGET}/include/ddk/tdi.h
-${MINGW_TARGET}/include/ddk/tdiinfo.h
-${MINGW_TARGET}/include/ddk/tdikrnl.h
-${MINGW_TARGET}/include/ddk/tdistat.h
-${MINGW_TARGET}/include/ddk/tvout.h
-${MINGW_TARGET}/include/ddk/upssvc.h
-${MINGW_TARGET}/include/ddk/usb.h
-${MINGW_TARGET}/include/ddk/usb100.h
-${MINGW_TARGET}/include/ddk/usbcamdi.h
-${MINGW_TARGET}/include/ddk/usbdi.h
-${MINGW_TARGET}/include/ddk/usbioctl.h
-${MINGW_TARGET}/include/ddk/usbiodef.h
-${MINGW_TARGET}/include/ddk/usbscan.h
-${MINGW_TARGET}/include/ddk/usbuser.h
-${MINGW_TARGET}/include/ddk/video.h
-${MINGW_TARGET}/include/ddk/videoagp.h
-${MINGW_TARGET}/include/ddk/win2k.h
-${MINGW_TARGET}/include/ddk/winddi.h
-${MINGW_TARGET}/include/ddk/winddk.h
-${MINGW_TARGET}/include/ddk/winnt4.h
-${MINGW_TARGET}/include/ddk/winxp.h
-${MINGW_TARGET}/include/ddk/ws2san.h
-${MINGW_TARGET}/include/ddk/xfilter.h
-${MINGW_TARGET}/include/devguid.h
-${MINGW_TARGET}/include/dhcpcsdk.h
-${MINGW_TARGET}/include/dlgs.h
-${MINGW_TARGET}/include/docobj.h
-${MINGW_TARGET}/include/dsadmin.h
-${MINGW_TARGET}/include/dsclient.h
-${MINGW_TARGET}/include/dsgetdc.h
-${MINGW_TARGET}/include/dshow.h
-${MINGW_TARGET}/include/dsquery.h
-${MINGW_TARGET}/include/dsrole.h
-${MINGW_TARGET}/include/dvdevcod.h
-${MINGW_TARGET}/include/dvdmedia.h
-${MINGW_TARGET}/include/dxerr8.h
-${MINGW_TARGET}/include/dxerr9.h
-${MINGW_TARGET}/include/edevdefs.h
-${MINGW_TARGET}/include/errorrep.h
-${MINGW_TARGET}/include/errors.h
-${MINGW_TARGET}/include/evcode.h
-${MINGW_TARGET}/include/exdisp.h
-${MINGW_TARGET}/include/exdispid.h
-${MINGW_TARGET}/include/fltdefs.h
-${MINGW_TARGET}/include/GL/gl.h
-${MINGW_TARGET}/include/GL/glext.h
-${MINGW_TARGET}/include/GL/glu.h
-${MINGW_TARGET}/include/httpext.h
-${MINGW_TARGET}/include/icm.h
-${MINGW_TARGET}/include/idispids.h
-${MINGW_TARGET}/include/il21dec.h
-${MINGW_TARGET}/include/imagehlp.h
-${MINGW_TARGET}/include/imm.h
-${MINGW_TARGET}/include/initguid.h
-${MINGW_TARGET}/include/intshcut.h
-${MINGW_TARGET}/include/ipexport.h
-${MINGW_TARGET}/include/iphlpapi.h
-${MINGW_TARGET}/include/ipifcons.h
-${MINGW_TARGET}/include/ipinfoid.h
-${MINGW_TARGET}/include/iprtrmib.h
-${MINGW_TARGET}/include/iptypes.h
-${MINGW_TARGET}/include/ipxconst.h
-${MINGW_TARGET}/include/ipxrtdef.h
-${MINGW_TARGET}/include/ipxtfflt.h
-${MINGW_TARGET}/include/isguids.h
-${MINGW_TARGET}/include/ks.h
-${MINGW_TARGET}/include/ksmedia.h
-${MINGW_TARGET}/include/largeint.h
-${MINGW_TARGET}/include/lm.h
-${MINGW_TARGET}/include/lmaccess.h
-${MINGW_TARGET}/include/lmalert.h
-${MINGW_TARGET}/include/lmapibuf.h
-${MINGW_TARGET}/include/lmat.h
-${MINGW_TARGET}/include/lmaudit.h
-${MINGW_TARGET}/include/lmbrowsr.h
-${MINGW_TARGET}/include/lmchdev.h
-${MINGW_TARGET}/include/lmconfig.h
-${MINGW_TARGET}/include/lmcons.h
-${MINGW_TARGET}/include/lmerr.h
-${MINGW_TARGET}/include/lmerrlog.h
-${MINGW_TARGET}/include/lmmsg.h
-${MINGW_TARGET}/include/lmremutl.h
-${MINGW_TARGET}/include/lmrepl.h
-${MINGW_TARGET}/include/lmserver.h
-${MINGW_TARGET}/include/lmshare.h
-${MINGW_TARGET}/include/lmsname.h
-${MINGW_TARGET}/include/lmstats.h
-${MINGW_TARGET}/include/lmsvc.h
-${MINGW_TARGET}/include/lmuse.h
-${MINGW_TARGET}/include/lmuseflg.h
-${MINGW_TARGET}/include/lmwksta.h
-${MINGW_TARGET}/include/lzexpand.h
-${MINGW_TARGET}/include/mapi.h
-${MINGW_TARGET}/include/mciavi.h
-${MINGW_TARGET}/include/mcx.h
-${MINGW_TARGET}/include/mgm.h
-${MINGW_TARGET}/include/mgmtapi.h
-${MINGW_TARGET}/include/mlang.h
-${MINGW_TARGET}/include/mmreg.h
-${MINGW_TARGET}/include/mmsystem.h
-${MINGW_TARGET}/include/mpegtype.h
-${MINGW_TARGET}/include/mprapi.h
-${MINGW_TARGET}/include/mq.h
-${MINGW_TARGET}/include/msacm.h
-${MINGW_TARGET}/include/mshtml.h
-${MINGW_TARGET}/include/mswsock.h
-${MINGW_TARGET}/include/nb30.h
-${MINGW_TARGET}/include/nddeapi.h
-${MINGW_TARGET}/include/nspapi.h
-${MINGW_TARGET}/include/ntdef.h
-${MINGW_TARGET}/include/ntdll.h
-${MINGW_TARGET}/include/ntdsapi.h
-${MINGW_TARGET}/include/ntdsbcli.h
-${MINGW_TARGET}/include/ntldap.h
-${MINGW_TARGET}/include/ntsecapi.h
-${MINGW_TARGET}/include/ntsecpkg.h
-${MINGW_TARGET}/include/oaidl.h
-${MINGW_TARGET}/include/objbase.h
-${MINGW_TARGET}/include/objfwd.h
-${MINGW_TARGET}/include/objidl.h
-${MINGW_TARGET}/include/objsafe.h
-${MINGW_TARGET}/include/objsel.h
-${MINGW_TARGET}/include/ocidl.h
-${MINGW_TARGET}/include/odbcinst.h
-${MINGW_TARGET}/include/ole.h
-${MINGW_TARGET}/include/ole2.h
-${MINGW_TARGET}/include/ole2ver.h
-${MINGW_TARGET}/include/oleacc.h
-${MINGW_TARGET}/include/oleauto.h
-${MINGW_TARGET}/include/olectl.h
-${MINGW_TARGET}/include/olectlid.h
-${MINGW_TARGET}/include/oledlg.h
-${MINGW_TARGET}/include/oleidl.h
-${MINGW_TARGET}/include/pbt.h
-${MINGW_TARGET}/include/poppack.h
-${MINGW_TARGET}/include/powrprof.h
-${MINGW_TARGET}/include/prsht.h
-${MINGW_TARGET}/include/psapi.h
-${MINGW_TARGET}/include/pshpack1.h
-${MINGW_TARGET}/include/pshpack2.h
-${MINGW_TARGET}/include/pshpack4.h
-${MINGW_TARGET}/include/pshpack8.h
-${MINGW_TARGET}/include/qedit.h
-${MINGW_TARGET}/include/rapi.h
-${MINGW_TARGET}/include/ras.h
-${MINGW_TARGET}/include/rasdlg.h
-${MINGW_TARGET}/include/raserror.h
-${MINGW_TARGET}/include/rassapi.h
-${MINGW_TARGET}/include/reason.h
-${MINGW_TARGET}/include/regstr.h
-${MINGW_TARGET}/include/richedit.h
-${MINGW_TARGET}/include/richole.h
-${MINGW_TARGET}/include/routprot.h
-${MINGW_TARGET}/include/rpc.h
-${MINGW_TARGET}/include/rpcdce.h
-${MINGW_TARGET}/include/rpcdce2.h
-${MINGW_TARGET}/include/rpcdcep.h
-${MINGW_TARGET}/include/rpcndr.h
-${MINGW_TARGET}/include/rpcnsi.h
-${MINGW_TARGET}/include/rpcnsip.h
-${MINGW_TARGET}/include/rpcnterr.h
-${MINGW_TARGET}/include/rpcproxy.h
-${MINGW_TARGET}/include/rtutils.h
-${MINGW_TARGET}/include/schannel.h
-${MINGW_TARGET}/include/schnlsp.h
-${MINGW_TARGET}/include/scrnsave.h
-${MINGW_TARGET}/include/sddl.h
-${MINGW_TARGET}/include/secext.h
-${MINGW_TARGET}/include/security.h
-${MINGW_TARGET}/include/servprov.h
-${MINGW_TARGET}/include/setupapi.h
-${MINGW_TARGET}/include/shellapi.h
-${MINGW_TARGET}/include/shldisp.h
-${MINGW_TARGET}/include/shlguid.h
-${MINGW_TARGET}/include/shlobj.h
-${MINGW_TARGET}/include/shlwapi.h
-${MINGW_TARGET}/include/snmp.h
-${MINGW_TARGET}/include/sql.h
-${MINGW_TARGET}/include/sqlext.h
-${MINGW_TARGET}/include/sqltypes.h
-${MINGW_TARGET}/include/sqlucode.h
-${MINGW_TARGET}/include/sspi.h
-${MINGW_TARGET}/include/stm.h
-${MINGW_TARGET}/include/strmif.h
-${MINGW_TARGET}/include/subauth.h
-${MINGW_TARGET}/include/svcguid.h
-${MINGW_TARGET}/include/tlhelp32.h
-${MINGW_TARGET}/include/tmschema.h
-${MINGW_TARGET}/include/unknwn.h
-${MINGW_TARGET}/include/userenv.h
-${MINGW_TARGET}/include/usp10.h
-${MINGW_TARGET}/include/uxtheme.h
-${MINGW_TARGET}/include/vfw.h
-${MINGW_TARGET}/include/vidcap.h
-${MINGW_TARGET}/include/vmr9.h
-${MINGW_TARGET}/include/vptype.h
-${MINGW_TARGET}/include/w32api.h
-${MINGW_TARGET}/include/winable.h
-${MINGW_TARGET}/include/winbase.h
-${MINGW_TARGET}/include/winber.h
-${MINGW_TARGET}/include/wincon.h
-${MINGW_TARGET}/include/wincrypt.h
-${MINGW_TARGET}/include/windef.h
-${MINGW_TARGET}/include/windns.h
-${MINGW_TARGET}/include/windows.h
-${MINGW_TARGET}/include/windowsx.h
-${MINGW_TARGET}/include/winerror.h
-${MINGW_TARGET}/include/wingdi.h
-${MINGW_TARGET}/include/wininet.h
-${MINGW_TARGET}/include/winioctl.h
-${MINGW_TARGET}/include/winldap.h
-${MINGW_TARGET}/include/winnetwk.h
-${MINGW_TARGET}/include/winnls.h
-${MINGW_TARGET}/include/winnt.h
-${MINGW_TARGET}/include/winperf.h
-${MINGW_TARGET}/include/winreg.h
-${MINGW_TARGET}/include/winresrc.h
-${MINGW_TARGET}/include/winsnmp.h
-${MINGW_TARGET}/include/winsock.h
-${MINGW_TARGET}/include/winsock2.h
-${MINGW_TARGET}/include/winspool.h
-${MINGW_TARGET}/include/winsvc.h
-${MINGW_TARGET}/include/winuser.h
-${MINGW_TARGET}/include/winver.h
-${MINGW_TARGET}/include/ws2spi.h
-${MINGW_TARGET}/include/ws2tcpip.h
-${MINGW_TARGET}/include/wsahelp.h
-${MINGW_TARGET}/include/wsipx.h
-${MINGW_TARGET}/include/wsnetbs.h
-${MINGW_TARGET}/include/wtsapi32.h
-${MINGW_TARGET}/include/wtsapi32.h
-${MINGW_TARGET}/include/wtypes.h
-${MINGW_TARGET}/include/xprtdefs.h
-${MINGW_TARGET}/include/zmouse.h
-${MINGW_TARGET}/lib/libaclui.a
-${MINGW_TARGET}/lib/libadvapi32.a
-${MINGW_TARGET}/lib/libapcups.a
-${MINGW_TARGET}/lib/libavicap32.a
-${MINGW_TARGET}/lib/libavifil32.a
-${MINGW_TARGET}/lib/libcap.a
-${MINGW_TARGET}/lib/libcfgmgr32.a
-${MINGW_TARGET}/lib/libcomctl32.a
-${MINGW_TARGET}/lib/libcomdlg32.a
-${MINGW_TARGET}/lib/libcrypt32.a
-${MINGW_TARGET}/lib/libctl3d32.a
-${MINGW_TARGET}/lib/libd3d8.a
-${MINGW_TARGET}/lib/libd3d9.a
-${MINGW_TARGET}/lib/libd3dim.a
-${MINGW_TARGET}/lib/libd3drm.a
-${MINGW_TARGET}/lib/libd3dx8d.a
-${MINGW_TARGET}/lib/libd3dx9d.a
-${MINGW_TARGET}/lib/libd3dxof.a
-${MINGW_TARGET}/lib/libddraw.a
-${MINGW_TARGET}/lib/libdhcpcsvc.a
-${MINGW_TARGET}/lib/libdinput.a
-${MINGW_TARGET}/lib/libdinput8.a
-${MINGW_TARGET}/lib/libdlcapi.a
-${MINGW_TARGET}/lib/libdmoguids.a
-${MINGW_TARGET}/lib/libdnsapi.a
-${MINGW_TARGET}/lib/libdplayx.a
-${MINGW_TARGET}/lib/libdpnaddr.a
-${MINGW_TARGET}/lib/libdpnet.a
-${MINGW_TARGET}/lib/libdpnlobby.a
-${MINGW_TARGET}/lib/libdpvoice.a
-${MINGW_TARGET}/lib/libdsetup.a
-${MINGW_TARGET}/lib/libdsound.a
-${MINGW_TARGET}/lib/libdxapi.a
-${MINGW_TARGET}/lib/libdxerr8.a
-${MINGW_TARGET}/lib/libdxerr9.a
-${MINGW_TARGET}/lib/libdxguid.a
-${MINGW_TARGET}/lib/libfaultrep.a
-${MINGW_TARGET}/lib/libgdi32.a
-${MINGW_TARGET}/lib/libglaux.a
-${MINGW_TARGET}/lib/libglu32.a
-${MINGW_TARGET}/lib/libglut.a
-${MINGW_TARGET}/lib/libglut32.a
-${MINGW_TARGET}/lib/libhal.a
-${MINGW_TARGET}/lib/libhid.a
-${MINGW_TARGET}/lib/libhidparse.a
-${MINGW_TARGET}/lib/libicmui.a
-${MINGW_TARGET}/lib/libigmpagnt.a
-${MINGW_TARGET}/lib/libimagehlp.a
-${MINGW_TARGET}/lib/libimm32.a
-${MINGW_TARGET}/lib/libiphlpapi.a
-${MINGW_TARGET}/lib/libkernel32.a
-${MINGW_TARGET}/lib/libksproxy.a
-${MINGW_TARGET}/lib/libksuser.a
-${MINGW_TARGET}/lib/liblargeint.a
-${MINGW_TARGET}/lib/liblz32.a
-${MINGW_TARGET}/lib/libmapi32.a
-${MINGW_TARGET}/lib/libmcd.a
-${MINGW_TARGET}/lib/libmfcuia32.a
-${MINGW_TARGET}/lib/libmgmtapi.a
-${MINGW_TARGET}/lib/libmpr.a
-${MINGW_TARGET}/lib/libmprapi.a
-${MINGW_TARGET}/lib/libmqrt.a
-${MINGW_TARGET}/lib/libmsacm32.a
-${MINGW_TARGET}/lib/libmscms.a
-${MINGW_TARGET}/lib/libmsdmo.a
-${MINGW_TARGET}/lib/libmsimg32.a
-${MINGW_TARGET}/lib/libmsvcp60.a
-${MINGW_TARGET}/lib/libmsvfw32.a
-${MINGW_TARGET}/lib/libmswsock.a
-${MINGW_TARGET}/lib/libnddeapi.a
-${MINGW_TARGET}/lib/libndis.a
-${MINGW_TARGET}/lib/libnetapi32.a
-${MINGW_TARGET}/lib/libnewdev.a
-${MINGW_TARGET}/lib/libntdll.a
-${MINGW_TARGET}/lib/libntoskrnl.a
-${MINGW_TARGET}/lib/libodbc32.a
-${MINGW_TARGET}/lib/libodbccp32.a
-${MINGW_TARGET}/lib/libole32.a
-${MINGW_TARGET}/lib/liboleacc.a
-${MINGW_TARGET}/lib/liboleaut32.a
-${MINGW_TARGET}/lib/libolecli32.a
-${MINGW_TARGET}/lib/liboledlg.a
-${MINGW_TARGET}/lib/libolepro32.a
-${MINGW_TARGET}/lib/libolesvr32.a
-${MINGW_TARGET}/lib/libopengl32.a
-${MINGW_TARGET}/lib/libpenwin32.a
-${MINGW_TARGET}/lib/libpkpd32.a
-${MINGW_TARGET}/lib/libpowrprof.a
-${MINGW_TARGET}/lib/libpsapi.a
-${MINGW_TARGET}/lib/libquartz.a
-${MINGW_TARGET}/lib/librapi.a
-${MINGW_TARGET}/lib/librasapi32.a
-${MINGW_TARGET}/lib/librasdlg.a
-${MINGW_TARGET}/lib/librpcdce4.a
-${MINGW_TARGET}/lib/librpcns4.a
-${MINGW_TARGET}/lib/librpcrt4.a
-${MINGW_TARGET}/lib/librtm.a
-${MINGW_TARGET}/lib/librtutils.a
-${MINGW_TARGET}/lib/libscrnsave.a
-${MINGW_TARGET}/lib/libscrnsavw.a
-${MINGW_TARGET}/lib/libscsiport.a
-${MINGW_TARGET}/lib/libsecur32.a
-${MINGW_TARGET}/lib/libsetupapi.a
-${MINGW_TARGET}/lib/libshell32.a
-${MINGW_TARGET}/lib/libshfolder.a
-${MINGW_TARGET}/lib/libshlwapi.a
-${MINGW_TARGET}/lib/libsnmpapi.a
-${MINGW_TARGET}/lib/libstrmiids.a
-${MINGW_TARGET}/lib/libsvrapi.a
-${MINGW_TARGET}/lib/libtapi32.a
-${MINGW_TARGET}/lib/libtdi.a
-${MINGW_TARGET}/lib/libth32.a
-${MINGW_TARGET}/lib/libthunk32.a
-${MINGW_TARGET}/lib/liburl.a
-${MINGW_TARGET}/lib/libusbcamd.a
-${MINGW_TARGET}/lib/libusbcamd2.a
-${MINGW_TARGET}/lib/libuser32.a
-${MINGW_TARGET}/lib/libuserenv.a
-${MINGW_TARGET}/lib/libusp10.a
-${MINGW_TARGET}/lib/libuuid.a
-${MINGW_TARGET}/lib/libuxtheme.a
-${MINGW_TARGET}/lib/libvdmdbg.a
-${MINGW_TARGET}/lib/libversion.a
-${MINGW_TARGET}/lib/libvfw32.a
-${MINGW_TARGET}/lib/libvideoprt.a
-${MINGW_TARGET}/lib/libwin32k.a
-${MINGW_TARGET}/lib/libwin32spl.a
-${MINGW_TARGET}/lib/libwininet.a
-${MINGW_TARGET}/lib/libwinmm.a
-${MINGW_TARGET}/lib/libwinspool.a
-${MINGW_TARGET}/lib/libwinstrm.a
-${MINGW_TARGET}/lib/libwldap32.a
-${MINGW_TARGET}/lib/libwow32.a
-${MINGW_TARGET}/lib/libws2_32.a
-${MINGW_TARGET}/lib/libwsnmp32.a
-${MINGW_TARGET}/lib/libwsock32.a
-${MINGW_TARGET}/lib/libwst.a
-${MINGW_TARGET}/lib/libwtsapi32.a
+@comment $NetBSD: PLIST,v 1.2 2016/06/19 16:20:27 wiz Exp $
+cross/${MINGW_TARGET}/include/accctrl.h
+cross/${MINGW_TARGET}/include/aclapi.h
+cross/${MINGW_TARGET}/include/aclui.h
+cross/${MINGW_TARGET}/include/adsprop.h
+cross/${MINGW_TARGET}/include/afxres.h
+cross/${MINGW_TARGET}/include/amaudio.h
+cross/${MINGW_TARGET}/include/amvideo.h
+cross/${MINGW_TARGET}/include/audevcod.h
+cross/${MINGW_TARGET}/include/aviriff.h
+cross/${MINGW_TARGET}/include/aygshell.h
+cross/${MINGW_TARGET}/include/basetsd.h
+cross/${MINGW_TARGET}/include/basetyps.h
+cross/${MINGW_TARGET}/include/bdatypes.h
+cross/${MINGW_TARGET}/include/cderr.h
+cross/${MINGW_TARGET}/include/cguid.h
+cross/${MINGW_TARGET}/include/cmnquery.h
+cross/${MINGW_TARGET}/include/comcat.h
+cross/${MINGW_TARGET}/include/commctrl.h
+cross/${MINGW_TARGET}/include/commdlg.h
+cross/${MINGW_TARGET}/include/control.h
+cross/${MINGW_TARGET}/include/cpl.h
+cross/${MINGW_TARGET}/include/cplext.h
+cross/${MINGW_TARGET}/include/custcntl.h
+cross/${MINGW_TARGET}/include/d3d9.h
+cross/${MINGW_TARGET}/include/d3d9caps.h
+cross/${MINGW_TARGET}/include/d3d9types.h
+cross/${MINGW_TARGET}/include/dbt.h
+cross/${MINGW_TARGET}/include/dde.h
+cross/${MINGW_TARGET}/include/ddeml.h
+cross/${MINGW_TARGET}/include/ddk/atm.h
+cross/${MINGW_TARGET}/include/ddk/batclass.h
+cross/${MINGW_TARGET}/include/ddk/cfg.h
+cross/${MINGW_TARGET}/include/ddk/cfgmgr32.h
+cross/${MINGW_TARGET}/include/ddk/d4drvif.h
+cross/${MINGW_TARGET}/include/ddk/d4iface.h
+cross/${MINGW_TARGET}/include/ddk/ddkmapi.h
+cross/${MINGW_TARGET}/include/ddk/hidclass.h
+cross/${MINGW_TARGET}/include/ddk/hidpi.h
+cross/${MINGW_TARGET}/include/ddk/hidsdi.h
+cross/${MINGW_TARGET}/include/ddk/hidsdi.h
+cross/${MINGW_TARGET}/include/ddk/hidusage.h
+cross/${MINGW_TARGET}/include/ddk/kbdmou.h
+cross/${MINGW_TARGET}/include/ddk/mcd.h
+cross/${MINGW_TARGET}/include/ddk/miniport.h
+cross/${MINGW_TARGET}/include/ddk/minitape.h
+cross/${MINGW_TARGET}/include/ddk/mountdev.h
+cross/${MINGW_TARGET}/include/ddk/mountmgr.h
+cross/${MINGW_TARGET}/include/ddk/ndis.h
+cross/${MINGW_TARGET}/include/ddk/ndisguid.h
+cross/${MINGW_TARGET}/include/ddk/ndistapi.h
+cross/${MINGW_TARGET}/include/ddk/ndiswan.h
+cross/${MINGW_TARGET}/include/ddk/netevent.h
+cross/${MINGW_TARGET}/include/ddk/netpnp.h
+cross/${MINGW_TARGET}/include/ddk/newdev.h
+cross/${MINGW_TARGET}/include/ddk/ntapi.h
+cross/${MINGW_TARGET}/include/ddk/ntdd8042.h
+cross/${MINGW_TARGET}/include/ddk/ntddbeep.h
+cross/${MINGW_TARGET}/include/ddk/ntddcdrm.h
+cross/${MINGW_TARGET}/include/ddk/ntddcdvd.h
+cross/${MINGW_TARGET}/include/ddk/ntddchgr.h
+cross/${MINGW_TARGET}/include/ddk/ntdddisk.h
+cross/${MINGW_TARGET}/include/ddk/ntddk.h
+cross/${MINGW_TARGET}/include/ddk/ntddkbd.h
+cross/${MINGW_TARGET}/include/ddk/ntddmou.h
+cross/${MINGW_TARGET}/include/ddk/ntddndis.h
+cross/${MINGW_TARGET}/include/ddk/ntddpar.h
+cross/${MINGW_TARGET}/include/ddk/ntddpcm.h
+cross/${MINGW_TARGET}/include/ddk/ntddscsi.h
+cross/${MINGW_TARGET}/include/ddk/ntddser.h
+cross/${MINGW_TARGET}/include/ddk/ntddstor.h
+cross/${MINGW_TARGET}/include/ddk/ntddtape.h
+cross/${MINGW_TARGET}/include/ddk/ntddtdi.h
+cross/${MINGW_TARGET}/include/ddk/ntddvdeo.h
+cross/${MINGW_TARGET}/include/ddk/ntddvol.h
+cross/${MINGW_TARGET}/include/ddk/ntifs.h
+cross/${MINGW_TARGET}/include/ddk/ntpoapi.h
+cross/${MINGW_TARGET}/include/ddk/ntstatus.h
+cross/${MINGW_TARGET}/include/ddk/parallel.h
+cross/${MINGW_TARGET}/include/ddk/pfhook.h
+cross/${MINGW_TARGET}/include/ddk/poclass.h
+cross/${MINGW_TARGET}/include/ddk/scsi.h
+cross/${MINGW_TARGET}/include/ddk/scsiscan.h
+cross/${MINGW_TARGET}/include/ddk/scsiwmi.h
+cross/${MINGW_TARGET}/include/ddk/smbus.h
+cross/${MINGW_TARGET}/include/ddk/srb.h
+cross/${MINGW_TARGET}/include/ddk/storport.h
+cross/${MINGW_TARGET}/include/ddk/tdi.h
+cross/${MINGW_TARGET}/include/ddk/tdiinfo.h
+cross/${MINGW_TARGET}/include/ddk/tdikrnl.h
+cross/${MINGW_TARGET}/include/ddk/tdistat.h
+cross/${MINGW_TARGET}/include/ddk/tvout.h
+cross/${MINGW_TARGET}/include/ddk/upssvc.h
+cross/${MINGW_TARGET}/include/ddk/usb.h
+cross/${MINGW_TARGET}/include/ddk/usb100.h
+cross/${MINGW_TARGET}/include/ddk/usbcamdi.h
+cross/${MINGW_TARGET}/include/ddk/usbdi.h
+cross/${MINGW_TARGET}/include/ddk/usbioctl.h
+cross/${MINGW_TARGET}/include/ddk/usbiodef.h
+cross/${MINGW_TARGET}/include/ddk/usbscan.h
+cross/${MINGW_TARGET}/include/ddk/usbuser.h
+cross/${MINGW_TARGET}/include/ddk/video.h
+cross/${MINGW_TARGET}/include/ddk/videoagp.h
+cross/${MINGW_TARGET}/include/ddk/win2k.h
+cross/${MINGW_TARGET}/include/ddk/winddi.h
+cross/${MINGW_TARGET}/include/ddk/winddk.h
+cross/${MINGW_TARGET}/include/ddk/winnt4.h
+cross/${MINGW_TARGET}/include/ddk/winxp.h
+cross/${MINGW_TARGET}/include/ddk/ws2san.h
+cross/${MINGW_TARGET}/include/ddk/xfilter.h
+cross/${MINGW_TARGET}/include/devguid.h
+cross/${MINGW_TARGET}/include/dhcpcsdk.h
+cross/${MINGW_TARGET}/include/dlgs.h
+cross/${MINGW_TARGET}/include/docobj.h
+cross/${MINGW_TARGET}/include/dsadmin.h
+cross/${MINGW_TARGET}/include/dsclient.h
+cross/${MINGW_TARGET}/include/dsgetdc.h
+cross/${MINGW_TARGET}/include/dshow.h
+cross/${MINGW_TARGET}/include/dsquery.h
+cross/${MINGW_TARGET}/include/dsrole.h
+cross/${MINGW_TARGET}/include/dvdevcod.h
+cross/${MINGW_TARGET}/include/dvdmedia.h
+cross/${MINGW_TARGET}/include/dxerr8.h
+cross/${MINGW_TARGET}/include/dxerr9.h
+cross/${MINGW_TARGET}/include/edevdefs.h
+cross/${MINGW_TARGET}/include/errorrep.h
+cross/${MINGW_TARGET}/include/errors.h
+cross/${MINGW_TARGET}/include/evcode.h
+cross/${MINGW_TARGET}/include/exdisp.h
+cross/${MINGW_TARGET}/include/exdispid.h
+cross/${MINGW_TARGET}/include/fltdefs.h
+cross/${MINGW_TARGET}/include/GL/gl.h
+cross/${MINGW_TARGET}/include/GL/glext.h
+cross/${MINGW_TARGET}/include/GL/glu.h
+cross/${MINGW_TARGET}/include/httpext.h
+cross/${MINGW_TARGET}/include/icm.h
+cross/${MINGW_TARGET}/include/idispids.h
+cross/${MINGW_TARGET}/include/il21dec.h
+cross/${MINGW_TARGET}/include/imagehlp.h
+cross/${MINGW_TARGET}/include/imm.h
+cross/${MINGW_TARGET}/include/initguid.h
+cross/${MINGW_TARGET}/include/intshcut.h
+cross/${MINGW_TARGET}/include/ipexport.h
+cross/${MINGW_TARGET}/include/iphlpapi.h
+cross/${MINGW_TARGET}/include/ipifcons.h
+cross/${MINGW_TARGET}/include/ipinfoid.h
+cross/${MINGW_TARGET}/include/iprtrmib.h
+cross/${MINGW_TARGET}/include/iptypes.h
+cross/${MINGW_TARGET}/include/ipxconst.h
+cross/${MINGW_TARGET}/include/ipxrtdef.h
+cross/${MINGW_TARGET}/include/ipxtfflt.h
+cross/${MINGW_TARGET}/include/isguids.h
+cross/${MINGW_TARGET}/include/ks.h
+cross/${MINGW_TARGET}/include/ksmedia.h
+cross/${MINGW_TARGET}/include/largeint.h
+cross/${MINGW_TARGET}/include/lm.h
+cross/${MINGW_TARGET}/include/lmaccess.h
+cross/${MINGW_TARGET}/include/lmalert.h
+cross/${MINGW_TARGET}/include/lmapibuf.h
+cross/${MINGW_TARGET}/include/lmat.h
+cross/${MINGW_TARGET}/include/lmaudit.h
+cross/${MINGW_TARGET}/include/lmbrowsr.h
+cross/${MINGW_TARGET}/include/lmchdev.h
+cross/${MINGW_TARGET}/include/lmconfig.h
+cross/${MINGW_TARGET}/include/lmcons.h
+cross/${MINGW_TARGET}/include/lmerr.h
+cross/${MINGW_TARGET}/include/lmerrlog.h
+cross/${MINGW_TARGET}/include/lmmsg.h
+cross/${MINGW_TARGET}/include/lmremutl.h
+cross/${MINGW_TARGET}/include/lmrepl.h
+cross/${MINGW_TARGET}/include/lmserver.h
+cross/${MINGW_TARGET}/include/lmshare.h
+cross/${MINGW_TARGET}/include/lmsname.h
+cross/${MINGW_TARGET}/include/lmstats.h
+cross/${MINGW_TARGET}/include/lmsvc.h
+cross/${MINGW_TARGET}/include/lmuse.h
+cross/${MINGW_TARGET}/include/lmuseflg.h
+cross/${MINGW_TARGET}/include/lmwksta.h
+cross/${MINGW_TARGET}/include/lzexpand.h
+cross/${MINGW_TARGET}/include/mapi.h
+cross/${MINGW_TARGET}/include/mciavi.h
+cross/${MINGW_TARGET}/include/mcx.h
+cross/${MINGW_TARGET}/include/mgm.h
+cross/${MINGW_TARGET}/include/mgmtapi.h
+cross/${MINGW_TARGET}/include/mlang.h
+cross/${MINGW_TARGET}/include/mmreg.h
+cross/${MINGW_TARGET}/include/mmsystem.h
+cross/${MINGW_TARGET}/include/mpegtype.h
+cross/${MINGW_TARGET}/include/mprapi.h
+cross/${MINGW_TARGET}/include/mq.h
+cross/${MINGW_TARGET}/include/msacm.h
+cross/${MINGW_TARGET}/include/mshtml.h
+cross/${MINGW_TARGET}/include/mswsock.h
+cross/${MINGW_TARGET}/include/nb30.h
+cross/${MINGW_TARGET}/include/nddeapi.h
+cross/${MINGW_TARGET}/include/nspapi.h
+cross/${MINGW_TARGET}/include/ntdef.h
+cross/${MINGW_TARGET}/include/ntdll.h
+cross/${MINGW_TARGET}/include/ntdsapi.h
+cross/${MINGW_TARGET}/include/ntdsbcli.h
+cross/${MINGW_TARGET}/include/ntldap.h
+cross/${MINGW_TARGET}/include/ntsecapi.h
+cross/${MINGW_TARGET}/include/ntsecpkg.h
+cross/${MINGW_TARGET}/include/oaidl.h
+cross/${MINGW_TARGET}/include/objbase.h
+cross/${MINGW_TARGET}/include/objfwd.h
+cross/${MINGW_TARGET}/include/objidl.h
+cross/${MINGW_TARGET}/include/objsafe.h
+cross/${MINGW_TARGET}/include/objsel.h
+cross/${MINGW_TARGET}/include/ocidl.h
+cross/${MINGW_TARGET}/include/odbcinst.h
+cross/${MINGW_TARGET}/include/ole.h
+cross/${MINGW_TARGET}/include/ole2.h
+cross/${MINGW_TARGET}/include/ole2ver.h
+cross/${MINGW_TARGET}/include/oleacc.h
+cross/${MINGW_TARGET}/include/oleauto.h
+cross/${MINGW_TARGET}/include/olectl.h
+cross/${MINGW_TARGET}/include/olectlid.h
+cross/${MINGW_TARGET}/include/oledlg.h
+cross/${MINGW_TARGET}/include/oleidl.h
+cross/${MINGW_TARGET}/include/pbt.h
+cross/${MINGW_TARGET}/include/poppack.h
+cross/${MINGW_TARGET}/include/powrprof.h
+cross/${MINGW_TARGET}/include/prsht.h
+cross/${MINGW_TARGET}/include/psapi.h
+cross/${MINGW_TARGET}/include/pshpack1.h
+cross/${MINGW_TARGET}/include/pshpack2.h
+cross/${MINGW_TARGET}/include/pshpack4.h
+cross/${MINGW_TARGET}/include/pshpack8.h
+cross/${MINGW_TARGET}/include/qedit.h
+cross/${MINGW_TARGET}/include/rapi.h
+cross/${MINGW_TARGET}/include/ras.h
+cross/${MINGW_TARGET}/include/rasdlg.h
+cross/${MINGW_TARGET}/include/raserror.h
+cross/${MINGW_TARGET}/include/rassapi.h
+cross/${MINGW_TARGET}/include/reason.h
+cross/${MINGW_TARGET}/include/regstr.h
+cross/${MINGW_TARGET}/include/richedit.h
+cross/${MINGW_TARGET}/include/richole.h
+cross/${MINGW_TARGET}/include/routprot.h
+cross/${MINGW_TARGET}/include/rpc.h
+cross/${MINGW_TARGET}/include/rpcdce.h
+cross/${MINGW_TARGET}/include/rpcdce2.h
+cross/${MINGW_TARGET}/include/rpcdcep.h
+cross/${MINGW_TARGET}/include/rpcndr.h
+cross/${MINGW_TARGET}/include/rpcnsi.h
+cross/${MINGW_TARGET}/include/rpcnsip.h
+cross/${MINGW_TARGET}/include/rpcnterr.h
+cross/${MINGW_TARGET}/include/rpcproxy.h
+cross/${MINGW_TARGET}/include/rtutils.h
+cross/${MINGW_TARGET}/include/schannel.h
+cross/${MINGW_TARGET}/include/schnlsp.h
+cross/${MINGW_TARGET}/include/scrnsave.h
+cross/${MINGW_TARGET}/include/sddl.h
+cross/${MINGW_TARGET}/include/secext.h
+cross/${MINGW_TARGET}/include/security.h
+cross/${MINGW_TARGET}/include/servprov.h
+cross/${MINGW_TARGET}/include/setupapi.h
+cross/${MINGW_TARGET}/include/shellapi.h
+cross/${MINGW_TARGET}/include/shldisp.h
+cross/${MINGW_TARGET}/include/shlguid.h
+cross/${MINGW_TARGET}/include/shlobj.h
+cross/${MINGW_TARGET}/include/shlwapi.h
+cross/${MINGW_TARGET}/include/snmp.h
+cross/${MINGW_TARGET}/include/sql.h
+cross/${MINGW_TARGET}/include/sqlext.h
+cross/${MINGW_TARGET}/include/sqltypes.h
+cross/${MINGW_TARGET}/include/sqlucode.h
+cross/${MINGW_TARGET}/include/sspi.h
+cross/${MINGW_TARGET}/include/stm.h
+cross/${MINGW_TARGET}/include/strmif.h
+cross/${MINGW_TARGET}/include/subauth.h
+cross/${MINGW_TARGET}/include/svcguid.h
+cross/${MINGW_TARGET}/include/tlhelp32.h
+cross/${MINGW_TARGET}/include/tmschema.h
+cross/${MINGW_TARGET}/include/unknwn.h
+cross/${MINGW_TARGET}/include/userenv.h
+cross/${MINGW_TARGET}/include/usp10.h
+cross/${MINGW_TARGET}/include/uxtheme.h
+cross/${MINGW_TARGET}/include/vfw.h
+cross/${MINGW_TARGET}/include/vidcap.h
+cross/${MINGW_TARGET}/include/vmr9.h
+cross/${MINGW_TARGET}/include/vptype.h
+cross/${MINGW_TARGET}/include/w32api.h
+cross/${MINGW_TARGET}/include/winable.h
+cross/${MINGW_TARGET}/include/winbase.h
+cross/${MINGW_TARGET}/include/winber.h
+cross/${MINGW_TARGET}/include/wincon.h
+cross/${MINGW_TARGET}/include/wincrypt.h
+cross/${MINGW_TARGET}/include/windef.h
+cross/${MINGW_TARGET}/include/windns.h
+cross/${MINGW_TARGET}/include/windows.h
+cross/${MINGW_TARGET}/include/windowsx.h
+cross/${MINGW_TARGET}/include/winerror.h
+cross/${MINGW_TARGET}/include/wingdi.h
+cross/${MINGW_TARGET}/include/wininet.h
+cross/${MINGW_TARGET}/include/winioctl.h
+cross/${MINGW_TARGET}/include/winldap.h
+cross/${MINGW_TARGET}/include/winnetwk.h
+cross/${MINGW_TARGET}/include/winnls.h
+cross/${MINGW_TARGET}/include/winnt.h
+cross/${MINGW_TARGET}/include/winperf.h
+cross/${MINGW_TARGET}/include/winreg.h
+cross/${MINGW_TARGET}/include/winresrc.h
+cross/${MINGW_TARGET}/include/winsnmp.h
+cross/${MINGW_TARGET}/include/winsock.h
+cross/${MINGW_TARGET}/include/winsock2.h
+cross/${MINGW_TARGET}/include/winspool.h
+cross/${MINGW_TARGET}/include/winsvc.h
+cross/${MINGW_TARGET}/include/winuser.h
+cross/${MINGW_TARGET}/include/winver.h
+cross/${MINGW_TARGET}/include/ws2spi.h
+cross/${MINGW_TARGET}/include/ws2tcpip.h
+cross/${MINGW_TARGET}/include/wsahelp.h
+cross/${MINGW_TARGET}/include/wsipx.h
+cross/${MINGW_TARGET}/include/wsnetbs.h
+cross/${MINGW_TARGET}/include/wtsapi32.h
+cross/${MINGW_TARGET}/include/wtsapi32.h
+cross/${MINGW_TARGET}/include/wtypes.h
+cross/${MINGW_TARGET}/include/xprtdefs.h
+cross/${MINGW_TARGET}/include/zmouse.h
+cross/${MINGW_TARGET}/lib/libaclui.a
+cross/${MINGW_TARGET}/lib/libadvapi32.a
+cross/${MINGW_TARGET}/lib/libapcups.a
+cross/${MINGW_TARGET}/lib/libavicap32.a
+cross/${MINGW_TARGET}/lib/libavifil32.a
+cross/${MINGW_TARGET}/lib/libcap.a
+cross/${MINGW_TARGET}/lib/libcfgmgr32.a
+cross/${MINGW_TARGET}/lib/libcomctl32.a
+cross/${MINGW_TARGET}/lib/libcomdlg32.a
+cross/${MINGW_TARGET}/lib/libcrypt32.a
+cross/${MINGW_TARGET}/lib/libctl3d32.a
+cross/${MINGW_TARGET}/lib/libd3d8.a
+cross/${MINGW_TARGET}/lib/libd3d9.a
+cross/${MINGW_TARGET}/lib/libd3dim.a
+cross/${MINGW_TARGET}/lib/libd3drm.a
+cross/${MINGW_TARGET}/lib/libd3dx8d.a
+cross/${MINGW_TARGET}/lib/libd3dx9d.a
+cross/${MINGW_TARGET}/lib/libd3dxof.a
+cross/${MINGW_TARGET}/lib/libddraw.a
+cross/${MINGW_TARGET}/lib/libdhcpcsvc.a
+cross/${MINGW_TARGET}/lib/libdinput.a
+cross/${MINGW_TARGET}/lib/libdinput8.a
+cross/${MINGW_TARGET}/lib/libdlcapi.a
+cross/${MINGW_TARGET}/lib/libdmoguids.a
+cross/${MINGW_TARGET}/lib/libdnsapi.a
+cross/${MINGW_TARGET}/lib/libdplayx.a
+cross/${MINGW_TARGET}/lib/libdpnaddr.a
+cross/${MINGW_TARGET}/lib/libdpnet.a
+cross/${MINGW_TARGET}/lib/libdpnlobby.a
+cross/${MINGW_TARGET}/lib/libdpvoice.a
+cross/${MINGW_TARGET}/lib/libdsetup.a
+cross/${MINGW_TARGET}/lib/libdsound.a
+cross/${MINGW_TARGET}/lib/libdxapi.a
+cross/${MINGW_TARGET}/lib/libdxerr8.a
+cross/${MINGW_TARGET}/lib/libdxerr9.a
+cross/${MINGW_TARGET}/lib/libdxguid.a
+cross/${MINGW_TARGET}/lib/libfaultrep.a
+cross/${MINGW_TARGET}/lib/libgdi32.a
+cross/${MINGW_TARGET}/lib/libglaux.a
+cross/${MINGW_TARGET}/lib/libglu32.a
+cross/${MINGW_TARGET}/lib/libglut.a
+cross/${MINGW_TARGET}/lib/libglut32.a
+cross/${MINGW_TARGET}/lib/libhal.a
+cross/${MINGW_TARGET}/lib/libhid.a
+cross/${MINGW_TARGET}/lib/libhidparse.a
+cross/${MINGW_TARGET}/lib/libicmui.a
+cross/${MINGW_TARGET}/lib/libigmpagnt.a
+cross/${MINGW_TARGET}/lib/libimagehlp.a
+cross/${MINGW_TARGET}/lib/libimm32.a
+cross/${MINGW_TARGET}/lib/libiphlpapi.a
+cross/${MINGW_TARGET}/lib/libkernel32.a
+cross/${MINGW_TARGET}/lib/libksproxy.a
+cross/${MINGW_TARGET}/lib/libksuser.a
+cross/${MINGW_TARGET}/lib/liblargeint.a
+cross/${MINGW_TARGET}/lib/liblz32.a
+cross/${MINGW_TARGET}/lib/libmapi32.a
+cross/${MINGW_TARGET}/lib/libmcd.a
+cross/${MINGW_TARGET}/lib/libmfcuia32.a
+cross/${MINGW_TARGET}/lib/libmgmtapi.a
+cross/${MINGW_TARGET}/lib/libmpr.a
+cross/${MINGW_TARGET}/lib/libmprapi.a
+cross/${MINGW_TARGET}/lib/libmqrt.a
+cross/${MINGW_TARGET}/lib/libmsacm32.a
+cross/${MINGW_TARGET}/lib/libmscms.a
+cross/${MINGW_TARGET}/lib/libmsdmo.a
+cross/${MINGW_TARGET}/lib/libmsimg32.a
+cross/${MINGW_TARGET}/lib/libmsvcp60.a
+cross/${MINGW_TARGET}/lib/libmsvfw32.a
+cross/${MINGW_TARGET}/lib/libmswsock.a
+cross/${MINGW_TARGET}/lib/libnddeapi.a
+cross/${MINGW_TARGET}/lib/libndis.a
+cross/${MINGW_TARGET}/lib/libnetapi32.a
+cross/${MINGW_TARGET}/lib/libnewdev.a
+cross/${MINGW_TARGET}/lib/libntdll.a
+cross/${MINGW_TARGET}/lib/libntoskrnl.a
+cross/${MINGW_TARGET}/lib/libodbc32.a
+cross/${MINGW_TARGET}/lib/libodbccp32.a
+cross/${MINGW_TARGET}/lib/libole32.a
+cross/${MINGW_TARGET}/lib/liboleacc.a
+cross/${MINGW_TARGET}/lib/liboleaut32.a
+cross/${MINGW_TARGET}/lib/libolecli32.a
+cross/${MINGW_TARGET}/lib/liboledlg.a
+cross/${MINGW_TARGET}/lib/libolepro32.a
+cross/${MINGW_TARGET}/lib/libolesvr32.a
+cross/${MINGW_TARGET}/lib/libopengl32.a
+cross/${MINGW_TARGET}/lib/libpenwin32.a
+cross/${MINGW_TARGET}/lib/libpkpd32.a
+cross/${MINGW_TARGET}/lib/libpowrprof.a
+cross/${MINGW_TARGET}/lib/libpsapi.a
+cross/${MINGW_TARGET}/lib/libquartz.a
+cross/${MINGW_TARGET}/lib/librapi.a
+cross/${MINGW_TARGET}/lib/librasapi32.a
+cross/${MINGW_TARGET}/lib/librasdlg.a
+cross/${MINGW_TARGET}/lib/librpcdce4.a
+cross/${MINGW_TARGET}/lib/librpcns4.a
+cross/${MINGW_TARGET}/lib/librpcrt4.a
+cross/${MINGW_TARGET}/lib/librtm.a
+cross/${MINGW_TARGET}/lib/librtutils.a
+cross/${MINGW_TARGET}/lib/libscrnsave.a
+cross/${MINGW_TARGET}/lib/libscrnsavw.a
+cross/${MINGW_TARGET}/lib/libscsiport.a
+cross/${MINGW_TARGET}/lib/libsecur32.a
+cross/${MINGW_TARGET}/lib/libsetupapi.a
+cross/${MINGW_TARGET}/lib/libshell32.a
+cross/${MINGW_TARGET}/lib/libshfolder.a
+cross/${MINGW_TARGET}/lib/libshlwapi.a
+cross/${MINGW_TARGET}/lib/libsnmpapi.a
+cross/${MINGW_TARGET}/lib/libstrmiids.a
+cross/${MINGW_TARGET}/lib/libsvrapi.a
+cross/${MINGW_TARGET}/lib/libtapi32.a
+cross/${MINGW_TARGET}/lib/libtdi.a
+cross/${MINGW_TARGET}/lib/libth32.a
+cross/${MINGW_TARGET}/lib/libthunk32.a
+cross/${MINGW_TARGET}/lib/liburl.a
+cross/${MINGW_TARGET}/lib/libusbcamd.a
+cross/${MINGW_TARGET}/lib/libusbcamd2.a
+cross/${MINGW_TARGET}/lib/libuser32.a
+cross/${MINGW_TARGET}/lib/libuserenv.a
+cross/${MINGW_TARGET}/lib/libusp10.a
+cross/${MINGW_TARGET}/lib/libuuid.a
+cross/${MINGW_TARGET}/lib/libuxtheme.a
+cross/${MINGW_TARGET}/lib/libvdmdbg.a
+cross/${MINGW_TARGET}/lib/libversion.a
+cross/${MINGW_TARGET}/lib/libvfw32.a
+cross/${MINGW_TARGET}/lib/libvideoprt.a
+cross/${MINGW_TARGET}/lib/libwin32k.a
+cross/${MINGW_TARGET}/lib/libwin32spl.a
+cross/${MINGW_TARGET}/lib/libwininet.a
+cross/${MINGW_TARGET}/lib/libwinmm.a
+cross/${MINGW_TARGET}/lib/libwinspool.a
+cross/${MINGW_TARGET}/lib/libwinstrm.a
+cross/${MINGW_TARGET}/lib/libwldap32.a
+cross/${MINGW_TARGET}/lib/libwow32.a
+cross/${MINGW_TARGET}/lib/libws2_32.a
+cross/${MINGW_TARGET}/lib/libwsnmp32.a
+cross/${MINGW_TARGET}/lib/libwsock32.a
+cross/${MINGW_TARGET}/lib/libwst.a
+cross/${MINGW_TARGET}/lib/libwtsapi32.a
diff --git a/cross/mingw/Makefile b/cross/mingw/Makefile
index 808c4cfe15a..9281ba31910 100644
--- a/cross/mingw/Makefile
+++ b/cross/mingw/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/03/15 18:34:36 asau Exp $
-#
+# $NetBSD: Makefile,v 1.2 2016/06/19 16:20:27 wiz Exp $
 
 DISTNAME=		mingw-3.3.1
 CATEGORIES=		cross
diff --git a/cross/mingw/Makefile.common b/cross/mingw/Makefile.common
index 95a1a607b7b..13d078a3347 100644
--- a/cross/mingw/Makefile.common
+++ b/cross/mingw/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2014/12/10 23:21:40 joerg Exp $
+# $NetBSD: Makefile.common,v 1.3 2016/06/19 16:20:27 wiz Exp $
 #
 # used by cross/mingw-gcc/buildlink3.mk
 # used by cross/mingw-binutils/Makefile
@@ -8,7 +8,6 @@
 
 .if !defined(MINGW_MAKEFILECOMMON)
 MINGW_MAKEFILECOMMON=	# defined
-USE_CROSSBASE=		yes
 
 MASTER_SITE_MINGW=	${MASTER_SITE_SOURCEFORGE:=mingw/}
 MINGW_TARGET?=		i386--mingw32
@@ -16,11 +15,10 @@ PLIST_SUBST+=		MINGW_TARGET=${MINGW_TARGET:Q}
 MAKE_ENV+=		MINGW_TARGET=${MINGW_TARGET:Q}
 CONFIGURE_ENV+=		MINGW_TARGET=${MINGW_TARGET:Q}
 
-PREPEND_PATH+=		${CROSSBASE}/bin
+PREPEND_PATH+=		${PREFIX}/cross/bin
 
 .if defined(GNU_CONFIGURE)
-CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
-CONFIGURE_ARGS+=	--exec-prefix=${PREFIX:Q}
+GNU_CONFIGURE_PREFIX=	${PREFIX}/cross
 CONFIGURE_ARGS+=	--target=${MINGW_TARGET:Q}
 # following line to avoid getting
 #    make: exec(i386--netbsdelf-ar) failed (No such file or directory)
diff --git a/cross/nios2-binutils/Makefile b/cross/nios2-binutils/Makefile
index 9a5dd01d7f8..019fd70eb32 100644
--- a/cross/nios2-binutils/Makefile
+++ b/cross/nios2-binutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2014/11/10 03:34:53 mef Exp $
+# $NetBSD: Makefile,v 1.14 2016/06/19 16:20:28 wiz Exp $
 
 DISTNAME=		binutils-2.24
 PKGNAME=		${DISTNAME:S/^/nios2-/}
@@ -17,7 +17,6 @@ USE_TOOLS+=		gmake
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
-USE_PKGLOCALEDIR=	yes
 USE_GNU_CONFIGURE_HOST=	no
 INFO_FILES=		# empty
 
@@ -36,14 +35,13 @@ NIOS2_TARGET=		nios2-elf
 CONFIGURE_ARGS+=	--disable-werror --target=${NIOS2_TARGET} --disable-nls
 PLIST_SUBST+=		NIOS2_TARGET=${NIOS2_TARGET:Q}
 
-USE_CROSSBASE=		yes
-BUILD_DEFS+=		CROSSBASE
-PATH:=			${CROSSBASE}/bin:${PATH}
+GNU_CONFIGURE_PREFIX=	${PREFIX}/cross
+PATH:=			${PREFIX}/cross/bin:${PATH}
 AUTO_MKDIRS=		yes
 
 # following file installed is reference only, not used at all for the moment
 post-install:
-	${INSTALL_DATA} files/nios2elf-netbsd.x ${DESTDIR}${PREFIX}/${NIOS2_TARGET}/lib/ldscripts
+	${INSTALL_DATA} files/nios2elf-netbsd.x ${DESTDIR}${PREFIX}/cross/${NIOS2_TARGET}/lib/ldscripts
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cross/nios2-binutils/PLIST b/cross/nios2-binutils/PLIST
index 89ea1ac079e..be0f39744f9 100644
--- a/cross/nios2-binutils/PLIST
+++ b/cross/nios2-binutils/PLIST
@@ -1,59 +1,59 @@
-@comment $NetBSD: PLIST,v 1.4 2014/06/15 23:43:13 mef Exp $
-${NIOS2_TARGET}/bin/ar
-${NIOS2_TARGET}/bin/as
-${NIOS2_TARGET}/bin/ld
-${NIOS2_TARGET}/bin/ld.bfd
-${NIOS2_TARGET}/bin/nm
-${NIOS2_TARGET}/bin/objcopy
-${NIOS2_TARGET}/bin/objdump
-${NIOS2_TARGET}/bin/ranlib
-${NIOS2_TARGET}/bin/strip
-bin/${NIOS2_TARGET}-addr2line
-bin/${NIOS2_TARGET}-ar
-bin/${NIOS2_TARGET}-as
-bin/${NIOS2_TARGET}-c++filt
-bin/${NIOS2_TARGET}-elfedit
-bin/${NIOS2_TARGET}-gprof
-bin/${NIOS2_TARGET}-ld
-bin/${NIOS2_TARGET}-ld.bfd
-bin/${NIOS2_TARGET}-nm
-bin/${NIOS2_TARGET}-objcopy
-bin/${NIOS2_TARGET}-objdump
-bin/${NIOS2_TARGET}-ranlib
-bin/${NIOS2_TARGET}-readelf
-bin/${NIOS2_TARGET}-size
-bin/${NIOS2_TARGET}-strings
-bin/${NIOS2_TARGET}-strip
-${NIOS2_TARGET}/lib/ldscripts/nios2elf-netbsd.x
-${NIOS2_TARGET}/lib/ldscripts/nios2elf.x
-${NIOS2_TARGET}/lib/ldscripts/nios2elf.xbn
-${NIOS2_TARGET}/lib/ldscripts/nios2elf.xc
-${NIOS2_TARGET}/lib/ldscripts/nios2elf.xd
-${NIOS2_TARGET}/lib/ldscripts/nios2elf.xdc
-${NIOS2_TARGET}/lib/ldscripts/nios2elf.xdw
-${NIOS2_TARGET}/lib/ldscripts/nios2elf.xn
-${NIOS2_TARGET}/lib/ldscripts/nios2elf.xr
-${NIOS2_TARGET}/lib/ldscripts/nios2elf.xs
-${NIOS2_TARGET}/lib/ldscripts/nios2elf.xsc
-${NIOS2_TARGET}/lib/ldscripts/nios2elf.xsw
-${NIOS2_TARGET}/lib/ldscripts/nios2elf.xu
-${NIOS2_TARGET}/lib/ldscripts/nios2elf.xw
-man/man1/${NIOS2_TARGET}-addr2line.1
-man/man1/${NIOS2_TARGET}-ar.1
-man/man1/${NIOS2_TARGET}-as.1
-man/man1/${NIOS2_TARGET}-c++filt.1
-man/man1/${NIOS2_TARGET}-dlltool.1
-man/man1/${NIOS2_TARGET}-elfedit.1
-man/man1/${NIOS2_TARGET}-gprof.1
-man/man1/${NIOS2_TARGET}-ld.1
-man/man1/${NIOS2_TARGET}-nlmconv.1
-man/man1/${NIOS2_TARGET}-nm.1
-man/man1/${NIOS2_TARGET}-objcopy.1
-man/man1/${NIOS2_TARGET}-objdump.1
-man/man1/${NIOS2_TARGET}-ranlib.1
-man/man1/${NIOS2_TARGET}-readelf.1
-man/man1/${NIOS2_TARGET}-size.1
-man/man1/${NIOS2_TARGET}-strings.1
-man/man1/${NIOS2_TARGET}-strip.1
-man/man1/${NIOS2_TARGET}-windmc.1
-man/man1/${NIOS2_TARGET}-windres.1
+@comment $NetBSD: PLIST,v 1.5 2016/06/19 16:20:28 wiz Exp $
+cross/${NIOS2_TARGET}/bin/ar
+cross/${NIOS2_TARGET}/bin/as
+cross/${NIOS2_TARGET}/bin/ld
+cross/${NIOS2_TARGET}/bin/ld.bfd
+cross/${NIOS2_TARGET}/bin/nm
+cross/${NIOS2_TARGET}/bin/objcopy
+cross/${NIOS2_TARGET}/bin/objdump
+cross/${NIOS2_TARGET}/bin/ranlib
+cross/${NIOS2_TARGET}/bin/strip
+cross/bin/${NIOS2_TARGET}-addr2line
+cross/bin/${NIOS2_TARGET}-ar
+cross/bin/${NIOS2_TARGET}-as
+cross/bin/${NIOS2_TARGET}-c++filt
+cross/bin/${NIOS2_TARGET}-elfedit
+cross/bin/${NIOS2_TARGET}-gprof
+cross/bin/${NIOS2_TARGET}-ld
+cross/bin/${NIOS2_TARGET}-ld.bfd
+cross/bin/${NIOS2_TARGET}-nm
+cross/bin/${NIOS2_TARGET}-objcopy
+cross/bin/${NIOS2_TARGET}-objdump
+cross/bin/${NIOS2_TARGET}-ranlib
+cross/bin/${NIOS2_TARGET}-readelf
+cross/bin/${NIOS2_TARGET}-size
+cross/bin/${NIOS2_TARGET}-strings
+cross/bin/${NIOS2_TARGET}-strip
+cross/${NIOS2_TARGET}/lib/ldscripts/nios2elf-netbsd.x
+cross/${NIOS2_TARGET}/lib/ldscripts/nios2elf.x
+cross/${NIOS2_TARGET}/lib/ldscripts/nios2elf.xbn
+cross/${NIOS2_TARGET}/lib/ldscripts/nios2elf.xc
+cross/${NIOS2_TARGET}/lib/ldscripts/nios2elf.xd
+cross/${NIOS2_TARGET}/lib/ldscripts/nios2elf.xdc
+cross/${NIOS2_TARGET}/lib/ldscripts/nios2elf.xdw
+cross/${NIOS2_TARGET}/lib/ldscripts/nios2elf.xn
+cross/${NIOS2_TARGET}/lib/ldscripts/nios2elf.xr
+cross/${NIOS2_TARGET}/lib/ldscripts/nios2elf.xs
+cross/${NIOS2_TARGET}/lib/ldscripts/nios2elf.xsc
+cross/${NIOS2_TARGET}/lib/ldscripts/nios2elf.xsw
+cross/${NIOS2_TARGET}/lib/ldscripts/nios2elf.xu
+cross/${NIOS2_TARGET}/lib/ldscripts/nios2elf.xw
+cross/man/man1/${NIOS2_TARGET}-addr2line.1
+cross/man/man1/${NIOS2_TARGET}-ar.1
+cross/man/man1/${NIOS2_TARGET}-as.1
+cross/man/man1/${NIOS2_TARGET}-c++filt.1
+cross/man/man1/${NIOS2_TARGET}-dlltool.1
+cross/man/man1/${NIOS2_TARGET}-elfedit.1
+cross/man/man1/${NIOS2_TARGET}-gprof.1
+cross/man/man1/${NIOS2_TARGET}-ld.1
+cross/man/man1/${NIOS2_TARGET}-nlmconv.1
+cross/man/man1/${NIOS2_TARGET}-nm.1
+cross/man/man1/${NIOS2_TARGET}-objcopy.1
+cross/man/man1/${NIOS2_TARGET}-objdump.1
+cross/man/man1/${NIOS2_TARGET}-ranlib.1
+cross/man/man1/${NIOS2_TARGET}-readelf.1
+cross/man/man1/${NIOS2_TARGET}-size.1
+cross/man/man1/${NIOS2_TARGET}-strings.1
+cross/man/man1/${NIOS2_TARGET}-strip.1
+cross/man/man1/${NIOS2_TARGET}-windmc.1
+cross/man/man1/${NIOS2_TARGET}-windres.1
diff --git a/cross/nios2-binutils/buildlink3.mk b/cross/nios2-binutils/buildlink3.mk
index 951bff10a0a..ad32edcd023 100644
--- a/cross/nios2-binutils/buildlink3.mk
+++ b/cross/nios2-binutils/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2013/12/06 01:08:27 mef Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2016/06/19 16:20:28 wiz Exp $
 
 BUILDLINK_TREE+=	nios2-binutils
 
@@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.nios2-binutils+=		nios2-binutils>=2.20
 BUILDLINK_PKGSRCDIR.nios2-binutils?=		../../cross/nios2-binutils
 BUILDLINK_FNAME_TRANSFORM.nios2-binutils+=	-e "s,${NIOS2_TARGET}/lib,lib/,g"
 #BUILDLINK_CONTENTS_FILTER.nios2-binutils=	${EGREP} '.*'
-BUILDLINK_CONTENTS_FILTER.nios2-binutils=	${GREP} '${CROSSBASE}'
+BUILDLINK_CONTENTS_FILTER.nios2-binutils=	${GREP} '${PREFIX}/cross'
 
 .endif # NIOS2_BINUTILS_BUILDLINK3_MK
 
diff --git a/cross/nios2-gcc/Makefile b/cross/nios2-gcc/Makefile
index beba22110c2..d8bf0502d27 100644
--- a/cross/nios2-gcc/Makefile
+++ b/cross/nios2-gcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2015/06/12 10:48:35 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2016/06/19 16:20:28 wiz Exp $
 .include		"../../cross/nios2/Makefile.common"
 PKGNAME=		nios2-gcc-${PKG_VERSION}
 PKG_VERSION=		4.7.3
@@ -14,7 +14,6 @@ USE_TOOLS+=		ksh gettext gmake makeinfo perl tar automake autoconf gawk
 USE_LIBTOOL=		yes
 USE_LANGUAGES+=		c c++
 USE_GNU_CONFIGURE_HOST=	no
-#BUILD_DEFS+=		CROSSBASE	#included in ../nios2/Makefile.common
 WRKSRC=			${WRKDIR}/gcc-nios2
 
 CONFIGURE_ARGS+=	--enable-languages=c
@@ -54,15 +53,15 @@ do-extract:
 
 # to avoid conflict with binutils (to be fixed by more sophisticated way)
 post-install:
-	${RM}  ${DESTDIR}${CROSSBASE}/lib/libiberty.a
+	${RM}  ${DESTDIR}${PREFIX}/cross/lib/libiberty.a
 #  to avoid conflict wit mingw-w64-gcc-4.5.1
-	${RM}  ${DESTDIR}${CROSSBASE}/man/man7/fsf-funding.7
-	${RM}  ${DESTDIR}${CROSSBASE}/man/man7/gfdl.7
-	${RM}  ${DESTDIR}${CROSSBASE}/man/man7/gpl.7
-	${RM}  ${DESTDIR}${CROSSBASE}/info/cpp.info
-	${RM}  ${DESTDIR}${CROSSBASE}/info/cppinternals.info
-	${RM}  ${DESTDIR}${CROSSBASE}/info/gcc.info
-	${RM}  ${DESTDIR}${CROSSBASE}/info/gccinstall.info
-	${RM}  ${DESTDIR}${CROSSBASE}/info/gccint.info
+	${RM}  ${DESTDIR}${PREFIX}/cross/man/man7/fsf-funding.7
+	${RM}  ${DESTDIR}${PREFIX}/cross/man/man7/gfdl.7
+	${RM}  ${DESTDIR}${PREFIX}/cross/man/man7/gpl.7
+	${RM}  ${DESTDIR}${PREFIX}/cross/info/cpp.info
+	${RM}  ${DESTDIR}${PREFIX}/cross/info/cppinternals.info
+	${RM}  ${DESTDIR}${PREFIX}/cross/info/gcc.info
+	${RM}  ${DESTDIR}${PREFIX}/cross/info/gccinstall.info
+	${RM}  ${DESTDIR}${PREFIX}/cross/info/gccint.info
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/cross/nios2-gcc/PLIST b/cross/nios2-gcc/PLIST
index b94e2922530..c032e7046c1 100644
--- a/cross/nios2-gcc/PLIST
+++ b/cross/nios2-gcc/PLIST
@@ -1,188 +1,187 @@
-@comment $NetBSD: PLIST,v 1.3 2013/11/18 06:41:27 mef Exp $
-bin/${NIOS2_TARGET}-cpp
-bin/${NIOS2_TARGET}-gcc
-bin/${NIOS2_TARGET}-gcc-${PKGVERSION}
-bin/${NIOS2_TARGET}-gcc-ar
-bin/${NIOS2_TARGET}-gcc-nm
-bin/${NIOS2_TARGET}-gcc-ranlib
-bin/${NIOS2_TARGET}-gcov
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/crtbegin.o
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/crtend.o
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/crti.o
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/crtn.o
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include-fixed/README
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include-fixed/limits.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include-fixed/syslimits.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/float.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/iso646.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/stdalign.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/stdarg.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/stdbool.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/stddef.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/stdfix.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/stdint-gcc.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/stdint.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/stdnoreturn.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/tgmath.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/unwind.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/varargs.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/install-tools/fixinc_list
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/install-tools/gsyslimits.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/install-tools/include/README
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/install-tools/include/limits.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/install-tools/macro_list
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/install-tools/mkheaders.conf
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/libgcc.a
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/libgcov.a
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/gtype.state
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/ada/gcc-interface/ada-tree.def
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/alias.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/all-tree.def
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/alloc-pool.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/ansidecl.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/auto-host.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/b-header-vars
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/basic-block.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/bitmap.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/builtins.def
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/bversion.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/c-family/c-common.def
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/c-family/c-common.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/c-family/c-objc.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/c-family/c-pragma.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/c-family/c-pretty-print.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/c-tree.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/cfghooks.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/cfgloop.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/cgraph.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/cif-code.def
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/config.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/config/elfos.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/config/initfini-array.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/config/newlib-stdint.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/config/nios2/elf.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/config/nios2/nios2-opts.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/config/nios2/nios2-protos.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/config/nios2/nios2.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/configargs.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/coretypes.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/cp/cp-tree.def
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/cppdefault.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/cpplib.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/debug.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/defaults.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/diagnostic-core.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/diagnostic.def
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/diagnostic.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/double-int.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/emit-rtl.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/except.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/filenames.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/fixed-value.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/flag-types.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/flags.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/function.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/gcc-plugin.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/genrtl.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/ggc.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/gimple-pretty-print.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/gimple.def
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/gimple.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/gsstruct.def
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/gtm-builtins.def
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/gtype-desc.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/hard-reg-set.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/hashtab.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/highlev-plugin-common.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/hwint.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/incpath.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/input.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/insn-constants.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/insn-flags.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/insn-modes.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/insn-notes.def
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/internal-fn.def
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/internal-fn.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/intl.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/ipa-prop.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/ipa-ref-inline.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/ipa-ref.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/ipa-reference.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/ipa-utils.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/java/java-tree.def
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/langhooks.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/libiberty.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/line-map.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/machmode.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/md5.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/mode-classes.def
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/objc/objc-tree.def
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/obstack.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/omp-builtins.def
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/options.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/opts.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/output.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/params.def
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/params.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/plugin-api.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/plugin-version.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/plugin.def
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/plugin.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/pointer-set.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/predict.def
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/predict.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/prefix.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/pretty-print.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/real.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/realmpfr.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/reg-notes.def
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/rtl.def
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/rtl.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/safe-ctype.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/sbitmap.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/splay-tree.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/statistics.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/symtab.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/sync-builtins.def
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/system.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/target-hooks-macros.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/target.def
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/target.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/timevar.def
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/timevar.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/tm-preds.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/tm.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/tm_p.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/toplev.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/tree-check.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/tree-dump.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/tree-flow-inline.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/tree-flow.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/tree-inline.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/tree-iterator.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/tree-pass.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/tree-pretty-print.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/tree-ssa-alias.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/tree-ssa-operands.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/tree-ssa-sccvn.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/tree.def
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/tree.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/treestruct.def
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/vec.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/vecir.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/vecprim.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/version.h
-libexec/gcc/${NIOS2_TARGET}/${PKGVERSION}/cc1
-libexec/gcc/${NIOS2_TARGET}/${PKGVERSION}/collect2
-libexec/gcc/${NIOS2_TARGET}/${PKGVERSION}/install-tools/fixinc.sh
-libexec/gcc/${NIOS2_TARGET}/${PKGVERSION}/install-tools/fixincl
-libexec/gcc/${NIOS2_TARGET}/${PKGVERSION}/install-tools/mkheaders
-libexec/gcc/${NIOS2_TARGET}/${PKGVERSION}/install-tools/mkinstalldirs
-libexec/gcc/${NIOS2_TARGET}/${PKGVERSION}/liblto_plugin.la
-libexec/gcc/${NIOS2_TARGET}/${PKGVERSION}/lto-wrapper
-libexec/gcc/${NIOS2_TARGET}/${PKGVERSION}/lto1
-libexec/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/gengtype
-man/man1/${NIOS2_TARGET}-cpp.1
-man/man1/${NIOS2_TARGET}-gcc.1
-man/man1/${NIOS2_TARGET}-gcov.1
-@pkgdir nios2-elf/lib
+@comment $NetBSD: PLIST,v 1.4 2016/06/19 16:20:28 wiz Exp $
+cross/bin/${NIOS2_TARGET}-cpp
+cross/bin/${NIOS2_TARGET}-gcc
+cross/bin/${NIOS2_TARGET}-gcc-${PKGVERSION}
+cross/bin/${NIOS2_TARGET}-gcc-ar
+cross/bin/${NIOS2_TARGET}-gcc-nm
+cross/bin/${NIOS2_TARGET}-gcc-ranlib
+cross/bin/${NIOS2_TARGET}-gcov
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/crtbegin.o
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/crtend.o
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/crti.o
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/crtn.o
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include-fixed/README
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include-fixed/limits.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include-fixed/syslimits.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/float.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/iso646.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/stdalign.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/stdarg.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/stdbool.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/stddef.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/stdfix.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/stdint-gcc.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/stdint.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/stdnoreturn.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/tgmath.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/unwind.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/varargs.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/install-tools/fixinc_list
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/install-tools/gsyslimits.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/install-tools/include/README
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/install-tools/include/limits.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/install-tools/macro_list
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/install-tools/mkheaders.conf
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/libgcc.a
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/libgcov.a
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/gtype.state
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/ada/gcc-interface/ada-tree.def
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/alias.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/all-tree.def
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/alloc-pool.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/ansidecl.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/auto-host.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/b-header-vars
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/basic-block.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/bitmap.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/builtins.def
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/bversion.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/c-family/c-common.def
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/c-family/c-common.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/c-family/c-objc.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/c-family/c-pragma.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/c-family/c-pretty-print.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/c-tree.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/cfghooks.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/cfgloop.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/cgraph.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/cif-code.def
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/config.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/config/elfos.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/config/initfini-array.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/config/newlib-stdint.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/config/nios2/elf.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/config/nios2/nios2-opts.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/config/nios2/nios2-protos.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/config/nios2/nios2.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/configargs.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/coretypes.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/cp/cp-tree.def
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/cppdefault.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/cpplib.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/debug.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/defaults.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/diagnostic-core.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/diagnostic.def
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/diagnostic.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/double-int.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/emit-rtl.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/except.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/filenames.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/fixed-value.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/flag-types.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/flags.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/function.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/gcc-plugin.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/genrtl.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/ggc.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/gimple-pretty-print.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/gimple.def
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/gimple.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/gsstruct.def
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/gtm-builtins.def
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/gtype-desc.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/hard-reg-set.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/hashtab.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/highlev-plugin-common.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/hwint.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/incpath.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/input.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/insn-constants.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/insn-flags.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/insn-modes.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/insn-notes.def
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/internal-fn.def
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/internal-fn.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/intl.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/ipa-prop.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/ipa-ref-inline.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/ipa-ref.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/ipa-reference.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/ipa-utils.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/java/java-tree.def
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/langhooks.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/libiberty.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/line-map.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/machmode.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/md5.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/mode-classes.def
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/objc/objc-tree.def
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/obstack.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/omp-builtins.def
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/options.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/opts.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/output.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/params.def
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/params.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/plugin-api.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/plugin-version.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/plugin.def
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/plugin.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/pointer-set.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/predict.def
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/predict.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/prefix.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/pretty-print.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/real.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/realmpfr.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/reg-notes.def
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/rtl.def
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/rtl.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/safe-ctype.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/sbitmap.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/splay-tree.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/statistics.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/symtab.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/sync-builtins.def
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/system.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/target-hooks-macros.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/target.def
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/target.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/timevar.def
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/timevar.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/tm-preds.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/tm.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/tm_p.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/toplev.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/tree-check.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/tree-dump.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/tree-flow-inline.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/tree-flow.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/tree-inline.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/tree-iterator.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/tree-pass.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/tree-pretty-print.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/tree-ssa-alias.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/tree-ssa-operands.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/tree-ssa-sccvn.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/tree.def
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/tree.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/treestruct.def
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/vec.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/vecir.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/vecprim.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/version.h
+cross/libexec/gcc/${NIOS2_TARGET}/${PKGVERSION}/cc1
+cross/libexec/gcc/${NIOS2_TARGET}/${PKGVERSION}/collect2
+cross/libexec/gcc/${NIOS2_TARGET}/${PKGVERSION}/install-tools/fixinc.sh
+cross/libexec/gcc/${NIOS2_TARGET}/${PKGVERSION}/install-tools/fixincl
+cross/libexec/gcc/${NIOS2_TARGET}/${PKGVERSION}/install-tools/mkheaders
+cross/libexec/gcc/${NIOS2_TARGET}/${PKGVERSION}/install-tools/mkinstalldirs
+cross/libexec/gcc/${NIOS2_TARGET}/${PKGVERSION}/liblto_plugin.la
+cross/libexec/gcc/${NIOS2_TARGET}/${PKGVERSION}/lto-wrapper
+cross/libexec/gcc/${NIOS2_TARGET}/${PKGVERSION}/lto1
+cross/libexec/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/gengtype
+cross/man/man1/${NIOS2_TARGET}-cpp.1
+cross/man/man1/${NIOS2_TARGET}-gcc.1
+cross/man/man1/${NIOS2_TARGET}-gcov.1
diff --git a/cross/nios2-gcc3/Makefile b/cross/nios2-gcc3/Makefile
index 19abfffb41e..fae14032c3c 100644
--- a/cross/nios2-gcc3/Makefile
+++ b/cross/nios2-gcc3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2015/06/12 10:48:35 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2016/06/19 16:20:28 wiz Exp $
 
 PKG_VERSION=		3.4.6
 # PKGNAME will have option name only when explictly selected
@@ -17,23 +17,19 @@ NOT_FOR_BULK_PLATFORM=	SunOS-*-*
 
 EXTRACT_ELEMENTS=	gcc
 WRKSRC=			${WRKDIR}/gcc
-#PATH:=                  ${CROSSBASE}/bin:${PATH}
 
 USE_TOOLS+=		gmake makeinfo perl
 USE_GNU_CONFIGURE_HOST=	no
-#BUILD_DEFS+=		CROSSBASE	#included in ../nios2/Makefile.common
 
 DEPENDS+=		nios2-binutils-[0-9]*:../../cross/nios2-binutils
 
 GNU_CONFIGURE=		yes
-USE_PKGLOCALEDIR=	yes
 
 NIOS2_TARGET?=		nios2-elf
 PLIST_SUBST+=		NIOS2_TARGET=${NIOS2_TARGET:Q}
 
-USE_CROSSBASE=		yes
-BUILD_DEFS+=		CROSSBASE
-PATH:=			${CROSSBASE}/bin:${PATH}
+GNU_CONFIGURE_PREFIX=	${PREFIX}/cross
+PATH:=			${PREFIX}/cross/bin:${PATH}
 
 BUILD_DEPENDS+=		gtexinfo-[0-9]*:../../devel/gtexinfo
 
@@ -57,15 +53,15 @@ INFO_FILES=		no
 
 # to avoid conflict with binutils (to be fixed by more sophisticated way)
 post-install:
-	${RM}  ${DESTDIR}${CROSSBASE}/lib/libiberty.a
+	${RM}  ${DESTDIR}${PREFIX}/cross/lib/libiberty.a
 #  to avoid conflict wit mingw-w64-gcc-4.5.1
-	${RM}  ${DESTDIR}${CROSSBASE}/man/man7/fsf-funding.7
-	${RM}  ${DESTDIR}${CROSSBASE}/man/man7/gfdl.7
-	${RM}  ${DESTDIR}${CROSSBASE}/man/man7/gpl.7
-	${RM}  ${DESTDIR}${CROSSBASE}/info/cpp.info
-	${RM}  ${DESTDIR}${CROSSBASE}/info/cppinternals.info
-	${RM}  ${DESTDIR}${CROSSBASE}/info/gcc.info
-	${RM}  ${DESTDIR}${CROSSBASE}/info/gccinstall.info
-	${RM}  ${DESTDIR}${CROSSBASE}/info/gccint.info
+	${RM}  ${DESTDIR}${PREFIX}/cross/man/man7/fsf-funding.7
+	${RM}  ${DESTDIR}${PREFIX}/cross/man/man7/gfdl.7
+	${RM}  ${DESTDIR}${PREFIX}/cross/man/man7/gpl.7
+	${RM}  ${DESTDIR}${PREFIX}/cross/info/cpp.info
+	${RM}  ${DESTDIR}${PREFIX}/cross/info/cppinternals.info
+	${RM}  ${DESTDIR}${PREFIX}/cross/info/gcc.info
+	${RM}  ${DESTDIR}${PREFIX}/cross/info/gccinstall.info
+	${RM}  ${DESTDIR}${PREFIX}/cross/info/gccint.info
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/cross/nios2-gcc41/Makefile b/cross/nios2-gcc41/Makefile
index d29703279bd..fa7e6c9cea3 100644
--- a/cross/nios2-gcc41/Makefile
+++ b/cross/nios2-gcc41/Makefile
@@ -1,4 +1,5 @@
-# $NetBSD: Makefile,v 1.4 2015/06/12 10:48:35 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2016/06/19 16:20:28 wiz Exp $
+
 DISTNAME=		nios2_gnu_gcc4_13.0
 PKG_VERSION=		4.1.2
 PKGNAME=		nios2-gcc41-${PKG_VERSION}
@@ -14,14 +15,12 @@ LICENSE=		gnu-gpl-v2
 DEPENDS+=		nios2-binutils-[0-9]*:../../cross/nios2-binutils
 BUILD_DEPENDS+=		gtexinfo-[0-9]*:../../devel/gtexinfo
 
-BUILD_DEFS+=		CROSSBASE
 GNU_CONFIGURE=		yes
 INFO_FILES=		no
 EXTRACT_ELEMENTS=	gcc-4.1
-USE_PKGLOCALEDIR=	yes
 WRKSRC=			${WRKDIR}/${EXTRACT_ELEMENTS}
-PATH:=                  ${CROSSBASE}/bin:${PATH}
-USE_CROSSBASE=		yes
+PATH:=                  ${PREFIX}/cross/bin:${PATH}
+GNU_CONFIGURE_PREFIX=	${PREFIX}/cross
 USE_TOOLS+=		gmake makeinfo perl bison tar
 # following line to avoid getting
 #    make: exec(nios2--netbsdelf-ar) failed (No such file or directory)
@@ -50,15 +49,15 @@ do-extract:
 
 # to avoid conflict with binutils (to be fixed by more sophisticated way)
 post-install:
-	${RM}  ${DESTDIR}${CROSSBASE}/lib/libiberty.a
+	${RM}  ${DESTDIR}${PREFIX}/cross/lib/libiberty.a
 #  to avoid conflict wit mingw-w64-gcc-4.5.1
-	${RM}  ${DESTDIR}${CROSSBASE}/man/man7/fsf-funding.7
-	${RM}  ${DESTDIR}${CROSSBASE}/man/man7/gfdl.7
-	${RM}  ${DESTDIR}${CROSSBASE}/man/man7/gpl.7
-	${RM}  ${DESTDIR}${CROSSBASE}/info/cpp.info
-	${RM}  ${DESTDIR}${CROSSBASE}/info/cppinternals.info
-	${RM}  ${DESTDIR}${CROSSBASE}/info/gcc.info
-	${RM}  ${DESTDIR}${CROSSBASE}/info/gccinstall.info
-	${RM}  ${DESTDIR}${CROSSBASE}/info/gccint.info
+	${RM}  ${DESTDIR}${PREFIX}/cross/man/man7/fsf-funding.7
+	${RM}  ${DESTDIR}${PREFIX}/cross/man/man7/gfdl.7
+	${RM}  ${DESTDIR}${PREFIX}/cross/man/man7/gpl.7
+	${RM}  ${DESTDIR}${PREFIX}/cross/info/cpp.info
+	${RM}  ${DESTDIR}${PREFIX}/cross/info/cppinternals.info
+	${RM}  ${DESTDIR}${PREFIX}/cross/info/gcc.info
+	${RM}  ${DESTDIR}${PREFIX}/cross/info/gccinstall.info
+	${RM}  ${DESTDIR}${PREFIX}/cross/info/gccint.info
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/cross/nios2-gcc41/PLIST b/cross/nios2-gcc41/PLIST
index 98e2a6756e3..fc6249bea8a 100644
--- a/cross/nios2-gcc41/PLIST
+++ b/cross/nios2-gcc41/PLIST
@@ -1,615 +1,614 @@
-@comment $NetBSD: PLIST,v 1.1 2013/11/16 07:41:00 mef Exp $
-bin/${NIOS2_TARGET}-cpp
-bin/${NIOS2_TARGET}-gcc
-bin/${NIOS2_TARGET}-gcc-${PKGVERSION}
-bin/${NIOS2_TARGET}-gccbug
-bin/${NIOS2_TARGET}-gcov
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/crtbegin.o
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/crtbeginS.o
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/crtbeginT.o
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/crtend.o
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/crtendS.o
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/crti.o
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/crtn.o
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include-fixed/README
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include-fixed/limits.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include-fixed/syslimits.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/float.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/iso646.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/stdarg.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/stdbool.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/stddef.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/unwind.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/varargs.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/install-tools/fixinc_list
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/install-tools/gsyslimits.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/install-tools/include/README
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/install-tools/include/limits.h
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/install-tools/macro_list
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/install-tools/mkheaders.conf
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/libgcc.a
-lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/libgcov.a
-libexec/gcc/${NIOS2_TARGET}/${PKGVERSION}/cc1
-libexec/gcc/${NIOS2_TARGET}/${PKGVERSION}/collect2
-libexec/gcc/${NIOS2_TARGET}/${PKGVERSION}/install-tools/fixinc.sh
-libexec/gcc/${NIOS2_TARGET}/${PKGVERSION}/install-tools/fixincl
-libexec/gcc/${NIOS2_TARGET}/${PKGVERSION}/install-tools/mkheaders
-libexec/gcc/${NIOS2_TARGET}/${PKGVERSION}/install-tools/mkinstalldirs
-man/man1/${NIOS2_TARGET}-cpp.1
-man/man1/${NIOS2_TARGET}-gcc.1
-man/man1/${NIOS2_TARGET}-gcov.1
-${PLIST.doc}share/doc/cpp/Argument-Prescan.html
-${PLIST.doc}share/doc/cpp/Assertions.html
-${PLIST.doc}share/doc/cpp/C_002b_002b-Named-Operators.html
-${PLIST.doc}share/doc/cpp/Character-sets.html
-${PLIST.doc}share/doc/cpp/Common-Predefined-Macros.html
-${PLIST.doc}share/doc/cpp/Computed-Includes.html
-${PLIST.doc}share/doc/cpp/Concatenation.html
-${PLIST.doc}share/doc/cpp/Concept-Index.html
-${PLIST.doc}share/doc/cpp/Conditional-Syntax.html
-${PLIST.doc}share/doc/cpp/Conditional-Uses.html
-${PLIST.doc}share/doc/cpp/Conditionals.html
-${PLIST.doc}share/doc/cpp/Defined.html
-${PLIST.doc}share/doc/cpp/Deleted-Code.html
-${PLIST.doc}share/doc/cpp/Diagnostics.html
-${PLIST.doc}share/doc/cpp/Differences-from-previous-versions.html
-${PLIST.doc}share/doc/cpp/Directives-Within-Macro-Arguments.html
-${PLIST.doc}share/doc/cpp/Duplication-of-Side-Effects.html
-${PLIST.doc}share/doc/cpp/Elif.html
-${PLIST.doc}share/doc/cpp/Else.html
-${PLIST.doc}share/doc/cpp/Environment-Variables.html
-${PLIST.doc}share/doc/cpp/Function_002dlike-Macros.html
-${PLIST.doc}share/doc/cpp/GNU-Free-Documentation-License.html
-${PLIST.doc}share/doc/cpp/Header-Files.html
-${PLIST.doc}share/doc/cpp/Identifier-characters.html
-${PLIST.doc}share/doc/cpp/If.html
-${PLIST.doc}share/doc/cpp/Ifdef.html
-${PLIST.doc}share/doc/cpp/Implementation-Details.html
-${PLIST.doc}share/doc/cpp/Implementation-limits.html
-${PLIST.doc}share/doc/cpp/Implementation_002ddefined-behavior.html
-${PLIST.doc}share/doc/cpp/Include-Operation.html
-${PLIST.doc}share/doc/cpp/Include-Syntax.html
-${PLIST.doc}share/doc/cpp/Index-of-Directives.html
-${PLIST.doc}share/doc/cpp/Initial-processing.html
-${PLIST.doc}share/doc/cpp/Invocation.html
-${PLIST.doc}share/doc/cpp/Line-Control.html
-${PLIST.doc}share/doc/cpp/Macro-Arguments.html
-${PLIST.doc}share/doc/cpp/Macro-Pitfalls.html
-${PLIST.doc}share/doc/cpp/Macros.html
-${PLIST.doc}share/doc/cpp/Misnesting.html
-${PLIST.doc}share/doc/cpp/Newlines-in-Arguments.html
-${PLIST.doc}share/doc/cpp/Object_002dlike-Macros.html
-${PLIST.doc}share/doc/cpp/Obsolete-Features.html
-${PLIST.doc}share/doc/cpp/Obsolete-once_002donly-headers.html
-${PLIST.doc}share/doc/cpp/Once_002dOnly-Headers.html
-${PLIST.doc}share/doc/cpp/Operator-Precedence-Problems.html
-${PLIST.doc}share/doc/cpp/Option-Index.html
-${PLIST.doc}share/doc/cpp/Other-Directives.html
-${PLIST.doc}share/doc/cpp/Overview.html
-${PLIST.doc}share/doc/cpp/Pragmas.html
-${PLIST.doc}share/doc/cpp/Predefined-Macros.html
-${PLIST.doc}share/doc/cpp/Preprocessor-Output.html
-${PLIST.doc}share/doc/cpp/Search-Path.html
-${PLIST.doc}share/doc/cpp/Self_002dReferential-Macros.html
-${PLIST.doc}share/doc/cpp/Standard-Predefined-Macros.html
-${PLIST.doc}share/doc/cpp/Stringification.html
-${PLIST.doc}share/doc/cpp/Swallowing-the-Semicolon.html
-${PLIST.doc}share/doc/cpp/System-Headers.html
-${PLIST.doc}share/doc/cpp/System_002dspecific-Predefined-Macros.html
-${PLIST.doc}share/doc/cpp/The-preprocessing-language.html
-${PLIST.doc}share/doc/cpp/Tokenization.html
-${PLIST.doc}share/doc/cpp/Traditional-Mode.html
-${PLIST.doc}share/doc/cpp/Traditional-lexical-analysis.html
-${PLIST.doc}share/doc/cpp/Traditional-macros.html
-${PLIST.doc}share/doc/cpp/Traditional-miscellany.html
-${PLIST.doc}share/doc/cpp/Traditional-warnings.html
-${PLIST.doc}share/doc/cpp/Undefining-and-Redefining-Macros.html
-${PLIST.doc}share/doc/cpp/Variadic-Macros.html
-${PLIST.doc}share/doc/cpp/Wrapper-Headers.html
-${PLIST.doc}share/doc/cpp/Wtrigraphs.html
-${PLIST.doc}share/doc/cpp/dashMF.html
-${PLIST.doc}share/doc/cpp/fdollars_002din_002didentifiers.html
-${PLIST.doc}share/doc/cpp/index.html
-${PLIST.doc}share/doc/cpp/trigraphs.html
-${PLIST.doc}share/doc/cppinternals/Concept-Index.html
-${PLIST.doc}share/doc/cppinternals/Conventions.html
-${PLIST.doc}share/doc/cppinternals/Files.html
-${PLIST.doc}share/doc/cppinternals/Guard-Macros.html
-${PLIST.doc}share/doc/cppinternals/Hash-Nodes.html
-${PLIST.doc}share/doc/cppinternals/Invalid-identifiers.html
-${PLIST.doc}share/doc/cppinternals/Lexer.html
-${PLIST.doc}share/doc/cppinternals/Lexing-a-line.html
-${PLIST.doc}share/doc/cppinternals/Line-Numbering.html
-${PLIST.doc}share/doc/cppinternals/Macro-Expansion.html
-${PLIST.doc}share/doc/cppinternals/Token-Spacing.html
-${PLIST.doc}share/doc/cppinternals/index.html
-${PLIST.doc}share/doc/gcc/ARC-Options.html
-${PLIST.doc}share/doc/gcc/ARM-NEON-Intrinsics.html
-${PLIST.doc}share/doc/gcc/ARM-Options.html
-${PLIST.doc}share/doc/gcc/ARM-Pragmas.html
-${PLIST.doc}share/doc/gcc/ARM-iWMMXt-Built_002din-Functions.html
-${PLIST.doc}share/doc/gcc/AVR-Options.html
-${PLIST.doc}share/doc/gcc/Actual-Bugs.html
-${PLIST.doc}share/doc/gcc/Alignment.html
-${PLIST.doc}share/doc/gcc/Alpha-Built_002din-Functions.html
-${PLIST.doc}share/doc/gcc/Altera-Nios-II-Built_002din-Functions.html
-${PLIST.doc}share/doc/gcc/Altera-Nios-II-Options.html
-${PLIST.doc}share/doc/gcc/Altera-Nios-II-Pragmas.html
-${PLIST.doc}share/doc/gcc/Alternate-Keywords.html
-${PLIST.doc}share/doc/gcc/Architecture-implementation.html
-${PLIST.doc}share/doc/gcc/Argument-Types.html
-${PLIST.doc}share/doc/gcc/Arrays-and-pointers-implementation.html
-${PLIST.doc}share/doc/gcc/Asm-Labels.html
-${PLIST.doc}share/doc/gcc/Assembler-Options.html
-${PLIST.doc}share/doc/gcc/Atomic-Builtins.html
-${PLIST.doc}share/doc/gcc/Attribute-Syntax.html
-${PLIST.doc}share/doc/gcc/Backwards-Compatibility.html
-${PLIST.doc}share/doc/gcc/Blackfin-Built_002din-Functions.html
-${PLIST.doc}share/doc/gcc/Blackfin-Options.html
-${PLIST.doc}share/doc/gcc/Bound-member-functions.html
-${PLIST.doc}share/doc/gcc/Bug-Criteria.html
-${PLIST.doc}share/doc/gcc/Bug-Reporting.html
-${PLIST.doc}share/doc/gcc/Bugs.html
-${PLIST.doc}share/doc/gcc/C-Dialect-Options.html
-${PLIST.doc}share/doc/gcc/C-Extensions.html
-${PLIST.doc}share/doc/gcc/C-Implementation.html
-${PLIST.doc}share/doc/gcc/C99-Thread_002dLocal-Edits.html
-${PLIST.doc}share/doc/gcc/CRIS-Options.html
-${PLIST.doc}share/doc/gcc/CRX-Options.html
-${PLIST.doc}share/doc/gcc/C_002b_002b-Attributes.html
-${PLIST.doc}share/doc/gcc/C_002b_002b-Comments.html
-${PLIST.doc}share/doc/gcc/C_002b_002b-Dialect-Options.html
-${PLIST.doc}share/doc/gcc/C_002b_002b-Extensions.html
-${PLIST.doc}share/doc/gcc/C_002b_002b-Interface.html
-${PLIST.doc}share/doc/gcc/C_002b_002b-Misunderstandings.html
-${PLIST.doc}share/doc/gcc/C_002b_002b98-Thread_002dLocal-Edits.html
-${PLIST.doc}share/doc/gcc/Case-Ranges.html
-${PLIST.doc}share/doc/gcc/Cast-to-Union.html
-${PLIST.doc}share/doc/gcc/Character-Escapes.html
-${PLIST.doc}share/doc/gcc/Characters-implementation.html
-${PLIST.doc}share/doc/gcc/Code-Gen-Options.html
-${PLIST.doc}share/doc/gcc/Compatibility.html
-${PLIST.doc}share/doc/gcc/Complex.html
-${PLIST.doc}share/doc/gcc/Compound-Literals.html
-${PLIST.doc}share/doc/gcc/Conditionals.html
-${PLIST.doc}share/doc/gcc/Constant-string-objects.html
-${PLIST.doc}share/doc/gcc/Constraints.html
-${PLIST.doc}share/doc/gcc/Constructing-Calls.html
-${PLIST.doc}share/doc/gcc/Contributing.html
-${PLIST.doc}share/doc/gcc/Contributors.html
-${PLIST.doc}share/doc/gcc/Copy-Assignment.html
-${PLIST.doc}share/doc/gcc/Copying.html
-${PLIST.doc}share/doc/gcc/Cross_002dCompiler-Problems.html
-${PLIST.doc}share/doc/gcc/Cross_002dprofiling.html
-${PLIST.doc}share/doc/gcc/DEC-Alpha-Options.html
-${PLIST.doc}share/doc/gcc/DEC-Alpha_002fVMS-Options.html
-${PLIST.doc}share/doc/gcc/Darwin-Options.html
-${PLIST.doc}share/doc/gcc/Darwin-Pragmas.html
-${PLIST.doc}share/doc/gcc/Debugging-Options.html
-${PLIST.doc}share/doc/gcc/Declarators-implementation.html
-${PLIST.doc}share/doc/gcc/Deprecated-Features.html
-${PLIST.doc}share/doc/gcc/Designated-Inits.html
-${PLIST.doc}share/doc/gcc/Directly_002dmapped-Integer-Functions.html
-${PLIST.doc}share/doc/gcc/Directly_002dmapped-Media-Functions.html
-${PLIST.doc}share/doc/gcc/Directory-Options.html
-${PLIST.doc}share/doc/gcc/Disappointments.html
-${PLIST.doc}share/doc/gcc/Dollar-Signs.html
-${PLIST.doc}share/doc/gcc/Empty-Structures.html
-${PLIST.doc}share/doc/gcc/Environment-Variables.html
-${PLIST.doc}share/doc/gcc/Environment-implementation.html
-${PLIST.doc}share/doc/gcc/Escaped-Newlines.html
-${PLIST.doc}share/doc/gcc/Example-of-asm-with-clobbered-asm-reg.html
-${PLIST.doc}share/doc/gcc/Executing-code-before-main.html
-${PLIST.doc}share/doc/gcc/Explicit-Reg-Vars.html
-${PLIST.doc}share/doc/gcc/Extended-Asm.html
-${PLIST.doc}share/doc/gcc/FRV-Options.html
-${PLIST.doc}share/doc/gcc/FR_002dV-Built_002din-Functions.html
-${PLIST.doc}share/doc/gcc/Fixed-Headers.html
-${PLIST.doc}share/doc/gcc/Floating-point-implementation.html
-${PLIST.doc}share/doc/gcc/Function-Attributes.html
-${PLIST.doc}share/doc/gcc/Function-Names.html
-${PLIST.doc}share/doc/gcc/Function-Prototypes.html
-${PLIST.doc}share/doc/gcc/Funding.html
-${PLIST.doc}share/doc/gcc/GNU-Free-Documentation-License.html
-${PLIST.doc}share/doc/gcc/GNU-Project.html
-${PLIST.doc}share/doc/gcc/GNU_002fLinux-Options.html
-${PLIST.doc}share/doc/gcc/G_002b_002b-and-GCC.html
-${PLIST.doc}share/doc/gcc/Garbage-Collection.html
-${PLIST.doc}share/doc/gcc/Gcov-Data-Files.html
-${PLIST.doc}share/doc/gcc/Gcov-Intro.html
-${PLIST.doc}share/doc/gcc/Gcov-and-Optimization.html
-${PLIST.doc}share/doc/gcc/Gcov.html
-${PLIST.doc}share/doc/gcc/Global-Reg-Vars.html
-${PLIST.doc}share/doc/gcc/H8_002f300-Options.html
-${PLIST.doc}share/doc/gcc/HPPA-Options.html
-${PLIST.doc}share/doc/gcc/Hex-Floats.html
-${PLIST.doc}share/doc/gcc/Hints-implementation.html
-${PLIST.doc}share/doc/gcc/IA_002d64-Options.html
-${PLIST.doc}share/doc/gcc/Identifiers-implementation.html
-${PLIST.doc}share/doc/gcc/Incompatibilities.html
-${PLIST.doc}share/doc/gcc/Incomplete-Enums.html
-${PLIST.doc}share/doc/gcc/Initializers.html
-${PLIST.doc}share/doc/gcc/Inline.html
-${PLIST.doc}share/doc/gcc/Integers-implementation.html
-${PLIST.doc}share/doc/gcc/Interoperation.html
-${PLIST.doc}share/doc/gcc/Invoking-GCC.html
-${PLIST.doc}share/doc/gcc/Invoking-G_002b_002b.html
-${PLIST.doc}share/doc/gcc/Invoking-Gcov.html
-${PLIST.doc}share/doc/gcc/Java-Exceptions.html
-${PLIST.doc}share/doc/gcc/Keyword-Index.html
-${PLIST.doc}share/doc/gcc/Labels-as-Values.html
-${PLIST.doc}share/doc/gcc/Language-Independent-Options.html
-${PLIST.doc}share/doc/gcc/Library-functions-implementation.html
-${PLIST.doc}share/doc/gcc/Link-Options.html
-${PLIST.doc}share/doc/gcc/Local-Labels.html
-${PLIST.doc}share/doc/gcc/Local-Reg-Vars.html
-${PLIST.doc}share/doc/gcc/Locale_002dspecific-behavior-implementation.html
-${PLIST.doc}share/doc/gcc/Long-Long.html
-${PLIST.doc}share/doc/gcc/M32C-Options.html
-${PLIST.doc}share/doc/gcc/M32C-Pragmas.html
-${PLIST.doc}share/doc/gcc/M32R_002fD-Options.html
-${PLIST.doc}share/doc/gcc/M680x0-Options.html
-${PLIST.doc}share/doc/gcc/M68hc1x-Options.html
-${PLIST.doc}share/doc/gcc/MCore-Options.html
-${PLIST.doc}share/doc/gcc/MIPS-DSP-Built_002din-Functions.html
-${PLIST.doc}share/doc/gcc/MIPS-Options.html
-${PLIST.doc}share/doc/gcc/MIPS-Paired_002dSingle-Support.html
-${PLIST.doc}share/doc/gcc/MIPS_002d3D-Built_002din-Functions.html
-${PLIST.doc}share/doc/gcc/MMIX-Options.html
-${PLIST.doc}share/doc/gcc/MN10300-Options.html
-${PLIST.doc}share/doc/gcc/MT-Options.html
-${PLIST.doc}share/doc/gcc/Machine-Constraints.html
-${PLIST.doc}share/doc/gcc/Mixed-Declarations.html
-${PLIST.doc}share/doc/gcc/Modifiers.html
-${PLIST.doc}share/doc/gcc/Multi_002dAlternative.html
-${PLIST.doc}share/doc/gcc/Name-lookup.html
-${PLIST.doc}share/doc/gcc/Nested-Functions.html
-${PLIST.doc}share/doc/gcc/Non_002dbugs.html
-${PLIST.doc}share/doc/gcc/Object-Size-Checking.html
-${PLIST.doc}share/doc/gcc/Objective_002dC-and-Objective_002dC_002b_002b-Dialect-Options.html
-${PLIST.doc}share/doc/gcc/Objective_002dC.html
-${PLIST.doc}share/doc/gcc/Offsetof.html
-${PLIST.doc}share/doc/gcc/Optimize-Options.html
-${PLIST.doc}share/doc/gcc/Option-Index.html
-${PLIST.doc}share/doc/gcc/Option-Summary.html
-${PLIST.doc}share/doc/gcc/Other-Built_002din-Functions.html
-${PLIST.doc}share/doc/gcc/Other-Builtins.html
-${PLIST.doc}share/doc/gcc/Overall-Options.html
-${PLIST.doc}share/doc/gcc/PDP_002d11-Options.html
-${PLIST.doc}share/doc/gcc/Paired_002dSingle-Arithmetic.html
-${PLIST.doc}share/doc/gcc/Paired_002dSingle-Built_002din-Functions.html
-${PLIST.doc}share/doc/gcc/Pointer-Arith.html
-${PLIST.doc}share/doc/gcc/PowerPC-AltiVec-Built_002din-Functions.html
-${PLIST.doc}share/doc/gcc/PowerPC-Options.html
-${PLIST.doc}share/doc/gcc/Pragmas.html
-${PLIST.doc}share/doc/gcc/Precompiled-Headers.html
-${PLIST.doc}share/doc/gcc/Preprocessing-directives-implementation.html
-${PLIST.doc}share/doc/gcc/Preprocessor-Options.html
-${PLIST.doc}share/doc/gcc/Protoize-Caveats.html
-${PLIST.doc}share/doc/gcc/Qualifiers-implementation.html
-${PLIST.doc}share/doc/gcc/RS_002f6000-and-PowerPC-Options.html
-${PLIST.doc}share/doc/gcc/RS_002f6000-and-PowerPC-Pragmas.html
-${PLIST.doc}share/doc/gcc/Raw-read_002fwrite-Functions.html
-${PLIST.doc}share/doc/gcc/Restricted-Pointers.html
-${PLIST.doc}share/doc/gcc/Return-Address.html
-${PLIST.doc}share/doc/gcc/Running-Protoize.html
-${PLIST.doc}share/doc/gcc/SH-Options.html
-${PLIST.doc}share/doc/gcc/SPARC-Options.html
-${PLIST.doc}share/doc/gcc/SPARC-VIS-Built_002din-Functions.html
-${PLIST.doc}share/doc/gcc/S_002f390-and-zSeries-Options.html
-${PLIST.doc}share/doc/gcc/Service.html
-${PLIST.doc}share/doc/gcc/Simple-Constraints.html
-${PLIST.doc}share/doc/gcc/Solaris-Format-Checks.html
-${PLIST.doc}share/doc/gcc/Solaris-Pragmas.html
-${PLIST.doc}share/doc/gcc/Spec-Files.html
-${PLIST.doc}share/doc/gcc/Standard-Libraries.html
-${PLIST.doc}share/doc/gcc/Standards.html
-${PLIST.doc}share/doc/gcc/Statement-Exprs.html
-${PLIST.doc}share/doc/gcc/Statements-implementation.html
-${PLIST.doc}share/doc/gcc/Static-Definitions.html
-${PLIST.doc}share/doc/gcc/Strong-Using.html
-${PLIST.doc}share/doc/gcc/Structure_002dPacking-Pragmas.html
-${PLIST.doc}share/doc/gcc/Structures-unions-enumerations-and-bit_002dfields-implementation.html
-${PLIST.doc}share/doc/gcc/Submodel-Options.html
-${PLIST.doc}share/doc/gcc/Subscripting.html
-${PLIST.doc}share/doc/gcc/Symbol_002dRenaming-Pragmas.html
-${PLIST.doc}share/doc/gcc/System-V-Options.html
-${PLIST.doc}share/doc/gcc/TMS320C3x_002fC4x-Options.html
-${PLIST.doc}share/doc/gcc/Target-Builtins.html
-${PLIST.doc}share/doc/gcc/Target-Format-Checks.html
-${PLIST.doc}share/doc/gcc/Target-Options.html
-${PLIST.doc}share/doc/gcc/Template-Instantiation.html
-${PLIST.doc}share/doc/gcc/Temporaries.html
-${PLIST.doc}share/doc/gcc/Thread_002dLocal.html
-${PLIST.doc}share/doc/gcc/Translation-implementation.html
-${PLIST.doc}share/doc/gcc/Trouble.html
-${PLIST.doc}share/doc/gcc/Type-Attributes.html
-${PLIST.doc}share/doc/gcc/Type-encoding.html
-${PLIST.doc}share/doc/gcc/Typeof.html
-${PLIST.doc}share/doc/gcc/Unnamed-Fields.html
-${PLIST.doc}share/doc/gcc/V850-Options.html
-${PLIST.doc}share/doc/gcc/VAX-Options.html
-${PLIST.doc}share/doc/gcc/Vague-Linkage.html
-${PLIST.doc}share/doc/gcc/Variable-Attributes.html
-${PLIST.doc}share/doc/gcc/Variable-Length.html
-${PLIST.doc}share/doc/gcc/Variadic-Macros.html
-${PLIST.doc}share/doc/gcc/Vector-Extensions.html
-${PLIST.doc}share/doc/gcc/Volatiles.html
-${PLIST.doc}share/doc/gcc/VxWorks-Options.html
-${PLIST.doc}share/doc/gcc/Warning-Options.html
-${PLIST.doc}share/doc/gcc/Warnings-and-Errors.html
-${PLIST.doc}share/doc/gcc/Weak-Pragmas.html
-${PLIST.doc}share/doc/gcc/What-you-can-and-what-you-cannot-do-in-_002bload.html
-${PLIST.doc}share/doc/gcc/Wtrigraphs.html
-${PLIST.doc}share/doc/gcc/X86-Built_002din-Functions.html
-${PLIST.doc}share/doc/gcc/Xstormy16-Options.html
-${PLIST.doc}share/doc/gcc/Xtensa-Options.html
-${PLIST.doc}share/doc/gcc/Zero-Length.html
-${PLIST.doc}share/doc/gcc/compatibility_005falias.html
-${PLIST.doc}share/doc/gcc/cpp.pdf
-${PLIST.doc}share/doc/gcc/cppinternals.pdf
-${PLIST.doc}share/doc/gcc/dashMF.html
-${PLIST.doc}share/doc/gcc/fdollars_002din_002didentifiers.html
-${PLIST.doc}share/doc/gcc/gcc.pdf
-${PLIST.doc}share/doc/gcc/gccinstall.pdf
-${PLIST.doc}share/doc/gcc/gccint.pdf
-${PLIST.doc}share/doc/gcc/i386-and-x86_002d64-Options.html
-${PLIST.doc}share/doc/gcc/index.html
-${PLIST.doc}share/doc/gcc/x86_002d64-Options.html
-${PLIST.doc}share/doc/gcc/zSeries-Options.html
-${PLIST.doc}share/doc/gccinstall/index.html
-${PLIST.doc}share/doc/gccint/Accessors.html
-${PLIST.doc}share/doc/gccint/Ada-Tests.html
-${PLIST.doc}share/doc/gccint/Adding-new-DECL-node-types.html
-${PLIST.doc}share/doc/gccint/Addressing-Modes.html
-${PLIST.doc}share/doc/gccint/Aggregate-Return.html
-${PLIST.doc}share/doc/gccint/Alias-analysis.html
-${PLIST.doc}share/doc/gccint/Alignment-Output.html
-${PLIST.doc}share/doc/gccint/All-Debuggers.html
-${PLIST.doc}share/doc/gccint/Allocation-Order.html
-${PLIST.doc}share/doc/gccint/Annotations.html
-${PLIST.doc}share/doc/gccint/Arithmetic.html
-${PLIST.doc}share/doc/gccint/Assembler-Format.html
-${PLIST.doc}share/doc/gccint/Assembler.html
-${PLIST.doc}share/doc/gccint/Attr-Example.html
-${PLIST.doc}share/doc/gccint/Attributes.html
-${PLIST.doc}share/doc/gccint/Back-End.html
-${PLIST.doc}share/doc/gccint/Basic-Blocks.html
-${PLIST.doc}share/doc/gccint/Bit_002dFields.html
-${PLIST.doc}share/doc/gccint/Blocks.html
-${PLIST.doc}share/doc/gccint/Build.html
-${PLIST.doc}share/doc/gccint/C-Tests.html
-${PLIST.doc}share/doc/gccint/C_002b_002b-ABI.html
-${PLIST.doc}share/doc/gccint/Caller-Saves.html
-${PLIST.doc}share/doc/gccint/Calls.html
-${PLIST.doc}share/doc/gccint/Class-Preferences.html
-${PLIST.doc}share/doc/gccint/Classes.html
-${PLIST.doc}share/doc/gccint/Cleanups.html
-${PLIST.doc}share/doc/gccint/Code-Macros.html
-${PLIST.doc}share/doc/gccint/Collect2.html
-${PLIST.doc}share/doc/gccint/Comparisons.html
-${PLIST.doc}share/doc/gccint/Compound-Expressions.html
-${PLIST.doc}share/doc/gccint/Compound-Lvalues.html
-${PLIST.doc}share/doc/gccint/Concept-Index.html
-${PLIST.doc}share/doc/gccint/Condition-Code.html
-${PLIST.doc}share/doc/gccint/Conditional-Execution.html
-${PLIST.doc}share/doc/gccint/Conditional-Expressions.html
-${PLIST.doc}share/doc/gccint/Config-Fragments.html
-${PLIST.doc}share/doc/gccint/Configuration-Files.html
-${PLIST.doc}share/doc/gccint/Configuration.html
-${PLIST.doc}share/doc/gccint/Configure-Terms.html
-${PLIST.doc}share/doc/gccint/Constant-Attributes.html
-${PLIST.doc}share/doc/gccint/Constant-Definitions.html
-${PLIST.doc}share/doc/gccint/Constants.html
-${PLIST.doc}share/doc/gccint/Constraints.html
-${PLIST.doc}share/doc/gccint/Containers.html
-${PLIST.doc}share/doc/gccint/Contributing.html
-${PLIST.doc}share/doc/gccint/Contributors.html
-${PLIST.doc}share/doc/gccint/Control-Flow.html
-${PLIST.doc}share/doc/gccint/Conversions.html
-${PLIST.doc}share/doc/gccint/Copying.html
-${PLIST.doc}share/doc/gccint/Costs.html
-${PLIST.doc}share/doc/gccint/Current-structure-hierarchy.html
-${PLIST.doc}share/doc/gccint/DBX-Hooks.html
-${PLIST.doc}share/doc/gccint/DBX-Options.html
-${PLIST.doc}share/doc/gccint/Data-Output.html
-${PLIST.doc}share/doc/gccint/Debugging-Info.html
-${PLIST.doc}share/doc/gccint/Declarations.html
-${PLIST.doc}share/doc/gccint/Deficiencies.html
-${PLIST.doc}share/doc/gccint/Defining-Attributes.html
-${PLIST.doc}share/doc/gccint/Defining-Mode-Macros.html
-${PLIST.doc}share/doc/gccint/Defining-Predicates.html
-${PLIST.doc}share/doc/gccint/Delay-Slots.html
-${PLIST.doc}share/doc/gccint/Dependent-Patterns.html
-${PLIST.doc}share/doc/gccint/Dispatch-Tables.html
-${PLIST.doc}share/doc/gccint/Documentation.html
-${PLIST.doc}share/doc/gccint/Driver.html
-${PLIST.doc}share/doc/gccint/Edges.html
-${PLIST.doc}share/doc/gccint/Elimination.html
-${PLIST.doc}share/doc/gccint/Empty-Statements.html
-${PLIST.doc}share/doc/gccint/Example.html
-${PLIST.doc}share/doc/gccint/Examples.html
-${PLIST.doc}share/doc/gccint/Exception-Handling.html
-${PLIST.doc}share/doc/gccint/Exception-Region-Output.html
-${PLIST.doc}share/doc/gccint/Exception-handling-routines.html
-${PLIST.doc}share/doc/gccint/Expander-Definitions.html
-${PLIST.doc}share/doc/gccint/Expression-trees.html
-${PLIST.doc}share/doc/gccint/Expressions.html
-${PLIST.doc}share/doc/gccint/File-Framework.html
-${PLIST.doc}share/doc/gccint/File-Names-and-DBX.html
-${PLIST.doc}share/doc/gccint/Files.html
-${PLIST.doc}share/doc/gccint/Filesystem.html
-${PLIST.doc}share/doc/gccint/Flags.html
-${PLIST.doc}share/doc/gccint/Floating-Point.html
-${PLIST.doc}share/doc/gccint/Fragments.html
-${PLIST.doc}share/doc/gccint/Frame-Layout.html
-${PLIST.doc}share/doc/gccint/Frame-Registers.html
-${PLIST.doc}share/doc/gccint/Front-End-Config.html
-${PLIST.doc}share/doc/gccint/Front-End-Directory.html
-${PLIST.doc}share/doc/gccint/Front-End.html
-${PLIST.doc}share/doc/gccint/Function-Basics.html
-${PLIST.doc}share/doc/gccint/Function-Bodies.html
-${PLIST.doc}share/doc/gccint/Function-Entry.html
-${PLIST.doc}share/doc/gccint/Functions.html
-${PLIST.doc}share/doc/gccint/Funding.html
-${PLIST.doc}share/doc/gccint/GENERIC.html
-${PLIST.doc}share/doc/gccint/GGC-Roots.html
-${PLIST.doc}share/doc/gccint/GIMPLE-Example.html
-${PLIST.doc}share/doc/gccint/GIMPLE-Exception-Handling.html
-${PLIST.doc}share/doc/gccint/GIMPLE-Expressions.html
-${PLIST.doc}share/doc/gccint/GIMPLE.html
-${PLIST.doc}share/doc/gccint/GNU-Free-Documentation-License.html
-${PLIST.doc}share/doc/gccint/GNU-Project.html
-${PLIST.doc}share/doc/gccint/GTY-Options.html
-${PLIST.doc}share/doc/gccint/Gimplification-pass.html
-${PLIST.doc}share/doc/gccint/Header-Dirs.html
-${PLIST.doc}share/doc/gccint/Headers.html
-${PLIST.doc}share/doc/gccint/Host-Common.html
-${PLIST.doc}share/doc/gccint/Host-Config.html
-${PLIST.doc}share/doc/gccint/Host-Fragment.html
-${PLIST.doc}share/doc/gccint/Host-Misc.html
-${PLIST.doc}share/doc/gccint/Identifiers.html
-${PLIST.doc}share/doc/gccint/Incdec.html
-${PLIST.doc}share/doc/gccint/Including-Patterns.html
-${PLIST.doc}share/doc/gccint/Initialization.html
-${PLIST.doc}share/doc/gccint/Insn-Attributes.html
-${PLIST.doc}share/doc/gccint/Insn-Canonicalizations.html
-${PLIST.doc}share/doc/gccint/Insn-Lengths.html
-${PLIST.doc}share/doc/gccint/Insn-Splitting.html
-${PLIST.doc}share/doc/gccint/Insns.html
-${PLIST.doc}share/doc/gccint/Instruction-Output.html
-${PLIST.doc}share/doc/gccint/Integer-library-routines.html
-${PLIST.doc}share/doc/gccint/Interface.html
-${PLIST.doc}share/doc/gccint/Interfaces.html
-${PLIST.doc}share/doc/gccint/Internal-structure.html
-${PLIST.doc}share/doc/gccint/Jump-Patterns.html
-${PLIST.doc}share/doc/gccint/Jumps.html
-${PLIST.doc}share/doc/gccint/Label-Output.html
-${PLIST.doc}share/doc/gccint/Languages.html
-${PLIST.doc}share/doc/gccint/Leaf-Functions.html
-${PLIST.doc}share/doc/gccint/Libgcc.html
-${PLIST.doc}share/doc/gccint/Library-Calls.html
-${PLIST.doc}share/doc/gccint/Library-Files.html
-${PLIST.doc}share/doc/gccint/Liveness-information.html
-${PLIST.doc}share/doc/gccint/Logical-Operators.html
-${PLIST.doc}share/doc/gccint/Looping-Patterns.html
-${PLIST.doc}share/doc/gccint/Loops.html
-${PLIST.doc}share/doc/gccint/MIPS-Coprocessors.html
-${PLIST.doc}share/doc/gccint/Machine-Constraints.html
-${PLIST.doc}share/doc/gccint/Machine-Desc.html
-${PLIST.doc}share/doc/gccint/Machine-Modes.html
-${PLIST.doc}share/doc/gccint/Machine_002dIndependent-Predicates.html
-${PLIST.doc}share/doc/gccint/Macros-and-Functions.html
-${PLIST.doc}share/doc/gccint/Macros-for-Initialization.html
-${PLIST.doc}share/doc/gccint/Macros.html
-${PLIST.doc}share/doc/gccint/Maintaining-the-CFG.html
-${PLIST.doc}share/doc/gccint/Makefile.html
-${PLIST.doc}share/doc/gccint/Man-Page-Generation.html
-${PLIST.doc}share/doc/gccint/Misc.html
-${PLIST.doc}share/doc/gccint/Miscellaneous-Docs.html
-${PLIST.doc}share/doc/gccint/Miscellaneous-routines.html
-${PLIST.doc}share/doc/gccint/Mode-Macros.html
-${PLIST.doc}share/doc/gccint/Mode-Switching.html
-${PLIST.doc}share/doc/gccint/Modifiers.html
-${PLIST.doc}share/doc/gccint/Multi_002dAlternative.html
-${PLIST.doc}share/doc/gccint/Namespaces.html
-${PLIST.doc}share/doc/gccint/Option-Index.html
-${PLIST.doc}share/doc/gccint/Option-file-format.html
-${PLIST.doc}share/doc/gccint/Option-properties.html
-${PLIST.doc}share/doc/gccint/Options.html
-${PLIST.doc}share/doc/gccint/Output-Statement.html
-${PLIST.doc}share/doc/gccint/Output-Template.html
-${PLIST.doc}share/doc/gccint/Overview.html
-${PLIST.doc}share/doc/gccint/PCH-Target.html
-${PLIST.doc}share/doc/gccint/PIC.html
-${PLIST.doc}share/doc/gccint/Parsing-pass.html
-${PLIST.doc}share/doc/gccint/Pass-manager.html
-${PLIST.doc}share/doc/gccint/Passes.html
-${PLIST.doc}share/doc/gccint/Pattern-Ordering.html
-${PLIST.doc}share/doc/gccint/Patterns.html
-${PLIST.doc}share/doc/gccint/Peephole-Definitions.html
-${PLIST.doc}share/doc/gccint/Per_002dFunction-Data.html
-${PLIST.doc}share/doc/gccint/Portability.html
-${PLIST.doc}share/doc/gccint/Predicates.html
-${PLIST.doc}share/doc/gccint/Processor-pipeline-description.html
-${PLIST.doc}share/doc/gccint/Profile-information.html
-${PLIST.doc}share/doc/gccint/Profiling.html
-${PLIST.doc}share/doc/gccint/RTL-Classes.html
-${PLIST.doc}share/doc/gccint/RTL-Declarations.html
-${PLIST.doc}share/doc/gccint/RTL-Objects.html
-${PLIST.doc}share/doc/gccint/RTL-Template.html
-${PLIST.doc}share/doc/gccint/RTL-passes.html
-${PLIST.doc}share/doc/gccint/RTL.html
-${PLIST.doc}share/doc/gccint/Reading-RTL.html
-${PLIST.doc}share/doc/gccint/Register-Arguments.html
-${PLIST.doc}share/doc/gccint/Register-Basics.html
-${PLIST.doc}share/doc/gccint/Register-Classes.html
-${PLIST.doc}share/doc/gccint/Registers.html
-${PLIST.doc}share/doc/gccint/Regs-and-Memory.html
-${PLIST.doc}share/doc/gccint/Rough-GIMPLE-Grammar.html
-${PLIST.doc}share/doc/gccint/Run_002dtime-Target.html
-${PLIST.doc}share/doc/gccint/SDB-and-DWARF.html
-${PLIST.doc}share/doc/gccint/SSA.html
-${PLIST.doc}share/doc/gccint/Scalar-Return.html
-${PLIST.doc}share/doc/gccint/Scheduling.html
-${PLIST.doc}share/doc/gccint/Scopes.html
-${PLIST.doc}share/doc/gccint/Sections.html
-${PLIST.doc}share/doc/gccint/Selection-Statements.html
-${PLIST.doc}share/doc/gccint/Sharing.html
-${PLIST.doc}share/doc/gccint/Side-Effects.html
-${PLIST.doc}share/doc/gccint/Simple-Constraints.html
-${PLIST.doc}share/doc/gccint/Soft-float-library-routines.html
-${PLIST.doc}share/doc/gccint/Source-Tree.html
-${PLIST.doc}share/doc/gccint/Special-Accessors.html
-${PLIST.doc}share/doc/gccint/Stack-Arguments.html
-${PLIST.doc}share/doc/gccint/Stack-Checking.html
-${PLIST.doc}share/doc/gccint/Stack-Registers.html
-${PLIST.doc}share/doc/gccint/Stack-Smashing-Protection.html
-${PLIST.doc}share/doc/gccint/Stack-and-Calling.html
-${PLIST.doc}share/doc/gccint/Standard-Names.html
-${PLIST.doc}share/doc/gccint/Statement-Operands.html
-${PLIST.doc}share/doc/gccint/Statement-Sequences.html
-${PLIST.doc}share/doc/gccint/Statements.html
-${PLIST.doc}share/doc/gccint/Storage-Layout.html
-${PLIST.doc}share/doc/gccint/Subdirectories.html
-${PLIST.doc}share/doc/gccint/Substitutions.html
-${PLIST.doc}share/doc/gccint/System-Config.html
-${PLIST.doc}share/doc/gccint/TARGET_005fSHIFT_005fTRUNCATION_005fMASK.html
-${PLIST.doc}share/doc/gccint/Tagging-Insns.html
-${PLIST.doc}share/doc/gccint/Tail-Calls.html
-${PLIST.doc}share/doc/gccint/Target-Attributes.html
-${PLIST.doc}share/doc/gccint/Target-Fragment.html
-${PLIST.doc}share/doc/gccint/Target-Macros.html
-${PLIST.doc}share/doc/gccint/Target-Structure.html
-${PLIST.doc}share/doc/gccint/Temporaries.html
-${PLIST.doc}share/doc/gccint/Test-Directives.html
-${PLIST.doc}share/doc/gccint/Test-Idioms.html
-${PLIST.doc}share/doc/gccint/Testsuites.html
-${PLIST.doc}share/doc/gccint/Texinfo-Manuals.html
-${PLIST.doc}share/doc/gccint/Top-Level.html
-${PLIST.doc}share/doc/gccint/Trampolines.html
-${PLIST.doc}share/doc/gccint/Tree-SSA.html
-${PLIST.doc}share/doc/gccint/Tree-overview.html
-${PLIST.doc}share/doc/gccint/Tree_002dSSA-passes.html
-${PLIST.doc}share/doc/gccint/Trees.html
-${PLIST.doc}share/doc/gccint/Type-Information.html
-${PLIST.doc}share/doc/gccint/Type-Layout.html
-${PLIST.doc}share/doc/gccint/Types.html
-${PLIST.doc}share/doc/gccint/Uninitialized-Data.html
-${PLIST.doc}share/doc/gccint/VMS-Debug.html
-${PLIST.doc}share/doc/gccint/Values-in-Registers.html
-${PLIST.doc}share/doc/gccint/Varargs.html
-${PLIST.doc}share/doc/gccint/Vector-Operations.html
-${PLIST.doc}share/doc/gccint/Working-with-declarations.html
-${PLIST.doc}share/doc/gccint/compat-Testing.html
-${PLIST.doc}share/doc/gccint/define_005fpeephole.html
-${PLIST.doc}share/doc/gccint/define_005fpeephole2.html
-${PLIST.doc}share/doc/gccint/epilogue-instruction-pattern.html
-${PLIST.doc}share/doc/gccint/gcc-Directory.html
-${PLIST.doc}share/doc/gccint/gcov-Testing.html
-${PLIST.doc}share/doc/gccint/index.html
-${PLIST.doc}share/doc/gccint/libgcj-Tests.html
-${PLIST.doc}share/doc/gccint/profopt-Testing.html
-${PLIST.doc}share/doc/gccint/prologue-instruction-pattern.html
-${PLIST.doc}share/doc/gccint/shift-patterns.html
-@pkgdir ${NIOS2_TARGET}/lib
+@comment $NetBSD: PLIST,v 1.2 2016/06/19 16:20:28 wiz Exp $
+cross/bin/${NIOS2_TARGET}-cpp
+cross/bin/${NIOS2_TARGET}-gcc
+cross/bin/${NIOS2_TARGET}-gcc-${PKGVERSION}
+cross/bin/${NIOS2_TARGET}-gccbug
+cross/bin/${NIOS2_TARGET}-gcov
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/crtbegin.o
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/crtbeginS.o
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/crtbeginT.o
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/crtend.o
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/crtendS.o
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/crti.o
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/crtn.o
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include-fixed/README
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include-fixed/limits.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include-fixed/syslimits.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/float.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/iso646.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/stdarg.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/stdbool.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/stddef.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/unwind.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/varargs.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/install-tools/fixinc_list
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/install-tools/gsyslimits.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/install-tools/include/README
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/install-tools/include/limits.h
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/install-tools/macro_list
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/install-tools/mkheaders.conf
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/libgcc.a
+cross/lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/libgcov.a
+cross/libexec/gcc/${NIOS2_TARGET}/${PKGVERSION}/cc1
+cross/libexec/gcc/${NIOS2_TARGET}/${PKGVERSION}/collect2
+cross/libexec/gcc/${NIOS2_TARGET}/${PKGVERSION}/install-tools/fixinc.sh
+cross/libexec/gcc/${NIOS2_TARGET}/${PKGVERSION}/install-tools/fixincl
+cross/libexec/gcc/${NIOS2_TARGET}/${PKGVERSION}/install-tools/mkheaders
+cross/libexec/gcc/${NIOS2_TARGET}/${PKGVERSION}/install-tools/mkinstalldirs
+cross/man/man1/${NIOS2_TARGET}-cpp.1
+cross/man/man1/${NIOS2_TARGET}-gcc.1
+cross/man/man1/${NIOS2_TARGET}-gcov.1
+${PLIST.doc}/cross/share/doc/cpp/Argument-Prescan.html
+${PLIST.doc}/cross/share/doc/cpp/Assertions.html
+${PLIST.doc}/cross/share/doc/cpp/C_002b_002b-Named-Operators.html
+${PLIST.doc}/cross/share/doc/cpp/Character-sets.html
+${PLIST.doc}/cross/share/doc/cpp/Common-Predefined-Macros.html
+${PLIST.doc}/cross/share/doc/cpp/Computed-Includes.html
+${PLIST.doc}/cross/share/doc/cpp/Concatenation.html
+${PLIST.doc}/cross/share/doc/cpp/Concept-Index.html
+${PLIST.doc}/cross/share/doc/cpp/Conditional-Syntax.html
+${PLIST.doc}/cross/share/doc/cpp/Conditional-Uses.html
+${PLIST.doc}/cross/share/doc/cpp/Conditionals.html
+${PLIST.doc}/cross/share/doc/cpp/Defined.html
+${PLIST.doc}/cross/share/doc/cpp/Deleted-Code.html
+${PLIST.doc}/cross/share/doc/cpp/Diagnostics.html
+${PLIST.doc}/cross/share/doc/cpp/Differences-from-previous-versions.html
+${PLIST.doc}/cross/share/doc/cpp/Directives-Within-Macro-Arguments.html
+${PLIST.doc}/cross/share/doc/cpp/Duplication-of-Side-Effects.html
+${PLIST.doc}/cross/share/doc/cpp/Elif.html
+${PLIST.doc}/cross/share/doc/cpp/Else.html
+${PLIST.doc}/cross/share/doc/cpp/Environment-Variables.html
+${PLIST.doc}/cross/share/doc/cpp/Function_002dlike-Macros.html
+${PLIST.doc}/cross/share/doc/cpp/GNU-Free-Documentation-License.html
+${PLIST.doc}/cross/share/doc/cpp/Header-Files.html
+${PLIST.doc}/cross/share/doc/cpp/Identifier-characters.html
+${PLIST.doc}/cross/share/doc/cpp/If.html
+${PLIST.doc}/cross/share/doc/cpp/Ifdef.html
+${PLIST.doc}/cross/share/doc/cpp/Implementation-Details.html
+${PLIST.doc}/cross/share/doc/cpp/Implementation-limits.html
+${PLIST.doc}/cross/share/doc/cpp/Implementation_002ddefined-behavior.html
+${PLIST.doc}/cross/share/doc/cpp/Include-Operation.html
+${PLIST.doc}/cross/share/doc/cpp/Include-Syntax.html
+${PLIST.doc}/cross/share/doc/cpp/Index-of-Directives.html
+${PLIST.doc}/cross/share/doc/cpp/Initial-processing.html
+${PLIST.doc}/cross/share/doc/cpp/Invocation.html
+${PLIST.doc}/cross/share/doc/cpp/Line-Control.html
+${PLIST.doc}/cross/share/doc/cpp/Macro-Arguments.html
+${PLIST.doc}/cross/share/doc/cpp/Macro-Pitfalls.html
+${PLIST.doc}/cross/share/doc/cpp/Macros.html
+${PLIST.doc}/cross/share/doc/cpp/Misnesting.html
+${PLIST.doc}/cross/share/doc/cpp/Newlines-in-Arguments.html
+${PLIST.doc}/cross/share/doc/cpp/Object_002dlike-Macros.html
+${PLIST.doc}/cross/share/doc/cpp/Obsolete-Features.html
+${PLIST.doc}/cross/share/doc/cpp/Obsolete-once_002donly-headers.html
+${PLIST.doc}/cross/share/doc/cpp/Once_002dOnly-Headers.html
+${PLIST.doc}/cross/share/doc/cpp/Operator-Precedence-Problems.html
+${PLIST.doc}/cross/share/doc/cpp/Option-Index.html
+${PLIST.doc}/cross/share/doc/cpp/Other-Directives.html
+${PLIST.doc}/cross/share/doc/cpp/Overview.html
+${PLIST.doc}/cross/share/doc/cpp/Pragmas.html
+${PLIST.doc}/cross/share/doc/cpp/Predefined-Macros.html
+${PLIST.doc}/cross/share/doc/cpp/Preprocessor-Output.html
+${PLIST.doc}/cross/share/doc/cpp/Search-Path.html
+${PLIST.doc}/cross/share/doc/cpp/Self_002dReferential-Macros.html
+${PLIST.doc}/cross/share/doc/cpp/Standard-Predefined-Macros.html
+${PLIST.doc}/cross/share/doc/cpp/Stringification.html
+${PLIST.doc}/cross/share/doc/cpp/Swallowing-the-Semicolon.html
+${PLIST.doc}/cross/share/doc/cpp/System-Headers.html
+${PLIST.doc}/cross/share/doc/cpp/System_002dspecific-Predefined-Macros.html
+${PLIST.doc}/cross/share/doc/cpp/The-preprocessing-language.html
+${PLIST.doc}/cross/share/doc/cpp/Tokenization.html
+${PLIST.doc}/cross/share/doc/cpp/Traditional-Mode.html
+${PLIST.doc}/cross/share/doc/cpp/Traditional-lexical-analysis.html
+${PLIST.doc}/cross/share/doc/cpp/Traditional-macros.html
+${PLIST.doc}/cross/share/doc/cpp/Traditional-miscellany.html
+${PLIST.doc}/cross/share/doc/cpp/Traditional-warnings.html
+${PLIST.doc}/cross/share/doc/cpp/Undefining-and-Redefining-Macros.html
+${PLIST.doc}/cross/share/doc/cpp/Variadic-Macros.html
+${PLIST.doc}/cross/share/doc/cpp/Wrapper-Headers.html
+${PLIST.doc}/cross/share/doc/cpp/Wtrigraphs.html
+${PLIST.doc}/cross/share/doc/cpp/dashMF.html
+${PLIST.doc}/cross/share/doc/cpp/fdollars_002din_002didentifiers.html
+${PLIST.doc}/cross/share/doc/cpp/index.html
+${PLIST.doc}/cross/share/doc/cpp/trigraphs.html
+${PLIST.doc}/cross/share/doc/cppinternals/Concept-Index.html
+${PLIST.doc}/cross/share/doc/cppinternals/Conventions.html
+${PLIST.doc}/cross/share/doc/cppinternals/Files.html
+${PLIST.doc}/cross/share/doc/cppinternals/Guard-Macros.html
+${PLIST.doc}/cross/share/doc/cppinternals/Hash-Nodes.html
+${PLIST.doc}/cross/share/doc/cppinternals/Invalid-identifiers.html
+${PLIST.doc}/cross/share/doc/cppinternals/Lexer.html
+${PLIST.doc}/cross/share/doc/cppinternals/Lexing-a-line.html
+${PLIST.doc}/cross/share/doc/cppinternals/Line-Numbering.html
+${PLIST.doc}/cross/share/doc/cppinternals/Macro-Expansion.html
+${PLIST.doc}/cross/share/doc/cppinternals/Token-Spacing.html
+${PLIST.doc}/cross/share/doc/cppinternals/index.html
+${PLIST.doc}/cross/share/doc/gcc/ARC-Options.html
+${PLIST.doc}/cross/share/doc/gcc/ARM-NEON-Intrinsics.html
+${PLIST.doc}/cross/share/doc/gcc/ARM-Options.html
+${PLIST.doc}/cross/share/doc/gcc/ARM-Pragmas.html
+${PLIST.doc}/cross/share/doc/gcc/ARM-iWMMXt-Built_002din-Functions.html
+${PLIST.doc}/cross/share/doc/gcc/AVR-Options.html
+${PLIST.doc}/cross/share/doc/gcc/Actual-Bugs.html
+${PLIST.doc}/cross/share/doc/gcc/Alignment.html
+${PLIST.doc}/cross/share/doc/gcc/Alpha-Built_002din-Functions.html
+${PLIST.doc}/cross/share/doc/gcc/Altera-Nios-II-Built_002din-Functions.html
+${PLIST.doc}/cross/share/doc/gcc/Altera-Nios-II-Options.html
+${PLIST.doc}/cross/share/doc/gcc/Altera-Nios-II-Pragmas.html
+${PLIST.doc}/cross/share/doc/gcc/Alternate-Keywords.html
+${PLIST.doc}/cross/share/doc/gcc/Architecture-implementation.html
+${PLIST.doc}/cross/share/doc/gcc/Argument-Types.html
+${PLIST.doc}/cross/share/doc/gcc/Arrays-and-pointers-implementation.html
+${PLIST.doc}/cross/share/doc/gcc/Asm-Labels.html
+${PLIST.doc}/cross/share/doc/gcc/Assembler-Options.html
+${PLIST.doc}/cross/share/doc/gcc/Atomic-Builtins.html
+${PLIST.doc}/cross/share/doc/gcc/Attribute-Syntax.html
+${PLIST.doc}/cross/share/doc/gcc/Backwards-Compatibility.html
+${PLIST.doc}/cross/share/doc/gcc/Blackfin-Built_002din-Functions.html
+${PLIST.doc}/cross/share/doc/gcc/Blackfin-Options.html
+${PLIST.doc}/cross/share/doc/gcc/Bound-member-functions.html
+${PLIST.doc}/cross/share/doc/gcc/Bug-Criteria.html
+${PLIST.doc}/cross/share/doc/gcc/Bug-Reporting.html
+${PLIST.doc}/cross/share/doc/gcc/Bugs.html
+${PLIST.doc}/cross/share/doc/gcc/C-Dialect-Options.html
+${PLIST.doc}/cross/share/doc/gcc/C-Extensions.html
+${PLIST.doc}/cross/share/doc/gcc/C-Implementation.html
+${PLIST.doc}/cross/share/doc/gcc/C99-Thread_002dLocal-Edits.html
+${PLIST.doc}/cross/share/doc/gcc/CRIS-Options.html
+${PLIST.doc}/cross/share/doc/gcc/CRX-Options.html
+${PLIST.doc}/cross/share/doc/gcc/C_002b_002b-Attributes.html
+${PLIST.doc}/cross/share/doc/gcc/C_002b_002b-Comments.html
+${PLIST.doc}/cross/share/doc/gcc/C_002b_002b-Dialect-Options.html
+${PLIST.doc}/cross/share/doc/gcc/C_002b_002b-Extensions.html
+${PLIST.doc}/cross/share/doc/gcc/C_002b_002b-Interface.html
+${PLIST.doc}/cross/share/doc/gcc/C_002b_002b-Misunderstandings.html
+${PLIST.doc}/cross/share/doc/gcc/C_002b_002b98-Thread_002dLocal-Edits.html
+${PLIST.doc}/cross/share/doc/gcc/Case-Ranges.html
+${PLIST.doc}/cross/share/doc/gcc/Cast-to-Union.html
+${PLIST.doc}/cross/share/doc/gcc/Character-Escapes.html
+${PLIST.doc}/cross/share/doc/gcc/Characters-implementation.html
+${PLIST.doc}/cross/share/doc/gcc/Code-Gen-Options.html
+${PLIST.doc}/cross/share/doc/gcc/Compatibility.html
+${PLIST.doc}/cross/share/doc/gcc/Complex.html
+${PLIST.doc}/cross/share/doc/gcc/Compound-Literals.html
+${PLIST.doc}/cross/share/doc/gcc/Conditionals.html
+${PLIST.doc}/cross/share/doc/gcc/Constant-string-objects.html
+${PLIST.doc}/cross/share/doc/gcc/Constraints.html
+${PLIST.doc}/cross/share/doc/gcc/Constructing-Calls.html
+${PLIST.doc}/cross/share/doc/gcc/Contributing.html
+${PLIST.doc}/cross/share/doc/gcc/Contributors.html
+${PLIST.doc}/cross/share/doc/gcc/Copy-Assignment.html
+${PLIST.doc}/cross/share/doc/gcc/Copying.html
+${PLIST.doc}/cross/share/doc/gcc/Cross_002dCompiler-Problems.html
+${PLIST.doc}/cross/share/doc/gcc/Cross_002dprofiling.html
+${PLIST.doc}/cross/share/doc/gcc/DEC-Alpha-Options.html
+${PLIST.doc}/cross/share/doc/gcc/DEC-Alpha_002fVMS-Options.html
+${PLIST.doc}/cross/share/doc/gcc/Darwin-Options.html
+${PLIST.doc}/cross/share/doc/gcc/Darwin-Pragmas.html
+${PLIST.doc}/cross/share/doc/gcc/Debugging-Options.html
+${PLIST.doc}/cross/share/doc/gcc/Declarators-implementation.html
+${PLIST.doc}/cross/share/doc/gcc/Deprecated-Features.html
+${PLIST.doc}/cross/share/doc/gcc/Designated-Inits.html
+${PLIST.doc}/cross/share/doc/gcc/Directly_002dmapped-Integer-Functions.html
+${PLIST.doc}/cross/share/doc/gcc/Directly_002dmapped-Media-Functions.html
+${PLIST.doc}/cross/share/doc/gcc/Directory-Options.html
+${PLIST.doc}/cross/share/doc/gcc/Disappointments.html
+${PLIST.doc}/cross/share/doc/gcc/Dollar-Signs.html
+${PLIST.doc}/cross/share/doc/gcc/Empty-Structures.html
+${PLIST.doc}/cross/share/doc/gcc/Environment-Variables.html
+${PLIST.doc}/cross/share/doc/gcc/Environment-implementation.html
+${PLIST.doc}/cross/share/doc/gcc/Escaped-Newlines.html
+${PLIST.doc}/cross/share/doc/gcc/Example-of-asm-with-clobbered-asm-reg.html
+${PLIST.doc}/cross/share/doc/gcc/Executing-code-before-main.html
+${PLIST.doc}/cross/share/doc/gcc/Explicit-Reg-Vars.html
+${PLIST.doc}/cross/share/doc/gcc/Extended-Asm.html
+${PLIST.doc}/cross/share/doc/gcc/FRV-Options.html
+${PLIST.doc}/cross/share/doc/gcc/FR_002dV-Built_002din-Functions.html
+${PLIST.doc}/cross/share/doc/gcc/Fixed-Headers.html
+${PLIST.doc}/cross/share/doc/gcc/Floating-point-implementation.html
+${PLIST.doc}/cross/share/doc/gcc/Function-Attributes.html
+${PLIST.doc}/cross/share/doc/gcc/Function-Names.html
+${PLIST.doc}/cross/share/doc/gcc/Function-Prototypes.html
+${PLIST.doc}/cross/share/doc/gcc/Funding.html
+${PLIST.doc}/cross/share/doc/gcc/GNU-Free-Documentation-License.html
+${PLIST.doc}/cross/share/doc/gcc/GNU-Project.html
+${PLIST.doc}/cross/share/doc/gcc/GNU_002fLinux-Options.html
+${PLIST.doc}/cross/share/doc/gcc/G_002b_002b-and-GCC.html
+${PLIST.doc}/cross/share/doc/gcc/Garbage-Collection.html
+${PLIST.doc}/cross/share/doc/gcc/Gcov-Data-Files.html
+${PLIST.doc}/cross/share/doc/gcc/Gcov-Intro.html
+${PLIST.doc}/cross/share/doc/gcc/Gcov-and-Optimization.html
+${PLIST.doc}/cross/share/doc/gcc/Gcov.html
+${PLIST.doc}/cross/share/doc/gcc/Global-Reg-Vars.html
+${PLIST.doc}/cross/share/doc/gcc/H8_002f300-Options.html
+${PLIST.doc}/cross/share/doc/gcc/HPPA-Options.html
+${PLIST.doc}/cross/share/doc/gcc/Hex-Floats.html
+${PLIST.doc}/cross/share/doc/gcc/Hints-implementation.html
+${PLIST.doc}/cross/share/doc/gcc/IA_002d64-Options.html
+${PLIST.doc}/cross/share/doc/gcc/Identifiers-implementation.html
+${PLIST.doc}/cross/share/doc/gcc/Incompatibilities.html
+${PLIST.doc}/cross/share/doc/gcc/Incomplete-Enums.html
+${PLIST.doc}/cross/share/doc/gcc/Initializers.html
+${PLIST.doc}/cross/share/doc/gcc/Inline.html
+${PLIST.doc}/cross/share/doc/gcc/Integers-implementation.html
+${PLIST.doc}/cross/share/doc/gcc/Interoperation.html
+${PLIST.doc}/cross/share/doc/gcc/Invoking-GCC.html
+${PLIST.doc}/cross/share/doc/gcc/Invoking-G_002b_002b.html
+${PLIST.doc}/cross/share/doc/gcc/Invoking-Gcov.html
+${PLIST.doc}/cross/share/doc/gcc/Java-Exceptions.html
+${PLIST.doc}/cross/share/doc/gcc/Keyword-Index.html
+${PLIST.doc}/cross/share/doc/gcc/Labels-as-Values.html
+${PLIST.doc}/cross/share/doc/gcc/Language-Independent-Options.html
+${PLIST.doc}/cross/share/doc/gcc/Library-functions-implementation.html
+${PLIST.doc}/cross/share/doc/gcc/Link-Options.html
+${PLIST.doc}/cross/share/doc/gcc/Local-Labels.html
+${PLIST.doc}/cross/share/doc/gcc/Local-Reg-Vars.html
+${PLIST.doc}/cross/share/doc/gcc/Locale_002dspecific-behavior-implementation.html
+${PLIST.doc}/cross/share/doc/gcc/Long-Long.html
+${PLIST.doc}/cross/share/doc/gcc/M32C-Options.html
+${PLIST.doc}/cross/share/doc/gcc/M32C-Pragmas.html
+${PLIST.doc}/cross/share/doc/gcc/M32R_002fD-Options.html
+${PLIST.doc}/cross/share/doc/gcc/M680x0-Options.html
+${PLIST.doc}/cross/share/doc/gcc/M68hc1x-Options.html
+${PLIST.doc}/cross/share/doc/gcc/MCore-Options.html
+${PLIST.doc}/cross/share/doc/gcc/MIPS-DSP-Built_002din-Functions.html
+${PLIST.doc}/cross/share/doc/gcc/MIPS-Options.html
+${PLIST.doc}/cross/share/doc/gcc/MIPS-Paired_002dSingle-Support.html
+${PLIST.doc}/cross/share/doc/gcc/MIPS_002d3D-Built_002din-Functions.html
+${PLIST.doc}/cross/share/doc/gcc/MMIX-Options.html
+${PLIST.doc}/cross/share/doc/gcc/MN10300-Options.html
+${PLIST.doc}/cross/share/doc/gcc/MT-Options.html
+${PLIST.doc}/cross/share/doc/gcc/Machine-Constraints.html
+${PLIST.doc}/cross/share/doc/gcc/Mixed-Declarations.html
+${PLIST.doc}/cross/share/doc/gcc/Modifiers.html
+${PLIST.doc}/cross/share/doc/gcc/Multi_002dAlternative.html
+${PLIST.doc}/cross/share/doc/gcc/Name-lookup.html
+${PLIST.doc}/cross/share/doc/gcc/Nested-Functions.html
+${PLIST.doc}/cross/share/doc/gcc/Non_002dbugs.html
+${PLIST.doc}/cross/share/doc/gcc/Object-Size-Checking.html
+${PLIST.doc}/cross/share/doc/gcc/Objective_002dC-and-Objective_002dC_002b_002b-Dialect-Options.html
+${PLIST.doc}/cross/share/doc/gcc/Objective_002dC.html
+${PLIST.doc}/cross/share/doc/gcc/Offsetof.html
+${PLIST.doc}/cross/share/doc/gcc/Optimize-Options.html
+${PLIST.doc}/cross/share/doc/gcc/Option-Index.html
+${PLIST.doc}/cross/share/doc/gcc/Option-Summary.html
+${PLIST.doc}/cross/share/doc/gcc/Other-Built_002din-Functions.html
+${PLIST.doc}/cross/share/doc/gcc/Other-Builtins.html
+${PLIST.doc}/cross/share/doc/gcc/Overall-Options.html
+${PLIST.doc}/cross/share/doc/gcc/PDP_002d11-Options.html
+${PLIST.doc}/cross/share/doc/gcc/Paired_002dSingle-Arithmetic.html
+${PLIST.doc}/cross/share/doc/gcc/Paired_002dSingle-Built_002din-Functions.html
+${PLIST.doc}/cross/share/doc/gcc/Pointer-Arith.html
+${PLIST.doc}/cross/share/doc/gcc/PowerPC-AltiVec-Built_002din-Functions.html
+${PLIST.doc}/cross/share/doc/gcc/PowerPC-Options.html
+${PLIST.doc}/cross/share/doc/gcc/Pragmas.html
+${PLIST.doc}/cross/share/doc/gcc/Precompiled-Headers.html
+${PLIST.doc}/cross/share/doc/gcc/Preprocessing-directives-implementation.html
+${PLIST.doc}/cross/share/doc/gcc/Preprocessor-Options.html
+${PLIST.doc}/cross/share/doc/gcc/Protoize-Caveats.html
+${PLIST.doc}/cross/share/doc/gcc/Qualifiers-implementation.html
+${PLIST.doc}/cross/share/doc/gcc/RS_002f6000-and-PowerPC-Options.html
+${PLIST.doc}/cross/share/doc/gcc/RS_002f6000-and-PowerPC-Pragmas.html
+${PLIST.doc}/cross/share/doc/gcc/Raw-read_002fwrite-Functions.html
+${PLIST.doc}/cross/share/doc/gcc/Restricted-Pointers.html
+${PLIST.doc}/cross/share/doc/gcc/Return-Address.html
+${PLIST.doc}/cross/share/doc/gcc/Running-Protoize.html
+${PLIST.doc}/cross/share/doc/gcc/SH-Options.html
+${PLIST.doc}/cross/share/doc/gcc/SPARC-Options.html
+${PLIST.doc}/cross/share/doc/gcc/SPARC-VIS-Built_002din-Functions.html
+${PLIST.doc}/cross/share/doc/gcc/S_002f390-and-zSeries-Options.html
+${PLIST.doc}/cross/share/doc/gcc/Service.html
+${PLIST.doc}/cross/share/doc/gcc/Simple-Constraints.html
+${PLIST.doc}/cross/share/doc/gcc/Solaris-Format-Checks.html
+${PLIST.doc}/cross/share/doc/gcc/Solaris-Pragmas.html
+${PLIST.doc}/cross/share/doc/gcc/Spec-Files.html
+${PLIST.doc}/cross/share/doc/gcc/Standard-Libraries.html
+${PLIST.doc}/cross/share/doc/gcc/Standards.html
+${PLIST.doc}/cross/share/doc/gcc/Statement-Exprs.html
+${PLIST.doc}/cross/share/doc/gcc/Statements-implementation.html
+${PLIST.doc}/cross/share/doc/gcc/Static-Definitions.html
+${PLIST.doc}/cross/share/doc/gcc/Strong-Using.html
+${PLIST.doc}/cross/share/doc/gcc/Structure_002dPacking-Pragmas.html
+${PLIST.doc}/cross/share/doc/gcc/Structures-unions-enumerations-and-bit_002dfields-implementation.html
+${PLIST.doc}/cross/share/doc/gcc/Submodel-Options.html
+${PLIST.doc}/cross/share/doc/gcc/Subscripting.html
+${PLIST.doc}/cross/share/doc/gcc/Symbol_002dRenaming-Pragmas.html
+${PLIST.doc}/cross/share/doc/gcc/System-V-Options.html
+${PLIST.doc}/cross/share/doc/gcc/TMS320C3x_002fC4x-Options.html
+${PLIST.doc}/cross/share/doc/gcc/Target-Builtins.html
+${PLIST.doc}/cross/share/doc/gcc/Target-Format-Checks.html
+${PLIST.doc}/cross/share/doc/gcc/Target-Options.html
+${PLIST.doc}/cross/share/doc/gcc/Template-Instantiation.html
+${PLIST.doc}/cross/share/doc/gcc/Temporaries.html
+${PLIST.doc}/cross/share/doc/gcc/Thread_002dLocal.html
+${PLIST.doc}/cross/share/doc/gcc/Translation-implementation.html
+${PLIST.doc}/cross/share/doc/gcc/Trouble.html
+${PLIST.doc}/cross/share/doc/gcc/Type-Attributes.html
+${PLIST.doc}/cross/share/doc/gcc/Type-encoding.html
+${PLIST.doc}/cross/share/doc/gcc/Typeof.html
+${PLIST.doc}/cross/share/doc/gcc/Unnamed-Fields.html
+${PLIST.doc}/cross/share/doc/gcc/V850-Options.html
+${PLIST.doc}/cross/share/doc/gcc/VAX-Options.html
+${PLIST.doc}/cross/share/doc/gcc/Vague-Linkage.html
+${PLIST.doc}/cross/share/doc/gcc/Variable-Attributes.html
+${PLIST.doc}/cross/share/doc/gcc/Variable-Length.html
+${PLIST.doc}/cross/share/doc/gcc/Variadic-Macros.html
+${PLIST.doc}/cross/share/doc/gcc/Vector-Extensions.html
+${PLIST.doc}/cross/share/doc/gcc/Volatiles.html
+${PLIST.doc}/cross/share/doc/gcc/VxWorks-Options.html
+${PLIST.doc}/cross/share/doc/gcc/Warning-Options.html
+${PLIST.doc}/cross/share/doc/gcc/Warnings-and-Errors.html
+${PLIST.doc}/cross/share/doc/gcc/Weak-Pragmas.html
+${PLIST.doc}/cross/share/doc/gcc/What-you-can-and-what-you-cannot-do-in-_002bload.html
+${PLIST.doc}/cross/share/doc/gcc/Wtrigraphs.html
+${PLIST.doc}/cross/share/doc/gcc/X86-Built_002din-Functions.html
+${PLIST.doc}/cross/share/doc/gcc/Xstormy16-Options.html
+${PLIST.doc}/cross/share/doc/gcc/Xtensa-Options.html
+${PLIST.doc}/cross/share/doc/gcc/Zero-Length.html
+${PLIST.doc}/cross/share/doc/gcc/compatibility_005falias.html
+${PLIST.doc}/cross/share/doc/gcc/cpp.pdf
+${PLIST.doc}/cross/share/doc/gcc/cppinternals.pdf
+${PLIST.doc}/cross/share/doc/gcc/dashMF.html
+${PLIST.doc}/cross/share/doc/gcc/fdollars_002din_002didentifiers.html
+${PLIST.doc}/cross/share/doc/gcc/gcc.pdf
+${PLIST.doc}/cross/share/doc/gcc/gccinstall.pdf
+${PLIST.doc}/cross/share/doc/gcc/gccint.pdf
+${PLIST.doc}/cross/share/doc/gcc/i386-and-x86_002d64-Options.html
+${PLIST.doc}/cross/share/doc/gcc/index.html
+${PLIST.doc}/cross/share/doc/gcc/x86_002d64-Options.html
+${PLIST.doc}/cross/share/doc/gcc/zSeries-Options.html
+${PLIST.doc}/cross/share/doc/gccinstall/index.html
+${PLIST.doc}/cross/share/doc/gccint/Accessors.html
+${PLIST.doc}/cross/share/doc/gccint/Ada-Tests.html
+${PLIST.doc}/cross/share/doc/gccint/Adding-new-DECL-node-types.html
+${PLIST.doc}/cross/share/doc/gccint/Addressing-Modes.html
+${PLIST.doc}/cross/share/doc/gccint/Aggregate-Return.html
+${PLIST.doc}/cross/share/doc/gccint/Alias-analysis.html
+${PLIST.doc}/cross/share/doc/gccint/Alignment-Output.html
+${PLIST.doc}/cross/share/doc/gccint/All-Debuggers.html
+${PLIST.doc}/cross/share/doc/gccint/Allocation-Order.html
+${PLIST.doc}/cross/share/doc/gccint/Annotations.html
+${PLIST.doc}/cross/share/doc/gccint/Arithmetic.html
+${PLIST.doc}/cross/share/doc/gccint/Assembler-Format.html
+${PLIST.doc}/cross/share/doc/gccint/Assembler.html
+${PLIST.doc}/cross/share/doc/gccint/Attr-Example.html
+${PLIST.doc}/cross/share/doc/gccint/Attributes.html
+${PLIST.doc}/cross/share/doc/gccint/Back-End.html
+${PLIST.doc}/cross/share/doc/gccint/Basic-Blocks.html
+${PLIST.doc}/cross/share/doc/gccint/Bit_002dFields.html
+${PLIST.doc}/cross/share/doc/gccint/Blocks.html
+${PLIST.doc}/cross/share/doc/gccint/Build.html
+${PLIST.doc}/cross/share/doc/gccint/C-Tests.html
+${PLIST.doc}/cross/share/doc/gccint/C_002b_002b-ABI.html
+${PLIST.doc}/cross/share/doc/gccint/Caller-Saves.html
+${PLIST.doc}/cross/share/doc/gccint/Calls.html
+${PLIST.doc}/cross/share/doc/gccint/Class-Preferences.html
+${PLIST.doc}/cross/share/doc/gccint/Classes.html
+${PLIST.doc}/cross/share/doc/gccint/Cleanups.html
+${PLIST.doc}/cross/share/doc/gccint/Code-Macros.html
+${PLIST.doc}/cross/share/doc/gccint/Collect2.html
+${PLIST.doc}/cross/share/doc/gccint/Comparisons.html
+${PLIST.doc}/cross/share/doc/gccint/Compound-Expressions.html
+${PLIST.doc}/cross/share/doc/gccint/Compound-Lvalues.html
+${PLIST.doc}/cross/share/doc/gccint/Concept-Index.html
+${PLIST.doc}/cross/share/doc/gccint/Condition-Code.html
+${PLIST.doc}/cross/share/doc/gccint/Conditional-Execution.html
+${PLIST.doc}/cross/share/doc/gccint/Conditional-Expressions.html
+${PLIST.doc}/cross/share/doc/gccint/Config-Fragments.html
+${PLIST.doc}/cross/share/doc/gccint/Configuration-Files.html
+${PLIST.doc}/cross/share/doc/gccint/Configuration.html
+${PLIST.doc}/cross/share/doc/gccint/Configure-Terms.html
+${PLIST.doc}/cross/share/doc/gccint/Constant-Attributes.html
+${PLIST.doc}/cross/share/doc/gccint/Constant-Definitions.html
+${PLIST.doc}/cross/share/doc/gccint/Constants.html
+${PLIST.doc}/cross/share/doc/gccint/Constraints.html
+${PLIST.doc}/cross/share/doc/gccint/Containers.html
+${PLIST.doc}/cross/share/doc/gccint/Contributing.html
+${PLIST.doc}/cross/share/doc/gccint/Contributors.html
+${PLIST.doc}/cross/share/doc/gccint/Control-Flow.html
+${PLIST.doc}/cross/share/doc/gccint/Conversions.html
+${PLIST.doc}/cross/share/doc/gccint/Copying.html
+${PLIST.doc}/cross/share/doc/gccint/Costs.html
+${PLIST.doc}/cross/share/doc/gccint/Current-structure-hierarchy.html
+${PLIST.doc}/cross/share/doc/gccint/DBX-Hooks.html
+${PLIST.doc}/cross/share/doc/gccint/DBX-Options.html
+${PLIST.doc}/cross/share/doc/gccint/Data-Output.html
+${PLIST.doc}/cross/share/doc/gccint/Debugging-Info.html
+${PLIST.doc}/cross/share/doc/gccint/Declarations.html
+${PLIST.doc}/cross/share/doc/gccint/Deficiencies.html
+${PLIST.doc}/cross/share/doc/gccint/Defining-Attributes.html
+${PLIST.doc}/cross/share/doc/gccint/Defining-Mode-Macros.html
+${PLIST.doc}/cross/share/doc/gccint/Defining-Predicates.html
+${PLIST.doc}/cross/share/doc/gccint/Delay-Slots.html
+${PLIST.doc}/cross/share/doc/gccint/Dependent-Patterns.html
+${PLIST.doc}/cross/share/doc/gccint/Dispatch-Tables.html
+${PLIST.doc}/cross/share/doc/gccint/Documentation.html
+${PLIST.doc}/cross/share/doc/gccint/Driver.html
+${PLIST.doc}/cross/share/doc/gccint/Edges.html
+${PLIST.doc}/cross/share/doc/gccint/Elimination.html
+${PLIST.doc}/cross/share/doc/gccint/Empty-Statements.html
+${PLIST.doc}/cross/share/doc/gccint/Example.html
+${PLIST.doc}/cross/share/doc/gccint/Examples.html
+${PLIST.doc}/cross/share/doc/gccint/Exception-Handling.html
+${PLIST.doc}/cross/share/doc/gccint/Exception-Region-Output.html
+${PLIST.doc}/cross/share/doc/gccint/Exception-handling-routines.html
+${PLIST.doc}/cross/share/doc/gccint/Expander-Definitions.html
+${PLIST.doc}/cross/share/doc/gccint/Expression-trees.html
+${PLIST.doc}/cross/share/doc/gccint/Expressions.html
+${PLIST.doc}/cross/share/doc/gccint/File-Framework.html
+${PLIST.doc}/cross/share/doc/gccint/File-Names-and-DBX.html
+${PLIST.doc}/cross/share/doc/gccint/Files.html
+${PLIST.doc}/cross/share/doc/gccint/Filesystem.html
+${PLIST.doc}/cross/share/doc/gccint/Flags.html
+${PLIST.doc}/cross/share/doc/gccint/Floating-Point.html
+${PLIST.doc}/cross/share/doc/gccint/Fragments.html
+${PLIST.doc}/cross/share/doc/gccint/Frame-Layout.html
+${PLIST.doc}/cross/share/doc/gccint/Frame-Registers.html
+${PLIST.doc}/cross/share/doc/gccint/Front-End-Config.html
+${PLIST.doc}/cross/share/doc/gccint/Front-End-Directory.html
+${PLIST.doc}/cross/share/doc/gccint/Front-End.html
+${PLIST.doc}/cross/share/doc/gccint/Function-Basics.html
+${PLIST.doc}/cross/share/doc/gccint/Function-Bodies.html
+${PLIST.doc}/cross/share/doc/gccint/Function-Entry.html
+${PLIST.doc}/cross/share/doc/gccint/Functions.html
+${PLIST.doc}/cross/share/doc/gccint/Funding.html
+${PLIST.doc}/cross/share/doc/gccint/GENERIC.html
+${PLIST.doc}/cross/share/doc/gccint/GGC-Roots.html
+${PLIST.doc}/cross/share/doc/gccint/GIMPLE-Example.html
+${PLIST.doc}/cross/share/doc/gccint/GIMPLE-Exception-Handling.html
+${PLIST.doc}/cross/share/doc/gccint/GIMPLE-Expressions.html
+${PLIST.doc}/cross/share/doc/gccint/GIMPLE.html
+${PLIST.doc}/cross/share/doc/gccint/GNU-Free-Documentation-License.html
+${PLIST.doc}/cross/share/doc/gccint/GNU-Project.html
+${PLIST.doc}/cross/share/doc/gccint/GTY-Options.html
+${PLIST.doc}/cross/share/doc/gccint/Gimplification-pass.html
+${PLIST.doc}/cross/share/doc/gccint/Header-Dirs.html
+${PLIST.doc}/cross/share/doc/gccint/Headers.html
+${PLIST.doc}/cross/share/doc/gccint/Host-Common.html
+${PLIST.doc}/cross/share/doc/gccint/Host-Config.html
+${PLIST.doc}/cross/share/doc/gccint/Host-Fragment.html
+${PLIST.doc}/cross/share/doc/gccint/Host-Misc.html
+${PLIST.doc}/cross/share/doc/gccint/Identifiers.html
+${PLIST.doc}/cross/share/doc/gccint/Incdec.html
+${PLIST.doc}/cross/share/doc/gccint/Including-Patterns.html
+${PLIST.doc}/cross/share/doc/gccint/Initialization.html
+${PLIST.doc}/cross/share/doc/gccint/Insn-Attributes.html
+${PLIST.doc}/cross/share/doc/gccint/Insn-Canonicalizations.html
+${PLIST.doc}/cross/share/doc/gccint/Insn-Lengths.html
+${PLIST.doc}/cross/share/doc/gccint/Insn-Splitting.html
+${PLIST.doc}/cross/share/doc/gccint/Insns.html
+${PLIST.doc}/cross/share/doc/gccint/Instruction-Output.html
+${PLIST.doc}/cross/share/doc/gccint/Integer-library-routines.html
+${PLIST.doc}/cross/share/doc/gccint/Interface.html
+${PLIST.doc}/cross/share/doc/gccint/Interfaces.html
+${PLIST.doc}/cross/share/doc/gccint/Internal-structure.html
+${PLIST.doc}/cross/share/doc/gccint/Jump-Patterns.html
+${PLIST.doc}/cross/share/doc/gccint/Jumps.html
+${PLIST.doc}/cross/share/doc/gccint/Label-Output.html
+${PLIST.doc}/cross/share/doc/gccint/Languages.html
+${PLIST.doc}/cross/share/doc/gccint/Leaf-Functions.html
+${PLIST.doc}/cross/share/doc/gccint/Libgcc.html
+${PLIST.doc}/cross/share/doc/gccint/Library-Calls.html
+${PLIST.doc}/cross/share/doc/gccint/Library-Files.html
+${PLIST.doc}/cross/share/doc/gccint/Liveness-information.html
+${PLIST.doc}/cross/share/doc/gccint/Logical-Operators.html
+${PLIST.doc}/cross/share/doc/gccint/Looping-Patterns.html
+${PLIST.doc}/cross/share/doc/gccint/Loops.html
+${PLIST.doc}/cross/share/doc/gccint/MIPS-Coprocessors.html
+${PLIST.doc}/cross/share/doc/gccint/Machine-Constraints.html
+${PLIST.doc}/cross/share/doc/gccint/Machine-Desc.html
+${PLIST.doc}/cross/share/doc/gccint/Machine-Modes.html
+${PLIST.doc}/cross/share/doc/gccint/Machine_002dIndependent-Predicates.html
+${PLIST.doc}/cross/share/doc/gccint/Macros-and-Functions.html
+${PLIST.doc}/cross/share/doc/gccint/Macros-for-Initialization.html
+${PLIST.doc}/cross/share/doc/gccint/Macros.html
+${PLIST.doc}/cross/share/doc/gccint/Maintaining-the-CFG.html
+${PLIST.doc}/cross/share/doc/gccint/Makefile.html
+${PLIST.doc}/cross/share/doc/gccint/Man-Page-Generation.html
+${PLIST.doc}/cross/share/doc/gccint/Misc.html
+${PLIST.doc}/cross/share/doc/gccint/Miscellaneous-Docs.html
+${PLIST.doc}/cross/share/doc/gccint/Miscellaneous-routines.html
+${PLIST.doc}/cross/share/doc/gccint/Mode-Macros.html
+${PLIST.doc}/cross/share/doc/gccint/Mode-Switching.html
+${PLIST.doc}/cross/share/doc/gccint/Modifiers.html
+${PLIST.doc}/cross/share/doc/gccint/Multi_002dAlternative.html
+${PLIST.doc}/cross/share/doc/gccint/Namespaces.html
+${PLIST.doc}/cross/share/doc/gccint/Option-Index.html
+${PLIST.doc}/cross/share/doc/gccint/Option-file-format.html
+${PLIST.doc}/cross/share/doc/gccint/Option-properties.html
+${PLIST.doc}/cross/share/doc/gccint/Options.html
+${PLIST.doc}/cross/share/doc/gccint/Output-Statement.html
+${PLIST.doc}/cross/share/doc/gccint/Output-Template.html
+${PLIST.doc}/cross/share/doc/gccint/Overview.html
+${PLIST.doc}/cross/share/doc/gccint/PCH-Target.html
+${PLIST.doc}/cross/share/doc/gccint/PIC.html
+${PLIST.doc}/cross/share/doc/gccint/Parsing-pass.html
+${PLIST.doc}/cross/share/doc/gccint/Pass-manager.html
+${PLIST.doc}/cross/share/doc/gccint/Passes.html
+${PLIST.doc}/cross/share/doc/gccint/Pattern-Ordering.html
+${PLIST.doc}/cross/share/doc/gccint/Patterns.html
+${PLIST.doc}/cross/share/doc/gccint/Peephole-Definitions.html
+${PLIST.doc}/cross/share/doc/gccint/Per_002dFunction-Data.html
+${PLIST.doc}/cross/share/doc/gccint/Portability.html
+${PLIST.doc}/cross/share/doc/gccint/Predicates.html
+${PLIST.doc}/cross/share/doc/gccint/Processor-pipeline-description.html
+${PLIST.doc}/cross/share/doc/gccint/Profile-information.html
+${PLIST.doc}/cross/share/doc/gccint/Profiling.html
+${PLIST.doc}/cross/share/doc/gccint/RTL-Classes.html
+${PLIST.doc}/cross/share/doc/gccint/RTL-Declarations.html
+${PLIST.doc}/cross/share/doc/gccint/RTL-Objects.html
+${PLIST.doc}/cross/share/doc/gccint/RTL-Template.html
+${PLIST.doc}/cross/share/doc/gccint/RTL-passes.html
+${PLIST.doc}/cross/share/doc/gccint/RTL.html
+${PLIST.doc}/cross/share/doc/gccint/Reading-RTL.html
+${PLIST.doc}/cross/share/doc/gccint/Register-Arguments.html
+${PLIST.doc}/cross/share/doc/gccint/Register-Basics.html
+${PLIST.doc}/cross/share/doc/gccint/Register-Classes.html
+${PLIST.doc}/cross/share/doc/gccint/Registers.html
+${PLIST.doc}/cross/share/doc/gccint/Regs-and-Memory.html
+${PLIST.doc}/cross/share/doc/gccint/Rough-GIMPLE-Grammar.html
+${PLIST.doc}/cross/share/doc/gccint/Run_002dtime-Target.html
+${PLIST.doc}/cross/share/doc/gccint/SDB-and-DWARF.html
+${PLIST.doc}/cross/share/doc/gccint/SSA.html
+${PLIST.doc}/cross/share/doc/gccint/Scalar-Return.html
+${PLIST.doc}/cross/share/doc/gccint/Scheduling.html
+${PLIST.doc}/cross/share/doc/gccint/Scopes.html
+${PLIST.doc}/cross/share/doc/gccint/Sections.html
+${PLIST.doc}/cross/share/doc/gccint/Selection-Statements.html
+${PLIST.doc}/cross/share/doc/gccint/Sharing.html
+${PLIST.doc}/cross/share/doc/gccint/Side-Effects.html
+${PLIST.doc}/cross/share/doc/gccint/Simple-Constraints.html
+${PLIST.doc}/cross/share/doc/gccint/Soft-float-library-routines.html
+${PLIST.doc}/cross/share/doc/gccint/Source-Tree.html
+${PLIST.doc}/cross/share/doc/gccint/Special-Accessors.html
+${PLIST.doc}/cross/share/doc/gccint/Stack-Arguments.html
+${PLIST.doc}/cross/share/doc/gccint/Stack-Checking.html
+${PLIST.doc}/cross/share/doc/gccint/Stack-Registers.html
+${PLIST.doc}/cross/share/doc/gccint/Stack-Smashing-Protection.html
+${PLIST.doc}/cross/share/doc/gccint/Stack-and-Calling.html
+${PLIST.doc}/cross/share/doc/gccint/Standard-Names.html
+${PLIST.doc}/cross/share/doc/gccint/Statement-Operands.html
+${PLIST.doc}/cross/share/doc/gccint/Statement-Sequences.html
+${PLIST.doc}/cross/share/doc/gccint/Statements.html
+${PLIST.doc}/cross/share/doc/gccint/Storage-Layout.html
+${PLIST.doc}/cross/share/doc/gccint/Subdirectories.html
+${PLIST.doc}/cross/share/doc/gccint/Substitutions.html
+${PLIST.doc}/cross/share/doc/gccint/System-Config.html
+${PLIST.doc}/cross/share/doc/gccint/TARGET_005fSHIFT_005fTRUNCATION_005fMASK.html
+${PLIST.doc}/cross/share/doc/gccint/Tagging-Insns.html
+${PLIST.doc}/cross/share/doc/gccint/Tail-Calls.html
+${PLIST.doc}/cross/share/doc/gccint/Target-Attributes.html
+${PLIST.doc}/cross/share/doc/gccint/Target-Fragment.html
+${PLIST.doc}/cross/share/doc/gccint/Target-Macros.html
+${PLIST.doc}/cross/share/doc/gccint/Target-Structure.html
+${PLIST.doc}/cross/share/doc/gccint/Temporaries.html
+${PLIST.doc}/cross/share/doc/gccint/Test-Directives.html
+${PLIST.doc}/cross/share/doc/gccint/Test-Idioms.html
+${PLIST.doc}/cross/share/doc/gccint/Testsuites.html
+${PLIST.doc}/cross/share/doc/gccint/Texinfo-Manuals.html
+${PLIST.doc}/cross/share/doc/gccint/Top-Level.html
+${PLIST.doc}/cross/share/doc/gccint/Trampolines.html
+${PLIST.doc}/cross/share/doc/gccint/Tree-SSA.html
+${PLIST.doc}/cross/share/doc/gccint/Tree-overview.html
+${PLIST.doc}/cross/share/doc/gccint/Tree_002dSSA-passes.html
+${PLIST.doc}/cross/share/doc/gccint/Trees.html
+${PLIST.doc}/cross/share/doc/gccint/Type-Information.html
+${PLIST.doc}/cross/share/doc/gccint/Type-Layout.html
+${PLIST.doc}/cross/share/doc/gccint/Types.html
+${PLIST.doc}/cross/share/doc/gccint/Uninitialized-Data.html
+${PLIST.doc}/cross/share/doc/gccint/VMS-Debug.html
+${PLIST.doc}/cross/share/doc/gccint/Values-in-Registers.html
+${PLIST.doc}/cross/share/doc/gccint/Varargs.html
+${PLIST.doc}/cross/share/doc/gccint/Vector-Operations.html
+${PLIST.doc}/cross/share/doc/gccint/Working-with-declarations.html
+${PLIST.doc}/cross/share/doc/gccint/compat-Testing.html
+${PLIST.doc}/cross/share/doc/gccint/define_005fpeephole.html
+${PLIST.doc}/cross/share/doc/gccint/define_005fpeephole2.html
+${PLIST.doc}/cross/share/doc/gccint/epilogue-instruction-pattern.html
+${PLIST.doc}/cross/share/doc/gccint/gcc-Directory.html
+${PLIST.doc}/cross/share/doc/gccint/gcov-Testing.html
+${PLIST.doc}/cross/share/doc/gccint/index.html
+${PLIST.doc}/cross/share/doc/gccint/libgcj-Tests.html
+${PLIST.doc}/cross/share/doc/gccint/profopt-Testing.html
+${PLIST.doc}/cross/share/doc/gccint/prologue-instruction-pattern.html
+${PLIST.doc}/cross/share/doc/gccint/shift-patterns.html
diff --git a/cross/nios2/Makefile.common b/cross/nios2/Makefile.common
index b10a46efd68..9dc2e6fc8b5 100644
--- a/cross/nios2/Makefile.common
+++ b/cross/nios2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2014/01/27 18:41:11 wiz Exp $ -*- Makefile -*-
+# $NetBSD: Makefile.common,v 1.5 2016/06/19 16:20:28 wiz Exp $ -*- Makefile -*-
 #
 # used by cross/nios2-binutils/Makefile
 # used by cross/nios2-gcc/Makefile
@@ -12,15 +12,13 @@ MASTER_SITES=		https://sourcery.mentor.com/GNUToolchain/package11649/public/nios
 EXTRACT_SUFX=           .tar.bz2
 
 GNU_CONFIGURE=		yes
-INFO_FILES=		#empty
-USE_PKGLOCALEDIR=	yes
+INFO_FILES=		yes
 
 NIOS2_TARGET?=		nios2-elf
 PLIST_SUBST+=		NIOS2_TARGET=${NIOS2_TARGET:Q}
 
-USE_CROSSBASE=		yes
-BUILD_DEFS+=		CROSSBASE
-PATH:=			${CROSSBASE}/bin:${PATH}
+GNU_CONFIGURE_PREFIX=	${PREFIX}/cross
+PATH:=			${PREFIX}/cross/bin:${PATH}
 
 BUILD_DEPENDS+=		gtexinfo-[0-9]*:../../devel/gtexinfo
 # MASTER_SITES with https:// and FETCH_USING= curl