[pkgsrc/trunk]: pkgsrc Convert all libnbcompat/buildlink3.mk references to in...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/86a3c9868603
branches:  trunk
changeset: 533008:86a3c9868603
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Sep 06 21:51:52 2007 +0000

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

diffstat:

 archivers/gtar-base/Makefile    |   6 ++----
 archivers/pax/Makefile          |   4 ++--
 graphics/netpbm/Makefile        |   6 ++----
 graphics/xpm/Makefile           |   9 ++++-----
 mail/incm/Makefile              |   4 ++--
 net/xtraceroute/Makefile        |   8 ++++----
 news/cg/Makefile                |  13 +++++++------
 news/leafnode/Makefile          |   5 ++---
 news/suck/Makefile              |   7 +++----
 pkgtools/pkg_filecheck/Makefile |   4 ++--
 pkgtools/pkgfind/Makefile       |   4 ++--
 shells/nologinmsg/Makefile      |   4 ++--
 sysutils/mtree/Makefile         |   4 ++--
 sysutils/news/Makefile          |   4 ++--
 textproc/aspell/Makefile        |   8 ++++----
 textproc/catdoc/Makefile.common |   6 +++---
 textproc/groff/Makefile         |   5 ++---
 textproc/libxml2/Makefile       |   5 ++---
 textproc/libxml2/buildlink3.mk  |   6 +++---
 time/remind/Makefile            |   6 +++---
 www/mini_httpd/Makefile         |   7 +++----
 www/privoxy/Makefile            |   5 ++---
 www/sitecopy/Makefile           |   4 ++--
 x11/xsnow/Makefile              |   7 +++----
 24 files changed, 65 insertions(+), 76 deletions(-)

diffs (truncated from 496 to 300 lines):

diff -r 25dd51fdb930 -r 86a3c9868603 archivers/gtar-base/Makefile
--- a/archivers/gtar-base/Makefile      Thu Sep 06 21:29:26 2007 +0000
+++ b/archivers/gtar-base/Makefile      Thu Sep 06 21:51:52 2007 +0000
@@ -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 @@
        ${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 -r 25dd51fdb930 -r 86a3c9868603 archivers/pax/Makefile
--- a/archivers/pax/Makefile    Thu Sep 06 21:29:26 2007 +0000
+++ b/archivers/pax/Makefile    Thu Sep 06 21:51:52 2007 +0000
@@ -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+=    gtar-base-[0-9]*
 .endif
 
-.include "../../pkgtools/libnbcompat/buildlink3.mk"
+.include "../../pkgtools/libnbcompat/inplace.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 25dd51fdb930 -r 86a3c9868603 graphics/netpbm/Makefile
--- a/graphics/netpbm/Makefile  Thu Sep 06 21:29:26 2007 +0000
+++ b/graphics/netpbm/Makefile  Thu Sep 06 21:51:52 2007 +0000
@@ -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 @@
 .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 -r 25dd51fdb930 -r 86a3c9868603 graphics/xpm/Makefile
--- a/graphics/xpm/Makefile     Thu Sep 06 21:29:26 2007 +0000
+++ b/graphics/xpm/Makefile     Thu Sep 06 21:51:52 2007 +0000
@@ -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_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 -r 25dd51fdb930 -r 86a3c9868603 mail/incm/Makefile
--- a/mail/incm/Makefile        Thu Sep 06 21:29:26 2007 +0000
+++ b/mail/incm/Makefile        Thu Sep 06 21:51:52 2007 +0000
@@ -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 @@
 .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 -r 25dd51fdb930 -r 86a3c9868603 net/xtraceroute/Makefile
--- a/net/xtraceroute/Makefile  Thu Sep 06 21:29:26 2007 +0000
+++ b/net/xtraceroute/Makefile  Thu Sep 06 21:51:52 2007 +0000
@@ -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-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 -r 25dd51fdb930 -r 86a3c9868603 news/cg/Makefile
--- a/news/cg/Makefile  Thu Sep 06 21:29:26 2007 +0000
+++ b/news/cg/Makefile  Thu Sep 06 21:51:52 2007 +0000
@@ -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 @@
 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 -r 25dd51fdb930 -r 86a3c9868603 news/leafnode/Makefile
--- a/news/leafnode/Makefile    Thu Sep 06 21:29:26 2007 +0000
+++ b/news/leafnode/Makefile    Thu Sep 06 21:51:52 2007 +0000
@@ -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 @@
                        ${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 -r 25dd51fdb930 -r 86a3c9868603 news/suck/Makefile
--- a/news/suck/Makefile        Thu Sep 06 21:29:26 2007 +0000
+++ b/news/suck/Makefile        Thu Sep 06 21:51:52 2007 +0000
@@ -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 @@
 
 GNU_CONFIGURE= yes
 
+.include "../../mk/bsd.prefs.mk"
 .include "options.mk"
 
 post-patch:
@@ -26,10 +27,8 @@
        ${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 -r 25dd51fdb930 -r 86a3c9868603 pkgtools/pkg_filecheck/Makefile
--- a/pkgtools/pkg_filecheck/Makefile   Thu Sep 06 21:29:26 2007 +0000
+++ b/pkgtools/pkg_filecheck/Makefile   Thu Sep 06 21:51:52 2007 +0000
@@ -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 @@
 
 .if ${OPSYS} != "NetBSD"
 CPPFLAGS+=     -DUSE_LIBNBCOMPAT
-.  include "../../pkgtools/libnbcompat/buildlink3.mk"
+.  include "../../pkgtools/libnbcompat/inplace.mk"
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff -r 25dd51fdb930 -r 86a3c9868603 pkgtools/pkgfind/Makefile
--- a/pkgtools/pkgfind/Makefile Thu Sep 06 21:29:26 2007 +0000
+++ b/pkgtools/pkgfind/Makefile Thu Sep 06 21:51:52 2007 +0000
@@ -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 @@
 .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 -r 25dd51fdb930 -r 86a3c9868603 shells/nologinmsg/Makefile
--- a/shells/nologinmsg/Makefile        Thu Sep 06 21:29:26 2007 +0000
+++ b/shells/nologinmsg/Makefile        Thu Sep 06 21:51:52 2007 +0000
@@ -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 @@
 .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 -r 25dd51fdb930 -r 86a3c9868603 sysutils/mtree/Makefile
--- a/sysutils/mtree/Makefile   Thu Sep 06 21:29:26 2007 +0000
+++ b/sysutils/mtree/Makefile   Thu Sep 06 21:51:52 2007 +0000
@@ -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 -r 25dd51fdb930 -r 86a3c9868603 sysutils/news/Makefile
--- a/sysutils/news/Makefile    Thu Sep 06 21:29:26 2007 +0000
+++ b/sysutils/news/Makefile    Thu Sep 06 21:51:52 2007 +0000
@@ -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 @@
 .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 -r 25dd51fdb930 -r 86a3c9868603 textproc/aspell/Makefile
--- a/textproc/aspell/Makefile  Thu Sep 06 21:29:26 2007 +0000
+++ b/textproc/aspell/Makefile  Thu Sep 06 21:51:52 2007 +0000
@@ -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-dict-dir=${PREFIX}/lib/aspell
 CONFIGURE_ENV+=                gt_cv_func_gnugettext1_libintl=yes
 
+.include "../../mk/bsd.prefs.mk"