summaryrefslogtreecommitdiff
path: root/mail/xfmail
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2005-03-16 16:17:42 +0000
committerrillig <rillig@pkgsrc.org>2005-03-16 16:17:42 +0000
commit9fa35d5b1d1f4a18c33b5f2edc1321ff2f49f9ed (patch)
treebe9284c83a10ea52d64ebf83eb971dd8f2d32afd /mail/xfmail
parent4a25811ee2535f1a227047b83000a6195e427341 (diff)
downloadpkgsrc-9fa35d5b1d1f4a18c33b5f2edc1321ff2f49f9ed.tar.gz
Added some patches for NetBSD-1.6.2, which lacks the readdir_r function.
Cleaned up the package's Makefile. Approved by wiz.
Diffstat (limited to 'mail/xfmail')
-rw-r--r--mail/xfmail/Makefile10
-rw-r--r--mail/xfmail/distinfo5
-rw-r--r--mail/xfmail/patches/patch-ab16
-rw-r--r--mail/xfmail/patches/patch-ac13
-rw-r--r--mail/xfmail/patches/patch-ad13
5 files changed, 47 insertions, 10 deletions
diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile
index 14380bad0b5..95e41b049b6 100644
--- a/mail/xfmail/Makefile
+++ b/mail/xfmail/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2005/02/10 19:10:21 garbled Exp $
+# $NetBSD: Makefile,v 1.35 2005/03/16 16:17:42 rillig Exp $
DISTNAME= xfmail-1.5.5
-PKGREVISION= 0
CATEGORIES= mail x11
MASTER_SITES= ftp://xfmail.ufies.org/pub/xfmail/release/1.4.7/source/
EXTRACT_SUFX= .tar.bz2
@@ -10,19 +9,13 @@ MAINTAINER= root@garbled.net
HOMEPAGE= http://xfmail.slappy.org/
COMMENT= Xforms based mail application for Unix operating systems
-ONLY_FOR_PLATFORM= NetBSD-*-alpha NetBSD-*-arm NetBSD-*-arm32 \
- NetBSD-*-i386 NetBSD-*-m68k NetBSD-*-mipsel \
- NetBSD-*-ns32k NetBSD-*-sparc NetBSD-*-powerpc
-
RESTRICTED= "Selling this software requires permission of the authors."
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
-AUTOCONF_REQD= 2.13
USE_BUILDLINK3= YES
USE_X11BASE= YES
GNU_CONFIGURE= YES
-CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} X11BASE=${X11BASE}
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xfmail
@@ -34,5 +27,4 @@ post-install:
.include "../../graphics/xpm/buildlink3.mk"
.include "../../x11/xforms/buildlink3.mk"
-.include "../../mk/autoconf.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/xfmail/distinfo b/mail/xfmail/distinfo
index 18deb7b22b1..3339005f258 100644
--- a/mail/xfmail/distinfo
+++ b/mail/xfmail/distinfo
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.6 2005/02/24 09:59:30 agc Exp $
+$NetBSD: distinfo,v 1.7 2005/03/16 16:17:42 rillig Exp $
SHA1 (xfmail-1.5.5.tar.bz2) = 7a98486d1f8cce956efaf37d9540369d5f327401
RMD160 (xfmail-1.5.5.tar.bz2) = bf3e866d6fa37b7b9959c532b1f4b82fb57eb307
Size (xfmail-1.5.5.tar.bz2) = 1185913 bytes
SHA1 (patch-aa) = 975551cddd979b39d423e32cb353f5ed48cb600a
+SHA1 (patch-ab) = 17de1abd320f38e38a72194531d358061cbd2eb4
+SHA1 (patch-ac) = f04aad8c7d44183cf16743c31c1779b42da500a1
+SHA1 (patch-ad) = 91d92fb76b5ecf9c07295b942a34628ce212ae3d
diff --git a/mail/xfmail/patches/patch-ab b/mail/xfmail/patches/patch-ab
new file mode 100644
index 00000000000..719c381fc86
--- /dev/null
+++ b/mail/xfmail/patches/patch-ab
@@ -0,0 +1,16 @@
+$NetBSD: patch-ab,v 1.5 2005/03/16 16:17:42 rillig Exp $
+
+--- src/mail/addrbookdb.cpp.orig Fri Jan 2 04:54:01 2004
++++ src/mail/addrbookdb.cpp Wed Mar 16 14:13:41 2005
+@@ -174,7 +174,11 @@ AddressBookDB::Load(const char *configdi
+ dir = opendir(configdir);
+ if (dir == NULL)
+ return false;
++#ifdef HAVE_READDIR_R
+ while (readdir_r(dir, &entry, &result) == 0 && result != NULL) {
++#else
++ while ( (result = readdir(dir)) != NULL) {
++#endif
+ if (NAMLEN(result) > 8 && strncmp(result->d_name, ".xfbook.", 8) == 0) {
+ strncpy(buf, result->d_name, NAMLEN(result));
+ buf[NAMLEN(result)] = '\0';
diff --git a/mail/xfmail/patches/patch-ac b/mail/xfmail/patches/patch-ac
new file mode 100644
index 00000000000..a11c8112514
--- /dev/null
+++ b/mail/xfmail/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.5 2005/03/16 16:17:42 rillig Exp $
+
+--- configure.orig Sun Jan 18 19:01:45 2004
++++ configure Wed Mar 16 16:52:31 2005
+@@ -27214,7 +27214,7 @@ done
+
+
+
+-for ac_func in regcomp madvise vsnprintf snprintf flock lockf strchr memcpy memmove strtoul strerror sysconf sys_nerr utimes setlocale unsetenv
++for ac_func in regcomp madvise vsnprintf snprintf flock lockf strchr memcpy memmove strtoul strerror sysconf sys_nerr utimes setlocale unsetenv readdir_r
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ echo "$as_me:$LINENO: checking for $ac_func" >&5
diff --git a/mail/xfmail/patches/patch-ad b/mail/xfmail/patches/patch-ad
new file mode 100644
index 00000000000..bf8e58f8349
--- /dev/null
+++ b/mail/xfmail/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.7 2005/03/16 16:17:42 rillig Exp $
+
+--- src/include/config.h.in.orig Sun Jan 18 19:01:41 2004
++++ src/include/config.h.in Wed Mar 16 16:59:26 2005
+@@ -115,6 +115,8 @@
+ /* Define to 1 if you have the `RAND_status' function. */
+ #undef HAVE_RAND_STATUS
+
++#undef HAVE_READDIR_R
++
+ /* Define to 1 if you have the `regcomp' function. */
+ #undef HAVE_REGCOMP
+