Date: Mon, 17 Dec 2001 02:26:22 -0800 (PST) From: John Merryweather Cooper <john_m_cooper@yahoo.com> To: FreeBSD-gnats-submit@freebsd.org Cc: sobomax@freebsd.org, gnome@freebsd.org Subject: ports/32927: [PATCH] Upgrade balsa to balsa-1.3.0 Message-ID: <20011217102622.5517415503@johncoop.MSHOME>
next in thread | raw e-mail | index | archive | help
>Number: 32927 >Category: ports >Synopsis: [PATCH] Upgrade balsa to balsa-1.3.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Dec 17 02:30:00 PST 2001 >Closed-Date: >Last-Modified: >Originator: John Merryweather Cooper >Release: FreeBSD 4.4-STABLE i386 >Organization: >Environment: System: FreeBSD johncoop.MSHOME 4.4-STABLE FreeBSD 4.4-STABLE #30: Sun Dec 16 02:53:49 PST 2001 jmcoopr@johncoop.MSHOME:/usr/obj/usr/src/sys/JOHNCOOP i386 >Description: Balsa 1.3.0 was released yesterday. The focus is on UI improvements. Also, the tarball is now a bzip2 one, the help files have been tweaked and ldap addressbook processing improved. >How-To-Repeat: N/A >Fix: # Files that have changed: # 'balsa.new/Makefile' | 0 # 'balsa.new/distinfo' | 0 # 'balsa.new/files/patch-configure' | 0 # 'balsa.new/files/patch-libbalsa::address-book-ldap.c' | 0 # 'balsa.new/pkg-plist' | 0 # ./Makefile | 16 +-- # ./distinfo | 2 # ./files/patch-configure | 17 +++ # ./files/patch-libbalsa::address-book-ldap.c | 9 + # ./pkg-plist | 83 ++++++++++-------- # 10 files changed, 85 insertions(+), 42 deletions(-) # The patch: # This is a patch for balsa to update it to balsa.new # # To apply this patch: # STEP 1: Chdir to the source directory. # STEP 2: Run the 'applypatch' program with this patch file as input. # # If you do not have 'applypatch', it is part of the 'makepatch' package # that you can fetch from the Comprehensive Perl Archive Network: # http://www.perl.com/CPAN/authors/Johan_Vromans/makepatch-x.y.tar.gz # In the above URL, 'x' should be 2 or higher. # # To apply this patch without the use of 'applypatch': # STEP 1: Chdir to the source directory. # If you have a decent Bourne-type shell: # STEP 2: Run the shell with this file as input. # If you don't have such a shell, you may need to manually create # the files as shown below. # STEP 3: Run the 'patch' program with this file as input. # # These are the commands needed to create/delete files/directories: # touch 'files/patch-configure' chmod 0644 'files/patch-configure' touch 'files/patch-libbalsa::address-book-ldap.c' chmod 0644 'files/patch-libbalsa::address-book-ldap.c' # # This command terminates the shell and need not be executed manually. exit # #### End of Preamble #### #### Patch data follows #### diff -u 'balsa/Makefile' 'balsa.new/Makefile' Index: ./Makefile --- ./Makefile Wed Nov 7 16:21:56 2001 +++ ./Makefile Sun Dec 16 12:48:40 2001 @@ -2,39 +2,41 @@ # Date created: 02 December 1998 # Whom: Glenn Johnson <gljohns@bellsouth.net> # -# $FreeBSD: ports/mail/balsa/Makefile,v 1.49 2001/11/07 08:51:15 sobomax Exp $ +# $FreeBSD$ # PORTNAME= balsa -PORTVERSION= 1.2.3 +PORTVERSION= 1.3.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 \ - ldap.2:${PORTSDIR}/net/openldap2 \ +LIB_DEPENDS= ldap.2:${PORTSDIR}/net/openldap2 \ aspell.11:${PORTSDIR}/textproc/aspell \ pcre.0:${PORTSDIR}/devel/pcre -RUN_DEPENDS= ${LOCALBASE}/bin/ispell:${PORTSDIR}/textproc/ispell +BUILD_DEPENDS= ${LOCALBASE}/bin/libesmtp-config:${PORTSDIR}/mail/libesmtp +RUN_DEPENDS= ${LOCALBASE}/bin/ispell:${PORTSDIR}/textproc/ispell \ + ${LOCALBASE}/bin/libesmtp-config:${PORTSDIR}/mail/libesmtp USE_X_PREFIX= yes USE_GNOME= yes USE_LIBTOOL= yes USE_OPENSSL= yes +USE_BZIP2= yes LIBTOOLFILES= libmutt/configure CONFIGURE_ARGS= --enable-threads \ --enable-gtkhtml \ --enable-ldap \ --disable-more-warnings \ --with-ssl -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LIBS="-L${LOCALBASE}/lib -lgiconv" MAN1= balsa.1 -pre-patch: +post-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 ; \ diff -u 'balsa/distinfo' 'balsa.new/distinfo' Index: ./distinfo --- ./distinfo Wed Nov 7 16:21:56 2001 +++ ./distinfo Sun Dec 16 12:17:22 2001 @@ -1 +1 @@ -MD5 (balsa-1.2.3.tar.gz) = 10fe350475b92863da6704a84be6709e +MD5 (balsa-1.3.0.tar.bz2) = 7ccfffa3d4a4df485bb9e483f2a1a98e diff -u /dev/null 'balsa.new/files/patch-configure' Index: ./files/patch-configure --- ./files/patch-configure Wed Dec 31 16:00:00 1969 +++ ./files/patch-configure Sun Dec 16 12:53:14 2001 @@ -0,0 +1,20 @@ +--- configure Fri Dec 14 06:13:21 2001 ++++ configure.new Sun Dec 16 12:52:33 2001 +@@ -8869,7 +8869,7 @@ + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" +-LIBS="-lldap -llber -lresolv $LIBS" ++LIBS="-lldap -llber $LIBS" + cat > conftest.$ac_ext <<EOF + #line 8875 "configure" + #include "confdefs.h" +@@ -8900,7 +8900,7 @@ + cat >> confdefs.h <<\EOF + #define ENABLE_LDAP 1 + EOF +- LIBS="-lldap -llber -lresolv $LIBS" ++ LIBS="-lldap -llber $LIBS" + else + echo "$ac_t""no" 1>&6 + { echo "configure: error: *** You enabled LDAP but ldap library is not found." 1>&2; exit 1; } diff -u /dev/null 'balsa.new/files/patch-libbalsa::address-book-ldap.c' Index: ./files/patch-libbalsa::address-book-ldap.c --- ./files/patch-libbalsa::address-book-ldap.c Wed Dec 31 16:00:00 1969 +++ ./files/patch-libbalsa::address-book-ldap.c Sun Dec 16 13:02:12 2001 @@ -0,0 +1,11 @@ +--- libbalsa/address-book-ldap.c Mon Nov 19 03:41:21 2001 ++++ libbalsa/address-book-ldap.c.new Sun Dec 16 12:59:34 2001 +@@ -31,7 +31,7 @@ + #include <sys/time.h> + #include <lber.h> + #include <ldap.h> +-#include <iconv.h> ++#include <giconv.h> + + #include "address-book.h" + #include "address-book-ldap.h" diff -u 'balsa/pkg-plist' 'balsa.new/pkg-plist' Index: ./pkg-plist --- ./pkg-plist Wed Nov 7 16:21:56 2001 +++ ./pkg-plist Mon Dec 17 02:13:45 2001 @@ -1,12 +1,49 @@ bin/balsa +share/locale/az/LC_MESSAGES/balsa.mo +share/locale/bg/LC_MESSAGES/balsa.mo +share/locale/ca/LC_MESSAGES/balsa.mo +share/locale/cs/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/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/LC_MESSAGES/balsa.mo +share/locale/zh_TW/LC_MESSAGES/balsa.mo etc/sound/events/balsa.soundlist etc/sound/events/email.soundlist share/gnome/apps/Internet/balsa.desktop +share/gnome/help/balsa/C/ab-conf.html +share/gnome/help/balsa/C/authors.html 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/identities.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 @@ -24,8 +61,17 @@ 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/ln28.html share/gnome/help/balsa/C/ln7.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/preferences-5.html +share/gnome/help/balsa/C/preferences-6.html +share/gnome/help/balsa/C/preferences.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 @@ -38,6 +84,7 @@ 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/toolbars.html share/gnome/help/balsa/C/topic.dat share/gnome/help/balsa/C/win-composer.html share/gnome/help/balsa/C/win-config-0.html @@ -53,6 +100,7 @@ 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/win-message.html share/gnome/pixmaps/balsa/attachment.png share/gnome/pixmaps/balsa/balsa-logo.png share/gnome/pixmaps/balsa/balsa-top.png @@ -62,41 +110,8 @@ share/gnome/pixmaps/gnome-balsa2.png share/gnome/sounds/balsa/newmail.wav share/gnome/sounds/balsa/startup.wav -share/locale/az/LC_MESSAGES/balsa.mo -share/locale/bg/LC_MESSAGES/balsa.mo -share/locale/ca/LC_MESSAGES/balsa.mo -share/locale/cs/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/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/LC_MESSAGES/balsa.mo -@dirrm share/gnome/sounds/balsa @dirrm share/gnome/pixmaps/balsa +@dirrm share/gnome/sounds/balsa @dirrm share/gnome/help/balsa/C/stylesheet-images @dirrm share/gnome/help/balsa/C/images @dirrm share/gnome/help/balsa/C #### End of Patch data #### #### ApplyPatch data follows #### # Data version : 1.0 # Date generated : Mon Dec 17 02:19:18 2001 # Generated by : makepatch 2.00 # Recurse directories : Yes # p 'Makefile' 1435 1008535720 0100644 # p 'distinfo' 60 1008533842 0100644 # c 'files/patch-configure' 0 1008535994 0100644 # c 'files/patch-libbalsa::address-book-ldap.c' 0 1008536532 0100644 # p 'pkg-plist' 4362 1008584025 0100644 #### End of ApplyPatch data #### #### End of Patch kit [created: Mon Dec 17 02:19:18 2001] #### #### Checksum: 279 10210 55270 #### >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?20011217102622.5517415503>