Fix shell syntax. Has been fixed differently upstream, these patches can

go when the next version is released.

5 files changed, 65 insertions, 1 deletions

diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo
index 41814eea5d1..03842e055d7 100644
--- a/x11/gtk2/distinfo
+++ b/x11/gtk2/distinfo
@@ -1,9 +1,13 @@
-$NetBSD: distinfo,v 1.107 2009/01/12 02:08:46 jmcneill Exp $
+$NetBSD: distinfo,v 1.108 2009/01/19 23:23:54 sketch Exp $
 
 SHA1 (gtk+-2.14.7.tar.bz2) = f4b9c65dbdc78cad6fc9b601640cbad1d3abb57f
 RMD160 (gtk+-2.14.7.tar.bz2) = 2ed6451d3de050e9b2423f6509d15e39ba69a6ab
 Size (gtk+-2.14.7.tar.bz2) = 17475873 bytes
 SHA1 (patch-aa) = 507f43c8257607c3ddb194015cc67c5b166a5047
+SHA1 (patch-ab) = 075dcdceeeea06d93802643b9bd2c23f0ee32a64
+SHA1 (patch-ac) = 81765fc056a25c5b53a7223ea62f6f98a6da6104
+SHA1 (patch-ad) = b28feb33311f4b42bdeeae257a470edd677d5c15
+SHA1 (patch-ae) = 33e5411076362295329f82e2106e1cd7f0529863
 SHA1 (patch-aj) = 4e36ab908ae14d81bd62c3eb170be87f14bb6a35
 SHA1 (patch-gb) = 6c0728eda2d4a59add4f8962bdab4f05022eda79
 SHA1 (patch-ob) = 51cbaa82d534ca4ea5253e3a938daa3a5d1e05fb
diff --git a/x11/gtk2/patches/patch-ab b/x11/gtk2/patches/patch-ab
new file mode 100644
index 00000000000..105a1254927
--- /dev/null
+++ b/x11/gtk2/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.20 2009/01/19 23:23:54 sketch Exp $
+
+--- docs/reference/gdk/Makefile.in.orig	Mon Jan 19 22:47:18 2009
++++ docs/reference/gdk/Makefile.in	Mon Jan 19 22:48:45 2009
+@@ -925,8 +925,9 @@
+ 	    mv -f $${installdir}/$(DOC_MODULE).devhelp \
+ 	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
+ 	  fi; \
+-	  ! which gtkdoc-rebase >/dev/null 2>&1 || \
++	  if type gtkdoc-rebase >/dev/null 2>&1; then \
+ 	    gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \
++	  fi; \
+ 	fi
+ 
+ uninstall-local:
diff --git a/x11/gtk2/patches/patch-ac b/x11/gtk2/patches/patch-ac
new file mode 100644
index 00000000000..3a7a714ddaf
--- /dev/null
+++ b/x11/gtk2/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.17 2009/01/19 23:23:54 sketch Exp $
+
+--- docs/reference/gtk/Makefile.in.orig	Mon Jan 19 22:51:09 2009
++++ docs/reference/gtk/Makefile.in	Mon Jan 19 22:51:34 2009
+@@ -1179,8 +1179,9 @@
+ 	    mv -f $${installdir}/$(DOC_MODULE).devhelp \
+ 	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
+ 	  fi; \
+-	  ! which gtkdoc-rebase >/dev/null 2>&1 || \
++	  if type gtkdoc-rebase >/dev/null 2>&1; then \
+ 	    gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \
++	  fi; \
+ 	fi
+ 
+ uninstall-local:
diff --git a/x11/gtk2/patches/patch-ad b/x11/gtk2/patches/patch-ad
new file mode 100644
index 00000000000..1e1d57b721c
--- /dev/null
+++ b/x11/gtk2/patches/patch-ad
@@ -0,0 +1,15 @@
+$NetBSD: patch-ad,v 1.16 2009/01/19 23:23:54 sketch Exp $
+
+--- docs/reference/gdk-pixbuf/Makefile.in.orig	Mon Jan 19 22:52:18 2009
++++ docs/reference/gdk-pixbuf/Makefile.in	Mon Jan 19 22:52:48 2009
+@@ -909,8 +909,9 @@
+ 	    mv -f $${installdir}/$(DOC_MODULE).devhelp \
+ 	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
+ 	  fi; \
+-	  ! which gtkdoc-rebase >/dev/null 2>&1 || \
++	  if type gtkdoc-rebase >/dev/null 2>&1; then \
+ 	    gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \
++	  fi; \
+ 	fi
+ 
+ uninstall-local:
diff --git a/x11/gtk2/patches/patch-ae b/x11/gtk2/patches/patch-ae
new file mode 100644
index 00000000000..5d3b77baae7
--- /dev/null
+++ b/x11/gtk2/patches/patch-ae
@@ -0,0 +1,15 @@
+$NetBSD: patch-ae,v 1.17 2009/01/19 23:23:54 sketch Exp $
+
+--- docs/reference/libgail-util/Makefile.in.orig	Mon Jan 19 22:53:27 2009
++++ docs/reference/libgail-util/Makefile.in	Mon Jan 19 22:53:41 2009
+@@ -801,8 +801,9 @@
+ 	    mv -f $${installdir}/$(DOC_MODULE).devhelp \
+ 	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
+ 	  fi; \
+-	  ! which gtkdoc-rebase >/dev/null 2>&1 || \
++	  if type gtkdoc-rebase >/dev/null 2>&1; then \
+ 	    gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \
++	  fi; \
+ 	fi
+ 
+ uninstall-local: