diff options
Diffstat (limited to 'x11-toolkits')
88 files changed, 803 insertions, 941 deletions
diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile index d0abda35df7e..f78d647f128b 100644 --- a/x11-toolkits/Makefile +++ b/x11-toolkits/Makefile @@ -43,6 +43,11 @@ SUBDIR += gauche-gtk SUBDIR += gdl SUBDIR += gigi + SUBDIR += gir-repository-gtk20 + SUBDIR += gir-repository-gtksourceview2 + SUBDIR += gir-repository-libwnck + SUBDIR += gir-repository-pango + SUBDIR += gir-repository-vte SUBDIR += gnocl SUBDIR += gnome-desktop-sharp20 SUBDIR += gnome-sharp20 diff --git a/x11-toolkits/gauche-gtk/Makefile b/x11-toolkits/gauche-gtk/Makefile index 93d3f628c9e4..b2bc8fcee381 100644 --- a/x11-toolkits/gauche-gtk/Makefile +++ b/x11-toolkits/gauche-gtk/Makefile @@ -7,7 +7,7 @@ PORTNAME= gauche PORTVERSION= 0.4.1 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= x11-toolkits scheme MASTER_SITES= SF/${PORTNAME}/Gauche-gtk/${PORTVERSION} PKGNAMESUFFIX= -gtk @@ -36,6 +36,10 @@ PLIST_SUB+= GTKGLEXT="" PLIST_SUB+= GTKGLEXT="@comment " .endif +post-patch: + @${REINPLACE_CMD} -e 's|n-bytes|x-n-bytes|g' -e 's|text-size|x-text-size|g' \ + ${WRKSRC}/src/gtkentry.stub + post-install: .if !defined(NOPORTDOCS) ${MKDIR} ${EXAMPLESDIR} diff --git a/x11-toolkits/gdl/Makefile b/x11-toolkits/gdl/Makefile index 9e47cd09b4da..a17f592a31db 100644 --- a/x11-toolkits/gdl/Makefile +++ b/x11-toolkits/gdl/Makefile @@ -3,12 +3,11 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/gdl/Makefile,v 1.22 2009/03/17 18:08:56 kwm Exp $ +# $MCom: ports/x11-toolkits/gdl/Makefile,v 1.31 2009/11/24 18:15:38 kwm Exp $ # PORTNAME= gdl -PORTVERSION= 2.26.2 -PORTREVISION= 1 +PORTVERSION= 2.28.2 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME @@ -17,7 +16,7 @@ COMMENT= Components intended to be shared between GNOME development tools USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack libgnomeui +USE_GNOME= gnomeprefix gnomehack gtk20 USE_GETTEXT= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/x11-toolkits/gdl/distinfo b/x11-toolkits/gdl/distinfo index 5ccccc16b2ac..19f7a4702daf 100644 --- a/x11-toolkits/gdl/distinfo +++ b/x11-toolkits/gdl/distinfo @@ -1,3 +1,3 @@ -MD5 (gdl-2.26.2.tar.bz2) = 461b077f33ee7a447964f521e5455fd1 -SHA256 (gdl-2.26.2.tar.bz2) = bc19871a7512f85b684a332e282512e41bb354dc632e1a6cf3ca07708c344410 -SIZE (gdl-2.26.2.tar.bz2) = 552658 +MD5 (gdl-2.28.2.tar.bz2) = 8070b7effb3ca80e7f4f0c90924f6718 +SHA256 (gdl-2.28.2.tar.bz2) = c389c4fa623ce00b5a6da1103f4f4a913e4641e9787d13ba37854f17b9efdcf7 +SIZE (gdl-2.28.2.tar.bz2) = 543823 diff --git a/x11-toolkits/gdl/pkg-plist b/x11-toolkits/gdl/pkg-plist index 25b1c27b90e0..7e4dc41face9 100644 --- a/x11-toolkits/gdl/pkg-plist +++ b/x11-toolkits/gdl/pkg-plist @@ -1,35 +1,25 @@ -include/libgdl-1.0/gdl/gdl-combo-button.h include/libgdl-1.0/gdl/gdl-dock-bar.h include/libgdl-1.0/gdl/gdl-dock-item.h +include/libgdl-1.0/gdl/gdl-dock-item-grip.h include/libgdl-1.0/gdl/gdl-dock-layout.h include/libgdl-1.0/gdl/gdl-dock-master.h -include/libgdl-1.0/gdl/gdl-dock-notebook.h include/libgdl-1.0/gdl/gdl-dock-object.h -include/libgdl-1.0/gdl/gdl-dock-paned.h include/libgdl-1.0/gdl/gdl-dock-placeholder.h -include/libgdl-1.0/gdl/gdl-dock-tablabel.h include/libgdl-1.0/gdl/gdl-dock.h -include/libgdl-1.0/gdl/gdl-stock-icons.h -include/libgdl-1.0/gdl/gdl-stock.h -include/libgdl-1.0/gdl/gdl-switcher.h include/libgdl-1.0/gdl/gdl-tools.h include/libgdl-1.0/gdl/gdl.h include/libgdl-1.0/gdl/libgdltypebuiltins.h lib/libgdl-1.la lib/libgdl-1.so -lib/libgdl-1.so.0 +lib/libgdl-1.so.3 libdata/pkgconfig/gdl-1.0.pc %%DOCSDIR%%/GdlDock.html %%DOCSDIR%%/GdlDockBar.html %%DOCSDIR%%/GdlDockItem.html %%DOCSDIR%%/GdlDockLayout.html %%DOCSDIR%%/GdlDockMaster.html -%%DOCSDIR%%/GdlDockNotebook.html %%DOCSDIR%%/GdlDockObject.html -%%DOCSDIR%%/GdlDockPaned.html %%DOCSDIR%%/GdlDockPlaceholder.html -%%DOCSDIR%%/GdlDockTablabel.html -%%DOCSDIR%%/GdlSwitcher.html %%DOCSDIR%%/gdl-gdl-tools.html %%DOCSDIR%%/gdl-main.html %%DOCSDIR%%/gdl.devhelp @@ -41,7 +31,7 @@ libdata/pkgconfig/gdl-1.0.pc %%DOCSDIR%%/right.png %%DOCSDIR%%/style.css %%DOCSDIR%%/up.png -share/gdl/glade/layout.glade +share/gdl/ui/layout.ui share/locale/am/LC_MESSAGES/gdl-1.mo share/locale/ar/LC_MESSAGES/gdl-1.mo share/locale/ast/LC_MESSAGES/gdl-1.mo @@ -74,6 +64,7 @@ share/locale/ja/LC_MESSAGES/gdl-1.mo share/locale/ko/LC_MESSAGES/gdl-1.mo share/locale/lt/LC_MESSAGES/gdl-1.mo share/locale/lv/LC_MESSAGES/gdl-1.mo +share/locale/mai/LC_MESSAGES/gdl-1.mo share/locale/mk/LC_MESSAGES/gdl-1.mo share/locale/ml/LC_MESSAGES/gdl-1.mo share/locale/mr/LC_MESSAGES/gdl-1.mo @@ -105,7 +96,7 @@ share/locale/vi/LC_MESSAGES/gdl-1.mo share/locale/zh_CN/LC_MESSAGES/gdl-1.mo share/locale/zh_HK/LC_MESSAGES/gdl-1.mo share/locale/zh_TW/LC_MESSAGES/gdl-1.mo -@dirrm share/gdl/glade +@dirrm share/gdl/ui @dirrm share/gdl @dirrm %%DOCSDIR%% @dirrm include/libgdl-1.0/gdl @@ -126,6 +117,8 @@ share/locale/zh_TW/LC_MESSAGES/gdl-1.mo @dirrmtry share/locale/oc @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr +@dirrmtry share/locale/mai/LC_MESSAGES +@dirrmtry share/locale/mai @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES diff --git a/x11-toolkits/gir-repository-gtk20/Makefile b/x11-toolkits/gir-repository-gtk20/Makefile new file mode 100644 index 000000000000..1d064a3e6c23 --- /dev/null +++ b/x11-toolkits/gir-repository-gtk20/Makefile @@ -0,0 +1,15 @@ +# New ports collection makefile for: gir-repository-gtk20 +# Date created: 07 September 2009 +# Whom: Alexander Logvinov <avl@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/x11-toolkits/gir-repository-gtk20/Makefile,v 1.1 2009/09/16 02:05:13 avl Exp $ +# + +CATEGORIES= x11-toolkits + +MASTERDIR= ${.CURDIR}/../../devel/gir-repository + +PKGNAMESUFFIX= -gtk20 + +.include "${MASTERDIR}/bsd.gir.mk" diff --git a/x11-toolkits/gir-repository-gtksourceview2/Makefile b/x11-toolkits/gir-repository-gtksourceview2/Makefile new file mode 100644 index 000000000000..e2e0b03b0656 --- /dev/null +++ b/x11-toolkits/gir-repository-gtksourceview2/Makefile @@ -0,0 +1,15 @@ +# New ports collection makefile for: gir-repository-gtksourceview2 +# Date created: 12 September 2009 +# Whom: Alexander Logvinov <avl@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/x11-toolkits/gir-repository-gtksourceview2/Makefile,v 1.1 2009/09/16 02:05:13 avl Exp $ +# + +CATEGORIES= x11-toolkits + +MASTERDIR= ${.CURDIR}/../../devel/gir-repository + +PKGNAMESUFFIX= -gtksourceview2 + +.include "${MASTERDIR}/bsd.gir.mk" diff --git a/x11-toolkits/gir-repository-libwnck/Makefile b/x11-toolkits/gir-repository-libwnck/Makefile new file mode 100644 index 000000000000..d27921f60fea --- /dev/null +++ b/x11-toolkits/gir-repository-libwnck/Makefile @@ -0,0 +1,15 @@ +# New ports collection makefile for: gir-repository-libwnck +# Date created: 12 September 2009 +# Whom: Alexander Logvinov <avl@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/x11-toolkits/gir-repository-libwnck/Makefile,v 1.1 2009/09/16 02:05:14 avl Exp $ +# + +CATEGORIES= x11-toolkits + +MASTERDIR= ${.CURDIR}/../../devel/gir-repository + +PKGNAMESUFFIX= -libwnck + +.include "${MASTERDIR}/bsd.gir.mk" diff --git a/x11-toolkits/gir-repository-pango/Makefile b/x11-toolkits/gir-repository-pango/Makefile new file mode 100644 index 000000000000..5b3a538b3f00 --- /dev/null +++ b/x11-toolkits/gir-repository-pango/Makefile @@ -0,0 +1,15 @@ +# New ports collection makefile for: gir-repository-pango +# Date created: 07 September 2009 +# Whom: Alexander Logvinov <avl@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/x11-toolkits/gir-repository-pango/Makefile,v 1.1 2009/09/16 02:05:14 avl Exp $ +# + +CATEGORIES= x11-toolkits + +MASTERDIR= ${.CURDIR}/../../devel/gir-repository + +PKGNAMESUFFIX= -pango + +.include "${MASTERDIR}/bsd.gir.mk" diff --git a/x11-toolkits/gir-repository-vte/Makefile b/x11-toolkits/gir-repository-vte/Makefile new file mode 100644 index 000000000000..e6701185c27c --- /dev/null +++ b/x11-toolkits/gir-repository-vte/Makefile @@ -0,0 +1,15 @@ +# New ports collection makefile for: gir-repository-vte +# Date created: 12 September 2009 +# Whom: Alexander Logvinov <avl@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/x11-toolkits/gir-repository-vte/Makefile,v 1.1 2009/09/16 02:05:14 avl Exp $ +# + +CATEGORIES= x11-toolkits + +MASTERDIR= ${.CURDIR}/../../devel/gir-repository + +PKGNAMESUFFIX= -vte + +.include "${MASTERDIR}/bsd.gir.mk" diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index 9db9546d7ccd..c4e8d5625e0a 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -3,11 +3,11 @@ # Whom: Vanilla I. Shu <vanilla@MinJe.com.TW> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.152 2009/03/13 16:20:57 kwm Exp $ +# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.174 2009/10/17 09:40:33 kwm Exp $ # PORTNAME= gtk -PORTVERSION= 2.16.6 +PORTVERSION= 2.18.3 PORTREVISION?= 0 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \ @@ -44,7 +44,7 @@ USE_GNOME= gnomehack atk pango ltverhack USE_GETTEXT= yes USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \ xcomposite -CONFIGURE_ARGS= --enable-static --with-xinput=yes +CONFIGURE_ARGS= --enable-static --with-xinput=yes --with-libjasper CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \ -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo index be741d8cebee..d4f7d977df7b 100644 --- a/x11-toolkits/gtk20/distinfo +++ b/x11-toolkits/gtk20/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gtk+-2.16.6.tar.bz2) = 416412b336d9f3b6b78ca887395d1726 -SHA256 (gnome2/gtk+-2.16.6.tar.bz2) = 18e0f9792028e6cc5108447678f17d396f9a2cdfec1e6ab5dca98cb844f954af -SIZE (gnome2/gtk+-2.16.6.tar.bz2) = 18518781 +MD5 (gnome2/gtk+-2.18.3.tar.bz2) = 369e173600efc272131b53b1902679e8 +SHA256 (gnome2/gtk+-2.18.3.tar.bz2) = 1c0665fe560a560851e8b3c9a6501d416c4b54abfb6fa07549d703a04ea768bf +SIZE (gnome2/gtk+-2.18.3.tar.bz2) = 19069010 diff --git a/x11-toolkits/gtk20/files/patch-ah b/x11-toolkits/gtk20/files/patch-ah index 88bfe209d8ae..416fbb3f007e 100644 --- a/x11-toolkits/gtk20/files/patch-ah +++ b/x11-toolkits/gtk20/files/patch-ah @@ -1,11 +1,11 @@ ---- docs/Makefile.in.orig Fri Oct 24 21:47:52 2003 -+++ docs/Makefile.in Fri Oct 24 23:35:09 2003 -@@ -179,7 +179,7 @@ +--- docs/Makefile.in.orig 2009-09-05 11:12:17.000000000 +0200 ++++ docs/Makefile.in 2009-09-05 11:16:52.000000000 +0200 +@@ -228,7 +228,7 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ - MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ - MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ -MAKEINFO = @MAKEINFO@ +MAKEINFO = @MAKEINFO@ --no-split + MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ - MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ diff --git a/x11-toolkits/gtk20/files/patch-ai b/x11-toolkits/gtk20/files/patch-ai index a7c07057c598..0a4e1022fa27 100644 --- a/x11-toolkits/gtk20/files/patch-ai +++ b/x11-toolkits/gtk20/files/patch-ai @@ -1,11 +1,11 @@ ---- docs/reference/Makefile.in.orig 2008-02-23 10:25:17.000000000 -0500 -+++ docs/reference/Makefile.in 2008-02-23 10:26:36.000000000 -0500 -@@ -372,7 +372,7 @@ +--- docs/reference/Makefile.in.orig 2009-09-05 11:17:44.000000000 +0200 ++++ docs/reference/Makefile.in 2009-09-05 11:18:15.000000000 +0200 +@@ -359,7 +359,7 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY - -SUBDIRS = gdk-pixbuf gdk gtk libgail-util -+SUBDIRS = # gdk-pixbuf gdk gtk libgail-util - subdir = docs/reference - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++SUBDIRS = #gdk-pixbuf gdk gtk libgail-util + GITIGNOREFILES = */*.1 + all: all-recursive + diff --git a/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in b/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in index 1bedfdf55f2c..04ce78984f84 100644 --- a/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in +++ b/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in @@ -1,15 +1,14 @@ ---- gdk-pixbuf/Makefile.in.orig Wed Mar 2 15:56:36 2005 -+++ gdk-pixbuf/Makefile.in Wed Mar 2 15:57:08 2005 -@@ -519,10 +519,10 @@ - - bin_PROGRAMS = gdk-pixbuf-csource gdk-pixbuf-query-loaders +--- gdk-pixbuf/Makefile.in.orig 2009-09-05 11:19:07.000000000 +0200 ++++ gdk-pixbuf/Makefile.in 2009-09-05 11:20:19.000000000 +0200 +@@ -1322,9 +1322,9 @@ AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loade + LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS) + test_gdk_pixbuf_LDADD = $(LDADDS) gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c -gdk_pixbuf_csource_LDADD = $(LDADDS) +gdk_pixbuf_csource_LDADD = $(LDADDS) $(GLIB_LIBS) - gdk_pixbuf_query_loaders_DEPENDENCIES = $(DEPS) -gdk_pixbuf_query_loaders_LDADD = $(LDADDS) +gdk_pixbuf_query_loaders_LDADD = $(LDADDS) $(GLIB_LIBS) - gdk_pixbuf_query_loaders_SOURCES = queryloaders.c + # diff --git a/x11-toolkits/gtk20/files/patch-gtk_Makefile.in b/x11-toolkits/gtk20/files/patch-gtk_Makefile.in index 610ece8f33ac..8037cf952ad2 100644 --- a/x11-toolkits/gtk20/files/patch-gtk_Makefile.in +++ b/x11-toolkits/gtk20/files/patch-gtk_Makefile.in @@ -1,16 +1,14 @@ ---- gtk/Makefile.in.orig Sat May 6 04:47:11 2006 -+++ gtk/Makefile.in Sat May 6 04:48:06 2006 -@@ -1009,11 +1009,11 @@ LDADDS = \ - bin_PROGRAMS = gtk-query-immodules-2.0 gtk-update-icon-cache +--- gtk/Makefile.in.orig 2009-09-05 11:21:40.000000000 +0200 ++++ gtk/Makefile.in 2009-09-05 11:22:57.000000000 +0200 +@@ -1310,9 +1310,9 @@ LDADDS = \ + bin_SCRIPTS = gtk-builder-convert gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS) -gtk_query_immodules_2_0_LDADD = $(LDADDS) +gtk_query_immodules_2_0_LDADD = $(LDADDS) $(GLIB_LIBS) - gtk_query_immodules_2_0_SOURCES = queryimmodules.c - -gtk_update_icon_cache_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la +gtk_update_icon_cache_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la $(GLIB_LIBS) - - gtk_update_icon_cache_SOURCES = updateiconcache.c + gtk_update_icon_cache_SOURCES = \ + updateiconcache.c diff --git a/x11-toolkits/gtk20/files/patch-gtk_updateiconcache.c b/x11-toolkits/gtk20/files/patch-gtk_updateiconcache.c index 9003cc7d095e..206257551dbe 100644 --- a/x11-toolkits/gtk20/files/patch-gtk_updateiconcache.c +++ b/x11-toolkits/gtk20/files/patch-gtk_updateiconcache.c @@ -1,6 +1,6 @@ ---- gtk/updateiconcache.c.orig 2008-02-16 11:33:25.000000000 -0500 -+++ gtk/updateiconcache.c 2008-02-16 11:33:33.000000000 -0500 -@@ -1477,7 +1477,7 @@ build_cache (const gchar *path) +--- gtk/updateiconcache.c.orig 2009-05-11 18:05:35.000000000 +0200 ++++ gtk/updateiconcache.c 2009-05-30 12:03:39.000000000 +0200 +@@ -1505,7 +1505,7 @@ opentmp: if (!validate_file (tmp_cache_path)) { g_printerr (_("The generated cache was invalid.\n")); diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist index 830f0e739210..d65ae42f666a 100644 --- a/x11-toolkits/gtk20/pkg-plist +++ b/x11-toolkits/gtk20/pkg-plist @@ -110,6 +110,7 @@ include/gtk-2.0/gtk/gtkdnd.h include/gtk-2.0/gtk/gtkdrawingarea.h include/gtk-2.0/gtk/gtkeditable.h include/gtk-2.0/gtk/gtkentry.h +include/gtk-2.0/gtk/gtkentrybuffer.h include/gtk-2.0/gtk/gtkentrycompletion.h include/gtk-2.0/gtk/gtkenums.h include/gtk-2.0/gtk/gtkeventbox.h @@ -138,6 +139,7 @@ include/gtk-2.0/gtk/gtkhsv.h include/gtk-2.0/gtk/gtkiconfactory.h include/gtk-2.0/gtk/gtkicontheme.h include/gtk-2.0/gtk/gtkiconview.h +include/gtk-2.0/gtk/gtkinfobar.h include/gtk-2.0/gtk/gtkimage.h include/gtk-2.0/gtk/gtkimagemenuitem.h include/gtk-2.0/gtk/gtkimcontext.h @@ -413,6 +415,7 @@ 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 +share/gtk-2.0/demo/entry_buffer.c share/gtk-2.0/demo/entry_completion.c share/gtk-2.0/demo/expander.c share/gtk-2.0/demo/floppybuddy.gif @@ -430,8 +433,12 @@ share/gtk-2.0/demo/hypertext.c share/gtk-2.0/demo/iconview.c share/gtk-2.0/demo/iconview_edit.c share/gtk-2.0/demo/images.c +share/gtk-2.0/demo/infobar.c share/gtk-2.0/demo/list_store.c +share/gtk-2.0/demo/links.c share/gtk-2.0/demo/menus.c +share/gtk-2.0/demo/offscreen_window.c +share/gtk-2.0/demo/offscreen_window2.c share/gtk-2.0/demo/panes.c share/gtk-2.0/demo/pickers.c share/gtk-2.0/demo/pixbufs.c diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile index 9db9546d7ccd..c4e8d5625e0a 100644 --- a/x11-toolkits/gtk30/Makefile +++ b/x11-toolkits/gtk30/Makefile @@ -3,11 +3,11 @@ # Whom: Vanilla I. Shu <vanilla@MinJe.com.TW> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.152 2009/03/13 16:20:57 kwm Exp $ +# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.174 2009/10/17 09:40:33 kwm Exp $ # PORTNAME= gtk -PORTVERSION= 2.16.6 +PORTVERSION= 2.18.3 PORTREVISION?= 0 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \ @@ -44,7 +44,7 @@ USE_GNOME= gnomehack atk pango ltverhack USE_GETTEXT= yes USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \ xcomposite -CONFIGURE_ARGS= --enable-static --with-xinput=yes +CONFIGURE_ARGS= --enable-static --with-xinput=yes --with-libjasper CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \ -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo index be741d8cebee..d4f7d977df7b 100644 --- a/x11-toolkits/gtk30/distinfo +++ b/x11-toolkits/gtk30/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gtk+-2.16.6.tar.bz2) = 416412b336d9f3b6b78ca887395d1726 -SHA256 (gnome2/gtk+-2.16.6.tar.bz2) = 18e0f9792028e6cc5108447678f17d396f9a2cdfec1e6ab5dca98cb844f954af -SIZE (gnome2/gtk+-2.16.6.tar.bz2) = 18518781 +MD5 (gnome2/gtk+-2.18.3.tar.bz2) = 369e173600efc272131b53b1902679e8 +SHA256 (gnome2/gtk+-2.18.3.tar.bz2) = 1c0665fe560a560851e8b3c9a6501d416c4b54abfb6fa07549d703a04ea768bf +SIZE (gnome2/gtk+-2.18.3.tar.bz2) = 19069010 diff --git a/x11-toolkits/gtk30/files/patch-ah b/x11-toolkits/gtk30/files/patch-ah index 88bfe209d8ae..416fbb3f007e 100644 --- a/x11-toolkits/gtk30/files/patch-ah +++ b/x11-toolkits/gtk30/files/patch-ah @@ -1,11 +1,11 @@ ---- docs/Makefile.in.orig Fri Oct 24 21:47:52 2003 -+++ docs/Makefile.in Fri Oct 24 23:35:09 2003 -@@ -179,7 +179,7 @@ +--- docs/Makefile.in.orig 2009-09-05 11:12:17.000000000 +0200 ++++ docs/Makefile.in 2009-09-05 11:16:52.000000000 +0200 +@@ -228,7 +228,7 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ - MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ - MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ -MAKEINFO = @MAKEINFO@ +MAKEINFO = @MAKEINFO@ --no-split + MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ - MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ diff --git a/x11-toolkits/gtk30/files/patch-ai b/x11-toolkits/gtk30/files/patch-ai index a7c07057c598..0a4e1022fa27 100644 --- a/x11-toolkits/gtk30/files/patch-ai +++ b/x11-toolkits/gtk30/files/patch-ai @@ -1,11 +1,11 @@ ---- docs/reference/Makefile.in.orig 2008-02-23 10:25:17.000000000 -0500 -+++ docs/reference/Makefile.in 2008-02-23 10:26:36.000000000 -0500 -@@ -372,7 +372,7 @@ +--- docs/reference/Makefile.in.orig 2009-09-05 11:17:44.000000000 +0200 ++++ docs/reference/Makefile.in 2009-09-05 11:18:15.000000000 +0200 +@@ -359,7 +359,7 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY - -SUBDIRS = gdk-pixbuf gdk gtk libgail-util -+SUBDIRS = # gdk-pixbuf gdk gtk libgail-util - subdir = docs/reference - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++SUBDIRS = #gdk-pixbuf gdk gtk libgail-util + GITIGNOREFILES = */*.1 + all: all-recursive + diff --git a/x11-toolkits/gtk30/files/patch-gdk-pixbuf_Makefile.in b/x11-toolkits/gtk30/files/patch-gdk-pixbuf_Makefile.in index 1bedfdf55f2c..04ce78984f84 100644 --- a/x11-toolkits/gtk30/files/patch-gdk-pixbuf_Makefile.in +++ b/x11-toolkits/gtk30/files/patch-gdk-pixbuf_Makefile.in @@ -1,15 +1,14 @@ ---- gdk-pixbuf/Makefile.in.orig Wed Mar 2 15:56:36 2005 -+++ gdk-pixbuf/Makefile.in Wed Mar 2 15:57:08 2005 -@@ -519,10 +519,10 @@ - - bin_PROGRAMS = gdk-pixbuf-csource gdk-pixbuf-query-loaders +--- gdk-pixbuf/Makefile.in.orig 2009-09-05 11:19:07.000000000 +0200 ++++ gdk-pixbuf/Makefile.in 2009-09-05 11:20:19.000000000 +0200 +@@ -1322,9 +1322,9 @@ AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loade + LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS) + test_gdk_pixbuf_LDADD = $(LDADDS) gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c -gdk_pixbuf_csource_LDADD = $(LDADDS) +gdk_pixbuf_csource_LDADD = $(LDADDS) $(GLIB_LIBS) - gdk_pixbuf_query_loaders_DEPENDENCIES = $(DEPS) -gdk_pixbuf_query_loaders_LDADD = $(LDADDS) +gdk_pixbuf_query_loaders_LDADD = $(LDADDS) $(GLIB_LIBS) - gdk_pixbuf_query_loaders_SOURCES = queryloaders.c + # diff --git a/x11-toolkits/gtk30/files/patch-gtk_Makefile.in b/x11-toolkits/gtk30/files/patch-gtk_Makefile.in index 610ece8f33ac..8037cf952ad2 100644 --- a/x11-toolkits/gtk30/files/patch-gtk_Makefile.in +++ b/x11-toolkits/gtk30/files/patch-gtk_Makefile.in @@ -1,16 +1,14 @@ ---- gtk/Makefile.in.orig Sat May 6 04:47:11 2006 -+++ gtk/Makefile.in Sat May 6 04:48:06 2006 -@@ -1009,11 +1009,11 @@ LDADDS = \ - bin_PROGRAMS = gtk-query-immodules-2.0 gtk-update-icon-cache +--- gtk/Makefile.in.orig 2009-09-05 11:21:40.000000000 +0200 ++++ gtk/Makefile.in 2009-09-05 11:22:57.000000000 +0200 +@@ -1310,9 +1310,9 @@ LDADDS = \ + bin_SCRIPTS = gtk-builder-convert gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS) -gtk_query_immodules_2_0_LDADD = $(LDADDS) +gtk_query_immodules_2_0_LDADD = $(LDADDS) $(GLIB_LIBS) - gtk_query_immodules_2_0_SOURCES = queryimmodules.c - -gtk_update_icon_cache_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la +gtk_update_icon_cache_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la $(GLIB_LIBS) - - gtk_update_icon_cache_SOURCES = updateiconcache.c + gtk_update_icon_cache_SOURCES = \ + updateiconcache.c diff --git a/x11-toolkits/gtk30/files/patch-gtk_updateiconcache.c b/x11-toolkits/gtk30/files/patch-gtk_updateiconcache.c index 9003cc7d095e..206257551dbe 100644 --- a/x11-toolkits/gtk30/files/patch-gtk_updateiconcache.c +++ b/x11-toolkits/gtk30/files/patch-gtk_updateiconcache.c @@ -1,6 +1,6 @@ ---- gtk/updateiconcache.c.orig 2008-02-16 11:33:25.000000000 -0500 -+++ gtk/updateiconcache.c 2008-02-16 11:33:33.000000000 -0500 -@@ -1477,7 +1477,7 @@ build_cache (const gchar *path) +--- gtk/updateiconcache.c.orig 2009-05-11 18:05:35.000000000 +0200 ++++ gtk/updateiconcache.c 2009-05-30 12:03:39.000000000 +0200 +@@ -1505,7 +1505,7 @@ opentmp: if (!validate_file (tmp_cache_path)) { g_printerr (_("The generated cache was invalid.\n")); diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist index 830f0e739210..d65ae42f666a 100644 --- a/x11-toolkits/gtk30/pkg-plist +++ b/x11-toolkits/gtk30/pkg-plist @@ -110,6 +110,7 @@ include/gtk-2.0/gtk/gtkdnd.h include/gtk-2.0/gtk/gtkdrawingarea.h include/gtk-2.0/gtk/gtkeditable.h include/gtk-2.0/gtk/gtkentry.h +include/gtk-2.0/gtk/gtkentrybuffer.h include/gtk-2.0/gtk/gtkentrycompletion.h include/gtk-2.0/gtk/gtkenums.h include/gtk-2.0/gtk/gtkeventbox.h @@ -138,6 +139,7 @@ include/gtk-2.0/gtk/gtkhsv.h include/gtk-2.0/gtk/gtkiconfactory.h include/gtk-2.0/gtk/gtkicontheme.h include/gtk-2.0/gtk/gtkiconview.h +include/gtk-2.0/gtk/gtkinfobar.h include/gtk-2.0/gtk/gtkimage.h include/gtk-2.0/gtk/gtkimagemenuitem.h include/gtk-2.0/gtk/gtkimcontext.h @@ -413,6 +415,7 @@ 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 +share/gtk-2.0/demo/entry_buffer.c share/gtk-2.0/demo/entry_completion.c share/gtk-2.0/demo/expander.c share/gtk-2.0/demo/floppybuddy.gif @@ -430,8 +433,12 @@ share/gtk-2.0/demo/hypertext.c share/gtk-2.0/demo/iconview.c share/gtk-2.0/demo/iconview_edit.c share/gtk-2.0/demo/images.c +share/gtk-2.0/demo/infobar.c share/gtk-2.0/demo/list_store.c +share/gtk-2.0/demo/links.c share/gtk-2.0/demo/menus.c +share/gtk-2.0/demo/offscreen_window.c +share/gtk-2.0/demo/offscreen_window2.c share/gtk-2.0/demo/panes.c share/gtk-2.0/demo/pickers.c share/gtk-2.0/demo/pixbufs.c diff --git a/x11-toolkits/gtkada-gcc/Makefile b/x11-toolkits/gtkada-gcc/Makefile index 3eb291124176..4db4853550e3 100644 --- a/x11-toolkits/gtkada-gcc/Makefile +++ b/x11-toolkits/gtkada-gcc/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtkada PORTVERSION= 2.8.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-toolkits MASTER_SITES= SF/gnuada/GNAT_GCC%20Source/4.1.1%20R6 PKGNAMESUFFIX= -gcc @@ -49,5 +49,7 @@ do-extract: post-patch: @${REINPLACE_CMD} -e 's|lib/pkgconfig|libdata/pkgconfig|' ${WRKSRC}/projects/Makefile + @${REINPLACE_CMD} -e 's|n_bytes|x_n_bytes|g' -e 's|text_size|x_text_size|g' \ + ${WRKSRC}/src/gtkextra/gtkitementry.c .include <bsd.port.mk> diff --git a/x11-toolkits/gtkextra2/Makefile b/x11-toolkits/gtkextra2/Makefile index a1945f0dbaf1..8974a8296a8e 100644 --- a/x11-toolkits/gtkextra2/Makefile +++ b/x11-toolkits/gtkextra2/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtkextra PORTVERSION= 2.1.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-toolkits MASTER_SITES= SF/scigraphica/GtkExtra/${PORTVERSION}%20Sources DISTNAME= ${PORTNAME:S/gtk/gtk+/}-${PORTVERSION} diff --git a/x11-toolkits/gtkextra2/files/patch-gtkextra_gtkitementry.c b/x11-toolkits/gtkextra2/files/patch-gtkextra_gtkitementry.c new file mode 100644 index 000000000000..209bf3070e28 --- /dev/null +++ b/x11-toolkits/gtkextra2/files/patch-gtkextra_gtkitementry.c @@ -0,0 +1,108 @@ +--- gtkextra/gtkitementry.c.orig 2009-09-26 16:38:37.000000000 +0200 ++++ gtkextra/gtkitementry.c 2009-09-26 16:40:16.000000000 +0200 +@@ -693,23 +693,23 @@ gtk_entry_real_insert_text (GtkEditable + new_text_length = g_utf8_offset_to_pointer (new_text, n_chars) - new_text; + } + +- if (new_text_length + entry->n_bytes + 1 > entry->text_size) ++ if (new_text_length + entry->x_n_bytes + 1 > entry->x_text_size) + { +- while (new_text_length + entry->n_bytes + 1 > entry->text_size) ++ while (new_text_length + entry->x_n_bytes + 1 > entry->x_text_size) + { +- if (entry->text_size == 0) +- entry->text_size = MIN_SIZE; ++ if (entry->x_text_size == 0) ++ entry->x_text_size = MIN_SIZE; + else + { +- if (2 * (guint)entry->text_size < MAX_SIZE && +- 2 * (guint)entry->text_size > entry->text_size) +- entry->text_size *= 2; ++ if (2 * (guint)entry->x_text_size < MAX_SIZE && ++ 2 * (guint)entry->x_text_size > entry->x_text_size) ++ entry->x_text_size *= 2; + else + { +- entry->text_size = MAX_SIZE; +- if (new_text_length > (gint)entry->text_size - (gint)entry->n_bytes - 1) ++ entry->x_text_size = MAX_SIZE; ++ if (new_text_length > (gint)entry->x_text_size - (gint)entry->x_n_bytes - 1) + { +- new_text_length = (gint)entry->text_size - (gint)entry->n_bytes - 1; ++ new_text_length = (gint)entry->x_text_size - (gint)entry->x_n_bytes - 1; + new_text_length = g_utf8_find_prev_char (new_text, new_text + new_text_length + 1) - new_text; + n_chars = g_utf8_strlen (new_text, new_text_length); + } +@@ -718,19 +718,19 @@ gtk_entry_real_insert_text (GtkEditable + } + } + +- entry->text = g_realloc (entry->text, entry->text_size); ++ entry->text = g_realloc (entry->text, entry->x_text_size); + } + + index = g_utf8_offset_to_pointer (entry->text, *position) - entry->text; + +- g_memmove (entry->text + index + new_text_length, entry->text + index, entry->n_bytes - index); ++ g_memmove (entry->text + index + new_text_length, entry->text + index, entry->x_n_bytes - index); + memcpy (entry->text + index, new_text, new_text_length); + +- entry->n_bytes += new_text_length; ++ entry->x_n_bytes += new_text_length; + entry->text_length += n_chars; + + /* NUL terminate for safety and convenience */ +- entry->text[entry->n_bytes] = '\0'; ++ entry->text[entry->x_n_bytes] = '\0'; + + if (entry->current_pos > *position) + entry->current_pos += n_chars; +@@ -763,9 +763,9 @@ gtk_entry_real_delete_text (GtkEditable + gint start_index = g_utf8_offset_to_pointer (entry->text, start_pos) - entry->text; + gint end_index = g_utf8_offset_to_pointer (entry->text, end_pos) - entry->text; + +- g_memmove (entry->text + start_index, entry->text + end_index, entry->n_bytes + 1 - end_index); ++ g_memmove (entry->text + start_index, entry->text + end_index, entry->x_n_bytes + 1 - end_index); + entry->text_length -= (end_pos - start_pos); +- entry->n_bytes -= (end_index - start_index); ++ entry->x_n_bytes -= (end_index - start_index); + + if (entry->current_pos > start_pos) + entry->current_pos -= MIN (entry->current_pos, end_pos) - start_pos; +@@ -1028,7 +1028,7 @@ gtk_entry_retrieve_surrounding_cb (GtkIM + { + gtk_im_context_set_surrounding (context, + entry->text, +- entry->n_bytes, ++ entry->x_n_bytes, + g_utf8_offset_to_pointer (entry->text, entry->current_pos) - entry->text); + + return TRUE; +@@ -1229,7 +1229,7 @@ gtk_entry_create_layout (GtkEntry *entry + + if (entry->visible) + { +- g_string_prepend_len (tmp_string, entry->text, entry->n_bytes); ++ g_string_prepend_len (tmp_string, entry->text, entry->x_n_bytes); + g_string_insert (tmp_string, cursor_index, preedit_string); + } + else +@@ -1238,7 +1238,7 @@ gtk_entry_create_layout (GtkEntry *entry + gint preedit_len_chars; + gunichar invisible_char; + +- ch_len = g_utf8_strlen (entry->text, entry->n_bytes); ++ ch_len = g_utf8_strlen (entry->text, entry->x_n_bytes); + preedit_len_chars = g_utf8_strlen (preedit_string, -1); + ch_len += preedit_len_chars; + +@@ -1272,7 +1272,7 @@ gtk_entry_create_layout (GtkEntry *entry + { + if (entry->visible) + { +- pango_layout_set_text (layout, entry->text, entry->n_bytes); ++ pango_layout_set_text (layout, entry->text, entry->x_n_bytes); + } + else + { diff --git a/x11-toolkits/gtkmm24-reference/Makefile b/x11-toolkits/gtkmm24-reference/Makefile index cac4d3180c66..1c1e84cbd219 100644 --- a/x11-toolkits/gtkmm24-reference/Makefile +++ b/x11-toolkits/gtkmm24-reference/Makefile @@ -5,9 +5,10 @@ # $FreeBSD$ # -PORTREVISION= 4 +PORTREVISION= 5 -BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gtkmm-2.4.pc:${PORTSDIR}/x11-toolkits/gtkmm24 +BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gtkmm-2.4.pc:${PORTSDIR}/x11-toolkits/gtkmm24 \ + ${LOCALBASE}/share/glibmm-2.4/doctool/doc-install.pl:${PORTSDIR}/devel/glibmm-reference USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/x11-toolkits/gtkmm24-reference/pkg-plist b/x11-toolkits/gtkmm24-reference/pkg-plist index 79c4a6b613a5..842fc6b954a7 100644 --- a/x11-toolkits/gtkmm24-reference/pkg-plist +++ b/x11-toolkits/gtkmm24-reference/pkg-plist @@ -1,4 +1,4 @@ -%%PORTDOCS%%share/devhelp/books/gtkmm-2.4/gtkmm-2.4.devhelp +%%PORTDOCS%%share/devhelp/books/gtkmm-2.4/gtkmm-2.4.devhelp2 %%PORTDOCS%%@dirrm share/devhelp/books/gtkmm-2.4 %%PORTDOCS%%@dirrmtry share/devhelp/books %%PORTDOCS%%@dirrmtry share/devhelp diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile index 47733eaff60c..d67a1b4087b2 100644 --- a/x11-toolkits/gtkmm24/Makefile +++ b/x11-toolkits/gtkmm24/Makefile @@ -3,12 +3,12 @@ # Whom: Martin Klaffenboeck <martin.klaffenboeck@gmx.at> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/gtkmm24/Makefile,v 1.46 2009/03/17 15:18:15 kwm Exp $ +# $MCom: ports/x11-toolkits/gtkmm24/Makefile,v 1.55 2009/10/04 09:39:21 kwm Exp $ # PORTNAME= gtkmm -PORTVERSION= 2.16.0 -PORTREVISION?= 1 +PORTVERSION= 2.18.2 +PORTREVISION?= 0 CATEGORIES= x11-toolkits MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -29,22 +29,18 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 USE_GMAKE= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes -USE_GNOME= gnomehack gtk20 +USE_AUTOTOOLS= libtool:22 +USE_GNOME= gnomehack gtk20 ltverhack:1 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --disable-demos \ - --disable-docs \ - --disable-examples \ - --enable-static=yes \ - --with-sigc-prefix=${LOCALBASE} +CONFIGURE_ARGS= --disable-documentation \ + --enable-static=yes PLIST_SUB= VERSION="2.4" API_VERSION="2.4" post-patch: @${REINPLACE_CMD} -e '/^SUBDIRS =/s/tests//' \ ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's|demo[$$][(]EXEEXT[)]|gtkmm-demo$$(EXEEXT)|g' \ - ${WRKSRC}/demos/gtk-demo/Makefile.in .include <bsd.port.mk> diff --git a/x11-toolkits/gtkmm24/distinfo b/x11-toolkits/gtkmm24/distinfo index 98ae79afc752..e0749a3452c3 100644 --- a/x11-toolkits/gtkmm24/distinfo +++ b/x11-toolkits/gtkmm24/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gtkmm-2.16.0.tar.bz2) = a82e3b5b93008421ff67df16d1e51ec2 -SHA256 (gnome2/gtkmm-2.16.0.tar.bz2) = 9994e6a92f7086adb58aba0431f29a766218f806b9db95359dad59a0615f95bf -SIZE (gnome2/gtkmm-2.16.0.tar.bz2) = 9313258 +MD5 (gnome2/gtkmm-2.18.2.tar.bz2) = 3e43e9eef1da8988a76a2815d6b31c91 +SHA256 (gnome2/gtkmm-2.18.2.tar.bz2) = dfc003e22ecdc046cbae731b24e077ed87efa0f9ca57a0735dfe716c560b474e +SIZE (gnome2/gtkmm-2.18.2.tar.bz2) = 12215352 diff --git a/x11-toolkits/gtkmm24/pkg-plist b/x11-toolkits/gtkmm24/pkg-plist index acf9e6def421..93d068b38611 100644 --- a/x11-toolkits/gtkmm24/pkg-plist +++ b/x11-toolkits/gtkmm24/pkg-plist @@ -53,6 +53,7 @@ include/gdkmm-%%API_VERSION%%/gdkmm/event.h include/gdkmm-%%API_VERSION%%/gdkmm/gc.h include/gdkmm-%%API_VERSION%%/gdkmm/general.h include/gdkmm-%%API_VERSION%%/gdkmm/image.h +include/gtkmm-%%API_VERSION%%/gtkmm/infobar.h include/gdkmm-%%API_VERSION%%/gdkmm/list.h include/gdkmm-%%API_VERSION%%/gdkmm/pixbuf.h include/gdkmm-%%API_VERSION%%/gdkmm/pixbufanimation.h @@ -72,6 +73,7 @@ include/gdkmm-%%API_VERSION%%/gdkmm/private/drawable_p.h include/gdkmm-%%API_VERSION%%/gdkmm/private/event_p.h include/gdkmm-%%API_VERSION%%/gdkmm/private/gc_p.h include/gdkmm-%%API_VERSION%%/gdkmm/private/image_p.h +include/gtkmm-%%API_VERSION%%/gtkmm/private/infobar_p.h include/gdkmm-%%API_VERSION%%/gdkmm/private/pixbuf_p.h include/gdkmm-%%API_VERSION%%/gdkmm/private/pixbufanimation_p.h include/gdkmm-%%API_VERSION%%/gdkmm/private/pixbufanimationiter_p.h @@ -445,12 +447,6 @@ include/gtkmm-%%API_VERSION%%/gtkmm/window.h include/gtkmm-%%API_VERSION%%/gtkmm/wrap_init.h lib/gdkmm-%%API_VERSION%%/include/gdkmmconfig.h lib/gtkmm-%%API_VERSION%%/include/gtkmmconfig.h -lib/gtkmm-%%API_VERSION%%/proc/m4/convert.m4 -lib/gtkmm-%%API_VERSION%%/proc/m4/convert_atk.m4 -lib/gtkmm-%%API_VERSION%%/proc/m4/convert_gdk.m4 -lib/gtkmm-%%API_VERSION%%/proc/m4/convert_gtk.m4 -lib/gtkmm-%%API_VERSION%%/proc/m4/convert_gtkmm.m4 -lib/gtkmm-%%API_VERSION%%/proc/m4/convert_pango.m4 lib/libatkmm-1.6.a lib/libatkmm-1.6.la lib/libatkmm-1.6.so @@ -466,8 +462,48 @@ lib/libgtkmm-%%VERSION%%.so.1 libdata/pkgconfig/atkmm-1.6.pc libdata/pkgconfig/gdkmm-%%API_VERSION%%.pc libdata/pkgconfig/gtkmm-%%API_VERSION%%.pc -@dirrm lib/gtkmm-%%API_VERSION%%/proc/m4 -@dirrm lib/gtkmm-%%API_VERSION%%/proc +share/gtkmm-%%API_VERSION%%/demo/alphatest.png +share/gtkmm-%%API_VERSION%%/demo/apple-red.png +share/gtkmm-%%API_VERSION%%/demo/background.jpg +share/gtkmm-%%API_VERSION%%/demo/demo-common.cc +share/gtkmm-%%API_VERSION%%/demo/demo-common.h +share/gtkmm-%%API_VERSION%%/demo/demos.h +share/gtkmm-%%API_VERSION%%/demo/demowindow.cc +share/gtkmm-%%API_VERSION%%/demo/demowindow.h +share/gtkmm-%%API_VERSION%%/demo/example_appwindow.cc +share/gtkmm-%%API_VERSION%%/demo/example_buttonbox.cc +share/gtkmm-%%API_VERSION%%/demo/example_change_display.cc +share/gtkmm-%%API_VERSION%%/demo/example_colorsel.cc +share/gtkmm-%%API_VERSION%%/demo/example_dialog.cc +share/gtkmm-%%API_VERSION%%/demo/example_drawingarea.cc +share/gtkmm-%%API_VERSION%%/demo/example_iconview.cc +share/gtkmm-%%API_VERSION%%/demo/example_images.cc +share/gtkmm-%%API_VERSION%%/demo/example_menus.cc +share/gtkmm-%%API_VERSION%%/demo/example_panes.cc +share/gtkmm-%%API_VERSION%%/demo/example_pixbufs.cc +share/gtkmm-%%API_VERSION%%/demo/example_sizegroup.cc +share/gtkmm-%%API_VERSION%%/demo/example_stockbrowser.cc +share/gtkmm-%%API_VERSION%%/demo/example_textview.cc +share/gtkmm-%%API_VERSION%%/demo/example_treeview_editable_cells.cc +share/gtkmm-%%API_VERSION%%/demo/example_treeview_liststore.cc +share/gtkmm-%%API_VERSION%%/demo/example_treeview_treestore.cc +share/gtkmm-%%API_VERSION%%/demo/example_uimanager.cc +share/gtkmm-%%API_VERSION%%/demo/floppybuddy.gif +share/gtkmm-%%API_VERSION%%/demo/gnome-applets.png +share/gtkmm-%%API_VERSION%%/demo/gnome-calendar.png +share/gtkmm-%%API_VERSION%%/demo/gnome-foot.png +share/gtkmm-%%API_VERSION%%/demo/gnome-fs-directory.png +share/gtkmm-%%API_VERSION%%/demo/gnome-fs-regular.png +share/gtkmm-%%API_VERSION%%/demo/gnome-gimp.png +share/gtkmm-%%API_VERSION%%/demo/gnome-gmush.png +share/gtkmm-%%API_VERSION%%/demo/gnome-gsame.png +share/gtkmm-%%API_VERSION%%/demo/gnu-keys.png +share/gtkmm-%%API_VERSION%%/demo/gtk-logo-rgb.gif +share/gtkmm-%%API_VERSION%%/demo/main.cc +share/gtkmm-%%API_VERSION%%/demo/textwidget.cc +share/gtkmm-%%API_VERSION%%/demo/textwidget.h +@dirrm share/gtkmm-%%API_VERSION%%/demo +@dirrm share/gtkmm-%%API_VERSION%% @dirrm lib/gtkmm-%%API_VERSION%%/include @dirrm lib/gtkmm-%%API_VERSION%% @dirrm lib/gdkmm-%%API_VERSION%%/include diff --git a/x11-toolkits/gtksourceview2/Makefile b/x11-toolkits/gtksourceview2/Makefile index 3b2aca00591b..a16feee650ce 100644 --- a/x11-toolkits/gtksourceview2/Makefile +++ b/x11-toolkits/gtksourceview2/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/gtksourceview2/Makefile,v 1.72 2009/04/09 03:24:10 mezz Exp $ +# $MCom: ports/x11-toolkits/gtksourceview2/Makefile,v 1.81 2009/09/28 23:56:18 avl Exp $ # PORTNAME= gtksourceview2 -PORTVERSION= 2.6.2 -PORTREVISION?= 1 +PORTVERSION= 2.8.1 +PORTREVISION?= 0 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/x11-toolkits/gtksourceview2/distinfo b/x11-toolkits/gtksourceview2/distinfo index 99420450dc2c..d40c6f6e212a 100644 --- a/x11-toolkits/gtksourceview2/distinfo +++ b/x11-toolkits/gtksourceview2/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gtksourceview-2.6.2.tar.bz2) = 5f94a7c9e31f81b4a1780a3a83df6413 -SHA256 (gnome2/gtksourceview-2.6.2.tar.bz2) = 0b6f52b37557a883c80051305d07101473b34dcda5b6237cfafe3f26de797d5d -SIZE (gnome2/gtksourceview-2.6.2.tar.bz2) = 1045258 +MD5 (gnome2/gtksourceview-2.8.1.tar.bz2) = 7741e41d3c7c83a35014f0faef3c94a2 +SHA256 (gnome2/gtksourceview-2.8.1.tar.bz2) = e67e8222675228a7cc1ef7da0a3367f3d67d2a0ca2eb50e668e48caf116f390a +SIZE (gnome2/gtksourceview-2.8.1.tar.bz2) = 1049753 diff --git a/x11-toolkits/gtksourceview2/pkg-plist b/x11-toolkits/gtksourceview2/pkg-plist index d5926c92be46..7316c0d22815 100644 --- a/x11-toolkits/gtksourceview2/pkg-plist +++ b/x11-toolkits/gtksourceview2/pkg-plist @@ -1,4 +1,5 @@ include/gtksourceview-2.0/gtksourceview/gtksourcebuffer.h +include/gtksourceview-2.0/gtksourceview/gtksourcegutter.h include/gtksourceview-2.0/gtksourceview/gtksourceiter.h include/gtksourceview-2.0/gtksourceview/gtksourcelanguage.h include/gtksourceview-2.0/gtksourceview/gtksourcelanguagemanager.h @@ -28,6 +29,7 @@ share/gtksourceview-2.0/language-specs/convert.py share/gtksourceview-2.0/language-specs/cpp.lang share/gtksourceview-2.0/language-specs/csharp.lang share/gtksourceview-2.0/language-specs/css.lang +share/gtksourceview-2.0/language-specs/cuda.lang share/gtksourceview-2.0/language-specs/d.lang share/gtksourceview-2.0/language-specs/def.lang share/gtksourceview-2.0/language-specs/desktop.lang @@ -42,6 +44,7 @@ share/gtksourceview-2.0/language-specs/erlang.lang share/gtksourceview-2.0/language-specs/forth.lang share/gtksourceview-2.0/language-specs/fortran.lang share/gtksourceview-2.0/language-specs/gap.lang +share/gtksourceview-2.0/language-specs/glsl.lang share/gtksourceview-2.0/language-specs/gtk-doc.lang share/gtksourceview-2.0/language-specs/gtkrc.lang share/gtksourceview-2.0/language-specs/haddock.lang @@ -60,6 +63,7 @@ share/gtksourceview-2.0/language-specs/libtool.lang share/gtksourceview-2.0/language-specs/lua.lang share/gtksourceview-2.0/language-specs/m4.lang share/gtksourceview-2.0/language-specs/makefile.lang +share/gtksourceview-2.0/language-specs/mallard.lang share/gtksourceview-2.0/language-specs/msil.lang share/gtksourceview-2.0/language-specs/nemerle.lang share/gtksourceview-2.0/language-specs/nsis.lang @@ -105,6 +109,7 @@ share/locale/bn/LC_MESSAGES/gtksourceview-2.0.mo share/locale/bn_IN/LC_MESSAGES/gtksourceview-2.0.mo share/locale/bs/LC_MESSAGES/gtksourceview-2.0.mo share/locale/ca/LC_MESSAGES/gtksourceview-2.0.mo +share/locale/ca@valencia/LC_MESSAGES/gtksourceview-2.0.mo share/locale/cs/LC_MESSAGES/gtksourceview-2.0.mo share/locale/cy/LC_MESSAGES/gtksourceview-2.0.mo share/locale/da/LC_MESSAGES/gtksourceview-2.0.mo @@ -197,6 +202,8 @@ share/locale/zh_TW/LC_MESSAGES/gtksourceview-2.0.mo @dirrmtry share/locale/mai @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz +@dirrmtry share/locale/ca@valencia/LC_MESSAGES +@dirrmtry share/locale/ca@valencia @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN @dirrmtry share/locale/as/LC_MESSAGES diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile index d27104848c87..fc4e43bc1188 100644 --- a/x11-toolkits/libbonoboui/Makefile +++ b/x11-toolkits/libbonoboui/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/libbonoboui/Makefile,v 1.68 2008/09/22 12:44:50 kwm Exp $ +# $MCom: ports/x11-toolkits/libbonoboui/Makefile,v 1.71 2009/09/26 13:42:02 marcus Exp $ # PORTNAME= libbonoboui -PORTVERSION= 2.24.1 -PORTREVISION?= 1 +PORTVERSION= 2.24.2 +PORTREVISION?= 0 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome diff --git a/x11-toolkits/libbonoboui/distinfo b/x11-toolkits/libbonoboui/distinfo index c961106cf42f..793d24c2a721 100644 --- a/x11-toolkits/libbonoboui/distinfo +++ b/x11-toolkits/libbonoboui/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome/libbonoboui-2.24.1.tar.bz2) = 9ff3ec1c7aefd0b1a15a5b21ecc7b4e4 -SHA256 (gnome/libbonoboui-2.24.1.tar.bz2) = 322536bdc23a70287f229168af2538a7b36c1b5041626ba15e22902228750c29 -SIZE (gnome/libbonoboui-2.24.1.tar.bz2) = 988420 +MD5 (gnome/libbonoboui-2.24.2.tar.bz2) = 3c206eccc97730c02366a2f698c40ed2 +SHA256 (gnome/libbonoboui-2.24.2.tar.bz2) = aebcf9dc56a76f4ab1ae2134920d962e12c6f7397028052658dad5b1bebdbe00 +SIZE (gnome/libbonoboui-2.24.2.tar.bz2) = 961498 diff --git a/x11-toolkits/libbonoboui/pkg-plist b/x11-toolkits/libbonoboui/pkg-plist index c7648291f0a0..b8c6f7506a5b 100644 --- a/x11-toolkits/libbonoboui/pkg-plist +++ b/x11-toolkits/libbonoboui/pkg-plist @@ -56,8 +56,10 @@ share/locale/be/LC_MESSAGES/libbonoboui-2.0.mo share/locale/bg/LC_MESSAGES/libbonoboui-2.0.mo share/locale/bn/LC_MESSAGES/libbonoboui-2.0.mo share/locale/bn_IN/LC_MESSAGES/libbonoboui-2.0.mo +share/locale/br/LC_MESSAGES/libbonoboui-2.0.mo share/locale/bs/LC_MESSAGES/libbonoboui-2.0.mo share/locale/ca/LC_MESSAGES/libbonoboui-2.0.mo +share/locale/ca@valencia/LC_MESSAGES/libbonoboui-2.0.mo share/locale/cs/LC_MESSAGES/libbonoboui-2.0.mo share/locale/cy/LC_MESSAGES/libbonoboui-2.0.mo share/locale/da/LC_MESSAGES/libbonoboui-2.0.mo @@ -172,6 +174,8 @@ share/locale/zu/LC_MESSAGES/libbonoboui-2.0.mo @dirrmtry share/locale/ku @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz +@dirrmtry share/locale/ca@valencia/LC_MESSAGES +@dirrmtry share/locale/ca@valencia @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN @dirrmtry share/locale/as/LC_MESSAGES diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile index 93d963058964..3a95fb480249 100644 --- a/x11-toolkits/libgnomeui/Makefile +++ b/x11-toolkits/libgnomeui/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/libgnomeui/Makefile,v 1.122 2008/09/22 12:50:50 kwm Exp $ +# $MCom: ports/x11-toolkits/libgnomeui/Makefile,v 1.125 2009/09/26 13:42:02 marcus Exp $ # PORTNAME= libgnomeui -PORTVERSION= 2.24.1 -PORTREVISION?= 1 +PORTVERSION= 2.24.2 +PORTREVISION?= 0 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11-toolkits/libgnomeui/distinfo b/x11-toolkits/libgnomeui/distinfo index f2bcf60b44c9..b85a2bdc9b1e 100644 --- a/x11-toolkits/libgnomeui/distinfo +++ b/x11-toolkits/libgnomeui/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgnomeui-2.24.1.tar.bz2) = 8e7d36dd1decfcf5cc4d5cb93bc4d217 -SHA256 (gnome2/libgnomeui-2.24.1.tar.bz2) = a2ed289b7b35956eff7ddd4d9f4e2507260a7fcb5d7d01969f2e3bb8278e8dc1 -SIZE (gnome2/libgnomeui-2.24.1.tar.bz2) = 1494605 +MD5 (gnome2/libgnomeui-2.24.2.tar.bz2) = d455674fa1a477903dbfcf603f060172 +SHA256 (gnome2/libgnomeui-2.24.2.tar.bz2) = ae7459b3ddee78258bb2d619fd199b0b24647f1df45fc397fee83d659c354910 +SIZE (gnome2/libgnomeui-2.24.2.tar.bz2) = 1526889 diff --git a/x11-toolkits/libgnomeui/pkg-plist b/x11-toolkits/libgnomeui/pkg-plist index 6552b7e94fe4..97a37fcbbee6 100644 --- a/x11-toolkits/libgnomeui/pkg-plist +++ b/x11-toolkits/libgnomeui/pkg-plist @@ -71,6 +71,7 @@ share/locale/bn_IN/LC_MESSAGES/libgnomeui-2.0.mo share/locale/br/LC_MESSAGES/libgnomeui-2.0.mo share/locale/bs/LC_MESSAGES/libgnomeui-2.0.mo share/locale/ca/LC_MESSAGES/libgnomeui-2.0.mo +share/locale/ca@valencia/LC_MESSAGES/libgnomeui-2.0.mo share/locale/crh/LC_MESSAGES/libgnomeui-2.0.mo share/locale/cs/LC_MESSAGES/libgnomeui-2.0.mo share/locale/cy/LC_MESSAGES/libgnomeui-2.0.mo @@ -206,6 +207,8 @@ share/pixmaps/gnome-about-logo.png @dirrmtry share/locale/dz @dirrmtry share/locale/crh/LC_MESSAGES @dirrmtry share/locale/crh +@dirrmtry share/locale/ca@valencia/LC_MESSAGES +@dirrmtry share/locale/ca@valencia @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES diff --git a/x11-toolkits/libgnomeuimm26/Makefile b/x11-toolkits/libgnomeuimm26/Makefile index ddd7b6714003..0b4a1d6246d6 100644 --- a/x11-toolkits/libgnomeuimm26/Makefile +++ b/x11-toolkits/libgnomeuimm26/Makefile @@ -3,12 +3,11 @@ # Whom: Alexander Nedotsukov <bland@mail.ru> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/libgnomeuimm26/Makefile,v 1.18 2009/03/17 16:02:12 kwm Exp $ +# $MCom: ports/x11-toolkits/libgnomeuimm26/Makefile,v 1.20 2009/09/22 21:23:48 kwm Exp $ # PORTNAME= libgnomeuimm -PORTVERSION= 2.26.0 -PORTREVISION= 1 +PORTVERSION= 2.28.0 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11-toolkits/libgnomeuimm26/distinfo b/x11-toolkits/libgnomeuimm26/distinfo index 12ed4522cfb6..69b0fec383a4 100644 --- a/x11-toolkits/libgnomeuimm26/distinfo +++ b/x11-toolkits/libgnomeuimm26/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgnomeuimm-2.26.0.tar.bz2) = 7a9c8426a227a80ca70f2c976fcb1ae3 -SHA256 (gnome2/libgnomeuimm-2.26.0.tar.bz2) = d2993a6c70e5049971bf1163765c459ce1c3b0999c8e686267e3e544442322a3 -SIZE (gnome2/libgnomeuimm-2.26.0.tar.bz2) = 337722 +MD5 (gnome2/libgnomeuimm-2.28.0.tar.bz2) = 6c34dbe07cf9835c36f7d0b7bc38d4fb +SHA256 (gnome2/libgnomeuimm-2.28.0.tar.bz2) = 6cb46494913f1e5e34b94a0f5b9ff8ef238bb71e3b08d0ef0ab7f4a7c88211d3 +SIZE (gnome2/libgnomeuimm-2.28.0.tar.bz2) = 382428 diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile index 0886675c91d7..381c45e108aa 100644 --- a/x11-toolkits/libwnck/Makefile +++ b/x11-toolkits/libwnck/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/x11-toolkits/libwnck/Makefile,v 1.3 2009/04/15 17:27:23 kwm Exp $ +# $MCom: ports/x11-toolkits/libwnck/Makefile,v 1.123 2009/09/22 09:04:57 kwm Exp $ # PORTNAME= libwnck -PORTVERSION= 2.26.2 -PORTREVISION?= 1 +PORTVERSION= 2.28.0 +PORTREVISION?= 0 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11-toolkits/libwnck/distinfo b/x11-toolkits/libwnck/distinfo index e4f856004639..df07325bdc85 100644 --- a/x11-toolkits/libwnck/distinfo +++ b/x11-toolkits/libwnck/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libwnck-2.26.2.tar.bz2) = 90d89a7bcf3311877fa4b427719c7483 -SHA256 (gnome2/libwnck-2.26.2.tar.bz2) = fc38a8ef185828e6a9205f2489bd563d8f303655ba533ad6f640e2de8018983c -SIZE (gnome2/libwnck-2.26.2.tar.bz2) = 684354 +MD5 (gnome2/libwnck-2.28.0.tar.bz2) = a9311661aa954e7c918439b6dd578792 +SHA256 (gnome2/libwnck-2.28.0.tar.bz2) = d90be36d2fefa33a9287ed6dc41141213a06463f91d69d847da6b2e59c16b947 +SIZE (gnome2/libwnck-2.28.0.tar.bz2) = 712289 diff --git a/x11-toolkits/libwnck/pkg-plist b/x11-toolkits/libwnck/pkg-plist index b614890c5689..2c3e5ed5c403 100644 --- a/x11-toolkits/libwnck/pkg-plist +++ b/x11-toolkits/libwnck/pkg-plist @@ -1,3 +1,4 @@ +bin/wnck-urgency-monitor bin/wnckprop include/libwnck-1.0/libwnck/application.h include/libwnck-1.0/libwnck/class-group.h @@ -63,6 +64,7 @@ share/locale/ky/LC_MESSAGES/libwnck.mo share/locale/li/LC_MESSAGES/libwnck.mo share/locale/lt/LC_MESSAGES/libwnck.mo share/locale/lv/LC_MESSAGES/libwnck.mo +share/locale/mai/LC_MESSAGES/libwnck.mo share/locale/mi/LC_MESSAGES/libwnck.mo share/locale/mk/LC_MESSAGES/libwnck.mo share/locale/ml/LC_MESSAGES/libwnck.mo @@ -120,6 +122,8 @@ share/locale/zh_TW/LC_MESSAGES/libwnck.mo @dirrmtry share/locale/mr @dirrmtry share/locale/mi/LC_MESSAGES @dirrmtry share/locale/mi +@dirrmtry share/locale/mai/LC_MESSAGES +@dirrmtry share/locale/mai @dirrmtry share/locale/ky/LC_MESSAGES @dirrmtry share/locale/ky @dirrmtry share/locale/ku/LC_MESSAGES diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile index 5d745929bb7f..345be6cd514f 100644 --- a/x11-toolkits/pango/Makefile +++ b/x11-toolkits/pango/Makefile @@ -3,11 +3,11 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/x11-toolkits/pango/Makefile,v 1.7 2009/04/15 22:25:48 kwm Exp $ +# $MCom: ports/x11-toolkits/pango/Makefile,v 1.149 2009/11/18 11:00:12 kwm Exp $ # PORTNAME= pango -PORTVERSION= 1.24.5 +PORTVERSION= 1.26.1 PORTREVISION?= 0 CATEGORIES= x11-toolkits MASTER_SITES= GNOME \ @@ -32,8 +32,7 @@ MAKE_JOBS_SAFE= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:22 USE_GNOME= gnomehack glib20 ltverhack referencehack -CONFIGURE_ARGS= --with-qt=no \ - --with-html-dir=${PREFIX}/share/doc \ +CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --enable-static # Hmm.. tough one. Found this one when I had graphics/hdf installed # (which installs glist.h) which is picked up before the glib-2.0 @@ -45,7 +44,7 @@ PLIST_SUB= VERSION="1.6.0" FONTSCALE= ${LOCALBASE}/lib/X11/fonts/TTF/luximb.ttf FONTENCOD= ${LOCALBASE}/lib/X11/fonts/encodings/encodings.dir -MAN1= pango-view.1 pango-querymodules.1 preload.1 +MAN1= pango-view.1 pango-querymodules.1 .if defined(WITHOUT_X11) CONFIGURE_ARGS+= --with-x=no @@ -61,6 +60,12 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \ PLIST_SUB+= X11="" .endif -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if ${OSVERSION} < 700000 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gcc +.endif + +.include <bsd.port.post.mk> .endif diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo index 80aac2bb8774..5acfcd5a394f 100644 --- a/x11-toolkits/pango/distinfo +++ b/x11-toolkits/pango/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/pango-1.24.5.tar.bz2) = 815416a452e9cccc172fed9862401f37 -SHA256 (gnome2/pango-1.24.5.tar.bz2) = 0f733d1ec3e8dafcae152d7ac58f1090bee1fd856176c8fee0e81b0e42392f4e -SIZE (gnome2/pango-1.24.5.tar.bz2) = 1519944 +MD5 (gnome2/pango-1.26.1.tar.bz2) = 2cbc1f26639e335905f7d31c0da53fce +SHA256 (gnome2/pango-1.26.1.tar.bz2) = e0254e979bf0fac305de596997cabda83e26c713b666bc582aa9e4b70cb0920d +SIZE (gnome2/pango-1.26.1.tar.bz2) = 1538050 diff --git a/x11-toolkits/pango/files/extra-patch-gcc b/x11-toolkits/pango/files/extra-patch-gcc new file mode 100644 index 000000000000..d8a1cc957480 --- /dev/null +++ b/x11-toolkits/pango/files/extra-patch-gcc @@ -0,0 +1,188 @@ +diff -ru ../pango-1.26.0/pango/opentype/hb-open-type-private.hh ./pango/opentype/hb-open-type-private.hh +--- pango/opentype/hb-open-type-private.hh 2009-08-28 17:15:12.000000000 -0400 ++++ pango/opentype/hb-open-type-private.hh 2009-09-30 05:14:13.000000000 -0400 +@@ -508,10 +508,10 @@ + inline const Type& operator [] (unsigned int i) const + { + if (HB_UNLIKELY (i >= len)) return Null(Type); +- return array[i]; ++ return _array(i); + } + inline unsigned int get_size () const +- { return sizeof (len) + len * sizeof (array[0]); } ++ { return sizeof (len) + len * sizeof (Type); } + + inline bool sanitize (SANITIZE_ARG_DEF) { + TRACE_SANITIZE (); +@@ -523,7 +523,7 @@ + return true; + unsigned int count = len; + for (unsigned int i = 0; i < count; i++) +- if (!SANITIZE (array[i])) ++ if (!SANITIZE (_array(i))) + return false; + return true; + } +@@ -532,7 +532,7 @@ + if (!SANITIZE_GET_SIZE()) return false; + unsigned int count = len; + for (unsigned int i = 0; i < count; i++) +- if (!array[i].sanitize (SANITIZE_ARG, base)) ++ if (!_array(i).sanitize (SANITIZE_ARG, base)) + return false; + return true; + } +@@ -541,7 +541,7 @@ + if (!SANITIZE_GET_SIZE()) return false; + unsigned int count = len; + for (unsigned int i = 0; i < count; i++) +- if (!array[i].sanitize (SANITIZE_ARG, base, base2)) ++ if (!_array(i).sanitize (SANITIZE_ARG, base, base2)) + return false; + return true; + } +@@ -550,15 +550,21 @@ + if (!SANITIZE_GET_SIZE()) return false; + unsigned int count = len; + for (unsigned int i = 0; i < count; i++) +- if (!array[i].sanitize (SANITIZE_ARG, base, user_data)) ++ if (!_array(i).sanitize (SANITIZE_ARG, base, user_data)) + return false; + return true; + } + + LenType len; +- Type array[]; ++ //Type array[]; ++ Type& _array(unsigned int i) const ++ { ++ return *(Type*)(&len + 1); ++ } + }; + ++#undef array ++ + /* An array with a USHORT number of elements. */ + template <typename Type> + struct ArrayOf : GenericArrayOf<USHORT, Type> {}; +@@ -586,7 +592,7 @@ + inline const Type& operator [] (unsigned int i) const + { + if (HB_UNLIKELY (i >= this->len)) return Null(Type); +- return this+this->array[i]; ++ return this+this->_array(i); + } + + inline bool sanitize (SANITIZE_ARG_DEF) { +diff -ru ../pango-1.26.0/pango/opentype/hb-ot-layout-common-private.hh ./pango/opentype/hb-ot-layout-common-private.hh +--- ../pango-1.26.0/pango/opentype/hb-ot-layout-common-private.hh 2009-08-28 17:15:12.000000000 -0400 ++++ ./pango/opentype/hb-ot-layout-common-private.hh 2009-09-30 05:15:25.000000000 -0400 +@@ -67,14 +67,14 @@ + inline const Tag& get_tag (unsigned int i) const + { + if (HB_UNLIKELY (i >= this->len)) return Null(Tag); +- return this->array[i].tag; ++ return this->_array(i).tag; + } + inline bool get_tags (unsigned int *record_count /* IN/OUT */, + hb_tag_t *record_tags /* OUT */) const + { + unsigned int count = MIN (this->len, *record_count); + for (unsigned int i = 0; i < count; i++) +- record_tags[i] = this->array[i].tag; ++ record_tags[i] = this->_array(i).tag; + + *record_count = this->len; + return !!this->len; +@@ -86,7 +86,7 @@ + unsigned int count = this->len; + for (unsigned int i = 0; i < count; i++) + { +- if (t == this->array[i].tag) ++ if (t == this->_array(i).tag) + { + if (index) *index = i; + return true; +@@ -116,14 +116,14 @@ + { + if (HB_UNLIKELY (i >= this->len)) + return NO_INDEX; +- return this->array[i]; ++ return this->_array(i); + } + inline bool get_indexes (unsigned int *_count /* IN/OUT */, + unsigned int *_indexes /* OUT */) const + { + unsigned int count = MIN (this->len, *_count); + for (unsigned int i = 0; i < count; i++) +- _indexes[i] = this->array[i]; ++ _indexes[i] = this->_array(i); + + *_count = this->len; + return !!this->len; +diff -ru ../pango-1.26.0/pango/opentype/hb-ot-layout-gsub-private.hh ./pango/opentype/hb-ot-layout-gsub-private.hh +--- ../pango-1.26.0/pango/opentype/hb-ot-layout-gsub-private.hh 2009-08-28 17:16:36.000000000 -0400 ++++ ./pango/opentype/hb-ot-layout-gsub-private.hh 2009-09-30 05:28:53.000000000 -0400 +@@ -160,7 +160,7 @@ + return false; + + _hb_buffer_add_output_glyphs (buffer, 1, +- substitute.len, (const uint16_t *) substitute.array, ++ substitute.len, (const uint16_t *) &substitute._array(0), + 0xFFFF, 0xFFFF); + + /* This is a guess only ... */ +@@ -285,7 +285,7 @@ + if (context->face->altfunc) + alt_index = (context->face->altfunc)(context->layout, buffer, + buffer->out_pos, glyph_id, +- alt_set.len, alt_set.array); ++ alt_set.len, alt_set._array(0)); + */ + + if (HB_UNLIKELY (alt_index >= alt_set.len)) +@@ -601,10 +601,10 @@ + const ArrayOf<GlyphID> &substitute = CONST_NEXT (ArrayOf<GlyphID>, lookahead); + + if (match_backtrack (APPLY_ARG, +- backtrack.len, (USHORT *) backtrack.array, ++ backtrack.len, (USHORT *) &backtrack._array(0), + match_coverage, DECONST_CHARP(this)) && + match_lookahead (APPLY_ARG, +- lookahead.len, (USHORT *) lookahead.array, ++ lookahead.len, (USHORT *) &lookahead._array(0), + match_coverage, DECONST_CHARP(this), + 1)) + { +diff -ru ../pango-1.26.0/pango/opentype/hb-ot-layout-gsubgpos-private.hh ./pango/opentype/hb-ot-layout-gsubgpos-private.hh +--- ../pango-1.26.0/pango/opentype/hb-ot-layout-gsubgpos-private.hh 2009-09-21 13:58:54.000000000 -0400 ++++ ./pango/opentype/hb-ot-layout-gsubgpos-private.hh 2009-09-30 05:33:03.000000000 -0400 +@@ -572,10 +572,10 @@ + const ArrayOf<USHORT> &lookahead = CONST_NEXT (ArrayOf<USHORT>, input); + const ArrayOf<LookupRecord> &lookup = CONST_NEXT (ArrayOf<LookupRecord>, lookahead); + return chain_context_lookup (APPLY_ARG, +- backtrack.len, backtrack.array, ++ backtrack.len, &backtrack._array(0), + input.len, input.array, +- lookahead.len, lookahead.array, +- lookup.len, lookup.array, ++ lookahead.len, &lookahead._array(0), ++ lookup.len, &lookup._array(0), + lookup_context); + return false; + } +@@ -754,10 +754,10 @@ + {DECONST_CHARP(this), DECONST_CHARP(this), DECONST_CHARP(this)} + }; + return chain_context_lookup (APPLY_ARG, +- backtrack.len, (USHORT *) backtrack.array, +- input.len, (USHORT *) input.array + 1, +- lookahead.len, (USHORT *) lookahead.array, +- lookup.len, lookup.array, ++ backtrack.len, (USHORT *) &backtrack._array(0), ++ input.len, (USHORT *) &input._array(1), ++ lookahead.len, (USHORT *) &lookahead._array(0), ++ lookup.len, &lookup._array(0), + lookup_context); + return false; + } diff --git a/x11-toolkits/pango/files/patch-pango-view_Makefile.in b/x11-toolkits/pango/files/patch-pango-view_Makefile.in deleted file mode 100644 index 345e608bf339..000000000000 --- a/x11-toolkits/pango/files/patch-pango-view_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- pango-view/Makefile.in.orig 2009-07-03 10:45:14.000000000 +0200 -+++ pango-view/Makefile.in 2009-07-03 10:46:39.000000000 +0200 -@@ -794,7 +794,7 @@ $(srcdir)/pango-view.1: ../configure.in - (test -f "$@" || echo help2man is required to generate this file. >> "$@")); - - install-data-hook: -- @cd "$(DESTDIR)$(man1dir)" && gzip -c pango-view.1 > pango-view.1.gz && $(RM) pango-view.1 -+ @cd "$(DESTDIR)$(man1dir)" && cp -p pango-view.1 preload.1 - - uninstall-hook: - $(RM) "$(DESTDIR)$(man1dir)/pango-view.1.gz" diff --git a/x11-toolkits/pangomm/Makefile b/x11-toolkits/pangomm/Makefile index 782570ccf582..99a2734834aa 100644 --- a/x11-toolkits/pangomm/Makefile +++ b/x11-toolkits/pangomm/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/pangomm/Makefile,v 1.9 2009/03/13 14:42:38 kwm Exp $ +# $MCom: ports/x11-toolkits/pangomm/Makefile,v 1.13 2009/09/21 17:22:55 kwm Exp $ # PORTNAME= pangomm -PORTVERSION= 2.24.0 +PORTVERSION= 2.26.0 PORTREVISION?= 0 CATEGORIES= x11-toolkits MASTER_SITES= GNOME @@ -30,17 +30,16 @@ USE_LDCONFIG= yes USE_GNOME= gnomehack pango CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --disable-demos \ - --disable-docs \ - --disable-examples \ - --enable-static=yes \ - --with-sigc-prefix=${LOCALBASE} +CONFIGURE_ARGS= --disable-documentation \ + --enable-static=yes PLIST_SUB= VERSION="2.4" API_VERSION="1.4" post-patch: - @${REINPLACE_CMD} -e '/^SUBDIRS =/s/tests//' \ +.for d in tests + @${REINPLACE_CMD} -e '/^SUBDIRS =/s/${d}//' \ ${WRKSRC}/Makefile.in +.endfor .include <bsd.port.mk> diff --git a/x11-toolkits/pangomm/distinfo b/x11-toolkits/pangomm/distinfo index 5e4dcdf249cc..2b1ff4ca292a 100644 --- a/x11-toolkits/pangomm/distinfo +++ b/x11-toolkits/pangomm/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/pangomm-2.24.0.tar.bz2) = fa0f44c37499433455857becad4bbcda -SHA256 (gnome2/pangomm-2.24.0.tar.bz2) = 0f0a45644bd11a3e354b52c3823a635cf0ebf2123fe7fa48e728e6aa5699039e -SIZE (gnome2/pangomm-2.24.0.tar.bz2) = 996057 +MD5 (gnome2/pangomm-2.26.0.tar.bz2) = 37f54dc8e6cb73ed923b22f313352156 +SHA256 (gnome2/pangomm-2.26.0.tar.bz2) = bf26ebe42c12c81e5c32ceca80ff226a01c8d80d4db2a4cc3463d5bf241b095e +SIZE (gnome2/pangomm-2.26.0.tar.bz2) = 982857 diff --git a/x11-toolkits/pangomm/pkg-plist b/x11-toolkits/pangomm/pkg-plist index 08c681f69138..8483bc4b0326 100644 --- a/x11-toolkits/pangomm/pkg-plist +++ b/x11-toolkits/pangomm/pkg-plist @@ -56,11 +56,9 @@ lib/libpangomm-%%API_VERSION%%.a lib/libpangomm-%%API_VERSION%%.la lib/libpangomm-%%API_VERSION%%.so lib/libpangomm-%%API_VERSION%%.so.1 -lib/pangomm-%%API_VERSION%%/proc/m4/convert.m4 -lib/pangomm-%%API_VERSION%%/proc/m4/convert_pango.m4 +lib/pangomm-%%API_VERSION%%/include/pangommconfig.h libdata/pkgconfig/pangomm-%%API_VERSION%%.pc -@dirrm lib/pangomm-%%API_VERSION%%/proc/m4 -@dirrm lib/pangomm-%%API_VERSION%%/proc +@dirrm lib/pangomm-%%API_VERSION%%/include @dirrm lib/pangomm-%%API_VERSION%% @dirrm include/pangomm-%%API_VERSION%%/pangomm/private @dirrm include/pangomm-%%API_VERSION%%/pangomm diff --git a/x11-toolkits/py-gnome-desktop/Makefile b/x11-toolkits/py-gnome-desktop/Makefile index b26933b80234..6cdb0918c15d 100644 --- a/x11-toolkits/py-gnome-desktop/Makefile +++ b/x11-toolkits/py-gnome-desktop/Makefile @@ -3,17 +3,15 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/py-gnome-desktop/Makefile,v 1.86 2009/03/15 00:39:36 marcus Exp $ +# $MCom: ports/x11-toolkits/py-gnome-desktop/Makefile,v 1.91 2009/09/21 20:15:50 kwm Exp $ # -PORTNAME= gnome -PORTVERSION= 2.26.0 -PORTREVISION= 1 +PORTNAME= gnome-desktop +PORTVERSION= 2.28.0 CATEGORIES= x11-toolkits python gnome MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/gnome-python-desktop/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -PKGNAMESUFFIX= -desktop DISTNAME= gnome-python-desktop-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -25,6 +23,7 @@ LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop \ totem-plparser.12:${PORTSDIR}/multimedia/totem-pl-parser \ gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media \ gnome-keyring:${PORTSDIR}/security/gnome-keyring \ + brasero-media.2:${PORTSDIR}/sysutils/brasero \ evdocument.1:${PORTSDIR}/graphics/evince RUN_DEPENDS= bug-buddy:${PORTSDIR}/devel/bug-buddy diff --git a/x11-toolkits/py-gnome-desktop/distinfo b/x11-toolkits/py-gnome-desktop/distinfo index 7c842b1e4979..162c4e063592 100644 --- a/x11-toolkits/py-gnome-desktop/distinfo +++ b/x11-toolkits/py-gnome-desktop/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-python-desktop-2.26.0.tar.bz2) = fbcf4ef5ec4a8c4eec4d390c5889c80f -SHA256 (gnome2/gnome-python-desktop-2.26.0.tar.bz2) = 400a5401a591e271c3357d0a8cb05a7927b4c218130497d06f75df9763d4efd8 -SIZE (gnome2/gnome-python-desktop-2.26.0.tar.bz2) = 571939 +MD5 (gnome2/gnome-python-desktop-2.28.0.tar.bz2) = d97bb3d8e1adc00505be060fbc832f44 +SHA256 (gnome2/gnome-python-desktop-2.28.0.tar.bz2) = 92948d2dd0d03a56abe565f3c24725242251db261bd0a12aad5a742326cb3c7f +SIZE (gnome2/gnome-python-desktop-2.28.0.tar.bz2) = 613169 diff --git a/x11-toolkits/py-gnome-desktop/pkg-plist b/x11-toolkits/py-gnome-desktop/pkg-plist index 2d7723f572f5..0de7d54e5ac0 100644 --- a/x11-toolkits/py-gnome-desktop/pkg-plist +++ b/x11-toolkits/py-gnome-desktop/pkg-plist @@ -1,3 +1,7 @@ +%%PYTHON_SITELIBDIR%%/gtk-2.0/braseroburn.la +%%PYTHON_SITELIBDIR%%/gtk-2.0/braseroburn.so +%%PYTHON_SITELIBDIR%%/gtk-2.0/braseromedia.la +%%PYTHON_SITELIBDIR%%/gtk-2.0/braseromedia.so %%PYTHON_SITELIBDIR%%/gtk-2.0/bugbuddy.py %%PYTHON_SITELIBDIR%%/gtk-2.0/bugbuddy.pyc %%PYTHON_SITELIBDIR%%/gtk-2.0/bugbuddy.pyo @@ -83,6 +87,10 @@ libdata/pkgconfig/gnome-python-desktop-2.0.pc %%PORTDOCS%%share/examples/py-gnome/applet/GNOME_PythonAppletSample.server %%PORTDOCS%%share/examples/py-gnome/applet/README %%PORTDOCS%%share/examples/py-gnome/applet/applet.py +%%PORTDOCS%%share/examples/py-gnome/braseroburn/write-audio-video.py +%%PORTDOCS%%share/examples/py-gnome/braseroburn/write-data.py +%%PORTDOCS%%share/examples/py-gnome/braseroburn/write-image.py +%%PORTDOCS%%share/examples/py-gnome/braseromedia/drive_selection.py %%PORTDOCS%%share/examples/py-gnome/gnomeprint/README %%PORTDOCS%%share/examples/py-gnome/gnomeprint/example_01.py %%PORTDOCS%%share/examples/py-gnome/gnomeprint/example_02.py @@ -106,6 +114,8 @@ libdata/pkgconfig/gnome-python-desktop-2.0.pc share/pygtk/2.0/defs/_gnomedesktop.defs share/pygtk/2.0/defs/applet.defs share/pygtk/2.0/defs/art.defs +share/pygtk/2.0/defs/brasero_burn.defs +share/pygtk/2.0/defs/brasero_media.defs share/pygtk/2.0/defs/ebook.defs share/pygtk/2.0/defs/evince.defs share/pygtk/2.0/defs/gnomekeyring.defs @@ -119,6 +129,8 @@ share/pygtk/2.0/defs/wnck.defs %%PORTDOCS%%@dirrm share/examples/py-gnome/mediaprofiles %%PORTDOCS%%@dirrm share/examples/py-gnome/gtksourceview %%PORTDOCS%%@dirrm share/examples/py-gnome/gnomeprint +%%PORTDOCS%%@dirrm share/examples/py-gnome/braseromedia +%%PORTDOCS%%@dirrm share/examples/py-gnome/braseroburn %%PORTDOCS%%@dirrm share/examples/py-gnome/applet %%PORTDOCS%%@dirrmtry share/examples/py-gnome %%PORTDOCS%%@dirrm %%DOCSDIR%%/pygtksourceview diff --git a/x11-toolkits/py-gnome-extras/Makefile b/x11-toolkits/py-gnome-extras/Makefile index 7e8bcd2b38b8..70a40e7e7321 100644 --- a/x11-toolkits/py-gnome-extras/Makefile +++ b/x11-toolkits/py-gnome-extras/Makefile @@ -3,17 +3,16 @@ # Whom: Koop Mast <kwm@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/py-gnome-extras/Makefile,v 1.48 2009/04/07 03:08:53 marcus Exp $ +# $MCom: ports/x11-toolkits/py-gnome-extras/Makefile,v 1.55 2009/11/28 05:59:04 mezz Exp $ # -PORTNAME= gnome +PORTNAME= gnome-extras PORTVERSION= 2.25.3 -PORTREVISION= 4 +PORTREVISION= 6 CATEGORIES= x11-toolkits python gnome MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/gnome-python-extras/${PORTVERSION:C/..$//} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -PKGNAMESUFFIX= -extras DISTNAME= gnome-python-extras-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -22,8 +21,8 @@ COMMENT= A set of Python bindings for GNOME 2 LIB_DEPENDS= gtkspell.0:${PORTSDIR}/textproc/gtkspell \ gksu1.2.0:${PORTSDIR}/sysutils/libgksu \ - gksuui1.0.1:${PORTSDIR}/sysutils/libgksuui \ - gdl-1.0:${PORTSDIR}/x11-toolkits/gdl + gksuui1.0.1:${PORTSDIR}/sysutils/libgksuui +# gdl-1.2:${PORTSDIR}/x11-toolkits/gdl USE_GECKO= libxul USE_BZIP2= yes @@ -33,6 +32,7 @@ USE_GNOME= gnomehack libgtkhtml pygnome2 libgda4 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ARGS+=--disable-gdl EG_SRC_DIR= ${WRKSRC}/examples EG_DST_DIR= ${PREFIX}/share/examples/py-gnome diff --git a/x11-toolkits/py-gnome-extras/files/patch-configure b/x11-toolkits/py-gnome-extras/files/patch-configure deleted file mode 100644 index 04f5b256944c..000000000000 --- a/x11-toolkits/py-gnome-extras/files/patch-configure +++ /dev/null @@ -1,675 +0,0 @@ ---- configure.orig 2009-02-28 16:14:05.000000000 -0500 -+++ configure 2009-02-28 16:21:48.000000000 -0500 -@@ -1721,7 +1721,7 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use - both] - --with-tags[=TAGS] include additional configurations [automatic] -- --with-gtkmozembed=mozilla|firefox|xulrunner -+ --with-gtkmozembed=mozilla|firefox|xulrunner|seamonkey - package that provides libgtkmozembed - - Some influential environment variables: -@@ -22428,6 +22428,150 @@ fi - - { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } -+ -+ -+pkg_failed=no -+{ $as_echo "$as_me:$LINENO: checking for GTKMOZEMBED" >&5 -+$as_echo_n "checking for GTKMOZEMBED... " >&6; } -+ -+if test -n "$GTKMOZEMBED_CFLAGS"; then -+ pkg_cv_GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_GTKMOZEMBED_CFLAGS=`$PKG_CONFIG --cflags "seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ else -+ pkg_failed=untried -+fi -+if test -n "$GTKMOZEMBED_LIBS"; then -+ pkg_cv_GTKMOZEMBED_LIBS="$GTKMOZEMBED_LIBS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_GTKMOZEMBED_LIBS=`$PKG_CONFIG --libs "seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ else -+ pkg_failed=untried -+fi -+ -+ -+ -+if test $pkg_failed = yes; then -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0" 2>&1` -+ else -+ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --print-errors "seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0" 2>&1` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$GTKMOZEMBED_PKG_ERRORS" >&5 -+ -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+ build_gtkmozembed=false -+elif test $pkg_failed = untried; then -+ build_gtkmozembed=false -+else -+ GTKMOZEMBED_CFLAGS=$pkg_cv_GTKMOZEMBED_CFLAGS -+ GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } -+ build_gtkmozembed=true; mozpackage=seamonkey -+fi -+ -+elif test $pkg_failed = untried; then -+ -+ -+pkg_failed=no -+{ $as_echo "$as_me:$LINENO: checking for GTKMOZEMBED" >&5 -+$as_echo_n "checking for GTKMOZEMBED... " >&6; } -+ -+if test -n "$GTKMOZEMBED_CFLAGS"; then -+ pkg_cv_GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_GTKMOZEMBED_CFLAGS=`$PKG_CONFIG --cflags "seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ else -+ pkg_failed=untried -+fi -+if test -n "$GTKMOZEMBED_LIBS"; then -+ pkg_cv_GTKMOZEMBED_LIBS="$GTKMOZEMBED_LIBS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_GTKMOZEMBED_LIBS=`$PKG_CONFIG --libs "seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ else -+ pkg_failed=untried -+fi -+ -+ -+ -+if test $pkg_failed = yes; then -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0" 2>&1` -+ else -+ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --print-errors "seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0" 2>&1` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$GTKMOZEMBED_PKG_ERRORS" >&5 -+ -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - build_gtkmozembed=false - elif test $pkg_failed = untried; then - build_gtkmozembed=false -@@ -22436,6 +22580,14 @@ else - GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS - { $as_echo "$as_me:$LINENO: result: yes" >&5 - $as_echo "yes" >&6; } -+ build_gtkmozembed=true; mozpackage=seamonkey -+fi -+ -+else -+ GTKMOZEMBED_CFLAGS=$pkg_cv_GTKMOZEMBED_CFLAGS -+ GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } - build_gtkmozembed=true; mozpackage=mozilla - fi - -@@ -22506,6 +22658,150 @@ fi - - { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } -+ -+ -+pkg_failed=no -+{ $as_echo "$as_me:$LINENO: checking for GTKMOZEMBED" >&5 -+$as_echo_n "checking for GTKMOZEMBED... " >&6; } -+ -+if test -n "$GTKMOZEMBED_CFLAGS"; then -+ pkg_cv_GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_GTKMOZEMBED_CFLAGS=`$PKG_CONFIG --cflags "seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ else -+ pkg_failed=untried -+fi -+if test -n "$GTKMOZEMBED_LIBS"; then -+ pkg_cv_GTKMOZEMBED_LIBS="$GTKMOZEMBED_LIBS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_GTKMOZEMBED_LIBS=`$PKG_CONFIG --libs "seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ else -+ pkg_failed=untried -+fi -+ -+ -+ -+if test $pkg_failed = yes; then -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0" 2>&1` -+ else -+ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --print-errors "seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0" 2>&1` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$GTKMOZEMBED_PKG_ERRORS" >&5 -+ -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+ build_gtkmozembed=false -+elif test $pkg_failed = untried; then -+ build_gtkmozembed=false -+else -+ GTKMOZEMBED_CFLAGS=$pkg_cv_GTKMOZEMBED_CFLAGS -+ GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } -+ build_gtkmozembed=true; mozpackage=seamonkey -+fi -+ -+elif test $pkg_failed = untried; then -+ -+ -+pkg_failed=no -+{ $as_echo "$as_me:$LINENO: checking for GTKMOZEMBED" >&5 -+$as_echo_n "checking for GTKMOZEMBED... " >&6; } -+ -+if test -n "$GTKMOZEMBED_CFLAGS"; then -+ pkg_cv_GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_GTKMOZEMBED_CFLAGS=`$PKG_CONFIG --cflags "seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ else -+ pkg_failed=untried -+fi -+if test -n "$GTKMOZEMBED_LIBS"; then -+ pkg_cv_GTKMOZEMBED_LIBS="$GTKMOZEMBED_LIBS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_GTKMOZEMBED_LIBS=`$PKG_CONFIG --libs "seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ else -+ pkg_failed=untried -+fi -+ -+ -+ -+if test $pkg_failed = yes; then -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0" 2>&1` -+ else -+ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --print-errors "seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0" 2>&1` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$GTKMOZEMBED_PKG_ERRORS" >&5 -+ -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - build_gtkmozembed=false - elif test $pkg_failed = untried; then - build_gtkmozembed=false -@@ -22514,6 +22810,14 @@ else - GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS - { $as_echo "$as_me:$LINENO: result: yes" >&5 - $as_echo "yes" >&6; } -+ build_gtkmozembed=true; mozpackage=seamonkey -+fi -+ -+else -+ GTKMOZEMBED_CFLAGS=$pkg_cv_GTKMOZEMBED_CFLAGS -+ GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } - build_gtkmozembed=true; mozpackage=mozilla - fi - -@@ -22658,6 +22962,150 @@ fi - - { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } -+ -+ -+pkg_failed=no -+{ $as_echo "$as_me:$LINENO: checking for GTKMOZEMBED" >&5 -+$as_echo_n "checking for GTKMOZEMBED... " >&6; } -+ -+if test -n "$GTKMOZEMBED_CFLAGS"; then -+ pkg_cv_GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_GTKMOZEMBED_CFLAGS=`$PKG_CONFIG --cflags "seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ else -+ pkg_failed=untried -+fi -+if test -n "$GTKMOZEMBED_LIBS"; then -+ pkg_cv_GTKMOZEMBED_LIBS="$GTKMOZEMBED_LIBS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_GTKMOZEMBED_LIBS=`$PKG_CONFIG --libs "seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ else -+ pkg_failed=untried -+fi -+ -+ -+ -+if test $pkg_failed = yes; then -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0" 2>&1` -+ else -+ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --print-errors "seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0" 2>&1` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$GTKMOZEMBED_PKG_ERRORS" >&5 -+ -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+ build_gtkmozembed=false -+elif test $pkg_failed = untried; then -+ build_gtkmozembed=false -+else -+ GTKMOZEMBED_CFLAGS=$pkg_cv_GTKMOZEMBED_CFLAGS -+ GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } -+ build_gtkmozembed=true; mozpackage=seamonkey -+fi -+ -+elif test $pkg_failed = untried; then -+ -+ -+pkg_failed=no -+{ $as_echo "$as_me:$LINENO: checking for GTKMOZEMBED" >&5 -+$as_echo_n "checking for GTKMOZEMBED... " >&6; } -+ -+if test -n "$GTKMOZEMBED_CFLAGS"; then -+ pkg_cv_GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_GTKMOZEMBED_CFLAGS=`$PKG_CONFIG --cflags "seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ else -+ pkg_failed=untried -+fi -+if test -n "$GTKMOZEMBED_LIBS"; then -+ pkg_cv_GTKMOZEMBED_LIBS="$GTKMOZEMBED_LIBS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_GTKMOZEMBED_LIBS=`$PKG_CONFIG --libs "seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ else -+ pkg_failed=untried -+fi -+ -+ -+ -+if test $pkg_failed = yes; then -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0" 2>&1` -+ else -+ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --print-errors "seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0" 2>&1` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$GTKMOZEMBED_PKG_ERRORS" >&5 -+ -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - build_gtkmozembed=false - elif test $pkg_failed = untried; then - build_gtkmozembed=false -@@ -22666,6 +23114,14 @@ else - GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS - { $as_echo "$as_me:$LINENO: result: yes" >&5 - $as_echo "yes" >&6; } -+ build_gtkmozembed=true; mozpackage=seamonkey -+fi -+ -+else -+ GTKMOZEMBED_CFLAGS=$pkg_cv_GTKMOZEMBED_CFLAGS -+ GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } - build_gtkmozembed=true; mozpackage=mozilla - fi - -@@ -22736,6 +23192,150 @@ fi - - { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } -+ -+ -+pkg_failed=no -+{ $as_echo "$as_me:$LINENO: checking for GTKMOZEMBED" >&5 -+$as_echo_n "checking for GTKMOZEMBED... " >&6; } -+ -+if test -n "$GTKMOZEMBED_CFLAGS"; then -+ pkg_cv_GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_GTKMOZEMBED_CFLAGS=`$PKG_CONFIG --cflags "seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ else -+ pkg_failed=untried -+fi -+if test -n "$GTKMOZEMBED_LIBS"; then -+ pkg_cv_GTKMOZEMBED_LIBS="$GTKMOZEMBED_LIBS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_GTKMOZEMBED_LIBS=`$PKG_CONFIG --libs "seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ else -+ pkg_failed=untried -+fi -+ -+ -+ -+if test $pkg_failed = yes; then -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0" 2>&1` -+ else -+ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --print-errors "seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0" 2>&1` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$GTKMOZEMBED_PKG_ERRORS" >&5 -+ -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+ build_gtkmozembed=false -+elif test $pkg_failed = untried; then -+ build_gtkmozembed=false -+else -+ GTKMOZEMBED_CFLAGS=$pkg_cv_GTKMOZEMBED_CFLAGS -+ GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } -+ build_gtkmozembed=true; mozpackage=seamonkey -+fi -+ -+elif test $pkg_failed = untried; then -+ -+ -+pkg_failed=no -+{ $as_echo "$as_me:$LINENO: checking for GTKMOZEMBED" >&5 -+$as_echo_n "checking for GTKMOZEMBED... " >&6; } -+ -+if test -n "$GTKMOZEMBED_CFLAGS"; then -+ pkg_cv_GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_GTKMOZEMBED_CFLAGS=`$PKG_CONFIG --cflags "seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ else -+ pkg_failed=untried -+fi -+if test -n "$GTKMOZEMBED_LIBS"; then -+ pkg_cv_GTKMOZEMBED_LIBS="$GTKMOZEMBED_LIBS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_GTKMOZEMBED_LIBS=`$PKG_CONFIG --libs "seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ else -+ pkg_failed=untried -+fi -+ -+ -+ -+if test $pkg_failed = yes; then -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0" 2>&1` -+ else -+ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --print-errors "seamonkey-gtkmozembed >= 1.1.3 -+ gtk+-2.0 >= 2.4.0" 2>&1` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$GTKMOZEMBED_PKG_ERRORS" >&5 -+ -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - build_gtkmozembed=false - elif test $pkg_failed = untried; then - build_gtkmozembed=false -@@ -22744,6 +23344,14 @@ else - GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS - { $as_echo "$as_me:$LINENO: result: yes" >&5 - $as_echo "yes" >&6; } -+ build_gtkmozembed=true; mozpackage=seamonkey -+fi -+ -+else -+ GTKMOZEMBED_CFLAGS=$pkg_cv_GTKMOZEMBED_CFLAGS -+ GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } - build_gtkmozembed=true; mozpackage=mozilla - fi - diff --git a/x11-toolkits/py-gnome-extras/pkg-plist b/x11-toolkits/py-gnome-extras/pkg-plist index 8564adea3250..fb6368087b33 100644 --- a/x11-toolkits/py-gnome-extras/pkg-plist +++ b/x11-toolkits/py-gnome-extras/pkg-plist @@ -8,8 +8,6 @@ include/pygda-4.0/pygdavalue_conversions.h %%PYTHON_SITELIBDIR%%/gtk-2.0/egg/trayicon.so %%PYTHON_SITELIBDIR%%/gtk-2.0/gda.la %%PYTHON_SITELIBDIR%%/gtk-2.0/gda.so -%%PYTHON_SITELIBDIR%%/gtk-2.0/gdl.la -%%PYTHON_SITELIBDIR%%/gtk-2.0/gdl.so %%PYTHON_SITELIBDIR%%/gtk-2.0/gksu/__init__.py %%PYTHON_SITELIBDIR%%/gtk-2.0/gksu/__init__.pyc %%PYTHON_SITELIBDIR%%/gtk-2.0/gksu/__init__.pyo diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile index 5b14acca2285..e4c9c99b1c72 100644 --- a/x11-toolkits/py-gnome2/Makefile +++ b/x11-toolkits/py-gnome2/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/py-gnome2/Makefile,v 1.55 2009/03/15 00:16:38 marcus Exp $ +# $MCom: ports/x11-toolkits/py-gnome2/Makefile,v 1.58 2009/09/21 19:32:26 kwm Exp $ # PORTNAME= gnome -PORTVERSION= 2.26.1 -PORTREVISION= 1 +PORTVERSION= 2.28.0 CATEGORIES= x11-toolkits python gnome MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/gnome-python/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/x11-toolkits/py-gnome2/distinfo b/x11-toolkits/py-gnome2/distinfo index 03156a926a87..ed7191ac1594 100644 --- a/x11-toolkits/py-gnome2/distinfo +++ b/x11-toolkits/py-gnome2/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-python-2.26.1.tar.bz2) = e5dcae40b2c291126843680dbed924a8 -SHA256 (gnome2/gnome-python-2.26.1.tar.bz2) = ede0203f1eec22b3ed4a91c7b769e437859e5bc4b89a8f8e80b3f7ca62317098 -SIZE (gnome2/gnome-python-2.26.1.tar.bz2) = 523132 +MD5 (gnome2/gnome-python-2.28.0.tar.bz2) = b627abbb0ed912e221cc072e3dd6f9d6 +SHA256 (gnome2/gnome-python-2.28.0.tar.bz2) = f2c984587450086dff8eb0a72a8d8c616d51fecfcc790601c35641be140efa0c +SIZE (gnome2/gnome-python-2.28.0.tar.bz2) = 560872 diff --git a/x11-toolkits/py-gnome2/pkg-plist b/x11-toolkits/py-gnome2/pkg-plist index 54bab3102807..e3cca9b7284c 100644 --- a/x11-toolkits/py-gnome2/pkg-plist +++ b/x11-toolkits/py-gnome2/pkg-plist @@ -48,6 +48,7 @@ libdata/pkgconfig/gnome-python-2.0.pc %%PORTDOCS%%share/examples/py-gnome/gconf/basic-gconf-app.py %%PORTDOCS%%share/examples/py-gnome/gconf/simple-controller.py %%PORTDOCS%%share/examples/py-gnome/gconf/simple-view.py +%%PORTDOCS%%share/examples/py-gnome/popt/goption.py %%PORTDOCS%%share/examples/py-gnome/popt/popt.py %%PORTDOCS%%share/examples/py-gnome/vfs/async-xfer.py %%PORTDOCS%%share/examples/py-gnome/vfs/async.py diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile index 7113e0840e59..8f1b2542185d 100644 --- a/x11-toolkits/py-gtk2/Makefile +++ b/x11-toolkits/py-gtk2/Makefile @@ -3,12 +3,11 @@ # Whom: marc@informatik.uni-bremen.de # # $FreeBSD$ -# $MCom: ports/x11-toolkits/py-gtk2/Makefile,v 1.58 2008/09/27 01:53:01 mezz Exp $ +# $MCom: ports/x11-toolkits/py-gtk2/Makefile,v 1.65 2009/08/23 18:58:07 kwm Exp $ # PORTNAME= gtk -PORTVERSION= 2.14.1 -PORTREVISION= 1 +PORTVERSION= 2.16.0 CATEGORIES= x11-toolkits python MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/pygtk/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -19,7 +18,8 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= A set of Python bindings for GTK+ -BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/cairo/__init__.py:${PORTSDIR}/graphics/py-cairo \ +BUILD_DEPENDS= ${PYNUMERIC} \ + ${PYTHON_SITELIBDIR}/cairo/__init__.py:${PORTSDIR}/graphics/py-cairo \ ${PYTHON_SITELIBDIR}/gtk-2.0/gobject/_gobject.so:${PORTSDIR}/devel/py-gobject RUN_DEPENDS= ${PYNUMERIC} \ ${PYTHON_SITELIBDIR}/cairo/__init__.py:${PORTSDIR}/graphics/py-cairo \ diff --git a/x11-toolkits/py-gtk2/distinfo b/x11-toolkits/py-gtk2/distinfo index 9e6b70760b75..44b98e279e92 100644 --- a/x11-toolkits/py-gtk2/distinfo +++ b/x11-toolkits/py-gtk2/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/pygtk-2.14.1.tar.bz2) = c27a7d21b87910e80605d9135d220592 -SHA256 (gnome2/pygtk-2.14.1.tar.bz2) = 733a5e2e1ca2ca6cf9dae0de9c035d3a428c6ec52774977f60d0618a1a27591a -SIZE (gnome2/pygtk-2.14.1.tar.bz2) = 2210535 +MD5 (gnome2/pygtk-2.16.0.tar.bz2) = bd0d437fefd6d5390f5d770a495cd50c +SHA256 (gnome2/pygtk-2.16.0.tar.bz2) = 7fae5e01af217a01738eae41c38ad7f86d1f538f444300d0fa2847aafb7444a8 +SIZE (gnome2/pygtk-2.16.0.tar.bz2) = 2253202 diff --git a/x11-toolkits/py-gtk2/pkg-plist b/x11-toolkits/py-gtk2/pkg-plist index 7cabb83f0786..3644393e6a62 100644 --- a/x11-toolkits/py-gtk2/pkg-plist +++ b/x11-toolkits/py-gtk2/pkg-plist @@ -186,6 +186,7 @@ libdata/pkgconfig/pygtk-2.0.pc %%DOCSDIR%%/class-gtkaccessible.html %%DOCSDIR%%/class-gtkaction.html %%DOCSDIR%%/class-gtkactiongroup.html +%%DOCSDIR%%/class-gtkactivatable.html %%DOCSDIR%%/class-gtkadjustment.html %%DOCSDIR%%/class-gtkalignment.html %%DOCSDIR%%/class-gtkarrow.html @@ -700,6 +701,7 @@ share/pygtk/2.0/defs/atk.defs share/pygtk/2.0/defs/gdk-2.10.defs share/pygtk/2.0/defs/gdk-2.12.defs share/pygtk/2.0/defs/gdk-2.14.defs +share/pygtk/2.0/defs/gdk-2.16.defs share/pygtk/2.0/defs/gdk-base-types.defs share/pygtk/2.0/defs/gdk-base.defs share/pygtk/2.0/defs/gdk-types.defs @@ -710,6 +712,8 @@ share/pygtk/2.0/defs/gtk-2.12-types.defs share/pygtk/2.0/defs/gtk-2.12.defs share/pygtk/2.0/defs/gtk-2.14-types.defs share/pygtk/2.0/defs/gtk-2.14.defs +share/pygtk/2.0/defs/gtk-2.16-types.defs +share/pygtk/2.0/defs/gtk-2.16.defs share/pygtk/2.0/defs/gtk-base-types.defs share/pygtk/2.0/defs/gtk-base.defs share/pygtk/2.0/defs/gtk-extrafuncs.defs @@ -743,10 +747,10 @@ share/pygtk/2.0/defs/pangocairo.override @dirrm %%DOCSDIR%%/cursors @dirrm %%DOCSDIR%% @dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gtk -@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0 +@dirrmtry %%PYTHON_SITELIBDIR%%/gtk-2.0 @dirrm lib/pygtk/2.0/demos/images @dirrm lib/pygtk/2.0/demos @dirrm lib/pygtk/2.0 @dirrm lib/pygtk @dirrm include/pygtk-2.0/pygtk -@dirrm include/pygtk-2.0 +@dirrmtry include/pygtk-2.0 diff --git a/x11-toolkits/py-gtksourceview/Makefile b/x11-toolkits/py-gtksourceview/Makefile index 104d27e48357..e0c9cf2489b7 100644 --- a/x11-toolkits/py-gtksourceview/Makefile +++ b/x11-toolkits/py-gtksourceview/Makefile @@ -3,12 +3,11 @@ # Whom: Mezz <mezz@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/py-gtksourceview/Makefile,v 1.17 2009/03/24 13:38:04 kwm Exp $ +# $MCom: ports/x11-toolkits/py-gtksourceview/Makefile,v 1.20 2009/09/22 08:25:11 kwm Exp $ # PORTNAME= gtksourceview -PORTVERSION= 2.6.0 -PORTREVISION= 1 +PORTVERSION= 2.8.0 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/pygtksourceview/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/x11-toolkits/py-gtksourceview/distinfo b/x11-toolkits/py-gtksourceview/distinfo index e07fe304f190..f0d42509325f 100644 --- a/x11-toolkits/py-gtksourceview/distinfo +++ b/x11-toolkits/py-gtksourceview/distinfo @@ -1,3 +1,3 @@ -MD5 (pygtksourceview-2.6.0.tar.bz2) = 5587a1865bd5c785c6f34095c57cc96b -SHA256 (pygtksourceview-2.6.0.tar.bz2) = 77acb735fee997a1638c79256b9dcf592566d066b54a72eb4321909f98f66178 -SIZE (pygtksourceview-2.6.0.tar.bz2) = 271314 +MD5 (pygtksourceview-2.8.0.tar.bz2) = bc344044113a52026b4eb7e433a24c29 +SHA256 (pygtksourceview-2.8.0.tar.bz2) = 27f531270b46285982573089a58a19d622174ad9a4568e12d8fa4aedbfc174da +SIZE (pygtksourceview-2.8.0.tar.bz2) = 269696 diff --git a/x11-toolkits/slgtk/Makefile b/x11-toolkits/slgtk/Makefile index 8198d4613690..7de23dcfd4b1 100644 --- a/x11-toolkits/slgtk/Makefile +++ b/x11-toolkits/slgtk/Makefile @@ -7,7 +7,7 @@ PORTNAME= slgtk PORTVERSION= 0.7.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits MASTER_SITES= ftp://space.mit.edu/pub/cxc/modules/slgtk/ diff --git a/x11-toolkits/slgtk/files/patch-src_slirprc-gtk.sl b/x11-toolkits/slgtk/files/patch-src_slirprc-gtk.sl new file mode 100644 index 000000000000..9b4ecf3bfc6d --- /dev/null +++ b/x11-toolkits/slgtk/files/patch-src_slirprc-gtk.sl @@ -0,0 +1,11 @@ +--- src/slirprc-gtk.sl.orig 2009-09-27 23:31:51.000000000 -0400 ++++ src/slirprc-gtk.sl 2009-09-27 23:32:06.000000000 -0400 +@@ -308,6 +308,8 @@ accepts_null_args["g_list_append"] = [1] + gtk_widget_get_window % prefer my version, which returns + % bin_window for GtkLayout + ++gtk_widget_get_allocation ++ + gtk_accel_group_activate % gtk/gtkaccelgroup.h: "internal" funcs + gtk_accel_group_get_entry + gtk_accel_group_lock_entry diff --git a/x11-toolkits/unique/Makefile b/x11-toolkits/unique/Makefile index 77650d91822c..41396bfe0a10 100644 --- a/x11-toolkits/unique/Makefile +++ b/x11-toolkits/unique/Makefile @@ -3,26 +3,30 @@ # Whom: Koop Mast <kwm@FreeBSD.org> # # $FreeBSD$ -# $MCom$ +# $MCom: ports/x11-toolkits/unique/Makefile,v 1.3 2009/10/03 02:27:43 marcus Exp $ # PORTNAME= unique -PORTVERSION= 1.0.6 -PORTREVISION= 1 +PORTVERSION= 1.1.2 CATEGORIES= x11-toolkits -MASTER_SITES= http://www.gnome.org/~ebassi/source/ +MASTER_SITES= GNOME/sources/lib${PORTNAME}/${PORTVERSION:R}/ +DISTNAME= lib${PORTNAME}-${PORTVERSION} MAINTAINER= kwm@FreeBSD.org COMMENT= Library for single instance applications. +BUILD_DEPENDS= ${LOCALBASE}/share/gir-1.0/Gtk-2.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-gtk20 LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus +RUN_DEPENDS= ${LOCALBASE}/share/gir-1.0/Gtk-2.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-gtk20 USE_XORG= ice +USE_GMAKE= yes USE_GETTEXT= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:22 -USE_GNOME= gtk20 gnomeprefix +USE_GNOME= gtk20 gnomeprefix ltverhack:2 GNU_CONFIGURE= yes +CONFIGURE_ARGS= --disable-maintainer-flags CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11-toolkits/unique/distinfo b/x11-toolkits/unique/distinfo index 08da782dbfe6..445ab3a96808 100644 --- a/x11-toolkits/unique/distinfo +++ b/x11-toolkits/unique/distinfo @@ -1,3 +1,3 @@ -MD5 (unique-1.0.6.tar.gz) = 90eccdb97722d53f872a8fbdc8255ebb -SHA256 (unique-1.0.6.tar.gz) = 5ab4814e854f594dd004b07bdecffd360f81cd13482d850d9c99e8b4cc9191b9 -SIZE (unique-1.0.6.tar.gz) = 449242 +MD5 (libunique-1.1.2.tar.gz) = a99799e72779baa98352fbac7f91c910 +SHA256 (libunique-1.1.2.tar.gz) = ccf73a90a66477d6d31e50aeabebad8e0035f80e98ac0e926157c3d7e229b31e +SIZE (libunique-1.1.2.tar.gz) = 431459 diff --git a/x11-toolkits/unique/pkg-plist b/x11-toolkits/unique/pkg-plist index fada9ed4463b..c82fa3a05818 100644 --- a/x11-toolkits/unique/pkg-plist +++ b/x11-toolkits/unique/pkg-plist @@ -3,11 +3,13 @@ include/unique-1.0/unique/uniqueapp.h include/unique-1.0/unique/uniquebackend.h include/unique-1.0/unique/uniquemessage.h include/unique-1.0/unique/uniqueversion.h +lib/girepository-1.0/Unique-1.0.typelib lib/libunique-1.0.a lib/libunique-1.0.la lib/libunique-1.0.so lib/libunique-1.0.so.2 libdata/pkgconfig/unique-1.0.pc +share/gir-1.0/Unique-1.0.gir %%DOCSDIR%%/UniqueApp.html %%DOCSDIR%%/UniqueBackend.html %%DOCSDIR%%/home.png diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile index 1ecbd3f7ca7a..1916cfd75029 100644 --- a/x11-toolkits/vte/Makefile +++ b/x11-toolkits/vte/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom$ +# $MCom: ports/x11-toolkits/vte/Makefile,v 1.104 2009/11/17 21:15:44 kwm Exp $ # PORTNAME= vte -PORTVERSION= 0.20.5 +PORTVERSION= 0.22.5 PORTREVISION?= 0 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME diff --git a/x11-toolkits/vte/distinfo b/x11-toolkits/vte/distinfo index ba6a4250b1ee..786a0be68291 100644 --- a/x11-toolkits/vte/distinfo +++ b/x11-toolkits/vte/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/vte-0.20.5.tar.bz2) = 90de70ddd1340be308430ded74d6b8d6 -SHA256 (gnome2/vte-0.20.5.tar.bz2) = d69ec08804eaa03beef93d39b1cb56ecb98a492f1dd091343b69303ef999681b -SIZE (gnome2/vte-0.20.5.tar.bz2) = 1328766 +MD5 (gnome2/vte-0.22.5.tar.bz2) = cbb17696e40ee175977bf165ef838da2 +SHA256 (gnome2/vte-0.22.5.tar.bz2) = c0987126347e12daf2bf9b772b6c58ddf8a922f5b8341470ed578d9fcea7b2f6 +SIZE (gnome2/vte-0.22.5.tar.bz2) = 1351975 diff --git a/x11-toolkits/vte/files/patch-python_Makefile.in b/x11-toolkits/vte/files/patch-python_Makefile.in index d8c01a7483df..d821a7cf66e0 100644 --- a/x11-toolkits/vte/files/patch-python_Makefile.in +++ b/x11-toolkits/vte/files/patch-python_Makefile.in @@ -1,6 +1,6 @@ ---- python/Makefile.in.orig 2009-03-16 08:49:19.000000000 +0100 -+++ python/Makefile.in 2009-03-16 08:51:17.000000000 +0100 -@@ -56,7 +56,6 @@ +--- python/Makefile.in.orig 2009-11-01 13:38:24.000000000 -0500 ++++ python/Makefile.in 2009-11-01 13:38:24.000000000 -0500 +@@ -73,7 +73,6 @@ am__installdirs = "$(DESTDIR)$(pythonsit LTLIBRARIES = $(pythonsiteexec_LTLIBRARIES) am__DEPENDENCIES_1 = @BUILD_PYTHON_MODULES_TRUE@vtemodule_la_DEPENDENCIES = \ @@ -8,24 +8,7 @@ @BUILD_PYTHON_MODULES_TRUE@ $(am__DEPENDENCIES_1) \ @BUILD_PYTHON_MODULES_TRUE@ $(am__DEPENDENCIES_1) \ @BUILD_PYTHON_MODULES_TRUE@ $(am__DEPENDENCIES_1) -@@ -290,11 +289,11 @@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - EXTRA_DIST = vte.defs pyvte.pc.in vte.override cat.py unrealize.py vte-demo.py --defsdir = $(datadir)/pygtk/2.0/defs --defs_DATA = vte.defs --pkgconfigdir = $(prefix)/libdata/pkgconfig --pkgconfig_DATA = pyvte.pc --PYTHON_MODULES = vtemodule.la -+@BUILD_PYTHON_MODULES_TRUE@defsdir = $(datadir)/pygtk/2.0/defs -+@BUILD_PYTHON_MODULES_TRUE@defs_DATA = vte.defs -+@BUILD_PYTHON_MODULES_TRUE@pkgconfigdir = $(prefix)/libdata/pkgconfig -+@BUILD_PYTHON_MODULES_TRUE@pkgconfig_DATA = pyvte.pc -+@BUILD_PYTHON_MODULES_TRUE@PYTHON_MODULES = vtemodule.la - @BUILD_PYTHON_MODULES_TRUE@pythonsiteexecdir = $(pyexecdir)/gtk-2.0 - @BUILD_PYTHON_MODULES_TRUE@pythonsiteexec_LTLIBRARIES = $(PYTHON_MODULES) - @BUILD_PYTHON_MODULES_TRUE@CLEANFILES = vte.c -@@ -305,7 +304,7 @@ +@@ -320,7 +319,7 @@ EXTRA_DIST = vte.defs pyvte.pc.in vte.ov # we do this to suport building with -Wl,-z,defs which errors on # vtemodule.so as we cannot include $(PYTHON_LIBS) due to bug 410986. @BUILD_PYTHON_MODULES_TRUE@vtemodule_la_LDFLAGS = -module -avoid-version -export-symbols-regex initvte $(PYTHON_LDFLAGS) $(AM_LDFLAGS) diff --git a/x11-toolkits/vte/pkg-plist b/x11-toolkits/vte/pkg-plist index d4337b16529b..33a0070c4553 100644 --- a/x11-toolkits/vte/pkg-plist +++ b/x11-toolkits/vte/pkg-plist @@ -28,12 +28,14 @@ share/locale/bn/LC_MESSAGES/vte.mo share/locale/bn_IN/LC_MESSAGES/vte.mo share/locale/bs/LC_MESSAGES/vte.mo share/locale/ca/LC_MESSAGES/vte.mo +share/locale/ca@valencia/LC_MESSAGES/vte.mo share/locale/cs/LC_MESSAGES/vte.mo share/locale/cy/LC_MESSAGES/vte.mo share/locale/da/LC_MESSAGES/vte.mo share/locale/de/LC_MESSAGES/vte.mo share/locale/dz/LC_MESSAGES/vte.mo share/locale/el/LC_MESSAGES/vte.mo +share/locale/en@shaw/LC_MESSAGES/vte.mo share/locale/en_CA/LC_MESSAGES/vte.mo share/locale/en_GB/LC_MESSAGES/vte.mo share/locale/es/LC_MESSAGES/vte.mo @@ -61,6 +63,7 @@ share/locale/ky/LC_MESSAGES/vte.mo share/locale/li/LC_MESSAGES/vte.mo share/locale/lt/LC_MESSAGES/vte.mo share/locale/lv/LC_MESSAGES/vte.mo +share/locale/mai/LC_MESSAGES/vte.mo share/locale/mi/LC_MESSAGES/vte.mo share/locale/mk/LC_MESSAGES/vte.mo share/locale/ml/LC_MESSAGES/vte.mo @@ -69,6 +72,7 @@ share/locale/mr/LC_MESSAGES/vte.mo share/locale/ms/LC_MESSAGES/vte.mo share/locale/nb/LC_MESSAGES/vte.mo share/locale/ne/LC_MESSAGES/vte.mo +share/locale/nds/LC_MESSAGES/vte.mo share/locale/nl/LC_MESSAGES/vte.mo share/locale/nn/LC_MESSAGES/vte.mo share/locale/oc/LC_MESSAGES/vte.mo @@ -120,16 +124,24 @@ share/locale/zh_TW/LC_MESSAGES/vte.mo @dirrmtry share/locale/rw @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc +@dirrmtry share/locale/nds/LC_MESSAGES +@dirrmtry share/locale/nds @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr @dirrmtry share/locale/mi/LC_MESSAGES @dirrmtry share/locale/mi +@dirrmtry share/locale/mai/LC_MESSAGES +@dirrmtry share/locale/mai @dirrmtry share/locale/ky/LC_MESSAGES @dirrmtry share/locale/ky @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz +@dirrmtry share/locale/ca@valencia/LC_MESSAGES +@dirrmtry share/locale/ca@valencia @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES diff --git a/x11-toolkits/wxgtk24/Makefile b/x11-toolkits/wxgtk24/Makefile index 90a7ae6a1c1c..2a09fdd27768 100644 --- a/x11-toolkits/wxgtk24/Makefile +++ b/x11-toolkits/wxgtk24/Makefile @@ -7,7 +7,7 @@ PORTNAME= wx PORTVERSION= 2.4.2 -PORTREVISION?= 17 +PORTREVISION?= 18 PKGNAMESUFFIX= ${WXGTK_FLAVOR} CATEGORIES= x11-toolkits MASTER_SITES= SF/wxwindows/wxGTK/${PORTVERSION} diff --git a/x11-toolkits/wxgtk24/files/patch-src-gtk-gsockgtk.cpp b/x11-toolkits/wxgtk24/files/patch-src-gtk-gsockgtk.cpp new file mode 100644 index 000000000000..9ad23614f486 --- /dev/null +++ b/x11-toolkits/wxgtk24/files/patch-src-gtk-gsockgtk.cpp @@ -0,0 +1,18 @@ +--- src/gtk/gsockgtk.c.orig 2003-09-21 13:31:58.000000000 +0200 ++++ src/gtk/gsockgtk.c 2009-09-28 13:38:26.000000000 +0200 +@@ -13,8 +13,15 @@ + #include <stdlib.h> + #include <stdio.h> + ++// newer versions of glib define its own GSocket but we unfortunately use this ++// name in our own (semi-)public header and so can't change it -- rename glib ++// one instead ++#define GSocket GlibGSocket ++#define _GSocket GlibGSocket + #include <gdk/gdk.h> + #include <glib.h> ++#undef GSocket ++#undef _GSocket + + #include "wx/gsocket.h" + #include "wx/unix/gsockunx.h" diff --git a/x11-toolkits/wxgtk26/Makefile b/x11-toolkits/wxgtk26/Makefile index 8dd258fa30a3..73589d934608 100644 --- a/x11-toolkits/wxgtk26/Makefile +++ b/x11-toolkits/wxgtk26/Makefile @@ -7,7 +7,7 @@ PORTNAME= wx PORTVERSION= 2.6.4 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= x11-toolkits MASTER_SITES= SF/wxwindows/wxGTK/${PORTVERSION} PKGNAMESUFFIX= ${WXGTK_FLAVOR} diff --git a/x11-toolkits/wxgtk26/files/patch-src-gtk-gsockgtk.cpp b/x11-toolkits/wxgtk26/files/patch-src-gtk-gsockgtk.cpp new file mode 100644 index 000000000000..113f73e51ced --- /dev/null +++ b/x11-toolkits/wxgtk26/files/patch-src-gtk-gsockgtk.cpp @@ -0,0 +1,16 @@ +--- src/gtk//gsockgtk.cpp.orig 2007-03-20 16:50:07.000000000 +0100 ++++ src/gtk/gsockgtk.cpp 2009-09-18 14:46:47.000000000 +0200 +@@ -14,8 +14,13 @@ + #include <stdlib.h> + #include <stdio.h> + ++// newer versions of glib define its own GSocket but we unfortunately use this ++// name in our own (semi-)public header and so can't change it -- rename glib ++// one instead ++#define GSocket GlibGSocket + #include <gdk/gdk.h> + #include <glib.h> ++#undef GSocket + + #include "wx/gsocket.h" + #include "wx/unix/gsockunx.h" diff --git a/x11-toolkits/wxgtk28/Makefile b/x11-toolkits/wxgtk28/Makefile index 321c75cc900a..e8510b09c18d 100644 --- a/x11-toolkits/wxgtk28/Makefile +++ b/x11-toolkits/wxgtk28/Makefile @@ -7,7 +7,7 @@ PORTNAME= wx PORTVERSION= 2.8.10 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= x11-toolkits MASTER_SITES= SF/wxwindows/wxGTK/${PORTVERSION} PKGNAMESUFFIX= ${WXGTK_FLAVOR} diff --git a/x11-toolkits/wxgtk28/files/patch-include__wx__gtk__win_gtk.h b/x11-toolkits/wxgtk28/files/patch-include__wx__gtk__win_gtk.h new file mode 100644 index 000000000000..d9c66f279bee --- /dev/null +++ b/x11-toolkits/wxgtk28/files/patch-include__wx__gtk__win_gtk.h @@ -0,0 +1,12 @@ +--- include/wx/gtk/win_gtk.h.orig 2009-11-27 01:59:18.000000000 +0100 ++++ include/wx/gtk/win_gtk.h 2009-11-27 01:59:33.000000000 +0100 +@@ -15,7 +15,9 @@ + extern "C" { + #endif /* __cplusplus */ + ++#define GSocket GlibGSocket + #include <gtk/gtkcontainer.h> ++#undef GSocket + + #include "wx/dlimpexp.h" + diff --git a/x11-toolkits/wxgtk28/files/patch-src-gtk-gsockgtk.cpp b/x11-toolkits/wxgtk28/files/patch-src-gtk-gsockgtk.cpp new file mode 100644 index 000000000000..113f73e51ced --- /dev/null +++ b/x11-toolkits/wxgtk28/files/patch-src-gtk-gsockgtk.cpp @@ -0,0 +1,16 @@ +--- src/gtk//gsockgtk.cpp.orig 2007-03-20 16:50:07.000000000 +0100 ++++ src/gtk/gsockgtk.cpp 2009-09-18 14:46:47.000000000 +0200 +@@ -14,8 +14,13 @@ + #include <stdlib.h> + #include <stdio.h> + ++// newer versions of glib define its own GSocket but we unfortunately use this ++// name in our own (semi-)public header and so can't change it -- rename glib ++// one instead ++#define GSocket GlibGSocket + #include <gdk/gdk.h> + #include <glib.h> ++#undef GSocket + + #include "wx/gsocket.h" + #include "wx/unix/gsockunx.h" diff --git a/x11-toolkits/wxgtk29/Makefile b/x11-toolkits/wxgtk29/Makefile index 321c75cc900a..e8510b09c18d 100644 --- a/x11-toolkits/wxgtk29/Makefile +++ b/x11-toolkits/wxgtk29/Makefile @@ -7,7 +7,7 @@ PORTNAME= wx PORTVERSION= 2.8.10 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= x11-toolkits MASTER_SITES= SF/wxwindows/wxGTK/${PORTVERSION} PKGNAMESUFFIX= ${WXGTK_FLAVOR} diff --git a/x11-toolkits/wxgtk29/files/patch-include__wx__gtk__win_gtk.h b/x11-toolkits/wxgtk29/files/patch-include__wx__gtk__win_gtk.h new file mode 100644 index 000000000000..d9c66f279bee --- /dev/null +++ b/x11-toolkits/wxgtk29/files/patch-include__wx__gtk__win_gtk.h @@ -0,0 +1,12 @@ +--- include/wx/gtk/win_gtk.h.orig 2009-11-27 01:59:18.000000000 +0100 ++++ include/wx/gtk/win_gtk.h 2009-11-27 01:59:33.000000000 +0100 +@@ -15,7 +15,9 @@ + extern "C" { + #endif /* __cplusplus */ + ++#define GSocket GlibGSocket + #include <gtk/gtkcontainer.h> ++#undef GSocket + + #include "wx/dlimpexp.h" + diff --git a/x11-toolkits/wxgtk29/files/patch-src-gtk-gsockgtk.cpp b/x11-toolkits/wxgtk29/files/patch-src-gtk-gsockgtk.cpp new file mode 100644 index 000000000000..113f73e51ced --- /dev/null +++ b/x11-toolkits/wxgtk29/files/patch-src-gtk-gsockgtk.cpp @@ -0,0 +1,16 @@ +--- src/gtk//gsockgtk.cpp.orig 2007-03-20 16:50:07.000000000 +0100 ++++ src/gtk/gsockgtk.cpp 2009-09-18 14:46:47.000000000 +0200 +@@ -14,8 +14,13 @@ + #include <stdlib.h> + #include <stdio.h> + ++// newer versions of glib define its own GSocket but we unfortunately use this ++// name in our own (semi-)public header and so can't change it -- rename glib ++// one instead ++#define GSocket GlibGSocket + #include <gdk/gdk.h> + #include <glib.h> ++#undef GSocket + + #include "wx/gsocket.h" + #include "wx/unix/gsockunx.h" |