[pkgsrc/trunk]: pkgsrc Sow BUILDLINK_USE_BUILTIN.<pkg> and reap _NEED_<PKG> v...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc Sow BUILDLINK_USE_BUILTIN.<pkg> and reap _NEED_<PKG> v...
From: jlam <jlam%pkgsrc.org@localhost>
Date: Wed, 13 Oct 2021 23:19:37 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/13c97e83a9c7
branches:  trunk
changeset: 465720:13c97e83a9c7
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Jan 05 09:31:31 2004 +0000

description:
Sow BUILDLINK_USE_BUILTIN.<pkg> and reap _NEED_<PKG> variables.

diffstat:

 archivers/bzip2/buildlink3.mk       |  31 +++++++++--------------
 converters/libiconv/buildlink3.mk   |  36 +++++++++++++-------------
 databases/db/buildlink3.mk          |  22 +++++++---------
 devel/binutils/buildlink3.mk        |  29 ++++++++++------------
 devel/gettext-lib/buildlink3.mk     |  39 ++++++++++++++++-------------
 devel/libgetopt/buildlink3.mk       |  26 +++++++++----------
 devel/ncurses/buildlink3.mk         |  48 ++++++++++++++++--------------------
 devel/zlib/buildlink3.mk            |  38 ++++++++++++----------------
 graphics/MesaLib/buildlink3.mk      |  39 +++++++++++++++--------------
 graphics/freetype2/buildlink3.mk    |  35 +++++++++++++-------------
 graphics/glu/buildlink3.mk          |  35 +++++++++++++-------------
 graphics/xpm/buildlink3.mk          |  35 +++++++++++++-------------
 net/libpcap/buildlink3.mk           |  26 ++++++-------------
 security/PAM/buildlink3.mk          |  26 ++++++-------------
 security/openssl/buildlink3.mk      |  36 ++++++++++++++-------------
 security/tcp_wrappers/buildlink3.mk |  26 ++++++-------------
 x11/Xrender/buildlink3.mk           |  36 +++++++++++++-------------
 17 files changed, 260 insertions(+), 303 deletions(-)

diffs (truncated from 1314 to 300 lines):

diff -r 2593f043a2f2 -r 13c97e83a9c7 archivers/bzip2/buildlink3.mk
--- a/archivers/bzip2/buildlink3.mk     Mon Jan 05 09:14:10 2004 +0000
+++ b/archivers/bzip2/buildlink3.mk     Mon Jan 05 09:31:31 2004 +0000
@@ -1,11 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:04 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 09:31:31 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 BZIP2_BUILDLINK3_MK:=  ${BZIP2_BUILDLINK3_MK}+
 
+.include "../../mk/bsd.prefs.mk"
+
 .if !empty(BZIP2_BUILDLINK3_MK:M+)
-.  include "../../mk/bsd.prefs.mk"
-
+BUILDLINK_PACKAGES+=           bzip2
 BUILDLINK_DEPENDS.bzip2?=      bzip2>=1.0.1
 BUILDLINK_PKGSRCDIR.bzip2?=    ../../archivers/bzip2
 .endif # BZIP2_BUILDLINK3_MK
@@ -26,18 +27,18 @@
 .endif
 
 .if defined(USE_BZIP2)
-_NEED_BZIP2=   YES
+BUILDLINK_USE_BUILTIN.bzip2=   NO
 .endif
 
 .if !empty(BUILDLINK_CHECK_BUILTIN.bzip2:M[yY][eE][sS])
-_NEED_BZIP2=   NO
+BUILDLINK_USE_BUILTIN.bzip2=   YES
 .endif
 
-.if !defined(_NEED_BZIP2)
+.if !defined(BUILDLINK_USE_BUILTIN.bzip2)
 .  if !empty(BUILDLINK_IS_BUILTIN.bzip2:M[nN][oO])
-_NEED_BZIP2=   YES
+BUILDLINK_USE_BUILTIN.bzip2=   NO
 .  else
-_NEED_BZIP2=   NO
+BUILDLINK_USE_BUILTIN.bzip2=   YES
 #
 # Solaris 9 has bzip2 1.0.1, build it on older versions.
 # Darwin only has static libbz2.a, which can't be buildlinked.
