From d74507e8b12a9986d935ad72d559fc822cc03b7d Mon Sep 17 00:00:00 2001
From: tron <tron@pkgsrc.org>
Date: Thu, 19 Jan 2006 14:51:38 +0000
Subject: Make this build under Mac OS X.

---
 mail/elm/Makefile         | 18 ++++++++++++------
 mail/elm/distinfo         |  4 ++--
 mail/elm/files/config.sh  |  2 +-
 mail/elm/patches/patch-aa |  4 ++--
 4 files changed, 17 insertions(+), 11 deletions(-)

(limited to 'mail/elm')

diff --git a/mail/elm/Makefile b/mail/elm/Makefile
index fad9bd9a25a..21067d0d2bd 100644
--- a/mail/elm/Makefile
+++ b/mail/elm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2006/01/19 11:23:44 tron Exp $
+# $NetBSD: Makefile,v 1.37 2006/01/19 14:51:38 tron Exp $
 
 DISTNAME=		elm2.5.8
 PKGNAME=		elm-2.5.8
@@ -18,14 +18,20 @@ HAS_CONFIGURE=		YES
 CONFIGURE_SCRIPT=	./Configure
 CONFIGURE_ARGS+=	-d
 
+.include "../../mk/bsd.prefs.mk"
+
+.if (${OPSYS} == Darwin)
+LIBC=			/usr/lib/libSystem.dylib
+.else
+LIBC=			/usr/lib/libc.so
+.endif
+
 pre-configure:
 	${CP} ${FILESDIR}/config.sh ${WRKSRC}/config.sh.orig
 	${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.tmp2
-	${SED} -e 's:@CC@:${CC}:g' \
-		${WRKSRC}/config.sh.tmp2 > ${WRKSRC}/config.sh
+	  -e 's:LOCALBASE:${LOCALBASE}:g' \
+	  -e 's:LIBC:${LIBC}:g' \
+	  ${WRKSRC}/config.sh.orig > ${WRKSRC}/config.sh
 	${MV} ${WRKSRC}/nls/LANGS ${WRKSRC}/nls/LANGS.tmpl
 	${SED} -e 's:__PREFIX:'${PREFIX}':g' < ${WRKSRC}/nls/LANGS.tmpl > ${WRKSRC}/nls/LANGS
 
diff --git a/mail/elm/distinfo b/mail/elm/distinfo
index b349a41d942..4f2f9f57ff5 100644
--- a/mail/elm/distinfo
+++ b/mail/elm/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.8 2005/08/22 12:40:12 tron Exp $
+$NetBSD: distinfo,v 1.9 2006/01/19 14:51:38 tron Exp $
 
 SHA1 (elm2.5.8.tar.gz) = bf09df75d0dc9097a1e69591bfb4872f860e00c7
 RMD160 (elm2.5.8.tar.gz) = c12dbefd0bf9d47ee4438673507a4693c4a6808c
 Size (elm2.5.8.tar.gz) = 607078 bytes
-SHA1 (patch-aa) = b563de30ee117674419ec56074c0a94fbfbb6504
+SHA1 (patch-aa) = cba94203f670bbe7c59d379442f471fca2f34e84
 SHA1 (patch-ab) = 0d3a39f6fb0179bf75095ed7aa1910d94506fbe8
 SHA1 (patch-ac) = 3216e1f8a00200efd93ada37c8250c5277abfbfe
 SHA1 (patch-ad) = de6e99072ad6379126bb1e6d798bc2cd851a92ed
diff --git a/mail/elm/files/config.sh b/mail/elm/files/config.sh
index fadbb166be8..6236e50a9c3 100644
--- a/mail/elm/files/config.sh
+++ b/mail/elm/files/config.sh
@@ -235,7 +235,7 @@ i_utime='define'
 i_sysutime='undef'
 lib='PREFIX/lib/elm'
 installlib='PREFIX/lib/elm'
-libc='/usr/lib/libc.so'
+libc='LIBC'
 linepr='/usr/bin/lp'
 maildir='/var/mail'
 mailer='/usr/sbin/sendmail'
diff --git a/mail/elm/patches/patch-aa b/mail/elm/patches/patch-aa
index dba6687a86c..7e6b2e4d186 100644
--- a/mail/elm/patches/patch-aa
+++ b/mail/elm/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2002/01/03 14:13:01 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2006/01/19 14:51:38 tron Exp $
 
 --- Configure.orig	Fri Dec 15 15:00:55 2000
 +++ Configure
@@ -30,7 +30,7 @@ $NetBSD: patch-aa,v 1.3 2002/01/03 14:13:01 wiz Exp $
  rp="If you need to edit config.sh, do it as a shell escape here:"
  $echo $n "$rp $c"
 -. UU/myread
-+#. UU/myread
++ans=''
  case "$ans" in
  '') ;;
  *) : in case they cannot read
-- 
cgit v1.2.3