summaryrefslogtreecommitdiff
path: root/textproc/libxml2
diff options
context:
space:
mode:
Diffstat (limited to 'textproc/libxml2')
-rw-r--r--textproc/libxml2/Makefile10
-rw-r--r--textproc/libxml2/buildlink3.mk7
2 files changed, 4 insertions, 13 deletions
diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 9c959a6d58d..09562e7161b 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.88 2007/09/06 21:51:54 jlam Exp $
+# $NetBSD: Makefile,v 1.89 2007/09/08 21:58:00 jlam Exp $
DISTNAME= libxml2-2.6.30
CATEGORIES= textproc
@@ -13,6 +13,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
PKG_DESTDIR_SUPPORT= user-destdir
USE_TOOLS+= gmake
+USE_FEATURES= glob
USE_LIBTOOL= yes
PKGCONFIG_OVERRIDE= libxml-2.0.pc.in
@@ -44,13 +45,6 @@ SUBST_FILES.cat= catalog.c xmlcatalog.c
SUBST_SED.cat= -e "s,@@SGML_DEFAULT_CATALOG@@,${SGML_DEFAULT_CATALOG},g"
SUBST_SED.cat+= -e "s,@@XML_DEFAULT_CATALOG@@,${XML_DEFAULT_CATALOG},g"
-.if !empty(LOWER_OPSYS:Mirix5*)
-. include "../../pkgtools/libnbcompat/inplace.mk" # <glob.h>
-SUBST_CLASSES+= glob_h
-SUBST_STAGE.glob_h= post-patch
-SUBST_FILES.glob_h= runtest.c
-SUBST_SED.glob_h= -e "s,<glob\.h>,<nbcompat/glob.h>,"
-.endif
.include "../../devel/zlib/buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
.include "../../textproc/xmlcatmgr/catalogs.mk"
diff --git a/textproc/libxml2/buildlink3.mk b/textproc/libxml2/buildlink3.mk
index 9b50ca64384..47d63bc7c10 100644
--- a/textproc/libxml2/buildlink3.mk
+++ b/textproc/libxml2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2007/09/06 21:51:55 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2007/09/08 21:58:01 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBXML2_BUILDLINK3_MK:= ${LIBXML2_BUILDLINK3_MK}+
@@ -19,11 +19,8 @@ BUILDLINK_PKGSRCDIR.libxml2?= ../../textproc/libxml2
BUILDLINK_FILES.libxml2+= bin/xml2-config
.endif # LIBXML2_BUILDLINK3_MK
-.include "../../mk/bsd.fast.prefs.mk"
+USE_FEATURES+= glob
-.if !empty(LOWER_OPSYS:Mirix5*)
-. include "../../pkgtools/libnbcompat/inplace.mk" # glob()
-.endif
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"