Help config.guess/config.sub override logic.

14 files changed, 52 insertions, 14 deletions

diff --git a/devel/zzuf/Makefile b/devel/zzuf/Makefile
index b833be2be4e..ed17f8ade75 100644
--- a/devel/zzuf/Makefile
+++ b/devel/zzuf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/10/31 11:19:55 asau Exp $
+# $NetBSD: Makefile,v 1.4 2015/02/23 18:28:51 joerg Exp $
 #
 
 DISTNAME=	zzuf-0.13
@@ -14,6 +14,8 @@ USE_LIBTOOL=	yes
 
 BUILDLINK_TRANSFORM+=	l:gnugetopt:getopt
 SHLIBTOOL_OVERRIDE=	# empty
+CONFIG_GUESS_OVERRIDE=	.auto/config.guess
+CONFIG_SUB_OVERRIDE=	.auto/config.sub
 
 SUBST_CLASSES+=		fix-paths
 SUBST_FILES.fix-paths=	doc/libzzuf.3.in
diff --git a/fonts/ps2pkm/Makefile b/fonts/ps2pkm/Makefile
index 8bce2ab828e..785043ec7aa 100644
--- a/fonts/ps2pkm/Makefile
+++ b/fonts/ps2pkm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2013/12/04 03:35:27 minskim Exp $
+# $NetBSD: Makefile,v 1.7 2015/02/23 18:28:51 joerg Exp $
 
 DISTNAME=	texlive-20130530-source
 PKGNAME=	ps2pkm-1.5
@@ -20,6 +20,8 @@ EXTRACT_ELEMENTS=	${DISTNAME}/build-aux \
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/ps2pkm
+CONFIG_GUESS_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.guess
+CONFIG_SUB_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.sub
 
 CONFIGURE_ARGS+=	--with-system-kpathsea \
 		--with-kpathsea-includes=${BUILDLINK_PREFIX.kpathsea}/include \
diff --git a/fonts/ttf2pk/Makefile b/fonts/ttf2pk/Makefile
index dd2b7b315d6..c13b44f41d4 100644
--- a/fonts/ttf2pk/Makefile
+++ b/fonts/ttf2pk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2013/11/19 03:11:20 minskim Exp $
+# $NetBSD: Makefile,v 1.29 2015/02/23 18:28:51 joerg Exp $
 
 DISTNAME=	texlive-20130530-source
 PKGNAME=	ttf2pk-1.5
@@ -18,6 +18,9 @@ GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/ttf2pk
 
+CONFIG_GUESS_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.guess
+CONFIG_SUB_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.sub
+
 CONFIGURE_ARGS+=	--with-system-kpathsea \
 		--with-kpathsea-includes=${BUILDLINK_PREFIX.kpathsea}/include \
 		--with-kpathsea-libdir=${BUILDLINK_PREFIX.kpathsea}/lib
diff --git a/fonts/ttfdump/Makefile b/fonts/ttfdump/Makefile
index f595ddbf6ec..9250f6403b5 100644
--- a/fonts/ttfdump/Makefile
+++ b/fonts/ttfdump/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/11/12 21:50:09 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2015/02/23 18:28:51 joerg Exp $
 
 DISTNAME=	texlive-20130530-source
 PKGNAME=	ttfdump-0.5.5
@@ -18,6 +18,9 @@ GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/ttfdump
 
+CONFIG_GUESS_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.guess
+CONFIG_SUB_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.sub
+
 CONFIGURE_ARGS+=	--with-system-kpathsea \
 		--with-kpathsea-includes=${BUILDLINK_PREFIX.kpathsea}/include \
 		--with-kpathsea-libdir=${BUILDLINK_PREFIX.kpathsea}/lib
