Remove mk/find-prefix.mk usage from the cross category.

The find-prefix infrastructure was required in a pkgviews world where
packages installed from pkgsrc could have different installation
prefixes, and this was a way for a dependency prefix to be determined.

Now that pkgviews has been removed there is no longer any need for the
overhead of this infrastructure.  Instead we use BUILDLINK_PREFIX.pkg
for dependencies pulled in via buildlink, or LOCALBASE/PREFIX where the
dependency is coming from pkgsrc.

Provides a reasonable performance win due to the reduction of `pkg_info
-qp` calls, some of which were redundant anyway as they were duplicating
the same information provided by BUILDLINK_PREFIX.pkg.

3 files changed, 6 insertions, 15 deletions

diff --git a/cross/freemint-gcc/Makefile b/cross/freemint-gcc/Makefile
index ec0bf2ab5ba..16b3c765ad6 100644
--- a/cross/freemint-gcc/Makefile
+++ b/cross/freemint-gcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/05/16 13:54:50 ryoon Exp $
+# $NetBSD: Makefile,v 1.4 2015/11/25 12:49:12 jperkin Exp $
 
 DISTNAME=		gcc-4.6.4
 PKGNAME=		cross-freemint-${DISTNAME}
@@ -33,9 +33,6 @@ GNU_CONFIGURE=		yes
 
 GNU_CONFIGURE_PREFIX=	${FREEMINT_PREFIX}
 
-FIND_PREFIX:=		AR_DIR=cross-freemint-binutils
-.include "../../mk/find-prefix.mk"
-
 CFLAGS+=		-fomit-frame-pointer
 
 HOSTDIR=		build-${MACHINE_ARCH}--${LOWER_OPSYS}
@@ -49,7 +46,7 @@ CONFIGURE_ARGS+=	--disable-multilib
 MAKE_ENV+=		SHELL=${TOOLS_PATH.bash}
 MAKE_ENV+=		FREEMINT_PREFIX=${FREEMINT_PREFIX}
 MAKE_ENV+=		WRKSRC=${WRKSRC}
-MAKE_ENV+=		ARDIR=${AR_DIR}/cross-freemint/bin
+MAKE_ENV+=		ARDIR=${FREEMINT_PREFIX}/bin
 MAKE_ENV+=		DESTDIR=${DESTDIR}
 MAKE_ENV+=		HOSTDIR=${HOSTDIR}
 MAKE_ENV+=		CONFIGURE_DIRS=${CONFIGURE_DIRS}
diff --git a/cross/freemint-mintlib/Makefile b/cross/freemint-mintlib/Makefile
index c719bd9cf93..622d8b6ef66 100644
--- a/cross/freemint-mintlib/Makefile
+++ b/cross/freemint-mintlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2015/01/16 23:53:04 wiedi Exp $
+# $NetBSD: Makefile,v 1.5 2015/11/25 12:49:12 jperkin Exp $
 
 DISTNAME=		mintlib-CVS-20131219
 PKGNAME=		cross-freemint-${DISTNAME:S/CVS-//}
@@ -33,9 +33,6 @@ GNU_CONFIGURE=		yes
 
 GNU_CONFIGURE_PREFIX=	${FREEMINT_PREFIX}
 
-FIND_PREFIX:=		AR_DIR=cross-freemint-binutils
-.include "../../mk/find-prefix.mk"
-
 CFLAGS+=		-fomit-frame-pointer
 
 CONFIGURE_ARGS+=	--target=m68k-atari-mint
@@ -47,7 +44,7 @@ CONFIGURE_ARGS+=	--disable-nls
 MAKE_ENV+=		SHELL=${TOOLS_PATH.bash}
 MAKE_ENV+=		FREEMINT_PREFIX=${FREEMINT_PREFIX}
 MAKE_ENV+=		WRKSRC=${WRKSRC}
-MAKE_ENV+=		ARDIR=${AR_DIR}/cross-freemint/bin
+MAKE_ENV+=		ARDIR=${FREEMINT_PREFIX}/bin
 MAKE_ENV+=		DESTDIR=${DESTDIR}
 MAKE_ENV+=		CONFIGURE_DIRS=${CONFIGURE_DIRS}
 INFO_FILES=		yes
diff --git a/cross/freemint-pml/Makefile b/cross/freemint-pml/Makefile
index ffe6c19ea99..0303d735a1e 100644
--- a/cross/freemint-pml/Makefile
+++ b/cross/freemint-pml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/09/12 14:03:58 ryoon Exp $
+# $NetBSD: Makefile,v 1.2 2015/11/25 12:49:12 jperkin Exp $
 
 DISTNAME=		pml-2.03
 PKGNAME=		cross-freemint-${DISTNAME}
@@ -38,9 +38,6 @@ GNU_CONFIGURE=		yes
 
 GNU_CONFIGURE_PREFIX=	${FREEMINT_PREFIX}
 
-FIND_PREFIX:=		AR_DIR=cross-freemint-binutils
-.include "../../mk/find-prefix.mk"
-
 CFLAGS+=		-fomit-frame-pointer
 
 CROSSDIR=		${DESTDIR}${FREEMINT_PREFIX}/m68k-atari-mint
@@ -54,7 +51,7 @@ CONFIGURE_ARGS+=	--disable-multilib
 MAKE_ENV+=		SHELL=${TOOLS_PATH.bash}
 MAKE_ENV+=		FREEMINT_PREFIX=${FREEMINT_PREFIX}
 MAKE_ENV+=		WRKSRC=${WRKSRC}
-MAKE_ENV+=		ARDIR=${AR_DIR}/cross-freemint/bin
+MAKE_ENV+=		ARDIR=${FREEMINT_PREFIX}/bin
 MAKE_ENV+=		DESTDIR=${DESTDIR}
 MAKE_ENV+=		CONFIGURE_DIRS=${CONFIGURE_DIRS}
 INFO_FILES=		yes