@@ -46,25 +47,17 @@
 INCOMPAT_BZIP2?=       # empty
 .    for _pattern_ in ${_INCOMPAT_BZIP2} ${INCOMPAT_BZIP2}
 .      if !empty(MACHINE_PLATFORM:M${_pattern_})
-_NEED_BZIP2=   YES
+BUILDLINK_USE_BUILTIN.bzip2=   NO
 .      endif
 .    endfor
 .  endif
-MAKEFLAGS+=    _NEED_BZIP2="${_NEED_BZIP2}"
+MAKEFLAGS+=    BUILDLINK_USE_BUILTIN.bzip2="${BUILDLINK_USE_BUILTIN.bzip2}"
 .endif
 
-.if ${_NEED_BZIP2} == "YES"
+.if !empty(BUILDLINK_USE_BUILTIN.bzip2:M[nN][oO])
 .  if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=    bzip2
 .  endif
 .endif
 
-.if !empty(BZIP2_BUILDLINK3_MK:M+)
-.  if ${_NEED_BZIP2} == "YES"
-BUILDLINK_PACKAGES+=           bzip2
-.  else
-BUILDLINK_PREFIX.bzip2=                /usr
-.  endif
-.endif # BZIP2_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:C/\+$//}
diff -r 2593f043a2f2 -r 13c97e83a9c7 converters/libiconv/buildlink3.mk
--- a/converters/libiconv/buildlink3.mk Mon Jan 05 09:14:10 2004 +0000
+++ b/converters/libiconv/buildlink3.mk Mon Jan 05 09:31:31 2004 +0000
@@ -1,11 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 09:31:31 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 ICONV_BUILDLINK3_MK:=  ${ICONV_BUILDLINK3_MK}+
 
+.include "../../mk/bsd.prefs.mk"
+
 .if !empty(ICONV_BUILDLINK3_MK:M+)
-.  include "../../mk/bsd.prefs.mk"
-
+BUILDLINK_PACKAGES+=           iconv
 BUILDLINK_DEPENDS.iconv?=      libiconv>=1.9.1
 BUILDLINK_PKGSRCDIR.iconv?=    ../../converters/libiconv
 .endif # ICONV_BUILDLINK3_MK
@@ -19,38 +20,38 @@
 .  endif
 .endif
 
-.if !empty(BUILDLINK_CHECK_BUILTIN.iconv:M[yY][eE][sS])
-_NEED_GNU_ICONV=       NO
+.if defined(USE_GNU_ICONV)
+BUILDLINK_USE_BUILTIN.iconv=   NO
 .endif
 
-.if !defined(_NEED_GNU_ICONV)
+.if !empty(BUILDLINK_CHECK_BUILTIN.iconv:M[yY][eE][sS])
+BUILDLINK_USE_BUILTIN.iconv=   YES
+.endif
+
+.if !defined(BUILDLINK_USE_BUILTIN.iconv)
 .  if !empty(BUILDLINK_IS_BUILTIN.iconv:M[nN][oO])
-_NEED_GNU_ICONV=       YES
+BUILDLINK_USE_BUILTIN.iconv=   NO
 .  else
-_NEED_GNU_ICONV=       NO
+BUILDLINK_USE_BUILTIN.iconv=   YES
 _INCOMPAT_ICONV?=      # should be set from defs.${OPSYS}.mk
 INCOMPAT_ICONV?=       # empty
 .    for _pattern_ in ${_INCOMPAT_ICONV} ${INCOMPAT_ICONV}
 .      if !empty(MACHINE_PLATFORM:M${_pattern_})
-_NEED_GNU_ICONV=       YES
+BUILDLINK_USE_BUILTIN.iconv=   NO
 .      endif
 .    endfor
 .  endif
-.  if defined(USE_GNU_ICONV)
-_NEED_GNU_ICONV=       YES
-.  endif
-MAKEFLAGS+=    _NEED_GNU_ICONV=${_NEED_GNU_ICONV}
+MAKEFLAGS+=    BUILDLINK_USE_BUILTIN.iconv="${BUILDLINK_USE_BUILTIN.iconv}"
 .endif
 
-.if ${_NEED_GNU_ICONV} == "YES"
+.if !empty(BUILDLINK_USE_BUILTIN.iconv:M[nN][oO])
 .  if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=    iconv
 .  endif
 .endif
 
 .if !empty(ICONV_BUILDLINK3_MK:M+)
