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

[ryandesign at macports.org]

Revision: 42805
          http://trac.macports.org/changeset/42805
Author:   ryandesign at macports.org
Date:     2008-11-30 20:28:15 -0800 (Sun, 30 Nov 2008)
Log Message:
-----------
glib2: fix the "which" patch from r42728; see #17418

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	2008-12-01 04:20:28 UTC (rev 42804)
+++ trunk/dports/devel/glib2/files/patch-which.diff	2008-12-01 04:28:15 UTC (rev 42805)
@@ -1,4 +1,64 @@
 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 @@
+ 	    mv -f $${installdir}/$(DOC_MODULE).devhelp \
+ 	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
+ 	  fi; \
+-	  ! which gtkdoc-rebase >/dev/null 2>&1 || \
++	  ! test -x "`which gtkdoc-rebase`" || \
+ 	    gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \
+ 	fi
+ 
+@@ -769,7 +769,7 @@
+ 	-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
+ 	-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+ 	cd $(distdir) && rm -f $(DISTCLEANFILES)
+-	! which gtkdoc-rebase >/dev/null 2>&1 || \
++	! test -x "`which gtkdoc-rebase`" || \
+ 	  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 @@
+ 	    mv -f $${installdir}/$(DOC_MODULE).devhelp \
+ 	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
+ 	  fi; \
+-	  ! which gtkdoc-rebase >/dev/null 2>&1 || \
++	  ! test -x "`which gtkdoc-rebase`" || \
+ 	    gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \
+ 	fi
+ 
+@@ -801,7 +801,7 @@
+ 	-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
+ 	-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+ 	cd $(distdir) && rm -f $(DISTCLEANFILES)
+-	! which gtkdoc-rebase >/dev/null 2>&1 || \
++	! test -x "`which gtkdoc-rebase`" || \
+ 	  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 @@
+ 	    mv -f $${installdir}/$(DOC_MODULE).devhelp \
+ 	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
+ 	  fi; \
+-	  ! which gtkdoc-rebase >/dev/null 2>&1 || \
++	  ! test -x "`which gtkdoc-rebase`" || \
+ 	    gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \
+ 	fi
+ 
+@@ -784,7 +784,7 @@
+ 	-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
+ 	-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+ 	cd $(distdir) && rm -f $(DISTCLEANFILES)
+-	! which gtkdoc-rebase >/dev/null 2>&1 || \
++	! test -x "`which gtkdoc-rebase`" || \
+ 	  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
 @@ -4,7 +4,7 @@
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081130/56e80756/attachment-0001.html>