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

24 files changed, 65 insertions, 76 deletions

diff --git a/archivers/gtar-base/Makefile b/archivers/gtar-base/Makefile
index 5598bb968ee..a74c454d60e 100644
--- a/archivers/gtar-base/Makefile
+++ b/archivers/gtar-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2007/07/19 14:54:04 joerg Exp $
+# $NetBSD: Makefile,v 1.58 2007/09/06 21:51:52 jlam Exp $
 
 DISTNAME=	tar-1.15.1
 PKGNAME=	gtar-base-1.15.1
@@ -65,10 +65,8 @@ post-install:
 	${LN} -sf ${DESTDIR}${GTAR_PROGRAM_PREFIX}tar ${DESTDIR}${PREFIX}/bin/"gtar"
 .endif
 
-.include "../../mk/bsd.prefs.mk"
 .if !empty(LOWER_OPSYS:Mirix5*)
-# needs vnsprintf
-. include "../../pkgtools/libnbcompat/buildlink3.mk"
+.  include "../../pkgtools/libnbcompat/inplace.mk"	# vnsprintf()
 .endif
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/pax/Makefile b/archivers/pax/Makefile
index 6128aa94dff..f1de1b03bb9 100644
--- a/archivers/pax/Makefile
+++ b/archivers/pax/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2006/10/07 16:52:19 reed Exp $
+# $NetBSD: Makefile,v 1.30 2007/09/06 21:51:53 jlam Exp $
 
 .include "Makefile.common"
 
@@ -13,5 +13,5 @@ CONFLICTS+=	gcpio-[0-9]*
 CONFLICTS+=	gtar-base-[0-9]*
 .endif
 
-.include "../../pkgtools/libnbcompat/buildlink3.mk"
+.include "../../pkgtools/libnbcompat/inplace.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 37e3977c853..fe426a32d85 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.153 2007/04/22 09:58:10 tnn Exp $
+# $NetBSD: Makefile,v 1.154 2007/09/06 21:51:53 jlam Exp $
 
 DISTNAME=	netpbm-10.34
 PKGREVISION=	1
@@ -67,9 +67,7 @@ CPPFLAGS+=	-DSGI_IDO_CC
 .endif
 
 .if !empty(LOWER_OPSYS:Mirix5*)
-# needs snprintf()
-. include "../../pkgtools/libnbcompat/buildlink3.mk"
-LIBS+=		${BUILDLINK_LDADD.libnbcompat}
+.  include "../../pkgtools/libnbcompat/inplace.mk"	# snprintf()
 .endif
 
 .include "../../graphics/jasper/buildlink3.mk"
diff --git a/graphics/xpm/Makefile b/graphics/xpm/Makefile
index 3cbee558490..e5df2f84f73 100644
--- a/graphics/xpm/Makefile
+++ b/graphics/xpm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2007/01/06 16:45:17 rillig Exp $
+# $NetBSD: Makefile,v 1.55 2007/09/06 21:51:53 jlam Exp $
 
 DISTNAME=	xpm-3.4k
 PKGREVISION=	7
@@ -31,13 +31,12 @@ SUBST_STAGE.sodots=	post-configure
 SUBST_FILES.sodots=	lib/Makefile
 SUBST_SED.sodots=	-e 's,\.so$$(SOXPMLIBREV),.so.$$(SOXPMLIBREV),g'
 
-# needs snprintf()
-. include "../../pkgtools/libnbcompat/buildlink3.mk"
-IMAKEOPTS+=	-DExtraLibraries=${BUILDLINK_LDADD.libnbcompat:Q}
+.  include "../../pkgtools/libnbcompat/inplace.mk"	# snprintf()
+IMAKEOPTS+=	-DExtraLibraries=-lnbcompat
 IMAKEOPTS+=	-DInstallCmd=${INSTALL:Q}
 
 post-configure:
-	mkdir ${WRKSRC}/usrlib
+	${MKDIR} ${WRKSRC}/usrlib
 .endif
 
 .include "../../x11/libXext/buildlink3.mk"
diff --git a/mail/incm/Makefile b/mail/incm/Makefile
index 13fcc83b8b4..f0015e9e46c 100644
--- a/mail/incm/Makefile
+++ b/mail/incm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/03/04 21:30:00 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2007/09/06 21:51:53 jlam Exp $
 #
 
 DISTNAME=	incm-0.5