-.  if ${_NEED_GNU_ICONV} == "YES"
-BUILDLINK_PACKAGES+=   iconv
+.  if !empty(BUILDLINK_USE_BUILTIN.iconv:M[nN][oO])
 _BLNK_LIBICONV=                -liconv
 .  else
 .    if !defined(_BLNK_LIBICONV_FOUND)
@@ -69,11 +70,10 @@
 BUILDLINK_TRANSFORM+=  S:-liconv:
 .    endif
 BUILDLINK_LDADD.iconv?=        ${_BLNK_LIBICONV}
-BUILDLINK_PREFIX.iconv=        /usr
 .  endif
 
 .  if defined(GNU_CONFIGURE)
-.    if ${_NEED_GNU_ICONV} == "YES"
+.    if !empty(BUILDLINK_USE_BUILTIN.iconv:M[nN][oO])
 CONFIGURE_ARGS+=       --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
 .    else
 CONFIGURE_ARGS+=       --without-libiconv-prefix
diff -r 2593f043a2f2 -r 13c97e83a9c7 databases/db/buildlink3.mk
--- a/databases/db/buildlink3.mk        Mon Jan 05 09:14:10 2004 +0000
+++ b/databases/db/buildlink3.mk        Mon Jan 05 09:31:31 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 09:31:31 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 DB2_BUILDLINK3_MK:=    ${DB2_BUILDLINK3_MK}+
@@ -9,30 +9,28 @@
 BUILDLINK_PKGSRCDIR.db?=       ../../databases/db
 .endif # DB2_BUILDLINK3_MK
 
-.if !defined(_NEED_DB2)
-_NEED_DB2=     YES
+.if !defined(BUILDLINK_USE_BUILTIN.db)
+BUILDLINK_USE_BUILTIN.db=      NO
 .  if defined(USE_DB185)
 .    if exists(/usr/include/db.h)      # NetBSD, Darwin
-BUILDLINK_PREFIX.db=   /usr
-_NEED_DB2=     NO
+BUILDLINK_USE_BUILTIN.db=      YES
 .    elif exists(/usr/include/db1/db.h)        # Linux
-BUILDLINK_PREFIX.db=   /usr
-BUILDLINK_INCDIRS.db=  include/db1
-BUILDLINK_TRANSFORM+=  l:db:db1
-_NEED_DB2=     NO
+BUILDLINK_USE_BUILTIN.db=      YES
+BUILDLINK_INCDIRS.db?=         include/db1
+BUILDLINK_TRANSFORM+=          l:db:db1
 .    endif
 .  endif
-MAKEFLAGS+=    _NEED_DB2="${_NEED_DB2}"
+MAKEFLAGS+=    BUILDLINK_USE_BUILTIN.db="${BUILDLINK_USE_BUILTIN.db}"
 .endif
 
-.if ${_NEED_DB2} == "YES"
+.if !empty(BUILDLINK_USE_BUILTIN.db:M[nN][oO])
 .  if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=    db
 .  endif
 .endif
 
 .if !empty(DB2_BUILDLINK3_MK:M+)
-.  if ${_NEED_DB2} == "YES"
+.  if !empty(BUILDLINK_USE_BUILTIN.db:M[nN][oO])
 BUILDLINK_INCDIRS.db=  include/db2
 BUILDLINK_TRANSFORM+=  l:db:db2
 .  endif
diff -r 2593f043a2f2 -r 13c97e83a9c7 devel/binutils/buildlink3.mk
--- a/devel/binutils/buildlink3.mk      Mon Jan 05 09:14:10 2004 +0000
+++ b/devel/binutils/buildlink3.mk      Mon Jan 05 09:31:31 2004 +0000
@@ -1,14 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 09:31:31 jlam Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 BINUTILS_BUILDLINK3_MK:=       ${BINUTILS_BUILDLINK3_MK}+
 
-.if !defined(BINUTILS_BUILDLINK3_MK)
-BINUTILS_BUILDLINK3_MK=        # defined
+.include "../../mk/bsd.prefs.mk"
 
 .if !empty(BINUTILS_BUILDLINK3_MK:M+)
-.  include "../../mk/bsd.prefs.mk"
-
+BUILDLINK_PACKAGES+=                   binutils
 BUILDLINK_DEPENDS.binutils?=           binutils>=2.14.0
 BUILDLINK_PKGSRCDIR.binutils?=         ../../devel/binutils
 BUILDLINK_DEPMETHOD.binutils?=         build
