summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorsalo <salo@pkgsrc.org>2003-01-16 01:18:39 +0000
committersalo <salo@pkgsrc.org>2003-01-16 01:18:39 +0000
commit5de1afcbc8a934c67b0b44f5138fb7145cc17edc (patch)
tree103012e2a5d84217f72d5594147e16b44d1dc158 /mail
parentba2577a56aa024901e9f33d48b8499462f4c0453 (diff)
downloadpkgsrc-5de1afcbc8a934c67b0b44f5138fb7145cc17edc.tar.gz
Switch to aspell provided libpspell compat library. Bump PKGREVISION.
Diffstat (limited to 'mail')
-rw-r--r--mail/balsa/Makefile6
-rw-r--r--mail/balsa/distinfo4
-rw-r--r--mail/balsa/patches/patch-aa30
3 files changed, 31 insertions, 9 deletions
diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index 9c0d3eaf130..90e7a773ee0 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2002/12/24 06:10:10 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2003/01/16 01:18:39 salo Exp $
#
DISTNAME= balsa-1.4.0
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= mail gnome
MASTER_SITES= http://www.theochem.kth.se/~pawsa/balsa/ \
ftp://ftp.newton.cx/pub/balsa/
@@ -28,6 +28,6 @@ CONFIGURE_ARGS+= --with-ssl=${BUILDLINK_PREFIX.openssl}
.include "../../devel/libproplist/buildlink2.mk"
.include "../../devel/pcre/buildlink2.mk"
.include "../../security/openssl/buildlink2.mk"
-.include "../../textproc/libpspell/buildlink2.mk"
+.include "../../textproc/aspell/buildlink2.mk"
.include "../../x11/gnome-core/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/balsa/distinfo b/mail/balsa/distinfo
index d07f19075bd..1c96512f43f 100644
--- a/mail/balsa/distinfo
+++ b/mail/balsa/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2002/08/21 01:49:09 mjl Exp $
+$NetBSD: distinfo,v 1.8 2003/01/16 01:18:39 salo Exp $
SHA1 (balsa-1.4.0.tar.gz) = 4bdcb46ba8ba662a54235e9374e94b874c8abf65
Size (balsa-1.4.0.tar.gz) = 3324059 bytes
-SHA1 (patch-aa) = 6152666036a9db82d49bcb4402aafa19881fbe92
+SHA1 (patch-aa) = 9f264274e5aa1dca38e0fb3dbd0d2a967cbf41a7
SHA1 (patch-ba) = bafbce2ce3bb2f690e2975c4c072835519310533
diff --git a/mail/balsa/patches/patch-aa b/mail/balsa/patches/patch-aa
index a97cfc8e4b0..a9de9bba771 100644
--- a/mail/balsa/patches/patch-aa
+++ b/mail/balsa/patches/patch-aa
@@ -1,16 +1,38 @@
-$NetBSD: patch-aa,v 1.9 2002/08/21 01:49:10 mjl Exp $
+$NetBSD: patch-aa,v 1.10 2003/01/16 01:18:40 salo Exp $
--- configure.orig Mon Aug 19 20:05:07 2002
-+++ configure Wed Aug 21 02:57:45 2002
-@@ -6888,7 +6888,7 @@
++++ configure Thu Jan 16 01:58:21 2003
+@@ -6881,24 +6881,24 @@
+
+
+
+-echo $ac_n "checking for new_pspell_manager in -lpspell""... $ac_c" 1>&6
+-echo "configure:6886: checking for new_pspell_manager in -lpspell" >&5
+-ac_lib_var=`echo pspell'_'new_pspell_manager | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for new_aspell_speller in -lpspell""... $ac_c" 1>&6
++echo "configure:6886: checking for new_aspell_speller in -lpspell" >&5
++ac_lib_var=`echo pspell'_'new_aspell_speller | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lpspell -lstdc++ -lpspell-modules $LIBS"
-+LIBS="-lpspell -lstdc++ -lpspell-modules $LIBS -lm"
++LIBS="-lpspell -lstdc++ $LIBS -lm"
cat > conftest.$ac_ext <<EOF
#line 6894 "configure"
#include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+-char new_pspell_manager();
++char new_aspell_speller();
+
+ int main() {
+-new_pspell_manager()
++new_aspell_speller()
+ ; return 0; }
+ EOF
+ if { (eval echo configure:6905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
@@ -6922,7 +6922,7 @@
#define $ac_tr_lib 1
EOF