4 files changed, 22 insertions, 33 deletions
diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile
index 0a703b98a1e..711c68d7c03 100644
--- a/shells/bash2/Makefile
+++ b/shells/bash2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2001/04/13 16:39:42 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2001/08/04 06:58:23 jlam Exp $
 #
 
 V=		2.05
@@ -13,10 +13,10 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gnu.org/software/bash/bash.html
 COMMENT=	The GNU Bourne Again Shell
 
-GNU_CONFIGURE=	yes
-USE_GTEXINFO=	yes
-USE_LIBINTL=	yes
-MAKE_ENV+=	INSTALL_SCRIPT='${INSTALL_SCRIPT}'
+USE_BUILDLINK_ONLY=	yes
+GNU_CONFIGURE=		yes
+USE_GTEXINFO=		yes
+MAKE_ENV+=		INSTALL_SCRIPT='${INSTALL_SCRIPT}'
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -24,6 +24,19 @@ MAKE_ENV+=	INSTALL_SCRIPT='${INSTALL_SCRIPT}'
 CONFIGURE_ARGS+=	--enable-static-link
 .endif
 
+# Remove -I$(includedir) from the INCLUDES passed to the compiler as this
+# defeats buildlink.
+#
+post-patch:
+	cd ${WRKSRC};							\
+	files="Makefile.in";						\
+	for file in $${files}; do					\
+		${MV} -f $${file} $${file}.fixme;			\
+		${SED} -e "s|[  ]*-I\$$(includedir)||"			\
+			$${file}.fixme > $${file};			\
+		${RM} $${file}.fixme;					\
+	done
+
 post-install:
 	${CP} /etc/shells /etc/shells.bak
 	(${GREP} -v ${PREFIX}/bin/bash /etc/shells.bak; ${ECHO} ${PREFIX}/bin/bash) >/etc/shells
@@ -41,4 +54,5 @@ post-install:
 		${PREFIX}/share/doc/html/bash
 	${GZIP_CMD} ${PREFIX}/share/doc/bash/*.ps
 
+.include "../../devel/gettext-lib/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/shells/bash2/distinfo b/shells/bash2/distinfo
index d8b3324c2cf..19bb6d40d2d 100644
--- a/shells/bash2/distinfo
+++ b/shells/bash2/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 14:53:31 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/08/04 06:58:23 jlam Exp $
 
 SHA1 (bash-2.05.tar.gz) = 4418655ddc7bf6172f885bd3a54e7bfec77fec91
 Size (bash-2.05.tar.gz) = 1792319 bytes
 SHA1 (bash-doc-2.05.tar.gz) = c07174e6f59730a925634a173541b4dbfcd5fdc1
 Size (bash-doc-2.05.tar.gz) = 880715 bytes
-SHA1 (patch-aa) = 6a7733599ce07ca1c6257a96f41b985f25ad5a00
-SHA1 (patch-ab) = c206cb77dfc151bc32d3d56fc1253a01d60a21d5
+SHA1 (patch-ab) = ea7d1d5e063a839445cb4c7937ba79234a0596bf
 SHA1 (patch-ae) = f55a728f9f8ce8896a7097100de80db1d1cf752f
diff --git a/shells/bash2/patches/patch-aa b/shells/bash2/patches/patch-aa
deleted file mode 100644
index 7905f2fdb99..00000000000
--- a/shells/bash2/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2001/04/16 11:35:36 tron Exp $
-
---- builtins/Makefile.in.orig	Sat Oct 14 23:35:28 2000
-+++ builtins/Makefile.in	Mon Apr 16 13:29:42 2001
-@@ -48,8 +48,8 @@
- 
- INCLUDES = -I. -I.. @RL_INCLUDE@ -I$(topdir) -I$(BASHINCDIR) -I$(topdir)/lib -I$(srcdir)
- 
--CCFLAGS = ${PROFILE_FLAGS} $(DEFS) $(LOCAL_DEFS) $(SYSTEM_FLAGS) $(CPPFLAGS) \
--	  ${INCLUDES} $(LOCAL_CFLAGS) $(CFLAGS)
-+CCFLAGS = ${PROFILE_FLAGS} $(DEFS) $(LOCAL_DEFS) $(SYSTEM_FLAGS) ${INCLUDES} \
-+	$(CPPFLAGS) $(LOCAL_CFLAGS) $(CFLAGS)
- 
- MKBUILTINS = mkbuiltins$(EXEEXT)
- DIRECTDEFINE = -D $(srcdir)
diff --git a/shells/bash2/patches/patch-ab b/shells/bash2/patches/patch-ab
index 918a8b1036e..cc5fd2bbb28 100644
--- a/shells/bash2/patches/patch-ab
+++ b/shells/bash2/patches/patch-ab
@@ -1,16 +1,7 @@
-$NetBSD: patch-ab,v 1.6 2001/04/16 11:35:36 tron Exp $
+$NetBSD: patch-ab,v 1.7 2001/08/04 06:58:24 jlam Exp $
 
 --- Makefile.in.orig	Tue Apr  3 21:03:24 2001
 +++ Makefile.in	Mon Apr 16 12:44:31 2001
-@@ -111,7 +111,7 @@
- SYSTEM_FLAGS = -DPROGRAM='"$(Program)"' -DCONF_HOSTTYPE='"$(Machine)"' -DCONF_OSTYPE='"$(OS)"' -DCONF_MACHTYPE='"$(MACHTYPE)"' -DCONF_VENDOR='"$(VENDOR)"'
- 
- CCFLAGS	= $(PROFILE_FLAGS) $(SYSTEM_FLAGS) $(LOCAL_DEFS) \
--	  $(DEFS) $(LOCAL_CFLAGS) $(CPPFLAGS) $(INCLUDES) $(CFLAGS)
-+	  $(DEFS) $(LOCAL_CFLAGS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
- 
- INCLUDES = -I. @RL_INCLUDE@ -I$(srcdir) -I$(BASHINCDIR) -I$(LIBSRC) -I$(includedir)
- 
 @@ -599,7 +599,7 @@
  
  install:	.made installdirs