[35110] trunk/dports/gnome/gnucash
reiffert at macports.org
reiffert at macports.org
Mon Mar 17 10:47:48 PDT 2008
Revision: 35110
http://trac.macosforge.org/projects/macports/changeset/35110
Author: reiffert at macports.org
Date: 2008-03-17 10:47:47 -0700 (Mon, 17 Mar 2008)
Log Message:
-----------
gnucash 2.2.4, fixing:
#14297 (Update gnucash)
#13316 (binreloc error)
#13472 (Fails to build on leopard)
#13852 (Fails to compile)
Modified Paths:
--------------
trunk/dports/gnome/gnucash/Portfile
Added Paths:
-----------
trunk/dports/gnome/gnucash/files/
trunk/dports/gnome/gnucash/files/patch-configure.diff
Modified: trunk/dports/gnome/gnucash/Portfile
===================================================================
--- trunk/dports/gnome/gnucash/Portfile 2008-03-17 16:27:20 UTC (rev 35109)
+++ trunk/dports/gnome/gnucash/Portfile 2008-03-17 17:47:47 UTC (rev 35110)
@@ -1,11 +1,12 @@
# $Id$
PortSystem 1.0
+
name gnucash
-version 2.2.1
-revision 2
+version 2.2.4
categories gnome x11
maintainers nomaintainer
+platforms darwin
description a personal and small-business financial-accounting software
long_description GnuCash is a personal and small-business \
financial-accounting software, freely licensed under the \
@@ -23,7 +24,7 @@
master_sites sourceforge \
http://www.gnucash.org/pub/gnucash/sources/stable/
use_bzip2 yes
-checksums md5 c971dba50b6e04d8fdd66cb681e1cead
+checksums md5 f521cea858ee7223325114ec98de86ca
# gpg signature for 2.2.1 not published!
depends_lib lib:XML/Parser.pm:p5-xml-parser \
port:glib2 \
@@ -52,31 +53,43 @@
reinplace "/^DYLD_LIBRARY_PATH/s|=\"|=\"/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources at -PATH_SEPARATOR-@|" ${worksrcpath}/src/bin/overrides/gnucash-env.in
}
-default_variants +guile16
+default_variants +guile16 +without-docs
-variant without_quotes {
+variant without_quotes description {Does not depend on building p5-finance-quote} {
depends_lib-delete lib:Finance/Quote.pm:p5-finance-quote
}
-variant without_hbci {
+variant without_hbci description {Disables HBCI support} {
depends_lib-delete lib:aqbanking:aqbanking
configure.args-delete --enable-hbci
configure.args-append --disable-hbci
}
-variant without_ofx {
+variant without_ofx description {Disables ofx support} {
depends_lib-delete lib:libofx:libofx
configure.args-delete --enable-ofx
configure.args-append --disable-ofx
}
-variant without_docs {
+variant without_docs description {Does not build gnucash-docs} {
depends_lib-delete port:gnucash-docs
}
-variant guile16 {
+variant guile16 description {Builds using guile16} {
depends_lib-delete port:guile
depends_lib-delete port:slib-guile
depends_lib-append port:guile16 \
port:slib-guile16
+
+ patchfiles patch-configure.diff
+
+ post-patch {
+ fs-traverse src_file ${worksrcpath}/src {
+ if { [ file isfile ${src_file} ] } {
+ reinplace "s|\\<guile\\/|\<guile16\\/|g" ${src_file}
+ reinplace "s|libguile\\.h|libguile16\\.h|g" ${src_file}
+ reinplace "s|exec\\ guile|exec\\ guile16|g" ${src_file}
+ }
+ }
+ }
}
Added: trunk/dports/gnome/gnucash/files/patch-configure.diff
===================================================================
--- trunk/dports/gnome/gnucash/files/patch-configure.diff (rev 0)
+++ trunk/dports/gnome/gnucash/files/patch-configure.diff 2008-03-17 17:47:47 UTC (rev 35110)
@@ -0,0 +1,183 @@
+--- configure.orig 2008-03-02 14:30:21.000000000 +0100
++++ configure 2008-03-17 18:42:05.000000000 +0100
+@@ -25464,9 +25464,9 @@
+
+
+ if test "x$cross_compiling" = "xyes" ; then
+- name_build_guile="$target_alias-guile-config"
++ name_build_guile="$target_alias-guile16-config"
+ else
+- name_build_guile="guile-config"
++ name_build_guile="guile16-config"
+ fi
+
+ # Extract the first word of "$name_build_guile", so it can be a program name with args.
+@@ -25649,13 +25649,13 @@
+
+
+ if test "x$BUILD_GUILE" = "xyes"; then
+- { echo "$as_me:$LINENO: checking for guile libraries" >&5
+-echo $ECHO_N "checking for guile libraries... $ECHO_C" >&6; }
++ { echo "$as_me:$LINENO: checking for guile16 libraries" >&5
++echo $ECHO_N "checking for guile16 libraries... $ECHO_C" >&6; }
+ GUILE_LIBS="`$name_build_guile link`"
+ { echo "$as_me:$LINENO: result: $GUILE_LIBS" >&5
+ echo "${ECHO_T}$GUILE_LIBS" >&6; }
+- { echo "$as_me:$LINENO: checking for guile headers" >&5
+-echo $ECHO_N "checking for guile headers... $ECHO_C" >&6; }
++ { echo "$as_me:$LINENO: checking for guile16 headers" >&5
++echo $ECHO_N "checking for guile16 headers... $ECHO_C" >&6; }
+ GUILE_INCS="`$name_build_guile compile`"
+ { echo "$as_me:$LINENO: result: $GUILE_INCS" >&5
+ echo "${ECHO_T}$GUILE_INCS" >&6; }
+@@ -25981,7 +25981,7 @@
+ GUILE_LIBS="$GUILE_LIBS -lsocket"
+ fi
+
+- GUILE_LIBS="-lguile $GUILE_LIBS $QTTHREADS_LIB $READLINE_LIB $TERMCAP_LIB"
++ GUILE_LIBS="-lguile16 $GUILE_LIBS $QTTHREADS_LIB $READLINE_LIB $TERMCAP_LIB"
+ fi
+
+
+@@ -25991,8 +25991,8 @@
+ LIBS="$LIBS $GUILE_LIBS"
+ CPPFLAGS="$saved_cppflags $GUILE_INCS"
+
+- { echo "$as_me:$LINENO: checking whether guile works" >&5
+-echo $ECHO_N "checking whether guile works... $ECHO_C" >&6; }
++ { echo "$as_me:$LINENO: checking whether guile16 works" >&5
++echo $ECHO_N "checking whether guile16 works... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -26000,8 +26000,8 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+- #include <libguile.h>
+- #include <guile/gh.h>
++ #include <libguile16.h>
++ #include <guile16/gh.h>
+
+ int
+ main ()
+@@ -26104,8 +26104,8 @@
+
+
+ if test x${GUILE} = x ; then
+- # Extract the first word of "guile", so it can be a program name with args.
+-set dummy guile; ac_word=$2
++ # Extract the first word of "guile16", so it can be a program name with args.
++set dummy guile16; ac_word=$2
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_GUILE+set}" = set; then
+@@ -26243,8 +26243,8 @@
+
+
+ if test x${GUILE} = x ; then
+- # Extract the first word of "guile", so it can be a program name with args.
+-set dummy guile; ac_word=$2
++ # Extract the first word of "guile16", so it can be a program name with args.
++set dummy guile16; ac_word=$2
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_GUILE+set}" = set; then
+@@ -26391,20 +26391,20 @@
+
+ ### Check size of long_long - some guile's are broken.
+ { echo "$as_me:$LINENO: checking if guile long_long is at least as big as gint64" >&5
+-echo $ECHO_N "checking if guile long_long is at least as big as gint64... $ECHO_C" >&6; }
++echo $ECHO_N "checking if guile16 long_long is at least as big as gint64... $ECHO_C" >&6; }
+ GNC_OLDCFLAGS="$CFLAGS"
+ CFLAGS="${GNOME_CFLAGS} ${GUILE_INCS} ${CFLAGS} ${GLIB_CFLAGS}"
+ if test "$cross_compiling" = yes; then
+
+ { echo "$as_me:$LINENO: result: assuming yes" >&5
+ echo "${ECHO_T}assuming yes" >&6; }
+- { echo "$as_me:$LINENO: checking for scm_long_long2num in -lguile" >&5
+-echo $ECHO_N "checking for scm_long_long2num in -lguile... $ECHO_C" >&6; }
++ { echo "$as_me:$LINENO: checking for scm_long_long2num in -lguile16" >&5
++echo $ECHO_N "checking for scm_long_long2num in -lguile16... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_guile_scm_long_long2num+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lguile $LIBS"
++LIBS="-lguile16 $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -26477,7 +26477,7 @@
+ /* end confdefs.h. */
+
+ #include <glib.h>
+- #include <libguile/__scm.h>
++ #include <libguile16/__scm.h>
+ int main(int argc, char *argv[]) {
+ return(!(sizeof(long_long) >= sizeof(gint64)));
+ }
+@@ -26506,13 +26506,13 @@
+
+ { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+- { echo "$as_me:$LINENO: checking for scm_long_long2num in -lguile" >&5
+-echo $ECHO_N "checking for scm_long_long2num in -lguile... $ECHO_C" >&6; }
++ { echo "$as_me:$LINENO: checking for scm_long_long2num in -lguile16" >&5
++echo $ECHO_N "checking for scm_long_long2num in -lguile16... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_guile_scm_long_long2num+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lguile $LIBS"
++LIBS="-lguile16 $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -26704,8 +26704,8 @@
+
+ { echo "$as_me:$LINENO: checking if guile needs our copy of (guile www)" >&5
+ echo $ECHO_N "checking if guile needs our copy of (guile www)... $ECHO_C" >&6; }
+-# Extract the first word of "guile", so it can be a program name with args.
+-set dummy guile; ac_word=$2
++# Extract the first word of "guile16", so it can be a program name with args.
++set dummy guile16; ac_word=$2
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_GUILE+set}" = set; then
+@@ -26745,13 +26745,13 @@
+
+
+ if test "$GUILE" = "" ; then
+- { { echo "$as_me:$LINENO: error: guile required but not found" >&5
+-echo "$as_me: error: guile required but not found" >&2;}
++ { { echo "$as_me:$LINENO: error: guile16 required but not found" >&5
++echo "$as_me: error: guile16 required but not found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+- # Extract the first word of "guile-config", so it can be a program name with args.
+-set dummy guile-config; ac_word=$2
++ # Extract the first word of "guile16-config", so it can be a program name with args.
++set dummy guile16-config; ac_word=$2
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_GUILE_CONFIG+set}" = set; then
+@@ -26791,13 +26791,13 @@
+
+
+ if test "$GUILE_CONFIG" = "" ; then
+- { { echo "$as_me:$LINENO: error: guile-config required but not found" >&5
+-echo "$as_me: error: guile-config required but not found" >&2;}
++ { { echo "$as_me:$LINENO: error: guile16-config required but not found" >&5
++echo "$as_me: error: guile16-config required but not found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+- # Extract the first word of "guile-tools", so it can be a program name with args.
+-set dummy guile-tools; ac_word=$2
++ # Extract the first word of "guile16-tools", so it can be a program name with args.
++set dummy guile16-tools; ac_word=$2
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_GUILE_TOOLS+set}" = set; then
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080317/f4471f00/attachment-0001.html
More information about the macports-changes
mailing list