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.

2 files changed, 93 insertions, 94 deletions

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