[pkgsrc/trunk]: pkgsrc CONFIG_{GUESS,SUB}_OVERRIDE are now relative to ${WRKS...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc CONFIG_{GUESS,SUB}_OVERRIDE are now relative to ${WRKS...
From: jlam <jlam%pkgsrc.org@localhost>
Date: Wed, 13 Oct 2021 23:32:43 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/4e36ded90f32
branches:  trunk
changeset: 468496:4e36ded90f32
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Feb 14 15:29:15 2004 +0000

description:
CONFIG_{GUESS,SUB}_OVERRIDE are now relative to ${WRKSRC} and will
automatically substitute for any config.{guess,sub} files found up to a
directory depth of 2.

diffstat:

 archivers/arj/Makefile                 |   4 +---
 benchmarks/benchfft/Makefile           |   7 +++----
 databases/db3/Makefile                 |   6 +++---
 devel/libslang/Makefile                |   5 +----
 devel/libtool/Makefile.common          |   9 +--------
 devel/mit-pthreads/Makefile            |   5 +----
 devel/papaya/Makefile                  |   4 +---
 devel/unproven-pthreads/Makefile       |   5 +----
 editors/ce/Makefile.common             |   4 +---
 net/ORBit/Makefile                     |  10 +---------
 net/xorp/Makefile                      |  11 ++++-------
 print/teTeX1-bin/Makefile              |  10 +---------
 sysutils/amanda-common/Makefile.common |   4 +---
 13 files changed, 20 insertions(+), 64 deletions(-)

diffs (263 lines):

diff -r f620a995813e -r 4e36ded90f32 archivers/arj/Makefile
--- a/archivers/arj/Makefile    Sat Feb 14 15:22:42 2004 +0000
+++ b/archivers/arj/Makefile    Sat Feb 14 15:29:15 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/22 07:18:43 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/02/14 15:29:15 jlam Exp $
 # FreeBSD Id: ports/archivers/arj/Makefile,v 1.2 2002/09/17 05:17:29 ijliao Exp
 
 DISTNAME=      arj-3.10b
@@ -12,8 +12,6 @@
 USE_GNU_TOOLS+=                make
 GNU_CONFIGURE=         yes
 CONFIGURE_SCRIPT=      ${WRKSRC}/gnu/configure
-CONFIG_GUESS_OVERRIDE= ${WRKSRC}/gnu/config.guess
-CONFIG_SUB_OVERRIDE=   ${WRKSRC}/gnu/config.sub
 MAKEFILE=              makefile.gnu
 
 ARJ_DOCSDIR=           ${PREFIX}/share/doc/arj
diff -r f620a995813e -r 4e36ded90f32 benchmarks/benchfft/Makefile
--- a/benchmarks/benchfft/Makefile      Sat Feb 14 15:22:42 2004 +0000
+++ b/benchmarks/benchfft/Makefile      Sat Feb 14 15:29:15 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/01/22 07:19:25 grant Exp $
+# $NetBSD: Makefile,v 1.17 2004/02/14 15:29:15 jlam Exp $
 
 DISTNAME=              benchfft-2.0
 CATEGORIES=            benchmarks math
@@ -17,9 +17,8 @@
 USE_LIBTOOL=           yes
 
 LTCONFIG_OVERRIDE=     ${WRKDIR}/fftw-2.0.1/ltconfig
-CONFIG_GUESS_OVERRIDE= ${WRKSRC}/config.guess
-CONFIG_GUESS_OVERRIDE+=        ${WRKDIR}/fftw-2.0.1/config.guess
-CONFIG_SUB_OVERRIDE=   ${WRKSRC}/config.sub ${WRKDIR}/fftw-2.0.1/config.sub
+CONFIG_GUESS_OVERRIDE= config.guess ../fftw-*/config.guess
+CONFIG_SUB_OVERRIDE=   config.sub ../fftw-*/config.sub
 
 pre-configure:
        CONFIGURE_DIRS=${WRKDIR}/fftw-2.0.1 ${MAKE} ${MAKEFLAGS} do-configure
diff -r f620a995813e -r 4e36ded90f32 databases/db3/Makefile
--- a/databases/db3/Makefile    Sat Feb 14 15:22:42 2004 +0000
+++ b/databases/db3/Makefile    Sat Feb 14 15:29:15 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2004/02/11 01:46:30 abs Exp $
+# $NetBSD: Makefile,v 1.24 2004/02/14 15:29:15 jlam Exp $
 
 DISTNAME=      db-3.3.11
 PKGNAME=       db3-3.11.2
@@ -24,8 +24,8 @@
 GNU_CONFIGURE=         yes
 CONFIGURE_SCRIPT=      ../dist/configure
 
-CONFIG_SUB_OVERRIDE+=  ${WRKDIR}/${DISTNAME}/dist/config.sub
-CONFIG_GUESS_OVERRIDE+=        ${WRKDIR}/${DISTNAME}/dist/config.guess
+CONFIG_SUB_OVERRIDE+=  ../dist/config.sub
+CONFIG_GUESS_OVERRIDE+=        ../dist/config.guess
 
 CONFIGURE_ARGS+=       --program-transform-name=s,db_,db3_,
 CONFIGURE_ARGS+=       --includedir=${PREFIX}/include/db3
diff -r f620a995813e -r 4e36ded90f32 devel/libslang/Makefile
--- a/devel/libslang/Makefile   Sat Feb 14 15:22:42 2004 +0000
+++ b/devel/libslang/Makefile   Sat Feb 14 15:29:15 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2004/01/22 08:24:30 grant Exp $
+# $NetBSD: Makefile,v 1.49 2004/02/14 15:29:15 jlam Exp $
 #
 
 DISTNAME=      slang-1.4.9
@@ -24,9 +24,6 @@
 USE_LIBTOOL=           yes
 GNU_CONFIGURE=         yes
 
-CONFIG_GUESS_OVERRIDE= ${WRKSRC}/autoconf/config.guess
-CONFIG_SUB_OVERRIDE=   ${WRKSRC}/autoconf/config.sub
-
 post-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/slang
        ${MV} ${PREFIX}/share/doc/slang/slangdoc.html \
diff -r f620a995813e -r 4e36ded90f32 devel/libtool/Makefile.common
--- a/devel/libtool/Makefile.common     Sat Feb 14 15:22:42 2004 +0000
+++ b/devel/libtool/Makefile.common     Sat Feb 14 15:29:15 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.44 2004/02/08 11:21:58 skrll Exp $
+# $NetBSD: Makefile.common,v 1.45 2004/02/14 15:29:15 jlam Exp $
 #
 
 DISTNAME=      libtool-1.5.2
@@ -20,11 +20,4 @@
 FILESDIR=      ${.CURDIR}/../libtool/files
 PATCHDIR=      ${.CURDIR}/../libtool/patches
 
-CONFIG_GUESS_OVERRIDE= \
-       ${WRKSRC}/config.guess \
-       ${WRKSRC}/libltdl/config.guess
-
-CONFIG_SUB_OVERRIDE=   \
-       ${WRKSRC}/config.sub \
-       ${WRKSRC}/libltdl/config.sub
 AUTOMAKE_OVERRIDE=     NO
diff -r f620a995813e -r 4e36ded90f32 devel/mit-pthreads/Makefile
--- a/devel/mit-pthreads/Makefile       Sat Feb 14 15:22:42 2004 +0000
+++ b/devel/mit-pthreads/Makefile       Sat Feb 14 15:29:15 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2004/01/27 00:53:12 heinz Exp $
+# $NetBSD: Makefile,v 1.40 2004/02/14 15:29:15 jlam Exp $
 #
 
 DISTNAME=              pthreads-1_60_beta6
@@ -21,9 +21,6 @@
 
 PATCH_FUZZ_FACTOR=     # empty
 
-CONFIG_GUESS_OVERRIDE= ${WRKSRC}/config/config.guess
-CONFIG_SUB_OVERRIDE=   ${WRKSRC}/config/config.sub
-
 post-patch:
        @${RM} ${WRKSRC}/include/endian.h
        @${RM} ${WRKSRC}/include/math.h
diff -r f620a995813e -r 4e36ded90f32 devel/papaya/Makefile
--- a/devel/papaya/Makefile     Sat Feb 14 15:22:42 2004 +0000
+++ b/devel/papaya/Makefile     Sat Feb 14 15:29:15 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/10/28 23:22:54 kristerw Exp $
+# $NetBSD: Makefile,v 1.7 2004/02/14 15:29:15 jlam Exp $
 #
 
 DISTNAME=      papaya-0.1.7
@@ -13,8 +13,6 @@
 USE_PERL5=     run
 USE_BUILDLINK2=        YES
 GNU_CONFIGURE= YES
-CONFIG_GUESS_OVERRIDE= ${WRKSRC}/misc/config.guess
-CONFIG_SUB_OVERRIDE=   ${WRKSRC}/misc/config.sub
 INFO_FILES=    papaya.info
 
 pre-configure:
diff -r f620a995813e -r 4e36ded90f32 devel/unproven-pthreads/Makefile
--- a/devel/unproven-pthreads/Makefile  Sat Feb 14 15:22:42 2004 +0000
+++ b/devel/unproven-pthreads/Makefile  Sat Feb 14 15:29:15 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2004/01/27 00:53:12 heinz Exp $
+# $NetBSD: Makefile,v 1.40 2004/02/14 15:29:15 jlam Exp $
 #
 
 DISTNAME=              unproven-pthreads-0.17
@@ -19,9 +19,6 @@
 GNU_CONFIGURE_PREFIX=  ${PREFIX}/pthreads
 MAKE_ENV+=             NOLINT=1 NOPROFILE=1 OBJECT_FMT=${OBJECT_FMT} USETOOLS=no
 
-CONFIG_GUESS_OVERRIDE= ${WRKSRC}/config/config.guess
-CONFIG_SUB_OVERRIDE=   ${WRKSRC}/config/config.sub
-
 # Remove environment variables with special meaning from the shell
 # environment before executing ${MAKE_PROGRAM} in the do-configure,
 # do-build and do-install targets.
diff -r f620a995813e -r 4e36ded90f32 editors/ce/Makefile.common
--- a/editors/ce/Makefile.common        Sat Feb 14 15:22:42 2004 +0000
+++ b/editors/ce/Makefile.common        Sat Feb 14 15:29:15 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2003/07/17 21:34:21 grant Exp $
+# $NetBSD: Makefile.common,v 1.4 2004/02/14 15:29:15 jlam Exp $
 #
 
 DISTNAME=              ce-${VERSION}
@@ -15,8 +15,6 @@
 CONFIGURE_ARGS+=       --libdir=${PREFIX}/share/doc
 CONFIGURE_ARGS+=       --without-ce-malloc
 CONFIGURE_ARGS+=       --with-curses
-CONFIG_GUESS_OVERRIDE= ${WRKSRC}/support/config.guess
-CONFIG_SUB_OVERRIDE=   ${WRKSRC}/support/config.sub
 
 PATCHDIR=              ${.CURDIR}/../ce/patches
 DISTINFO_FILE=         ${.CURDIR}/../ce/distinfo
diff -r f620a995813e -r 4e36ded90f32 net/ORBit/Makefile
--- a/net/ORBit/Makefile        Sat Feb 14 15:22:42 2004 +0000
+++ b/net/ORBit/Makefile        Sat Feb 14 15:29:15 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.100 2004/01/31 11:36:23 sekiya Exp $
+# $NetBSD: Makefile,v 1.101 2004/02/14 15:29:15 jlam Exp $
 #
 
 DISTNAME=              ORBit-0.${ORBIT_MAJOR}.${ORBIT_MINOR}
@@ -25,14 +25,6 @@
 LIBTOOL_OVERRIDE+=     ${WRKSRC}/popt/libtool
 LIBTOOL_OVERRIDE+=     ${WRKSRC}/libIDL/libtool
 
-CONFIG_GUESS_OVERRIDE+=        ${WRKSRC}/config.guess
-CONFIG_GUESS_OVERRIDE+=        ${WRKSRC}/libIDL/config.guess
-CONFIG_GUESS_OVERRIDE+=        ${WRKSRC}/popt/config.guess
-
-CONFIG_SUB_OVERRIDE+=  ${WRKSRC}/config.sub
-CONFIG_SUB_OVERRIDE+=  ${WRKSRC}/libIDL/config.sub
-CONFIG_SUB_OVERRIDE+=  ${WRKSRC}/popt/config.sub
-
 GNU_CONFIGURE=         YES
 CONFIGURE_ENV+=        LIBWRAP_PATH=${BUILDLINK_PREFIX.tcp_wrappers}/lib/libwrap.a
 CONFIGURE_ENV+=        LIB_WRAP="-lwrap"
diff -r f620a995813e -r 4e36ded90f32 net/xorp/Makefile
--- a/net/xorp/Makefile Sat Feb 14 15:22:42 2004 +0000
+++ b/net/xorp/Makefile Sat Feb 14 15:29:15 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/01/24 14:50:06 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/02/14 15:29:15 jlam Exp $
 #
 
 DISTNAME=      xorp-0.3
@@ -12,11 +12,8 @@
 # cli/libtecla/configure.in bombs if ncurses is installed
 CONFLICTS+=    ncurses-[0-9]*
 
-HAS_CONFIGURE= YES
-GNU_CONFIGURE= YES
-USE_GNU_TOOLS+=        make
-CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR}
-CONFIG_GUESS_OVERRIDE= ${WRKSRC}/cli/libtecla/config.guess
-CONFIG_SUB_OVERRIDE=   ${WRKSRC}/cli/libtecla/config.sub
+GNU_CONFIGURE=         YES
+USE_GNU_TOOLS+=                make
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff -r f620a995813e -r 4e36ded90f32 print/teTeX1-bin/Makefile
--- a/print/teTeX1-bin/Makefile Sat Feb 14 15:22:42 2004 +0000
+++ b/print/teTeX1-bin/Makefile Sat Feb 14 15:29:15 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/01/24 14:58:00 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/02/14 15:29:15 jlam Exp $
 
 DISTNAME=      teTeX-src-1.0.7
 PKGNAME=       teTeX-bin-1.0.7
@@ -34,14 +34,6 @@
 INSTALL_EXTRA_TMPL+=   ${.CURDIR}/INSTALL
 
 GNU_CONFIGURE=         yes
-CONFIG_GUESS_OVERRIDE= ${WRKSRC}/texk/config.guess
-CONFIG_GUESS_OVERRIDE+=        ${WRKSRC}/config/config.guess
-CONFIG_GUESS_OVERRIDE+=        ${WRKSRC}/libs/ncurses/config.guess
-CONFIG_GUESS_OVERRIDE+=        ${WRKSRC}/texinfo/config.guess
-CONFIG_SUB_OVERRIDE=   ${WRKSRC}/texk/config.sub
-CONFIG_SUB_OVERRIDE+=  ${WRKSRC}/config/config.sub
-CONFIG_SUB_OVERRIDE+=  ${WRKSRC}/libs/ncurses/config.sub
-CONFIG_SUB_OVERRIDE+=  ${WRKSRC}/texinfo/config.sub
 CONFIGURE_ARGS+=       --without-texinfo
 CONFIGURE_ARGS+=       --without-dialog
 CONFIGURE_ARGS+=       --disable-multiplatform
diff -r f620a995813e -r 4e36ded90f32 sysutils/amanda-common/Makefile.common
--- a/sysutils/amanda-common/Makefile.common    Sat Feb 14 15:22:42 2004 +0000
+++ b/sysutils/amanda-common/Makefile.common    Sat Feb 14 15:29:15 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2002/10/20 03:20:34 grant Exp $
+# $NetBSD: Makefile.common,v 1.11 2004/02/14 15:29:15 jlam Exp $
 #
 # common make file fragment shared by all amanda-* pkgs.
 #
@@ -17,8 +17,6 @@
 
 USE_LIBTOOL=           yes
 LTCONFIG_OVERRIDE=     ${WRKSRC}/config/ltconfig
-CONFIG_GUESS_OVERRIDE= ${WRKSRC}/config/config.guess
-CONFIG_SUB_OVERRIDE=   ${WRKSRC}/config/config.sub
 
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-user=${AMANDA_USER}
Prev by Date: [pkgsrc/trunk]: pkgsrc/devel/gettext-lib USE_BUILDLINK should be "yes", not j...
Next by Date: [pkgsrc/trunk]: pkgsrc/devel/libtool-base libtool-base actually uses config.s...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/devel/gettext-lib USE_BUILDLINK should be "yes", not j...
Next by Thread: [pkgsrc/trunk]: pkgsrc/devel/libtool-base libtool-base actually uses config.s...
Indexes:
Home | Main Index | Thread Index | Old Index