diff options
Diffstat (limited to 'mail/balsa')
-rw-r--r-- | mail/balsa/Makefile | 22 | ||||
-rw-r--r-- | mail/balsa/PLIST | 93 | ||||
-rw-r--r-- | mail/balsa/distinfo | 11 | ||||
-rw-r--r-- | mail/balsa/patches/patch-aa | 38 | ||||
-rw-r--r-- | mail/balsa/patches/patch-ab | 14 | ||||
-rw-r--r-- | mail/balsa/patches/patch-ac | 12 | ||||
-rw-r--r-- | mail/balsa/patches/patch-ba | 13 |
7 files changed, 104 insertions, 99 deletions
diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile index bbb649dac56..1c06a75570c 100644 --- a/mail/balsa/Makefile +++ b/mail/balsa/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.13 2002/01/24 13:59:57 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2002/02/01 17:02:18 mjl Exp $ # -DISTNAME= balsa-1.0.0 +DISTNAME= balsa-1.2.4 CATEGORIES= mail gnome MASTER_SITES= http://www.theochem.kth.se/~pawsa/balsa/ \ ftp://ftp.newton.cx/pub/balsa/ @@ -10,19 +10,31 @@ MAINTAINER= rh@netbsd.org HOMEPAGE= http://www.balsa.net/ COMMENT= GNOME EMail client +DEPENDS+= glib>=1.2.1:../../devel/glib +DEPENDS+= imlib>=1.9.2:../../graphics/imlib +DEPENDS+= gnome-libs>=1.2.1:../../x11/gnome-libs +DEPENDS+= gnome-print>=0.25:../../print/gnome-print +DEPENDS+= libpspell>=0.8.3:../../textproc/libpspell +DEPENDS+= pcre-[0-9]*:../../devel/pcre +DEPENDS+= gtkhtml-[0-9]*:../../www/gtkhtml +DEPENDS+= libiconv-*:../../converters/libiconv + GNU_CONFIGURE= yes USE_LIBTOOL= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig -CONFIGURE_ARGS+= --disable-more-warnings +CONFIGURE_ARGS+= --disable-more-warnings --without-esmtp \ + --enable-pcre --disable-threads CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR} USE_BUILDLINK_ONLY= yes -USE_PTHREAD= native pth +# USE_PTHREAD= native pth +.include "../../converters/libiconv/buildlink.mk" .include "../../devel/libtool/buildlink.mk" .include "../../devel/libproplist/buildlink.mk" +.include "../../devel/pcre/buildlink.mk" .include "../../textproc/libpspell/buildlink.mk" .include "../../x11/gnome-core/buildlink.mk" -.include "../../mk/pthread.buildlink.mk" +# .include "../../mk/pthread.buildlink.mk" .include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/balsa/PLIST b/mail/balsa/PLIST index 512325af1dc..6a1fe55715d 100644 --- a/mail/balsa/PLIST +++ b/mail/balsa/PLIST @@ -1,10 +1,9 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:59:39 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/01 17:02:18 mjl Exp $ bin/balsa etc/sound/events/balsa.soundlist etc/sound/events/email.soundlist man/man1/balsa.1 share/gnome/apps/Internet/balsa.desktop -share/gnome/help/balsa/C/authours.html share/gnome/help/balsa/C/common-tasks.html share/gnome/help/balsa/C/images/druid-start.png share/gnome/help/balsa/C/images/example-alias.png @@ -14,18 +13,6 @@ share/gnome/help/balsa/C/index.html share/gnome/help/balsa/C/its-not-working.html share/gnome/help/balsa/C/ln7.html share/gnome/help/balsa/C/win-composer.html -share/gnome/help/balsa/C/win-config-0.html -share/gnome/help/balsa/C/win-config-1.html -share/gnome/help/balsa/C/win-config-10.html -share/gnome/help/balsa/C/win-config-2.html -share/gnome/help/balsa/C/win-config-3.html -share/gnome/help/balsa/C/win-config-4.html -share/gnome/help/balsa/C/win-config-5.html -share/gnome/help/balsa/C/win-config-6.html -share/gnome/help/balsa/C/win-config-7.html -share/gnome/help/balsa/C/win-config-8.html -share/gnome/help/balsa/C/win-config-9.html -share/gnome/help/balsa/C/win-config.html share/gnome/help/balsa/C/win-main.html share/gnome/help/balsa/C/images/address-book-ldap.png share/gnome/help/balsa/C/images/address-book-modify.png @@ -53,37 +40,53 @@ share/gnome/help/balsa/C/stylesheet-images/toc-plus.gif share/gnome/help/balsa/C/stylesheet-images/up.gif share/gnome/help/balsa/C/stylesheet-images/warning.gif share/gnome/help/balsa/C/topic.dat -share/locale/ca/LC_MESSAGES/balsa.mo -share/locale/da/LC_MESSAGES/balsa.mo -share/locale/de/LC_MESSAGES/balsa.mo -share/locale/el/LC_MESSAGES/balsa.mo -share/locale/en_GB/LC_MESSAGES/balsa.mo -share/locale/es/LC_MESSAGES/balsa.mo -share/locale/es_ES/LC_MESSAGES/balsa.mo -share/locale/et/LC_MESSAGES/balsa.mo -share/locale/fi/LC_MESSAGES/balsa.mo -share/locale/fr/LC_MESSAGES/balsa.mo -share/locale/ga/LC_MESSAGES/balsa.mo -share/locale/hu/LC_MESSAGES/balsa.mo -share/locale/it/LC_MESSAGES/balsa.mo -share/locale/ja/LC_MESSAGES/balsa.mo -share/locale/ko/LC_MESSAGES/balsa.mo -share/locale/lt/LC_MESSAGES/balsa.mo -share/locale/nl/LC_MESSAGES/balsa.mo -share/locale/nn/LC_MESSAGES/balsa.mo -share/locale/no/LC_MESSAGES/balsa.mo -share/locale/pl/LC_MESSAGES/balsa.mo -share/locale/pt/LC_MESSAGES/balsa.mo -share/locale/pt_BR/LC_MESSAGES/balsa.mo -share/locale/ro/LC_MESSAGES/balsa.mo -share/locale/ru/LC_MESSAGES/balsa.mo -share/locale/sk/LC_MESSAGES/balsa.mo -share/locale/sl/LC_MESSAGES/balsa.mo -share/locale/sv/LC_MESSAGES/balsa.mo -share/locale/tr/LC_MESSAGES/balsa.mo -share/locale/uk/LC_MESSAGES/balsa.mo -share/locale/wa/LC_MESSAGES/balsa.mo -share/locale/zh_CN.GB2312/LC_MESSAGES/balsa.mo +share/gnome/help/balsa/C/authors.html +share/gnome/help/balsa/C/folder-config.html +share/gnome/help/balsa/C/identities.html +share/gnome/help/balsa/C/mbox-formats.html +share/gnome/help/balsa/C/preferences-0.html +share/gnome/help/balsa/C/preferences-1.html +share/gnome/help/balsa/C/preferences-2.html +share/gnome/help/balsa/C/preferences-3.html +share/gnome/help/balsa/C/preferences-4.html +share/gnome/help/balsa/C/toolbars.html +share/gnome/help/balsa/C/preferences-5.html +share/gnome/help/balsa/C/preferences-6.html +share/gnome/help/balsa/C/preferences.html +share/gnome/help/balsa/C/win-message.html +${PKGLOCALEDIR}/locale/az/LC_MESSAGES/balsa.mo +${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/balsa.mo +${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/balsa.mo +${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/balsa.mo +${PKGLOCALEDIR}/locale/da/LC_MESSAGES/balsa.mo +${PKGLOCALEDIR}/locale/de/LC_MESSAGES/balsa.mo +${PKGLOCALEDIR}/locale/el/LC_MESSAGES/balsa.mo +${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/balsa.mo +${PKGLOCALEDIR}/locale/es/LC_MESSAGES/balsa.mo +${PKGLOCALEDIR}/locale/et/LC_MESSAGES/balsa.mo +${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/balsa.mo +${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/balsa.mo +${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/balsa.mo +${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/balsa.mo +${PKGLOCALEDIR}/locale/it/LC_MESSAGES/balsa.mo +${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/balsa.mo +${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/balsa.mo +${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/balsa.mo +${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/balsa.mo +${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/balsa.mo +${PKGLOCALEDIR}/locale/no/LC_MESSAGES/balsa.mo +${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/balsa.mo +${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/balsa.mo +${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/balsa.mo +${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/balsa.mo +${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/balsa.mo +${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/balsa.mo +${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/balsa.mo +${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/balsa.mo +${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/balsa.mo +${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/balsa.mo +${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/balsa.mo +${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/balsa.mo share/pixmaps/balsa/attachment.png share/pixmaps/balsa/balsa-logo.png share/pixmaps/balsa/balsa-top.png diff --git a/mail/balsa/distinfo b/mail/balsa/distinfo index 0c25d00c94a..38eeb118e00 100644 --- a/mail/balsa/distinfo +++ b/mail/balsa/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.4 2002/01/24 13:59:57 wiz Exp $ +$NetBSD: distinfo,v 1.5 2002/02/01 17:02:18 mjl Exp $ -SHA1 (balsa-1.0.0.tar.gz) = 84b60f40a3ede9bdf8537b56ccb7d8fadb9312f9 -Size (balsa-1.0.0.tar.gz) = 1964922 bytes -SHA1 (patch-aa) = df7b6d09f61dc90919b62ca2ce4e24238f576638 -SHA1 (patch-ab) = 6ff24736e7b69ccb0bdcb3c2ae6d8d5f3ffc1e8f -SHA1 (patch-ac) = 5aba74fa2013599f7a575dfac8833160740b1d78 +SHA1 (balsa-1.2.4.tar.gz) = ece7cf1a16df48ddb18d98dbfbb44913f52d69ce +Size (balsa-1.2.4.tar.gz) = 2786340 bytes +SHA1 (patch-aa) = 11a5896f2e7087ed85218f420223c30afb5a9921 +SHA1 (patch-ba) = bafbce2ce3bb2f690e2975c4c072835519310533 diff --git a/mail/balsa/patches/patch-aa b/mail/balsa/patches/patch-aa index 118d59f04ce..d6b27315a36 100644 --- a/mail/balsa/patches/patch-aa +++ b/mail/balsa/patches/patch-aa @@ -1,17 +1,17 @@ -$NetBSD: patch-aa,v 1.6 2002/01/24 13:59:57 wiz Exp $ +$NetBSD: patch-aa,v 1.7 2002/02/01 17:02:18 mjl Exp $ ---- configure.orig Wed Oct 18 11:06:28 2000 -+++ configure -@@ -3436,7 +3436,7 @@ +--- configure.orig Sun Jan 20 12:45:14 2002 ++++ configure Fri Feb 1 14:12:02 2002 +@@ -6593,7 +6593,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" --LIBS="-lpspell $LIBS" -+LIBS="-lpspell $LIBS -lm" +-LIBS="-lpspell -lstdc++ -lpspell-modules $LIBS" ++LIBS="-lpspell -lstdc++ -lpspell-modules $LIBS -lm" cat > conftest.$ac_ext <<EOF - #line 3442 "configure" + #line 6599 "configure" #include "confdefs.h" -@@ -5018,7 +5018,7 @@ +@@ -8131,7 +8131,7 @@ cat conftest.$ac_ext >&5 rm -rf conftest* CATOBJEXT=.mo @@ -20,12 +20,16 @@ $NetBSD: patch-aa,v 1.6 2002/01/24 13:59:57 wiz Exp $ fi rm -f conftest* INSTOBJEXT=.mo -@@ -5280,7 +5280,7 @@ - USE_INCLUDED_LIBINTL=yes - CATOBJEXT=.cat - INSTOBJEXT=.cat -- DATADIRNAME=lib -+ DATADIRNAME=${PKGLOCALEDIR} - INTLDEPS='$(top_builddir)/intl/libintl.a' - INTLLIBS=$INTLDEPS - LIBS=`echo $LIBS | sed -e 's/-lintl//'` +@@ -9137,10 +9137,10 @@ + /* 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 iconv_open(); ++char libiconv_open(); + + int main() { +-iconv_open() ++libiconv_open() + ; return 0; } + EOF + if { (eval echo configure:9147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then diff --git a/mail/balsa/patches/patch-ab b/mail/balsa/patches/patch-ab deleted file mode 100644 index 9e08f484260..00000000000 --- a/mail/balsa/patches/patch-ab +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ab,v 1.5 2000/10/22 09:33:24 rh Exp $ - ---- libbalsa/send.c.orig Fri Oct 6 20:20:20 2000 -+++ libbalsa/send.c -@@ -24,6 +24,9 @@ - - /* #include <radlib.h> */ - /* FreeBSD 4.1-STABLE FreeBSD 4.1-STABLE */ -+#include <sys/types.h> -+#include <sys/socket.h> -+#include <netinet/in.h> - #include <arpa/inet.h> - #include <netdb.h> - diff --git a/mail/balsa/patches/patch-ac b/mail/balsa/patches/patch-ac deleted file mode 100644 index 70691c57767..00000000000 --- a/mail/balsa/patches/patch-ac +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2002/01/15 01:05:57 wiz Exp $ - ---- src/spell-check.c.orig Fri Oct 6 19:46:38 2000 -+++ src/spell-check.c -@@ -23,6 +23,7 @@ - - #include <ctype.h> - #include <gnome.h> -+#define USE_ORIGINAL_MANAGER_FUNCS - #include <pspell/pspell.h> - #include <stdio.h> - diff --git a/mail/balsa/patches/patch-ba b/mail/balsa/patches/patch-ba new file mode 100644 index 00000000000..76ba2be465b --- /dev/null +++ b/mail/balsa/patches/patch-ba @@ -0,0 +1,13 @@ +$NetBSD: patch-ba,v 1.1 2002/02/01 17:02:18 mjl Exp $ + +--- libbalsa/send.c.orig Fri Feb 1 17:13:19 2002 ++++ libbalsa/send.c Fri Feb 1 17:13:35 2002 +@@ -937,7 +937,7 @@ + pthread_detach(send_mail); + } + #else /*non-threaded code */ +- ++ } + send_message_info=send_message_info_new(outbox); + balsa_send_message_real(send_message_info); + #endif |