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, 130 insertions, 130 deletions

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