[40374] trunk/dports/gnome/gnucash

jmr at macports.org jmr at macports.org
Mon Sep 29 17:37:06 PDT 2008


Revision: 40374
          http://trac.macports.org/changeset/40374
Author:   jmr at macports.org
Date:     2008-09-29 17:37:06 -0700 (Mon, 29 Sep 2008)
Log Message:
-----------
gnucash: update to 2.2.7

Modified Paths:
--------------
    trunk/dports/gnome/gnucash/Portfile

Removed Paths:
-------------
    trunk/dports/gnome/gnucash/files/patch-enotsup.diff
    trunk/dports/gnome/gnucash/files/patch-gnc-backend-file.c.diff

Modified: trunk/dports/gnome/gnucash/Portfile
===================================================================
--- trunk/dports/gnome/gnucash/Portfile	2008-09-30 00:12:56 UTC (rev 40373)
+++ trunk/dports/gnome/gnucash/Portfile	2008-09-30 00:37:06 UTC (rev 40374)
@@ -4,8 +4,7 @@
 PortSystem        1.0
 
 name              gnucash
-version           2.2.5
-revision          1
+version           2.2.7
 
 categories        gnome x11
 maintainers       nomaintainer
@@ -25,39 +24,34 @@
 master_sites      sourceforge \
                   http://www.gnucash.org/pub/gnucash/sources/stable/
 use_bzip2         yes
-checksums         md5 81d8d115e27db96ab2b47727010ccdc4 \
-                  sha1 32acf9c980000fd851b543ac541a786ac36cf721
+checksums         md5 0f3f324c274b136070b769aa10591ccf \
+                  sha1 55aeb126de4b195b3a84b8fe88cc16e8679f3cc5 \
+                  rmd160 db6cf249ca8f2a2497d48b4a1815b6ae5c681b97
 
-depends_lib       lib:XML/Parser.pm:p5-xml-parser \
+depends_lib       port:p5-xml-parser \
                   path:${prefix}/lib/pkgconfig/glib-2.0.pc:glib2 \
                   port:gconf \
                   port:guile16 \
                   port:slib \
                   port:slib-guile16 \
-                  lib:libpopt:popt \
-                  lib:libgnomeui:libgnomeui \
-                  lib:libgnomeprintui:libgnomeprintui \
-                  lib:libgtkhtml-3:libgtkhtml3 \
-                  lib:libgsf:libgsf \
-                  lib:libgoffice-0.6:goffice \
-                  lib:aqbanking:aqbanking \
-                  lib:libofx:libofx \
-                  lib:Finance/Quote.pm:p5-finance-quote
+                  port:popt \
+                  port:libgnomeui \
+                  port:libgnomeprintui \
+                  port:libgtkhtml3 \
+                  port:libgsf \
+                  port:goffice \
+                  port:aqbanking \
+                  port:libofx \
+                  port:p5-finance-quote
 
-depends_build     bin:glibtoolize:libtool
+depends_build     port:libtool
 depends_run       port:evince
 
 configure.args    --disable-glibtest \
                   --disable-dependency-tracking --enable-hbci --enable-ofx
 
-patchfiles        patch-configure.diff patch-lib_libc_libc-missing-noop.c.diff \
-                  patch-gnc-backend-file.c.diff patch-enotsup.diff
+patchfiles        patch-configure.diff patch-lib_libc_libc-missing-noop.c.diff
 
-# patch-gnc-backend-file.c.diff and patch-enotsup.diff are needed to fix
-# ticket #16545. Corresponding upstream bugs:
-# http://bugzilla.gnome.org/show_bug.cgi?id=549595
-# http://bugzilla.gnome.org/show_bug.cgi?id=552306
-
 post-patch {
     reinplace "/^DYLD_LIBRARY_PATH/s|=\"|=\"/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources at -PATH_SEPARATOR-@|" ${worksrcpath}/src/bin/gnucash.in
     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
@@ -71,17 +65,17 @@
 }
 
 variant without_quotes description {Does not depend on building p5-finance-quote} {
-    depends_lib-delete  lib:Finance/Quote.pm:p5-finance-quote
+    depends_lib-delete  port:p5-finance-quote
 }
 
 variant without_hbci description {Disables HBCI support} {
-    depends_lib-delete  lib:aqbanking:aqbanking
+    depends_lib-delete  port:aqbanking
     configure.args-delete   --enable-hbci
     configure.args-append   --disable-hbci
 }
 
 variant without_ofx description {Disables ofx support} {
-    depends_lib-delete  lib:libofx:libofx
+    depends_lib-delete  port:libofx
     configure.args-delete   --enable-ofx
     configure.args-append   --disable-ofx
 }

