[33829] trunk/dports/gnome/gnome-vfs

nox at macports.org nox at macports.org
Wed Feb 6 08:07:50 PST 2008


Revision: 33829
          http://trac.macosforge.org/projects/macports/changeset/33829
Author:   nox at macports.org
Date:     2008-02-06 08:07:17 -0800 (Wed, 06 Feb 2008)

Log Message:
-----------
gnome-vfs:
 * Avahi support is now a variant (avahi service conflicts with Bonjour).
 * Empty patch removed (the patch was an empty file).
 * Reorganised platform code.
 * Use of open64(), posix_fadvise() and kerberos 5 is now disabled directly
   through configure.args.
 * Fixed xdg_data_dirs variable.
 * neon removed from the lib dependencies as gnome-vfs uses its own embedded library.

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

Removed Paths:
-------------
    trunk/dports/gnome/gnome-vfs/files/patch-xdgmimecache.c

Modified: trunk/dports/gnome/gnome-vfs/Portfile
===================================================================
--- trunk/dports/gnome/gnome-vfs/Portfile	2008-02-06 15:42:31 UTC (rev 33828)
+++ trunk/dports/gnome/gnome-vfs/Portfile	2008-02-06 16:07:17 UTC (rev 33829)
@@ -4,6 +4,7 @@
 
 name            gnome-vfs
 version         2.20.1
+revision        1
 maintainers     nomaintainer
 categories      gnome
 platforms       darwin 
@@ -22,10 +23,7 @@
                 sha1 03afa10e84425f7f38e05f0db0ecf55ae5fb7b15 \
                 rmd160 faa5fffb5495d1e161cb6c3b47612cf39cbb1629
 
-depends_lib     port:gnome-mime-data \
-                port:gconf \
-                port:avahi \
-                port:neon \
+depends_lib     port:gconf \
                 port:dbus \
                 port:openssl \
                 port:libidl \
@@ -34,63 +32,59 @@
                 port:libiconv \
                 port:gettext
 
+depends_run     port:gnome-mime-data
 
-configure.args  --mandir=${prefix}/share/man \
-                --enable-ipv6 \
+configure.args  --enable-ipv6 \
                 --disable-howl \
+                --disable-avahi \
                 --with-openssl-libs=${prefix}/lib \
                 --with-openssl-includes=${prefix}/include \
-                --disable-gnutls
+                --disable-gnutls \
+                ac_cv_func_open64=no \
+                ac_cv_func_posix_fadvise=no \
+                ac_cv_path_KRB5_CONFIG=none
+                
 
 configure.ldflags-append    -lresolv
 
 post-patch {
-    reinplace "s|open64||g" ${worksrcpath}/configure
-    reinplace "s|posix_fadvise||g" ${worksrcpath}/configure
-    reinplace "s|data_dirs = \"/usr|data_dirs = \"${prefix}/share:/usr|g" \
-        ${worksrcpath}/libgnomevfs/xdgmime.c \
-        ${worksrcpath}/libgnomevfs/gnome-vfs-mime-info.c 
-    reinplace "s|\"/etc/fstab\"|\"/etc/fstab.hd\"|g" \
+    reinplace -E "/xdg_data_dirs =/s|\"\[^\"\]*\"|\"${prefix}/share\"|" \
+        ${worksrcpath}/libgnomevfs/xdgmime.c
+
+    reinplace "s|/etc/fstab|/etc/fstab.hd|" \
         ${worksrcpath}/libgnomevfs/gnome-vfs-unix-mounts.c
+}
 
-    if {[variant_isset darwin_6]} {
+platform darwin 6 {
+    post-patch {
         reinplace "s|#include <arpa/nameser.h>|#include <arpa/nameser.h>\\
         #ifndef T_SRV\\
         #define T_SRV 33\\
         #endif|g" \
             ${worksrcpath}/libgnomevfs/gnome-vfs-dns-sd.c 
+
         reinplace "s|#include <limits.h>|#include <limits.h>\\
         #if \!defined getc_unlocked \\&\\& \!defined HAVE_GETC_UNLOCKED\\
         #define getc_unlocked(fp) getc (fp)\\
         #endif|g" \
             ${worksrcpath}/libgnomevfs/xdgmimemagic.c
+
         reinplace "s|socklen_t|int|g" ${worksrcpath}/modules/ftp-method.c
     }
-    
-    if {[variant_isset darwin_7]} {
-        reinplace "s|#include <stdio.h>|#include <stdio.h>\\
-        #include <stdint.h>|g" ${worksrcpath}/libgnomevfs/xdgmimecache.c
-    }
 
+    configure.ldflags-delete    -lresolv
 }
 
-pre-build {
-    reinplace "s|-lkrb5support||g" \
-        ${worksrcpath}/Makefile ${worksrcpath}/daemon/Makefile \
-        ${worksrcpath}/devel-docs/Makefile ${worksrcpath}/doc/Makefile \
-        ${worksrcpath}/devel-docs/gnome-vfs-tutorial/Makefile \
-        ${worksrcpath}/imported/Makefile ${worksrcpath}/imported/neon/Makefile \
-        ${worksrcpath}/libgnomevfs/Makefile ${worksrcpath}/modules/Makefile \
-        ${worksrcpath}/schemas/Makefile 
-}
+platform darwin 7 {
+    patchfiles-append   patch-modules_file-method-acl.c.diff
 
-platform darwin 6 {
-    patchfiles-append   patch-xdgmimecache.c
-
-    configure.ldflags-delete    -lresolv
+    post-patch {
+        reinplace "s|#include <stdio.h>|#include <stdio.h>\\
+        #include <stdint.h>|g" ${worksrcpath}/libgnomevfs/xdgmimecache.c
+    }
 }
 
-platform darwin 7 {
-    patchfiles-append   patch-xdgmimecache.c \
-                        patch-modules_file-method-acl.c.diff
+variant avahi description {Enable Bonjour through avahi} {
+    depends_lib-append      port:avahi
+    configure.args-delete   --disable-avahi
 }

Deleted: trunk/dports/gnome/gnome-vfs/files/patch-xdgmimecache.c
===================================================================

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080206/895117f6/attachment-0001.html


More information about the macports-changes mailing list