[49467] trunk/dports/devel/glib2-devel

[ryandesign at macports.org]

Revision: 49467
          http://trac.macports.org/changeset/49467
Author:   ryandesign at macports.org
Date:     2009-04-10 05:32:07 -0700 (Fri, 10 Apr 2009)
Log Message:
-----------
glib2-devel: merge r49466 from glib2: fix location of MIME stuff; see #19263

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

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

Property Changed:
----------------
    trunk/dports/devel/glib2-devel/
    trunk/dports/devel/glib2-devel/files/
    trunk/dports/devel/glib2-devel/files/patch-child-test.c.diff
    trunk/dports/devel/glib2-devel/files/patch-which.diff


Property changes on: trunk/dports/devel/glib2-devel
___________________________________________________________________
Added: svn:mergeinfo
   + /trunk/dports/devel/glib2:49466

Modified: trunk/dports/devel/glib2-devel/Portfile
===================================================================
--- trunk/dports/devel/glib2-devel/Portfile	2009-04-10 11:58:39 UTC (rev 49466)
+++ trunk/dports/devel/glib2-devel/Portfile	2009-04-10 12:32:07 UTC (rev 49467)
@@ -6,6 +6,7 @@
 name                    glib2-devel
 set my_name             glib
 version                 2.19.6
+revision                1
 set branch              [join [lrange [split ${version} .] 0 1] .]
 categories              devel
 maintainers             ryandesign
@@ -37,6 +38,7 @@
     patch-glib-2.0.pc.in.diff \
     patch-gutils.c.diff \
     patch-gi18n.h.diff \
+    patch-gio_xdgmime_xdgmime.c.diff \
     patch-which.diff
 
 depends_build \
@@ -93,6 +95,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
 }
 
 platform darwin {


Property changes on: trunk/dports/devel/glib2-devel/files
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/dports/devel/glib2/files:41475
   + /trunk/dports/devel/glib2/files:41475,49466


Property changes on: trunk/dports/devel/glib2-devel/files/patch-child-test.c.diff
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/dports/devel/glib2/files/patch-child-test.c.diff:49466

Copied: trunk/dports/devel/glib2-devel/files/patch-gio_xdgmime_xdgmime.c.diff (from rev 49466, trunk/dports/devel/glib2/files/patch-gio_xdgmime_xdgmime.c.diff)
===================================================================
--- trunk/dports/devel/glib2-devel/files/patch-gio_xdgmime_xdgmime.c.diff	                        (rev 0)
+++ trunk/dports/devel/glib2-devel/files/patch-gio_xdgmime_xdgmime.c.diff	2009-04-10 12:32:07 UTC (rev 49467)
@@ -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;
+ 


Property changes on: trunk/dports/devel/glib2-devel/files/patch-which.diff
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/dports/devel/glib2/files/patch-which.diff:49466
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090410/d8ef7204/attachment.html>