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.

8 files changed, 24 insertions, 48 deletions

diff --git a/databases/shared-mime-info/mimedb.mk b/databases/shared-mime-info/mimedb.mk
index 6b42316b63a..52db0a8519f 100644
--- a/databases/shared-mime-info/mimedb.mk
+++ b/databases/shared-mime-info/mimedb.mk
@@ -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\/packages$$/ \
 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 --git a/devel/GConf2/schemas.mk b/devel/GConf2/schemas.mk
index 93a26901499..6011bd15eac 100644
--- a/devel/GConf2/schemas.mk
+++ b/devel/GConf2/schemas.mk
@@ -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_PLIST_AWK+=	/^@dirrm share\/gconf\/schemas$$/ \
 				{ 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 --git a/lang/python/pyversion.mk b/lang/python/pyversion.mk
index e365c7faca2..2184b3674f5 100644
--- a/lang/python/pyversion.mk
+++ b/lang/python/pyversion.mk
@@ -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 @@ BUILD_DEPENDS+=	py15-distutils-*:../../devel/py-distutils
 	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 --git a/security/PAM/module.mk b/security/PAM/module.mk
index 67cd4cef241..401556c6182 100644
--- a/security/PAM/module.mk
+++ b/security/PAM/module.mk
@@ -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 --git a/sysutils/desktop-file-utils/desktopdb.mk b/sysutils/desktop-file-utils/desktopdb.mk
index bad5e0c5d93..7800fff021d 100644
--- a/sysutils/desktop-file-utils/desktopdb.mk
+++ b/sysutils/desktop-file-utils/desktopdb.mk
@@ -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 @@ FILES_SUBST+=		UPDATE_DESKTOPDB="${BUILDLINK_PREFIX.desktop-file-utils}/bin/upda
 
 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 --git a/textproc/scrollkeeper/omf.mk b/textproc/scrollkeeper/omf.mk
index 431ebb2645a..a3f48d39ad0 100644
--- a/textproc/scrollkeeper/omf.mk
+++ b/textproc/scrollkeeper/omf.mk
@@ -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_PLIST_AWK+=	/^@dirrm share\/omf$$/ \
 				{ 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 --git a/textproc/xmlcatmgr/catalogs.mk b/textproc/xmlcatmgr/catalogs.mk
index c5fa6d4d2a1..b2b283dcdec 100644
--- a/textproc/xmlcatmgr/catalogs.mk
+++ b/textproc/xmlcatmgr/catalogs.mk
@@ -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+=	/^share\/(sgml|xml)\/catalog$$/ \
 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 --git a/www/apache/module.mk b/www/apache/module.mk
index 9ce942b9a50..d2c26c9d4b9 100644
--- a/www/apache/module.mk
+++ b/www/apache/module.mk
@@ -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