aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/xfmail/Makefile13
-rw-r--r--mail/xfmail/files/patch-ab19
-rw-r--r--mail/xfmail/pkg-plist2
3 files changed, 14 insertions, 20 deletions
diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile
index aa2131ad3a1f..de4814642978 100644
--- a/mail/xfmail/Makefile
+++ b/mail/xfmail/Makefile
@@ -22,15 +22,26 @@ USE_AUTOMAKE= yes
USE_BZIP2= yes
USE_GLIB= yes
USE_GMAKE= yes
+USE_LIBTOOL= yes
USE_X_PREFIX= yes
USE_XPM= yes
+# XXX: Disable patching for libtool until we can generate the files
+LIBTOOLFILES=
+
.include <bsd.port.pre.mk>
CONFIGURE_ARGS= --with-dbm-lib=gdbm
+
+.if defined(WITH_ESOUND)
+USE_ESOUND= yes
+CONFIGURE_ARGS+= --with-esd-sound
+.endif
+
MAN1= xfmail.1
pre-configure:
- @cd ${WRKSRC} && ${SH} autogen.sh
+ @(cd ${WRKSRC} && ${SH} autogen.sh); \
+ ${MAKE} LIBTOOLFILES=aclocal.m4 patch-libtool
.include <bsd.port.post.mk>
diff --git a/mail/xfmail/files/patch-ab b/mail/xfmail/files/patch-ab
index 134aa0bdcc54..fd617266cca3 100644
--- a/mail/xfmail/files/patch-ab
+++ b/mail/xfmail/files/patch-ab
@@ -1,21 +1,6 @@
--- autogen.sh.orig Mon Feb 5 17:40:21 2001
-+++ autogen.sh Thu Jul 5 20:06:50 2001
-@@ -14,14 +14,6 @@
- DIE=1
- }
-
--(libtool --version) < /dev/null > /dev/null 2>&1 || {
-- echo
-- echo "You must have libtool installed to compile xfmail."
-- echo "Get ftp://alpha.gnu.org/gnu/libtool-1.0h.tar.gz"
-- echo "(or a newer version if it is available)"
-- DIE=1
--}
--
- (automake --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "You must have automake installed to compile xfmail."
-@@ -42,15 +34,4 @@
++++ autogen.sh Sat Jul 7 20:21:07 2001
+@@ -42,15 +42,4 @@
automake --gnu --add-missing
cd "$THEDIR"
diff --git a/mail/xfmail/pkg-plist b/mail/xfmail/pkg-plist
index 091f61a0af64..aade20735e65 100644
--- a/mail/xfmail/pkg-plist
+++ b/mail/xfmail/pkg-plist
@@ -1,10 +1,8 @@
bin/xfmail
lib/libeditor.a
-lib/libeditor.la
lib/libeditor.so
lib/libeditor.so.0
lib/libmail.a
-lib/libmail.la
lib/libmail.so
lib/libmail.so.0
share/xfmail/abook.xpm