nb1: Install ansidecl.h as libiberty_decl.h (to avoid collision). Done as

patches rather than altering custom tarball so as to keep the tarball as
close to FSF's source as possible.

Add application.mk convenience include to add to CPPFLAGS and LIBS enough
glue to use libiberty in a gcc-based app compile.

6 files changed, 42 insertions, 7 deletions

diff --git a/devel/libiberty/Makefile b/devel/libiberty/Makefile
index a46545281d5..a80852a509c 100644
--- a/devel/libiberty/Makefile
+++ b/devel/libiberty/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2004/06/05 16:32:02 minskim Exp $
+# $NetBSD: Makefile,v 1.3 2005/01/18 21:58:55 tv Exp $
 #
 
 DISTNAME=		libiberty-1.0
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		http://www.johnrshannon.com/NetBSD/
 
@@ -16,8 +17,12 @@ GNU_CONFIGURE=		yes
 
 INSTALLATION_DIRS=	include lib
 
+post-extract:
+	${CP} -f ${WRKSRC}/include/ansidecl.h ${WRKSRC}/include/libiberty_decl.h
+
 do-install:
-	${INSTALL_LIB} ${WRKSRC}/libiberty/libiberty.a ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/include/libiberty.h ${PREFIX}/include
+	${INSTALL_LIB} ${WRKSRC}/libiberty/libiberty.a ${PREFIX}/lib/
+	${INSTALL_DATA} ${WRKSRC}/include/libiberty_decl.h ${PREFIX}/include/
+	${INSTALL_DATA} ${WRKSRC}/include/libiberty.h ${PREFIX}/include/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libiberty/PLIST b/devel/libiberty/PLIST
index 189e8f44b3d..ee0adb2eee9 100644
--- a/devel/libiberty/PLIST
+++ b/devel/libiberty/PLIST
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/06/02 11:28:38 shannonjr Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/01/18 21:58:55 tv Exp $
 include/libiberty.h
+include/libiberty_decl.h
 lib/libiberty.a
diff --git a/devel/libiberty/application.mk b/devel/libiberty/application.mk
new file mode 100644
index 00000000000..5c2c3167b53
--- /dev/null
+++ b/devel/libiberty/application.mk
@@ -0,0 +1,14 @@
+# $NetBSD: application.mk,v 1.1 2005/01/18 21:58:55 tv Exp $
+# Convenience header to help pull libiberty into an application's build.
+
+.include "../../mk/bsd.prefs.mk"
+
+# currently requires GCC for "-include"
+.if empty(PKGSRC_COMPILER:Mgcc)
+PKG_FAIL_REASON+=	"libiberty compatibility build requires gcc compiler"
+.endif
+
+.include "../../devel/libiberty/buildlink3.mk"
+
+CPPFLAGS+=		-include libiberty.h
+LIBS+=			-liberty
diff --git a/devel/libiberty/buildlink3.mk b/devel/libiberty/buildlink3.mk
index 4b73ffa4591..a4dd4b30da7 100644
--- a/devel/libiberty/buildlink3.mk
+++ b/devel/libiberty/buildlink3.mk
@@ -1,4 +1,5 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/06/02 11:28:38 shannonjr Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2005/01/18 21:58:55 tv Exp $
+
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBIBERTY_BUILDLINK3_MK:=	${LIBIBERTY_BUILDLINK3_MK}+
 
@@ -10,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibiberty}
 BUILDLINK_PACKAGES+=	libiberty
 
 .if !empty(LIBIBERTY_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libiberty+=	libiberty>=1.0
+BUILDLINK_DEPENDS.libiberty+=	libiberty>=1.0nb1
 BUILDLINK_PKGSRCDIR.libiberty?=	../../devel/libiberty
 .endif	# LIBIBERTY_BUILDLINK3_MK
 BUILDLINK_DEPMETHOD.libiberty?= build
diff --git a/devel/libiberty/distinfo b/devel/libiberty/distinfo
index 1591a578cfd..99325b28cc6 100644
--- a/devel/libiberty/distinfo
+++ b/devel/libiberty/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/06/02 11:28:38 shannonjr Exp $
+$NetBSD: distinfo,v 1.2 2005/01/18 21:58:55 tv Exp $
 
 SHA1 (libiberty-1.0.tar.gz) = e0ad9a4ae0e1d2be67a14d03e7e8840ab01dc2d5
 Size (libiberty-1.0.tar.gz) = 1210416 bytes
+SHA1 (patch-aa) = b3bd46fe9fd48206ae62f2462ae5f192a6848239
diff --git a/devel/libiberty/patches/patch-aa b/devel/libiberty/patches/patch-aa
new file mode 100644
index 00000000000..8cbb6b0607b
--- /dev/null
+++ b/devel/libiberty/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2005/01/18 21:58:55 tv Exp $
+
+--- include/libiberty.h.orig	2005-01-18 16:43:34.000000000 -0500
++++ include/libiberty.h
+@@ -39,7 +39,7 @@
+ extern "C" {
+ #endif
+ 
+-#include "ansidecl.h"
++#include "libiberty_decl.h"
+ 
+ #ifdef ANSI_PROTOTYPES
+ /* Get a definition for size_t.  */