From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Nov 19 22:40:29 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AA1C716A41F for ; Sat, 19 Nov 2005 22:40:29 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4CC6E43D45 for ; Sat, 19 Nov 2005 22:40:29 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id jAJMeTKB088653 for ; Sat, 19 Nov 2005 22:40:29 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id jAJMeT9n088652; Sat, 19 Nov 2005 22:40:29 GMT (envelope-from gnats) Date: Sat, 19 Nov 2005 22:40:29 GMT Message-Id: <200511192240.jAJMeT9n088652@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org From: Alex Varju Cc: Subject: Re: ports/87703: [PATCH] finance/gnucash: update to 1.8.12 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Alex Varju List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Nov 2005 22:40:29 -0000 The following reply was made to PR ports/87703; it has been noted by GNATS. From: Alex Varju To: FreeBSD-gnats-submit@freebsd.org Cc: Subject: Re: ports/87703: [PATCH] finance/gnucash: update to 1.8.12 Date: Sat, 19 Nov 2005 14:35:37 -0800 (PST) >Submitter-Id: current-users >Originator: Alex Varju >Organization: WebCT >Confidential: no >Synopsis: Re: ports/87703: [PATCH] finance/gnucash: update to 1.8.12 >Severity: non-critical >Priority: low >Category: ports >Class: update >Release: FreeBSD 5.3-STABLE i386 >Environment: System: FreeBSD snapple.webct.com 5.3-STABLE FreeBSD 5.3-STABLE #13: Wed Nov 3 11:31:28 PST 2004 varju@snapple.webct.com:/usr/obj/usr/src/sys/SNAPPLE i386 >Description: - Resubmit update to 1.8.12 Added file(s): - files/patch-intltool-merge.in Generated with FreeBSD Port Tools 0.63 >How-To-Repeat: >Fix: --- gnucash-1.8.12.patch begins here --- Index: Makefile =================================================================== RCS file: /home/freebsd/cvsroot/ports/finance/gnucash/Makefile,v retrieving revision 1.83 diff -u -u -r1.83 Makefile --- Makefile 15 Sep 2005 07:11:15 -0000 1.83 +++ Makefile 30 Oct 2005 01:14:30 -0000 @@ -6,8 +6,7 @@ # PORTNAME= gnucash -PORTVERSION= 1.8.11 -PORTREVISION= 1 +PORTVERSION= 1.8.12 CATEGORIES= finance gnome MASTER_SITES= http://www.gnucash.org/pub/gnucash/sources/stable/ \ ${MASTER_SITE_SOURCEFORGE} @@ -35,7 +34,7 @@ USE_GMAKE= yes USE_XPM= yes USE_PERL5= yes -USE_GNOME= gnomeprefix gnomehack gnomeprint libglade gtkhtml libghttp +USE_GNOME= gnomeprefix gnomehack gnomeprint libglade gtkhtml libghttp intltool USE_REINPLACE= yes GNU_CONFIGURE= yes INSTALLS_SHLIB= yes @@ -61,11 +60,13 @@ # WITH_OPENHBCI is old synonym for aqbanking option .if defined(WITH_AQBANKING) || defined(WITH_OPENHBCI) -LIB_DEPENDS+= aqbanking.5:${PORTSDIR}/finance/aqbanking \ - ktoblzcheck.1:${PORTSDIR}/finance/ktoblzcheck +LIB_DEPENDS+= aqbanking.8:${PORTSDIR}/finance/aqbanking \ + ktoblzcheck.4:${PORTSDIR}/finance/ktoblzcheck CONFIGURE_ARGS+=--enable-hbci +PLIST_SUB= AQBANKING="" .else CONFIGURE_ARGS+=--disable-hbci +PLIST_SUB= AQBANKING="@comment " .endif post-configure: Index: distinfo =================================================================== RCS file: /home/freebsd/cvsroot/ports/finance/gnucash/distinfo,v retrieving revision 1.30 diff -u -u -r1.30 distinfo --- distinfo 12 Feb 2005 00:14:56 -0000 1.30 +++ distinfo 20 Oct 2005 03:59:12 -0000 @@ -1,2 +1,2 @@ -MD5 (gnucash-1.8.11.tar.gz) = 62f94331936e37ed1b1d28b5a1863bb3 -SIZE (gnucash-1.8.11.tar.gz) = 7822353 +MD5 (gnucash-1.8.12.tar.gz) = 81e7c703db56bb203e106664157779cc +SIZE (gnucash-1.8.12.tar.gz) = 8290229 Index: pkg-plist =================================================================== RCS file: /home/freebsd/cvsroot/ports/finance/gnucash/pkg-plist,v retrieving revision 1.32 diff -u -u -r1.32 pkg-plist --- pkg-plist 12 Feb 2005 00:14:56 -0000 1.32 +++ pkg-plist 21 Oct 2005 04:16:04 -0000 @@ -460,50 +460,6 @@ share/gnome/gnucash/doc/examples/web.qif share/gnome/gnucash/doc/examples/xfer.xac share/gnome/gnucash/doc/guile-hackers.txt -share/gnome/gnucash/doc/html/Account_8h.html -share/gnome/gnucash/doc/html/SchedXaction_8h.html -share/gnome/gnucash/doc/html/TransLog_8h.html -share/gnome/gnucash/doc/html/Transaction_8h.html -share/gnome/gnucash/doc/html/annotated.html -share/gnome/gnucash/doc/html/classes.html -share/gnome/gnucash/doc/html/combocell_8h.html -share/gnome/gnucash/doc/html/date_8h.html -share/gnome/gnucash/doc/html/doxygen.css -share/gnome/gnucash/doc/html/doxygen.gif -share/gnome/gnucash/doc/html/files.html -share/gnome/gnucash/doc/html/functions.html -share/gnome/gnucash/doc/html/globals.html -share/gnome/gnucash/doc/html/gnc-hbci-trans-templ_8h.html -share/gnome/gnucash/doc/html/gnc-log-replay_8h.html -share/gnome/gnucash/doc/html/gnc-ofx-import_8h.html -share/gnome/gnucash/doc/html/gnc-pricedb_8h.html -share/gnome/gnucash/doc/html/gnc-ui-util_8h.html -share/gnome/gnucash/doc/html/group__Account__Quickfill.html -share/gnome/gnucash/doc/html/group__Date.html -share/gnome/gnucash/doc/html/group__Engine.html -share/gnome/gnucash/doc/html/group__Import__Export.html -share/gnome/gnucash/doc/html/group__UI.html -share/gnome/gnucash/doc/html/import-account-matcher_8h.html -share/gnome/gnucash/doc/html/import-backend_8h.html -share/gnome/gnucash/doc/html/import-commodity-matcher_8h.html -share/gnome/gnucash/doc/html/import-main-matcher_8h.html -share/gnome/gnucash/doc/html/import-match-map_8h.html -share/gnome/gnucash/doc/html/import-match-picker_8h.html -share/gnome/gnucash/doc/html/import-settings_8h.html -share/gnome/gnucash/doc/html/import-utilities_8h.html -share/gnome/gnucash/doc/html/index.html -share/gnome/gnucash/doc/html/modules.html -share/gnome/gnucash/doc/html/structGNCDateEdit.html -share/gnome/gnucash/doc/html/struct__FormulaCell.html -share/gnome/gnucash/doc/html/struct__GNCFrequency.html -share/gnome/gnucash/doc/html/struct__temporalStateData.html -share/gnome/gnucash/doc/html/structaccount__group__s.html -share/gnome/gnucash/doc/html/structaccount__s.html -share/gnome/gnucash/doc/html/structgnc__template__xaction__data.html -share/gnome/gnucash/doc/html/structgncp__SchedXaction.html -share/gnome/gnucash/doc/html/structgncp__freq__spec.html -share/gnome/gnucash/doc/html/structsplit__s.html -share/gnome/gnucash/doc/html/structtimespec64.html share/gnome/gnucash/doc/projects.html share/gnome/gnucash/finance-quote-check share/gnome/gnucash/finance-quote-helper @@ -519,6 +475,8 @@ share/gnome/gnucash/glade/fincalc.glade share/gnome/gnucash/glade/generic-import.glade share/gnome/gnucash/glade/gnc-date-format.glade +%%AQBANKING%%share/gnome/gnucash/glade/hbci.glade +%%AQBANKING%%share/gnome/gnucash/glade/hbcipass.glade share/gnome/gnucash/glade/help.glade share/gnome/gnucash/glade/invoice.glade share/gnome/gnucash/glade/job.glade @@ -646,6 +604,7 @@ share/gnome/gnucash/scm/gnc-numeric.scm share/gnome/gnucash/scm/gnumeric/gnumeric-utilities.scm share/gnome/gnucash/scm/gnumeric/table-utils.scm +%%AQBANKING%%share/gnome/gnucash/scm/hbci/hbci.scm share/gnome/gnucash/scm/help-topics-index.scm share/gnome/gnucash/scm/hooks.scm share/gnome/gnucash/scm/html-barchart.scm @@ -724,6 +683,7 @@ @dirrm share/gnome/gnucash/scm/printing @dirrm share/gnome/gnucash/scm/ofx @dirrm share/gnome/gnucash/scm/log-replay +%%AQBANKING%%@dirrm share/gnome/gnucash/scm/hbci @dirrm share/gnome/gnucash/scm/gnumeric @dirrm share/gnome/gnucash/scm/generic-import @dirrm share/gnome/gnucash/scm Index: files/patch-Makefile.in =================================================================== RCS file: /home/freebsd/cvsroot/ports/finance/gnucash/files/patch-Makefile.in,v retrieving revision 1.2 diff -u -u -r1.2 patch-Makefile.in --- files/patch-Makefile.in 18 Dec 2003 17:50:56 -0000 1.2 +++ files/patch-Makefile.in 20 Oct 2005 04:06:48 -0000 @@ -1,11 +1,11 @@ ---- Makefile.in.orig Wed Dec 17 13:21:00 2003 -+++ Makefile.in Wed Dec 17 13:22:34 2003 -@@ -227,7 +227,7 @@ - enable_html_docs = @enable_html_docs@ - enable_latex_docs = @enable_latex_docs@ - +--- Makefile.in~ Wed Oct 19 21:05:51 2005 ++++ Makefile.in Wed Oct 19 21:06:29 2005 +@@ -412,7 +412,7 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ -SUBDIRS = intl m4 macros doc lib src intl-scm po rpm accounts +SUBDIRS = m4 macros doc lib src intl-scm po rpm accounts - docdir = ${GNC_DOC_INSTALL_DIR} - + @GNC_FALSE@dummy_SOURCES = dummy.c + noinst_DATA = make-gnucash-patch make-gnucash-potfiles Index: files/patch-configure =================================================================== RCS file: /home/freebsd/cvsroot/ports/finance/gnucash/files/patch-configure,v retrieving revision 1.11 diff -u -u -r1.11 patch-configure --- files/patch-configure 25 Sep 2003 05:17:05 -0000 1.11 +++ files/patch-configure 21 Oct 2005 04:12:36 -0000 @@ -1,33 +1,44 @@ ---- configure.orig Sun Sep 21 16:06:57 2003 -+++ configure Sun Sep 21 16:07:24 2003 -@@ -3860,10 +3860,10 @@ - #include "confdefs.h" +--- configure.orig Thu Oct 20 21:05:33 2005 ++++ configure Thu Oct 20 21:12:31 2005 +@@ -9710,12 +9710,12 @@ + /* end confdefs.h. */ #include extern int _nl_msg_cat_cntr; -extern int *_nl_domain_bindings; +extern int *libintl_nl_domain_bindings; - int main() { + int + main () + { bindtextdomain ("", ""); -return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings +return (int) gettext ("") + _nl_msg_cat_cntr + *libintl_nl_domain_bindings - ; return 0; } - EOF - if { (eval echo configure:3870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -@@ -11776,7 +11776,7 @@ + ; + return 0; + } +@@ -20102,7 +20102,7 @@ withval="$with_help_prefix" GNC_HELPDIR="$with_help_prefix/gnome/help/gnucash" else - GNC_HELPDIR="\${datadir}/gnome/help/gnucash" + GNC_HELPDIR="\${datadir}/help/gnucash" - fi + fi; -@@ -13665,7 +13665,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-lgtkhtml $GTKHTML_LIBS $LIBS" -+LIBS="-lgtkhtml-1.1 $GTKHTML_LIBS $LIBS" - cat > conftest.$ac_ext <$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n"; + my $tree = readXml($FILE); Index: files/patch-po::ru.po =================================================================== RCS file: /home/freebsd/cvsroot/ports/finance/gnucash/files/patch-po::ru.po,v retrieving revision 1.3 diff -u -u -r1.3 patch-po::ru.po --- files/patch-po::ru.po 12 Feb 2003 04:28:13 -0000 1.3 +++ files/patch-po::ru.po 20 Oct 2005 04:10:08 -0000 @@ -1,6 +1,6 @@ ---- po/ru.po.orig Mon Feb 10 01:52:51 2003 -+++ po/ru.po Tue Feb 11 22:29:55 2003 -@@ -4767,7 +4767,7 @@ +--- po/ru.po.orig Sun Oct 16 13:14:00 2005 ++++ po/ru.po Wed Oct 19 21:10:01 2005 +@@ -4953,7 +4953,7 @@ #: src/gnome/dialog-totd.c:303 msgid "-*-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*" @@ -9,7 +9,7 @@ #: src/gnome/dialog-totd.c:304 msgid "Tip of the Day:" -@@ -8574,12 +8574,12 @@ +@@ -8660,12 +8660,12 @@ msgid "" "register-default-font:-adobe-helvetica-medium-r-normal--*-120-*-*-*-*-*-*" msgstr "" @@ -17,7 +17,7 @@ +"register-hint-font:-cronyx-helvetica-medium-o-normal--*-120-*-*-*-*-*-*" #: src/register/register-gnome/gnucash-style.c:819 - #: intl-scm/guile-strings.c:248 + #: intl-scm/guile-strings.c:1093 msgid "register-hint-font:-adobe-helvetica-medium-o-normal--*-120-*-*-*-*-*-*" -msgstr "register-hint-font:-rfx-helvetica-medium-o-normal--*-120-*-*-*-*-*-*" +msgstr "register-hint-font:-cronyx-helvetica-medium-o-normal--*-120-*-*-*-*-*-*" Index: files/patch-src::gnome::Makefile.in =================================================================== RCS file: /home/freebsd/cvsroot/ports/finance/gnucash/files/patch-src::gnome::Makefile.in,v retrieving revision 1.1 diff -u -u -r1.1 patch-src::gnome::Makefile.in --- files/patch-src::gnome::Makefile.in 11 Jul 2002 17:15:57 -0000 1.1 +++ files/patch-src::gnome::Makefile.in 20 Oct 2005 04:11:12 -0000 @@ -1,14 +1,11 @@ - -$FreeBSD: ports/finance/gnucash/files/patch-src::gnome::Makefile.in,v 1.1 2002/07/11 17:15:57 sobomax Exp $ - ---- src/gnome/Makefile.in 2002/07/11 09:16:01 1.1 -+++ src/gnome/Makefile.in 2002/07/11 09:16:10 -@@ -226,7 +226,7 @@ - window-report.c - +--- src/gnome/Makefile.in.orig Wed Oct 19 21:10:12 2005 ++++ src/gnome/Makefile.in Wed Oct 19 21:10:41 2005 +@@ -470,7 +470,7 @@ + window-reconcile.c \ + window-register.c -gnomeappdir = ${datadir}/gnome/apps/Applications +gnomeappdir = ${datadir}/apps/Applications - - gnomeapp_DATA = gnucash.desktop - + gnomeapp_in_files = gnucash.desktop.in + gnomeapp_DATA = $(gnomeapp_in_files:.desktop.in=.desktop) + appicondir = $(datadir)/pixmaps Index: files/patch-src_doc_Makefile.in =================================================================== RCS file: /home/freebsd/cvsroot/ports/finance/gnucash/files/patch-src_doc_Makefile.in,v retrieving revision 1.1 diff -u -u -r1.1 patch-src_doc_Makefile.in --- files/patch-src_doc_Makefile.in 5 Feb 2003 06:12:43 -0000 1.1 +++ files/patch-src_doc_Makefile.in 20 Oct 2005 04:23:20 -0000 @@ -1,11 +1,11 @@ ---- src/doc/Makefile.in.orig Tue Feb 4 23:55:03 2003 -+++ src/doc/Makefile.in Tue Feb 4 23:58:49 2003 -@@ -492,7 +492,7 @@ +--- src/doc/Makefile.in.orig Wed Oct 19 21:11:16 2005 ++++ src/doc/Makefile.in Wed Oct 19 21:23:15 2005 +@@ -726,7 +726,7 @@ $(mkinstalldirs) $(DESTDIR)$(docdir)/html mkdir -p html #Workaround to allow libofx-cvs user to install without doc. # cp -rp $(srcdir)/html ${docdir} - cp -rp html $(DESTDIR)$(docdir)/html -+ cp -rp html/* $(DESTDIR)$(docdir)/html ++ cp -rp html $(DESTDIR)$(docdir) uninstall-hook: rm -rf ${docdir}/html --- gnucash-1.8.12.patch ends here ---