These packages are no longer needed to bootstrap buildlink2. Simplify the

building of these packages by using buildlink2.

1 files changed, 7 insertions, 52 deletions

diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile
index 6f44c5872bf..a9b5bcc6be8 100644
--- a/shells/bash2/Makefile
+++ b/shells/bash2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2002/11/26 10:00:35 jlam Exp $
+# $NetBSD: Makefile,v 1.41 2002/12/22 19:04:08 jlam Exp $
 #
 
 DISTNAME=	bash-2.05b
@@ -11,69 +11,24 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gnu.org/software/bash/bash.html
 COMMENT=	The GNU Bourne Again Shell
 
-# bash is needed to bootstrap buildlink2 on Darwin.
-USE_BUILDLINK2=		no
-
-GNU_CONFIGURE=		yes
+USE_BUILDLINK2=		# defined
+GNU_CONFIGURE=		# defined
 MAKE_ENV+=		INSTALL_SCRIPT='${INSTALL_SCRIPT}'
 
 PKG_SHELL=		${PREFIX}/bin/bash
 
 .include "../../mk/bsd.prefs.mk"
 
-.if defined(BASH_STATIC) && ${BASH_STATIC} == YES
+.if defined(BASH_STATIC)
+.  if !empty(BASH_STATIC:M[yY][eE][sS])
 CONFIGURE_ARGS+=	--enable-static-link
+.  endif
 .endif
 
-GETTEXTDIR=		${WRKDIR}/.gettext
-.if exists(/usr/include/libintl.h)
-GETTEXT_PREFIX=		/usr
-.else
-DEPENDS+=		gettext-lib>=0.10.35nb1:../../devel/gettext-lib
-EVAL_PREFIX+=		GETTEXT_PREFIX=gettext-lib
-GETTEXT_PREFIX_DEFAULT=	${LOCALBASE}
-.endif
-
-# Remove -I$(includedir) from the INCLUDES passed to the compiler.  We
-# want the build to be completely self-contained.
-#
-pre-build:
-	cd ${WRKSRC};							\
-	files="Makefile.in";						\
-	for file in $${files}; do					\
-		${SED} -e "s|[  ]*-I\$$(includedir)||"			\
-			$${file} > $${file}.fixed;			\
-		${MV} -f $${file}.fixed $${file};			\
-	done
-
-# Symlink the correct gettext libraries and headers into a private directory
-# that is placed in the library and header search paths.
-#
-pre-configure:
-	cd ${GETTEXT_PREFIX};						\
-	for file in include/libintl.h lib/libintl.*; do			\
-		if [ -f "$${file}" ]; then				\
-			${MKDIR} ${GETTEXTDIR}/`${DIRNAME} $${file}`;	\
-			${LN} -sf ${GETTEXT_PREFIX}/$${file}		\
-				${GETTEXTDIR}/$${file};			\
-		fi;							\
-	done
-
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/bash.1 ${PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/doc/bashbug.1 ${PREFIX}/man/man1
 
+.include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
-
-CPPFLAGS:=	-I${GETTEXTDIR}/include ${CPPFLAGS}
-CFLAGS:=	-I${GETTEXTDIR}/include ${CFLAGS}
-LDFLAGS=	# empty
-LIBINTL_LIST!=	set ${GETTEXT_PREFIX}/lib/libintl.*; ${ECHO} $$1
-.if ${LIBINTL_LIST} != "${GETTEXT_PREFIX}/lib/libintl.*"
-LDFLAGS+=	-L${GETTEXTDIR}/lib
-.  if ${_USE_RPATH} == "yes"
-LDFLAGS+=	-Wl,-R${GETTEXT_PREFIX}/lib
-.  endif
-LIBS+=		${LDFLAGS} -lintl
-.endif