Hi.
This diff updates gtk to the latest bugfix release: 2.14.7.
Comments/OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/gtk+2/Makefile,v
retrieving revision 1.74
diff -u -r1.74 Makefile
--- Makefile 20 Dec 2008 19:37:19 -0000 1.74
+++ Makefile 9 Jan 2009 13:39:10 -0000
@@ -6,9 +6,9 @@
COMMENT-docs= gtk+2 documentation
COMMENT-cups= gtk+2 CUPS print backend
-VERSION= 2.14.5
+VERSION= 2.14.7
DISTNAME= gtk+-${VERSION}
-PKGNAME-main= gtk+2-${VERSION}p1
+PKGNAME-main= gtk+2-${VERSION}
PKGNAME-docs= gtk+2-docs-${VERSION}
PKGNAME-cups= gtk+2-cups-${VERSION}
CATEGORIES= x11 devel
@@ -71,6 +71,8 @@
--with-xinput=yes
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include/freetype2/
-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
LDFLAGS="-L${LOCALBASE}/lib"
+
+FAKE_FLAGS= sysconfdir=${PREFIX}/share/examples/gtk+2
# The regression tests require a running instance of X.
# You will also need to set the XAUTHORITY environment variable to point
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/gtk+2/distinfo,v
retrieving revision 1.39
diff -u -r1.39 distinfo
--- distinfo 25 Nov 2008 13:14:08 -0000 1.39
+++ distinfo 9 Jan 2009 13:39:10 -0000
@@ -1,5 +1,5 @@
-MD5 (gtk+-2.14.5.tar.bz2) = GxtderWiXoRoLLJ+5ICKQA==
-RMD160 (gtk+-2.14.5.tar.bz2) = CKatimCaYhT5ocPFLCbqv5fjIOw=
-SHA1 (gtk+-2.14.5.tar.bz2) = a3qYiAdifV9OcKL8W1bHgy/j4bQ=
-SHA256 (gtk+-2.14.5.tar.bz2) = BdAd/OUc2WzXzkTDp3wgCnDydVGRXTcs/C3jLKlVDFE=
-SIZE (gtk+-2.14.5.tar.bz2) = 17426317
+MD5 (gtk+-2.14.7.tar.bz2) = +xYU1LKtunsHji55m122BA==
+RMD160 (gtk+-2.14.7.tar.bz2) = LtZFHT3gUOmyQj9lCdFeObpppqs=
+SHA1 (gtk+-2.14.7.tar.bz2) = 9LnGXb3HjK1vybYBZAy60dOrtX8=
+SHA256 (gtk+-2.14.7.tar.bz2) = 6C9HKOUtuvw1cTt1XrhjpH3BVTNJEt2gJA3D3pywfhQ=
+SIZE (gtk+-2.14.7.tar.bz2) = 17475873
Index: patches/patch-demos_Makefile_in
===================================================================
RCS file: /cvs/ports/x11/gtk+2/patches/patch-demos_Makefile_in,v
retrieving revision 1.17
diff -u -r1.17 patch-demos_Makefile_in
--- patches/patch-demos_Makefile_in 25 Nov 2008 13:14:08 -0000 1.17
+++ patches/patch-demos_Makefile_in 9 Jan 2009 13:39:10 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-demos_Makefile_in,v 1.17 2008/11/25 13:14:08 jasper Exp $
---- demos/Makefile.in.orig Mon Nov 24 07:41:38 2008
-+++ demos/Makefile.in Tue Nov 25 11:50:20 2008
-@@ -968,6 +968,7 @@ test-report perf-report full-report: ${TEST_PROGS}
+--- demos/Makefile.in.orig Wed Jan 7 22:52:01 2009
++++ demos/Makefile.in Fri Jan 9 13:28:02 2009
+@@ -964,6 +964,7 @@ test-report perf-report full-report: ${TEST_PROGS}
check-local: test
test-inline-pixbufs.h: $(pixbuf_csource_deps) apple-red.png gnome-foot.png
Index: patches/patch-gdk-pixbuf_Makefile_in
===================================================================
RCS file: /cvs/ports/x11/gtk+2/patches/patch-gdk-pixbuf_Makefile_in,v
retrieving revision 1.20
diff -u -r1.20 patch-gdk-pixbuf_Makefile_in
--- patches/patch-gdk-pixbuf_Makefile_in 25 Nov 2008 13:14:08 -0000
1.20
+++ patches/patch-gdk-pixbuf_Makefile_in 9 Jan 2009 13:39:10 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-gdk-pixbuf_Makefile_in,v 1.20 2008/11/25 13:14:08 jasper Exp $
---- gdk-pixbuf/Makefile.in.orig Mon Nov 24 07:41:40 2008
-+++ gdk-pixbuf/Makefile.in Tue Nov 25 11:50:20 2008
-@@ -856,7 +856,7 @@ gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c
+--- gdk-pixbuf/Makefile.in.orig Wed Jan 7 22:52:05 2009
++++ gdk-pixbuf/Makefile.in Fri Jan 9 13:28:02 2009
+@@ -852,7 +852,7 @@ gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c
gdk_pixbuf_csource_LDADD = $(LDADDS)
gdk_pixbuf_query_loaders_DEPENDENCIES = $(DEPS)
@@ -10,7 +10,7 @@
gdk_pixbuf_query_loaders_SOURCES = queryloaders.c
-@@ -2243,13 +2243,6 @@ install-data-hook: install-ms-lib install-def-file
+@@ -2239,13 +2239,6 @@ install-data-hook: install-ms-lib install-def-file
@if $(RUN_QUERY_LOADER_TEST) ; then \
$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
$(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders >
$(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders ; \
@@ -24,7 +24,7 @@
fi
uninstall-local: uninstall-ms-lib uninstall-def-file
-@@ -2261,7 +2254,7 @@ uninstall-local: uninstall-ms-lib uninstall-def-file
+@@ -2257,7 +2250,7 @@ uninstall-local: uninstall-ms-lib uninstall-def-file
@BUILD_DYNAMIC_MODULES_TRUE@ LOADERS=`echo libpixbufloader-*.la` ; \
@BUILD_DYNAMIC_MODULES_TRUE@ if test "x$$LOADERS" != 'xlibpixbufloader-*.la'
; then \
@BUILD_DYNAMIC_MODULES_TRUE@ echo "Writing a gdk-pixbuf.loader file
to use when running examples before installing gdk-pixbuf."; \
Index: patches/patch-gtk_Makefile_in
===================================================================
RCS file: /cvs/ports/x11/gtk+2/patches/patch-gtk_Makefile_in,v
retrieving revision 1.11
diff -u -r1.11 patch-gtk_Makefile_in
--- patches/patch-gtk_Makefile_in 7 Dec 2008 21:37:53 -0000 1.11
+++ patches/patch-gtk_Makefile_in 9 Jan 2009 13:39:10 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-gtk_Makefile_in,v 1.11 2008/12/07 21:37:53 naddy Exp $
---- gtk/Makefile.in.orig Sun Dec 7 22:11:29 2008
-+++ gtk/Makefile.in Sun Dec 7 22:12:17 2008
-@@ -473,7 +473,7 @@ SUBDIRS = theme-bits . tests
+--- gtk/Makefile.in.orig Wed Jan 7 22:52:08 2009
++++ gtk/Makefile.in Fri Jan 9 13:28:02 2009
+@@ -469,7 +469,7 @@ SUBDIRS = theme-bits . tests
DIST_SUBDIRS = theme-bits tests
@have_cups_fa...@gtk_print_backends = file,lpr
Index: patches/patch-modules_input_Makefile_in
===================================================================
RCS file: /cvs/ports/x11/gtk+2/patches/patch-modules_input_Makefile_in,v
retrieving revision 1.19
diff -u -r1.19 patch-modules_input_Makefile_in
--- patches/patch-modules_input_Makefile_in 25 Nov 2008 13:14:08 -0000
1.19
+++ patches/patch-modules_input_Makefile_in 9 Jan 2009 13:39:10 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-modules_input_Makefile_in,v 1.19 2008/11/25 13:14:08 jasper
Exp $
---- modules/input/Makefile.in.orig Mon Nov 24 07:41:44 2008
-+++ modules/input/Makefile.in Tue Nov 25 11:50:20 2008
-@@ -1340,13 +1340,6 @@ install-data-hook:
+--- modules/input/Makefile.in.orig Wed Jan 7 22:52:11 2009
++++ modules/input/Makefile.in Fri Jan 9 13:28:02 2009
+@@ -1336,13 +1336,6 @@ install-data-hook:
$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
echo "$(top_builddir)/gtk/gtk-query-immodules-2.0 >
$(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules" ; \
$(top_builddir)/gtk/gtk-query-immodules-2.0 >
$(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules ; \
@@ -15,7 +15,7 @@
fi
uninstall-local:
-@@ -1355,6 +1348,7 @@ uninstall-local:
+@@ -1351,6 +1344,7 @@ uninstall-local:
included-modules: $(noinst_LTLIBRARIES)
gtk.immodules: Makefile.am $(module_LTLIBRARIES)
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/x11/gtk+2/pkg/PLIST-main,v
retrieving revision 1.10
diff -u -r1.10 PLIST-main
--- pkg/PLIST-main 25 Nov 2008 13:14:08 -0000 1.10
+++ pkg/PLIST-main 9 Jan 2009 13:39:10 -0000
@@ -411,6 +411,11 @@
@man man/man1/gtk-query-immodules-2.0.1
@man man/man1/gtk-update-icon-cache.1
share/aclocal/gtk-2.0.m4
+share/examples/gtk+2/
+share/examples/gtk+2/gtk-2.0/
+...@sample ${SYSCONFDIR}/gtk-2.0/
+share/examples/gtk+2/gtk-2.0/im-multipress.conf
+...@sample ${SYSCONFDIR}/gtk-2.0/im-multipress.conf
share/gtk-2.0/
share/gtk-2.0/demo/
share/gtk-2.0/demo/alphatest.png
--
Antoine
