Convert to use the features framework.

6 files changed, 19 insertions, 39 deletions

diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index c710bdeea22..96117cd053f 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2007/09/06 21:51:54 jlam Exp $
+# $NetBSD: Makefile,v 1.51 2007/09/08 21:58:00 jlam Exp $
 #
 
 DISTNAME=		aspell-0.60.5
@@ -14,6 +14,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 CONFLICTS=		libpspell-[0-9]*
 
 GNU_CONFIGURE=		yes
+USE_FEATURES=		snprintf vsnprintf
 USE_TOOLS+=		gmake
 # for bin/aspell-import
 USE_TOOLS+=		perl:run
@@ -30,6 +31,12 @@ CONFIGURE_ENV+=		gt_cv_func_gnugettext1_libintl=yes
 
 .include "../../mk/bsd.prefs.mk"
 
+.if !empty(LOWER_OPSYS:Mirix5*)
+CPPFLAGS+=	-DDECLARE_VSNPRINTF -DDECLARE_SNPRINTF
+# IRIX 5 has an older implementation of signal()
+CPPFLAGS+=	-DHAVE_OLD_SIGNAL
+.endif
+
 # Loadable filter currently don't work on NetBSD, see
 # https://sourceforge.net/tracker/?func=detail&atid=100245&aid=1336865&group_id=245
 # Disable dynamic loading of filters until it is fixed.
@@ -53,12 +60,6 @@ NOT_FOR_COMPILER=	xlc
 
 LIBS.SunOS+=		-lm
 
-.if !empty(LOWER_OPSYS:Mirix5*)
-. include "../../pkgtools/libnbcompat/inplace.mk"	# {,v}snprintf()
-CPPFLAGS+=	-DDECLARE_VSNPRINTF -DDECLARE_SNPRINTF
-# IRIX 5 has an older implementation of signal()
-CPPFLAGS+=	-DHAVE_OLD_SIGNAL
-.endif
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/catdoc/Makefile.common b/textproc/catdoc/Makefile.common
index 93c9945af6c..f139bf33067 100644
--- a/textproc/catdoc/Makefile.common
+++ b/textproc/catdoc/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2007/09/06 21:51:54 jlam Exp $
+# $NetBSD: Makefile.common,v 1.11 2007/09/08 21:58:00 jlam Exp $
 #
 
 DISTNAME=	catdoc-0.94.2
@@ -12,18 +12,9 @@ COMMENT=	Converts MS Word, Excel and Powerpoint files to plain text
 DISTINFO_FILE=		${.CURDIR}/../../textproc/catdoc/distinfo
 PATCHDIR=		${.CURDIR}/../../textproc/catdoc/patches
 
-GNU_CONFIGURE=		yes
+USE_FEATURES=		glob nbcompat
 
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--libdir=${PREFIX}/share
 
 CPPFLAGS+=		-Dunix -D__unix
-
-.include "../../mk/bsd.prefs.mk"
-
-.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=	src/fileutil.c
-SUBST_SED.glob_h=	-e "s,<glob\.h>,<nbcompat/glob.h>,"
-.endif
diff --git a/textproc/groff/Makefile b/textproc/groff/Makefile
index 96e903ded7e..0dfcc2823ed 100644
--- a/textproc/groff/Makefile
+++ b/textproc/groff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2007/09/06 21:51:54 jlam Exp $
+# $NetBSD: Makefile,v 1.47 2007/09/08 21:58:00 jlam Exp $
 #
 
 DISTNAME=	groff-1.19.2
@@ -16,6 +16,7 @@ USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		YES
 CONFIGURE_ENV+=		PERLPATH=${PERL5:Q}
 USE_TOOLS+=		perl:run sed:run awk:run
+USE_FEATURES=		getopt_long
 
 INFO_FILES=		YES
 
@@ -49,10 +50,6 @@ PLIST_SUBST+=	GNU_PREFIX_AN_TMAC="g"
 PLIST_SUBST+=	GNU_PREFIX_AN_TMAC=""
 .endif
 
-.if ${OPSYS} == "IRIX" || ${OPSYS} == "OSF1"
-.  include "../../pkgtools/libnbcompat/inplace.mk"	# getopt_long()
-.endif
-
 BUILD_DEFS+=	PAPERSIZE
 .if defined(PAPERSIZE)
 CONFIGURE_ENV+=	PAGE=${PAPERSIZE:Q}
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"
 
diff --git a/textproc/nbsed/Makefile b/textproc/nbsed/Makefile
index 3785a7fb7bb..78a40767420 100644
--- a/textproc/nbsed/Makefile
+++ b/textproc/nbsed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2007/09/06 21:29:26 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2007/09/08 21:58:01 jlam Exp $
 
 DISTNAME=		nbsed-20040821
 PKGREVISION=		1
@@ -12,11 +12,11 @@ COMMENT=		NetBSD-current's sed(1)
 
 NO_CHECKSUM=		yes
 NO_MTREE=		yes
+USE_FEATURES=		nbcompat
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--program-transform-name="s,sed,nbsed,"
 
 do-extract:
 	@${CP} -R ${FILESDIR} ${WRKSRC}
 
-.include "../../pkgtools/libnbcompat/inplace.mk"
 .include "../../mk/bsd.pkg.mk"