Merge changes in packages from the buildlink2 branch that have

buildlink2.mk files back into the main trunk.

5 files changed, 59 insertions, 4 deletions

diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile
index 08a46d2fba3..6b4383e8374 100644
--- a/devel/binutils/Makefile
+++ b/devel/binutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/08/12 02:17:23 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.4 2002/08/25 19:22:22 jlam Exp $
 #
 
 DISTNAME=	binutils-2.11.2
diff --git a/devel/binutils/PLIST b/devel/binutils/PLIST
index 28ebeb07a85..c1355b8b440 100644
--- a/devel/binutils/PLIST
+++ b/devel/binutils/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/08/12 02:17:23 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/08/25 19:22:22 jlam Exp $
 ${MACHINE_GNU_PLATFORM}/bin/ar
 ${MACHINE_GNU_PLATFORM}/bin/as
 ${MACHINE_GNU_PLATFORM}/bin/ld
diff --git a/devel/binutils/PLIST.SunOS b/devel/binutils/PLIST.SunOS
index 209e752b892..9e36f7cda27 100644
--- a/devel/binutils/PLIST.SunOS
+++ b/devel/binutils/PLIST.SunOS
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.SunOS,v 1.1 2002/07/11 16:09:36 agc Exp $
+@comment $NetBSD: PLIST.SunOS,v 1.2 2002/08/25 19:22:22 jlam Exp $
 ${MACHINE_GNU_PLATFORM}/bin/ar
 ${MACHINE_GNU_PLATFORM}/bin/as
 ${MACHINE_GNU_PLATFORM}/bin/ld
diff --git a/devel/binutils/buildlink.mk b/devel/binutils/buildlink.mk
index 729ec66d842..77043a87671 100644
--- a/devel/binutils/buildlink.mk
+++ b/devel/binutils/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2002/05/21 11:04:12 wiz Exp $
+# $NetBSD: buildlink.mk,v 1.4 2002/08/25 19:22:22 jlam Exp $
 #
 # This Makefile fragment is included by packages that use binutils.
 #
diff --git a/devel/binutils/buildlink2.mk b/devel/binutils/buildlink2.mk
new file mode 100644
index 00000000000..6d22509ac78
--- /dev/null
+++ b/devel/binutils/buildlink2.mk
@@ -0,0 +1,55 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:22 jlam Exp $
+
+.if !defined(BINUTILS_BUILDLINK2_MK)
+BINUTILS_BUILDLINK2_MK=	# defined
+
+.include "../../mk/bsd.prefs.mk"
+
+BUILDLINK_DEPENDS.binutils?=		binutils>=2.11.2
+BUILDLINK_PKGSRCDIR.binutils?=		../../devel/binutils
+BUILDLINK_DEPMETHOD.binutils?=		build
+
+_NEED_BINUTILS=          NO
+.if ${OPSYS} == "NetBSD"
+_INCOMPAT_BINUTILS=       0.* 1.[01234]* 1.5.* 1.5[A-X]
+.  for PATTERN in ${_INCOMPAT_BINUTILS}
+.    if ${OS_VERSION:M${PATTERN}} != ""
+_NEED_BINUTILS=          YES
+.    endif
+.  endfor
+.else
+# XXX: logic for other operating systems needed here
+.endif
+
+.if ${_NEED_BINUTILS} == "YES"
+BUILDLINK_PACKAGES+=		binutils
+EVAL_PREFIX+=	BUILDLINK_PREFIX.binutils=binutils
+BUILDLINK_PREFIX.binutils_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.binutils+=	include/ansidecl.h
+BUILDLINK_FILES.binutils+=	include/bfd.h
+BUILDLINK_FILES.binutils+=	include/bfdlink.h
+BUILDLINK_FILES.binutils+=	lib/libbfd.*
+BUILDLINK_FILES.binutils+=	lib/libiberty.*
+BUILDLINK_FILES.binutils+=	lib/libopcodes.*
+BUILDLINK_FILES.binutils+=	bin/addr2line
+BUILDLINK_FILES.binutils+=	bin/ar
+BUILDLINK_FILES.binutils+=	bin/as
+BUILDLINK_FILES.binutils+=	bin/c++filt
+BUILDLINK_FILES.binutils+=	bin/gasp
+BUILDLINK_FILES.binutils+=	bin/gprof
+BUILDLINK_FILES.binutils+=	bin/ld
+BUILDLINK_FILES.binutils+=	bin/nm
+BUILDLINK_FILES.binutils+=	bin/objcopy
+BUILDLINK_FILES.binutils+=	bin/objdump
+BUILDLINK_FILES.binutils+=	bin/ranlib
+BUILDLINK_FILES.binutils+=	bin/readelf
+BUILDLINK_FILES.binutils+=	bin/size
+BUILDLINK_FILES.binutils+=	bin/strings
+BUILDLINK_FILES.binutils+=	bin/strip
+
+BUILDLINK_TARGETS+=	binutils-buildlink
+
+binutils-buildlink: _BUILDLINK_USE
+.endif	# _NEED_BINUTILS
+
+.endif	# BINUTILS_BUILDLINK2_MK