[pkgsrc/trunk]: pkgsrc Don't check for USE_BUILDLINK3 anymore in these files....

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc Don't check for USE_BUILDLINK3 anymore in these files....
From: jlam <jlam%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 01:34:37 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/6a38d6190718
branches:  trunk
changeset: 491511:6a38d6190718
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Mar 24 22:42:58 2005 +0000

description:
Don't check for USE_BUILDLINK3 anymore in these files.  These are included
by other package Makefiles, and with the deprecation of USE_BUILDLINK3
support in the infrastructure files, these had the potential to break
existing packages.

diffstat:

 databases/shared-mime-info/mimedb.mk     |   8 +++-----
 devel/GConf2/schemas.mk                  |   5 +----
 lang/python/pyversion.mk                 |  22 +++++++---------------
 security/PAM/module.mk                   |   6 ++----
 sysutils/desktop-file-utils/desktopdb.mk |   8 +++-----
 textproc/scrollkeeper/omf.mk             |  10 +++-------
 textproc/xmlcatmgr/catalogs.mk           |   6 ++----
 www/apache/module.mk                     |   7 +++----
 8 files changed, 24 insertions(+), 48 deletions(-)

diffs (203 lines):

diff -r cc8c915c3d32 -r 6a38d6190718 databases/shared-mime-info/mimedb.mk
--- a/databases/shared-mime-info/mimedb.mk      Thu Mar 24 22:41:58 2005 +0000
+++ b/databases/shared-mime-info/mimedb.mk      Thu Mar 24 22:42:58 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mimedb.mk,v 1.1 2004/08/31 11:43:44 jmmv Exp $
+# $NetBSD: mimedb.mk,v 1.2 2005/03/24 22:42:58 jlam Exp $
 #
 # This Makefile fragment is intended to be included by packages that install
 # mime customization files.  It takes care of registering them in the global
@@ -8,7 +8,7 @@
 .if !defined(SHARED_MIME_INFO_MIMEDB_MK)
 SHARED_MIME_INFO_MIMEDB_MK=    # defined
 
-. include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.prefs.mk"
 
 USE_PKGINSTALL=                YES
 INSTALL_EXTRA_TMPL+=   ${.CURDIR}/../../databases/shared-mime-info/files/install.tmpl
@@ -25,8 +25,6 @@
 PRINT_PLIST_AWK+=      /^@dirrm share\/mime\// { next; }
 PRINT_PLIST_AWK+=      /^@dirrm share\/mime$$/ { next; }
 
-.if !defined(NO_BUILDLINK) && !empty(USE_BUILDLINK3:M[yY][eE][sS])
-.  include "../../databases/shared-mime-info/buildlink3.mk"
-.endif
+.include "../../databases/shared-mime-info/buildlink3.mk"
 
 .endif # SHARED_MIME_INFO_MIMEDB_MK
diff -r cc8c915c3d32 -r 6a38d6190718 devel/GConf2/schemas.mk
--- a/devel/GConf2/schemas.mk   Thu Mar 24 22:41:58 2005 +0000
+++ b/devel/GConf2/schemas.mk   Thu Mar 24 22:42:58 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: schemas.mk,v 1.9 2004/06/11 18:12:11 minskim Exp $
+# $NetBSD: schemas.mk,v 1.10 2005/03/24 22:42:58 jlam Exp $
 #
 # This Makefile fragment is intended to be included by packages that install
 # GConf2 schema files.  It takes care of registering them in the GConf2
@@ -57,9 +57,6 @@
                                { print "@comment in GConf2: " $$0; next; }
 
 .include "../../mk/bsd.prefs.mk"
-
-.if empty(USE_BUILDLINK3:M[nN][oO])
 .include "../../devel/GConf2/buildlink3.mk"
-.endif
 
 .endif # GCONF2_SCHEMAS_MK
diff -r cc8c915c3d32 -r 6a38d6190718 lang/python/pyversion.mk
--- a/lang/python/pyversion.mk  Thu Mar 24 22:41:58 2005 +0000
+++ b/lang/python/pyversion.mk  Thu Mar 24 22:42:58 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: pyversion.mk,v 1.32 2005/01/24 08:04:41 recht Exp $
+# $NetBSD: pyversion.mk,v 1.33 2005/03/24 22:42:58 jlam Exp $
 
 .if !defined(PYTHON_PYVERSION_MK)
 PYTHON_PYVERSION_MK=   defined
