diff --git a/finance/gnucash-devel/Makefile b/finance/gnucash-devel/Makefile index f6077dd7f203..8552319f633c 100644 --- a/finance/gnucash-devel/Makefile +++ b/finance/gnucash-devel/Makefile @@ -1,74 +1,75 @@ # Ports collection makefile for: gnucash # Date created: Mon Feb 03, 1997 # Whom: David O'Brien (obrien@NUXI.com) # # $FreeBSD$ # 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} MASTER_SITE_SUBDIR= gnucash MAINTAINER= ports@FreeBSD.org COMMENT= Quicken-like money and finance manager LIB_DEPENDS= guile.15:${PORTSDIR}/lang/guile \ guppi.16:${PORTSDIR}/math/guppi \ popt.0:${PORTSDIR}/devel/popt \ ofx.2:${PORTSDIR}/finance/libofx \ gw-standard.0:${PORTSDIR}/devel/g-wrap RUN_DEPENDS= ${LOCALBASE}/share/guile/slibcat:${PORTSDIR}/lang/slib-guile \ ${SITE_PERL}/HTML/Base.pm:${PORTSDIR}/www/p5-HTML \ ${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \ ${SITE_PERL}/Date/Manip.pm:${PORTSDIR}/devel/p5-Date-Manip \ ${SITE_PERL}/Finance/Quote.pm:${PORTSDIR}/finance/p5-Finance-Quote \ ${SITE_PERL}/Finance/QuoteHist.pm:${PORTSDIR}/finance/p5-Finance-QuoteHist \ ${X11BASE}/share/gnome/omf/gnucash-docs/gnucash-guide-C.omf:${PORTSDIR}/finance/gnucash-docs OPTIONS= AQBANKING "AqBanking support (HBCI/OpenHBCI)" off USE_X_PREFIX= yes 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 intlhack USE_REINPLACE= yes GNU_CONFIGURE= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS= --with-glib-config=${GLIB_CONFIG} \ --enable-ofx \ --disable-error-on-warning CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lintl" MAN1= gnc-prices.1 gnucash.1 INFO= gnucash-design .include .if exists(${LOCALBASE}/include/db41/db_185.h) LIB_DEPENDS+= db41.1:${PORTSDIR}/databases/db41 post-patch: @${REINPLACE_CMD} -e "s|db4/db_185.h|db41/db_185.h|g" \ ${WRKSRC}/configure .else LIB_DEPENDS+= db4.0:${PORTSDIR}/databases/db4 .endif # 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: @${RM} ${WRKSRC}/src/doc/design/gnucash-design.info .include diff --git a/finance/gnucash-devel/distinfo b/finance/gnucash-devel/distinfo index 10a478a64bfe..85c535245563 100644 --- a/finance/gnucash-devel/distinfo +++ b/finance/gnucash-devel/distinfo @@ -1,3 +1,3 @@ -MD5 (gnucash-1.8.11.tar.gz) = 62f94331936e37ed1b1d28b5a1863bb3 -SHA256 (gnucash-1.8.11.tar.gz) = 46d67731992c06f4cefe3cb0129bfd00f49ef72c8f44d3aae6317ef9d44fc107 +MD5 (gnucash-1.8.12.tar.gz) = 81e7c703db56bb203e106664157779cc +SIZE (gnucash-1.8.12.tar.gz) = 8290229 SIZE (gnucash-1.8.11.tar.gz) = 7822353 diff --git a/finance/gnucash-devel/files/patch-Makefile.in b/finance/gnucash-devel/files/patch-Makefile.in index bdabc9770ec4..7ce6ec37981e 100644 --- a/finance/gnucash-devel/files/patch-Makefile.in +++ b/finance/gnucash-devel/files/patch-Makefile.in @@ -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 diff --git a/finance/gnucash-devel/files/patch-configure b/finance/gnucash-devel/files/patch-configure index 094f45f1bb2c..aae73e5c8b09 100644 --- a/finance/gnucash-devel/files/patch-configure +++ b/finance/gnucash-devel/files/patch-configure @@ -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 < /dev/null || true +@unexec rmdir %D/share/locale/rw 2> /dev/null || true @unexec rmdir %D/share/locale/es_NI/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/es_NI 2> /dev/null || true @dirrm share/gnome/pixmaps/gnucash @dirrm share/gnome/gnucash/scm/qif-import @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 @dirrm share/gnome/gnucash/guile-modules/www @dirrm share/gnome/gnucash/guile-modules/srfi @dirrm share/gnome/gnucash/guile-modules/gnucash/tax @dirrm share/gnome/gnucash/guile-modules/gnucash/report/locale-specific @dirrm share/gnome/gnucash/guile-modules/gnucash/report @dirrm share/gnome/gnucash/guile-modules/gnucash/printing @dirrm share/gnome/gnucash/guile-modules/gnucash/import-export @dirrm share/gnome/gnucash/guile-modules/gnucash @dirrm share/gnome/gnucash/guile-modules/g-wrapped @dirrm share/gnome/gnucash/guile-modules @dirrm share/gnome/gnucash/glade @dirrm share/gnome/gnucash/doc/html @dirrm share/gnome/gnucash/doc/examples @dirrm share/gnome/gnucash/doc @dirrm share/gnome/gnucash/accounts/tr_TR @dirrm share/gnome/gnucash/accounts/sk @dirrm share/gnome/gnucash/accounts/pt_PT @dirrm share/gnome/gnucash/accounts/pt_BR @dirrm share/gnome/gnucash/accounts/it @dirrm share/gnome/gnucash/accounts/hu_HU @dirrm share/gnome/gnucash/accounts/fr_FR @dirrm share/gnome/gnucash/accounts/es_ES @dirrm share/gnome/gnucash/accounts/el_GR @dirrm share/gnome/gnucash/accounts/de_DE @dirrm share/gnome/gnucash/accounts/de_CH @dirrm share/gnome/gnucash/accounts/da @dirrm share/gnome/gnucash/accounts/C @dirrm share/gnome/gnucash/accounts @dirrm share/gnome/gnucash @dirrm libexec/gnucash/overrides @dirrm libexec/gnucash @dirrm lib/gnucash @dirrm include/gnucash @dirrm etc/gnucash diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile index f6077dd7f203..8552319f633c 100644 --- a/finance/gnucash/Makefile +++ b/finance/gnucash/Makefile @@ -1,74 +1,75 @@ # Ports collection makefile for: gnucash # Date created: Mon Feb 03, 1997 # Whom: David O'Brien (obrien@NUXI.com) # # $FreeBSD$ # 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} MASTER_SITE_SUBDIR= gnucash MAINTAINER= ports@FreeBSD.org COMMENT= Quicken-like money and finance manager LIB_DEPENDS= guile.15:${PORTSDIR}/lang/guile \ guppi.16:${PORTSDIR}/math/guppi \ popt.0:${PORTSDIR}/devel/popt \ ofx.2:${PORTSDIR}/finance/libofx \ gw-standard.0:${PORTSDIR}/devel/g-wrap RUN_DEPENDS= ${LOCALBASE}/share/guile/slibcat:${PORTSDIR}/lang/slib-guile \ ${SITE_PERL}/HTML/Base.pm:${PORTSDIR}/www/p5-HTML \ ${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \ ${SITE_PERL}/Date/Manip.pm:${PORTSDIR}/devel/p5-Date-Manip \ ${SITE_PERL}/Finance/Quote.pm:${PORTSDIR}/finance/p5-Finance-Quote \ ${SITE_PERL}/Finance/QuoteHist.pm:${PORTSDIR}/finance/p5-Finance-QuoteHist \ ${X11BASE}/share/gnome/omf/gnucash-docs/gnucash-guide-C.omf:${PORTSDIR}/finance/gnucash-docs OPTIONS= AQBANKING "AqBanking support (HBCI/OpenHBCI)" off USE_X_PREFIX= yes 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 intlhack USE_REINPLACE= yes GNU_CONFIGURE= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS= --with-glib-config=${GLIB_CONFIG} \ --enable-ofx \ --disable-error-on-warning CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lintl" MAN1= gnc-prices.1 gnucash.1 INFO= gnucash-design .include .if exists(${LOCALBASE}/include/db41/db_185.h) LIB_DEPENDS+= db41.1:${PORTSDIR}/databases/db41 post-patch: @${REINPLACE_CMD} -e "s|db4/db_185.h|db41/db_185.h|g" \ ${WRKSRC}/configure .else LIB_DEPENDS+= db4.0:${PORTSDIR}/databases/db4 .endif # 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: @${RM} ${WRKSRC}/src/doc/design/gnucash-design.info .include diff --git a/finance/gnucash/distinfo b/finance/gnucash/distinfo index 10a478a64bfe..85c535245563 100644 --- a/finance/gnucash/distinfo +++ b/finance/gnucash/distinfo @@ -1,3 +1,3 @@ -MD5 (gnucash-1.8.11.tar.gz) = 62f94331936e37ed1b1d28b5a1863bb3 -SHA256 (gnucash-1.8.11.tar.gz) = 46d67731992c06f4cefe3cb0129bfd00f49ef72c8f44d3aae6317ef9d44fc107 +MD5 (gnucash-1.8.12.tar.gz) = 81e7c703db56bb203e106664157779cc +SIZE (gnucash-1.8.12.tar.gz) = 8290229 SIZE (gnucash-1.8.11.tar.gz) = 7822353 diff --git a/finance/gnucash/files/patch-Makefile.in b/finance/gnucash/files/patch-Makefile.in index bdabc9770ec4..7ce6ec37981e 100644 --- a/finance/gnucash/files/patch-Makefile.in +++ b/finance/gnucash/files/patch-Makefile.in @@ -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 diff --git a/finance/gnucash/files/patch-configure b/finance/gnucash/files/patch-configure index 094f45f1bb2c..aae73e5c8b09 100644 --- a/finance/gnucash/files/patch-configure +++ b/finance/gnucash/files/patch-configure @@ -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 < /dev/null || true +@unexec rmdir %D/share/locale/rw 2> /dev/null || true @unexec rmdir %D/share/locale/es_NI/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/es_NI 2> /dev/null || true @dirrm share/gnome/pixmaps/gnucash @dirrm share/gnome/gnucash/scm/qif-import @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 @dirrm share/gnome/gnucash/guile-modules/www @dirrm share/gnome/gnucash/guile-modules/srfi @dirrm share/gnome/gnucash/guile-modules/gnucash/tax @dirrm share/gnome/gnucash/guile-modules/gnucash/report/locale-specific @dirrm share/gnome/gnucash/guile-modules/gnucash/report @dirrm share/gnome/gnucash/guile-modules/gnucash/printing @dirrm share/gnome/gnucash/guile-modules/gnucash/import-export @dirrm share/gnome/gnucash/guile-modules/gnucash @dirrm share/gnome/gnucash/guile-modules/g-wrapped @dirrm share/gnome/gnucash/guile-modules @dirrm share/gnome/gnucash/glade @dirrm share/gnome/gnucash/doc/html @dirrm share/gnome/gnucash/doc/examples @dirrm share/gnome/gnucash/doc @dirrm share/gnome/gnucash/accounts/tr_TR @dirrm share/gnome/gnucash/accounts/sk @dirrm share/gnome/gnucash/accounts/pt_PT @dirrm share/gnome/gnucash/accounts/pt_BR @dirrm share/gnome/gnucash/accounts/it @dirrm share/gnome/gnucash/accounts/hu_HU @dirrm share/gnome/gnucash/accounts/fr_FR @dirrm share/gnome/gnucash/accounts/es_ES @dirrm share/gnome/gnucash/accounts/el_GR @dirrm share/gnome/gnucash/accounts/de_DE @dirrm share/gnome/gnucash/accounts/de_CH @dirrm share/gnome/gnucash/accounts/da @dirrm share/gnome/gnucash/accounts/C @dirrm share/gnome/gnucash/accounts @dirrm share/gnome/gnucash @dirrm libexec/gnucash/overrides @dirrm libexec/gnucash @dirrm lib/gnucash @dirrm include/gnucash @dirrm etc/gnucash