Date: Wed, 31 Oct 2001 20:05:02 -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/31680: [PATCH] Upgrade balsa to balsa-1.2.2 (supercedes PR ports/31411) Message-ID: <20011101040502.B59D415503@johncoop.MSHOME>
next in thread | raw e-mail | index | archive | help
>Number: 31680 >Category: ports >Synopsis: [PATCH] Upgrade balsa to balsa-1.2.2 (supercedes PR ports/31411) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Oct 31 20:10:01 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 #38: Sun Oct 28 22:56:28 PST 2001 jmcoopr@johncoop.MSHOME:/usr/obj/usr/src/sys/JOHNCOOP i386 >Description: Balsa 1.2.2 has been released today. It fixes the off-by-one bug when stepping through threaded messages. Some revamping of the help documentation and international support has also occurred. >How-To-Repeat: N/A >Fix: ================================ THIS PR SUPERCEDES ports/31411 ================================ NOTE: libesmtp-0.8.6_2 IS REQUIRED for this port to function. Although the html help is pre-built, the authors insist on designing things such that Linux build tools not presently ported to FreeBSD would be required. Rebuild of the help documentation is therefore disabled (and isn't necessary anyway) with this port. Nevertheless, the damn win-config-*.html files must be built at run-time. The provided script masquerades as a /bin/sh script, but it's really a bash script. I've been unable to coax win-config-gen to run under /bin/sh with any reasonable amount of patching. I've therefore added shells/bash2 as a BUILD_DEPENDS. Without this, the help will be bunged and the install will fail. The pkg-plist had to be completely re-done as the international support has adopted a slightly different directory scheme. Everything works though! File status: patch-aa is now obsolete patch-help::C::Makefile.in had to be hacked as described above diff -ruN follows: diff -ruN balsa/Makefile balsa.new/Makefile --- balsa/Makefile Wed Sep 19 02:34:20 2001 +++ balsa.new/Makefile Wed Oct 31 17:19:29 2001 @@ -2,11 +2,11 @@ # Date created: 02 December 1998 # Whom: Glenn Johnson <gljohns@bellsouth.net> # -# $FreeBSD: ports/mail/balsa/Makefile,v 1.48 2001/09/19 09:34:20 sobomax Exp $ +# $FreeBSD$ # PORTNAME= balsa -PORTVERSION= 1.2.0 +PORTVERSION= 1.2.2 CATEGORIES= mail gnome MASTER_SITES= http://www.theochem.kth.se/~pawsa/balsa/ \ ftp://ftp.newton.cx/pub/balsa/ @@ -17,6 +17,7 @@ ldap.2:${PORTSDIR}/net/openldap2 \ aspell.11:${PORTSDIR}/textproc/aspell \ pcre.0:${PORTSDIR}/devel/pcre +BUILD_DEPENDS= ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash2 RUN_DEPENDS= ${LOCALBASE}/bin/ispell:${PORTSDIR}/textproc/ispell USE_X_PREFIX= yes @@ -30,7 +31,7 @@ --disable-more-warnings \ --with-ssl CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib -lgiconv" + LIBS="-L${LOCALBASE}/lib -lgiconv ${PTHREAD_LIBS}" MAN1= balsa.1 @@ -44,5 +45,12 @@ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g ; \ s|\$\(gnomedatadir\)/gnome|\$\(gnomedatadir\)|g' + @${MV} ${WRKSRC}/help/C/win-config-gen \ + ${WRKSRC}/help/C/win-config-gen.orig + @${SED} \ + -e 's#/bin/sh#${LOCALBASE}/bin/bash#' \ + ${WRKSRC}/help/C/win-config-gen.orig > \ + ${WRKSRC}/help/C/win-config-gen + @${CHMOD} a+x ${WRKSRC}/help/C/win-config-gen .include <bsd.port.mk> diff -ruN balsa/distinfo balsa.new/distinfo --- balsa/distinfo Wed Sep 19 02:34:20 2001 +++ balsa.new/distinfo Wed Oct 31 15:07:59 2001 @@ -1 +1 @@ -MD5 (balsa-1.2.0.tar.gz) = 8936f2f1ac6356c76cf29b70e1bf8a32 +MD5 (balsa-1.2.2.tar.gz) = d2b3fbddfdacb119adf54278089b1c87 diff -ruN balsa/files/patch-aa balsa.new/files/patch-aa --- balsa/files/patch-aa Wed Sep 19 02:34:21 2001 +++ balsa.new/files/patch-aa Wed Dec 31 16:00:00 1969 @@ -1,11 +0,0 @@ ---- 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@ $(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 $(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 -ruN balsa/files/patch-help::C::Makefile.in balsa.new/files/patch-help::C::Makefile.in --- balsa/files/patch-help::C::Makefile.in Wed Dec 31 16:00:00 1969 +++ balsa.new/files/patch-help::C::Makefile.in Wed Oct 31 16:22:56 2001 @@ -0,0 +1,19 @@ +--- help/C/Makefile.in Wed Oct 31 16:11:07 2001 ++++ help/C/Makefile.in.new Wed Oct 31 16:20:47 2001 +@@ -301,11 +301,11 @@ + # This is where the SGML bit is cool + # older db2html don't support the stylesheets, detect it. + index.html: $(SGML_FILES) +- if test "$(HAVE_JW)" = 'yes' ; then \ +- jw -c /etc/sgml/catalog balsa.sgml -o balsa; \ +- else \ +- db2html balsa.sgml; \ +- fi ++# if test "$(HAVE_JW)" = 'yes' ; then \ ++# jw -c /etc/sgml/catalog balsa.sgml -o balsa; \ ++# else \ ++# db2html balsa.sgml; \ ++# fi + -cp balsa/index.html index.html + -cd balsa && ../win-config-gen $(NUM_PREF_PAGES) + diff -ruN balsa/pkg-plist balsa.new/pkg-plist --- balsa/pkg-plist Wed Sep 19 02:34:20 2001 +++ balsa.new/pkg-plist Wed Oct 31 19:25:29 2001 @@ -62,41 +62,109 @@ 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/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 +share/gnome/locale/az.mo/LC_MESSAGES/balsa.mo +share/gnome/locale/bg.mo/LC_MESSAGES/balsa.mo +share/gnome/locale/ca.mo/LC_MESSAGES/balsa.mo +share/gnome/locale/cs.mo/LC_MESSAGES/balsa.mo +share/gnome/locale/da.mo/LC_MESSAGES/balsa.mo +share/gnome/locale/de.mo/LC_MESSAGES/balsa.mo +share/gnome/locale/el.mo/LC_MESSAGES/balsa.mo +share/gnome/locale/en_GB.mo/LC_MESSAGES/balsa.mo +share/gnome/locale/es.mo/LC_MESSAGES/balsa.mo +share/gnome/locale/et.mo/LC_MESSAGES/balsa.mo +share/gnome/locale/fi.mo/LC_MESSAGES/balsa.mo +share/gnome/locale/fr.mo/LC_MESSAGES/balsa.mo +share/gnome/locale/ga.mo/LC_MESSAGES/balsa.mo +share/gnome/locale/hu.mo/LC_MESSAGES/balsa.mo +share/gnome/locale/it.mo/LC_MESSAGES/balsa.mo +share/gnome/locale/ja.mo/LC_MESSAGES/balsa.mo +share/gnome/locale/ko.mo/LC_MESSAGES/balsa.mo +share/gnome/locale/lt.mo/LC_MESSAGES/balsa.mo +share/gnome/locale/nl.mo/LC_MESSAGES/balsa.mo +share/gnome/locale/nn.mo/LC_MESSAGES/balsa.mo +share/gnome/locale/no.mo/LC_MESSAGES/balsa.mo +share/gnome/locale/pl.mo/LC_MESSAGES/balsa.mo +share/gnome/locale/pt.mo/LC_MESSAGES/balsa.mo +share/gnome/locale/pt_BR.mo/LC_MESSAGES/balsa.mo +share/gnome/locale/ro.mo/LC_MESSAGES/balsa.mo +share/gnome/locale/ru.mo/LC_MESSAGES/balsa.mo +share/gnome/locale/sk.mo/LC_MESSAGES/balsa.mo +share/gnome/locale/sl.mo/LC_MESSAGES/balsa.mo +share/gnome/locale/sv.mo/LC_MESSAGES/balsa.mo +share/gnome/locale/tr.mo/LC_MESSAGES/balsa.mo +share/gnome/locale/uk.mo/LC_MESSAGES/balsa.mo +share/gnome/locale/wa.mo/LC_MESSAGES/balsa.mo +share/gnome/locale/zh_CN.mo/LC_MESSAGES/balsa.mo @dirrm share/gnome/help/balsa/C/stylesheet-images @dirrm share/gnome/help/balsa/C/images @dirrm share/gnome/help/balsa/C @dirrm share/gnome/help/balsa +@dirrm share/gnome/locale/az.mo/LC_MESSAGES +@dirrm share/gnome/locale/az.mo +@dirrm share/gnome/locale/bg.mo/LC_MESSAGES +@dirrm share/gnome/locale/bg.mo +@dirrm share/gnome/locale/ca.mo/LC_MESSAGES +@dirrm share/gnome/locale/ca.mo +@dirrm share/gnome/locale/cs.mo/LC_MESSAGES +@dirrm share/gnome/locale/cs.mo +@dirrm share/gnome/locale/da.mo/LC_MESSAGES +@dirrm share/gnome/locale/da.mo +@dirrm share/gnome/locale/de.mo/LC_MESSAGES +@dirrm share/gnome/locale/de.mo +@dirrm share/gnome/locale/el.mo/LC_MESSAGES +@dirrm share/gnome/locale/el.mo +@dirrm share/gnome/locale/en_GB.mo/LC_MESSAGES +@dirrm share/gnome/locale/en_GB.mo +@dirrm share/gnome/locale/es.mo/LC_MESSAGES +@dirrm share/gnome/locale/es.mo +@dirrm share/gnome/locale/et.mo/LC_MESSAGES +@dirrm share/gnome/locale/et.mo +@dirrm share/gnome/locale/fi.mo/LC_MESSAGES +@dirrm share/gnome/locale/fi.mo +@dirrm share/gnome/locale/fr.mo/LC_MESSAGES +@dirrm share/gnome/locale/fr.mo +@dirrm share/gnome/locale/ga.mo/LC_MESSAGES +@dirrm share/gnome/locale/ga.mo +@dirrm share/gnome/locale/hu.mo/LC_MESSAGES +@dirrm share/gnome/locale/hu.mo +@dirrm share/gnome/locale/it.mo/LC_MESSAGES +@dirrm share/gnome/locale/it.mo +@dirrm share/gnome/locale/ja.mo/LC_MESSAGES +@dirrm share/gnome/locale/ja.mo +@dirrm share/gnome/locale/ko.mo/LC_MESSAGES +@dirrm share/gnome/locale/ko.mo +@dirrm share/gnome/locale/lt.mo/LC_MESSAGES +@dirrm share/gnome/locale/lt.mo +@dirrm share/gnome/locale/nl.mo/LC_MESSAGES +@dirrm share/gnome/locale/nl.mo +@dirrm share/gnome/locale/nn.mo/LC_MESSAGES +@dirrm share/gnome/locale/nn.mo +@dirrm share/gnome/locale/no.mo/LC_MESSAGES +@dirrm share/gnome/locale/no.mo +@dirrm share/gnome/locale/pl.mo/LC_MESSAGES +@dirrm share/gnome/locale/pl.mo +@dirrm share/gnome/locale/pt.mo/LC_MESSAGES +@dirrm share/gnome/locale/pt.mo +@dirrm share/gnome/locale/pt_BR.mo/LC_MESSAGES +@dirrm share/gnome/locale/pt_BR.mo +@dirrm share/gnome/locale/ro.mo/LC_MESSAGES +@dirrm share/gnome/locale/ro.mo +@dirrm share/gnome/locale/ru.mo/LC_MESSAGES +@dirrm share/gnome/locale/ru.mo +@dirrm share/gnome/locale/sk.mo/LC_MESSAGES +@dirrm share/gnome/locale/sk.mo +@dirrm share/gnome/locale/sl.mo/LC_MESSAGES +@dirrm share/gnome/locale/sl.mo +@dirrm share/gnome/locale/sv.mo/LC_MESSAGES +@dirrm share/gnome/locale/sv.mo +@dirrm share/gnome/locale/tr.mo/LC_MESSAGES +@dirrm share/gnome/locale/tr.mo +@dirrm share/gnome/locale/uk.mo/LC_MESSAGES +@dirrm share/gnome/locale/uk.mo +@dirrm share/gnome/locale/wa.mo/LC_MESSAGES +@dirrm share/gnome/locale/wa.mo +@dirrm share/gnome/locale/zh_CN.mo/LC_MESSAGES +@dirrm share/gnome/locale/zh_CN.mo +@dirrm share/gnome/locale +@dirrm share/gnome/pixmaps/balsa +@dirrm share/gnome/sounds/balsa >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?20011101040502.B59D415503>