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.

3 files changed, 4 insertions, 44 deletions

diff --git a/pkgtools/libnbcompat/buildlink3.mk b/pkgtools/libnbcompat/buildlink3.mk
deleted file mode 100644
index ea13c2be9f4..00000000000
--- a/pkgtools/libnbcompat/buildlink3.mk
+++ /dev/null
@@ -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 --git a/pkgtools/rcorder/Makefile b/pkgtools/rcorder/Makefile
index 29018b97db6..0203a8c6524 100644
--- a/pkgtools/rcorder/Makefile
+++ b/pkgtools/rcorder/Makefile
@@ -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 @@ COMMENT=		Print a dependency ordering of interdependent files
 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 --git a/textproc/nbsed/Makefile b/textproc/nbsed/Makefile
index 6d8bbec5119..3785a7fb7bb 100644
--- a/textproc/nbsed/Makefile
+++ b/textproc/nbsed/Makefile
@@ -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 @@ NO_MTREE=		yes
 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"