On Mon, Oct 15, 2007 at 11:15:56PM +0200, Jasper Lievisse Adriaanse wrote:
> hi,
>
> here's an update to take gtk+2 and friends to the next major release.
>
> please test and comment.
> breakage is expected, mainly due to the new tooltip implementation,
> please let me know if you experience it. (full build logs attached
> please).
>
> cheers,
> jasper
>
> changes:
> glib:
> GRegex, an implementation of Perl regular expressions based on PCRE, was
> added. GSequence, a list implemented using a balanced binary tree, was
> added. Support for xdg-user-dirs was added. All the bugfixes and
> enhancements from the 2.13 development branch were integrated.
>
> gtk:
> A completely new tooltip implementation was introduced. A new interface
> builder, GtkBuilder, was added. Keyboard navigation was improved.
> GtkScaleButton, GtkVolumeButton, and GtkRecentAction were added. Search
> functionality was added to the file chooser, supporting several
> backends. Many bugs were fixed. Translations were updated.
>
>
> --
> "The good life is one inspired by love and guided by knowledge."
> -- Bertrand Russel
>
oops, send the wrong diffs. correct ones attached.
? atk.diff
? w-atk-1.18.0p0
? w-atk-1.20.0
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/atk/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- Makefile 16 Sep 2007 02:52:57 -0000 1.22
+++ Makefile 2 Oct 2007 18:31:01 -0000
@@ -2,13 +2,12 @@
COMMENT= accessibility toolkit used by gtk+
-DISTNAME= atk-1.18.0
-SHARED_LIBS += atk-1.0 1809.1 # .1809.1
-PKGNAME= ${DISTNAME}p0
+DISTNAME= atk-1.20.0
+SHARED_LIBS += atk-1.0 2009.1 # .2009.1
CATEGORIES= devel
-HOMEPAGE= http://www.gtk.org
+HOMEPAGE= http://www.gtk.org/
# LGPL
PERMIT_PACKAGE_CDROM= Yes
@@ -16,7 +15,7 @@
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/atk/1.18/}
+MASTER_SITES= ${MASTER_SITE_GNOME:=sources/atk/1.20/}
EXTRACT_SUFX= .tar.bz2
MODULES= devel/gettext
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/atk/distinfo,v
retrieving revision 1.13
diff -u -r1.13 distinfo
--- distinfo 23 Apr 2007 16:22:46 -0000 1.13
+++ distinfo 2 Oct 2007 18:31:01 -0000
@@ -1,5 +1,5 @@
-MD5 (atk-1.18.0.tar.bz2) = n8M+xI/TKTP39jBHnfrWZw==
-RMD160 (atk-1.18.0.tar.bz2) = w2jBmwx7V3tsUq6wMlxJIGU5IOo=
-SHA1 (atk-1.18.0.tar.bz2) = 1Y38Pb2tSdjERuC9SgtiYNMVzrA=
-SHA256 (atk-1.18.0.tar.bz2) = vi1TdkKkO1oehaLQ+BMWe4WFeB/4MgOk9oIGw+zWoxU=
-SIZE (atk-1.18.0.tar.bz2) = 655890
+MD5 (atk-1.20.0.tar.bz2) = sanijZ9U6jBr2FpMhLJfuA==
+RMD160 (atk-1.20.0.tar.bz2) = Mw4lNOF9HnUlQibJdsL352yIjt8=
+SHA1 (atk-1.20.0.tar.bz2) = 4wn+1BVIGRlN2/m+TKMlLMMUNM8=
+SHA256 (atk-1.20.0.tar.bz2) = HzsvLLtbDY2gkklwxmw+y/4TxOQ2Cwrx23VFQBo3R8k=
+SIZE (atk-1.20.0.tar.bz2) = 705435
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/glib2/Makefile,v
retrieving revision 1.38
diff -u -r1.38 Makefile
--- Makefile 13 Sep 2007 10:51:13 -0000 1.38
+++ Makefile 10 Oct 2007 17:53:37 -0000
@@ -3,18 +3,18 @@
COMMENT-main= general-purpose utility library
COMMENT-docs= glib2 documentation
-VERSION= 2.12.13
+VERSION= 2.14.1
DISTNAME= glib-${VERSION}
-PKGNAME-main= glib2-${VERSION}p0
+PKGNAME-main= glib2-${VERSION}
PKGNAME-docs= glib2-docs-${VERSION}
CATEGORIES= devel
-HOMEPAGE= http://www.gtk.org
+HOMEPAGE= http://www.gtk.org/
-SHARED_LIBS += glib-2.0 1200.13 # .1200.13
-SHARED_LIBS += gobject-2.0 1200.13 # .1200.13
-SHARED_LIBS += gmodule-2.0 1200.13 # .1200.13
-SHARED_LIBS += gthread-2.0 1200.13 # .1200.13
+SHARED_LIBS += glib-2.0 1400.00 # .1400.1
+SHARED_LIBS += gobject-2.0 1400.00 # .1400.1
+SHARED_LIBS += gmodule-2.0 1400.00 # .1400.1
+SHARED_LIBS += gthread-2.0 1400.00 # .1400.1
# LGPL
PERMIT_PACKAGE_CDROM= Yes
@@ -22,7 +22,7 @@
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/glib/2.12/}
+MASTER_SITES= ${MASTER_SITE_GNOME:=sources/glib/2.14/}
EXTRACT_SUFX= .tar.bz2
MULTI_PACKAGES= -main -docs
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/glib2/distinfo,v
retrieving revision 1.21
diff -u -r1.21 distinfo
--- distinfo 10 Sep 2007 19:13:33 -0000 1.21
+++ distinfo 10 Oct 2007 17:53:37 -0000
@@ -1,5 +1,5 @@
-MD5 (glib-2.12.13.tar.bz2) = 12EkI25OIW6MCGE0HpZ6dg==
-RMD160 (glib-2.12.13.tar.bz2) = DRPnPLIXPn1jzhiP23d0bMo7BNY=
-SHA1 (glib-2.12.13.tar.bz2) = gc4OU/VYO+lwYj0SUjx4WjkmR78=
-SHA256 (glib-2.12.13.tar.bz2) = ElPVY8ouUCktkkhJ/jojw7e8cHq4t5vaGTGfnRkrDo4=
-SIZE (glib-2.12.13.tar.bz2) = 2938164
+MD5 (glib-2.14.1.tar.bz2) = GW15RKjdwffD0enHFG3VYA==
+RMD160 (glib-2.14.1.tar.bz2) = mgrJJd1CpCOnLIZlP6oQQ+50Cvw=
+SHA1 (glib-2.14.1.tar.bz2) = 75/1Yqp3ZrAIHTfjzmhYQ+eWwPg=
+SHA256 (glib-2.14.1.tar.bz2) = bzbKYkoS3OA83qWcnrkA7aSeovRjsylzfrnyqPOsFE0=
+SIZE (glib-2.14.1.tar.bz2) = 3337370
Index: patches/patch-glib_gbacktrace_c
===================================================================
RCS file: /cvs/ports/devel/glib2/patches/patch-glib_gbacktrace_c,v
retrieving revision 1.4
diff -u -r1.4 patch-glib_gbacktrace_c
--- patches/patch-glib_gbacktrace_c 23 Apr 2007 16:22:07 -0000 1.4
+++ patches/patch-glib_gbacktrace_c 10 Oct 2007 17:53:37 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-glib_gbacktrace_c,v 1.4 2007/04/23 16:22:07 jasper Exp $
---- glib/gbacktrace.c.orig Fri Mar 9 05:01:39 2007
-+++ glib/gbacktrace.c Fri Apr 20 19:02:41 2007
-@@ -169,7 +169,7 @@ g_on_error_stack_trace (const gchar *prg_name)
+--- glib/gbacktrace.c.orig Sun Sep 16 18:28:33 2007
++++ glib/gbacktrace.c Tue Oct 2 20:47:04 2007
+@@ -167,7 +167,7 @@ g_on_error_stack_trace (const gchar *prg_name)
if (!prg_name)
return;
Index: patches/patch-glib_gmacros_h
===================================================================
RCS file: /cvs/ports/devel/glib2/patches/patch-glib_gmacros_h,v
retrieving revision 1.6
diff -u -r1.6 patch-glib_gmacros_h
--- patches/patch-glib_gmacros_h 22 May 2006 01:39:36 -0000 1.6
+++ patches/patch-glib_gmacros_h 10 Oct 2007 17:53:37 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-glib_gmacros_h,v 1.6 2006/05/22 01:39:36 brad Exp $
---- glib/gmacros.h.orig Sun Dec 4 01:41:57 2005
-+++ glib/gmacros.h Fri Apr 28 23:41:43 2006
+--- glib/gmacros.h.orig Sun Sep 16 18:28:33 2007
++++ glib/gmacros.h Tue Oct 2 20:47:04 2007
@@ -34,6 +34,7 @@
/* We include stddef.h to get the system's definition of NULL
*/
@@ -9,7 +9,7 @@
/* Here we provide G_GNUC_EXTENSION as an alias for __extension__,
* where this is valid. This allows for warningless compilation of
-@@ -163,11 +164,13 @@
+@@ -169,11 +170,13 @@
#define TRUE (!FALSE)
#endif
Index: patches/patch-glib_gprintf_c
===================================================================
RCS file: /cvs/ports/devel/glib2/patches/patch-glib_gprintf_c,v
retrieving revision 1.3
diff -u -r1.3 patch-glib_gprintf_c
--- patches/patch-glib_gprintf_c 23 Apr 2007 16:22:07 -0000 1.3
+++ patches/patch-glib_gprintf_c 10 Oct 2007 17:53:37 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-glib_gprintf_c,v 1.3 2007/04/23 16:22:07 jasper Exp $
---- glib/gprintf.c.orig Fri Mar 9 05:01:39 2007
-+++ glib/gprintf.c Fri Apr 20 19:02:41 2007
+--- glib/gprintf.c.orig Sun Sep 16 18:28:33 2007
++++ glib/gprintf.c Tue Oct 2 20:47:04 2007
@@ -87,6 +87,8 @@ g_fprintf (FILE *file,
return retval;
}
@@ -9,8 +9,8 @@
+ "warning: g_sprintf() is often misused, please use g_snprintf()");
/**
* g_sprintf:
- * @string: the buffer to hold the output.
-@@ -208,6 +210,8 @@ g_vfprintf (FILE *file,
+ * @string: A pointer to a memory buffer to contain the resulting string. It
+@@ -210,6 +212,8 @@ g_vfprintf (FILE *file,
return _g_vfprintf (file, format, args);
}
Index: patches/patch-glib_gstrfuncs_c
===================================================================
RCS file: /cvs/ports/devel/glib2/patches/patch-glib_gstrfuncs_c,v
retrieving revision 1.4
diff -u -r1.4 patch-glib_gstrfuncs_c
--- patches/patch-glib_gstrfuncs_c 23 Apr 2007 16:22:07 -0000 1.4
+++ patches/patch-glib_gstrfuncs_c 10 Oct 2007 17:53:37 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-glib_gstrfuncs_c,v 1.4 2007/04/23 16:22:07 jasper Exp $
---- glib/gstrfuncs.c.orig Fri Mar 9 05:01:39 2007
-+++ glib/gstrfuncs.c Fri Apr 20 19:02:41 2007
-@@ -1280,7 +1280,7 @@ g_strerror (gint errnum)
+--- glib/gstrfuncs.c.orig Sun Sep 16 18:28:33 2007
++++ glib/gstrfuncs.c Tue Oct 2 20:47:04 2007
+@@ -1308,7 +1308,7 @@ g_strerror (gint errnum)
g_static_private_set (&msg_private, msg, g_free);
}
@@ -10,7 +10,7 @@
errno = saved_errno;
return msg;
-@@ -1430,7 +1430,7 @@ extern const char *strsignal(int);
+@@ -1458,7 +1458,7 @@ extern const char *strsignal(int);
g_static_private_set (&msg_private, msg, g_free);
}
Index: patches/patch-glib_gutils_c
===================================================================
RCS file: /cvs/ports/devel/glib2/patches/patch-glib_gutils_c,v
retrieving revision 1.1
diff -u -r1.1 patch-glib_gutils_c
--- patches/patch-glib_gutils_c 24 Apr 2007 18:21:14 -0000 1.1
+++ patches/patch-glib_gutils_c 10 Oct 2007 17:53:37 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-glib_gutils_c,v 1.1 2007/04/24 18:21:14 jasper Exp $
---- glib/gutils.c.orig Thu Jul 6 14:30:16 2006
-+++ glib/gutils.c Thu Dec 21 14:07:45 2006
-@@ -2489,7 +2489,7 @@ g_get_system_data_dirs (void)
+--- glib/gutils.c.orig Sun Sep 16 18:28:32 2007
++++ glib/gutils.c Tue Oct 2 20:47:04 2007
+@@ -2619,7 +2619,7 @@ g_get_system_data_dirs (void)
gchar *data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS");
if (!data_dirs || !data_dirs[0])
Index: patches/patch-tests_Makefile_in
===================================================================
RCS file: /cvs/ports/devel/glib2/patches/patch-tests_Makefile_in,v
retrieving revision 1.3
diff -u -r1.3 patch-tests_Makefile_in
--- patches/patch-tests_Makefile_in 23 Apr 2007 16:22:07 -0000 1.3
+++ patches/patch-tests_Makefile_in 10 Oct 2007 17:53:37 -0000
@@ -1,11 +1,11 @@
$OpenBSD: patch-tests_Makefile_in,v 1.3 2007/04/23 16:22:07 jasper Exp $
---- tests/Makefile.in.orig Fri Mar 9 05:04:20 2007
-+++ tests/Makefile.in Fri Apr 20 19:02:41 2007
-@@ -335,7 +335,6 @@ test_programs = \
+--- tests/Makefile.in.orig Sun Sep 16 18:29:42 2007
++++ tests/Makefile.in Tue Oct 2 20:47:04 2007
+@@ -355,7 +355,6 @@ test_programs = \
tree-test \
type-test \
unicode-caseconv \
- unicode-encoding \
utf8-validate \
utf8-pointer \
- uri-test
+ uri-test \
Index: patches/patch-tests_child-test_c
===================================================================
RCS file: /cvs/ports/devel/glib2/patches/patch-tests_child-test_c,v
retrieving revision 1.1
diff -u -r1.1 patch-tests_child-test_c
--- patches/patch-tests_child-test_c 13 Nov 2005 06:22:03 -0000 1.1
+++ patches/patch-tests_child-test_c 10 Oct 2007 17:53:37 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-tests_child-test_c,v 1.1 2005/11/13 06:22:03 marcm Exp $
---- tests/child-test.c.orig Mon Oct 31 21:12:02 2005
-+++ tests/child-test.c Mon Oct 31 21:12:36 2005
-@@ -174,7 +174,7 @@ main (int argc, char *argv[])
+--- tests/child-test.c.orig Sun Sep 16 18:28:30 2007
++++ tests/child-test.c Tue Oct 2 20:47:04 2007
+@@ -175,7 +175,7 @@ main (int argc, char *argv[])
#ifdef G_OS_WIN32
system ("ipconfig /all");
#else
Index: patches/patch-tests_refcount_Makefile_in
===================================================================
RCS file: /cvs/ports/devel/glib2/patches/patch-tests_refcount_Makefile_in,v
retrieving revision 1.3
diff -u -r1.3 patch-tests_refcount_Makefile_in
--- patches/patch-tests_refcount_Makefile_in 23 Apr 2007 16:22:07 -0000
1.3
+++ patches/patch-tests_refcount_Makefile_in 10 Oct 2007 17:53:37 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-tests_refcount_Makefile_in,v 1.3 2007/04/23 16:22:07 jasper
Exp $
---- tests/refcount/Makefile.in.orig Fri Mar 9 05:04:20 2007
-+++ tests/refcount/Makefile.in Fri Apr 20 19:02:41 2007
-@@ -251,7 +251,6 @@ libgobject = $(top_builddir)/gobject/libgobject-2.0.la
+--- tests/refcount/Makefile.in.orig Sun Sep 16 18:29:42 2007
++++ tests/refcount/Makefile.in Tue Oct 2 20:47:04 2007
+@@ -264,7 +264,6 @@ libgobject = $(top_builddir)/gobject/libgobject-2.0.la
LDADD = $(libglib) $(libgobject) $(libgthread) $(G_THREAD_LIBS)
test_programs = \
Index: pkg/PLIST-docs
===================================================================
RCS file: /cvs/ports/devel/glib2/pkg/PLIST-docs,v
retrieving revision 1.12
diff -u -r1.12 PLIST-docs
--- pkg/PLIST-docs 23 Apr 2007 16:22:07 -0000 1.12
+++ pkg/PLIST-docs 10 Oct 2007 17:53:37 -0000
@@ -43,10 +43,12 @@
share/gtk-doc/html/glib/glib-Miscellaneous-Utility-Functions.html
share/gtk-doc/html/glib/glib-N-ary-Trees.html
share/gtk-doc/html/glib/glib-Numerical-Definitions.html
+share/gtk-doc/html/glib/glib-Perl-compatible-regular-expressions.html
share/gtk-doc/html/glib/glib-Pointer-Arrays.html
share/gtk-doc/html/glib/glib-Quarks.html
share/gtk-doc/html/glib/glib-Random-Numbers.html
share/gtk-doc/html/glib/glib-Relations-and-Tuples.html
+share/gtk-doc/html/glib/glib-Sequences.html
share/gtk-doc/html/glib/glib-Shell-related-Utilities.html
share/gtk-doc/html/glib/glib-Simple-XML-Subset-Parser.html
share/gtk-doc/html/glib/glib-Singly-Linked-Lists.html
@@ -74,6 +76,7 @@
share/gtk-doc/html/glib/glib-fundamentals.html
share/gtk-doc/html/glib/glib-gettextize.html
share/gtk-doc/html/glib/glib-resources.html
+share/gtk-doc/html/glib/glib-regex-syntax.html
share/gtk-doc/html/glib/glib-running.html
share/gtk-doc/html/glib/glib-utilities.html
share/gtk-doc/html/glib/glib.devhelp
@@ -90,6 +93,7 @@
share/gtk-doc/html/glib/ix06.html
share/gtk-doc/html/glib/ix07.html
share/gtk-doc/html/glib/ix08.html
+share/gtk-doc/html/glib/ix09.html
share/gtk-doc/html/glib/left.png
share/gtk-doc/html/glib/mainloop-states.gif
share/gtk-doc/html/glib/right.png
@@ -99,13 +103,13 @@
share/gtk-doc/html/gobject/
share/gtk-doc/html/gobject/GTypeModule.html
share/gtk-doc/html/gobject/GTypePlugin.html
-share/gtk-doc/html/gobject/ch01.html
share/gtk-doc/html/gobject/ch01s02.html
-share/gtk-doc/html/gobject/ch02.html
share/gtk-doc/html/gobject/ch06s03.html
share/gtk-doc/html/gobject/ch07s02.html
share/gtk-doc/html/gobject/ch07s03.html
share/gtk-doc/html/gobject/chapter-gobject.html
+share/gtk-doc/html/gobject/chapter-gtype.html
+share/gtk-doc/html/gobject/chapter-intro.html
share/gtk-doc/html/gobject/chapter-signal.html
share/gtk-doc/html/gobject/glib-genmarshal.html
share/gtk-doc/html/gobject/glib-mkenums.html
@@ -151,6 +155,7 @@
share/gtk-doc/html/gobject/ix06.html
share/gtk-doc/html/gobject/ix07.html
share/gtk-doc/html/gobject/ix08.html
+share/gtk-doc/html/gobject/ix09.html
share/gtk-doc/html/gobject/left.png
share/gtk-doc/html/gobject/pr01.html
share/gtk-doc/html/gobject/pt01.html
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/devel/glib2/pkg/PLIST-main,v
retrieving revision 1.2
diff -u -r1.2 PLIST-main
--- pkg/PLIST-main 23 Apr 2007 16:22:07 -0000 1.2
+++ pkg/PLIST-main 10 Oct 2007 17:53:37 -0000
@@ -45,8 +45,10 @@
include/glib-2.0/glib/gquark.h
include/glib-2.0/glib/gqueue.h
include/glib-2.0/glib/grand.h
+include/glib-2.0/glib/gregex.h
include/glib-2.0/glib/grel.h
include/glib-2.0/glib/gscanner.h
+include/glib-2.0/glib/gsequence.h
include/glib-2.0/glib/gshell.h
include/glib-2.0/glib/gslice.h
include/glib-2.0/glib/gslist.h
@@ -117,6 +119,9 @@
share/locale/ar/
share/locale/ar/LC_MESSAGES/
share/locale/ar/LC_MESSAGES/glib20.mo
+share/locale/as/
+share/locale/as/LC_MESSAGES/
+share/locale/as/LC_MESSAGES/glib20.mo
share/locale/az/
share/locale/az/LC_MESSAGES/
share/locale/az/LC_MESSAGES/glib20.mo
@@ -185,6 +190,9 @@
share/locale/ka/
share/locale/ka/LC_MESSAGES/
share/locale/ka/LC_MESSAGES/glib20.mo
+share/locale/kn/
+share/locale/kn/LC_MESSAGES/
+share/locale/kn/LC_MESSAGES/glib20.mo
share/locale/ko/LC_MESSAGES/glib20.mo
share/locale/ku/
share/locale/ku/LC_MESSAGES/
@@ -193,6 +201,9 @@
share/locale/lt/LC_MESSAGES/
share/locale/lt/LC_MESSAGES/glib20.mo
share/locale/lv/LC_MESSAGES/glib20.mo
+share/locale/mg/
+share/locale/mg/LC_MESSAGES/
+share/locale/mg/LC_MESSAGES/glib20.mo
share/locale/mk/
share/locale/mk/LC_MESSAGES/
share/locale/mk/LC_MESSAGES/glib20.mo
@@ -211,6 +222,9 @@
share/locale/ne/LC_MESSAGES/glib20.mo
share/locale/nl/LC_MESSAGES/glib20.mo
share/locale/nn/LC_MESSAGES/glib20.mo
+share/locale/oc/
+share/locale/oc/LC_MESSAGES/
+share/locale/oc/LC_MESSAGES/glib20.mo
share/locale/or/
share/locale/or/LC_MESSAGES/
share/locale/or/LC_MESSAGES/glib20.mo
@@ -266,8 +280,6 @@
share/locale/yi/LC_MESSAGES/
share/locale/yi/LC_MESSAGES/glib20.mo
share/locale/zh_CN/LC_MESSAGES/glib20.mo
-share/locale/zh_HK/
-share/locale/zh_HK/LC_MESSAGES/
share/locale/zh_HK/LC_MESSAGES/glib20.mo
share/locale/zh_TW/LC_MESSAGES/glib20.mo
%%SHARED%%
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/pango/Makefile,v
retrieving revision 1.25
diff -u -r1.25 Makefile
--- Makefile 10 Sep 2007 19:14:19 -0000 1.25
+++ Makefile 10 Oct 2007 18:12:33 -0000
@@ -2,15 +2,15 @@
COMMENT= library for layout and rendering of text
-DISTNAME= pango-1.16.5
-SHARED_LIBS += pango-1.0 1300.2 # .1600.5
-SHARED_LIBS += pangox-1.0 1300.2 # .1600.5
-SHARED_LIBS += pangoft2-1.0 1300.2 # .1600.5
-SHARED_LIBS += pangoxft-1.0 1300.2 # .1600.5
-SHARED_LIBS += pangocairo-1.0 1300.2 # .1600.5
+DISTNAME= pango-1.18.2
+SHARED_LIBS += pango-1.0 1400.0 # .1800.2
+SHARED_LIBS += pangox-1.0 1400.0 # .1800.2
+SHARED_LIBS += pangoft2-1.0 1400.0 # .1800.2
+SHARED_LIBS += pangoxft-1.0 1400.0 # .1800.2
+SHARED_LIBS += pangocairo-1.0 1400.0 # .1800.2
CATEGORIES= devel x11
-HOMEPAGE= http://www.gtk.org
+HOMEPAGE= http://www.gtk.org/
# LGPL
PERMIT_PACKAGE_CDROM= Yes
@@ -20,12 +20,12 @@
WANTLIB= X11 Xau Xdmcp Xft Xrender c expat fontconfig freetype \
glitz m png z
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pango/1.16/}
+MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pango/1.18/}
EXTRACT_SUFX= .tar.bz2
MODULES= devel/gettext
-LIB_DEPENDS=
glib-2.0.>=1200.0,gmodule-2.0.>=1200.0,gobject-2.0.>=1200.0::devel/glib2 \
+LIB_DEPENDS=
glib-2.0.>=1400.0,gmodule-2.0.>=1400.0,gobject-2.0.>=1400.0::devel/glib2 \
cairo.>=3::graphics/cairo
USE_X11= Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/pango/distinfo,v
retrieving revision 1.19
diff -u -r1.19 distinfo
--- distinfo 10 Sep 2007 19:14:19 -0000 1.19
+++ distinfo 10 Oct 2007 18:12:33 -0000
@@ -1,5 +1,5 @@
-MD5 (pango-1.16.5.tar.bz2) = 2NfaKrhU9uJX7Aa/VSphFA==
-RMD160 (pango-1.16.5.tar.bz2) = mPOLL4Bi6PEelaIoJPqMiWZP+7M=
-SHA1 (pango-1.16.5.tar.bz2) = ojiZsWqVKU36c5glyB84WHhxJ+g=
-SHA256 (pango-1.16.5.tar.bz2) = eP/aHdZ7Fsb1WMkY0kc94oQJG/qwdXd6T4HjN1K8RE0=
-SIZE (pango-1.16.5.tar.bz2) = 1345977
+MD5 (pango-1.18.2.tar.bz2) = ge/qxjmXftP1bILxbuC+dA==
+RMD160 (pango-1.18.2.tar.bz2) = WaCXzbfZDPye1FjeOsLJ+88Qve0=
+SHA1 (pango-1.18.2.tar.bz2) = 97pP+J4FxWWcF9xCJcGmd3KniNo=
+SHA256 (pango-1.18.2.tar.bz2) = eKD9bktjqnw7sm8QRdjzbuOz+EDTs/LQBkg4Y8c2njI=
+SIZE (pango-1.18.2.tar.bz2) = 1392725
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/devel/pango/pkg/DESCR,v
retrieving revision 1.2
diff -u -r1.2 DESCR
--- pkg/DESCR 23 Aug 2003 19:52:47 -0000 1.2
+++ pkg/DESCR 10 Oct 2007 18:12:33 -0000
@@ -1,5 +1,5 @@
-Pango is a library for layout and rendering of text, with an emphasis
-on internationalization. Pango can be used anywhere that text layout
-is needed; however, most of the work on Pango-1.0 was done using the
-GTK+ widget toolkit as a test platform. Pango forms the core of text
-and font handling for GTK+-2.0.
+Pango is a library for layout and rendering of text, with an emphasis on
+internationalization. Pango can be used anywhere that text layout is
+needed; however, most of the work on Pango-1.0 was done using the GTK+
+widget toolkit as a test platform. Pango forms the core of text and font
+handling for GTK+-2.0.
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/pango/pkg/PLIST,v
retrieving revision 1.15
diff -u -r1.15 PLIST
--- pkg/PLIST 23 Apr 2007 16:24:18 -0000 1.15
+++ pkg/PLIST 10 Oct 2007 18:12:33 -0000
@@ -17,6 +17,7 @@
include/pango-1.0/pango/pango-glyph.h
include/pango-1.0/pango/pango-gravity.h
include/pango-1.0/pango/pango-item.h
+include/pango-1.0/pango/pango-language.h
include/pango-1.0/pango/pango-layout.h
include/pango-1.0/pango/pango-matrix.h
include/pango-1.0/pango/pango-modules.h
@@ -94,19 +95,21 @@
share/gtk-doc/html/pango/PangoFcFont.html
share/gtk-doc/html/pango/PangoFcFontMap.html
share/gtk-doc/html/pango/PangoMarkupFormat.html
+share/gtk-doc/html/pango/PangoRenderer.html
share/gtk-doc/html/pango/home.png
+share/gtk-doc/html/pango/index-1.10.html
+share/gtk-doc/html/pango/index-1.12.html
+share/gtk-doc/html/pango/index-1.14.html
+share/gtk-doc/html/pango/index-1.16.html
+share/gtk-doc/html/pango/index-1.18.html
+share/gtk-doc/html/pango/index-1.2.html
+share/gtk-doc/html/pango/index-1.4.html
+share/gtk-doc/html/pango/index-1.6.html
+share/gtk-doc/html/pango/index-1.8.html
+share/gtk-doc/html/pango/index-all.html
+share/gtk-doc/html/pango/index-deprecated.html
share/gtk-doc/html/pango/index.html
share/gtk-doc/html/pango/index.sgml
-share/gtk-doc/html/pango/ix01.html
-share/gtk-doc/html/pango/ix02.html
-share/gtk-doc/html/pango/ix03.html
-share/gtk-doc/html/pango/ix04.html
-share/gtk-doc/html/pango/ix05.html
-share/gtk-doc/html/pango/ix06.html
-share/gtk-doc/html/pango/ix07.html
-share/gtk-doc/html/pango/ix08.html
-share/gtk-doc/html/pango/ix09.html
-share/gtk-doc/html/pango/ix10.html
share/gtk-doc/html/pango/layout.gif
share/gtk-doc/html/pango/left.png
share/gtk-doc/html/pango/lowlevel.html
@@ -121,7 +124,6 @@
share/gtk-doc/html/pango/pango-Miscellaneous-Utilities.html
share/gtk-doc/html/pango/pango-Modules.html
share/gtk-doc/html/pango/pango-OpenType-Font-Handling.html
-share/gtk-doc/html/pango/pango-PangoRenderer.html
share/gtk-doc/html/pango/pango-Scripts.html
share/gtk-doc/html/pango/pango-Tab-Stops.html
share/gtk-doc/html/pango/pango-Text-Attributes.html
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/gtk+2/Makefile,v
retrieving revision 1.54
diff -u -r1.54 Makefile
--- Makefile 10 Sep 2007 19:15:25 -0000 1.54
+++ Makefile 10 Oct 2007 20:57:56 -0000
@@ -5,14 +5,14 @@
COMMENT-main= multi-platform graphical toolkit
COMMENT-docs= gtk+-2 documentation
-VERSION= 2.10.14
+VERSION= 2.12.0
DISTNAME= gtk+-${VERSION}
PKGNAME-main= gtk+2-${VERSION}
PKGNAME-docs= gtk+2-docs-${VERSION}
-SHARED_LIBS += gdk_pixbuf-2.0 1000.14 # .1000.14
-SHARED_LIBS += gdk-x11-2.0 1000.14 # .1000.14
-SHARED_LIBS += gtk-x11-2.0 1000.14 # .1000.14
-SHARED_LIBS += gdk_pixbuf_xlib-2.0 1000.14 # .1000.14
+SHARED_LIBS += gdk_pixbuf-2.0 1200.0 # .1200.0
+SHARED_LIBS += gdk-x11-2.0 1200.0 # .1200.0
+SHARED_LIBS += gtk-x11-2.0 1200.0 # .1200.0
+SHARED_LIBS += gdk_pixbuf_xlib-2.0 1200.0 # .1200.0
CATEGORIES= x11 devel
HOMEPAGE= http://www.gtk.org/
@@ -23,15 +23,15 @@
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk+/2.10/}
+MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk+/2.12/}
EXTRACT_SUFX= .tar.bz2
MULTI_PACKAGES= -main -docs
-WANTLIB-main= X11.>=10 Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama \
- Xrender Xrandr c cairo expat fontconfig freetype \
- glib-2.0 glitz m gmodule-2.0 gobject-2.0 gthread-2.0 \
- pthread z
+WANTLIB-main= X11.>=10 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
+ Xfixes Xi Xinerama Xrender Xrandr c cairo expat \
+ fontconfig freetype glib-2.0 glitz m gmodule-2.0 \
+ gobject-2.0 gthread-2.0 pthread z
MODULES= devel/gettext
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/gtk+2/distinfo,v
retrieving revision 1.30
diff -u -r1.30 distinfo
--- distinfo 10 Sep 2007 19:15:25 -0000 1.30
+++ distinfo 10 Oct 2007 20:57:56 -0000
@@ -1,5 +1,5 @@
-MD5 (gtk+-2.10.14.tar.bz2) = AY190Pp94Bz9t3x8Vee6Jg==
-RMD160 (gtk+-2.10.14.tar.bz2) = I01yQHMrKKMaJgqp4Ew0/FAqy/Q=
-SHA1 (gtk+-2.10.14.tar.bz2) = eLgZgU1SyqZnOatkYR5B815bSMM=
-SHA256 (gtk+-2.10.14.tar.bz2) = 0CNEI50Eg5C6Avz9feT578DftR57Bt+kamMU1mbqTeI=
-SIZE (gtk+-2.10.14.tar.bz2) = 15172170
+MD5 (gtk+-2.12.0.tar.bz2) = 6cKAr+wpsRdyr1p8gHq/QQ==
+RMD160 (gtk+-2.12.0.tar.bz2) = ImyPOOt4ldY/gf62AVLbHKNZlig=
+SHA1 (gtk+-2.12.0.tar.bz2) = 9ey/c6eJqIgKay4VJ5JnuxE5gOI=
+SHA256 (gtk+-2.12.0.tar.bz2) = +qHcc/gHf3KEmt4UljIC2K8itRRpwejojiDGnTMP0v0=
+SIZE (gtk+-2.12.0.tar.bz2) = 15732170
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/x11/gtk+2/patches/patch-configure,v
retrieving revision 1.15
diff -u -r1.15 patch-configure
--- patches/patch-configure 23 May 2007 14:26:26 -0000 1.15
+++ patches/patch-configure 10 Oct 2007 20:57:56 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.15 2007/05/23 14:26:26 steven Exp $
---- configure.orig Wed May 2 18:28:50 2007
-+++ configure Tue May 22 17:53:30 2007
-@@ -34215,7 +34215,9 @@ _ACEOF
+--- configure.orig Thu Sep 13 14:47:55 2007
++++ configure Wed Oct 10 12:37:07 2007
+@@ -35378,7 +35378,9 @@ fi
fi
Index: patches/patch-demos_Makefile_in
===================================================================
RCS file: /cvs/ports/x11/gtk+2/patches/patch-demos_Makefile_in,v
retrieving revision 1.12
diff -u -r1.12 patch-demos_Makefile_in
--- patches/patch-demos_Makefile_in 12 May 2007 20:24:56 -0000 1.12
+++ patches/patch-demos_Makefile_in 10 Oct 2007 20:57:56 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-demos_Makefile_in,v 1.12 2007/05/12 20:24:56 jasper Exp $
---- demos/Makefile.in.orig Wed May 2 18:41:49 2007
-+++ demos/Makefile.in Sat May 5 00:20:27 2007
-@@ -799,6 +799,7 @@ uninstall-info: uninstall-info-recursive
+--- demos/Makefile.in.orig Thu Sep 13 17:40:46 2007
++++ demos/Makefile.in Wed Oct 10 12:37:07 2007
+@@ -832,6 +832,7 @@ uninstall-info: uninstall-info-recursive
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.15
diff -u -r1.15 patch-gdk-pixbuf_Makefile_in
--- patches/patch-gdk-pixbuf_Makefile_in 12 May 2007 20:24:56 -0000
1.15
+++ patches/patch-gdk-pixbuf_Makefile_in 10 Oct 2007 20:57:56 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-gdk-pixbuf_Makefile_in,v 1.15 2007/05/12 20:24:56 jasper Exp $
---- gdk-pixbuf/Makefile.in.orig Wed May 2 18:41:50 2007
-+++ gdk-pixbuf/Makefile.in Sat May 5 00:20:27 2007
-@@ -538,7 +538,7 @@ gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c
+--- gdk-pixbuf/Makefile.in.orig Thu Sep 13 17:40:48 2007
++++ gdk-pixbuf/Makefile.in Wed Oct 10 12:37:07 2007
+@@ -567,7 +567,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
-@@ -1604,13 +1604,6 @@ install-data-hook: install-ms-lib install-def-file
+@@ -1639,13 +1639,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
-@@ -1622,7 +1615,7 @@ uninstall-local: uninstall-ms-lib uninstall-def-file
+@@ -1657,7 +1650,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-gdk-pixbuf_io-pnm_c
===================================================================
RCS file: patches/patch-gdk-pixbuf_io-pnm_c
diff -N patches/patch-gdk-pixbuf_io-pnm_c
--- patches/patch-gdk-pixbuf_io-pnm_c 26 May 2007 02:44:55 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-gdk-pixbuf_io-pnm_c,v 1.1 2007/05/26 02:44:55 kili Exp $
-
-Found by puffy.pbm. Thanks :-)
-
---- gdk-pixbuf/io-pnm.c.orig Wed May 2 18:27:11 2007
-+++ gdk-pixbuf/io-pnm.c Thu May 24 10:58:39 2007
-@@ -135,7 +135,7 @@ explode_bitmap_into_buf (PnmLoaderContext *context)
- to -= 3;
- bit++;
-
-- if (bit > 7) {
-+ if (bit > 7 && x > 0) {
- from--;
- data = from[0];
- bit = 0;
Index: patches/patch-gtk_gtkrc_c
===================================================================
RCS file: /cvs/ports/x11/gtk+2/patches/patch-gtk_gtkrc_c,v
retrieving revision 1.3
diff -u -r1.3 patch-gtk_gtkrc_c
--- patches/patch-gtk_gtkrc_c 23 Apr 2007 16:29:05 -0000 1.3
+++ patches/patch-gtk_gtkrc_c 10 Oct 2007 20:57:56 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-gtk_gtkrc_c,v 1.3 2007/04/23 16:29:05 jasper Exp $
---- gtk/gtkrc.c.orig Mon Mar 12 14:51:26 2007
-+++ gtk/gtkrc.c Fri Apr 20 19:19:51 2007
-@@ -447,7 +447,7 @@ gtk_rc_get_im_module_file (void)
+--- gtk/gtkrc.c.orig Thu Sep 13 14:35:42 2007
++++ gtk/gtkrc.c Wed Oct 10 12:37:07 2007
+@@ -450,7 +450,7 @@ gtk_rc_get_im_module_file (void)
if (im_module_file)
result = g_strdup (im_module_file);
else
Index: patches/patch-gtk_gtksettings_c
===================================================================
RCS file: /cvs/ports/x11/gtk+2/patches/patch-gtk_gtksettings_c,v
retrieving revision 1.5
diff -u -r1.5 patch-gtk_gtksettings_c
--- patches/patch-gtk_gtksettings_c 23 Apr 2007 16:29:05 -0000 1.5
+++ patches/patch-gtk_gtksettings_c 10 Oct 2007 20:57:56 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-gtk_gtksettings_c,v 1.5 2007/04/23 16:29:05 jasper Exp $
---- gtk/gtksettings.c.orig Mon Mar 12 14:50:58 2007
-+++ gtk/gtksettings.c Fri Apr 20 19:19:51 2007
-@@ -256,7 +256,7 @@ gtk_settings_class_init (GtkSettingsClass *class)
+--- gtk/gtksettings.c.orig Thu Sep 13 14:35:41 2007
++++ gtk/gtksettings.c Wed Oct 10 12:37:07 2007
+@@ -299,7 +299,7 @@ gtk_settings_class_init (GtkSettingsClass *class)
g_param_spec_string
("gtk-key-theme-name",
P_("Key Theme
Name"),
P_("Name of
key theme RC file to load"),
Index: patches/patch-modules_input_Makefile_in
===================================================================
RCS file: /cvs/ports/x11/gtk+2/patches/patch-modules_input_Makefile_in,v
retrieving revision 1.14
diff -u -r1.14 patch-modules_input_Makefile_in
--- patches/patch-modules_input_Makefile_in 12 May 2007 20:24:56 -0000
1.14
+++ patches/patch-modules_input_Makefile_in 10 Oct 2007 20:57:56 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-modules_input_Makefile_in,v 1.14 2007/05/12 20:24:56 jasper
Exp $
---- modules/input/Makefile.in.orig Wed May 2 18:41:52 2007
-+++ modules/input/Makefile.in Sat May 5 00:20:27 2007
-@@ -825,19 +825,13 @@ install-data-hook:
+--- modules/input/Makefile.in.orig Thu Sep 13 17:40:50 2007
++++ modules/input/Makefile.in Wed Oct 10 12:37:07 2007
+@@ -972,19 +972,13 @@ 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 ; \
Index: pkg/PLIST-docs
===================================================================
RCS file: /cvs/ports/x11/gtk+2/pkg/PLIST-docs,v
retrieving revision 1.18
diff -u -r1.18 PLIST-docs
--- pkg/PLIST-docs 23 Apr 2007 16:29:05 -0000 1.18
+++ pkg/PLIST-docs 10 Oct 2007 20:57:57 -0000
@@ -120,6 +120,7 @@
share/gtk-doc/html/gdk/ix05.html
share/gtk-doc/html/gdk/ix06.html
share/gtk-doc/html/gdk/ix07.html
+share/gtk-doc/html/gdk/ix08.html
share/gtk-doc/html/gdk/left.png
share/gtk-doc/html/gdk/left_ptr.png
share/gtk-doc/html/gdk/left_side.png
@@ -173,6 +174,7 @@
share/gtk-doc/html/gtk/
share/gtk-doc/html/gtk/AbstractObjects.html
share/gtk-doc/html/gtk/Actions.html
+share/gtk-doc/html/gtk/Builder.html
share/gtk-doc/html/gtk/ButtonWidgets.html
share/gtk-doc/html/gtk/DeprecatedObjects.html
share/gtk-doc/html/gtk/DisplayWidgets.html
@@ -188,6 +190,7 @@
share/gtk-doc/html/gtk/GtkAssistant.html
share/gtk-doc/html/gtk/GtkBin.html
share/gtk-doc/html/gtk/GtkBox.html
+share/gtk-doc/html/gtk/GtkBuilder.html
share/gtk-doc/html/gtk/GtkButton.html
share/gtk-doc/html/gtk/GtkButtonBox.html
share/gtk-doc/html/gtk/GtkCList.html
@@ -286,6 +289,7 @@
share/gtk-doc/html/gtk/GtkRadioMenuItem.html
share/gtk-doc/html/gtk/GtkRadioToolButton.html
share/gtk-doc/html/gtk/GtkRange.html
+share/gtk-doc/html/gtk/GtkRecentAction.html
share/gtk-doc/html/gtk/GtkRecentChooser.html
share/gtk-doc/html/gtk/GtkRecentChooserDialog.html
share/gtk-doc/html/gtk/GtkRecentChooserMenu.html
@@ -294,6 +298,7 @@
share/gtk-doc/html/gtk/GtkRecentManager.html
share/gtk-doc/html/gtk/GtkRuler.html
share/gtk-doc/html/gtk/GtkScale.html
+share/gtk-doc/html/gtk/GtkScaleButton.html
share/gtk-doc/html/gtk/GtkScrollbar.html
share/gtk-doc/html/gtk/GtkScrolledWindow.html
share/gtk-doc/html/gtk/GtkSeparator.html
@@ -321,6 +326,7 @@
share/gtk-doc/html/gtk/GtkToolButton.html
share/gtk-doc/html/gtk/GtkToolItem.html
share/gtk-doc/html/gtk/GtkToolbar.html
+share/gtk-doc/html/gtk/GtkTooltip.html
share/gtk-doc/html/gtk/GtkTooltips.html
share/gtk-doc/html/gtk/GtkTree.html
share/gtk-doc/html/gtk/GtkTreeItem.html
@@ -341,6 +347,7 @@
share/gtk-doc/html/gtk/GtkVScrollbar.html
share/gtk-doc/html/gtk/GtkVSeparator.html
share/gtk-doc/html/gtk/GtkViewport.html
+share/gtk-doc/html/gtk/GtkVolumeButton.html
share/gtk-doc/html/gtk/GtkWidget.html
share/gtk-doc/html/gtk/GtkWindow.html
share/gtk-doc/html/gtk/GtkWindowGroup.html
@@ -404,6 +411,7 @@
share/gtk-doc/html/gtk/gtk-add.png
share/gtk-doc/html/gtk/gtk-apply.png
share/gtk-doc/html/gtk/gtk-bold.png
+share/gtk-doc/html/gtk/gtk-builder-convert.html
share/gtk-doc/html/gtk/gtk-building.html
share/gtk-doc/html/gtk/gtk-cancel.png
share/gtk-doc/html/gtk/gtk-cdrom.png
@@ -435,7 +443,6 @@
share/gtk-doc/html/gtk/gtk-find.png
share/gtk-doc/html/gtk/gtk-floppy.png
share/gtk-doc/html/gtk/gtk-font.png
-share/gtk-doc/html/gtk/gtk-framebuffer.html
share/gtk-doc/html/gtk/gtk-fullscreen.png
share/gtk-doc/html/gtk/gtk-go-back-ltr.png
share/gtk-doc/html/gtk/gtk-go-back-rtl.png
@@ -449,6 +456,7 @@
share/gtk-doc/html/gtk/gtk-goto-last-ltr.png
share/gtk-doc/html/gtk/gtk-goto-last-rtl.png
share/gtk-doc/html/gtk/gtk-goto-top.png
+share/gtk-doc/html/gtk/gtk-gtkbuildable.html
share/gtk-doc/html/gtk/gtk-gtkfilefilter.html
share/gtk-doc/html/gtk/gtk-harddisk.png
share/gtk-doc/html/gtk/gtk-help.png
@@ -481,6 +489,7 @@
share/gtk-doc/html/gtk/gtk-migrating-GtkAboutDialog.html
share/gtk-doc/html/gtk/gtk-migrating-GtkAction.html
share/gtk-doc/html/gtk/gtk-migrating-GtkAssistant.html
+share/gtk-doc/html/gtk/gtk-migrating-GtkBuilder.html
share/gtk-doc/html/gtk/gtk-migrating-GtkColorButton.html
share/gtk-doc/html/gtk/gtk-migrating-GtkComboBox.html
share/gtk-doc/html/gtk/gtk-migrating-GtkFileChooser.html
@@ -488,6 +497,7 @@
share/gtk-doc/html/gtk/gtk-migrating-GtkLinkButton.html
share/gtk-doc/html/gtk/gtk-migrating-GtkRecentChooser.html
share/gtk-doc/html/gtk/gtk-migrating-checklist.html
+share/gtk-doc/html/gtk/gtk-migrating-tooltips.html
share/gtk-doc/html/gtk/gtk-missing-image.png
share/gtk-doc/html/gtk/gtk-network.png
share/gtk-doc/html/gtk/gtk-new.png
@@ -562,6 +572,7 @@
share/gtk-doc/html/gtk/ix05.html
share/gtk-doc/html/gtk/ix06.html
share/gtk-doc/html/gtk/ix07.html
+share/gtk-doc/html/gtk/ix08.html
share/gtk-doc/html/gtk/label.png
share/gtk-doc/html/gtk/left.png
share/gtk-doc/html/gtk/link-button.png
@@ -591,6 +602,8 @@
share/gtk-doc/html/gtk/style.css
share/gtk-doc/html/gtk/toggle-button.png
share/gtk-doc/html/gtk/toolbar.png
+share/gtk-doc/html/gtk/tree-view-coordinates.png
share/gtk-doc/html/gtk/ui-manager.html
share/gtk-doc/html/gtk/up.png
+share/gtk-doc/html/gtk/volumebutton.png
share/gtk-doc/html/gtk/window.png
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/x11/gtk+2/pkg/PLIST-main,v
retrieving revision 1.3
diff -u -r1.3 PLIST-main
--- pkg/PLIST-main 12 May 2007 20:24:56 -0000 1.3
+++ pkg/PLIST-main 10 Oct 2007 20:57:57 -0000
@@ -2,6 +2,7 @@
@pkgpath x11/gtk+2
bin/gdk-pixbuf-csource
bin/gdk-pixbuf-query-loaders
+bin/gtk-builder-convert
bin/gtk-demo
bin/gtk-query-immodules-2.0
bin/gtk-update-icon-cache
@@ -72,6 +73,8 @@
include/gtk-2.0/gtk/gtkbin.h
include/gtk-2.0/gtk/gtkbindings.h
include/gtk-2.0/gtk/gtkbox.h
+include/gtk-2.0/gtk/gtkbuildable.h
+include/gtk-2.0/gtk/gtkbuilder.h
include/gtk-2.0/gtk/gtkbutton.h
include/gtk-2.0/gtk/gtkcalendar.h
include/gtk-2.0/gtk/gtkcelleditable.h
@@ -181,6 +184,7 @@
include/gtk-2.0/gtk/gtkradiotoolbutton.h
include/gtk-2.0/gtk/gtkrange.h
include/gtk-2.0/gtk/gtkrc.h
+include/gtk-2.0/gtk/gtkrecentaction.h
include/gtk-2.0/gtk/gtkrecentchooser.h
include/gtk-2.0/gtk/gtkrecentchooserdialog.h
include/gtk-2.0/gtk/gtkrecentchoosermenu.h
@@ -189,6 +193,7 @@
include/gtk-2.0/gtk/gtkrecentmanager.h
include/gtk-2.0/gtk/gtkruler.h
include/gtk-2.0/gtk/gtkscale.h
+include/gtk-2.0/gtk/gtkscalebutton.h
include/gtk-2.0/gtk/gtkscrollbar.h
include/gtk-2.0/gtk/gtkscrolledwindow.h
include/gtk-2.0/gtk/gtkselection.h
@@ -224,6 +229,7 @@
include/gtk-2.0/gtk/gtktoolbar.h
include/gtk-2.0/gtk/gtktoolbutton.h
include/gtk-2.0/gtk/gtktoolitem.h
+include/gtk-2.0/gtk/gtktooltip.h
include/gtk-2.0/gtk/gtktooltips.h
include/gtk-2.0/gtk/gtktree.h
include/gtk-2.0/gtk/gtktreednd.h
@@ -243,6 +249,7 @@
include/gtk-2.0/gtk/gtkvbox.h
include/gtk-2.0/gtk/gtkversion.h
include/gtk-2.0/gtk/gtkviewport.h
+include/gtk-2.0/gtk/gtkvolumebutton.h
include/gtk-2.0/gtk/gtkvpaned.h
include/gtk-2.0/gtk/gtkvruler.h
include/gtk-2.0/gtk/gtkvscale.h
@@ -278,6 +285,9 @@
lib/gtk-2.0/2.10.0/immodules/im-ipa.a
lib/gtk-2.0/2.10.0/immodules/im-ipa.la
lib/gtk-2.0/2.10.0/immodules/im-ipa.so
+lib/gtk-2.0/2.10.0/immodules/im-multipress.a
+lib/gtk-2.0/2.10.0/immodules/im-multipress.la
+lib/gtk-2.0/2.10.0/immodules/im-multipress.so
lib/gtk-2.0/2.10.0/immodules/im-thai.a
lib/gtk-2.0/2.10.0/immodules/im-thai.la
lib/gtk-2.0/2.10.0/immodules/im-thai.so
@@ -357,7 +367,6 @@
lib/libgtk-x11-2.0.a
lib/libgtk-x11-2.0.la
@lib lib/libgtk-x11-2.0.so.${LIBgtk-x11-2.0_VERSION}
-lib/pkgconfig/
lib/pkgconfig/gdk-2.0.pc
lib/pkgconfig/gdk-pixbuf-2.0.pc
lib/pkgconfig/gdk-pixbuf-xlib-2.0.pc
@@ -367,6 +376,7 @@
lib/pkgconfig/gtk+-x11-2.0.pc
@man man/man1/gdk-pixbuf-csource.1
@man man/man1/gdk-pixbuf-query-loaders.1
[EMAIL PROTECTED] man/man1/gtk-builder-convert.1
@man man/man1/gtk-query-immodules-2.0.1
@man man/man1/gtk-update-icon-cache.1
share/aclocal/gtk-2.0.m4
@@ -377,11 +387,13 @@
share/gtk-2.0/demo/appwindow.c
share/gtk-2.0/demo/assistant.c
share/gtk-2.0/demo/background.jpg
+share/gtk-2.0/demo/builder.c
share/gtk-2.0/demo/button_box.c
share/gtk-2.0/demo/changedisplay.c
share/gtk-2.0/demo/clipboard.c
share/gtk-2.0/demo/colorsel.c
share/gtk-2.0/demo/combobox.c
+share/gtk-2.0/demo/demo.ui
share/gtk-2.0/demo/dialog.c
share/gtk-2.0/demo/drawingarea.c
share/gtk-2.0/demo/editable_cells.c
@@ -427,10 +439,6 @@
share/locale/ang/LC_MESSAGES/gtk20.mo
share/locale/ar/LC_MESSAGES/gtk20-properties.mo
share/locale/ar/LC_MESSAGES/gtk20.mo
-share/locale/as/
-share/locale/as/LC_MESSAGES/
-share/locale/as/LC_MESSAGES/gtk20-properties.mo
-share/locale/as/LC_MESSAGES/gtk20.mo
share/locale/az/LC_MESSAGES/gtk20-properties.mo
share/locale/az/LC_MESSAGES/gtk20.mo
share/locale/az_IR/
@@ -555,6 +563,8 @@
share/locale/nso/LC_MESSAGES/
share/locale/nso/LC_MESSAGES/gtk20-properties.mo
share/locale/nso/LC_MESSAGES/gtk20.mo
+share/locale/oc/LC_MESSAGES/gtk20-properties.mo
+share/locale/oc/LC_MESSAGES/gtk20.mo
share/locale/or/LC_MESSAGES/gtk20-properties.mo
share/locale/or/LC_MESSAGES/gtk20.mo
share/locale/pa/LC_MESSAGES/gtk20-properties.mo
@@ -571,10 +581,6 @@
share/locale/ru/LC_MESSAGES/gtk20.mo
share/locale/rw/LC_MESSAGES/gtk20-properties.mo
share/locale/rw/LC_MESSAGES/gtk20.mo
-share/locale/si/
-share/locale/si/LC_MESSAGES/
-share/locale/si/LC_MESSAGES/gtk20-properties.mo
-share/locale/si/LC_MESSAGES/gtk20.mo
share/locale/sk/LC_MESSAGES/gtk20-properties.mo
share/locale/sk/LC_MESSAGES/gtk20.mo
share/locale/sl/LC_MESSAGES/gtk20-properties.mo
@@ -613,10 +619,10 @@
share/locale/uz/LC_MESSAGES/
share/locale/uz/LC_MESSAGES/gtk20-properties.mo
share/locale/uz/LC_MESSAGES/gtk20.mo
-share/locale/[EMAIL PROTECTED]/
-share/locale/[EMAIL PROTECTED]/LC_MESSAGES/
-share/locale/[EMAIL PROTECTED]/LC_MESSAGES/gtk20-properties.mo
-share/locale/[EMAIL PROTECTED]/LC_MESSAGES/gtk20.mo
+share/locale/[EMAIL PROTECTED]/
+share/locale/[EMAIL PROTECTED]/LC_MESSAGES/
+share/locale/[EMAIL PROTECTED]/LC_MESSAGES/gtk20-properties.mo
+share/locale/[EMAIL PROTECTED]/LC_MESSAGES/gtk20.mo
share/locale/vi/LC_MESSAGES/gtk20-properties.mo
share/locale/vi/LC_MESSAGES/gtk20.mo
share/locale/wa/LC_MESSAGES/gtk20-properties.mo