[51358] trunk/dports/devel/glib2/files/patch-which.diff

[ryandesign at macports.org]

Revision: 51358
          http://trac.macports.org/changeset/51358
Author:   ryandesign at macports.org
Date:     2009-05-23 05:15:42 -0700 (Sat, 23 May 2009)
Log Message:
-----------
glib2: update patch-which.diff so it applies cleanly

Modified Paths:
--------------
    trunk/dports/devel/glib2/files/patch-which.diff

Modified: trunk/dports/devel/glib2/files/patch-which.diff
===================================================================
--- trunk/dports/devel/glib2/files/patch-which.diff	2009-05-23 12:11:09 UTC (rev 51357)
+++ trunk/dports/devel/glib2/files/patch-which.diff	2009-05-23 12:15:42 UTC (rev 51358)
@@ -1,7 +1,7 @@
-Use "which" in a way that works on Mac OS X. See #17418.
---- docs/reference/gio/Makefile.in	2008-11-23 23:49:55.000000000 -0600
-+++ docs/reference/gio/Makefile.in	2008-11-30 22:09:12.000000000 -0600
-@@ -739,7 +739,7 @@
+Use "which" in a way that works on Mac OS X 10.4.x and earlier. See #17418.
+--- docs/reference/gio/Makefile.in	2009-05-16 21:53:56.000000000 -0500
++++ docs/reference/gio/Makefile.in	2009-05-23 07:12:03.000000000 -0500
+@@ -740,7 +740,7 @@
  	    mv -f $${installdir}/$(DOC_MODULE).devhelp \
  	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
  	  fi; \
@@ -10,7 +10,7 @@
  	    gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \
  	fi
  
-@@ -769,7 +769,7 @@
+@@ -770,7 +770,7 @@
  	-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
  	-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
  	cd $(distdir) && rm -f $(DISTCLEANFILES)
@@ -19,9 +19,9 @@
  	  gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
  
  .PHONY : dist-hook-local docs
---- docs/reference/glib/Makefile.in	2008-11-23 23:49:56.000000000 -0600
-+++ docs/reference/glib/Makefile.in	2008-11-30 22:09:02.000000000 -0600
-@@ -771,7 +771,7 @@
+--- docs/reference/glib/Makefile.in	2009-05-16 21:53:56.000000000 -0500
++++ docs/reference/glib/Makefile.in	2009-05-23 07:12:03.000000000 -0500
+@@ -772,7 +772,7 @@
  	    mv -f $${installdir}/$(DOC_MODULE).devhelp \
  	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
  	  fi; \
@@ -30,7 +30,7 @@
  	    gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \
  	fi
  
-@@ -801,7 +801,7 @@
+@@ -802,7 +802,7 @@
  	-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
  	-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
  	cd $(distdir) && rm -f $(DISTCLEANFILES)
@@ -39,9 +39,9 @@
  	  gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
  
  .PHONY : dist-hook-local docs
---- docs/reference/gobject/Makefile.in	2008-11-23 23:49:56.000000000 -0600
-+++ docs/reference/gobject/Makefile.in	2008-11-30 22:08:55.000000000 -0600
-@@ -754,7 +754,7 @@
+--- docs/reference/gobject/Makefile.in	2009-05-16 21:53:56.000000000 -0500
++++ docs/reference/gobject/Makefile.in	2009-05-23 07:12:03.000000000 -0500
+@@ -755,7 +755,7 @@
  	    mv -f $${installdir}/$(DOC_MODULE).devhelp \
  	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
  	  fi; \
@@ -50,7 +50,7 @@
  	    gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \
  	fi
  
-@@ -784,7 +784,7 @@
+@@ -785,7 +785,7 @@
  	-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
  	-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
  	cd $(distdir) && rm -f $(DISTCLEANFILES)
@@ -59,8 +59,8 @@
  	  gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
  
  .PHONY : dist-hook-local docs
---- gio/pltcheck.sh	2008-11-23 23:45:19.000000000 -0600
-+++ gio/pltcheck.sh	2008-11-28 15:37:06.000000000 -0600
+--- gio/pltcheck.sh	2009-05-16 19:56:51.000000000 -0500
++++ gio/pltcheck.sh	2009-05-23 07:12:03.000000000 -0500
 @@ -4,7 +4,7 @@
  
  status=0
@@ -70,8 +70,8 @@
  	echo "'readelf' not found; skipping test"
  	exit 0
  fi
---- glib/pltcheck.sh	2008-11-23 23:45:23.000000000 -0600
-+++ glib/pltcheck.sh	2008-11-28 15:37:05.000000000 -0600
+--- glib/pltcheck.sh	2009-03-31 18:04:20.000000000 -0500
++++ glib/pltcheck.sh	2009-05-23 07:12:03.000000000 -0500
 @@ -4,7 +4,7 @@
  
  status=0
@@ -81,8 +81,8 @@
  	echo "'readelf' not found; skipping test"
  	exit 0
  fi
---- gobject/pltcheck.sh	2008-11-23 23:45:24.000000000 -0600
-+++ gobject/pltcheck.sh	2008-11-28 15:37:00.000000000 -0600
+--- gobject/pltcheck.sh	2009-03-31 18:04:20.000000000 -0500
++++ gobject/pltcheck.sh	2009-05-23 07:12:03.000000000 -0500
 @@ -4,7 +4,7 @@
  
  status=0
@@ -92,8 +92,8 @@
  	echo "'readelf' not found; skipping test"
  	exit 0
  fi
---- gtk-doc.make	2008-11-24 01:03:18.000000000 -0600
-+++ gtk-doc.make	2008-11-28 15:36:02.000000000 -0600
+--- gtk-doc.make	2009-05-16 22:25:13.000000000 -0500
++++ gtk-doc.make	2009-05-23 07:12:03.000000000 -0500
 @@ -157,7 +157,7 @@
  	    mv -f $${installdir}/$(DOC_MODULE).devhelp \
  	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090523/4669e95e/attachment.html>