Convert all libnbcompat/buildlink3.mk references to inplace.mk.

5 files changed, 14 insertions, 16 deletions

diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index d1c834075ed..c710bdeea22 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2007/06/10 16:03:45 rillig Exp $
+# $NetBSD: Makefile,v 1.50 2007/09/06 21:51:54 jlam Exp $
 #
 
 DISTNAME=		aspell-0.60.5
@@ -28,6 +28,8 @@ CONFIGURE_ARGS+=	--enable-pkgdatadir=${PREFIX}/share/aspell
 CONFIGURE_ARGS+=	--enable-dict-dir=${PREFIX}/lib/aspell
 CONFIGURE_ENV+=		gt_cv_func_gnugettext1_libintl=yes
 
+.include "../../mk/bsd.prefs.mk"
+
 # 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.
@@ -51,10 +53,8 @@ NOT_FOR_COMPILER=	xlc
 
 LIBS.SunOS+=		-lm
 
-.include "../../mk/bsd.prefs.mk"
 .if !empty(LOWER_OPSYS:Mirix5*)
-# needs vsnprintf() and snprintf()
-. include "../../pkgtools/libnbcompat/buildlink3.mk"
+. include "../../pkgtools/libnbcompat/inplace.mk"	# {,v}snprintf()
 CPPFLAGS+=	-DDECLARE_VSNPRINTF -DDECLARE_SNPRINTF
 # IRIX 5 has an older implementation of signal()
 CPPFLAGS+=	-DHAVE_OLD_SIGNAL
diff --git a/textproc/catdoc/Makefile.common b/textproc/catdoc/Makefile.common
index db5e1a5fe56..93c9945af6c 100644
--- a/textproc/catdoc/Makefile.common
+++ b/textproc/catdoc/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2007/01/24 17:07:00 reed Exp $
+# $NetBSD: Makefile.common,v 1.10 2007/09/06 21:51:54 jlam Exp $
 #
 
 DISTNAME=	catdoc-0.94.2
@@ -19,9 +19,9 @@ CONFIGURE_ARGS+=	--libdir=${PREFIX}/share
 CPPFLAGS+=		-Dunix -D__unix
 
 .include "../../mk/bsd.prefs.mk"
+
 .if !empty(LOWER_OPSYS:Mirix5*)
-# needs glob.h
-. include "../../pkgtools/libnbcompat/buildlink3.mk"
+. include "../../pkgtools/libnbcompat/inplace.mk"	# <glob.h>
 SUBST_CLASSES+=		glob_h
 SUBST_STAGE.glob_h=	post-patch
 SUBST_FILES.glob_h=	src/fileutil.c
diff --git a/textproc/groff/Makefile b/textproc/groff/Makefile
index 164dc611a58..96e903ded7e 100644
--- a/textproc/groff/Makefile
+++ b/textproc/groff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2007/08/05 08:47:57 tnn Exp $
+# $NetBSD: Makefile,v 1.46 2007/09/06 21:51:54 jlam Exp $
 #
 
 DISTNAME=	groff-1.19.2
@@ -50,8 +50,7 @@ PLIST_SUBST+=	GNU_PREFIX_AN_TMAC=""
 .endif
 
 .if ${OPSYS} == "IRIX" || ${OPSYS} == "OSF1"
-# needs getopt_long()
-. include "../../pkgtools/libnbcompat/buildlink3.mk"
+.  include "../../pkgtools/libnbcompat/inplace.mk"	# getopt_long()
 .endif
 
 BUILD_DEFS+=	PAPERSIZE
diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 0d17005a0ad..9c959a6d58d 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.87 2007/08/29 22:27:09 wiz Exp $
+# $NetBSD: Makefile,v 1.88 2007/09/06 21:51:54 jlam Exp $
 
 DISTNAME=	libxml2-2.6.30
 CATEGORIES=	textproc
@@ -45,8 +45,7 @@ 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*)
-# needs glob.h
-. include "../../pkgtools/libnbcompat/buildlink3.mk"
+.  include "../../pkgtools/libnbcompat/inplace.mk"	# <glob.h>
 SUBST_CLASSES+=		glob_h
 SUBST_STAGE.glob_h=	post-patch
 SUBST_FILES.glob_h=	runtest.c
diff --git a/textproc/libxml2/buildlink3.mk b/textproc/libxml2/buildlink3.mk
index adbf1463895..9b50ca64384 100644
--- a/textproc/libxml2/buildlink3.mk
+++ b/textproc/libxml2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/12/12 21:52:37 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2007/09/06 21:51:55 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBXML2_BUILDLINK3_MK:=	${LIBXML2_BUILDLINK3_MK}+
@@ -20,9 +20,9 @@ BUILDLINK_FILES.libxml2+=	bin/xml2-config
 .endif	# LIBXML2_BUILDLINK3_MK
 
 .include "../../mk/bsd.fast.prefs.mk"
+
 .if !empty(LOWER_OPSYS:Mirix5*)
-# for glob
-. include "../../pkgtools/libnbcompat/buildlink3.mk"
+.  include "../../pkgtools/libnbcompat/inplace.mk"	# glob()
 .endif
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"