@@ -21,18 +19,18 @@
 .endif
 
 .if defined(USE_BINUTILS)
-_NEED_BINUTILS=        YES
+BUILDLINK_USE_BUILTIN.binutils=        NO
 .endif
 
 .if !empty(BUILDLINK_CHECK_BUILTIN.binutils:M[yY][eE][sS])
-_NEED_BINUTILS=        NO
+BUILDLINK_USE_BUILTIN.binutils=        YES
 .endif
 
-.if !defined(_NEED_BINUTILS)
+.if !defined(BUILDLINK_USE_BUILTIN.binutils)
 .  if !empty(BUILDLINK_IS_BUILTIN.binutils:M[nN][oO])
-_NEED_BINUTILS=        YES
+BUILDLINK_USE_BUILTIN.binutils=        NO
 .  else
-_NEED_BINUTILS=        NO
+BUILDLINK_USE_BUILTIN.binutils=        YES
 #
 # These versions of NetBSD didn't have a toolchain that was capable of
 # replacing binutils.
@@ -46,23 +44,22 @@
 INCOMPAT_BINUTILS?=       # empty
 .    for _pattern_ in ${_INCOMPAT_BINUTILS} ${INCOMPAT_BINUTILS}
 .      if !empty(MACHINE_PLATFORM:M${_pattern_})
-_NEED_BINUTILS=          YES
+BUILDLINK_USE_BUILTIN.binutils=        NO
 .      endif
 .    endfor
 .  endif
-MAKEFLAGS+=    _NEED_BINUTILS="${_NEED_BINUTILS}"
+MAKEFLAGS+=    \
+       BUILDLINK_USE_BUILTIN.binutils="${BUILDLINK_USE_BUILTIN.binutils}"
 .endif
 
-.if ${_NEED_BINUTILS} == "YES"
+.if !empty(BUILDLINK_USE_BUILTIN.binutils:M[nN][oO])
 .  if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=    binutils
 .  endif
 .endif
 
 .if !empty(BINUTILS_BUILDLINK3_MK:M+)
-.  if ${_NEED_BINUTILS} == "YES"
-BUILDLINK_PACKAGES+=           binutils
-
+.  if !empty(BUILDLINK_USE_BUILTIN.binutils:M[nN][oO])
 AR=    ${BUILDLINK_PREFIX.binutils}/bin/ar
 AS=    ${BUILDLINK_PREFIX.binutils}/bin/as
 LD=    ${BUILDLINK_PREFIX.binutils}/bin/ld
diff -r 2593f043a2f2 -r 13c97e83a9c7 devel/gettext-lib/buildlink3.mk
--- a/devel/gettext-lib/buildlink3.mk   Mon Jan 05 09:14:10 2004 +0000
+++ b/devel/gettext-lib/buildlink3.mk   Mon Jan 05 09:31:31 2004 +0000
@@ -1,11 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 09:31:31 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 GETTEXT_BUILDLINK3_MK:=        ${GETTEXT_BUILDLINK3_MK}+
 
+.include "../../mk/bsd.prefs.mk"
+
 .if !empty(GETTEXT_BUILDLINK3_MK:M+)
-.  include "../../mk/bsd.prefs.mk"
-
+BUILDLINK_PACKAGES+=           gettext
 BUILDLINK_DEPENDS.gettext?=    gettext-lib>=0.10.35nb1
 BUILDLINK_PKGSRCDIR.gettext?=  ../../devel/gettext-lib
 .endif # GETTEXT_BUILDLINK3_MK
@@ -19,24 +20,28 @@
 .  endif
Prev by Date: [pkgsrc/trunk]: pkgsrc Sprinkle a few double quotes here and there.
Next by Date: [pkgsrc/trunk]: pkgsrc/devel/gettext-lib Don't need to set BUILDLINK_PREFIX.g...
Previous by Thread: [pkgsrc/trunk]: pkgsrc Sprinkle a few double quotes here and there.
Next by Thread: [pkgsrc/trunk]: pkgsrc/devel/gettext-lib Don't need to set BUILDLINK_PREFIX.g...
Indexes:
Home | Main Index | Thread Index | Old Index