Deleted: trunk/dports/gnome/gnucash/files/patch-enotsup.diff
===================================================================
--- trunk/dports/gnome/gnucash/files/patch-enotsup.diff	2008-09-30 00:12:56 UTC (rev 40373)
+++ trunk/dports/gnome/gnucash/files/patch-enotsup.diff	2008-09-30 00:37:06 UTC (rev 40374)
@@ -1,42 +0,0 @@
---- src/backend/file/gnc-backend-file.c	2008-09-14 22:55:04.000000000 -0400
-+++ src/backend/file/gnc-backend-file.c	2008-09-14 22:56:05.000000000 -0400
-@@ -143,16 +143,19 @@ gnc_file_be_get_file_lock (FileBackend *
-     rc = link (be->lockfile, pathbuf);
-     if (rc)
-     {
-         /* If hard links aren't supported, just allow the lock. */
-         if (errno == EPERM
- # ifdef EOPNOTSUPP
- 	    || errno == EOPNOTSUPP
- # endif
-+# ifdef ENOTSUP
-+	    || errno == ENOTSUP
-+# endif
- 	    )
-         {
-             be->linkfile = NULL;
-             return TRUE;
-         }
- 
-         /* Otherwise, something else is wrong. */
-         qof_backend_set_error ((QofBackend*)be, ERR_BACKEND_LOCKED);
-@@ -404,16 +407,19 @@ gnc_int_link_or_make_backup(FileBackend 
-       ;
-     if(err_ret != 0)
-     {
- #ifdef HAVE_LINK
-         if(errno == EPERM
- # ifdef EOPNOTSUPP
- 	   || errno == EOPNOTSUPP
- # endif
-+# ifdef ENOTSUP
-+	   || errno == ENOTSUP
-+# endif
- # ifdef ENOSYS   // catches http://bugzilla.gnome.org/show_bug.cgi?id=549595
- 	   || errno == ENOSYS
- # endif
- 	   )
- #endif
-         {
-             copy_success = copy_file(orig, bkup);
-         }

Deleted: trunk/dports/gnome/gnucash/files/patch-gnc-backend-file.c.diff
===================================================================
--- trunk/dports/gnome/gnucash/files/patch-gnc-backend-file.c.diff	2008-09-30 00:12:56 UTC (rev 40373)
+++ trunk/dports/gnome/gnucash/files/patch-gnc-backend-file.c.diff	2008-09-30 00:37:06 UTC (rev 40374)
@@ -1,31 +0,0 @@
-Index: src/backend/file/gnc-backend-file.c
-===================================================================
---- src/backend/file/gnc-backend-file.c	(Revision 17479)
-+++ src/backend/file/gnc-backend-file.c	(Arbeitskopie)
-@@ -395,6 +395,7 @@
- static gboolean
- gnc_int_link_or_make_backup(FileBackend *be, const char *orig, const char *bkup)
- {
-+    gboolean copy_success = FALSE;
-     int err_ret = 
- #ifdef HAVE_LINK
-       link (orig, bkup)
-@@ -409,13 +410,16 @@
- # ifdef EOPNOTSUPP
- 	   || errno == EOPNOTSUPP
- # endif
-+# ifdef ENOSYS   // catches http://bugzilla.gnome.org/show_bug.cgi?id=549595
-+	   || errno == ENOSYS
-+# endif
- 	   )
- #endif
-         {
--            err_ret = copy_file(orig, bkup);
-+            copy_success = copy_file(orig, bkup);
-         }
- 
--        if(!err_ret)
-+        if(!copy_success)
-         {
-             qof_backend_set_error((QofBackend*)be, ERR_FILEIO_BACKUP_ERROR);
-             PWARN ("unable to make file backup from %s to %s: %s", 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080929/e88232bd/attachment.html 


More information about the macports-changes mailing list