Date: Fri, 27 Jul 2001 01:28:19 -0700 (PDT) From: John Merryweather Cooper <jmcoopr@webmail.bmi.net> To: FreeBSD-gnats-submit@freebsd.org Cc: gnome@freebsd.org Subject: ports/29261: Bug-fix and feature update for Balsa-1.1.7 Message-ID: <200107270828.f6R8SI003269@johncoop.MSHOME>
next in thread | raw e-mail | index | archive | help
>Number: 29261 >Category: ports >Synopsis: Bug-fix and feature update for Balsa-1.1.7 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Jul 27 01:30:01 PDT 2001 >Closed-Date: >Last-Modified: >Originator: John Merryweather Cooper >Release: FreeBSD 4.3-STABLE i386 >Organization: >Environment: System: FreeBSD johncoop.MSHOME 4.3-STABLE FreeBSD 4.3-STABLE #34: Thu Jul 26 12:36:41 PDT 2001 jmcoopr@johncoop.MSHOME:/usr/obj/usr/src/sys/JOHNCOOP i386 >Description: This proposed update: 1) fixes a zombie thread bug (patch submitted to authors); 2) enables OPENSSL and OPENLDAP support; 3) cleans up make and build 4) deals with PR ports/29112 (this is an improved version of the patch I posted in response to that PR); TODO: 1) Spell checking is broken because of breakage in pspell; 2) Krb5 support not working yet (combination of IMAP instability in Balsa itself and Kerberos weirdness) >How-To-Repeat: N/A >Fix: diff -ruN balsa/Makefile balsa.new/Makefile --- balsa/Makefile Fri Jul 20 08:04:16 2001 +++ balsa.new/Makefile Fri Jul 27 01:17:52 2001 @@ -2,11 +2,12 @@ # Date created: 02 December 1998 # Whom: Glenn Johnson <gljohns@bellsouth.net> # -# $FreeBSD: ports/mail/balsa/Makefile,v 1.47 2001/07/20 12:09:05 sobomax Exp $ +# $FreeBSD: ports/mail/balsa/Makefile,v 1.46 2001/06/19 09:42:54 ade Exp $ # PORTNAME= balsa PORTVERSION= 1.1.7 +PORTREVISION= 1 CATEGORIES= mail gnome MASTER_SITES= http://www.theochem.kth.se/~pawsa/balsa/ \ ftp://ftp.newton.cx/pub/balsa/ @@ -16,25 +17,46 @@ LIB_DEPENDS= esmtp.5:${PORTSDIR}/mail/libesmtp USE_X_PREFIX= yes +USE_GMAKE= yes USE_GNOME= yes USE_LIBTOOL= yes -LIBTOOLFILES= libmutt/configure +USE_AUTOMAKE= yes +RESTRICTED= "Now uses US-only libcipher" +RESTRICTED_FILES= ${PATCHDIR}/patch-src::Makefile.am +LIBTOOLFILES= configure libmutt/configure CONFIGURE_ARGS= --enable-threads \ --enable-gtkhtml \ --disable-more-warnings CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib -lgiconv" - + LIBS="-L${LOCALBASE}/lib" MAN1= balsa.1 +.include <bsd.port.pre.mk> + +.if defined(WITH_BALSA_LDAP) +LIB_DEPENDS+= ldap.1:${PORTSDIR}/net/openldap +CONFIGURE_ARGS+=--enable-ldap +.endif + +.if defined(WITH_BALSA_SSL) +USE_OPENSSL= yes +CONFIGURE_ARGS+=--with-ssl +.endif + 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 - @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ - 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ - s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g ; \ - s|\$\(gnomedatadir\)/gnome|\$\(gnomedatadir\)|g' +.if !defined(USA_RESIDENT) + @${ECHO} "Removing libcipher linkage: non-USA_RESIDENT" + ${RM} -f ${RESTRICTED_FILES} +.endif + +pre-extract: + @${ECHO} + @${ECHO} " Available build options:" + @${ECHO} "=====================================================" + @${ECHO} + @${ECHO} "WITH_BALSA_LDAP -- Build with LDAP addressing support" + @${ECHO} "WITH_BALSA_SSL -- Build with OPENSSL login support" + @${ECHO} "USA_RESIDENT -- links U.S.-only libcipher" + @${ECHO} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff -ruN balsa/files/patch-Makefile.am balsa.new/files/patch-Makefile.am --- balsa/files/patch-Makefile.am Wed Dec 31 16:00:00 1969 +++ balsa.new/files/patch-Makefile.am Wed Jul 18 15:08:22 2001 @@ -0,0 +1,11 @@ +--- Makefile.am Fri Oct 6 12:19:22 2000 ++++ Makefile.am.new Wed Jul 18 15:07:44 2001 +@@ -5,7 +5,7 @@ + pixmapdir = $(gnomedatadir)/pixmaps + pixmap_DATA = gnome-balsa2.png + +-desktopdir = $(gnomedatadir)/gnome/apps/Internet ++desktopdir = $(gnomedatadir)/apps/Internet + desktop_DATA = balsa.desktop + + EXTRA_DIST = \ diff -ruN balsa/files/patch-aa balsa.new/files/patch-aa --- balsa/files/patch-aa Wed Feb 7 04:30:13 2001 +++ balsa.new/files/patch-aa Wed Dec 31 16:00:00 1969 @@ -1,14 +0,0 @@ - -$FreeBSD: ports/mail/balsa/files/patch-aa,v 1.2 2001/02/07 12:30:13 sobomax Exp $ - ---- 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 @@ - - CFLAGS = @CFLAGS@ $(GTKHTML_CFLAGS) $(PIXBUF_FLAGS) - --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_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 -ruN balsa/files/patch-ab balsa.new/files/patch-ab --- balsa/files/patch-ab Tue Sep 19 00:57:34 2000 +++ balsa.new/files/patch-ab Wed Dec 31 16:00:00 1969 @@ -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 -ruN balsa/files/patch-configure.in balsa.new/files/patch-configure.in --- balsa/files/patch-configure.in Wed Dec 31 16:00:00 1969 +++ balsa.new/files/patch-configure.in Thu Jul 26 22:03:41 2001 @@ -0,0 +1,19 @@ +--- configure.in Fri Jul 13 02:09:44 2001 ++++ configure.in.new Thu Jul 26 22:03:00 2001 +@@ -458,12 +458,12 @@ + AC_MSG_RESULT([no]) + fi + dnl ############################################################# +-dnl Link with iconv for charset translation, if not found ++dnl Link with giconv for charset translation, if not found + dnl without library. Needed for libmutt. + dnl ############################################################# +-AC_CHECK_LIB(iconv, iconv_open, , [ +- AC_CHECK_FUNC(iconv_open, , [ +- AC_MSG_ERROR([*** You need iconv for libmutt.]) ++AC_CHECK_LIB(giconv, libiconv_open, , [ ++ AC_CHECK_FUNC(libiconv_open, , [ ++ AC_MSG_ERROR([*** You need giconv for libmutt.]) + ]) + ]) + diff -ruN balsa/files/patch-help-C::Makefile.am balsa.new/files/patch-help-C::Makefile.am --- balsa/files/patch-help-C::Makefile.am Wed Dec 31 16:00:00 1969 +++ balsa.new/files/patch-help-C::Makefile.am Thu Jul 26 12:50:01 2001 @@ -0,0 +1,11 @@ +--- help/C/Makefile.am Wed May 23 01:38:59 2001 ++++ help/C/Makefile.am.new Thu Jul 26 12:48:28 2001 +@@ -6,7 +6,7 @@ + win-config-gen \ + $(SGML_FILES) + +-balsa_helpdir = $(gnomedatadir)/gnome/help/balsa/C ++balsa_helpdir = $(gnomedatadir)/help/balsa/C + + balsa_help_DATA = \ + topic.dat \ diff -ruN balsa/files/patch-libbalsa::pop3.c balsa.new/files/patch-libbalsa::pop3.c --- balsa/files/patch-libbalsa::pop3.c Wed Dec 31 16:00:00 1969 +++ balsa.new/files/patch-libbalsa::pop3.c Tue Jul 24 17:41:20 2001 @@ -0,0 +1,11 @@ +--- libbalsa/pop3.c Fri Jul 13 01:45:04 2001 ++++ libbalsa/pop3.c.new Tue Jul 24 17:40:42 2001 +@@ -507,7 +507,7 @@ + + err = fetch_single_msg(s, msg, i, first_msg, msgs, &num_bytes, + tot_bytes, prog_cb); +- if (fclose (msg) != 0 && err == POP_OK) err = POP_PROCMAIL_ERR; ++ if (pclose (msg) != 0 && err == POP_OK) err = POP_PROCMAIL_ERR; + + if (err != POP_OK) break; /* the 'for' loop */ + if (delete_on_server) delete_msg(s, i); /* ignore errors */ diff -ruN balsa/files/patch-src::Makefile.am balsa.new/files/patch-src::Makefile.am --- balsa/files/patch-src::Makefile.am Wed Dec 31 16:00:00 1969 +++ balsa.new/files/patch-src::Makefile.am Fri Jul 20 15:14:55 2001 @@ -0,0 +1,19 @@ +--- src/Makefile.am Thu Jul 12 00:08:46 2001 ++++ src/Makefile.am.new Fri Jul 20 15:14:11 2001 +@@ -61,7 +61,7 @@ + balsa_SOURCES = $(balsa_BASE_SOURCES) $(balsa_IDL_SOURCES) + + INCLUDES = \ +- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ ++ -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \ + -I$(top_srcdir) \ + -I$(top_srcdir)/libbalsa \ + -I$(top_srcdir)/libmutt \ +@@ -76,6 +76,7 @@ + $(top_builddir)/libinit_balsa/libinit_balsa.a \ + -lpspell \ + -lltdl \ ++ -lcipher \ + @LIBESD_LIB@ \ + $(GNOME_LIBDIR) \ + $(GNOMEUI_LIBS) \ >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200107270828.f6R8SI003269>