[49466] trunk/dports/devel/glib2

[ryandesign at macports.org]

Revision: 49466
          http://trac.macports.org/changeset/49466
Author:   ryandesign at macports.org
Date:     2009-04-10 04:58:39 -0700 (Fri, 10 Apr 2009)
Log Message:
-----------
glib2: fix location of MIME stuff; see #19263

Modified Paths:
--------------
    trunk/dports/devel/glib2/Portfile

Added Paths:
-----------
    trunk/dports/devel/glib2/files/patch-gio_xdgmime_xdgmime.c.diff

Modified: trunk/dports/devel/glib2/Portfile
===================================================================
--- trunk/dports/devel/glib2/Portfile	2009-04-10 11:57:36 UTC (rev 49465)
+++ trunk/dports/devel/glib2/Portfile	2009-04-10 11:58:39 UTC (rev 49466)
@@ -6,6 +6,7 @@
 name                    glib2
 set my_name             glib
 version                 2.20.0
+revision                1
 set branch              [join [lrange [split ${version} .] 0 1] .]
 categories              devel
 maintainers             ryandesign
@@ -36,7 +37,8 @@
 # See http://trac.macports.org/changeset/27148
 patchfiles \
     patch-glib-2.0.pc.in.diff \
-    patch-gi18n.h.diff
+    patch-gi18n.h.diff \
+    patch-gio_xdgmime_xdgmime.c.diff
 
 if { ${os.major} < 9 } {
     # Prior to Leopard, which returns 0 even if it can not find the program.
@@ -67,6 +69,7 @@
 post-patch {
     reinplace "s|data_dirs = \"/usr|data_dirs = \"${prefix}/share:/usr|g" ${worksrcpath}/glib/gutils.c
     reinplace "s|path = \"/bin|path = \"${prefix}/bin:/bin|g" ${worksrcpath}/glib/gutils.c ${worksrcpath}/glib/gspawn.c
+    reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/gio/xdgmime/xdgmime.c
 
     # Allow endian.h to be found.
     #reinplace "s|endian.h|machine/endian.h|g" ${worksrcpath}/configure

Added: trunk/dports/devel/glib2/files/patch-gio_xdgmime_xdgmime.c.diff
===================================================================
--- trunk/dports/devel/glib2/files/patch-gio_xdgmime_xdgmime.c.diff	                        (rev 0)
+++ trunk/dports/devel/glib2/files/patch-gio_xdgmime_xdgmime.c.diff	2009-04-10 11:58:39 UTC (rev 49466)
@@ -0,0 +1,11 @@
+--- gio/xdgmime/xdgmime.c.orig	2009-03-12 22:09:52.000000000 -0600
++++ gio/xdgmime/xdgmime.c	2009-04-09 23:41:01.000000000 -0600
+@@ -257,7 +257,7 @@
+ 
+   xdg_data_dirs = getenv ("XDG_DATA_DIRS");
+   if (xdg_data_dirs == NULL)
+-    xdg_data_dirs = "/usr/local/share/:/usr/share/";
++    xdg_data_dirs = "@@PREFIX@@/share/:/usr/share/";
+ 
+   ptr = xdg_data_dirs;
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090410/5c834c35/attachment.html>