From 75b17427193d917a98c01fa1cfa820f8c17b8de6 Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Wed, 28 Apr 2004 07:11:44 +0000
Subject: Remove support for bl2 since remaining packages using this have been
 converted to bl3.

---
 textproc/xmlcatmgr/buildlink2.mk | 42 ----------------------------------------
 textproc/xmlcatmgr/catalogs.mk   |  5 +----
 2 files changed, 1 insertion(+), 46 deletions(-)
 delete mode 100644 textproc/xmlcatmgr/buildlink2.mk

(limited to 'textproc/xmlcatmgr')

diff --git a/textproc/xmlcatmgr/buildlink2.mk b/textproc/xmlcatmgr/buildlink2.mk
deleted file mode 100644
index a429384b03b..00000000000
--- a/textproc/xmlcatmgr/buildlink2.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.9 2004/04/27 17:28:50 wiz Exp $
-#
-# This Makefile fragment is included by packages that use xmlcatmgr.
-#
-# The following variables are automatically defined for free use in packages:
-#    XMLCATMGR            - Path to the xmlcatmgr program.
-#    SGML_DEFAULT_CATALOG - Path to the system-wide (tunable) SGML catalog.
-#    XML_DEFAULT_CATALOG  - Path to the system-wide (tunable) XML catalog.
-#
-# Packages that recognize a system-wide catalog file should be configured
-# to use SGML_DEFAULT_CATALOG or XML_DEFAULT_CATALOG, depending on the
-# type of tool they are.
-#
-
-.if !defined(XMLCATMGR_BUILDLINK2_MK)
-XMLCATMGR_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=			xmlcatmgr
-BUILDLINK_DEPENDS.xmlcatmgr?=		xmlcatmgr>=0.2
-BUILDLINK_RECOMMENDED.xmlcatmgr?=	xmlcatmgr>=2.0beta1
-BUILDLINK_PKGSRCDIR.xmlcatmgr?=		../../textproc/xmlcatmgr
-
-EVAL_PREFIX+=	BUILDLINK_PREFIX.xmlcatmgr=xmlcatmgr
-BUILDLINK_PREFIX.xmlcatmgr_DEFAULT=	${LOCALBASE}
-
-BUILDLINK_TARGETS+=	xmlcatmgr-buildlink
-
-# Location of the xmlcatmgr binary program.
-XMLCATMGR=	${BUILDLINK_PREFIX.xmlcatmgr}/bin/xmlcatmgr
-
-# System-wide configurable catalogs.
-.if defined(PKG_SYSCONFDIR.xmlcatmgr) && !empty(PKG_SYSCONFDIR.xmlcatmgr)
-SGML_DEFAULT_CATALOG=	${PKG_SYSCONFDIR.xmlcatmgr}/sgml/catalog
-XML_DEFAULT_CATALOG=	${PKG_SYSCONFDIR.xmlcatmgr}/xml/catalog
-.else
-SGML_DEFAULT_CATALOG=	${PKG_SYSCONFBASEDIR}/sgml/catalog
-XML_DEFAULT_CATALOG=	${PKG_SYSCONFBASEDIR}/xml/catalog
-.endif
-
-xmlcatmgr-buildlink: _BUILDLINK_USE
-
-.endif	# XMLCATMGR_BUILDLINK2_MK
diff --git a/textproc/xmlcatmgr/catalogs.mk b/textproc/xmlcatmgr/catalogs.mk
index 83bef21cde2..77a2623de63 100644
--- a/textproc/xmlcatmgr/catalogs.mk
+++ b/textproc/xmlcatmgr/catalogs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: catalogs.mk,v 1.6 2004/04/12 21:12:44 jmmv Exp $
+# $NetBSD: catalogs.mk,v 1.7 2004/04/28 07:11:44 wiz 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
@@ -63,9 +63,6 @@ PRINT_PLIST_AWK+=	/^@dirrm share\/(sgml|xml)$$/ \
 
 .if !empty(USE_BUILDLINK3:M[yY][eE][sS])
 .  include "../../textproc/xmlcatmgr/buildlink3.mk"
-.else
-USE_BUILDLINK2=	YES
-.  include "../../textproc/xmlcatmgr/buildlink2.mk"
 .endif
 
 .endif	# XMLCATMGR_CATALOGS_MK
-- 
cgit v1.2.3