summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/xfmail/Makefile14
-rw-r--r--mail/xfmail/files/md54
-rw-r--r--mail/xfmail/files/patch-sum11
-rw-r--r--mail/xfmail/patches/patch-aa18
-rw-r--r--mail/xfmail/patches/patch-ab16
-rw-r--r--mail/xfmail/patches/patch-ac12
-rw-r--r--mail/xfmail/patches/patch-ad62
-rw-r--r--mail/xfmail/patches/patch-ae22
8 files changed, 95 insertions, 64 deletions
diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile
index fdd0a8b2f06..75944003e92 100644
--- a/mail/xfmail/Makefile
+++ b/mail/xfmail/Makefile
@@ -1,16 +1,18 @@
-# $NetBSD: Makefile,v 1.16 2001/02/25 04:18:00 hubertf Exp $
+# $NetBSD: Makefile,v 1.17 2001/02/26 22:32:09 tron Exp $
#
-DISTNAME= xfmail-1.3
+DISTNAME= xfmail-1.4.7
CATEGORIES= mail x11
-MASTER_SITES= ftp://burka.netvision.net.il/pub/xfmail/
+MASTER_SITES= ftp://xfmail.ufies.org/pub/xfmail/release/1.4.7/source/
+EXTRACT_SUFX= .tar.bz2
MAINTAINER= root@garbled.net
-HOMEPAGE= http://Burka.NetVision.net.il/xfmail/xfmail.html
+HOMEPAGE= http://xfmail.slappy.org/
COMMENT= Xforms based mail application for Unix operating systems
DEPENDS+= gdbm>=1.7.3:../../databases/gdbm
DEPENDS+= xforms>=0.88nb1:../../x11/xforms
+DEPENDS+= glib-*:../../devel/glib
ONLY_FOR_PLATFORM= NetBSD-*-alpha NetBSD-*-arm32 NetBSD-*-i386 NetBSD-*-m68k \
NetBSD-*-mipsel NetBSD-*-ns32k NetBSD-*-sparc NetBSD-*-powerpc
@@ -23,6 +25,10 @@ USE_X11BASE= YES
USE_XPM= YES
GNU_CONFIGURE= YES
+pre-configure:
+ cd ${WRKSRC} && ( ${LN} -sf config/configure.in . && ${LN} -sf config/acconfig.h . )
+ cd ${WRKSRC} && ( ${LOCALBASE}/bin/autoheader && ${LOCALBASE}/bin/autoconf )
+
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xfmail
${INSTALL_DATA} ${WRKSRC}/Copyright ${PREFIX}/share/doc/xfmail
diff --git a/mail/xfmail/files/md5 b/mail/xfmail/files/md5
index 52cbd6345f3..5396de7b728 100644
--- a/mail/xfmail/files/md5
+++ b/mail/xfmail/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1998/08/07 13:25:03 agc Exp $
+$NetBSD: md5,v 1.3 2001/02/26 22:32:09 tron Exp $
-MD5 (xfmail-1.3.tar.gz) = c756fb26bb4b31e59af775d3a088fb73
+MD5 (xfmail-1.4.7.tar.bz2) = c915d9b39621fa538b329dcf4d161bb4
diff --git a/mail/xfmail/files/patch-sum b/mail/xfmail/files/patch-sum
index 482c44662a6..489ee9620aa 100644
--- a/mail/xfmail/files/patch-sum
+++ b/mail/xfmail/files/patch-sum
@@ -1,6 +1,7 @@
-$NetBSD: patch-sum,v 1.2 2000/09/07 00:35:49 dmcmahill Exp $
+$NetBSD: patch-sum,v 1.3 2001/02/26 22:32:09 tron Exp $
-MD5 (patch-aa) = a261d251cd80755282696e02ccc391e5
-MD5 (patch-ab) = 6313b4a64105e4d3fe3a8279b8daadec
-MD5 (patch-ac) = dca995c2c39df358248a4f981d2172f8
-MD5 (patch-ad) = 54c3c2564db85581a8e9d273ef8e33c3
+MD5 (patch-aa) = 04eeb9691762802f348db856884f42aa
+MD5 (patch-ab) = 7c175274f51d2607bae9d33f9e01d3d8
+MD5 (patch-ac) = bb72cc8467ee9447186fed09cd710b2b
+MD5 (patch-ad) = 63e07f169d348df7e3556b5046b9d72f
+MD5 (patch-ae) = 46fab712d88373c79a203b3a84b53fa5
diff --git a/mail/xfmail/patches/patch-aa b/mail/xfmail/patches/patch-aa
index 7d766d086f9..466f8912bba 100644
--- a/mail/xfmail/patches/patch-aa
+++ b/mail/xfmail/patches/patch-aa
@@ -1,9 +1,13 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 11:09:54 agc Exp $
+$NetBSD: patch-aa,v 1.3 2001/02/26 22:32:09 tron Exp $
---- ui/newobjs.h.orig Wed Oct 22 04:31:31 1997
-+++ ui/newobjs.h Fri Jun 26 03:14:01 1998
-@@ -6,3 +6,3 @@
+--- ui/newobjs.h.orig Tue Jan 18 02:38:23 2000
++++ ui/newobjs.h
+@@ -4,7 +4,7 @@
+ #ifndef _NEWOBJS_H
+ #define _NEWOBJS_H
--#include <forms.h>
-+#include <X11/forms.h>
- #include <sys/param.h>
+- #include <forms.h>
++ #include <X11/forms.h>
+ #ifdef MAX
+ #undef MAX
+ #endif
diff --git a/mail/xfmail/patches/patch-ab b/mail/xfmail/patches/patch-ab
index 6a7bdde733b..0f8d8e4558b 100644
--- a/mail/xfmail/patches/patch-ab
+++ b/mail/xfmail/patches/patch-ab
@@ -1,9 +1,13 @@
-$NetBSD: patch-ab,v 1.2 1998/08/07 11:09:55 agc Exp $
+$NetBSD: patch-ab,v 1.3 2001/02/26 22:32:09 tron Exp $
---- ui/umail.h.orig Fri Jun 26 03:19:23 1998
-+++ ui/umail.h Fri Jun 26 03:19:35 1998
-@@ -52,3 +52,3 @@
+--- ui/umail.h.orig Fri Jun 23 21:30:31 2000
++++ ui/umail.h
+@@ -30,7 +30,7 @@
+ #include <pwd.h>
+ #endif
--#include <forms.h>
-+#include <X11/forms.h>
+- #include <forms.h>
++ #include <X11/forms.h>
+
+ #include "version.h"
diff --git a/mail/xfmail/patches/patch-ac b/mail/xfmail/patches/patch-ac
index df9b6b0559e..6a6fff101e8 100644
--- a/mail/xfmail/patches/patch-ac
+++ b/mail/xfmail/patches/patch-ac
@@ -1,9 +1,13 @@
-$NetBSD: patch-ac,v 1.2 1998/08/07 11:09:55 agc Exp $
+$NetBSD: patch-ac,v 1.3 2001/02/26 22:32:09 tron Exp $
---- editor/fl_edit.c.orig Fri Jun 26 03:24:52 1998
-+++ editor/fl_edit.c Fri Jun 26 03:25:10 1998
-@@ -69,3 +69,3 @@
+--- editor/fl_edit.c.orig Sun May 28 00:11:08 2000
++++ editor/fl_edit.c
+@@ -71,7 +71,7 @@
+
+ #include <glib.h>
-#include <forms.h>
+#include <X11/forms.h>
+ #include <umail.h>
#include "fl_edit.h"
+ #include "textbuf.h"
diff --git a/mail/xfmail/patches/patch-ad b/mail/xfmail/patches/patch-ad
index 4ca76d55368..47517184204 100644
--- a/mail/xfmail/patches/patch-ad
+++ b/mail/xfmail/patches/patch-ad
@@ -1,50 +1,40 @@
-$NetBSD: patch-ad,v 1.3 2000/09/07 00:35:48 dmcmahill Exp $
+$NetBSD: patch-ad,v 1.4 2001/02/26 22:32:09 tron Exp $
---- configure.orig Wed Apr 15 03:57:51 1998
-+++ configure Wed Sep 6 20:17:41 2000
-@@ -1809,5 +1809,5 @@
- fi
+--- config/configure.in.orig Wed Nov 8 21:14:50 2000
++++ config/configure.in
+@@ -62,7 +62,7 @@
+ fi])
+ AC_PATH_XTRA
-LIBS="$extra_libraries -L/usr/local/lib $X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS -lm"
-+LIBS="$extra_libraries -L${X11BASE}/lib -Wl,-R${X11BASE}/lib $X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS -lm"
++LIBS="$extra_libraries -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib $X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS -lm"
CPPFLAGS="$extra_includes $CPPFLAGS $X_CFLAGS"
-@@ -2910,7 +2910,7 @@
-
-
--ac_safe=`echo "forms.h" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for forms.h""... $ac_c" 1>&6
--echo "configure:2915: checking for forms.h" >&5
-+ac_safe=`echo "X11/forms.h" | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for X11/forms.h""... $ac_c" 1>&6
-+echo "configure:2915: checking for X11/forms.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2919,5 +2919,5 @@
- #line 2920 "configure"
- #include "confdefs.h"
--#include <forms.h>
-+#include <X11/forms.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-@@ -2943,5 +2943,5 @@
-
- xfmail_error_txt="$xfmail_error_txt
--** Can't find forms.h. Please check that
-+** Can't find X11/forms.h. Please check that
- the libforms library is installed correctly on your system.
- "
-@@ -2949,5 +2949,5 @@
- fi
+ ### Check for the pt library (for SCO, needed for X)
+@@ -83,7 +83,7 @@
+ case "`gcc -v 2>&1`" in *"2.95"*)
+ AC_LANG_CPLUSPLUS
+ AC_CACHE_CHECK(for X headers compilance with ANSI C++,
+- xfmail_cv_permiss, [AC_TRY_COMPILE([#include <forms.h>],
++ xfmail_cv_permiss, [AC_TRY_COMPILE([#include <X11/forms.h>],
+ [int x; x=0], xfmail_cv_permiss=yes, xfmail_cv_permiss=no)])
+ if test x$xfmail_cv_permiss = xno; then
+ CPPFLAGS="-fpermissive $CPPFLAGS"
+@@ -217,14 +217,14 @@
+ AC_CHECK_HEADER(X11/xpm.h,[],XFMAIL_LIB_ERROR(X11/xpm.h,libXpm))
+ dnl Check for xforms headers
+-AC_CHECK_HEADER(forms.h,[],XFMAIL_LIB_ERROR(forms.h,libforms))
-if test $ac_cv_header_forms_h = yes; then
++AC_CHECK_HEADER(X11/forms.h,[],XFMAIL_LIB_ERROR(X11/forms.h,libforms))
+if test $ac_cv_header_X11_forms_h = yes; then
- echo $ac_n "checking xforms library version""... $ac_c" 1>&6
- echo "configure:2954: checking xforms library version" >&5
-@@ -2959,5 +2959,5 @@
+ AC_CACHE_CHECK([xforms library version],xfmail_cv_xfversion,
+ [ cat > conftest.$ac_ext <<EOF
+ #line __oline__ "configure"
#include "confdefs.h"
-#include <forms.h>
+#include <X11/forms.h>
#if ! defined(FL_INCLUDE_VERSION)
%%%old!%%%
+ #else
diff --git a/mail/xfmail/patches/patch-ae b/mail/xfmail/patches/patch-ae
new file mode 100644
index 00000000000..4782f23c231
--- /dev/null
+++ b/mail/xfmail/patches/patch-ae
@@ -0,0 +1,22 @@
+$NetBSD: patch-ae,v 1.1 2001/02/26 22:32:10 tron Exp $
+
+--- mail/fmail.h.orig Thu Nov 2 16:38:04 2000
++++ mail/fmail.h Mon Feb 26 23:20:21 2001
+@@ -121,11 +121,13 @@
+ #include <arpa/inet.h>
+ #include <netdb.h>
+
+- #ifndef HAVE_SYS_NERR
+- #define sys_nerr 65535
+- #else
+- #ifndef sys_nerr
++ #ifndef __NetBSD__
++ #ifndef HAVE_SYS_NERR
++ #define sys_nerr 65535
++ #else
++ #ifndef sys_nerr
+ extern int sys_nerr;
++ #endif
+ #endif
+ #endif
+
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-19 15:18:46 +0000