From b313b1d3238d32951370a71fe68772ca87ed7f93 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Mon, 21 Oct 2002 22:10:04 +0000
Subject: buildlink1 -> buildlink2

---
 mail/elm/Makefile        | 5 +++--
 mail/elm/files/config.sh | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'mail')

diff --git a/mail/elm/Makefile b/mail/elm/Makefile
index 7b030541b50..30315ecbfb4 100644
--- a/mail/elm/Makefile
+++ b/mail/elm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2002/05/26 10:42:39 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2002/10/21 22:10:04 jlam Exp $
 
 DISTNAME=		elm2.5.5
 PKGNAME=		elm-2.5.5
@@ -12,6 +12,7 @@ COMMENT=		ELM Mail User Agent (without ME extensions)
 CONFLICTS+=		mm-[0-9]* metamail-[0-9]*
 CONFLICTS+=		elm-me-[0-9]*
 
+USE_BUILDLINK2=		YES
 HAS_CONFIGURE=		YES
 CONFIGURE_SCRIPT=	./Configure
 CONFIGURE_ARGS+=	-d
@@ -25,5 +26,5 @@ pre-configure:
 	${MV} ${WRKSRC}/nls/LANGS ${WRKSRC}/nls/LANGS.tmpl
 	${SED} -e 's:__PREFIX:'${PREFIX}':g' < ${WRKSRC}/nls/LANGS.tmpl > ${WRKSRC}/nls/LANGS
 
-.include "../../devel/gettext-lib/buildlink.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/elm/files/config.sh b/mail/elm/files/config.sh
index 8110d939cd4..fadbb166be8 100644
--- a/mail/elm/files/config.sh
+++ b/mail/elm/files/config.sh
@@ -261,7 +261,7 @@ optimize='-O2'
 ccflags='-ILOCALBASE/include'
 cppflags=' -ILOCALBASE/include'
 ldflags='-Wl,-RLOCALBASE/lib -LLOCALBASE/lib'
-cc='@CC@ -MD'
+cc='cc -MD'
 libs='-lintl'
 nametype='bsd'
 d_passnames='define'
-- 
cgit v1.2.3