[pkgsrc/trunk]: pkgsrc Drop libnbcompat/buildlink3.mk and force all packages ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/25dd51fdb930
branches:  trunk
changeset: 533007:25dd51fdb930
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Sep 06 21:29:26 2007 +0000

description:
Drop libnbcompat/buildlink3.mk and force all packages that use
libnbcompat to use it "in place".  libnbcompat is just really special,
and is of almost no use to anything other than the pkgsrc bootstrap
process.

diffstat:

 pkgtools/libnbcompat/buildlink3.mk |  26 --------------------------
 pkgtools/rcorder/Makefile          |  11 ++---------
 textproc/nbsed/Makefile            |  11 ++---------
 3 files changed, 4 insertions(+), 44 deletions(-)

diffs (82 lines):

diff -r 2c57860f3102 -r 25dd51fdb930 pkgtools/libnbcompat/buildlink3.mk
--- a/pkgtools/libnbcompat/buildlink3.mk        Thu Sep 06 21:19:42 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.18 2007/05/31 10:18:49 rillig Exp $
-
-BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
-LIBNBCOMPAT_BUILDLINK3_MK:=    ${LIBNBCOMPAT_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=    libnbcompat
-.endif
-
-BUILDLINK_PACKAGES:=   ${BUILDLINK_PACKAGES:Nlibnbcompat}
-BUILDLINK_PACKAGES+=   libnbcompat
-BUILDLINK_ORDER:=      ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libnbcompat
-
-.if !empty(LIBNBCOMPAT_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.libnbcompat+=    libnbcompat>=20040911
-BUILDLINK_ABI_DEPENDS.libnbcompat+=    libnbcompat>=20070531
-BUILDLINK_PKGSRCDIR.libnbcompat?=      ../../pkgtools/libnbcompat
-BUILDLINK_DEPMETHOD.libnbcompat?=      build
-BUILDLINK_LDADD.libnbcompat=           -lnbcompat
-
-.  if defined(GNU_CONFIGURE)
-LIBS+=         ${BUILDLINK_LDADD.libnbcompat}
-.  endif
-.endif  # LIBNBCOMPAT_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH:S/+$//}
diff -r 2c57860f3102 -r 25dd51fdb930 pkgtools/rcorder/Makefile
--- a/pkgtools/rcorder/Makefile Thu Sep 06 21:19:42 2007 +0000
+++ b/pkgtools/rcorder/Makefile Thu Sep 06 21:29:26 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2007/03/24 07:13:15 schmonz Exp $
+# $NetBSD: Makefile,v 1.10 2007/09/06 21:29:26 jlam Exp $
 #
 
 DISTNAME=              rcorder-20031013
@@ -13,15 +13,8 @@
 NO_CHECKSUM=           yes
 GNU_CONFIGURE=         yes
 
-.include "../../mk/bsd.prefs.mk"
-
-.if defined(LIBNBCOMPAT_STYLE) && (${LIBNBCOMPAT_STYLE} == "inplace")
-.  include "../../pkgtools/libnbcompat/inplace.mk"
-.else
-.  include "../../pkgtools/libnbcompat/buildlink3.mk"
-.endif
-
 do-extract:
        ${CP} -R ${FILESDIR} ${WRKSRC}
 
+.include "../../pkgtools/libnbcompat/inplace.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 2c57860f3102 -r 25dd51fdb930 textproc/nbsed/Makefile
--- a/textproc/nbsed/Makefile   Thu Sep 06 21:19:42 2007 +0000
+++ b/textproc/nbsed/Makefile   Thu Sep 06 21:29:26 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2007/03/07 19:18:39 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2007/09/06 21:29:26 jlam Exp $
 
 DISTNAME=              nbsed-20040821
 PKGREVISION=           1
@@ -15,15 +15,8 @@
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --program-transform-name="s,sed,nbsed,"
 
-.include "../../mk/bsd.prefs.mk"
-
-.if defined(LIBNBCOMPAT_STYLE) && (${LIBNBCOMPAT_STYLE} == "inplace")
-.  include "../../pkgtools/libnbcompat/inplace.mk"
-.else
-.  include "../../pkgtools/libnbcompat/buildlink3.mk"
-.endif
-
 do-extract:
        @${CP} -R ${FILESDIR} ${WRKSRC}
 
+.include "../../pkgtools/libnbcompat/inplace.mk"
 .include "../../mk/bsd.pkg.mk"