[61949] trunk/dports/x11/gtk2

nox at macports.org nox at macports.org
Thu Dec 24 12:51:20 PST 2009 

Revision: 61949
          http://trac.macports.org/changeset/61949
Author:   nox at macports.org
Date:     2009-12-24 12:51:19 -0800 (Thu, 24 Dec 2009)
Log Message:
-----------
Update gtk2 to 2.18.5

This should also fix #22968.

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

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

Modified: trunk/dports/x11/gtk2/Portfile
===================================================================
--- trunk/dports/x11/gtk2/Portfile	2009-12-24 20:51:08 UTC (rev 61948)
+++ trunk/dports/x11/gtk2/Portfile	2009-12-24 20:51:19 UTC (rev 61949)
@@ -5,8 +5,7 @@
 PortGroup       muniversal 1.0
 
 name            gtk2
-version         2.18.2
-revision        1
+version         2.18.5
 set branch      [join [lrange [split ${version} .] 0 1] .]
 categories      x11
 maintainers     nox openmaintainer
@@ -57,14 +56,13 @@
     }
 }
 
-checksums       md5     9477986b58d7ee5e559b96e7a124bead \
-                sha1    f33b9c67541de024fa3867ab41de3e25ec6d52d4 \
-                rmd160  c5efa81dadc75c87bc9c7c2725b193f88779b06f
+checksums       md5     3047875309f7f6030e03b0a95cf99c8c \
+                sha1    ddb004f0f92f7c8e3b84237e05fcf0ef5affc79c \
+                rmd160  712098237fc31dcb99189645f0320aa165855577
 
 patchfiles      patch-gtk-builder-convert.diff \
                 patch-modules-gail.diff \
-                patch-modules-printbackends.diff \
-                patch-which-gtkdoc-rebase.diff
+                patch-modules-printbackends.diff
 
 depends_build   port:pkgconfig
 
@@ -133,7 +131,7 @@
             GDK_PIXBUF_MODULE_FILE=${worksrcpath}-${run_arch}/gdk-pixbuf/gdk-pixbuf.loaders
     }
 
-    post-configure {
+    pre-configure {
         # Let gtk_host in .pc files be the same on all architectures
         foreach arch ${host_archs} {
             if { [lsearch ${universal_archs_to_use} ${arch}] >= 0 } {
@@ -148,8 +146,7 @@
         }
     }
 }
-    
-configure.ccache            no
+
 configure.cppflags-append   -DX_LOCALE
 configure.cflags-append     -fstrict-aliasing
 

Deleted: trunk/dports/x11/gtk2/files/patch-which-gtkdoc-rebase.diff
===================================================================
--- trunk/dports/x11/gtk2/files/patch-which-gtkdoc-rebase.diff	2009-12-24 20:51:08 UTC (rev 61948)
+++ trunk/dports/x11/gtk2/files/patch-which-gtkdoc-rebase.diff	2009-12-24 20:51:19 UTC (rev 61949)
@@ -1,100 +0,0 @@
---- 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/20091224/43f1a9d9/attachment.html>

More information about the macports-changes mailing list