summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron>1999-02-22 01:53:15 +0000
committertron <tron>1999-02-22 01:53:15 +0000
commit21cdda4a746328fdd797cb365aa375fef899f3ac (patch)
tree360f667b47349065ad0fbc5240fb8d6a7d9e39f4
parentfcc39c9bd128b7924ac0207ccb0ec09d3e4bd821 (diff)
downloadpkgsrc-21cdda4a746328fdd797cb365aa375fef899f3ac.tar.gz
Fix this to build with new "automake" version.
-rw-r--r--mail/wmmail/Makefile4
-rw-r--r--mail/wmmail/patches/patch-ac7
2 files changed, 6 insertions, 5 deletions
diff --git a/mail/wmmail/Makefile b/mail/wmmail/Makefile
index 568d623dd9a..bdf54f66416 100644
--- a/mail/wmmail/Makefile
+++ b/mail/wmmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1999/02/20 22:48:35 hubertf Exp $
+# $NetBSD: Makefile,v 1.7 1999/02/22 01:53:15 tron Exp $
DISTNAME= WMMail.app-0.62
PKGNAME= wmmail-0.62
@@ -16,7 +16,7 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" SHELL="/bin/sh"
post-install:
${SED} -e 's#@@X11BASE@@#${X11BASE}#g' \
diff --git a/mail/wmmail/patches/patch-ac b/mail/wmmail/patches/patch-ac
index 7b00d774c06..75a7bacf6c0 100644
--- a/mail/wmmail/patches/patch-ac
+++ b/mail/wmmail/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 1999/01/30 23:59:33 tron Exp $
+$NetBSD: patch-ac,v 1.3 1999/02/22 01:53:15 tron Exp $
--- configure.orig Sat Jan 16 06:30:00 1999
-+++ configure Sat Jan 30 23:28:08 1999
-@@ -2459,12 +2459,12 @@
++++ configure Mon Feb 22 02:51:07 1999
+@@ -2459,12 +2459,13 @@
s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
$ac_vpsub
$extrasub
@@ -14,6 +14,7 @@ $NetBSD: patch-ac,v 1.2 1999/01/30 23:59:33 tron Exp $
s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
+s%@LIBS@%$LIBS -lSM -lICE%g
++s%@SHELL@%$SHELL%g
s%@exec_prefix@%$exec_prefix%g
s%@prefix@%$prefix%g
s%@program_transform_name@%$program_transform_name%g