--NzB8fVQJ5HfG6fxh
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Sat, Oct 12, 2002 at 08:27:07PM +0200, Manuel Bouyer wrote:
> Does the attached patch looks good ?
> It's not enouth, anyway, as it still tries to use cc for ./Configure

Here is a complete patch. elm compiles on solaris with it.
Does it looks good ?

-- 
Manuel Bouyer <bouyer@antioche.eu.org>
--

--NzB8fVQJ5HfG6fxh
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=diff

? README.html
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/elm/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- Makefile	2002/05/26 10:42:39	1.21
+++ Makefile	2002/10/12 20:32:30
@@ -9,6 +9,8 @@
 HOMEPAGE=		http://www.instinct.org/elm/
 COMMENT=		ELM Mail User Agent (without ME extensions)
 
+USE_BUILDLINK2=         YES
+
 CONFLICTS+=		mm-[0-9]* metamail-[0-9]*
 CONFLICTS+=		elm-me-[0-9]*
 
@@ -21,9 +23,11 @@
 	${SED} -e 's:PREFIX:'${PREFIX}':g' \
 		${WRKSRC}/config.sh.orig > ${WRKSRC}/config.sh.tmp
 	${SED} -e 's:LOCALBASE:'${LOCALBASE}':g' \
-		${WRKSRC}/config.sh.tmp > ${WRKSRC}/config.sh
+		${WRKSRC}/config.sh.tmp > ${WRKSRC}/config.sh.tmp2
+	${SED} -e 's:@CC@:'${CC}':g' \
+		${WRKSRC}/config.sh.tmp2 > ${WRKSRC}/config.sh
 	${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"
Index: files/config.sh
===================================================================
RCS file: /cvsroot/pkgsrc/mail/elm/files/config.sh,v
retrieving revision 1.4
diff -u -r1.4 config.sh
--- config.sh	2001/07/19 15:10:24	1.4
+++ config.sh	2002/10/12 20:32:31
@@ -261,7 +261,7 @@
 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'

--NzB8fVQJ5HfG6fxh--