@@ -137,23 +137,15 @@
        error: no valid Python version
 .endif
 
-.if (defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[nN][oO]))
 PTHREAD_OPTS=  require
-.    include "../../mk/pthread.buildlink3.mk"
-.    if ${PTHREAD_TYPE} == "pth"
-.        include "../../devel/pth/buildlink3.mk"
-.    endif
-.  if defined(PYTHON_FOR_BUILD_ONLY)
+.include "../../mk/pthread.buildlink3.mk"
+.if ${PTHREAD_TYPE} == "pth"
+.  include "../../devel/pth/buildlink3.mk"
+.endif
+.if defined(PYTHON_FOR_BUILD_ONLY)
 BUILD_DEPMETHOD.python?=       build
-.  endif
-.  include "${PYPKGSRCDIR}/buildlink3.mk"
-.else
-.  if defined(PYTHON_FOR_BUILD_ONLY)
-BUILD_DEPENDS+=        ${PYDEPENDENCY}
-.  else
-DEPENDS+=      ${PYDEPENDENCY}
-.  endif
 .endif
+.include "${PYPKGSRCDIR}/buildlink3.mk"
 
 PYTHONBIN=     ${LOCALBASE}/bin/python${PYVERSSUFFIX}
 
diff -r cc8c915c3d32 -r 6a38d6190718 security/PAM/module.mk
--- a/security/PAM/module.mk    Thu Mar 24 22:41:58 2005 +0000
+++ b/security/PAM/module.mk    Thu Mar 24 22:42:58 2005 +0000
@@ -1,11 +1,9 @@
-# $NetBSD: module.mk,v 1.4 2005/01/14 05:15:39 jlam Exp $
+# $NetBSD: module.mk,v 1.5 2005/03/24 22:42:58 jlam Exp $
 
 .if !defined(PAM_MODULE_MK)
 PAM_MODULE_MK= # defined
 
-.if empty(USE_BUILDLINK3:M[nN][oO])
-.  include "../../mk/pam.buildlink3.mk"
-.endif
+.include "../../mk/pam.buildlink3.mk"
 
 .if defined(DEFAULT_VIEW.${PAM_TYPE})
 DEFAULT_VIEW.${PKGBASE}=       ${DEFAULT_VIEW.${PAM_TYPE}}
diff -r cc8c915c3d32 -r 6a38d6190718 sysutils/desktop-file-utils/desktopdb.mk
--- a/sysutils/desktop-file-utils/desktopdb.mk  Thu Mar 24 22:41:58 2005 +0000
+++ b/sysutils/desktop-file-utils/desktopdb.mk  Thu Mar 24 22:42:58 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: desktopdb.mk,v 1.1.1.1 2004/09/21 17:03:54 jmmv Exp $
+# $NetBSD: desktopdb.mk,v 1.2 2005/03/24 22:42:58 jlam Exp $
 #
 # This Makefile fragment is intended to be included by packages that install
 # desktop entries.  It takes care of registering them in the global database.
@@ -7,7 +7,7 @@
 .if !defined(DESKTOP_FILE_UTILS_MIMEDB_MK)
 DESKTOP_FILE_UTILS_MIMEDB_MK=  # defined
 
-. include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.prefs.mk"
 
 USE_PKGINSTALL=                YES
 INSTALL_EXTRA_TMPL+=   ${.CURDIR}/../../sysutils/desktop-file-utils/files/install.tmpl
@@ -18,8 +18,6 @@
 
 PRINT_PLIST_AWK+=      /^share\/applications\/mimeinfo.cache$$/ { next }
 
-.if !defined(NO_BUILDLINK) && !empty(USE_BUILDLINK3:M[yY][eE][sS])
-.  include "../../sysutils/desktop-file-utils/buildlink3.mk"
-.endif
+.include "../../sysutils/desktop-file-utils/buildlink3.mk"
 
 .endif # DESKTOP_FILE_UTILS_MIMEDB_MK