@@ -21,7 +21,7 @@ do-install:
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "Interix"
-.  include "../../pkgtools/libnbcompat/buildlink3.mk" # for utimes()
+.  include "../../pkgtools/libnbcompat/inplace.mk"	# utimes()
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/xtraceroute/Makefile b/net/xtraceroute/Makefile
index 0c906c8f0f6..58e9f9ed639 100644
--- a/net/xtraceroute/Makefile
+++ b/net/xtraceroute/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2006/10/01 22:36:46 schwarz Exp $
+# $NetBSD: Makefile,v 1.47 2007/09/06 21:51:53 jlam Exp $
 #
 
 DISTNAME=	xtraceroute-0.8.14
@@ -24,10 +24,10 @@ CONFIGURE_ARGS+= --with-GL-prefix=${LOCALBASE:Q}
 CONFIGURE_ARGS+= --with-lib-MesaGL
 
 .include "../../mk/bsd.prefs.mk"
+
 .if !empty(LOWER_OPSYS:Mirix5*)
-CONFIGURE_ARGS+= --with-traceroute=/usr/etc/traceroute
-# needs snprintf()
-. include "../../pkgtools/libnbcompat/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-traceroute=/usr/etc/traceroute
+.  include "../../pkgtools/libnbcompat/inplace.mk"	# snprintf()
 .endif
 
 post-install:
diff --git a/news/cg/Makefile b/news/cg/Makefile
index b4e3e196dc9..b6bae7a3877 100644
--- a/news/cg/Makefile
+++ b/news/cg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2007/02/22 19:27:01 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2007/09/06 21:51:53 jlam Exp $
 #
 
 DISTNAME=	cg-0.4
@@ -14,12 +14,13 @@ USE_TOOLS+=		lex
 TEST_TARGET=		check
 
 .include "../../mk/bsd.prefs.mk"
+
 .if !empty(LOWER_OPSYS:Mirix5*)
-# needs regex.h
-. include "../../pkgtools/libnbcompat/buildlink3.mk"
+.  include "../../pkgtools/libnbcompat/inplace.mk"	# <regex.h>
 SUBST_CLASSES+=		regex_h