diff --git a/graphics/libcaca/Makefile b/graphics/libcaca/Makefile
index 0ad2ea71b46..56434615fd5 100644
--- a/graphics/libcaca/Makefile
+++ b/graphics/libcaca/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2014/02/26 01:29:28 wiedi Exp $
+# $NetBSD: Makefile,v 1.31 2015/02/23 18:28:52 joerg Exp $
 
 DISTNAME=	libcaca-0.99.beta18
 PKGNAME=	${DISTNAME:S/beta//}
@@ -20,6 +20,9 @@ PKGCONFIG_OVERRIDE+=	caca/caca.pc.in
 
 CHECK_FILES_SKIP+=	${PREFIX}/lib/libcucul.*
 
+CONFIG_GUESS_OVERRIDE+=	.auto/config.guess
+CONFIG_SUB_OVERRIDE+=	.auto/config.sub
+
 .include "options.mk"
 
 CONFIGURE_ARGS+=	--disable-doc
diff --git a/lang/elk/Makefile b/lang/elk/Makefile
index 31990dd4962..c159b867cb9 100644
--- a/lang/elk/Makefile
+++ b/lang/elk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2012/10/02 20:11:38 asau Exp $
+# $NetBSD: Makefile,v 1.44 2015/02/23 18:28:52 joerg Exp $
 
 DISTNAME=	elk-3.99.8
 PKGREVISION=	1
@@ -17,6 +17,9 @@ USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 
+CONFIG_GUESS_OVERRIDE+=	.auto/config.guess
+CONFIG_SUB_OVERRIDE+=	.auto/config.sub
+
 .include "options.mk"
 
 .include "../../databases/gdbm/buildlink3.mk"
diff --git a/multimedia/libdvbpsi/Makefile b/multimedia/libdvbpsi/Makefile
index b9b82a21c3b..6bcc7dc6317 100644
--- a/multimedia/libdvbpsi/Makefile
+++ b/multimedia/libdvbpsi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2014/12/01 12:39:17 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2015/02/23 18:28:52 joerg Exp $
 
 DISTNAME=	libdvbpsi-1.2.0
 CATEGORIES=	multimedia
@@ -17,6 +17,9 @@ PKGCONFIG_OVERRIDE=	libdvbpsi.pc.in
 
 LIBS.SunOS+=	-lsocket -lnsl
 
+CONFIG_GUESS_OVERRIDE=	.auto/config.guess
+CONFIG_SUB_OVERRIDE=	.auto/config.sub
+
 .include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Mclang)
 _WRAP_EXTRA_ARGS.CC+=	-Wno-error=tautological-constant-out-of-range-compare \
diff --git a/multimedia/libdvbpsi0/Makefile b/multimedia/libdvbpsi0/Makefile
index fc2a8bef747..38dce79776c 100644
--- a/multimedia/libdvbpsi0/Makefile
+++ b/multimedia/libdvbpsi0/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/01/22 11:45:57 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2015/02/23 18:28:52 joerg Exp $
 
 DISTNAME=	libdvbpsi-0.2.2
 CATEGORIES=	multimedia
@@ -15,6 +15,9 @@ USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 PKGCONFIG_OVERRIDE=	libdvbpsi.pc.in
 
+CONFIG_GUESS_OVERRIDE=	.auto/config.guess
+CONFIG_SUB_OVERRIDE=	.auto/config.sub
+
 LIBS.SunOS+=	-lsocket -lnsl
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/dviljk/Makefile b/print/dviljk/Makefile
index 28925de3441..e646409f3ba 100644
--- a/print/dviljk/Makefile
+++ b/print/dviljk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2013/12/06 02:33:32 minskim Exp $
+# $NetBSD: Makefile,v 1.8 2015/02/23 18:28:52 joerg Exp $
 
 DISTNAME=	texlive-20130530-source
 PKGNAME=	dviljk-2.6.5
@@ -20,6 +20,9 @@ GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/dviljk
 
+CONFIG_GUESS_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.guess
+CONFIG_SUB_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.sub
+
 CONFIGURE_ARGS+=	--with-system-kpathsea \
 		--with-kpathsea-includes=${BUILDLINK_PREFIX.kpathsea}/include \
 		--with-kpathsea-libdir=${BUILDLINK_PREFIX.kpathsea}/lib
diff --git a/print/pdvipsk/Makefile b/print/pdvipsk/Makefile
index 4d7d2923dd5..7bf9da5df02 100644
--- a/print/pdvipsk/Makefile
+++ b/print/pdvipsk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2012/10/08 13:45:44 asau Exp $
+# $NetBSD: Makefile,v 1.3 2015/02/23 18:28:52 joerg Exp $
 
 DISTNAME=	texlive-20091011-source
 PKGNAME=	pdvipsk-5.98pl1.7b
