[50708] trunk/dports/x11/gtk2

[nox at macports.org]

Revision: 50708
          http://trac.macports.org/changeset/50708
Author:   nox at macports.org
Date:     2009-05-07 05:19:46 -0700 (Thu, 07 May 2009)
Log Message:
-----------
gtk2: Remove gtk-doc dependency (closes #19476).

Modified Paths:
--------------
    trunk/dports/x11/gtk2/Portfile

Added Paths:
-----------
    trunk/dports/x11/gtk2/files/patch-which-gtkdoc-rebase.diff

Modified: trunk/dports/x11/gtk2/Portfile
===================================================================
--- trunk/dports/x11/gtk2/Portfile	2009-05-07 12:04:42 UTC (rev 50707)
+++ trunk/dports/x11/gtk2/Portfile	2009-05-07 12:19:46 UTC (rev 50708)
@@ -6,7 +6,7 @@
 
 name            gtk2
 version         2.16.1
-revision        2
+revision        3
 set branch      [join [lrange [split ${version} .] 0 1] .]
 categories      x11
 maintainers     nox openmaintainer
@@ -68,10 +68,10 @@
 
 patchfiles      patch-gtk-builder-convert.diff \
                 patch-modules-gail.diff \
-                patch-modules-printbackends.diff
+                patch-modules-printbackends.diff \
+                patch-which-gtkdoc-rebase.diff
 
-depends_build   port:pkgconfig \
-                port:gtk-doc
+depends_build   port:pkgconfig
 
 depends_lib     path:lib/pkgconfig/cairo.pc:cairo \
                 port:fontconfig \

Added: trunk/dports/x11/gtk2/files/patch-which-gtkdoc-rebase.diff
===================================================================
--- trunk/dports/x11/gtk2/files/patch-which-gtkdoc-rebase.diff	                        (rev 0)
+++ trunk/dports/x11/gtk2/files/patch-which-gtkdoc-rebase.diff	2009-05-07 12:19:46 UTC (rev 50708)
@@ -0,0 +1,100 @@
+--- docs/reference/gdk/Makefile.in	2009-05-07 12:29:07.000000000 +0200
++++ docs/reference/gdk/Makefile.in	2009-05-07 12:33:45.000000000 +0200
+@@ -929,7 +929,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
+ 
+@@ -959,7 +959,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/gdk-pixbuf/Makefile.in	2009-05-07 12:29:07.000000000 +0200
++++ docs/reference/gdk-pixbuf/Makefile.in	2009-05-07 12:33:45.000000000 +0200
+@@ -913,7 +913,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
+ 
+@@ -943,7 +943,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/gtk/Makefile.in	2009-05-07 12:29:08.000000000 +0200
++++ docs/reference/gtk/Makefile.in	2009-05-07 12:33:45.000000000 +0200
+@@ -1197,7 +1197,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
+ 
+@@ -1227,7 +1227,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/libgail-util/Makefile.in	2009-05-07 12:29:09.000000000 +0200
++++ docs/reference/libgail-util/Makefile.in	2009-05-07 12:33:45.000000000 +0200
+@@ -805,7 +805,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
+ 
+@@ -835,7 +835,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
+--- gtk-doc.make	2009-05-07 12:29:11.000000000 +0200
++++ gtk-doc.make	2009-05-07 12:33:45.000000000 +0200
+@@ -157,7 +157,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
+ 
+@@ -190,7 +190,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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090507/42e601b3/attachment.html>