-SUBST_STAGE.regex_h=     post-patch
-SUBST_FILES.regex_h=     checkgroup.c
-SUBST_SED.regex_h=       -e "s,<regex\.h>,<nbcompat/regex.h>,"
+SUBST_STAGE.regex_h=	post-patch
+SUBST_FILES.regex_h=	checkgroup.c
+SUBST_SED.regex_h=	-e "s,<regex\.h>,<nbcompat/regex.h>,"
 .endif
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/news/leafnode/Makefile b/news/leafnode/Makefile
index 9538ec31cd6..6299703ca26 100644
--- a/news/leafnode/Makefile
+++ b/news/leafnode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2007/07/04 20:54:55 jlam Exp $
+# $NetBSD: Makefile,v 1.37 2007/09/06 21:51:53 jlam Exp $
 
 DISTNAME=		leafnode-1.11.3.rel
 PKGNAME=		${DISTNAME:S/.rel//}
@@ -70,8 +70,7 @@ post-install:
 			${WRKSRC}/README.FIRST ${PREFIX}/share/doc/leafnode
 
 .if !empty(LOWER_OPSYS:Mirix5*)
-# needs snprintf(), vsnprintf()
-. include "../../pkgtools/libnbcompat/buildlink3.mk"
+.  include "../../pkgtools/libnbcompat/inplace.mk"	# {,v}snprintf()
 .endif
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/news/suck/Makefile b/news/suck/Makefile
index cab6e61b4e0..b2ececb5f4f 100644
--- a/news/suck/Makefile
+++ b/news/suck/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/10/15 21:59:13 schwarz Exp $
+# $NetBSD: Makefile,v 1.24 2007/09/06 21:51:53 jlam Exp $
 #
 
 DISTNAME=	suck-4.3.2
@@ -14,6 +14,7 @@ COMMENT=	Feed a local news server without a dedicated newsfeed
 
 GNU_CONFIGURE=	yes
 
+.include "../../mk/bsd.prefs.mk"
 .include "options.mk"
 
 post-patch:
@@ -26,10 +27,8 @@ post-install:
 	${CP} ${WRKSRC}/sample/* ${PREFIX}/share/examples/suck
 	${CHMOD} 644 ${PREFIX}/share/examples/suck/*
 
-.include "../../mk/bsd.prefs.mk"
 .if !empty(LOWER_OPSYS:Mirix5*)
-# needs snprintf()
-. include "../../pkgtools/libnbcompat/buildlink3.mk"
+.  include "../../pkgtools/libnbcompat/inplace.mk"	# snprintf()
 .endif
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/pkgtools/pkg_filecheck/Makefile b/pkgtools/pkg_filecheck/Makefile
index 9f769c499ca..87a61cf8551 100644
--- a/pkgtools/pkg_filecheck/Makefile
+++ b/pkgtools/pkg_filecheck/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2007/02/16 22:57:09 tonio Exp $
+# $NetBSD: Makefile,v 1.26 2007/09/06 21:51:54 jlam Exp $
 #
 
 DISTNAME=		pkg_filecheck-0.4
@@ -61,7 +61,7 @@ do-install:
 
 .if ${OPSYS} != "NetBSD"
 CPPFLAGS+=	-DUSE_LIBNBCOMPAT
-.  include "../../pkgtools/libnbcompat/buildlink3.mk"
+.  include "../../pkgtools/libnbcompat/inplace.mk"
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/pkgtools/pkgfind/Makefile b/pkgtools/pkgfind/Makefile
index 363b6a28ba3..125d6b8efaf 100644
--- a/pkgtools/pkgfind/Makefile
+++ b/pkgtools/pkgfind/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2007/05/18 10:03:31 peter Exp $
+# $NetBSD: Makefile,v 1.18 2007/09/06 21:51:54 jlam Exp $
 
 DISTNAME=	pkgfind-20050804
 CATEGORIES=	pkgtools
@@ -37,7 +37,7 @@ SUBST_MESSAGE.path=	Adjusting pkgsrc directory.
 .if ${OPSYS} != "NetBSD" && ${OPSYS} != "FreeBSD" && ${OPSYS} != "DragonFly"
 CFLAGS+=	-DNEED_LIBNBCOMPAT
 LDFLAGS+=	-lnbcompat
-.  include "../../pkgtools/libnbcompat/buildlink3.mk"
+.  include "../../pkgtools/libnbcompat/inplace.mk"
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/shells/nologinmsg/Makefile b/shells/nologinmsg/Makefile
index c090e6cd477..f73b1739c04 100644
--- a/shells/nologinmsg/Makefile
+++ b/shells/nologinmsg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2007/03/24 19:21:31 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2007/09/06 21:51:54 jlam Exp $
 
 DISTNAME=	nologinmsg-1.0
 PKGREVISION=	1
@@ -27,7 +27,7 @@ INSTALLATION_DIRS=	bin ${PKGMANDIR}/cat8 ${PKGMANDIR}/man8
 .if ${OPSYS} == "Linux" || ${OPSYS} == "IRIX" || ${OPSYS} == "Interix"
 MAKE_FLAGS+=	NOMAN=YES
 CFLAGS+=	-D__LIBNBCOMPAT
-.  include "../../pkgtools/libnbcompat/buildlink3.mk"
+.  include "../../pkgtools/libnbcompat/inplace.mk"
 .endif
 
 .include "../../devel/sysexits/buildlink3.mk"
diff --git a/sysutils/mtree/Makefile b/sysutils/mtree/Makefile
index beee5474e30..15988c5b04a 100644
--- a/sysutils/mtree/Makefile
+++ b/sysutils/mtree/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2006/07/14 20:11:10 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/06 21:51:54 jlam Exp $
 
 .include "../../pkgtools/mtree/Makefile.common"
 
 CATEGORIES=	sysutils
 
-.include "../../pkgtools/libnbcompat/buildlink3.mk"
+.include "../../pkgtools/libnbcompat/inplace.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/news/Makefile b/sysutils/news/Makefile
index 8cd5e677700..32b9ce0d566 100644
--- a/sysutils/news/Makefile
+++ b/sysutils/news/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/01/07 09:14:12 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2007/09/06 21:51:54 jlam Exp $
 #
 
 DISTNAME=		news-0.2
@@ -18,7 +18,7 @@ do-install:
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "Interix"
-.  include "../../pkgtools/libnbcompat/buildlink3.mk" # for utimes()
+.  include "../../pkgtools/libnbcompat/inplace.mk"	# utimes()
 .endif
 
 .include "../../mk/bsd.pkg.mk"
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"
diff --git a/time/remind/Makefile b/time/remind/Makefile
index a1783b8823d..43322a1a6ce 100644
--- a/time/remind/Makefile
+++ b/time/remind/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2007/02/22 19:01:26 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2007/09/06 21:51:55 jlam Exp $
 #
 
 DISTNAME=	remind-03.00.24
@@ -48,9 +48,9 @@ post-install:
 		${PREFIX}/bin/rem2html
 
 .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>
 CPPFLAGS+=	-DNBCOMPAT_GLOB_H
 .endif
 
diff --git a/www/mini_httpd/Makefile b/www/mini_httpd/Makefile
index a8be32b3fdb..c21dd9c1a05 100644
--- a/www/mini_httpd/Makefile
+++ b/www/mini_httpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2007/01/18 16:28:07 reed Exp $
+# $NetBSD: Makefile,v 1.14 2007/09/06 21:51:55 jlam Exp $
 
 DISTNAME=	mini_httpd-1.19
 PKGREVISION=	3
@@ -36,9 +36,8 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/htpasswd.1 ${PREFIX}/${PKGMANDIR}/man1/mhtpasswd.1
 
 .if !empty(LOWER_OPSYS:Mirix5*)
-# needs snprintf()
-. include "../../pkgtools/libnbcompat/buildlink3.mk"
-MAKE_ENV+=	LDLIBS=${BUILDLINK_LDADD.libnbcompat:Q}
+.  include "../../pkgtools/libnbcompat/inplace.mk"	# snprintf()
+MAKE_ENV+=	LDLIBS=${LIBS:Q}
 .endif
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/privoxy/Makefile b/www/privoxy/Makefile
index c4a47622040..50b1eb2e355 100644
--- a/www/privoxy/Makefile
+++ b/www/privoxy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2007/07/04 20:55:05 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2007/09/06 21:51:55 jlam Exp $
 #
 
 DISTNAME=	${PKGNAME_NOREV}-stable-src
@@ -67,8 +67,7 @@ post-install:
 	${CHMOD} -R a+r ${EGDIR}
 
 .if !empty(LOWER_OPSYS:Mirix5*)
-# needs snprintf
-. include "../../pkgtools/libnbcompat/buildlink3.mk"
+.  include "../../pkgtools/libnbcompat/inplace.mk"	# snprintf()
 .endif
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/www/sitecopy/Makefile b/www/sitecopy/Makefile
index d579b01c482..9c49b68c6b1 100644
--- a/www/sitecopy/Makefile
+++ b/www/sitecopy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2006/04/13 18:23:39 jlam Exp $
+# $NetBSD: Makefile,v 1.37 2007/09/06 21:51:55 jlam Exp $
 
 DISTNAME=		sitecopy-0.16.2
 CATEGORIES=		www
@@ -27,7 +27,7 @@ pre-build:
 	${LN} -sf ${WRKSRC:Q}/lib/fnmatch.h ${WRKSRC:Q}/fnmatch.h
 
 .if !exists(/usr/include/getopt.h)
-.  include "../../pkgtools/libnbcompat/buildlink3.mk"
+.  include "../../pkgtools/libnbcompat/inplace.mk"
 .endif
 
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/x11/xsnow/Makefile b/x11/xsnow/Makefile
index 65d1c77b74d..e37cc0e6bb6 100644
--- a/x11/xsnow/Makefile
+++ b/x11/xsnow/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2007/02/22 19:27:29 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2007/09/06 21:51:55 jlam Exp $
 
 DISTNAME=	xsnow-1.42
 PKGREVISION=	2
@@ -14,9 +14,8 @@ USE_IMAKE=	yes
 .include "../../mk/bsd.prefs.mk"
 
 .if !empty(LOWER_OPSYS:Mirix5*)
-# needs snprintf()
-. include "../../pkgtools/libnbcompat/buildlink3.mk"
-IMAKEOPTS+=	-DExtraLibraries=${BUILDLINK_LDADD.libnbcompat:Q}
+.  include "../../pkgtools/libnbcompat/inplace.mk"	# snprintf()
+IMAKEOPTS+=	-DExtraLibraries=${LIBS:Q}
 .endif
 
 .include "../../x11/libXext/buildlink3.mk"