From f1bb12de8e50bf76ae21f37debda60994ec7fd99 Mon Sep 17 00:00:00 2001 From: Joe Marcus Clarke Date: Sat, 14 Oct 2006 08:35:50 +0000 Subject: Presenting GNOME 2.16.1 for FreeBSD. This release represents a massive amount of work by the FreeBSD GNOME Team and our testers. On top of the usual GNOME update, we have taken this opportunity to move GNOME from X11BASE to LOCALBASE. This means roughly 600 ports NOT part of the GNOME Desktop also need to be changed. The bulk of the move was carried out by ahze, mezz, and pav, but it would not have been possible without cooperation from the FreeBSD KDE team who worked with us to make sure GNOME and KDE can still coexist happily. We would also like to send a shout out to kris and pointyhat for putting up with multiple test runs until we got something that was solid. Back to GNOME 2.16. This release brings a huge amount of new functionality to FreeBSD. The standard release notes can be read at http://www.gnome.org/start/2.16/ . But on top of what you will read there, jylefort and marcus have completed work on a port of HAL to FreeBSD. This will allow FreeBSD to take advantage of closer hardware interaction such as auto-mounting CD-ROMs, USB drives, and music players; auto-playing audio CDs; and managing laptop power consumption. But where would this all be without our loyal testers and contributors? Therefore, the FreeBSD GNOME team would like to thank the following users: Phillip Neumann tmclaugh mux Yuri Pankov chinsan Thomas Brian Gruber Franz Klammer Dominique Goncalves Pascal Hofstee Yasuda Keisuke backyard Andris Raugulis Eric L. Chen Pawel Worach QuiRK on #freebsd-gnome Shane Bell luigi sajd on #freebsd-gnome sat Chris Coleman kaeru on #freebsd-gnome crsd_ via irc.freenode.org/#FreeBSD-GNOME Joel Diaz Enjoy! Approved by: portmgr (implicit, kris) --- x11-toolkits/eel/Makefile | 10 +- x11-toolkits/eel/distinfo | 6 +- .../eel/files/patch-eel_eel-open-with-dialog.c | 2 +- x11-toolkits/eel/pkg-plist | 48 ++++++++- x11-toolkits/gtk20/Makefile | 31 ++++-- x11-toolkits/gtk20/distinfo | 6 +- x11-toolkits/gtk20/files/patch-ak | 2 +- x11-toolkits/gtk20/files/patch-gtk_Makefile.in | 13 ++- x11-toolkits/gtk20/files/patch-gtk_gtkcalendar.c | 10 -- .../gtk20/files/patch-gtk_xdgmime_xdgmime.h | 17 +++ x11-toolkits/gtk20/pkg-plist | 118 ++++++++++++++++++--- x11-toolkits/gtk30/Makefile | 31 ++++-- x11-toolkits/gtk30/distinfo | 6 +- x11-toolkits/gtk30/files/patch-ak | 2 +- x11-toolkits/gtk30/files/patch-gtk_Makefile.in | 13 ++- x11-toolkits/gtk30/files/patch-gtk_gtkcalendar.c | 10 -- .../gtk30/files/patch-gtk_xdgmime_xdgmime.h | 17 +++ x11-toolkits/gtk30/pkg-plist | 118 ++++++++++++++++++--- x11-toolkits/gtksourceview/Makefile | 8 +- x11-toolkits/gtksourceview/distinfo | 6 +- x11-toolkits/gtksourceview/pkg-plist | 52 ++++++++- x11-toolkits/libbonoboui/Makefile | 10 +- x11-toolkits/libbonoboui/distinfo | 6 +- .../files/patch-tools::browser::oaf-helper.c | 16 --- x11-toolkits/libbonoboui/pkg-plist | 65 +++++++++++- x11-toolkits/libgail-gnome/Makefile | 7 +- x11-toolkits/libgnomeprintui/Makefile | 12 +-- x11-toolkits/libgnomeprintui/pkg-plist | 46 ++++++++ x11-toolkits/libgnomeui/Makefile | 16 +-- x11-toolkits/libgnomeui/distinfo | 6 +- x11-toolkits/libgnomeui/pkg-plist | 78 +++++++++++--- x11-toolkits/libwnck/Makefile | 7 +- x11-toolkits/libwnck/distinfo | 6 +- x11-toolkits/libwnck/pkg-plist | 61 ++++++++++- x11-toolkits/pango/Makefile | 21 ++-- x11-toolkits/pango/distinfo | 6 +- x11-toolkits/pango/files/patch-ac | 16 --- x11-toolkits/pango/pkg-plist | 6 ++ x11-toolkits/py-gnome-desktop/Makefile | 21 ++-- x11-toolkits/py-gnome-desktop/distinfo | 6 +- x11-toolkits/py-gnome-desktop/pkg-plist | 70 +++++++----- x11-toolkits/py-gnome2/Makefile | 11 +- x11-toolkits/py-gnome2/distinfo | 6 +- x11-toolkits/py-gnome2/files/patch-configure | 18 ++-- .../py-gnome2/files/patch-gnomevfs_Makefile.in | 11 -- x11-toolkits/py-gnome2/pkg-plist | 17 ++- x11-toolkits/py-gtk2/Makefile | 9 +- x11-toolkits/py-gtk2/distinfo | 6 +- x11-toolkits/py-gtk2/files/patch-Makefile.in | 11 ++ x11-toolkits/py-gtk2/pkg-plist | 23 +++- x11-toolkits/vte/Makefile | 8 +- x11-toolkits/vte/distinfo | 6 +- .../vte/files/patch-07_set_backspace_to_utf8 | 14 --- x11-toolkits/vte/files/patch-config.h.in | 12 +++ x11-toolkits/vte/files/patch-configure | 26 +---- x11-toolkits/vte/files/patch-src_vteseq.c | 10 ++ x11-toolkits/vte/pkg-plist | 61 +++++++++-- 57 files changed, 905 insertions(+), 352 deletions(-) delete mode 100644 x11-toolkits/gtk20/files/patch-gtk_gtkcalendar.c create mode 100644 x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.h delete mode 100644 x11-toolkits/gtk30/files/patch-gtk_gtkcalendar.c create mode 100644 x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmime.h delete mode 100644 x11-toolkits/libbonoboui/files/patch-tools::browser::oaf-helper.c delete mode 100644 x11-toolkits/pango/files/patch-ac delete mode 100644 x11-toolkits/py-gnome2/files/patch-gnomevfs_Makefile.in create mode 100644 x11-toolkits/py-gtk2/files/patch-Makefile.in delete mode 100644 x11-toolkits/vte/files/patch-07_set_backspace_to_utf8 create mode 100644 x11-toolkits/vte/files/patch-config.h.in create mode 100644 x11-toolkits/vte/files/patch-src_vteseq.c (limited to 'x11-toolkits') diff --git a/x11-toolkits/eel/Makefile b/x11-toolkits/eel/Makefile index 901463be6b09..cc55c07c9505 100644 --- a/x11-toolkits/eel/Makefile +++ b/x11-toolkits/eel/Makefile @@ -3,11 +3,12 @@ # Whom: Ade Lovett # # $FreeBSD$ -# $MCom: ports/x11-toolkits/eel/Makefile,v 1.35 2006/04/13 07:52:42 bland Exp $ +# $MCom: ports/x11-toolkits/eel/Makefile,v 1.46 2006/09/07 21:36:05 ahze Exp $ # PORTNAME= eel -PORTVERSION= 2.14.3 +PORTVERSION= 2.16.0 +PORTREVISION= 1 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -19,7 +20,7 @@ COMMENT= Generally useful classes and extensions to GNOME USE_GETTEXT= yes USE_BZIP2= yes USE_GMAKE= yes -USE_X_PREFIX= yes +USE_XLIB= yes GNOME_DESKTOP_VERSION=2 USE_GNOME= gnomeprefix gnomehack gail gnomedesktop gnomemenus ltverhack USE_AUTOTOOLS= libtool:15 @@ -29,7 +30,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" post-patch: - @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' \ + @${REINPLACE_CMD} -e 's|applications.menu|gnome-applications.menu|; \ + s|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/eel/eel-open-with-dialog.c .include diff --git a/x11-toolkits/eel/distinfo b/x11-toolkits/eel/distinfo index ae230a41ee59..035a3b0791ed 100644 --- a/x11-toolkits/eel/distinfo +++ b/x11-toolkits/eel/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/eel-2.14.3.tar.bz2) = cdff898f9a054b35f5e3b7c0142cc2a5 -SHA256 (gnome2/eel-2.14.3.tar.bz2) = 4a19f4aa88dd92a79c6edd953302cfec8bfb2060e6d4e8fc74a77aa78a64825e -SIZE (gnome2/eel-2.14.3.tar.bz2) = 640614 +MD5 (gnome2/eel-2.16.0.tar.bz2) = 7403a91bd27979f7513b9e9325e1d890 +SHA256 (gnome2/eel-2.16.0.tar.bz2) = 59be6069341efee420052aa8b5398ea5f7eef6a6d00cbf163633f2c241c0e64b +SIZE (gnome2/eel-2.16.0.tar.bz2) = 672036 diff --git a/x11-toolkits/eel/files/patch-eel_eel-open-with-dialog.c b/x11-toolkits/eel/files/patch-eel_eel-open-with-dialog.c index b94075cd3994..09270d77cacc 100644 --- a/x11-toolkits/eel/files/patch-eel_eel-open-with-dialog.c +++ b/x11-toolkits/eel/files/patch-eel_eel-open-with-dialog.c @@ -5,7 +5,7 @@ FALSE); gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (chooser), - "/usr/bin"); -+ "%%X11BASE%%/bin"); ++ "%%LOCALBASE%%/bin"); gtk_widget_show (chooser); } diff --git a/x11-toolkits/eel/pkg-plist b/x11-toolkits/eel/pkg-plist index e4c025d30c4a..4be4b326e4cf 100644 --- a/x11-toolkits/eel/pkg-plist +++ b/x11-toolkits/eel/pkg-plist @@ -7,7 +7,6 @@ include/eel-2/eel/eel-background.h include/eel-2/eel/eel-canvas-rect-ellipse.h include/eel-2/eel/eel-canvas-util.h include/eel-2/eel/eel-canvas.h -include/eel-2/eel/eel-cell-renderer-pixbuf-list.h include/eel-2/eel/eel-dateedit-extensions.h include/eel-2/eel/eel-debug-drawing.h include/eel-2/eel/eel-debug.h @@ -56,6 +55,7 @@ share/locale/az/LC_MESSAGES/eel-2.0.mo share/locale/be/LC_MESSAGES/eel-2.0.mo share/locale/bg/LC_MESSAGES/eel-2.0.mo share/locale/bn/LC_MESSAGES/eel-2.0.mo +share/locale/bn_IN/LC_MESSAGES/eel-2.0.mo share/locale/br/LC_MESSAGES/eel-2.0.mo share/locale/bs/LC_MESSAGES/eel-2.0.mo share/locale/ca/LC_MESSAGES/eel-2.0.mo @@ -126,25 +126,63 @@ share/locale/xh/LC_MESSAGES/eel-2.0.mo share/locale/zh_CN/LC_MESSAGES/eel-2.0.mo share/locale/zh_HK/LC_MESSAGES/eel-2.0.mo share/locale/zh_TW/LC_MESSAGES/eel-2.0.mo +@dirrm include/eel-2/eel +@dirrm include/eel-2 +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN @dirrmtry share/locale/xh/LC_MESSAGES @dirrmtry share/locale/xh +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk @dirrmtry share/locale/ug/LC_MESSAGES @dirrmtry share/locale/ug +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/sr +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sl +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/nn/LC_MESSAGES +@dirrmtry share/locale/nn +@dirrmtry share/locale/ne/LC_MESSAGES +@dirrmtry share/locale/ne @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr +@dirrmtry share/locale/li/LC_MESSAGES +@dirrmtry share/locale/li @dirrmtry share/locale/ky/LC_MESSAGES @dirrmtry share/locale/ky @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko +@dirrmtry share/locale/gl/LC_MESSAGES +@dirrmtry share/locale/gl +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz -@dirrmtry share/locale/br/LC_MESSAGES -@dirrmtry share/locale/br +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/be/LC_MESSAGES +@dirrmtry share/locale/be @dirrmtry share/locale/ang/LC_MESSAGES @dirrmtry share/locale/ang -@dirrm include/eel-2/eel -@dirrm include/eel-2 diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index c5153fc719cc..5a1783c426e3 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -3,15 +3,15 @@ # Whom: Vanilla I. Shu # # $FreeBSD$ -# $MCom: ports-stable/x11-toolkits/gtk20/Makefile,v 1.8 2006/03/13 22:32:30 mezz Exp $ +# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.101 2006/10/08 21:05:26 marcus Exp $ # PORTNAME= gtk -PORTVERSION= 2.8.20 -PORTREVISION?= 0 +PORTVERSION= 2.10.6 +PORTREVISION?= 1 CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.8,} \ - ftp://ftp.gtk.org/pub/gtk/v2.8/ \ +MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \ + ftp://ftp.gtk.org/pub/gtk/v2.10/ \ ftp://ftp.gimp.org/pub/%SUBDIR%/ \ ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \ http://www.ameth.org/gimp/%SUBDIR%/ \ @@ -33,20 +33,21 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ jpeg.9:${PORTSDIR}/graphics/jpeg RUN_DEPENDS= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \ - ${X11BASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme + ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme +USE_GMAKE= yes USE_XPM= yes USE_PERL5= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 USE_GNOME= gnomehack atk pango ltverhack USE_GETTEXT= yes -USE_X_PREFIX= yes +USE_XLIB= yes CONFIGURE_ARGS= --enable-static --with-xinput=yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \ -I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" -GTK_VERSION= 2.4.0 +GTK_VERSION= 2.10.0 PLIST_SUB= GTK_VERSION="${GTK_VERSION}" gdk_pixbuf_MAN= gdk-pixbuf-query-loaders.1 @@ -77,13 +78,20 @@ STRIP= .include +.if defined(WITH_CUPS) || exists(${LOCALBASE}/lib/libcups.so) +LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-base +PLIST_SUB+= CUPS:="" +.else +PLIST_SUB+= CUPS:="@comment " +.endif + # There is a SSE2 bug in either GCC or in our libc, when use p4, p-m or else # is being use in CPUTYPE that enable SSE2 will causing Java with GTK2 and # Mono/gtk-sharp crash. Disable SSE2 to solve the crash and see ports/72014 # for detail. .if ${OSVERSION} >= 500000 && ( ${ARCH} == "i386" || ${ARCH} == "amd64" ) \ && ${CC} != "icc" -CFLAGS+= -mno-sse2 +#CFLAGS+= -mno-sse2 .endif pre-everything:: @@ -108,12 +116,13 @@ post-patch: @${REINPLACE_CMD} -e 's|@CFLAGS@|& ${PTHREAD_CFLAGS}|; \ s|@LDFLAGS@|& ${PTHREAD_LIBS}|' \ ${WRKSRC}/demos/gtk-demo/Makefile.in + @${REINPLACE_CMD} -e 's|@LN_S@|${LN} -sf|' ${WRKSRC}/gtk/Makefile.in pre-build: @${RM} -rf ${WRKSRC}/docs/gtk.info* post-install: - -@${FIND} ${X11BASE}/share/icons -type d -depth 1 -exec \ + -@${FIND} ${LOCALBASE}/share/icons -type d -depth 1 -exec \ ${PREFIX}/bin/gtk-update-icon-cache -q -f {} \; 2>/dev/null @${MKDIR} ${PREFIX}/lib/gtk-2.0/modules @${MKDIR} ${PREFIX}/lib/gtk-2.0/${GTK_VERSION}/engines diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo index e7e4075ad27d..0fc02b098bba 100644 --- a/x11-toolkits/gtk20/distinfo +++ b/x11-toolkits/gtk20/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gtk+-2.8.20.tar.bz2) = 74e7ca98194f1fadfe906e66d763d05d -SHA256 (gnome2/gtk+-2.8.20.tar.bz2) = 69a9b6c1e78da7e71416f20fab0c4972503139406e89ce7fbdbac0e213b16b79 -SIZE (gnome2/gtk+-2.8.20.tar.bz2) = 12247295 +MD5 (gnome2/gtk+-2.10.6.tar.bz2) = 13c62b610c910255934452d0617403f7 +SHA256 (gnome2/gtk+-2.10.6.tar.bz2) = ca98edcea2034ab36c1024121a44d047de192d282127c8f8b77d14afba0ca468 +SIZE (gnome2/gtk+-2.10.6.tar.bz2) = 14561124 diff --git a/x11-toolkits/gtk20/files/patch-ak b/x11-toolkits/gtk20/files/patch-ak index f30cec385b9a..27156d238e58 100644 --- a/x11-toolkits/gtk20/files/patch-ak +++ b/x11-toolkits/gtk20/files/patch-ak @@ -1,6 +1,6 @@ $FreeBSD$ - $MCom: ports-stable/x11-toolkits/gtk20/files/patch-ak,v 1.6 2006/03/08 20:28:38 mezz Exp $ + $MCom: ports/x11-toolkits/gtk20/files/patch-ak,v 1.19 2006/10/10 20:22:27 mezz Exp $ --- gdk/Makefile.in.orig Thu Feb 14 12:38:26 2002 +++ gdk/Makefile.in Thu Feb 14 12:45:37 2002 diff --git a/x11-toolkits/gtk20/files/patch-gtk_Makefile.in b/x11-toolkits/gtk20/files/patch-gtk_Makefile.in index 44589795f769..610ece8f33ac 100644 --- a/x11-toolkits/gtk20/files/patch-gtk_Makefile.in +++ b/x11-toolkits/gtk20/files/patch-gtk_Makefile.in @@ -1,6 +1,6 @@ ---- gtk/Makefile.in.orig Wed Mar 2 15:57:44 2005 -+++ gtk/Makefile.in Wed Mar 2 15:58:22 2005 -@@ -887,12 +887,12 @@ +--- 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_query_immodules_2_0_DEPENDENCIES = $(DEPS) @@ -9,9 +9,8 @@ gtk_query_immodules_2_0_SOURCES = queryimmodules.c - gtk_update_icon_cache_DEPENDENCIES = $(DEPS) --gtk_update_icon_cache_LDADD = $(LDADDS) -+gtk_update_icon_cache_LDADD = $(LDADDS) $(GLIB_LIBS) +-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 - subdir = gtk + diff --git a/x11-toolkits/gtk20/files/patch-gtk_gtkcalendar.c b/x11-toolkits/gtk20/files/patch-gtk_gtkcalendar.c deleted file mode 100644 index 4dcf1fd052a5..000000000000 --- a/x11-toolkits/gtk20/files/patch-gtk_gtkcalendar.c +++ /dev/null @@ -1,10 +0,0 @@ ---- gtk/gtkcalendar.c.orig Mon Oct 3 22:01:14 2005 -+++ gtk/gtkcalendar.c Mon Oct 3 22:02:36 2005 -@@ -566,6 +566,7 @@ gtk_calendar_init (GtkCalendar *calendar - GtkCalendarPrivate *priv; - gchar *year_before; - gchar *langinfo; -+ gchar *week_start; - gint week_1stday = 0; - gint first_weekday = 1; - guint week_origin; diff --git a/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.h b/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.h new file mode 100644 index 000000000000..ed81f9280fac --- /dev/null +++ b/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.h @@ -0,0 +1,17 @@ +--- gtk/xdgmime/xdgmime.h.orig Sat Oct 7 10:42:32 2006 ++++ gtk/xdgmime/xdgmime.h Sat Oct 7 11:01:57 2006 +@@ -52,11 +52,14 @@ typedef void (*XdgMimeDestroy) (void *u + #define xdg_mime_get_mime_type_from_file_name XDG_ENTRY(get_mime_type_from_file_name) + #define xdg_mime_is_valid_mime_type XDG_ENTRY(is_valid_mime_type) + #define xdg_mime_mime_type_equal XDG_ENTRY(mime_type_equal) ++#define _xdg_mime_mime_type_equal XDG_ENTRY(mime_type_equal_p) + #define xdg_mime_media_type_equal XDG_ENTRY(media_type_equal) + #define xdg_mime_mime_type_subclass XDG_ENTRY(mime_type_subclass) ++#define _xdg_mime_mime_type_subclass XDG_ENTRY(mime_type_subclass_p) + #define xdg_mime_get_mime_parents XDG_ENTRY(get_mime_parents) + #define xdg_mime_list_mime_parents XDG_ENTRY(list_mime_parents) + #define xdg_mime_unalias_mime_type XDG_ENTRY(unalias_mime_type) ++#define _xdg_mime_unalias_mime_type XDG_ENTRY(unalias_mime_type_p) + #define xdg_mime_get_max_buffer_extents XDG_ENTRY(get_max_buffer_extents) + #define xdg_mime_shutdown XDG_ENTRY(shutdown) + #define xdg_mime_dump XDG_ENTRY(dump) diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist index 8eeac80c990b..cd3e647f1258 100644 --- a/x11-toolkits/gtk20/pkg-plist +++ b/x11-toolkits/gtk20/pkg-plist @@ -63,6 +63,7 @@ include/gtk-2.0/gtk/gtkadjustment.h include/gtk-2.0/gtk/gtkalignment.h include/gtk-2.0/gtk/gtkarrow.h include/gtk-2.0/gtk/gtkaspectframe.h +include/gtk-2.0/gtk/gtkassistant.h include/gtk-2.0/gtk/gtkbbox.h include/gtk-2.0/gtk/gtkbin.h include/gtk-2.0/gtk/gtkbindings.h @@ -72,9 +73,11 @@ include/gtk-2.0/gtk/gtkcalendar.h include/gtk-2.0/gtk/gtkcelleditable.h include/gtk-2.0/gtk/gtkcelllayout.h include/gtk-2.0/gtk/gtkcellrenderer.h +include/gtk-2.0/gtk/gtkcellrendereraccel.h include/gtk-2.0/gtk/gtkcellrenderercombo.h include/gtk-2.0/gtk/gtkcellrendererpixbuf.h include/gtk-2.0/gtk/gtkcellrendererprogress.h +include/gtk-2.0/gtk/gtkcellrendererspin.h include/gtk-2.0/gtk/gtkcellrenderertext.h include/gtk-2.0/gtk/gtkcellrenderertoggle.h include/gtk-2.0/gtk/gtkcellview.h @@ -137,6 +140,7 @@ include/gtk-2.0/gtk/gtkitem.h include/gtk-2.0/gtk/gtkitemfactory.h include/gtk-2.0/gtk/gtklabel.h include/gtk-2.0/gtk/gtklayout.h +include/gtk-2.0/gtk/gtklinkbutton.h include/gtk-2.0/gtk/gtklist.h include/gtk-2.0/gtk/gtklistitem.h include/gtk-2.0/gtk/gtkliststore.h @@ -154,10 +158,16 @@ include/gtk-2.0/gtk/gtknotebook.h include/gtk-2.0/gtk/gtkobject.h include/gtk-2.0/gtk/gtkoldeditable.h include/gtk-2.0/gtk/gtkoptionmenu.h +include/gtk-2.0/gtk/gtkpagesetup.h include/gtk-2.0/gtk/gtkpaned.h +include/gtk-2.0/gtk/gtkpapersize.h include/gtk-2.0/gtk/gtkpixmap.h include/gtk-2.0/gtk/gtkplug.h include/gtk-2.0/gtk/gtkpreview.h +include/gtk-2.0/gtk/gtkprintcontext.h +include/gtk-2.0/gtk/gtkprintoperation.h +include/gtk-2.0/gtk/gtkprintoperationpreview.h +include/gtk-2.0/gtk/gtkprintsettings.h include/gtk-2.0/gtk/gtkprivate.h include/gtk-2.0/gtk/gtkprogress.h include/gtk-2.0/gtk/gtkprogressbar.h @@ -167,6 +177,12 @@ include/gtk-2.0/gtk/gtkradiomenuitem.h include/gtk-2.0/gtk/gtkradiotoolbutton.h include/gtk-2.0/gtk/gtkrange.h include/gtk-2.0/gtk/gtkrc.h +include/gtk-2.0/gtk/gtkrecentchooser.h +include/gtk-2.0/gtk/gtkrecentchooserdialog.h +include/gtk-2.0/gtk/gtkrecentchoosermenu.h +include/gtk-2.0/gtk/gtkrecentchooserwidget.h +include/gtk-2.0/gtk/gtkrecentfilter.h +include/gtk-2.0/gtk/gtkrecentmanager.h include/gtk-2.0/gtk/gtkruler.h include/gtk-2.0/gtk/gtkscale.h include/gtk-2.0/gtk/gtkscrollbar.h @@ -181,12 +197,14 @@ include/gtk-2.0/gtk/gtksizegroup.h include/gtk-2.0/gtk/gtksocket.h include/gtk-2.0/gtk/gtkspinbutton.h include/gtk-2.0/gtk/gtkstatusbar.h +include/gtk-2.0/gtk/gtkstatusicon.h include/gtk-2.0/gtk/gtkstock.h include/gtk-2.0/gtk/gtkstyle.h include/gtk-2.0/gtk/gtktable.h include/gtk-2.0/gtk/gtktearoffmenuitem.h include/gtk-2.0/gtk/gtktext.h include/gtk-2.0/gtk/gtktextbuffer.h +include/gtk-2.0/gtk/gtktextbufferrichtext.h include/gtk-2.0/gtk/gtktextchild.h include/gtk-2.0/gtk/gtktextdisplay.h include/gtk-2.0/gtk/gtktextiter.h @@ -228,6 +246,10 @@ include/gtk-2.0/gtk/gtkvscrollbar.h include/gtk-2.0/gtk/gtkvseparator.h include/gtk-2.0/gtk/gtkwidget.h include/gtk-2.0/gtk/gtkwindow.h +include/gtk-unix-print-2.0/gtk/gtkpagesetupunixdialog.h +include/gtk-unix-print-2.0/gtk/gtkprinter.h +include/gtk-unix-print-2.0/gtk/gtkprintjob.h +include/gtk-unix-print-2.0/gtk/gtkprintunixdialog.h lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.a lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.la lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.so @@ -303,6 +325,15 @@ lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.a lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.la lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.so +%%CUPS:%%lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-cups.a +%%CUPS:%%lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-cups.la +%%CUPS:%%lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-cups.so +lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-file.a +lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-file.la +lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-file.so +lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-lpr.a +lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-lpr.la +lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-lpr.so lib/libgdk-x11-2.0.a lib/libgdk-x11-2.0.la lib/libgdk-x11-2.0.so @@ -324,11 +355,13 @@ libdata/pkgconfig/gdk-pixbuf-2.0.pc libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc libdata/pkgconfig/gdk-x11-2.0.pc libdata/pkgconfig/gtk+-2.0.pc +libdata/pkgconfig/gtk+-unix-print-2.0.pc libdata/pkgconfig/gtk+-x11-2.0.pc share/aclocal/gtk-2.0.m4 share/gtk-2.0/demo/alphatest.png share/gtk-2.0/demo/apple-red.png share/gtk-2.0/demo/appwindow.c +share/gtk-2.0/demo/assistant.c share/gtk-2.0/demo/background.jpg share/gtk-2.0/demo/button_box.c share/gtk-2.0/demo/changedisplay.c @@ -360,9 +393,11 @@ share/gtk-2.0/demo/menus.c share/gtk-2.0/demo/panes.c share/gtk-2.0/demo/pickers.c share/gtk-2.0/demo/pixbufs.c +share/gtk-2.0/demo/printing.c share/gtk-2.0/demo/rotated_text.c share/gtk-2.0/demo/sizegroup.c share/gtk-2.0/demo/stock_browser.c +share/gtk-2.0/demo/textscroll.c share/gtk-2.0/demo/textview.c share/gtk-2.0/demo/tree_store.c share/gtk-2.0/demo/ui_manager.c @@ -370,6 +405,8 @@ share/locale/af/LC_MESSAGES/gtk20-properties.mo share/locale/af/LC_MESSAGES/gtk20.mo share/locale/am/LC_MESSAGES/gtk20-properties.mo share/locale/am/LC_MESSAGES/gtk20.mo +share/locale/ang/LC_MESSAGES/gtk20-properties.mo +share/locale/ang/LC_MESSAGES/gtk20.mo share/locale/ar/LC_MESSAGES/gtk20-properties.mo share/locale/ar/LC_MESSAGES/gtk20.mo share/locale/az/LC_MESSAGES/gtk20-properties.mo @@ -382,6 +419,8 @@ share/locale/bg/LC_MESSAGES/gtk20-properties.mo share/locale/bg/LC_MESSAGES/gtk20.mo share/locale/bn/LC_MESSAGES/gtk20-properties.mo share/locale/bn/LC_MESSAGES/gtk20.mo +share/locale/bn_IN/LC_MESSAGES/gtk20-properties.mo +share/locale/bn_IN/LC_MESSAGES/gtk20.mo share/locale/br/LC_MESSAGES/gtk20-properties.mo share/locale/br/LC_MESSAGES/gtk20.mo share/locale/bs/LC_MESSAGES/gtk20-properties.mo @@ -474,12 +513,10 @@ share/locale/nl/LC_MESSAGES/gtk20-properties.mo share/locale/nl/LC_MESSAGES/gtk20.mo share/locale/nn/LC_MESSAGES/gtk20-properties.mo share/locale/nn/LC_MESSAGES/gtk20.mo -share/locale/no/LC_MESSAGES/gtk20-properties.mo -share/locale/no/LC_MESSAGES/gtk20.mo share/locale/nso/LC_MESSAGES/gtk20-properties.mo share/locale/nso/LC_MESSAGES/gtk20.mo -share/locale/or/LC_MESSAGES/gtk20.mo share/locale/or/LC_MESSAGES/gtk20-properties.mo +share/locale/or/LC_MESSAGES/gtk20.mo share/locale/pa/LC_MESSAGES/gtk20-properties.mo share/locale/pa/LC_MESSAGES/gtk20.mo share/locale/pl/LC_MESSAGES/gtk20-properties.mo @@ -518,8 +555,12 @@ share/locale/tk/LC_MESSAGES/gtk20-properties.mo share/locale/tk/LC_MESSAGES/gtk20.mo share/locale/tr/LC_MESSAGES/gtk20-properties.mo share/locale/tr/LC_MESSAGES/gtk20.mo +share/locale/tt/LC_MESSAGES/gtk20-properties.mo +share/locale/tt/LC_MESSAGES/gtk20.mo share/locale/uk/LC_MESSAGES/gtk20-properties.mo share/locale/uk/LC_MESSAGES/gtk20.mo +share/locale/ur/LC_MESSAGES/gtk20-properties.mo +share/locale/ur/LC_MESSAGES/gtk20.mo share/locale/uz/LC_MESSAGES/gtk20-properties.mo share/locale/uz/LC_MESSAGES/gtk20.mo share/locale/uz@Latn/LC_MESSAGES/gtk20-properties.mo @@ -541,8 +582,8 @@ share/locale/zh_TW/LC_MESSAGES/gtk20.mo share/themes/Default/gtk-2.0-key/gtkrc share/themes/Emacs/gtk-2.0-key/gtkrc share/themes/Raleigh/gtk-2.0/gtkrc -@exec /usr/bin/find %%X11BASE%%/share/icons -type d -depth 1 -exec %D/bin/gtk-update-icon-cache -q -f {} \; 2>/dev/null || /usr/bin/true -@unexec /usr/bin/find %%X11BASE%%/share/icons -type f -depth 2 -name icon-theme.cache -delete 2>/dev/null || /usr/bin/true +@exec /usr/bin/find %%LOCALBASE%%/share/icons -type d -depth 1 -exec %D/bin/gtk-update-icon-cache -q -f {} \; 2>/dev/null || /usr/bin/true +@unexec /usr/bin/find %%LOCALBASE%%/share/icons -type f -depth 2 -name icon-theme.cache -delete 2>/dev/null || /usr/bin/true @dirrm share/themes/Raleigh/gtk-2.0 @dirrm share/themes/Raleigh @dirrm share/themes/Emacs/gtk-2.0-key @@ -550,6 +591,8 @@ share/themes/Raleigh/gtk-2.0/gtkrc @dirrm share/themes/Default/gtk-2.0-key @dirrm share/gtk-2.0/demo @dirrm share/gtk-2.0 +@dirrm include/gtk-unix-print-2.0/gtk +@dirrm include/gtk-unix-print-2.0 @dirrm include/gtk-2.0/gtk @dirrm include/gtk-2.0/gdk-pixbuf-xlib @dirrm include/gtk-2.0/gdk-pixbuf @@ -560,41 +603,90 @@ share/themes/Raleigh/gtk-2.0/gtkrc @exec /bin/mkdir -p %D/lib/gtk-2.0/%%GTK_VERSION%%/engines @dirrmtry share/themes/Default @dirrmtry share/themes +@dirrmtry lib/gtk-2.0/modules +@dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/printbackends +@dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/loaders +@dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/immodules +@dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/engines +@dirrmtry lib/gtk-2.0/%%GTK_VERSION%% +@dirrmtry lib/gtk-2.0 +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN @dirrmtry share/locale/yi/LC_MESSAGES @dirrmtry share/locale/yi @dirrmtry share/locale/xh/LC_MESSAGES @dirrmtry share/locale/xh @dirrmtry share/locale/uz@Latn/LC_MESSAGES @dirrmtry share/locale/uz@Latn +@dirrmtry share/locale/uz/LC_MESSAGES +@dirrmtry share/locale/uz +@dirrmtry share/locale/ur/LC_MESSAGES +@dirrmtry share/locale/ur +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk +@dirrmtry share/locale/tt/LC_MESSAGES +@dirrmtry share/locale/tt +@dirrmtry share/locale/tk/LC_MESSAGES +@dirrmtry share/locale/tk @dirrmtry share/locale/te/LC_MESSAGES @dirrmtry share/locale/te @dirrmtry share/locale/sr@ije/LC_MESSAGES @dirrmtry share/locale/sr@ije +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/sr +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sl +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl @dirrmtry share/locale/nso/LC_MESSAGES @dirrmtry share/locale/nso +@dirrmtry share/locale/nn/LC_MESSAGES +@dirrmtry share/locale/nn +@dirrmtry share/locale/ne/LC_MESSAGES +@dirrmtry share/locale/ne @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr @dirrmtry share/locale/mi/LC_MESSAGES @dirrmtry share/locale/mi +@dirrmtry share/locale/li/LC_MESSAGES +@dirrmtry share/locale/li @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko @dirrmtry share/locale/ia/LC_MESSAGES @dirrmtry share/locale/ia @dirrmtry share/locale/hy/LC_MESSAGES @dirrmtry share/locale/hy +@dirrmtry share/locale/gl/LC_MESSAGES +@dirrmtry share/locale/gl +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz -@dirrmtry share/locale/br/LC_MESSAGES -@dirrmtry share/locale/br +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/be/LC_MESSAGES +@dirrmtry share/locale/be @dirrmtry share/locale/az_IR/LC_MESSAGES @dirrmtry share/locale/az_IR -@dirrmtry lib/gtk-2.0/modules -@dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/loaders -@dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/immodules -@dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/engines -@dirrmtry lib/gtk-2.0/%%GTK_VERSION%% -@dirrmtry lib/gtk-2.0 +@dirrmtry share/locale/ang/LC_MESSAGES +@dirrmtry share/locale/ang diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile index c5153fc719cc..5a1783c426e3 100644 --- a/x11-toolkits/gtk30/Makefile +++ b/x11-toolkits/gtk30/Makefile @@ -3,15 +3,15 @@ # Whom: Vanilla I. Shu # # $FreeBSD$ -# $MCom: ports-stable/x11-toolkits/gtk20/Makefile,v 1.8 2006/03/13 22:32:30 mezz Exp $ +# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.101 2006/10/08 21:05:26 marcus Exp $ # PORTNAME= gtk -PORTVERSION= 2.8.20 -PORTREVISION?= 0 +PORTVERSION= 2.10.6 +PORTREVISION?= 1 CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.8,} \ - ftp://ftp.gtk.org/pub/gtk/v2.8/ \ +MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \ + ftp://ftp.gtk.org/pub/gtk/v2.10/ \ ftp://ftp.gimp.org/pub/%SUBDIR%/ \ ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \ http://www.ameth.org/gimp/%SUBDIR%/ \ @@ -33,20 +33,21 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ jpeg.9:${PORTSDIR}/graphics/jpeg RUN_DEPENDS= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \ - ${X11BASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme + ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme +USE_GMAKE= yes USE_XPM= yes USE_PERL5= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 USE_GNOME= gnomehack atk pango ltverhack USE_GETTEXT= yes -USE_X_PREFIX= yes +USE_XLIB= yes CONFIGURE_ARGS= --enable-static --with-xinput=yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \ -I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" -GTK_VERSION= 2.4.0 +GTK_VERSION= 2.10.0 PLIST_SUB= GTK_VERSION="${GTK_VERSION}" gdk_pixbuf_MAN= gdk-pixbuf-query-loaders.1 @@ -77,13 +78,20 @@ STRIP= .include +.if defined(WITH_CUPS) || exists(${LOCALBASE}/lib/libcups.so) +LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-base +PLIST_SUB+= CUPS:="" +.else +PLIST_SUB+= CUPS:="@comment " +.endif + # There is a SSE2 bug in either GCC or in our libc, when use p4, p-m or else # is being use in CPUTYPE that enable SSE2 will causing Java with GTK2 and # Mono/gtk-sharp crash. Disable SSE2 to solve the crash and see ports/72014 # for detail. .if ${OSVERSION} >= 500000 && ( ${ARCH} == "i386" || ${ARCH} == "amd64" ) \ && ${CC} != "icc" -CFLAGS+= -mno-sse2 +#CFLAGS+= -mno-sse2 .endif pre-everything:: @@ -108,12 +116,13 @@ post-patch: @${REINPLACE_CMD} -e 's|@CFLAGS@|& ${PTHREAD_CFLAGS}|; \ s|@LDFLAGS@|& ${PTHREAD_LIBS}|' \ ${WRKSRC}/demos/gtk-demo/Makefile.in + @${REINPLACE_CMD} -e 's|@LN_S@|${LN} -sf|' ${WRKSRC}/gtk/Makefile.in pre-build: @${RM} -rf ${WRKSRC}/docs/gtk.info* post-install: - -@${FIND} ${X11BASE}/share/icons -type d -depth 1 -exec \ + -@${FIND} ${LOCALBASE}/share/icons -type d -depth 1 -exec \ ${PREFIX}/bin/gtk-update-icon-cache -q -f {} \; 2>/dev/null @${MKDIR} ${PREFIX}/lib/gtk-2.0/modules @${MKDIR} ${PREFIX}/lib/gtk-2.0/${GTK_VERSION}/engines diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo index e7e4075ad27d..0fc02b098bba 100644 --- a/x11-toolkits/gtk30/distinfo +++ b/x11-toolkits/gtk30/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gtk+-2.8.20.tar.bz2) = 74e7ca98194f1fadfe906e66d763d05d -SHA256 (gnome2/gtk+-2.8.20.tar.bz2) = 69a9b6c1e78da7e71416f20fab0c4972503139406e89ce7fbdbac0e213b16b79 -SIZE (gnome2/gtk+-2.8.20.tar.bz2) = 12247295 +MD5 (gnome2/gtk+-2.10.6.tar.bz2) = 13c62b610c910255934452d0617403f7 +SHA256 (gnome2/gtk+-2.10.6.tar.bz2) = ca98edcea2034ab36c1024121a44d047de192d282127c8f8b77d14afba0ca468 +SIZE (gnome2/gtk+-2.10.6.tar.bz2) = 14561124 diff --git a/x11-toolkits/gtk30/files/patch-ak b/x11-toolkits/gtk30/files/patch-ak index f30cec385b9a..27156d238e58 100644 --- a/x11-toolkits/gtk30/files/patch-ak +++ b/x11-toolkits/gtk30/files/patch-ak @@ -1,6 +1,6 @@ $FreeBSD$ - $MCom: ports-stable/x11-toolkits/gtk20/files/patch-ak,v 1.6 2006/03/08 20:28:38 mezz Exp $ + $MCom: ports/x11-toolkits/gtk20/files/patch-ak,v 1.19 2006/10/10 20:22:27 mezz Exp $ --- gdk/Makefile.in.orig Thu Feb 14 12:38:26 2002 +++ gdk/Makefile.in Thu Feb 14 12:45:37 2002 diff --git a/x11-toolkits/gtk30/files/patch-gtk_Makefile.in b/x11-toolkits/gtk30/files/patch-gtk_Makefile.in index 44589795f769..610ece8f33ac 100644 --- a/x11-toolkits/gtk30/files/patch-gtk_Makefile.in +++ b/x11-toolkits/gtk30/files/patch-gtk_Makefile.in @@ -1,6 +1,6 @@ ---- gtk/Makefile.in.orig Wed Mar 2 15:57:44 2005 -+++ gtk/Makefile.in Wed Mar 2 15:58:22 2005 -@@ -887,12 +887,12 @@ +--- 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_query_immodules_2_0_DEPENDENCIES = $(DEPS) @@ -9,9 +9,8 @@ gtk_query_immodules_2_0_SOURCES = queryimmodules.c - gtk_update_icon_cache_DEPENDENCIES = $(DEPS) --gtk_update_icon_cache_LDADD = $(LDADDS) -+gtk_update_icon_cache_LDADD = $(LDADDS) $(GLIB_LIBS) +-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 - subdir = gtk + diff --git a/x11-toolkits/gtk30/files/patch-gtk_gtkcalendar.c b/x11-toolkits/gtk30/files/patch-gtk_gtkcalendar.c deleted file mode 100644 index 4dcf1fd052a5..000000000000 --- a/x11-toolkits/gtk30/files/patch-gtk_gtkcalendar.c +++ /dev/null @@ -1,10 +0,0 @@ ---- gtk/gtkcalendar.c.orig Mon Oct 3 22:01:14 2005 -+++ gtk/gtkcalendar.c Mon Oct 3 22:02:36 2005 -@@ -566,6 +566,7 @@ gtk_calendar_init (GtkCalendar *calendar - GtkCalendarPrivate *priv; - gchar *year_before; - gchar *langinfo; -+ gchar *week_start; - gint week_1stday = 0; - gint first_weekday = 1; - guint week_origin; diff --git a/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmime.h b/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmime.h new file mode 100644 index 000000000000..ed81f9280fac --- /dev/null +++ b/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmime.h @@ -0,0 +1,17 @@ +--- gtk/xdgmime/xdgmime.h.orig Sat Oct 7 10:42:32 2006 ++++ gtk/xdgmime/xdgmime.h Sat Oct 7 11:01:57 2006 +@@ -52,11 +52,14 @@ typedef void (*XdgMimeDestroy) (void *u + #define xdg_mime_get_mime_type_from_file_name XDG_ENTRY(get_mime_type_from_file_name) + #define xdg_mime_is_valid_mime_type XDG_ENTRY(is_valid_mime_type) + #define xdg_mime_mime_type_equal XDG_ENTRY(mime_type_equal) ++#define _xdg_mime_mime_type_equal XDG_ENTRY(mime_type_equal_p) + #define xdg_mime_media_type_equal XDG_ENTRY(media_type_equal) + #define xdg_mime_mime_type_subclass XDG_ENTRY(mime_type_subclass) ++#define _xdg_mime_mime_type_subclass XDG_ENTRY(mime_type_subclass_p) + #define xdg_mime_get_mime_parents XDG_ENTRY(get_mime_parents) + #define xdg_mime_list_mime_parents XDG_ENTRY(list_mime_parents) + #define xdg_mime_unalias_mime_type XDG_ENTRY(unalias_mime_type) ++#define _xdg_mime_unalias_mime_type XDG_ENTRY(unalias_mime_type_p) + #define xdg_mime_get_max_buffer_extents XDG_ENTRY(get_max_buffer_extents) + #define xdg_mime_shutdown XDG_ENTRY(shutdown) + #define xdg_mime_dump XDG_ENTRY(dump) diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist index 8eeac80c990b..cd3e647f1258 100644 --- a/x11-toolkits/gtk30/pkg-plist +++ b/x11-toolkits/gtk30/pkg-plist @@ -63,6 +63,7 @@ include/gtk-2.0/gtk/gtkadjustment.h include/gtk-2.0/gtk/gtkalignment.h include/gtk-2.0/gtk/gtkarrow.h include/gtk-2.0/gtk/gtkaspectframe.h +include/gtk-2.0/gtk/gtkassistant.h include/gtk-2.0/gtk/gtkbbox.h include/gtk-2.0/gtk/gtkbin.h include/gtk-2.0/gtk/gtkbindings.h @@ -72,9 +73,11 @@ include/gtk-2.0/gtk/gtkcalendar.h include/gtk-2.0/gtk/gtkcelleditable.h include/gtk-2.0/gtk/gtkcelllayout.h include/gtk-2.0/gtk/gtkcellrenderer.h +include/gtk-2.0/gtk/gtkcellrendereraccel.h include/gtk-2.0/gtk/gtkcellrenderercombo.h include/gtk-2.0/gtk/gtkcellrendererpixbuf.h include/gtk-2.0/gtk/gtkcellrendererprogress.h +include/gtk-2.0/gtk/gtkcellrendererspin.h include/gtk-2.0/gtk/gtkcellrenderertext.h include/gtk-2.0/gtk/gtkcellrenderertoggle.h include/gtk-2.0/gtk/gtkcellview.h @@ -137,6 +140,7 @@ include/gtk-2.0/gtk/gtkitem.h include/gtk-2.0/gtk/gtkitemfactory.h include/gtk-2.0/gtk/gtklabel.h include/gtk-2.0/gtk/gtklayout.h +include/gtk-2.0/gtk/gtklinkbutton.h include/gtk-2.0/gtk/gtklist.h include/gtk-2.0/gtk/gtklistitem.h include/gtk-2.0/gtk/gtkliststore.h @@ -154,10 +158,16 @@ include/gtk-2.0/gtk/gtknotebook.h include/gtk-2.0/gtk/gtkobject.h include/gtk-2.0/gtk/gtkoldeditable.h include/gtk-2.0/gtk/gtkoptionmenu.h +include/gtk-2.0/gtk/gtkpagesetup.h include/gtk-2.0/gtk/gtkpaned.h +include/gtk-2.0/gtk/gtkpapersize.h include/gtk-2.0/gtk/gtkpixmap.h include/gtk-2.0/gtk/gtkplug.h include/gtk-2.0/gtk/gtkpreview.h +include/gtk-2.0/gtk/gtkprintcontext.h +include/gtk-2.0/gtk/gtkprintoperation.h +include/gtk-2.0/gtk/gtkprintoperationpreview.h +include/gtk-2.0/gtk/gtkprintsettings.h include/gtk-2.0/gtk/gtkprivate.h include/gtk-2.0/gtk/gtkprogress.h include/gtk-2.0/gtk/gtkprogressbar.h @@ -167,6 +177,12 @@ include/gtk-2.0/gtk/gtkradiomenuitem.h include/gtk-2.0/gtk/gtkradiotoolbutton.h include/gtk-2.0/gtk/gtkrange.h include/gtk-2.0/gtk/gtkrc.h +include/gtk-2.0/gtk/gtkrecentchooser.h +include/gtk-2.0/gtk/gtkrecentchooserdialog.h +include/gtk-2.0/gtk/gtkrecentchoosermenu.h +include/gtk-2.0/gtk/gtkrecentchooserwidget.h +include/gtk-2.0/gtk/gtkrecentfilter.h +include/gtk-2.0/gtk/gtkrecentmanager.h include/gtk-2.0/gtk/gtkruler.h include/gtk-2.0/gtk/gtkscale.h include/gtk-2.0/gtk/gtkscrollbar.h @@ -181,12 +197,14 @@ include/gtk-2.0/gtk/gtksizegroup.h include/gtk-2.0/gtk/gtksocket.h include/gtk-2.0/gtk/gtkspinbutton.h include/gtk-2.0/gtk/gtkstatusbar.h +include/gtk-2.0/gtk/gtkstatusicon.h include/gtk-2.0/gtk/gtkstock.h include/gtk-2.0/gtk/gtkstyle.h include/gtk-2.0/gtk/gtktable.h include/gtk-2.0/gtk/gtktearoffmenuitem.h include/gtk-2.0/gtk/gtktext.h include/gtk-2.0/gtk/gtktextbuffer.h +include/gtk-2.0/gtk/gtktextbufferrichtext.h include/gtk-2.0/gtk/gtktextchild.h include/gtk-2.0/gtk/gtktextdisplay.h include/gtk-2.0/gtk/gtktextiter.h @@ -228,6 +246,10 @@ include/gtk-2.0/gtk/gtkvscrollbar.h include/gtk-2.0/gtk/gtkvseparator.h include/gtk-2.0/gtk/gtkwidget.h include/gtk-2.0/gtk/gtkwindow.h +include/gtk-unix-print-2.0/gtk/gtkpagesetupunixdialog.h +include/gtk-unix-print-2.0/gtk/gtkprinter.h +include/gtk-unix-print-2.0/gtk/gtkprintjob.h +include/gtk-unix-print-2.0/gtk/gtkprintunixdialog.h lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.a lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.la lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.so @@ -303,6 +325,15 @@ lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.a lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.la lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.so +%%CUPS:%%lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-cups.a +%%CUPS:%%lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-cups.la +%%CUPS:%%lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-cups.so +lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-file.a +lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-file.la +lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-file.so +lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-lpr.a +lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-lpr.la +lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-lpr.so lib/libgdk-x11-2.0.a lib/libgdk-x11-2.0.la lib/libgdk-x11-2.0.so @@ -324,11 +355,13 @@ libdata/pkgconfig/gdk-pixbuf-2.0.pc libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc libdata/pkgconfig/gdk-x11-2.0.pc libdata/pkgconfig/gtk+-2.0.pc +libdata/pkgconfig/gtk+-unix-print-2.0.pc libdata/pkgconfig/gtk+-x11-2.0.pc share/aclocal/gtk-2.0.m4 share/gtk-2.0/demo/alphatest.png share/gtk-2.0/demo/apple-red.png share/gtk-2.0/demo/appwindow.c +share/gtk-2.0/demo/assistant.c share/gtk-2.0/demo/background.jpg share/gtk-2.0/demo/button_box.c share/gtk-2.0/demo/changedisplay.c @@ -360,9 +393,11 @@ share/gtk-2.0/demo/menus.c share/gtk-2.0/demo/panes.c share/gtk-2.0/demo/pickers.c share/gtk-2.0/demo/pixbufs.c +share/gtk-2.0/demo/printing.c share/gtk-2.0/demo/rotated_text.c share/gtk-2.0/demo/sizegroup.c share/gtk-2.0/demo/stock_browser.c +share/gtk-2.0/demo/textscroll.c share/gtk-2.0/demo/textview.c share/gtk-2.0/demo/tree_store.c share/gtk-2.0/demo/ui_manager.c @@ -370,6 +405,8 @@ share/locale/af/LC_MESSAGES/gtk20-properties.mo share/locale/af/LC_MESSAGES/gtk20.mo share/locale/am/LC_MESSAGES/gtk20-properties.mo share/locale/am/LC_MESSAGES/gtk20.mo +share/locale/ang/LC_MESSAGES/gtk20-properties.mo +share/locale/ang/LC_MESSAGES/gtk20.mo share/locale/ar/LC_MESSAGES/gtk20-properties.mo share/locale/ar/LC_MESSAGES/gtk20.mo share/locale/az/LC_MESSAGES/gtk20-properties.mo @@ -382,6 +419,8 @@ share/locale/bg/LC_MESSAGES/gtk20-properties.mo share/locale/bg/LC_MESSAGES/gtk20.mo share/locale/bn/LC_MESSAGES/gtk20-properties.mo share/locale/bn/LC_MESSAGES/gtk20.mo +share/locale/bn_IN/LC_MESSAGES/gtk20-properties.mo +share/locale/bn_IN/LC_MESSAGES/gtk20.mo share/locale/br/LC_MESSAGES/gtk20-properties.mo share/locale/br/LC_MESSAGES/gtk20.mo share/locale/bs/LC_MESSAGES/gtk20-properties.mo @@ -474,12 +513,10 @@ share/locale/nl/LC_MESSAGES/gtk20-properties.mo share/locale/nl/LC_MESSAGES/gtk20.mo share/locale/nn/LC_MESSAGES/gtk20-properties.mo share/locale/nn/LC_MESSAGES/gtk20.mo -share/locale/no/LC_MESSAGES/gtk20-properties.mo -share/locale/no/LC_MESSAGES/gtk20.mo share/locale/nso/LC_MESSAGES/gtk20-properties.mo share/locale/nso/LC_MESSAGES/gtk20.mo -share/locale/or/LC_MESSAGES/gtk20.mo share/locale/or/LC_MESSAGES/gtk20-properties.mo +share/locale/or/LC_MESSAGES/gtk20.mo share/locale/pa/LC_MESSAGES/gtk20-properties.mo share/locale/pa/LC_MESSAGES/gtk20.mo share/locale/pl/LC_MESSAGES/gtk20-properties.mo @@ -518,8 +555,12 @@ share/locale/tk/LC_MESSAGES/gtk20-properties.mo share/locale/tk/LC_MESSAGES/gtk20.mo share/locale/tr/LC_MESSAGES/gtk20-properties.mo share/locale/tr/LC_MESSAGES/gtk20.mo +share/locale/tt/LC_MESSAGES/gtk20-properties.mo +share/locale/tt/LC_MESSAGES/gtk20.mo share/locale/uk/LC_MESSAGES/gtk20-properties.mo share/locale/uk/LC_MESSAGES/gtk20.mo +share/locale/ur/LC_MESSAGES/gtk20-properties.mo +share/locale/ur/LC_MESSAGES/gtk20.mo share/locale/uz/LC_MESSAGES/gtk20-properties.mo share/locale/uz/LC_MESSAGES/gtk20.mo share/locale/uz@Latn/LC_MESSAGES/gtk20-properties.mo @@ -541,8 +582,8 @@ share/locale/zh_TW/LC_MESSAGES/gtk20.mo share/themes/Default/gtk-2.0-key/gtkrc share/themes/Emacs/gtk-2.0-key/gtkrc share/themes/Raleigh/gtk-2.0/gtkrc -@exec /usr/bin/find %%X11BASE%%/share/icons -type d -depth 1 -exec %D/bin/gtk-update-icon-cache -q -f {} \; 2>/dev/null || /usr/bin/true -@unexec /usr/bin/find %%X11BASE%%/share/icons -type f -depth 2 -name icon-theme.cache -delete 2>/dev/null || /usr/bin/true +@exec /usr/bin/find %%LOCALBASE%%/share/icons -type d -depth 1 -exec %D/bin/gtk-update-icon-cache -q -f {} \; 2>/dev/null || /usr/bin/true +@unexec /usr/bin/find %%LOCALBASE%%/share/icons -type f -depth 2 -name icon-theme.cache -delete 2>/dev/null || /usr/bin/true @dirrm share/themes/Raleigh/gtk-2.0 @dirrm share/themes/Raleigh @dirrm share/themes/Emacs/gtk-2.0-key @@ -550,6 +591,8 @@ share/themes/Raleigh/gtk-2.0/gtkrc @dirrm share/themes/Default/gtk-2.0-key @dirrm share/gtk-2.0/demo @dirrm share/gtk-2.0 +@dirrm include/gtk-unix-print-2.0/gtk +@dirrm include/gtk-unix-print-2.0 @dirrm include/gtk-2.0/gtk @dirrm include/gtk-2.0/gdk-pixbuf-xlib @dirrm include/gtk-2.0/gdk-pixbuf @@ -560,41 +603,90 @@ share/themes/Raleigh/gtk-2.0/gtkrc @exec /bin/mkdir -p %D/lib/gtk-2.0/%%GTK_VERSION%%/engines @dirrmtry share/themes/Default @dirrmtry share/themes +@dirrmtry lib/gtk-2.0/modules +@dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/printbackends +@dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/loaders +@dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/immodules +@dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/engines +@dirrmtry lib/gtk-2.0/%%GTK_VERSION%% +@dirrmtry lib/gtk-2.0 +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN @dirrmtry share/locale/yi/LC_MESSAGES @dirrmtry share/locale/yi @dirrmtry share/locale/xh/LC_MESSAGES @dirrmtry share/locale/xh @dirrmtry share/locale/uz@Latn/LC_MESSAGES @dirrmtry share/locale/uz@Latn +@dirrmtry share/locale/uz/LC_MESSAGES +@dirrmtry share/locale/uz +@dirrmtry share/locale/ur/LC_MESSAGES +@dirrmtry share/locale/ur +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk +@dirrmtry share/locale/tt/LC_MESSAGES +@dirrmtry share/locale/tt +@dirrmtry share/locale/tk/LC_MESSAGES +@dirrmtry share/locale/tk @dirrmtry share/locale/te/LC_MESSAGES @dirrmtry share/locale/te @dirrmtry share/locale/sr@ije/LC_MESSAGES @dirrmtry share/locale/sr@ije +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/sr +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sl +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl @dirrmtry share/locale/nso/LC_MESSAGES @dirrmtry share/locale/nso +@dirrmtry share/locale/nn/LC_MESSAGES +@dirrmtry share/locale/nn +@dirrmtry share/locale/ne/LC_MESSAGES +@dirrmtry share/locale/ne @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr @dirrmtry share/locale/mi/LC_MESSAGES @dirrmtry share/locale/mi +@dirrmtry share/locale/li/LC_MESSAGES +@dirrmtry share/locale/li @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko @dirrmtry share/locale/ia/LC_MESSAGES @dirrmtry share/locale/ia @dirrmtry share/locale/hy/LC_MESSAGES @dirrmtry share/locale/hy +@dirrmtry share/locale/gl/LC_MESSAGES +@dirrmtry share/locale/gl +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz -@dirrmtry share/locale/br/LC_MESSAGES -@dirrmtry share/locale/br +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/be/LC_MESSAGES +@dirrmtry share/locale/be @dirrmtry share/locale/az_IR/LC_MESSAGES @dirrmtry share/locale/az_IR -@dirrmtry lib/gtk-2.0/modules -@dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/loaders -@dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/immodules -@dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/engines -@dirrmtry lib/gtk-2.0/%%GTK_VERSION%% -@dirrmtry lib/gtk-2.0 +@dirrmtry share/locale/ang/LC_MESSAGES +@dirrmtry share/locale/ang diff --git a/x11-toolkits/gtksourceview/Makefile b/x11-toolkits/gtksourceview/Makefile index f71d3f7c9db6..bdb27eb3d75b 100644 --- a/x11-toolkits/gtksourceview/Makefile +++ b/x11-toolkits/gtksourceview/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports/x11-toolkits/gtksourceview/Makefile,v 1.37 2006/04/13 07:52:42 bland Exp $ +# $MCom: ports/x11-toolkits/gtksourceview/Makefile,v 1.43 2006/10/02 00:40:29 ahze Exp $ # PORTNAME= gtksourceview -PORTVERSION= 1.6.2 +PORTVERSION= 1.8.1 PORTREVISION?= 0 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} @@ -22,10 +22,10 @@ USE_BZIP2= yes .if !defined(REFERENCE_PORT) USE_GETTEXT= yes -USE_X_PREFIX= yes +USE_XLIB= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_GNOME= gnomeprefix gnomehack libgnome libgnomeprintui intlhack \ ltverhack referencehack CONFIGURE_ARGS= --enable-compile-warnings=no diff --git a/x11-toolkits/gtksourceview/distinfo b/x11-toolkits/gtksourceview/distinfo index 24fd4193893b..67e49c2ff4fd 100644 --- a/x11-toolkits/gtksourceview/distinfo +++ b/x11-toolkits/gtksourceview/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gtksourceview-1.6.2.tar.bz2) = 57f4ee84f0c494fd943c7badb0a68785 -SHA256 (gnome2/gtksourceview-1.6.2.tar.bz2) = 9236de0b7471bfaefd0a9faf8f699c4e0cfaca0a835164bc64172ce85840e3d0 -SIZE (gnome2/gtksourceview-1.6.2.tar.bz2) = 756789 +MD5 (gnome2/gtksourceview-1.8.1.tar.bz2) = d2db4d84918fa0ca477f7684fa2f42a3 +SHA256 (gnome2/gtksourceview-1.8.1.tar.bz2) = e7c6b6bd842fad8163577ed21a8d940b42aa4bb27474d88829d15ddc9fd534e4 +SIZE (gnome2/gtksourceview-1.8.1.tar.bz2) = 771063 diff --git a/x11-toolkits/gtksourceview/pkg-plist b/x11-toolkits/gtksourceview/pkg-plist index 11bb3af26ff9..260599912788 100644 --- a/x11-toolkits/gtksourceview/pkg-plist +++ b/x11-toolkits/gtksourceview/pkg-plist @@ -17,11 +17,13 @@ lib/libgtksourceview-1.0.so.0 libdata/pkgconfig/gtksourceview-1.0.pc share/gnome/gtksourceview-1.0/language-specs/R.lang share/gnome/gtksourceview-1.0/language-specs/ada.lang +share/gnome/gtksourceview-1.0/language-specs/boo.lang share/gnome/gtksourceview-1.0/language-specs/c.lang share/gnome/gtksourceview-1.0/language-specs/changelog.lang share/gnome/gtksourceview-1.0/language-specs/cpp.lang share/gnome/gtksourceview-1.0/language-specs/csharp.lang share/gnome/gtksourceview-1.0/language-specs/css.lang +share/gnome/gtksourceview-1.0/language-specs/d.lang share/gnome/gtksourceview-1.0/language-specs/desktop.lang share/gnome/gtksourceview-1.0/language-specs/diff.lang share/gnome/gtksourceview-1.0/language-specs/fortran.lang @@ -89,13 +91,16 @@ share/locale/ja/LC_MESSAGES/gtksourceview-1.0.mo share/locale/ko/LC_MESSAGES/gtksourceview-1.0.mo share/locale/lt/LC_MESSAGES/gtksourceview-1.0.mo share/locale/lv/LC_MESSAGES/gtksourceview-1.0.mo +share/locale/mg/LC_MESSAGES/gtksourceview-1.0.mo share/locale/mk/LC_MESSAGES/gtksourceview-1.0.mo share/locale/ml/LC_MESSAGES/gtksourceview-1.0.mo share/locale/mn/LC_MESSAGES/gtksourceview-1.0.mo +share/locale/mr/LC_MESSAGES/gtksourceview-1.0.mo share/locale/ms/LC_MESSAGES/gtksourceview-1.0.mo share/locale/nb/LC_MESSAGES/gtksourceview-1.0.mo share/locale/ne/LC_MESSAGES/gtksourceview-1.0.mo share/locale/nl/LC_MESSAGES/gtksourceview-1.0.mo +share/locale/or/LC_MESSAGES/gtksourceview-1.0.mo share/locale/pa/LC_MESSAGES/gtksourceview-1.0.mo share/locale/pl/LC_MESSAGES/gtksourceview-1.0.mo share/locale/pt/LC_MESSAGES/gtksourceview-1.0.mo @@ -104,6 +109,7 @@ share/locale/ro/LC_MESSAGES/gtksourceview-1.0.mo share/locale/ru/LC_MESSAGES/gtksourceview-1.0.mo share/locale/rw/LC_MESSAGES/gtksourceview-1.0.mo share/locale/sk/LC_MESSAGES/gtksourceview-1.0.mo +share/locale/sl/LC_MESSAGES/gtksourceview-1.0.mo share/locale/sq/LC_MESSAGES/gtksourceview-1.0.mo share/locale/sr/LC_MESSAGES/gtksourceview-1.0.mo share/locale/sr@Latn/LC_MESSAGES/gtksourceview-1.0.mo @@ -117,17 +123,55 @@ share/locale/xh/LC_MESSAGES/gtksourceview-1.0.mo share/locale/zh_CN/LC_MESSAGES/gtksourceview-1.0.mo share/locale/zh_HK/LC_MESSAGES/gtksourceview-1.0.mo share/locale/zh_TW/LC_MESSAGES/gtksourceview-1.0.mo +@dirrm share/gnome/gtksourceview-1.0/language-specs +@dirrm share/gnome/gtksourceview-1.0 +@dirrm include/gtksourceview-1.0/gtksourceview +@dirrm include/gtksourceview-1.0 +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN @dirrmtry share/locale/xh/LC_MESSAGES @dirrmtry share/locale/xh +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/sr +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sl +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/ne/LC_MESSAGES +@dirrmtry share/locale/ne +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr +@dirrmtry share/locale/mg/LC_MESSAGES +@dirrmtry share/locale/mg +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko +@dirrmtry share/locale/gl/LC_MESSAGES +@dirrmtry share/locale/gl +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN -@dirrm share/gnome/gtksourceview-1.0/language-specs -@dirrm share/gnome/gtksourceview-1.0 -@dirrm include/gtksourceview-1.0/gtksourceview -@dirrm include/gtksourceview-1.0 +@dirrmtry share/locale/be/LC_MESSAGES +@dirrmtry share/locale/be diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile index 4f4b184f2700..0b0c4c7d507f 100644 --- a/x11-toolkits/libbonoboui/Makefile +++ b/x11-toolkits/libbonoboui/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports/x11-toolkits/libbonoboui/Makefile,v 1.43 2006/04/13 07:52:43 bland Exp $ +# $MCom: ports/x11-toolkits/libbonoboui/Makefile,v 1.48 2006/09/04 18:33:07 marcus Exp $ # PORTNAME= libbonoboui -PORTVERSION= 2.14.0 -PORTREVISION?= 1 +PORTVERSION= 2.16.0 +PORTREVISION?= 0 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -22,12 +22,12 @@ USE_BZIP2= yes .if !defined(REFERENCE_PORT) USE_GETTEXT= yes -USE_X_PREFIX= yes +USE_XLIB= yes USE_GMAKE= yes GNU_CONFIGURE= yes USE_GNOME= gnomeprefix gnomehack gnomehier intlhack \ libgnomecanvas libgnome referencehack -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" diff --git a/x11-toolkits/libbonoboui/distinfo b/x11-toolkits/libbonoboui/distinfo index 4a703b65ca1c..0997a7c6df4c 100644 --- a/x11-toolkits/libbonoboui/distinfo +++ b/x11-toolkits/libbonoboui/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome/libbonoboui-2.14.0.tar.bz2) = dc26dc17cddc625cac37ecfab263a51a -SHA256 (gnome/libbonoboui-2.14.0.tar.bz2) = 2dd02787e5bad91e1efbfe2fe041eefe8cf13ebce9607d6dd9764c69f37233a8 -SIZE (gnome/libbonoboui-2.14.0.tar.bz2) = 893139 +MD5 (gnome/libbonoboui-2.16.0.tar.bz2) = 603ffc92491ef27ccfbc2b69abd3906b +SHA256 (gnome/libbonoboui-2.16.0.tar.bz2) = 47346162245f79291b7755f82492d75a18f56e07a51b89f1014b83e796ba0ac1 +SIZE (gnome/libbonoboui-2.16.0.tar.bz2) = 937950 diff --git a/x11-toolkits/libbonoboui/files/patch-tools::browser::oaf-helper.c b/x11-toolkits/libbonoboui/files/patch-tools::browser::oaf-helper.c deleted file mode 100644 index 8b187fb40e00..000000000000 --- a/x11-toolkits/libbonoboui/files/patch-tools::browser::oaf-helper.c +++ /dev/null @@ -1,16 +0,0 @@ ---- tools/browser/oaf-helper.c.orig Sun Feb 6 03:04:39 2005 -+++ tools/browser/oaf-helper.c Sun Feb 6 03:06:17 2005 -@@ -58,10 +58,12 @@ - gchar **search; - - lang = getenv ("LANG"); -+ if (!lang) -+ return g_strdup (""); - - search = g_strsplit (lang, "_", 1); - if (!search) -- return ""; -+ return g_strdup (""); - - ret = g_strdup_printf ("%s", search[0]); - diff --git a/x11-toolkits/libbonoboui/pkg-plist b/x11-toolkits/libbonoboui/pkg-plist index 15174fc36410..f1bdbbeda992 100644 --- a/x11-toolkits/libbonoboui/pkg-plist +++ b/x11-toolkits/libbonoboui/pkg-plist @@ -54,6 +54,7 @@ share/locale/az/LC_MESSAGES/libbonoboui-2.0.mo 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/bs/LC_MESSAGES/libbonoboui-2.0.mo share/locale/ca/LC_MESSAGES/libbonoboui-2.0.mo share/locale/cs/LC_MESSAGES/libbonoboui-2.0.mo @@ -80,6 +81,7 @@ share/locale/id/LC_MESSAGES/libbonoboui-2.0.mo share/locale/is/LC_MESSAGES/libbonoboui-2.0.mo share/locale/it/LC_MESSAGES/libbonoboui-2.0.mo share/locale/ja/LC_MESSAGES/libbonoboui-2.0.mo +share/locale/ka/LC_MESSAGES/libbonoboui-2.0.mo share/locale/kn/LC_MESSAGES/libbonoboui-2.0.mo share/locale/ko/LC_MESSAGES/libbonoboui-2.0.mo share/locale/ku/LC_MESSAGES/libbonoboui-2.0.mo @@ -95,7 +97,6 @@ share/locale/nb/LC_MESSAGES/libbonoboui-2.0.mo share/locale/ne/LC_MESSAGES/libbonoboui-2.0.mo share/locale/nl/LC_MESSAGES/libbonoboui-2.0.mo share/locale/nn/LC_MESSAGES/libbonoboui-2.0.mo -share/locale/no/LC_MESSAGES/libbonoboui-2.0.mo share/locale/nso/LC_MESSAGES/libbonoboui-2.0.mo share/locale/or/LC_MESSAGES/libbonoboui-2.0.mo share/locale/pa/LC_MESSAGES/libbonoboui-2.0.mo @@ -123,11 +124,65 @@ share/locale/zh_CN/LC_MESSAGES/libbonoboui-2.0.mo share/locale/zh_HK/LC_MESSAGES/libbonoboui-2.0.mo share/locale/zh_TW/LC_MESSAGES/libbonoboui-2.0.mo share/locale/zu/LC_MESSAGES/libbonoboui-2.0.mo -@dirrmtry share/locale/zu/LC_MESSAGES -@dirrmtry share/locale/zu -@dirrmtry share/locale/zh_HK/LC_MESSAGES -@dirrmtry share/locale/zh_HK @dirrm lib/bonobo-2.0/samples @dirrm lib/bonobo-2.0 @dirrm include/libbonoboui-2.0/bonobo @dirrm include/libbonoboui-2.0 +@dirrmtry share/locale/zu/LC_MESSAGES +@dirrmtry share/locale/zu +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/yi/LC_MESSAGES +@dirrmtry share/locale/yi +@dirrmtry share/locale/xh/LC_MESSAGES +@dirrmtry share/locale/xh +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk +@dirrmtry share/locale/sr@ije/LC_MESSAGES +@dirrmtry share/locale/sr@ije +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/sr +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sl +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/nso/LC_MESSAGES +@dirrmtry share/locale/nso +@dirrmtry share/locale/nn/LC_MESSAGES +@dirrmtry share/locale/nn +@dirrmtry share/locale/ne/LC_MESSAGES +@dirrmtry share/locale/ne +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr +@dirrmtry share/locale/li/LC_MESSAGES +@dirrmtry share/locale/li +@dirrmtry share/locale/ku/LC_MESSAGES +@dirrmtry share/locale/ku +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko +@dirrmtry share/locale/gl/LC_MESSAGES +@dirrmtry share/locale/gl +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/be/LC_MESSAGES +@dirrmtry share/locale/be diff --git a/x11-toolkits/libgail-gnome/Makefile b/x11-toolkits/libgail-gnome/Makefile index 5cd93b1a4161..d2351dba1fd7 100644 --- a/x11-toolkits/libgail-gnome/Makefile +++ b/x11-toolkits/libgail-gnome/Makefile @@ -3,11 +3,12 @@ # Whom: Maxim Sobolev # # $FreeBSD$ +# $MCom: ports/x11-toolkits/libgail-gnome/Makefile,v 1.16 2006/09/10 00:51:17 mezz Exp $ # PORTNAME= libgail-gnome PORTVERSION= 1.1.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.1 @@ -18,8 +19,8 @@ COMMENT= An implementation of the ATK interfaces for GNOME widgets USE_BZIP2= yes USE_GMAKE= yes -USE_X_PREFIX= yes -INSTALLS_SHLIB= yes +USE_XLIB= yes +USE_LDCONFIG= yes GNU_CONFIGURE= yes GNOME_DESKTOP_VERSION=2 USE_GNOME= gnomeprefix gnomehack gnomepanel atspi diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile index c0cc666ec840..61a1ee9d4b0c 100644 --- a/x11-toolkits/libgnomeprintui/Makefile +++ b/x11-toolkits/libgnomeprintui/Makefile @@ -3,12 +3,12 @@ # Whom: Maxim Sobolev # # $FreeBSD$ -# $MCom: ports/x11-toolkits/libgnomeprintui/Makefile,v 1.53 2005/09/26 21:14:32 marcus Exp $ +# $MCom: ports/x11-toolkits/libgnomeprintui/Makefile,v 1.58 2006/10/10 20:22:27 mezz Exp $ # PORTNAME= libgnomeprintui PORTVERSION= 2.12.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12 @@ -17,17 +17,17 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Gnome print support library -BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme -RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme +BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme +RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme USE_BZIP2= yes -USE_X_PREFIX= yes +USE_XLIB= yes USE_XPM= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack libgnomeprint libgnomecanvas \ intlhack ltverhack USE_GETTEXT= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 USE_BISON= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/x11-toolkits/libgnomeprintui/pkg-plist b/x11-toolkits/libgnomeprintui/pkg-plist index 7363dec5e82b..5233820cabef 100644 --- a/x11-toolkits/libgnomeprintui/pkg-plist +++ b/x11-toolkits/libgnomeprintui/pkg-plist @@ -87,3 +87,49 @@ share/locale/zh_TW/LC_MESSAGES/libgnomeprintui-2.2.mo @dirrm share/gnome/libgnomeprintui @dirrm include/libgnomeprintui-2.2/libgnomeprintui @dirrm include/libgnomeprintui-2.2 +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/xh/LC_MESSAGES +@dirrmtry share/locale/xh +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk +@dirrmtry share/locale/te/LC_MESSAGES +@dirrmtry share/locale/te +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/sr +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sl +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/no/LC_MESSAGES +@dirrmtry share/locale/no +@dirrmtry share/locale/nn/LC_MESSAGES +@dirrmtry share/locale/nn +@dirrmtry share/locale/ne/LC_MESSAGES +@dirrmtry share/locale/ne +@dirrmtry share/locale/li/LC_MESSAGES +@dirrmtry share/locale/li +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko +@dirrmtry share/locale/gl/LC_MESSAGES +@dirrmtry share/locale/gl +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca +@dirrmtry share/locale/be/LC_MESSAGES +@dirrmtry share/locale/be diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile index acea669aae0f..4501201b953c 100644 --- a/x11-toolkits/libgnomeui/Makefile +++ b/x11-toolkits/libgnomeui/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports/x11-toolkits/libgnomeui/Makefile,v 1.79 2006/04/13 07:52:43 bland Exp $ +# $MCom: ports/x11-toolkits/libgnomeui/Makefile,v 1.91 2006/10/05 17:59:48 mezz Exp $ +# PORTNAME= libgnomeui -PORTVERSION= 2.14.1 -PORTREVISION?= 1 +PORTVERSION= 2.16.1 +PORTREVISION?= 0 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -22,14 +23,15 @@ USE_BZIP2= yes LIB_DEPENDS+= gnome-keyring.0:${PORTSDIR}/security/gnome-keyring \ startup-notification-1.0:${PORTSDIR}/x11/startup-notification -RUN_DEPENDS= ${X11BASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme +RUN_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme USE_GETTEXT= yes -USE_X_PREFIX= yes +USE_XLIB= yes USE_XPM= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack gnomehier libbonoboui ltverhack referencehack -INSTALLS_SHLIB= yes +USE_GNOME= gnomeprefix gnomehack gnomehier libbonoboui ltverhack \ + referencehack +USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 USE_BISON= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/x11-toolkits/libgnomeui/distinfo b/x11-toolkits/libgnomeui/distinfo index 406ea091cd0a..9acf13907b15 100644 --- a/x11-toolkits/libgnomeui/distinfo +++ b/x11-toolkits/libgnomeui/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgnomeui-2.14.1.tar.bz2) = ff6b6c25de0e7e39c79998621cdec048 -SHA256 (gnome2/libgnomeui-2.14.1.tar.bz2) = e1029ed0c69d7e1259c48d9ff1afdd87505182e0a1ef28ef3b48592a3a3c1c88 -SIZE (gnome2/libgnomeui-2.14.1.tar.bz2) = 1891798 +MD5 (gnome2/libgnomeui-2.16.1.tar.bz2) = d9b975952bf5feee8818d3fb18cca0b3 +SHA256 (gnome2/libgnomeui-2.16.1.tar.bz2) = 552c34d20f30847429e342e6c6ddeece707b69a5abe9aeeafcfeb65cec2eebd7 +SIZE (gnome2/libgnomeui-2.16.1.tar.bz2) = 1482097 diff --git a/x11-toolkits/libgnomeui/pkg-plist b/x11-toolkits/libgnomeui/pkg-plist index 9b564b12be44..d4ae531e03f8 100644 --- a/x11-toolkits/libgnomeui/pkg-plist +++ b/x11-toolkits/libgnomeui/pkg-plist @@ -62,11 +62,6 @@ lib/libgnomeui-2.so.0 libdata/pkgconfig/libgnomeui-2.0.pc libexec/gnome_segv2 share/gnome/pixmaps/gnome-about-logo.png -share/gnome/pixmaps/gnome-default-dlg.png -share/gnome/pixmaps/gnome-error.png -share/gnome/pixmaps/gnome-info.png -share/gnome/pixmaps/gnome-question.png -share/gnome/pixmaps/gnome-warning.png share/locale/af/LC_MESSAGES/libgnomeui-2.0.mo share/locale/am/LC_MESSAGES/libgnomeui-2.0.mo share/locale/ar/LC_MESSAGES/libgnomeui-2.0.mo @@ -74,6 +69,7 @@ share/locale/az/LC_MESSAGES/libgnomeui-2.0.mo share/locale/be/LC_MESSAGES/libgnomeui-2.0.mo share/locale/bg/LC_MESSAGES/libgnomeui-2.0.mo share/locale/bn/LC_MESSAGES/libgnomeui-2.0.mo +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 @@ -81,7 +77,6 @@ share/locale/cs/LC_MESSAGES/libgnomeui-2.0.mo share/locale/cy/LC_MESSAGES/libgnomeui-2.0.mo share/locale/da/LC_MESSAGES/libgnomeui-2.0.mo share/locale/de/LC_MESSAGES/libgnomeui-2.0.mo -share/locale/dz/LC_MESSAGES/libgnomeui-2.0.mo share/locale/el/LC_MESSAGES/libgnomeui-2.0.mo share/locale/en_CA/LC_MESSAGES/libgnomeui-2.0.mo share/locale/en_GB/LC_MESSAGES/libgnomeui-2.0.mo @@ -110,6 +105,7 @@ share/locale/ku/LC_MESSAGES/libgnomeui-2.0.mo share/locale/li/LC_MESSAGES/libgnomeui-2.0.mo share/locale/lt/LC_MESSAGES/libgnomeui-2.0.mo share/locale/lv/LC_MESSAGES/libgnomeui-2.0.mo +share/locale/mg/LC_MESSAGES/libgnomeui-2.0.mo share/locale/mi/LC_MESSAGES/libgnomeui-2.0.mo share/locale/mk/LC_MESSAGES/libgnomeui-2.0.mo share/locale/ml/LC_MESSAGES/libgnomeui-2.0.mo @@ -120,8 +116,8 @@ share/locale/nb/LC_MESSAGES/libgnomeui-2.0.mo share/locale/ne/LC_MESSAGES/libgnomeui-2.0.mo share/locale/nl/LC_MESSAGES/libgnomeui-2.0.mo share/locale/nn/LC_MESSAGES/libgnomeui-2.0.mo -share/locale/no/LC_MESSAGES/libgnomeui-2.0.mo share/locale/nso/LC_MESSAGES/libgnomeui-2.0.mo +share/locale/or/LC_MESSAGES/libgnomeui-2.0.mo share/locale/pa/LC_MESSAGES/libgnomeui-2.0.mo share/locale/pl/LC_MESSAGES/libgnomeui-2.0.mo share/locale/pt/LC_MESSAGES/libgnomeui-2.0.mo @@ -151,16 +147,74 @@ share/locale/zh_CN/LC_MESSAGES/libgnomeui-2.0.mo share/locale/zh_HK/LC_MESSAGES/libgnomeui-2.0.mo share/locale/zh_TW/LC_MESSAGES/libgnomeui-2.0.mo share/locale/zu/LC_MESSAGES/libgnomeui-2.0.mo +@dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%/filesystems +@dirrm include/libgnomeui-2.0/libgnomeui +@dirrm include/libgnomeui-2.0 +@dirrmtry share/locale/zu/LC_MESSAGES +@dirrmtry share/locale/zu +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/yi/LC_MESSAGES +@dirrmtry share/locale/yi +@dirrmtry share/locale/xh/LC_MESSAGES +@dirrmtry share/locale/xh +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk @dirrmtry share/locale/tt/LC_MESSAGES @dirrmtry share/locale/tt +@dirrmtry share/locale/tk/LC_MESSAGES +@dirrmtry share/locale/tk @dirrmtry share/locale/te/LC_MESSAGES @dirrmtry share/locale/te +@dirrmtry share/locale/sr@ije/LC_MESSAGES +@dirrmtry share/locale/sr@ije +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/sr +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sl +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/nso/LC_MESSAGES +@dirrmtry share/locale/nso +@dirrmtry share/locale/nn/LC_MESSAGES +@dirrmtry share/locale/nn +@dirrmtry share/locale/ne/LC_MESSAGES +@dirrmtry share/locale/ne +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr +@dirrmtry share/locale/mi/LC_MESSAGES +@dirrmtry share/locale/mi +@dirrmtry share/locale/mg/LC_MESSAGES +@dirrmtry share/locale/mg +@dirrmtry share/locale/li/LC_MESSAGES +@dirrmtry share/locale/li @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku -@dirrmtry share/locale/dz/LC_MESSAGES -@dirrmtry share/locale/dz -@dirrm lib/gtk-2.0/%%GTK2_VERSION%%/filesystems -@dirrm include/libgnomeui-2.0/libgnomeui -@dirrm include/libgnomeui-2.0 +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko +@dirrmtry share/locale/gl/LC_MESSAGES +@dirrmtry share/locale/gl +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/be/LC_MESSAGES +@dirrmtry share/locale/be diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile index 32470ff95642..4f51ac165648 100644 --- a/x11-toolkits/libwnck/Makefile +++ b/x11-toolkits/libwnck/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports/x11-toolkits/libwnck/Makefile,v 1.70 2006/04/13 07:52:43 bland Exp $ +# $MCom: ports/x11-toolkits/libwnck/Makefile,v 1.81 2006/10/03 01:48:04 ahze Exp $ # PORTNAME= libwnck -PORTVERSION= 2.14.3 +PORTVERSION= 2.16.1 PORTREVISION?= 0 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} @@ -27,8 +27,7 @@ USE_GETTEXT= yes USE_GMAKE= yes USE_GNOME= gnomehack gtk20 ltverhack referencehack USE_BISON= yes -USE_X_PREFIX= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/x11-toolkits/libwnck/distinfo b/x11-toolkits/libwnck/distinfo index 075263631c9b..d71586fcb4e3 100644 --- a/x11-toolkits/libwnck/distinfo +++ b/x11-toolkits/libwnck/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libwnck-2.14.3.tar.bz2) = 5796c0c26c5dfbad6d4fdf77858feae6 -SHA256 (gnome2/libwnck-2.14.3.tar.bz2) = b83ae20e45265465f237fd6d261f6baf61079df3220f01342f6d8d223027f415 -SIZE (gnome2/libwnck-2.14.3.tar.bz2) = 460773 +MD5 (gnome2/libwnck-2.16.1.tar.bz2) = 3b9d6d58ba8552bb354f87af23a058a8 +SHA256 (gnome2/libwnck-2.16.1.tar.bz2) = e3081b2b44ba780f6e1bf507bb39aea9aee56cdabf1784312aa057bccff626cb +SIZE (gnome2/libwnck-2.16.1.tar.bz2) = 466473 diff --git a/x11-toolkits/libwnck/pkg-plist b/x11-toolkits/libwnck/pkg-plist index 2171713fba1a..8c94310c4b38 100644 --- a/x11-toolkits/libwnck/pkg-plist +++ b/x11-toolkits/libwnck/pkg-plist @@ -21,12 +21,14 @@ share/locale/az/LC_MESSAGES/libwnck.mo share/locale/be/LC_MESSAGES/libwnck.mo share/locale/bg/LC_MESSAGES/libwnck.mo share/locale/bn/LC_MESSAGES/libwnck.mo +share/locale/bn_IN/LC_MESSAGES/libwnck.mo share/locale/bs/LC_MESSAGES/libwnck.mo share/locale/ca/LC_MESSAGES/libwnck.mo share/locale/cs/LC_MESSAGES/libwnck.mo share/locale/cy/LC_MESSAGES/libwnck.mo share/locale/da/LC_MESSAGES/libwnck.mo share/locale/de/LC_MESSAGES/libwnck.mo +share/locale/dz/LC_MESSAGES/libwnck.mo share/locale/el/LC_MESSAGES/libwnck.mo share/locale/en_CA/LC_MESSAGES/libwnck.mo share/locale/en_GB/LC_MESSAGES/libwnck.mo @@ -81,6 +83,7 @@ share/locale/sr/LC_MESSAGES/libwnck.mo share/locale/sr@Latn/LC_MESSAGES/libwnck.mo share/locale/sv/LC_MESSAGES/libwnck.mo share/locale/ta/LC_MESSAGES/libwnck.mo +share/locale/te/LC_MESSAGES/libwnck.mo share/locale/th/LC_MESSAGES/libwnck.mo share/locale/tr/LC_MESSAGES/libwnck.mo share/locale/uk/LC_MESSAGES/libwnck.mo @@ -90,9 +93,63 @@ share/locale/xh/LC_MESSAGES/libwnck.mo share/locale/zh_CN/LC_MESSAGES/libwnck.mo share/locale/zh_HK/LC_MESSAGES/libwnck.mo share/locale/zh_TW/LC_MESSAGES/libwnck.mo +@dirrm include/libwnck-1.0/libwnck +@dirrm include/libwnck-1.0 +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/xh/LC_MESSAGES +@dirrmtry share/locale/xh +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk +@dirrmtry share/locale/te/LC_MESSAGES +@dirrmtry share/locale/te +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/sr +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sl +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/nn/LC_MESSAGES +@dirrmtry share/locale/nn +@dirrmtry share/locale/ne/LC_MESSAGES +@dirrmtry share/locale/ne +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr +@dirrmtry share/locale/mi/LC_MESSAGES +@dirrmtry share/locale/mi +@dirrmtry share/locale/li/LC_MESSAGES +@dirrmtry share/locale/li @dirrmtry share/locale/ky/LC_MESSAGES @dirrmtry share/locale/ky -@dirrm include/libwnck-1.0/libwnck -@dirrm include/libwnck-1.0 +@dirrmtry share/locale/ku/LC_MESSAGES +@dirrmtry share/locale/ku +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko +@dirrmtry share/locale/gl/LC_MESSAGES +@dirrmtry share/locale/gl +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/dz/LC_MESSAGES +@dirrmtry share/locale/dz +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/be/LC_MESSAGES +@dirrmtry share/locale/be diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile index 9c8a7171010a..1d4d080cb137 100644 --- a/x11-toolkits/pango/Makefile +++ b/x11-toolkits/pango/Makefile @@ -3,15 +3,15 @@ # Whom: Maxim Sobolev # # $FreeBSD$ -# $MCom: ports/x11-toolkits/pango/Makefile,v 1.60 2006/04/27 11:12:49 ahze Exp $ +# $MCom: ports/x11-toolkits/pango/Makefile,v 1.84 2006/10/13 19:09:37 marcus Exp $ # PORTNAME= pango -PORTVERSION= 1.12.4 +PORTVERSION= 1.14.7 PORTREVISION?= 0 CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/pango/1.12,} \ - ftp://ftp.gtk.org/pub/gtk/v2.10/ +MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/pango/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \ + ftp://ftp.gtk.org/pub/pango/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -28,8 +28,7 @@ RUN_DEPENDS= ${FONTSCALE}:${X_FONTS_TTF_PORT} \ USE_GETTEXT= yes USE_GMAKE= yes -PREFIX?= ${X11BASE} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 USE_GNOME= gnomehack glib20 ltverhack referencehack CONFIGURE_ARGS= --with-qt=no \ @@ -64,14 +63,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \ PLIST_SUB+= X11="" .endif -.include - -.if ${X_WINDOW_SYSTEM:L} == xfree86-3 -MTREE_FILE= /etc/mtree/BSD.x11.dist -.else -MTREE_FILE= /etc/mtree/BSD.x11-4.dist -.endif - post-install: @${SED} -e 's|%%X11BASE%%|${X11BASE}|' < ${FILESDIR}/pkg-install.in \ > ${PKGINSTALL} @@ -79,6 +70,6 @@ post-install: @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif -.include +.include .endif diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo index a34d43b1747a..364514f32fb4 100644 --- a/x11-toolkits/pango/distinfo +++ b/x11-toolkits/pango/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/pango-1.12.4.tar.bz2) = 8f6749fe961e41dbeed72d1efcd55224 -SHA256 (gnome2/pango-1.12.4.tar.bz2) = 3d0ed04055fd8aa8e6522cd0471a8224e18e87939a26ff81593d56d4e8cd8530 -SIZE (gnome2/pango-1.12.4.tar.bz2) = 1261128 +MD5 (gnome2/pango-1.14.7.tar.bz2) = ae2e7d06917e745e3d249df4aabc42c1 +SHA256 (gnome2/pango-1.14.7.tar.bz2) = 1020cfc8907f29c293dc93c86692863eeaeffa63637137c50a11a40f8bd22b22 +SIZE (gnome2/pango-1.14.7.tar.bz2) = 1288583 diff --git a/x11-toolkits/pango/files/patch-ac b/x11-toolkits/pango/files/patch-ac deleted file mode 100644 index 63e2e8673d18..000000000000 --- a/x11-toolkits/pango/files/patch-ac +++ /dev/null @@ -1,16 +0,0 @@ - -$FreeBSD$ - $MCom: ports/x11-toolkits/pango/files/patch-ac,v 1.18 2006/03/13 05:45:48 mezz Exp $ - ---- Makefile.in.orig Mon Aug 2 19:12:56 2004 -+++ Makefile.in Mon Aug 2 19:13:11 2004 -@@ -234,7 +234,7 @@ - - AUTOMAKE_OPTIONS = 1.7 - --SUBDIRS = pango modules examples docs tools tests -+SUBDIRS = pango modules examples docs tools - - EXTRA_DIST = \ - pango.pc.in \ - diff --git a/x11-toolkits/pango/pkg-plist b/x11-toolkits/pango/pkg-plist index f9f30475438f..ca740efa7df4 100644 --- a/x11-toolkits/pango/pkg-plist +++ b/x11-toolkits/pango/pkg-plist @@ -54,6 +54,9 @@ lib/libpangoft2-1.0.so.0 lib/pango/%%VERSION%%/modules/pango-arabic-fc.a lib/pango/%%VERSION%%/modules/pango-arabic-fc.la lib/pango/%%VERSION%%/modules/pango-arabic-fc.so +lib/pango/%%VERSION%%/modules/pango-arabic-lang.a +lib/pango/%%VERSION%%/modules/pango-arabic-lang.la +lib/pango/%%VERSION%%/modules/pango-arabic-lang.so lib/pango/%%VERSION%%/modules/pango-basic-fc.a lib/pango/%%VERSION%%/modules/pango-basic-fc.la lib/pango/%%VERSION%%/modules/pango-basic-fc.so @@ -69,6 +72,9 @@ lib/pango/%%VERSION%%/modules/pango-hebrew-fc.so lib/pango/%%VERSION%%/modules/pango-indic-fc.a lib/pango/%%VERSION%%/modules/pango-indic-fc.la lib/pango/%%VERSION%%/modules/pango-indic-fc.so +lib/pango/%%VERSION%%/modules/pango-indic-lang.a +lib/pango/%%VERSION%%/modules/pango-indic-lang.la +lib/pango/%%VERSION%%/modules/pango-indic-lang.so lib/pango/%%VERSION%%/modules/pango-khmer-fc.a lib/pango/%%VERSION%%/modules/pango-khmer-fc.la lib/pango/%%VERSION%%/modules/pango-khmer-fc.so diff --git a/x11-toolkits/py-gnome-desktop/Makefile b/x11-toolkits/py-gnome-desktop/Makefile index b9fb33d21767..9d0178dfad32 100644 --- a/x11-toolkits/py-gnome-desktop/Makefile +++ b/x11-toolkits/py-gnome-desktop/Makefile @@ -3,14 +3,14 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports/x11-toolkits/py-gnome-desktop/Makefile,v 1.39 2006/03/12 23:43:07 marcus Exp $ +# $MCom: ports/x11-toolkits/py-gnome-desktop/Makefile,v 1.50 2006/09/05 01:09:07 ahze Exp $ # PORTNAME= gnome -PORTVERSION= 2.14.0 +PORTVERSION= 2.16.0 CATEGORIES= x11-toolkits python gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-python-desktop/${PORTVERSION:C/..$//} +MASTER_SITE_SUBDIR= sources/gnome-python-desktop/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} PKGNAMESUFFIX= -desktop DISTNAME= gnome-python-desktop-${PORTVERSION} @@ -20,20 +20,21 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= A set of Python bindings used by modules in the GNOME Desktop LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop \ - totem-plparser.2:${PORTSDIR}/multimedia/totem-gstreamer \ - gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media + totem-plparser.1:${PORTSDIR}/multimedia/totem-gstreamer \ + gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media \ + gnome-keyring:${PORTSDIR}/security/gnome-keyring USE_BZIP2= yes USE_GMAKE= yes USE_PYTHON= yes -USE_GNOME= gnomehack libgnomeprintui gnomepanel \ +USE_GNOME= gnomehack libgnomeprintui gnomepanel gnomedesktop \ gtksourceview libwnck nautiluscdburner pygnome2 metacity GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" EG_SRC_DIR= ${WRKSRC}/examples -EXAMPLESDIR= ${PREFIX}/share/examples/py-gnome +EG_DST_DIR= ${PREFIX}/share/examples/py-gnome .if !defined(NOPORTDOCS) DOCSDIR= ${PREFIX}/share/doc/py-gnome-desktop .else @@ -48,9 +49,9 @@ post-patch: .if !defined(NOPORTDOCS) post-install: - ${MKDIR} ${EXAMPLESDIR} - ${TAR} -C ${EG_SRC_DIR} -cf - . | ${TAR} -C ${EXAMPLESDIR} -xf - - ${CHOWN} -R ${BINOWN}:${BINGRP} ${EXAMPLESDIR} + ${MKDIR} ${EG_DST_DIR} + ${TAR} -C ${EG_SRC_DIR} -cf - . | ${TAR} -C ${EG_DST_DIR} -xf - + ${CHOWN} -R ${BINOWN}:${BINGRP} ${EG_DST_DIR} .endif .include diff --git a/x11-toolkits/py-gnome-desktop/distinfo b/x11-toolkits/py-gnome-desktop/distinfo index 85e7ee9263a1..5bfd6963337b 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.14.0.tar.bz2) = d3f9c2d213b7d486ca7bd87dd106ca69 -SHA256 (gnome2/gnome-python-desktop-2.14.0.tar.bz2) = 1e617686fc7b84a4b2779cdfe3987a592f40bd24f3f5e252fd559ca41452dde1 -SIZE (gnome2/gnome-python-desktop-2.14.0.tar.bz2) = 403302 +MD5 (gnome2/gnome-python-desktop-2.16.0.tar.bz2) = ea79fe3e6a65d8380539a9ef6eed963f +SHA256 (gnome2/gnome-python-desktop-2.16.0.tar.bz2) = 8b2a628e9f4a4827aa51456ab5cdf8839a9fe2522c5cd129aa9b50a712410610 +SIZE (gnome2/gnome-python-desktop-2.16.0.tar.bz2) = 429108 diff --git a/x11-toolkits/py-gnome-desktop/pkg-plist b/x11-toolkits/py-gnome-desktop/pkg-plist index ec4714de22b4..e7200549d7ea 100644 --- a/x11-toolkits/py-gnome-desktop/pkg-plist +++ b/x11-toolkits/py-gnome-desktop/pkg-plist @@ -3,6 +3,13 @@ %%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/applet.pyo %%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeapplet.la %%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeapplet.so +%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomedesktop/__init__.py +%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomedesktop/__init__.pyc +%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomedesktop/__init__.pyo +%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomedesktop/_gnomedesktop.la +%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomedesktop/_gnomedesktop.so +%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomekeyring.la +%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomekeyring.so %%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/__init__.py %%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/__init__.pyc %%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/__init__.pyo @@ -20,6 +27,8 @@ %%PYTHON_SITELIBDIR%%/gtk-2.0/metacity.so %%PYTHON_SITELIBDIR%%/gtk-2.0/nautilusburn.la %%PYTHON_SITELIBDIR%%/gtk-2.0/nautilusburn.so +%%PYTHON_SITELIBDIR%%/gtk-2.0/rsvg.la +%%PYTHON_SITELIBDIR%%/gtk-2.0/rsvg.so %%PYTHON_SITELIBDIR%%/gtk-2.0/totem/__init__.py %%PYTHON_SITELIBDIR%%/gtk-2.0/totem/__init__.pyc %%PYTHON_SITELIBDIR%%/gtk-2.0/totem/__init__.pyo @@ -63,46 +72,51 @@ libdata/pkgconfig/gnome-python-desktop-2.0.pc %%DOCSDIR%%/pygtksourceview/index.html %%DOCSDIR%%/pygtksourceview/index.sgml %%DOCSDIR%%/pygtksourceview/pygtksourceview.devhelp -%%EXAMPLESDIR%%/applet/GNOME_PythonAppletSample.server -%%EXAMPLESDIR%%/applet/README -%%EXAMPLESDIR%%/applet/applet.py -%%EXAMPLESDIR%%/gnomeprint/README -%%EXAMPLESDIR%%/gnomeprint/example_01.py -%%EXAMPLESDIR%%/gnomeprint/example_02.py -%%EXAMPLESDIR%%/gnomeprint/example_03.py -%%EXAMPLESDIR%%/gnomeprint/example_04.py -%%EXAMPLESDIR%%/gnomeprint/example_05.py -%%EXAMPLESDIR%%/gnomeprint/example_06.py -%%EXAMPLESDIR%%/gnomeprint/example_08.py -%%EXAMPLESDIR%%/gnomeprint/example_09.py -%%EXAMPLESDIR%%/gnomeprint/example_10.glade -%%EXAMPLESDIR%%/gnomeprint/example_10.py -%%EXAMPLESDIR%%/gnomeprint/example_11.py -%%EXAMPLESDIR%%/gnomeprint/sample-image.png -%%EXAMPLESDIR%%/gnomeprint/test-print.py -%%EXAMPLESDIR%%/gtksourceview/test-widget.py -%%EXAMPLESDIR%%/mediaprofiles/profiles.py -%%EXAMPLESDIR%%/nautilusburn/blank_disc.py -%%EXAMPLESDIR%%/nautilusburn/drive_selection.py -%%EXAMPLESDIR%%/nautilusburn/write_iso.py +share/examples/py-gnome/applet/GNOME_PythonAppletSample.server +share/examples/py-gnome/applet/README +share/examples/py-gnome/applet/applet.py +share/examples/py-gnome/gnomeprint/README +share/examples/py-gnome/gnomeprint/example_01.py +share/examples/py-gnome/gnomeprint/example_02.py +share/examples/py-gnome/gnomeprint/example_03.py +share/examples/py-gnome/gnomeprint/example_04.py +share/examples/py-gnome/gnomeprint/example_05.py +share/examples/py-gnome/gnomeprint/example_06.py +share/examples/py-gnome/gnomeprint/example_08.py +share/examples/py-gnome/gnomeprint/example_09.py +share/examples/py-gnome/gnomeprint/example_10.glade +share/examples/py-gnome/gnomeprint/example_10.py +share/examples/py-gnome/gnomeprint/example_11.py +share/examples/py-gnome/gnomeprint/sample-image.png +share/examples/py-gnome/gnomeprint/test-print.py +share/examples/py-gnome/gtksourceview/test-widget.py +share/examples/py-gnome/keyring.py +share/examples/py-gnome/mediaprofiles/profiles.py +share/examples/py-gnome/nautilusburn/blank_disc.py +share/examples/py-gnome/nautilusburn/drive_selection.py +share/examples/py-gnome/nautilusburn/write_iso.py +share/examples/py-gnome/rsvg/rsvg-cairo.py +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/gnomekeyring.defs share/pygtk/2.0/defs/gtksourceview.defs share/pygtk/2.0/defs/mediaprofiles.defs share/pygtk/2.0/defs/metacity.defs share/pygtk/2.0/defs/nautilus_burn.defs -share/pygtk/2.0/defs/nb_drive_selection.defs share/pygtk/2.0/defs/print.defs share/pygtk/2.0/defs/printui.defs share/pygtk/2.0/defs/wnck.defs -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/nautilusburn -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/mediaprofiles -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/gtksourceview -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/gnomeprint -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/applet +%%PORTDOCS%%@dirrm share/examples/py-gnome/rsvg +%%PORTDOCS%%@dirrm share/examples/py-gnome/nautilusburn +%%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/applet %%PORTDOCS%%@dirrm %%DOCSDIR%%/pygtksourceview %%PORTDOCS%%@dirrm %%DOCSDIR%%/pygnomeprintui %%PORTDOCS%%@dirrm %%DOCSDIR%%/pygnomeprint %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/totem @dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint +@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gnomedesktop diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile index 5bce80c66c11..175b18e98f5a 100644 --- a/x11-toolkits/py-gnome2/Makefile +++ b/x11-toolkits/py-gnome2/Makefile @@ -3,15 +3,14 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports-stable/x11-toolkits/py-gnome2/Makefile,v 1.2 2006/03/14 13:28:11 marcus Exp $ +# $MCom: ports/x11-toolkits/py-gnome2/Makefile,v 1.36 2006/09/04 22:22:09 ahze Exp $ # PORTNAME= gnome -PORTVERSION= 2.12.4 -PORTREVISION= 1 +PORTVERSION= 2.16.0 CATEGORIES= x11-toolkits python gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-python/${PORTVERSION:C/..$//} +MASTER_SITE_SUBDIR= sources/gnome-python/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= gnome-python-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -39,10 +38,6 @@ CONFLICTS= py*-gnome-1* .include -post-patch: - @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|' \ - ${WRKSRC}/gnomevfs/Makefile.in - .if !defined(NOPORTDOCS) post-install: ${MKDIR} ${EG_DST_DIR} diff --git a/x11-toolkits/py-gnome2/distinfo b/x11-toolkits/py-gnome2/distinfo index ca2f9bdae19b..2449a56ac706 100644 --- a/x11-toolkits/py-gnome2/distinfo +++ b/x11-toolkits/py-gnome2/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-python-2.12.4.tar.bz2) = 94347f1bff86ffcce76111fa8dac1efc -SHA256 (gnome2/gnome-python-2.12.4.tar.bz2) = 721268f92c0dc0a2a2480779e16545d05846090c469976c0913560beb7d8645e -SIZE (gnome2/gnome-python-2.12.4.tar.bz2) = 377341 +MD5 (gnome2/gnome-python-2.16.0.tar.bz2) = 65c71b08cdae600bf8cc31597682d595 +SHA256 (gnome2/gnome-python-2.16.0.tar.bz2) = 3a7dde776d7c0699f5a485b98dcadddde4bc8d4d39b23f8434616eb1bdcfdc7d +SIZE (gnome2/gnome-python-2.16.0.tar.bz2) = 401399 diff --git a/x11-toolkits/py-gnome2/files/patch-configure b/x11-toolkits/py-gnome2/files/patch-configure index af6b9c5e0154..94ede93f47f4 100644 --- a/x11-toolkits/py-gnome2/files/patch-configure +++ b/x11-toolkits/py-gnome2/files/patch-configure @@ -1,11 +1,11 @@ ---- configure.orig Tue Mar 14 08:23:11 2006 -+++ configure Tue Mar 14 08:24:01 2006 -@@ -21329,7 +21329,7 @@ if $build_pyvfsmodule; then - echo "$as_me:$LINENO: checking for libraries required to embed python" >&5 - echo $ECHO_N "checking for libraries required to embed python... $ECHO_C" >&6 - py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` --PYTHON_LIBS="-L${py_prefix}/lib -lpython${PYTHON_VERSION}" -+PYTHON_LIBS="-L${py_prefix}/lib -lpython${PYTHON_VERSION} ${PTHREAD_LIBS}" +--- configure.orig Tue Aug 22 00:47:05 2006 ++++ configure Tue Aug 22 00:47:29 2006 +@@ -19036,7 +19036,7 @@ PYTHON_LIB_DEPS=`$PYTHON -c "from distut save_LIBS="$LIBS" - LIBS="$LIBS $PYTHON_LIBS" + +-PYTHON_EMBED_LIBS="-L${py_prefix}/lib/ ${PYTHON_LIB_DEPS} -lpython${PYTHON_VERSION}" ++PYTHON_EMBED_LIBS="-L${py_prefix}/lib/ ${PYTHON_LIB_DEPS} -lpython${PYTHON_VERSION} ${PTHREAD_LIBS}" + + LIBS="$LIBS $PYTHON_EMBED_LIBS" + cat >conftest.$ac_ext <<_ACEOF diff --git a/x11-toolkits/py-gnome2/files/patch-gnomevfs_Makefile.in b/x11-toolkits/py-gnome2/files/patch-gnomevfs_Makefile.in deleted file mode 100644 index 40844f935796..000000000000 --- a/x11-toolkits/py-gnome2/files/patch-gnomevfs_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- gnomevfs/Makefile.in.orig Sat Sep 3 15:51:39 2005 -+++ gnomevfs/Makefile.in Sat Sep 3 15:52:19 2005 -@@ -276,7 +276,7 @@ - - gpincdir = $(includedir)/gnome-python-2.0 - gpinc_HEADERS = pygnomevfs.h --vfsmethoddir = $(libdir)/gnome-vfs-2.0/modules -+vfsmethoddir = %%X11BASE%%/lib/gnome-vfs-2.0/modules - @BUILD_PYVFSMODULE_FALSE@vfsmethod_LTLIBRARIES = - @BUILD_PYVFSMODULE_TRUE@vfsmethod_LTLIBRARIES = libpythonmethod.la - libpythonmethod_la_CFLAGS = $(GNOME_VFS_MODULE_CFLAGS) -DGNOME_VFS_PYTHON_DIR="\"$(vfsmethoddir)\"" diff --git a/x11-toolkits/py-gnome2/pkg-plist b/x11-toolkits/py-gnome2/pkg-plist index 957118502fcb..69b886286d63 100644 --- a/x11-toolkits/py-gnome2/pkg-plist +++ b/x11-toolkits/py-gnome2/pkg-plist @@ -1,4 +1,7 @@ include/gnome-python-2.0/pygnomevfs.h +include/gnome-python-2.0/pygnomevfsbonobo.h +lib/gnome-vfs-2.0/modules/libpythonmethod.la +lib/gnome-vfs-2.0/modules/libpythonmethod.so %%PYTHON_SITELIBDIR%%/gtk-2.0/bonobo/__init__.py %%PYTHON_SITELIBDIR%%/gtk-2.0/bonobo/__init__.pyc %%PYTHON_SITELIBDIR%%/gtk-2.0/bonobo/__init__.pyo @@ -25,8 +28,13 @@ include/gnome-python-2.0/pygnomevfs.h %%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/vfs.pyo %%PYTHON_SITELIBDIR%%/gtk-2.0/gnomecanvas.la %%PYTHON_SITELIBDIR%%/gtk-2.0/gnomecanvas.so -%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomevfs.la -%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomevfs.so +%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomevfs/__init__.py +%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomevfs/__init__.pyc +%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomevfs/__init__.pyo +%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomevfs/_gnomevfs.la +%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomevfs/_gnomevfs.so +%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomevfs/gnomevfsbonobo.la +%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomevfs/gnomevfsbonobo.so libdata/pkgconfig/gnome-python-2.0.pc %%PORTDOCS%%share/examples/py-gnome/bonobo/bonobo-application.py %%PORTDOCS%%share/examples/py-gnome/bonobo/bonoboui/Bonobo_Sample_Hello.xml @@ -34,6 +42,7 @@ libdata/pkgconfig/gnome-python-2.0.pc %%PORTDOCS%%share/examples/py-gnome/bonobo/echo/README %%PORTDOCS%%share/examples/py-gnome/bonobo/echo/echo-client.py %%PORTDOCS%%share/examples/py-gnome/bonobo/unknown.py +%%PORTDOCS%%share/examples/py-gnome/bug-buddy-integration.py %%PORTDOCS%%share/examples/py-gnome/canvas/canvas-curve.py %%PORTDOCS%%share/examples/py-gnome/canvas/canvas-example.py %%PORTDOCS%%share/examples/py-gnome/gconf/basic-gconf-app.py @@ -73,9 +82,7 @@ share/pygtk/2.0/defs/ui.defs %%PORTDOCS%%@dirrm share/examples/py-gnome/bonobo/bonoboui %%PORTDOCS%%@dirrm share/examples/py-gnome/bonobo %%PORTDOCS%%@dirrm share/examples/py-gnome +@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gnomevfs @dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gnome @dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/bonobo @dirrm include/gnome-python-2.0 -@cwd %%X11BASE%% -lib/gnome-vfs-2.0/modules/libpythonmethod.la -lib/gnome-vfs-2.0/modules/libpythonmethod.so diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile index 2979db884d65..098861892360 100644 --- a/x11-toolkits/py-gtk2/Makefile +++ b/x11-toolkits/py-gtk2/Makefile @@ -3,11 +3,11 @@ # Whom: marc@informatik.uni-bremen.de # # $FreeBSD$ -# $MCom: ports/x11-toolkits/py-gtk2/Makefile,v 1.38 2006/04/13 07:52:43 bland Exp $ +# $MCom: ports/x11-toolkits/py-gtk2/Makefile,v 1.49 2006/10/03 20:52:30 ahze Exp $ # PORTNAME= gtk -PORTVERSION= 2.8.6 +PORTVERSION= 2.10.2 CATEGORIES= x11-toolkits python MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/pygtk/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -19,10 +19,10 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= A set of Python bindings for GTK BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/cairo/__init__.py:${PORTSDIR}/graphics/py-cairo \ - ${PYTHON_SITELIBDIR}/gtk-2.0/gobject.so:${PORTSDIR}/devel/py-gobject + ${PYTHON_SITELIBDIR}/gtk-2.0/gobject/_gobject.so:${PORTSDIR}/devel/py-gobject RUN_DEPENDS= ${PYNUMERIC} \ ${PYTHON_SITELIBDIR}/cairo/__init__.py:${PORTSDIR}/graphics/py-cairo \ - ${PYTHON_SITELIBDIR}/gtk-2.0/gobject.so:${PORTSDIR}/devel/py-gobject + ${PYTHON_SITELIBDIR}/gtk-2.0/gobject/_gobject.so:${PORTSDIR}/devel/py-gobject USE_BZIP2= yes USE_GMAKE= yes @@ -32,6 +32,7 @@ USE_GETTEXT= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-lintl" +CONFIGURE_ARGS= --disable-docs LDFLAGS+= -L${LOCALBASE}/lib DOCSDIR= ${PREFIX}/share/doc/py-gtk diff --git a/x11-toolkits/py-gtk2/distinfo b/x11-toolkits/py-gtk2/distinfo index 28d9eb4c7da4..bad2a99afb8d 100644 --- a/x11-toolkits/py-gtk2/distinfo +++ b/x11-toolkits/py-gtk2/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/pygtk-2.8.6.tar.bz2) = c69c2e5e86a8f21a5773df20e265fc3a -SHA256 (gnome2/pygtk-2.8.6.tar.bz2) = dee1ec46a43bf624f1ff796903bd2d49e65c1cc8396385f46bf1489817bd6e60 -SIZE (gnome2/pygtk-2.8.6.tar.bz2) = 756885 +MD5 (gnome2/pygtk-2.10.2.tar.bz2) = 743ee3d0cbd9e63a50cdf382c28557da +SHA256 (gnome2/pygtk-2.10.2.tar.bz2) = 5c77ddba034ea810db357a9ac496e79dcbf5d6ce173860174f29af9836e3b5e7 +SIZE (gnome2/pygtk-2.10.2.tar.bz2) = 1977651 diff --git a/x11-toolkits/py-gtk2/files/patch-Makefile.in b/x11-toolkits/py-gtk2/files/patch-Makefile.in new file mode 100644 index 000000000000..b9cedaf23921 --- /dev/null +++ b/x11-toolkits/py-gtk2/files/patch-Makefile.in @@ -0,0 +1,11 @@ +--- Makefile.in.orig Tue Sep 5 02:02:53 2006 ++++ Makefile.in Tue Sep 5 02:06:11 2006 +@@ -292,7 +292,7 @@ sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + AUTOMAKE_OPTIONS = 1.7 + @BUILD_GTK_TRUE@GTK_SUBDIR = gtk +-SUBDIRS = codegen . $(GTK_SUBDIR) examples tests docs ++SUBDIRS = codegen . $(GTK_SUBDIR) examples + PLATFORM_VERSION = 2.0 + CLEANFILES = atk.c pango.c pangocairo.c + EXTRA_DIST = \ diff --git a/x11-toolkits/py-gtk2/pkg-plist b/x11-toolkits/py-gtk2/pkg-plist index ec1c7df6c566..2c6e6c9735e4 100644 --- a/x11-toolkits/py-gtk2/pkg-plist +++ b/x11-toolkits/py-gtk2/pkg-plist @@ -64,6 +64,9 @@ lib/pygtk/2.0/demos/panes.pyo lib/pygtk/2.0/demos/pixbufs.py lib/pygtk/2.0/demos/pixbufs.pyc lib/pygtk/2.0/demos/pixbufs.pyo +lib/pygtk/2.0/demos/print_editor.py +lib/pygtk/2.0/demos/print_editor.pyc +lib/pygtk/2.0/demos/print_editor.pyo lib/pygtk/2.0/demos/sizegroup.py lib/pygtk/2.0/demos/sizegroup.pyc lib/pygtk/2.0/demos/sizegroup.pyo @@ -92,14 +95,22 @@ lib/pygtk/2.0/pygtk-demo.pyo %%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/__init__.pyo %%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/_gtk.la %%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/_gtk.so +%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/_lazyutils.py +%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/_lazyutils.pyc +%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/_lazyutils.pyo %%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/compat.py %%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/compat.pyc %%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/compat.pyo +%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/deprecation.py +%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/deprecation.pyc +%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/deprecation.pyo %%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/glade.la %%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/glade.so %%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/keysyms.py %%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/keysyms.pyc %%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/keysyms.pyo +%%PYTHON_SITELIBDIR%%/gtk-2.0/gtkunixprint.la +%%PYTHON_SITELIBDIR%%/gtk-2.0/gtkunixprint.so %%PYTHON_SITELIBDIR%%/gtk-2.0/pango.la %%PYTHON_SITELIBDIR%%/gtk-2.0/pango.so %%PYTHON_SITELIBDIR%%/gtk-2.0/pangocairo.la @@ -117,12 +128,14 @@ libdata/pkgconfig/pygtk-2.0.pc %%PORTDOCS%%%%EXAMPLESDIR%%/glade/glade-demo.py %%PORTDOCS%%%%EXAMPLESDIR%%/glade/test.glade %%PORTDOCS%%%%EXAMPLESDIR%%/glade/test2.glade +%%PORTDOCS%%%%EXAMPLESDIR%%/gobject/editable-interface.py %%PORTDOCS%%%%EXAMPLESDIR%%/gobject/properties.py %%PORTDOCS%%%%EXAMPLESDIR%%/gobject/signal.py %%PORTDOCS%%%%EXAMPLESDIR%%/gtk/bin.py %%PORTDOCS%%%%EXAMPLESDIR%%/gtk/filechooser.py %%PORTDOCS%%%%EXAMPLESDIR%%/gtk/scrollable.py %%PORTDOCS%%%%EXAMPLESDIR%%/gtk/sizegroup.py +%%PORTDOCS%%%%EXAMPLESDIR%%/gtk/testprint.py %%PORTDOCS%%%%EXAMPLESDIR%%/gtk/uimanager.py %%PORTDOCS%%%%EXAMPLESDIR%%/gtk/widget.py %%PORTDOCS%%%%EXAMPLESDIR%%/ide/README @@ -173,6 +186,7 @@ libdata/pkgconfig/pygtk-2.0.pc %%PORTDOCS%%%%EXAMPLESDIR%%/pygtk-demo/demos/menu.py %%PORTDOCS%%%%EXAMPLESDIR%%/pygtk-demo/demos/panes.py %%PORTDOCS%%%%EXAMPLESDIR%%/pygtk-demo/demos/pixbufs.py +%%PORTDOCS%%%%EXAMPLESDIR%%/pygtk-demo/demos/print_editor.py %%PORTDOCS%%%%EXAMPLESDIR%%/pygtk-demo/demos/sizegroup.py %%PORTDOCS%%%%EXAMPLESDIR%%/pygtk-demo/demos/stock_browser.py %%PORTDOCS%%%%EXAMPLESDIR%%/pygtk-demo/demos/textview.py @@ -230,11 +244,18 @@ share/pygtk/2.0/codegen/scmexpr.pyc share/pygtk/2.0/codegen/scmexpr.pyo share/pygtk/2.0/defs/atk-types.defs share/pygtk/2.0/defs/atk.defs +share/pygtk/2.0/defs/gdk-2.10.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 share/pygtk/2.0/defs/gdk.defs -share/pygtk/2.0/defs/gtk-extrafuncs.defs +share/pygtk/2.0/defs/gtk-2.10-types.defs +share/pygtk/2.0/defs/gtk-2.10.defs +share/pygtk/2.0/defs/gtk-base-types.defs +share/pygtk/2.0/defs/gtk-base.defs share/pygtk/2.0/defs/gtk-types.defs share/pygtk/2.0/defs/gtk.defs +share/pygtk/2.0/defs/gtkunixprint.defs share/pygtk/2.0/defs/libglade.defs share/pygtk/2.0/defs/pango-types.defs share/pygtk/2.0/defs/pango.defs diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile index 664b8ae86d5c..68b2629a6eb8 100644 --- a/x11-toolkits/vte/Makefile +++ b/x11-toolkits/vte/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports/x11-toolkits/vte/Makefile,v 1.49 2006/04/27 01:40:22 ahze Exp $ +# $MCom: ports/x11-toolkits/vte/Makefile,v 1.61 2006/10/03 12:33:40 ahze Exp $ # PORTNAME= vte -PORTVERSION= 0.12.2 +PORTVERSION= 0.14.1 PORTREVISION?= 0 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} @@ -23,8 +23,8 @@ USE_BZIP2= yes USE_GMAKE= yes USE_BISON= yes -USE_X_PREFIX= yes -INSTALLS_SHLIB= yes +USE_XLIB= yes +USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 USE_GETTEXT= yes USE_GNOME= gnomeprefix gnomehack gtk20 ltverhack referencehack diff --git a/x11-toolkits/vte/distinfo b/x11-toolkits/vte/distinfo index 8decc2692298..47f0d6ce9176 100644 --- a/x11-toolkits/vte/distinfo +++ b/x11-toolkits/vte/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/vte-0.12.2.tar.bz2) = 7cb1bd6ca528bc4db5ec685549fd3eb1 -SHA256 (gnome2/vte-0.12.2.tar.bz2) = 41d22c945960feb1a924f58d2d237db2fbd1920cc48768ae0b4ac762245fcffb -SIZE (gnome2/vte-0.12.2.tar.bz2) = 974551 +MD5 (gnome2/vte-0.14.1.tar.bz2) = 98ea2513b773b44cb7f8d75dc1aa312e +SHA256 (gnome2/vte-0.14.1.tar.bz2) = 001b252018522a9dab890503a57949bd905d105dd317a2deca0e62f8cd16d6be +SIZE (gnome2/vte-0.14.1.tar.bz2) = 1008999 diff --git a/x11-toolkits/vte/files/patch-07_set_backspace_to_utf8 b/x11-toolkits/vte/files/patch-07_set_backspace_to_utf8 deleted file mode 100644 index cf1d41e6b7d7..000000000000 --- a/x11-toolkits/vte/files/patch-07_set_backspace_to_utf8 +++ /dev/null @@ -1,14 +0,0 @@ ---- src/vte.c.orig 2004-12-20 00:57:39 -0800 -+++ src/vte.c 2004-12-20 00:57:44 -0800 -@@ -7125,7 +7125,11 @@ - break; - default: - if (pid != 0) { -+ char *codeset; - terminal->pvt->pty_master = i; -+ g_get_charset(&codeset); -+ _vte_pty_set_utf8(terminal->pvt->pty_master, -+ (strcmp(codeset, "UTF-8") == 0)); - } - } - diff --git a/x11-toolkits/vte/files/patch-config.h.in b/x11-toolkits/vte/files/patch-config.h.in new file mode 100644 index 000000000000..03db0e1c47c3 --- /dev/null +++ b/x11-toolkits/vte/files/patch-config.h.in @@ -0,0 +1,12 @@ +--- config.h.in.orig Wed May 17 10:45:57 2006 ++++ config.h.in Wed May 17 10:46:25 2006 +@@ -106,6 +106,9 @@ + /* Define to 1 if you have the header file. */ + #undef HAVE_GL_GLX_H + ++/* Define to 1 if you have the `posix_openpt' function. */ ++#undef HAVE_POSIX_OPENPT ++ + /* Define to 1 if you have the `grantpt' function. */ + #undef HAVE_GRANTPT + diff --git a/x11-toolkits/vte/files/patch-configure b/x11-toolkits/vte/files/patch-configure index 424e74a57917..7cddbbd44395 100644 --- a/x11-toolkits/vte/files/patch-configure +++ b/x11-toolkits/vte/files/patch-configure @@ -1,17 +1,6 @@ ---- configure.orig Tue Aug 23 20:29:13 2005 -+++ configure Tue Aug 23 20:30:09 2005 -@@ -26765,10 +26765,6 @@ - rm -f conftest* - - --cat >>confdefs.h <<\_ACEOF --#define _XOPEN_SOURCE_EXTENDED 1 --_ACEOF -- - - cat >>confdefs.h <<\_ACEOF - #define _XOPEN_SOURCE 1 -@@ -27067,7 +27063,7 @@ +--- configure.orig Tue Oct 3 08:23:12 2006 ++++ configure Tue Oct 3 08:23:12 2006 +@@ -26464,7 +26464,7 @@ @@ -20,12 +9,3 @@ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_func" >&5 -@@ -29400,7 +29396,7 @@ - - - cat >>confdefs.h <<_ACEOF --#define LOCALEDIR "$mydatadir/locale" -+#define LOCALEDIR "$prefix/share/locale" - _ACEOF - - diff --git a/x11-toolkits/vte/files/patch-src_vteseq.c b/x11-toolkits/vte/files/patch-src_vteseq.c new file mode 100644 index 000000000000..e5afb288b0d8 --- /dev/null +++ b/x11-toolkits/vte/files/patch-src_vteseq.c @@ -0,0 +1,10 @@ +--- src/vteseq.c.orig Mon Jun 12 20:27:00 2006 ++++ src/vteseq.c Mon Jun 12 20:27:19 2006 +@@ -20,6 +20,7 @@ + #include "../config.h" + + #ifdef HAVE_SYS_SYSLIMITS_H ++#include + #include + #endif + diff --git a/x11-toolkits/vte/pkg-plist b/x11-toolkits/vte/pkg-plist index 6e7e79e3d677..c36847f1f528 100644 --- a/x11-toolkits/vte/pkg-plist +++ b/x11-toolkits/vte/pkg-plist @@ -6,7 +6,7 @@ include/vte/vteaccess.h lib/libvte.a lib/libvte.la lib/libvte.so -lib/libvte.so.4 +lib/libvte.so.9 lib/vte/decset lib/vte/interpret lib/vte/iso8859mode @@ -27,6 +27,7 @@ share/locale/az/LC_MESSAGES/vte.mo share/locale/be/LC_MESSAGES/vte.mo share/locale/bg/LC_MESSAGES/vte.mo 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/cs/LC_MESSAGES/vte.mo @@ -66,12 +67,12 @@ share/locale/mi/LC_MESSAGES/vte.mo share/locale/mk/LC_MESSAGES/vte.mo share/locale/ml/LC_MESSAGES/vte.mo share/locale/mn/LC_MESSAGES/vte.mo +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/nl/LC_MESSAGES/vte.mo share/locale/nn/LC_MESSAGES/vte.mo -share/locale/no/LC_MESSAGES/vte.mo share/locale/or/LC_MESSAGES/vte.mo share/locale/pa/LC_MESSAGES/vte.mo share/locale/pl/LC_MESSAGES/vte.mo @@ -97,19 +98,67 @@ share/locale/xh/LC_MESSAGES/vte.mo share/locale/zh_CN/LC_MESSAGES/vte.mo share/locale/zh_HK/LC_MESSAGES/vte.mo share/locale/zh_TW/LC_MESSAGES/vte.mo +@dirrm share/gnome/vte/termcap +@dirrm share/gnome/vte +@dirrm lib/vte +@dirrm include/vte +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/xh/LC_MESSAGES +@dirrmtry share/locale/xh +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk @dirrmtry share/locale/ug/LC_MESSAGES @dirrmtry share/locale/ug +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/sr +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sl +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/nn/LC_MESSAGES +@dirrmtry share/locale/nn +@dirrmtry share/locale/ne/LC_MESSAGES +@dirrmtry share/locale/ne +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr +@dirrmtry share/locale/mi/LC_MESSAGES +@dirrmtry share/locale/mi +@dirrmtry share/locale/li/LC_MESSAGES +@dirrmtry share/locale/li @dirrmtry share/locale/ky/LC_MESSAGES @dirrmtry share/locale/ky @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko +@dirrmtry share/locale/gl/LC_MESSAGES +@dirrmtry share/locale/gl +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/be/LC_MESSAGES +@dirrmtry share/locale/be @dirrmtry share/locale/ang/LC_MESSAGES @dirrmtry share/locale/ang -@dirrm share/gnome/vte/termcap -@dirrm share/gnome/vte -@dirrm lib/vte -@dirrm include/vte -- cgit v1.2.3