diff -r cc8c915c3d32 -r 6a38d6190718 textproc/scrollkeeper/omf.mk
--- a/textproc/scrollkeeper/omf.mk      Thu Mar 24 22:41:58 2005 +0000
+++ b/textproc/scrollkeeper/omf.mk      Thu Mar 24 22:42:58 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: omf.mk,v 1.7 2004/04/27 01:26:29 wiz Exp $
+# $NetBSD: omf.mk,v 1.8 2005/03/24 22:42:58 jlam Exp $
 #
 # This Makefile fragment is intended to be included by packages that install
 # OMF files.  It takes care of registering them in scrollkeeper's global
@@ -13,7 +13,7 @@
 .if !defined(SCROLLKEEPER_OMF_MK)
 SCROLLKEEPER_OMF_MK=   # defined
 
-. include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.prefs.mk"
 
 # scrollkeeper's data directory.
 SCROLLKEEPER_DATADIR=  ${BUILDLINK_PREFIX.scrollkeeper}/libdata/scrollkeeper
@@ -36,10 +36,6 @@
                                { print "@comment in scrollkeeper: " $$0; \
                                  next; }
 
-.if !defined(NO_BUILDLINK)
-.  if !empty(USE_BUILDLINK3:M[yY][eE][sS])
-.    include "../../textproc/scrollkeeper/buildlink3.mk"
-.  endif
-.endif
+.include "../../textproc/scrollkeeper/buildlink3.mk"
 
 .endif # SCROLLKEEPER_OMF_MK
diff -r cc8c915c3d32 -r 6a38d6190718 textproc/xmlcatmgr/catalogs.mk
--- a/textproc/xmlcatmgr/catalogs.mk    Thu Mar 24 22:41:58 2005 +0000
+++ b/textproc/xmlcatmgr/catalogs.mk    Thu Mar 24 22:42:58 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: catalogs.mk,v 1.8 2004/05/06 14:39:05 minskim Exp $
+# $NetBSD: catalogs.mk,v 1.9 2005/03/24 22:42:59 jlam Exp $
 #
 # This Makefile fragment is intended to be included by packages that install
 # catalog files or DTDs.  It takes care of registering them into the right
@@ -61,8 +61,6 @@
 PRINT_PLIST_AWK+=      /^@dirrm share\/(sgml|xml)$$/ \
                                { print "@comment in xmlcatmgr: " $$0; next; }
 
-.if !empty(USE_BUILDLINK3:M[yY][eE][sS])
-.  include "../../textproc/xmlcatmgr/buildlink3.mk"
-.endif
+.include "../../textproc/xmlcatmgr/buildlink3.mk"
 
 .endif # XMLCATMGR_CATALOGS_MK
diff -r cc8c915c3d32 -r 6a38d6190718 www/apache/module.mk
--- a/www/apache/module.mk      Thu Mar 24 22:41:58 2005 +0000
+++ b/www/apache/module.mk      Thu Mar 24 22:42:58 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: module.mk,v 1.9 2004/07/06 22:55:35 wiz Exp $
+# $NetBSD: module.mk,v 1.10 2005/03/24 22:42:59 jlam Exp $
 #
 # This Makefile fragment is intended to be included by packages that build
 # and install apache modules.
@@ -22,11 +22,10 @@
 
 .if !defined(_APACHE_MODULE_MK)
 _APACHE_MODULE_MK=     # defined
+
 APACHE_MODULE=         # defined
 
-.if defined(USE_BUILDLINK3)
-.  include "../../www/apache/buildlink3.mk"
-.endif
+.include "../../www/apache/buildlink3.mk"
 
 APACHE_MODULE_SRCDIR?= ${WRKSRC}
 APACHE_MODULE_SRC?=    *.c
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Note version bump for netbsd-tap.
Next by Date: [pkgsrc/trunk]: pkgsrc/mail/sylpheed Update sylpheed to 1.0.4 for another sec...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Note version bump for netbsd-tap.
Next by Thread: [pkgsrc/trunk]: pkgsrc/mail/sylpheed Update sylpheed to 1.0.4 for another sec...
Indexes:
Home | Main Index | Thread Index | Old Index