@@ -22,6 +22,9 @@ USE_LIBTOOL=	yes
 USE_TOOLS+=	patch
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/dvipsk
 
+CONFIG_GUESS_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.guess
+CONFIG_SUB_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.sub
+
 CONFIGURE_ARGS+=	--with-system-kpathsea \
 		--with-kpathsea-includes=${BUILDLINK_PREFIX.kpathsea}/include \
 		--with-kpathsea-libdir=${BUILDLINK_PREFIX.kpathsea}/lib
diff --git a/print/ptexenc/Makefile b/print/ptexenc/Makefile
index d6a83cb1d86..3675c69833d 100644
--- a/print/ptexenc/Makefile
+++ b/print/ptexenc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2013/11/17 16:46:36 minskim Exp $
+# $NetBSD: Makefile,v 1.6 2015/02/23 18:28:52 joerg Exp $
 
 DISTNAME=	texlive-20130530-source
 PKGNAME=	ptexenc-1.3.1
@@ -17,6 +17,8 @@ EXTRACT_ELEMENTS=	${DISTNAME}/build-aux \
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/ptexenc
+CONFIG_GUESS_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.guess
+CONFIG_SUB_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.sub
 
 CONFIGURE_ARGS+=	--with-system-kpathsea \
 		--with-kpathsea-includes=${BUILDLINK_PREFIX.kpathsea}/include \
diff --git a/print/web2c/Makefile b/print/web2c/Makefile
index 5b31aac20d3..0e393a36729 100644
--- a/print/web2c/Makefile
+++ b/print/web2c/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2015/01/08 10:20:36 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2015/02/23 18:28:52 joerg Exp $
 
 DISTNAME=	texlive-20130530-source
 PKGNAME=	web2c-2013
@@ -27,6 +27,9 @@ USE_LIBTOOL=	yes
 USE_TOOLS+=	gmake lex yacc pkg-config
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/web2c
 
+CONFIG_GUESS_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.guess
+CONFIG_SUB_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.sub
+
 CONFIGURE_ARGS+=	--disable-luatex
 CONFIGURE_ARGS+=	--disable-xetex
 CONFIGURE_ARGS+=	--with-x=no
diff --git a/textproc/makeindexk/Makefile b/textproc/makeindexk/Makefile
index 539afbe2f94..d1f657c4107 100644
--- a/textproc/makeindexk/Makefile
+++ b/textproc/makeindexk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2013/11/18 18:41:18 minskim Exp $
+# $NetBSD: Makefile,v 1.8 2015/02/23 18:28:52 joerg Exp $
 
 DISTNAME=	texlive-20130530-source
 PKGNAME=	makeindexk-2.15
@@ -19,6 +19,8 @@ EXTRACT_ELEMENTS=	${DISTNAME}/build-aux \
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/makeindexk
+CONFIG_GUESS_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.guess
+CONFIG_SUB_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.sub
 
 CONFIGURE_ARGS+=	--with-system-kpathsea \
 		--with-kpathsea-includes=${BUILDLINK_PREFIX.kpathsea}/include \
diff --git a/textproc/mendexk/Makefile b/textproc/mendexk/Makefile
index 148c866af0f..28fa7c7804e 100644
--- a/textproc/mendexk/Makefile
+++ b/textproc/mendexk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2014/02/13 00:58:22 minskim Exp $
+# $NetBSD: Makefile,v 1.6 2015/02/23 18:28:52 joerg Exp $
 
 DISTNAME=	texlive-20130530-source
 PKGNAME=	mendexk-2.6f
@@ -21,6 +21,9 @@ GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/mendexk
 
+CONFIG_GUESS_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.guess
+CONFIG_SUB_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.sub
+
 CONFIGURE_ARGS+=	--with-system-kpathsea \
 		--with-kpathsea-includes=${BUILDLINK_PREFIX.kpathsea}/include \
 		--with-kpathsea-libdir=${BUILDLINK_PREFIX.kpathsea}/lib \