diff options
author | Maxim Sobolev <sobomax@FreeBSD.org> | 2001-09-19 09:34:21 +0000 |
---|---|---|
committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2001-09-19 09:34:21 +0000 |
commit | e0cd2c976b267790091a9b28192501a3ae760668 (patch) | |
tree | c8a805ea41f8a1a18e1e6bf9950b532680e81679 /mail/balsa | |
parent | - Update to version 3.3.0 (diff) |
Update to 1.2.0.
PR: 30662
Submitted by: John Merryweather Cooper <john_m_cooper@yahoo.com>
Notes
Notes:
svn path=/head/; revision=47982
Diffstat (limited to 'mail/balsa')
-rw-r--r-- | mail/balsa/Makefile | 18 | ||||
-rw-r--r-- | mail/balsa/distinfo | 2 | ||||
-rw-r--r-- | mail/balsa/files/patch-aa | 15 | ||||
-rw-r--r-- | mail/balsa/files/patch-ab | 13 | ||||
-rw-r--r-- | mail/balsa/files/patch-libmutt::rfc2047.c | 11 | ||||
-rw-r--r-- | mail/balsa/pkg-plist | 5 |
6 files changed, 34 insertions, 30 deletions
diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile index 10599f0a74e6..a63200e267a5 100644 --- a/mail/balsa/Makefile +++ b/mail/balsa/Makefile @@ -6,22 +6,29 @@ # PORTNAME= balsa -PORTVERSION= 1.1.7 +PORTVERSION= 1.2.0 CATEGORIES= mail gnome MASTER_SITES= http://www.theochem.kth.se/~pawsa/balsa/ \ ftp://ftp.newton.cx/pub/balsa/ MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= esmtp.5:${PORTSDIR}/mail/libesmtp +LIB_DEPENDS= esmtp.5:${PORTSDIR}/mail/libesmtp \ + ldap.2:${PORTSDIR}/net/openldap2 \ + aspell.11:${PORTSDIR}/textproc/aspell \ + pcre.0:${PORTSDIR}/devel/pcre +RUN_DEPENDS= ${LOCALBASE}/bin/ispell:${PORTSDIR}/textproc/ispell USE_X_PREFIX= yes USE_GNOME= yes USE_LIBTOOL= yes +USE_OPENSSL= yes LIBTOOLFILES= libmutt/configure CONFIGURE_ARGS= --enable-threads \ --enable-gtkhtml \ - --disable-more-warnings + --enable-ldap \ + --disable-more-warnings \ + --with-ssl CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib -lgiconv" @@ -30,8 +37,9 @@ MAN1= balsa.1 pre-patch: @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ - s|-liconv|-lgiconv|g ; s|iconv_open|libiconv_open|g' \ - ${WRKSRC}/configure + s|-liconv|-lgiconv|g ; s|iconv_open|libiconv_open|g ; \ + s|([^g])iconv.h|\1giconv.h|g' \ + ${WRKSRC}/configure ${WRKSRC}/libmutt/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g ; \ diff --git a/mail/balsa/distinfo b/mail/balsa/distinfo index c417223aab5e..1c5a24da68d5 100644 --- a/mail/balsa/distinfo +++ b/mail/balsa/distinfo @@ -1 +1 @@ -MD5 (balsa-1.1.7.tar.gz) = 9a6cda3e70a8877308a4ff55da8dcec9 +MD5 (balsa-1.2.0.tar.gz) = 8936f2f1ac6356c76cf29b70e1bf8a32 diff --git a/mail/balsa/files/patch-aa b/mail/balsa/files/patch-aa index 89c2b3ebf998..3c8cfe144f46 100644 --- a/mail/balsa/files/patch-aa +++ b/mail/balsa/files/patch-aa @@ -1,14 +1,11 @@ - -$FreeBSD$ - ---- src/Makefile.in.orig Wed Feb 7 13:35:25 2001 -+++ src/Makefile.in Wed Feb 7 13:36:25 2001 -@@ -152,7 +152,7 @@ +--- src/Makefile.in Tue Sep 18 07:25:22 2001 ++++ src/Makefile.in.new Tue Sep 18 16:06:40 2001 +@@ -149,7 +149,7 @@ - CFLAGS = @CFLAGS@ $(GTKHTML_CFLAGS) $(PIXBUF_FLAGS) + CFLAGS = @CFLAGS@ $(PCRE_CFLAGS) --balsa_LDADD = $(top_builddir)/libbalsa/libbalsa.a $(top_builddir)/libmutt/imap/libimap.a $(top_builddir)/libmutt/libmutt.a $(top_builddir)/libinit_balsa/libinit_balsa.a -lpspell -lltdl @LIBESD_LIB@ $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS) $(PTHREAD_LIB) $(GNOME_PRINT_LIBS) $(GTKHTML_LIBS) $(PIXBUF_LIBS) -+balsa_LDADD = $(top_builddir)/libbalsa/libbalsa.a $(top_builddir)/libmutt/imap/libimap.a $(top_builddir)/libmutt/libmutt.a $(top_builddir)/libinit_balsa/libinit_balsa.a -lpspell @LIBESD_LIB@ $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS) $(PTHREAD_LIB) $(GNOME_PRINT_LIBS) $(GTKHTML_LIBS) $(PIXBUF_LIBS) +-balsa_LDADD = $(top_builddir)/libbalsa/libbalsa.a $(top_builddir)/libmutt/imap/libimap.a $(top_builddir)/libmutt/libmutt.a $(top_builddir)/libinit_balsa/libinit_balsa.a -lpspell -lltdl $(INTLLIBS) $(PCRE_LIBS) $(PTHREAD_LIB) ++balsa_LDADD = $(top_builddir)/libbalsa/libbalsa.a $(top_builddir)/libmutt/imap/libimap.a $(top_builddir)/libmutt/libmutt.a $(top_builddir)/libinit_balsa/libinit_balsa.a -lpspell $(INTLLIBS) $(PCRE_LIBS) $(PTHREAD_LIB) balsa_DEPENDENCIES = $(top_builddir)/libbalsa/libbalsa.a $(top_builddir)/libmutt/libmutt.a $(top_builddir)/libmutt/imap/libimap.a $(top_builddir)/libmutt/libmutt.a $(top_builddir)/libinit_balsa/libinit_balsa.a diff --git a/mail/balsa/files/patch-ab b/mail/balsa/files/patch-ab deleted file mode 100644 index 8a4be78e9731..000000000000 --- a/mail/balsa/files/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ ---- configure 2000/09/19 07:22:11 1.1 -+++ configure 2000/09/19 07:29:28 -@@ -3480,8 +3480,8 @@ - fi - - --LDFLAGS="$balsa_save_LDFLAGS" --LIBS="$balsa_save_LIBS" -+#LDFLAGS="$balsa_save_LDFLAGS" -+#LIBS="$balsa_save_LIBS" - - for ac_hdr in libgnomeui/gnome-window-icon.h - do diff --git a/mail/balsa/files/patch-libmutt::rfc2047.c b/mail/balsa/files/patch-libmutt::rfc2047.c new file mode 100644 index 000000000000..feb6b4e51de0 --- /dev/null +++ b/mail/balsa/files/patch-libmutt::rfc2047.c @@ -0,0 +1,11 @@ +--- libmutt/rfc2047.c Wed Jul 18 10:47:01 2001 ++++ libmutt/rfc2047.c.new Tue Sep 18 16:18:18 2001 +@@ -24,7 +24,7 @@ + + #include <ctype.h> + #include <errno.h> +-#include <iconv.h> ++#include <giconv.h> + #include <stdio.h> + #include <stdlib.h> + #include <string.h> diff --git a/mail/balsa/pkg-plist b/mail/balsa/pkg-plist index c06e175b2748..676458d08418 100644 --- a/mail/balsa/pkg-plist +++ b/mail/balsa/pkg-plist @@ -4,9 +4,9 @@ etc/sound/events/email.soundlist 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/folder-config.html share/gnome/help/balsa/C/getting-started.html share/gnome/help/balsa/C/glossary.html -share/gnome/help/balsa/C/folder-config.html share/gnome/help/balsa/C/images/address-book-ldap.png share/gnome/help/balsa/C/images/address-book-modify.png share/gnome/help/balsa/C/images/address-book-start.png @@ -25,6 +25,7 @@ share/gnome/help/balsa/C/images/spell-check.png 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/mbox-formats.html share/gnome/help/balsa/C/stylesheet-images/caution.gif share/gnome/help/balsa/C/stylesheet-images/home.gif share/gnome/help/balsa/C/stylesheet-images/important.gif @@ -92,7 +93,7 @@ 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/locale/zh_CN/LC_MESSAGES/balsa.mo @dirrm share/gnome/sounds/balsa @dirrm share/gnome/pixmaps/balsa @dirrm share/gnome/help/balsa/C/stylesheet-images |