diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2005-11-05 04:53:48 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2005-11-05 04:53:48 +0000 |
| commit | e18151212d3326dbf04797c6d5300fb1211ee875 (patch) | |
| tree | 1ca56d6a4227efdb653cc8e2b2cbedbbc8de3d88 /x11-toolkits | |
| parent | cc0f3248a2eb77d7e3df88333fd25eb8594223dc (diff) | |
| download | ports-e18151212d3326dbf04797c6d5300fb1211ee875.tar.gz ports-e18151212d3326dbf04797c6d5300fb1211ee875.zip | |
Notes
Diffstat (limited to 'x11-toolkits')
41 files changed, 361 insertions, 332 deletions
diff --git a/x11-toolkits/eel/Makefile b/x11-toolkits/eel/Makefile index c933c7ef01c8..79e7f2e4b5b6 100644 --- a/x11-toolkits/eel/Makefile +++ b/x11-toolkits/eel/Makefile @@ -3,14 +3,14 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/x11-toolkits/eel/Makefile,v 1.21 2005/10/03 15:22:10 ahze Exp $ # PORTNAME= eel -PORTVERSION= 2.10.1 -PORTREVISION= 1 +PORTVERSION= 2.12.1 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -20,8 +20,8 @@ USE_BZIP2= yes USE_GMAKE= yes USE_X_PREFIX= yes GNOME_DESKTOP_VERSION=2 -USE_GNOME= gnomeprefix gnomehack gail gnomedesktop gnomemenus -USE_LIBTOOL_VER=15 +USE_GNOME= gnomeprefix gnomehack gail gnomedesktop gnomemenus ltverhack +USE_AUTOTOOLS= libtool:15 USE_REINPLACE= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS= --enable-shared --enable-static diff --git a/x11-toolkits/eel/distinfo b/x11-toolkits/eel/distinfo index ec66f59e89d3..aaf75b416b95 100644 --- a/x11-toolkits/eel/distinfo +++ b/x11-toolkits/eel/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/eel-2.10.1.tar.bz2) = 2978fae17565dfb6e2d7ca129e738b9d -SIZE (gnome2/eel-2.10.1.tar.bz2) = 672143 +MD5 (gnome2/eel-2.12.1.tar.bz2) = 08281630bef2e2f957ec2c349d73d112 +SIZE (gnome2/eel-2.12.1.tar.bz2) = 675963 diff --git a/x11-toolkits/eel/files/patch-Makefile.in b/x11-toolkits/eel/files/patch-Makefile.in index c3cb2f239196..eaa3dc117279 100644 --- a/x11-toolkits/eel/files/patch-Makefile.in +++ b/x11-toolkits/eel/files/patch-Makefile.in @@ -1,5 +1,6 @@ $FreeBSD$ + $MCom: ports/x11-toolkits/eel/files/patch-Makefile.in,v 1.4 2005/06/28 05:40:14 adamw Exp $ --- Makefile.in 2002/06/13 16:05:09 1.1 +++ Makefile.in 2002/06/13 16:05:18 diff --git a/x11-toolkits/eel/pkg-plist b/x11-toolkits/eel/pkg-plist index 5bd16dbe783a..901b8bff6687 100644 --- a/x11-toolkits/eel/pkg-plist +++ b/x11-toolkits/eel/pkg-plist @@ -46,7 +46,7 @@ include/eel-2/eel/eel-xml-extensions.h include/eel-2/eel/eel.h lib/libeel-2.a lib/libeel-2.so -lib/libeel-2.so.12 +lib/libeel-2.so.2 libdata/pkgconfig/eel-2.0.pc share/locale/am/LC_MESSAGES/eel-2.0.mo share/locale/ang/LC_MESSAGES/eel-2.0.mo @@ -114,6 +114,7 @@ share/locale/sv/LC_MESSAGES/eel-2.0.mo share/locale/ta/LC_MESSAGES/eel-2.0.mo share/locale/th/LC_MESSAGES/eel-2.0.mo share/locale/tr/LC_MESSAGES/eel-2.0.mo +share/locale/ug/LC_MESSAGES/eel-2.0.mo share/locale/uk/LC_MESSAGES/eel-2.0.mo share/locale/vi/LC_MESSAGES/eel-2.0.mo share/locale/wa/LC_MESSAGES/eel-2.0.mo @@ -122,6 +123,8 @@ share/locale/zh_CN/LC_MESSAGES/eel-2.0.mo share/locale/zh_TW/LC_MESSAGES/eel-2.0.mo @unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/xh 2> /dev/null || true +@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/ug 2> /dev/null || true @unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/rw 2> /dev/null || true @unexec rmdir %D/share/locale/ang/LC_MESSAGES 2> /dev/null || true diff --git a/x11-toolkits/gal2/Makefile b/x11-toolkits/gal2/Makefile index da148b95ed6e..ca84b9d42e2d 100644 --- a/x11-toolkits/gal2/Makefile +++ b/x11-toolkits/gal2/Makefile @@ -3,13 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/x11-toolkits/gal2/Makefile,v 1.52 2005/08/19 13:26:41 marcus Exp $ # PORTNAME= gal2 -PORTVERSION= 2.4.3 +PORTVERSION= 2.5.3 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.4 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.5 DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -21,17 +22,22 @@ USE_X_PREFIX= yes USE_REINPLACE= yes USE_PERL5= yes USE_GMAKE= yes -USE_GNOME= gnomehack gnomeprefix intlhack libgnomeui libgnomeprintui +USE_GNOME= gnomehack gnomeprefix intlhack libgnomeui libgnomeprintui \ + ltverhack INSTALLS_SHLIB= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS= --enable-static --with-libiconv CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -PLIST_SUB= VERSION="2.4" PORTVERSION=${PORTVERSION} +PLIST_SUB= VERSION="2.6" PORTVERSION=${PORTVERSION} \ + SHLIBVERSION="2.4" .include <bsd.port.pre.mk> +post-extract: + ${TOUCH} -f ${WRKSRC}/gal/util/e-util-private.h + post-patch: .if ( ${OSVERSION} > 600000 && ${OSVERSION} < 600006 ) || \ ( ${OSVERSION} < 503101 ) diff --git a/x11-toolkits/gal2/distinfo b/x11-toolkits/gal2/distinfo index 036606f5fcdd..bc3f355aa0a5 100644 --- a/x11-toolkits/gal2/distinfo +++ b/x11-toolkits/gal2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gal-2.4.3.tar.bz2) = de9ef290fd614a1057e26e31bc294142 -SIZE (gnome2/gal-2.4.3.tar.bz2) = 1056344 +MD5 (gnome2/gal-2.5.3.tar.bz2) = 8fae770488887f9d0f95bcdbffc673cc +SIZE (gnome2/gal-2.5.3.tar.bz2) = 1153998 diff --git a/x11-toolkits/gal2/files/patch-gal_widgets_e-canvas.c b/x11-toolkits/gal2/files/patch-gal_widgets_e-canvas.c deleted file mode 100644 index 10dc71d4cb9f..000000000000 --- a/x11-toolkits/gal2/files/patch-gal_widgets_e-canvas.c +++ /dev/null @@ -1,11 +0,0 @@ ---- gal/widgets/e-canvas.c.orig Tue May 24 01:16:33 2005 -+++ gal/widgets/e-canvas.c Tue May 24 01:16:51 2005 -@@ -1015,7 +1015,7 @@ void e_canvas_popup_tooltip (ECanvas *ca - - void e_canvas_hide_tooltip (ECanvas *canvas) - { -- if (canvas->tooltip_window) { -+ if (canvas && canvas->tooltip_window) { - gtk_widget_destroy (canvas->tooltip_window); - canvas->tooltip_window = NULL; - } diff --git a/x11-toolkits/gal2/pkg-plist b/x11-toolkits/gal2/pkg-plist index ba5831247aa9..3c7ce3862c55 100644 --- a/x11-toolkits/gal2/pkg-plist +++ b/x11-toolkits/gal2/pkg-plist @@ -7,6 +7,7 @@ include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-cell-vbox.h include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-cell.h include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-table-click-to-add-factory.h include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-table-click-to-add.h +include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-table-column-header.h include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-table-factory.h include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-table-item-factory.h include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-table-item.h @@ -148,20 +149,115 @@ include/gal-%%VERSION%%/gal/widgets/gal-combo-stack.h include/gal-%%VERSION%%/gal/widgets/gal-combo-text.h include/gal-%%VERSION%%/gal/widgets/widget-color-combo.h include/gal-%%VERSION%%/gal/widgets/widget-pixmap-combo.h -lib/libgal-%%VERSION%%.a -lib/libgal-%%VERSION%%.so -lib/libgal-%%VERSION%%.so.0 -lib/libgal-a11y-%%VERSION%%.a -lib/libgal-a11y-%%VERSION%%.so -lib/libgal-a11y-%%VERSION%%.so.0 +lib/libgal-%%SHLIBVERSION%%.a +lib/libgal-%%SHLIBVERSION%%.so +lib/libgal-%%SHLIBVERSION%%.so.0 +lib/libgal-a11y-%%SHLIBVERSION%%.a +lib/libgal-a11y-%%SHLIBVERSION%%.so +lib/libgal-a11y-%%SHLIBVERSION%%.so.0 libdata/pkgconfig/gal-%%VERSION%%.pc -share/doc/gal-%%VERSION%%/gal-api.html -share/doc/gal-%%VERSION%%/gal-api.sgml -share/doc/gal-%%VERSION%%/gal-decl.txt -share/doc/gal-%%VERSION%%/gal-sections.txt -share/doc/gal-%%VERSION%%/gal.hierarchy -share/doc/gal-%%VERSION%%/gal.signals -share/doc/gal-%%VERSION%%/gal.types +share/doc/gal/book1.html +share/doc/gal/cell-renderers.html +share/doc/gal/combo-boxes.html +share/doc/gal/cut-and-paste.html +share/doc/gal/e-font.html +share/doc/gal/e-table-core.html +share/doc/gal/e-table.html +share/doc/gal/e-text.html +share/doc/gal/ecanvas.html +share/doc/gal/ecanvasvbox.html +share/doc/gal/ecell.html +share/doc/gal/ecellcheckbox.html +share/doc/gal/ecelltext.html +share/doc/gal/ecelltoggle.html +share/doc/gal/ecelltree.html +share/doc/gal/eentry.html +share/doc/gal/ehpaned.html +share/doc/gal/ehscrollbar.html +share/doc/gal/epaned.html +share/doc/gal/eprintable.html +share/doc/gal/ereflow.html +share/doc/gal/ereflowsorted.html +share/doc/gal/escrollframe.html +share/doc/gal/etable.html +share/doc/gal/etableclicktoadd.html +share/doc/gal/etablecol.html +share/doc/gal/etablecolumnspecification.html +share/doc/gal/etableconfig.html +share/doc/gal/etableconfigfield.html +share/doc/gal/etableextras.html +share/doc/gal/etablefieldchooser.html +share/doc/gal/etablefieldchooserdialog.html +share/doc/gal/etablefieldchooseritem.html +share/doc/gal/etablegroup.html +share/doc/gal/etablegroupcontainer.html +share/doc/gal/etablegroupleaf.html +share/doc/gal/etableheader.html +share/doc/gal/etableheaderitem.html +share/doc/gal/etableitem.html +share/doc/gal/etablemodel.html +share/doc/gal/etableone.html +share/doc/gal/etablescrolled.html +share/doc/gal/etableselectionmodel.html +share/doc/gal/etablesimple.html +share/doc/gal/etablesorted.html +share/doc/gal/etablesortedvariable.html +share/doc/gal/etablesorter.html +share/doc/gal/etablesortinfo.html +share/doc/gal/etablespecification.html +share/doc/gal/etablestate.html +share/doc/gal/etablesubset.html +share/doc/gal/etablesubsetvariable.html +share/doc/gal/etabletextmodel.html +share/doc/gal/etext.html +share/doc/gal/etexteventprocessor.html +share/doc/gal/etexteventprocessoremacslike.html +share/doc/gal/etextmodel.html +share/doc/gal/etreesimple.html +share/doc/gal/evpaned.html +share/doc/gal/evscrollbar.html +share/doc/gal/gal-api.html +share/doc/gal/gal-api.sgml +share/doc/gal/gal-colorcombo.html +share/doc/gal/gal-colorgroup.html +share/doc/gal/gal-colorpalette.html +share/doc/gal/gal-decl.txt +share/doc/gal/gal-e-cache.html +share/doc/gal/gal-e-canvas-utils.html +share/doc/gal/gal-e-colors.html +share/doc/gal/gal-e-cursors.html +share/doc/gal/gal-e-font.html +share/doc/gal/gal-e-gui-utils.html +share/doc/gal/gal-e-popup-menu.html +share/doc/gal/gal-e-table-col-dnd.html +share/doc/gal/gal-e-table-defines.html +share/doc/gal/gal-e-table-header-utils.html +share/doc/gal/gal-e-table-tooltip.html +share/doc/gal/gal-e-table-tree.html +share/doc/gal/gal-e-text-event-processor-types.html +share/doc/gal/gal-e-tree-model.html +share/doc/gal/gal-e-unicode.html +share/doc/gal/gal-e-util.html +share/doc/gal/gal-e-xml-utils.html +share/doc/gal/gal-gtkcombobox.html +share/doc/gal/gal-sections.txt +share/doc/gal/gal.hierarchy +share/doc/gal/gal.signals +share/doc/gal/gal.types +share/doc/gal/galdefineviewsdialog.html +share/doc/gal/galdefineviewsmodel.html +share/doc/gal/galview.html +share/doc/gal/galviewcollection.html +share/doc/gal/galviewetable.html +share/doc/gal/galviewfactory.html +share/doc/gal/galviewfactoryetable.html +share/doc/gal/galviewnewdialog.html +share/doc/gal/gtkcombostack.html +share/doc/gal/gtkcombotext.html +share/doc/gal/pixmapcombo.html +share/doc/gal/reflow.html +share/doc/gal/utility-widgets.html +share/doc/gal/view-configurationt.html share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/glade/e-categories-master-list-dialog.glade share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/glade/e-table-config-no-group.glade share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/glade/e-table-config.glade @@ -224,6 +320,7 @@ share/locale/lv/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/mn/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/ms/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/nb/LC_MESSAGES/gal-%%VERSION%%.mo +share/locale/ne/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/nl/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/nn/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/no/LC_MESSAGES/gal-%%VERSION%%.mo @@ -253,7 +350,7 @@ share/locale/zh_TW/LC_MESSAGES/gal-%%VERSION%%.mo @dirrm share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/glade @dirrm share/gnome/gal-%%VERSION%%/%%PORTVERSION%% @dirrm share/gnome/gal-%%VERSION%% -@dirrm share/doc/gal-%%VERSION%% +@dirrm share/doc/gal @dirrm include/gal-%%VERSION%%/gal/widgets @dirrm include/gal-%%VERSION%%/gal/util @dirrm include/gal-%%VERSION%%/gal/shortcut-bar diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index 3001ebcaaaad..014cf40de698 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -3,14 +3,14 @@ # Whom: Vanilla I. Shu <vanilla@MinJe.com.TW> # # $FreeBSD$ +# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.80 2005/10/29 22:42:26 mezz Exp $ # PORTNAME= gtk -PORTVERSION= 2.6.10 -PORTREVISION= 1 +PORTVERSION= 2.8.6 CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.6,} \ - ftp://ftp.gtk.org/pub/gtk/v2.6/ \ +MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.8,} \ + ftp://ftp.gtk.org/pub/gtk/v2.8/ \ ftp://ftp.gimp.org/pub/%SUBDIR%/ \ ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \ http://www.ameth.org/gimp/%SUBDIR%/ \ @@ -20,13 +20,6 @@ MASTER_SITE_SUBDIR= gtk/v${PORTVERSION:R} DISTNAME= gtk+-${PORTVERSION} DIST_SUBDIR= gnome2 -.if defined(WITH_DROPSHADOW) -PATCH_SITES= ${MASTER_SITE_SOURCEFORGE} -PATCH_SITE_SUBDIR= xfce -PATCHFILES= gtk+-2.4.0-menushadow.patch -PATCH_DIST_STRIP= -p1 -.endif - MAINTAINER= gnome@FreeBSD.org COMMENT= Gimp Toolkit for X11 GUI (current stable version) @@ -43,8 +36,8 @@ USE_XPM= yes USE_REINPLACE= yes USE_PERL5= yes INSTALLS_SHLIB= yes -USE_LIBTOOL_VER=15 -USE_GNOME= gnomehack atk pango +USE_AUTOTOOLS= libtool:15 +USE_GNOME= gnomehack atk pango ltverhack CONFIGURE_ARGS= --enable-static --with-xinput=yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \ -I${LOCALBASE}/include -I${X11BASE}/include" \ @@ -64,9 +57,10 @@ CONFIGURE_ARGS+= --enable-debug=no .else .if ${WITH_DEBUG:L} == "yes" CONFIGURE_ARGS+= --enable-debug=yes +STRIP= .else CONFIGURE_ARGS+= --enable-debug=minimum -CFLAGS+= -g +CFLAGS+= -g .endif STRIP= .endif @@ -84,15 +78,6 @@ CFLAGS+= -mno-sse2 .endif pre-everything:: -.if !defined(WITH_DROPSHADOW) - @${ECHO_MSG} - @${ECHO_MSG} "If you want to compile with experimental menu dropshadow patch," - @${ECHO_MSG} "hit Ctrl-C right now and use make \"WITH_DROPSHADOW=yes\"" - @${ECHO_MSG} "NOTE: This option is not supported by the FreeBSD GNOME Team." - @${ECHO_MSG} "If the patch does not work or causes the build to fail, just" - @${ECHO_MSG} "stop using the patch; we will not further debug it." - @${ECHO_MSG} -.endif .if !defined(WITH_DEBUG) @${ECHO_MSG} @${ECHO_MSG} "Enable or disable debugging with the following knob" @@ -115,6 +100,8 @@ pre-build: @${RM} -rf ${WRKSRC}/docs/gtk.info* post-install: + -@${FIND} ${PREFIX}/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 b725466f4aba..5766a84bc39b 100644 --- a/x11-toolkits/gtk20/distinfo +++ b/x11-toolkits/gtk20/distinfo @@ -1,4 +1,2 @@ -MD5 (gnome2/gtk+-2.6.10.tar.bz2) = 520090ef291e35ba93397060e20f5025 -SIZE (gnome2/gtk+-2.6.10.tar.bz2) = 11521380 -MD5 (gnome2/gtk+-2.4.0-menushadow.patch) = 5dde5c5af8f25d282c365663a7256b5c -SIZE (gnome2/gtk+-2.4.0-menushadow.patch) = 15603 +MD5 (gnome2/gtk+-2.8.6.tar.bz2) = 2bcb9e3feb62ac895101cb8ee87ca49a +SIZE (gnome2/gtk+-2.8.6.tar.bz2) = 11818976 diff --git a/x11-toolkits/gtk20/files/patch-Makefile.in b/x11-toolkits/gtk20/files/patch-Makefile.in index c47baaab5ef5..307fd6fc2f77 100644 --- a/x11-toolkits/gtk20/files/patch-Makefile.in +++ b/x11-toolkits/gtk20/files/patch-Makefile.in @@ -1,11 +1,11 @@ ---- Makefile.in.orig Thu Jan 22 19:40:10 2004 -+++ Makefile.in Thu Jan 22 19:40:52 2004 -@@ -286,7 +286,7 @@ +--- Makefile.in.orig Wed Aug 3 18:09:32 2005 ++++ Makefile.in Wed Aug 3 18:10:01 2005 +@@ -288,7 +288,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ --SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests contrib -+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos contrib - SUBDIRS = po po-properties $(SRC_SUBDIRS) docs build m4macros +-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib ++SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos perf contrib + SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros # require automake 1.4 diff --git a/x11-toolkits/gtk20/files/patch-ak b/x11-toolkits/gtk20/files/patch-ak index cc94fa96593c..41bffeab1b08 100644 --- a/x11-toolkits/gtk20/files/patch-ak +++ b/x11-toolkits/gtk20/files/patch-ak @@ -1,5 +1,6 @@ $FreeBSD$ + $MCom: ports/x11-toolkits/gtk20/files/patch-ak,v 1.16 2005/06/28 05:40:15 adamw 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_gtkcalendar.c b/x11-toolkits/gtk20/files/patch-gtk_gtkcalendar.c new file mode 100644 index 000000000000..4dcf1fd052a5 --- /dev/null +++ b/x11-toolkits/gtk20/files/patch-gtk_gtkcalendar.c @@ -0,0 +1,10 @@ +--- 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_gtkentry.c b/x11-toolkits/gtk20/files/patch-gtk_gtkentry.c deleted file mode 100644 index e725de399cff..000000000000 --- a/x11-toolkits/gtk20/files/patch-gtk_gtkentry.c +++ /dev/null @@ -1,13 +0,0 @@ ---- gtk/gtkentry.c.orig Wed Aug 25 12:44:23 2004 -+++ gtk/gtkentry.c Wed Aug 25 12:44:52 2004 -@@ -1670,8 +1670,9 @@ - event->x + entry->scroll_offset, event->y)) - { - GdkDragContext *context; -+ guint actions; - GtkTargetList *target_list = gtk_target_list_new (NULL, 0); -- guint actions = entry->editable ? GDK_ACTION_COPY | GDK_ACTION_MOVE : GDK_ACTION_COPY; -+ actions = entry->editable ? GDK_ACTION_COPY | GDK_ACTION_MOVE : GDK_ACTION_COPY; - - gtk_target_list_add_text_targets (target_list); - diff --git a/x11-toolkits/gtk20/files/patch-gtk_gtkiconcache.c b/x11-toolkits/gtk20/files/patch-gtk_gtkiconcache.c deleted file mode 100644 index d393bd3dfa8d..000000000000 --- a/x11-toolkits/gtk20/files/patch-gtk_gtkiconcache.c +++ /dev/null @@ -1,20 +0,0 @@ ---- gtk/gtkiconcache.c.orig Sun Dec 12 16:09:13 2004 -+++ gtk/gtkiconcache.c Thu Dec 16 17:09:23 2004 -@@ -21,6 +21,8 @@ - #include "gtkdebug.h" - #include "gtkiconcache.h" - #include <glib/gstdio.h> -+#include <sys/types.h> -+#include <sys/stat.h> - - #ifdef HAVE_MMAP - #include <sys/mman.h> -@@ -29,8 +31,6 @@ - #include <windows.h> - #include <io.h> - #endif --#include <sys/types.h> --#include <sys/stat.h> - #ifdef HAVE_UNISTD_H - #include <unistd.h> - #endif diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist index ec10564dc771..a7a06be2c7d3 100644 --- a/x11-toolkits/gtk20/pkg-plist +++ b/x11-toolkits/gtk20/pkg-plist @@ -14,11 +14,13 @@ include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-features.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-io.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-marshal.h +include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-simple-anim.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-transform.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h include/gtk-2.0/gdk-pixbuf/gdk-pixdata.h include/gtk-2.0/gdk/gdk.h include/gtk-2.0/gdk/gdkalias.h +include/gtk-2.0/gdk/gdkcairo.h include/gtk-2.0/gdk/gdkcolor.h include/gtk-2.0/gdk/gdkcursor.h include/gtk-2.0/gdk/gdkdisplay.h @@ -253,16 +255,16 @@ lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.so lib/libgdk-x11-2.0.a lib/libgdk-x11-2.0.so -lib/libgdk-x11-2.0.so.600 +lib/libgdk-x11-2.0.so.0 lib/libgdk_pixbuf-2.0.a lib/libgdk_pixbuf-2.0.so -lib/libgdk_pixbuf-2.0.so.600 +lib/libgdk_pixbuf-2.0.so.0 lib/libgdk_pixbuf_xlib-2.0.a lib/libgdk_pixbuf_xlib-2.0.so -lib/libgdk_pixbuf_xlib-2.0.so.600 +lib/libgdk_pixbuf_xlib-2.0.so.0 lib/libgtk-x11-2.0.a lib/libgtk-x11-2.0.so -lib/libgtk-x11-2.0.so.600 +lib/libgtk-x11-2.0.so.0 libdata/pkgconfig/gdk-2.0.pc libdata/pkgconfig/gdk-pixbuf-2.0.pc libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc @@ -297,6 +299,7 @@ share/gtk-2.0/demo/gnu-keys.png share/gtk-2.0/demo/gtk-logo-rgb.gif share/gtk-2.0/demo/hypertext.c share/gtk-2.0/demo/iconview.c +share/gtk-2.0/demo/iconview_edit.c share/gtk-2.0/demo/images.c share/gtk-2.0/demo/list_store.c share/gtk-2.0/demo/menus.c @@ -385,6 +388,8 @@ share/locale/ja/LC_MESSAGES/gtk20-properties.mo share/locale/ja/LC_MESSAGES/gtk20.mo share/locale/ko/LC_MESSAGES/gtk20-properties.mo share/locale/ko/LC_MESSAGES/gtk20.mo +share/locale/ku/LC_MESSAGES/gtk20-properties.mo +share/locale/ku/LC_MESSAGES/gtk20.mo share/locale/li/LC_MESSAGES/gtk20-properties.mo share/locale/li/LC_MESSAGES/gtk20.mo share/locale/lt/LC_MESSAGES/gtk20-properties.mo @@ -445,6 +450,8 @@ share/locale/sv/LC_MESSAGES/gtk20-properties.mo share/locale/sv/LC_MESSAGES/gtk20.mo share/locale/ta/LC_MESSAGES/gtk20-properties.mo share/locale/ta/LC_MESSAGES/gtk20.mo +share/locale/te/LC_MESSAGES/gtk20-properties.mo +share/locale/te/LC_MESSAGES/gtk20.mo share/locale/th/LC_MESSAGES/gtk20-properties.mo share/locale/th/LC_MESSAGES/gtk20.mo share/locale/tk/LC_MESSAGES/gtk20-properties.mo @@ -470,20 +477,17 @@ share/locale/zh_CN/LC_MESSAGES/gtk20.mo share/locale/zh_TW/LC_MESSAGES/gtk20-properties.mo share/locale/zh_TW/LC_MESSAGES/gtk20.mo share/themes/Default/gtk-2.0-key/gtkrc -share/themes/Default/gtk-2.0/gtkrc share/themes/Emacs/gtk-2.0-key/gtkrc +share/themes/Raleigh/gtk-2.0/gtkrc +@exec /usr/bin/find %D/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 %D/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 @dirrm share/themes/Emacs @dirrm share/themes/Default/gtk-2.0-key -@dirrm share/themes/Default/gtk-2.0 @dirrm share/gtk-2.0/demo @dirrm share/gtk-2.0 -@unexec /bin/rmdir %D/lib/gtk-2.0/modules 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/lib/gtk-2.0/%%GTK_VERSION%%/loaders 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/lib/gtk-2.0/%%GTK_VERSION%%/immodules 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/lib/gtk-2.0/%%GTK_VERSION%%/engines 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/lib/gtk-2.0/%%GTK_VERSION%% 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/lib/gtk-2.0 2>/dev/null || /usr/bin/true @dirrm include/gtk-2.0/gtk @dirrm include/gtk-2.0/gdk-pixbuf-xlib @dirrm include/gtk-2.0/gdk-pixbuf @@ -494,27 +498,37 @@ share/themes/Emacs/gtk-2.0-key/gtkrc @exec /bin/mkdir -p %D/lib/gtk-2.0/%%GTK_VERSION%%/engines @unexec /bin/rmdir %D/share/themes/Default 2>/dev/null || /usr/bin/true @unexec /bin/rmdir %D/share/themes 2>/dev/null || /usr/bin/true -@unexec rmdir %D/share/locale/az_IR/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/az_IR 2> /dev/null || true -@unexec rmdir %D/share/locale/br/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/br 2> /dev/null || true -@unexec rmdir %D/share/locale/hy/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/hy 2> /dev/null || true -@unexec rmdir %D/share/locale/ia/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ia 2> /dev/null || true -@unexec rmdir %D/share/locale/mi/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/mi 2> /dev/null || true -@unexec rmdir %D/share/locale/mr/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/mr 2> /dev/null || true -@unexec rmdir %D/share/locale/nso/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/nso 2> /dev/null || true -@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/rw 2> /dev/null || true -@unexec rmdir %D/share/locale/sr@ije/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/sr@ije 2> /dev/null || true -@unexec rmdir %D/share/locale/uz@Latn/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/uz@Latn 2> /dev/null || true @unexec rmdir %D/share/locale/yi/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/yi 2> /dev/null || true -@unexec rmdir %D/share/locale/xh/LC_MESSAGES/ 2> /dev/null || true +@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/xh 2> /dev/null || true +@unexec rmdir %D/share/locale/te/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/te 2> /dev/null || true +@unexec rmdir %D/share/locale/uz@Latn/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/uz@Latn 2> /dev/null || true +@unexec rmdir %D/share/locale/sr@ije/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/sr@ije 2> /dev/null || true +@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/rw 2> /dev/null || true +@unexec rmdir %D/share/locale/nso/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/nso 2> /dev/null || true +@unexec rmdir %D/share/locale/mr/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/mr 2> /dev/null || true +@unexec rmdir %D/share/locale/mi/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/mi 2> /dev/null || true +@unexec rmdir %D/share/locale/ku/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/ku 2> /dev/null || true +@unexec rmdir %D/share/locale/ia/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/ia 2> /dev/null || true +@unexec rmdir %D/share/locale/hy/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/hy 2> /dev/null || true +@unexec rmdir %D/share/locale/br/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/br 2> /dev/null || true +@unexec rmdir %D/share/locale/az_IR/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/az_IR 2> /dev/null || true +@unexec /bin/rmdir %D/lib/gtk-2.0/modules 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/lib/gtk-2.0/%%GTK_VERSION%%/loaders 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/lib/gtk-2.0/%%GTK_VERSION%%/immodules 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/lib/gtk-2.0/%%GTK_VERSION%%/engines 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/lib/gtk-2.0/%%GTK_VERSION%% 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/lib/gtk-2.0 2>/dev/null || /usr/bin/true diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile index 3001ebcaaaad..014cf40de698 100644 --- a/x11-toolkits/gtk30/Makefile +++ b/x11-toolkits/gtk30/Makefile @@ -3,14 +3,14 @@ # Whom: Vanilla I. Shu <vanilla@MinJe.com.TW> # # $FreeBSD$ +# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.80 2005/10/29 22:42:26 mezz Exp $ # PORTNAME= gtk -PORTVERSION= 2.6.10 -PORTREVISION= 1 +PORTVERSION= 2.8.6 CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.6,} \ - ftp://ftp.gtk.org/pub/gtk/v2.6/ \ +MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.8,} \ + ftp://ftp.gtk.org/pub/gtk/v2.8/ \ ftp://ftp.gimp.org/pub/%SUBDIR%/ \ ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \ http://www.ameth.org/gimp/%SUBDIR%/ \ @@ -20,13 +20,6 @@ MASTER_SITE_SUBDIR= gtk/v${PORTVERSION:R} DISTNAME= gtk+-${PORTVERSION} DIST_SUBDIR= gnome2 -.if defined(WITH_DROPSHADOW) -PATCH_SITES= ${MASTER_SITE_SOURCEFORGE} -PATCH_SITE_SUBDIR= xfce -PATCHFILES= gtk+-2.4.0-menushadow.patch -PATCH_DIST_STRIP= -p1 -.endif - MAINTAINER= gnome@FreeBSD.org COMMENT= Gimp Toolkit for X11 GUI (current stable version) @@ -43,8 +36,8 @@ USE_XPM= yes USE_REINPLACE= yes USE_PERL5= yes INSTALLS_SHLIB= yes -USE_LIBTOOL_VER=15 -USE_GNOME= gnomehack atk pango +USE_AUTOTOOLS= libtool:15 +USE_GNOME= gnomehack atk pango ltverhack CONFIGURE_ARGS= --enable-static --with-xinput=yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \ -I${LOCALBASE}/include -I${X11BASE}/include" \ @@ -64,9 +57,10 @@ CONFIGURE_ARGS+= --enable-debug=no .else .if ${WITH_DEBUG:L} == "yes" CONFIGURE_ARGS+= --enable-debug=yes +STRIP= .else CONFIGURE_ARGS+= --enable-debug=minimum -CFLAGS+= -g +CFLAGS+= -g .endif STRIP= .endif @@ -84,15 +78,6 @@ CFLAGS+= -mno-sse2 .endif pre-everything:: -.if !defined(WITH_DROPSHADOW) - @${ECHO_MSG} - @${ECHO_MSG} "If you want to compile with experimental menu dropshadow patch," - @${ECHO_MSG} "hit Ctrl-C right now and use make \"WITH_DROPSHADOW=yes\"" - @${ECHO_MSG} "NOTE: This option is not supported by the FreeBSD GNOME Team." - @${ECHO_MSG} "If the patch does not work or causes the build to fail, just" - @${ECHO_MSG} "stop using the patch; we will not further debug it." - @${ECHO_MSG} -.endif .if !defined(WITH_DEBUG) @${ECHO_MSG} @${ECHO_MSG} "Enable or disable debugging with the following knob" @@ -115,6 +100,8 @@ pre-build: @${RM} -rf ${WRKSRC}/docs/gtk.info* post-install: + -@${FIND} ${PREFIX}/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 b725466f4aba..5766a84bc39b 100644 --- a/x11-toolkits/gtk30/distinfo +++ b/x11-toolkits/gtk30/distinfo @@ -1,4 +1,2 @@ -MD5 (gnome2/gtk+-2.6.10.tar.bz2) = 520090ef291e35ba93397060e20f5025 -SIZE (gnome2/gtk+-2.6.10.tar.bz2) = 11521380 -MD5 (gnome2/gtk+-2.4.0-menushadow.patch) = 5dde5c5af8f25d282c365663a7256b5c -SIZE (gnome2/gtk+-2.4.0-menushadow.patch) = 15603 +MD5 (gnome2/gtk+-2.8.6.tar.bz2) = 2bcb9e3feb62ac895101cb8ee87ca49a +SIZE (gnome2/gtk+-2.8.6.tar.bz2) = 11818976 diff --git a/x11-toolkits/gtk30/files/patch-Makefile.in b/x11-toolkits/gtk30/files/patch-Makefile.in index c47baaab5ef5..307fd6fc2f77 100644 --- a/x11-toolkits/gtk30/files/patch-Makefile.in +++ b/x11-toolkits/gtk30/files/patch-Makefile.in @@ -1,11 +1,11 @@ ---- Makefile.in.orig Thu Jan 22 19:40:10 2004 -+++ Makefile.in Thu Jan 22 19:40:52 2004 -@@ -286,7 +286,7 @@ +--- Makefile.in.orig Wed Aug 3 18:09:32 2005 ++++ Makefile.in Wed Aug 3 18:10:01 2005 +@@ -288,7 +288,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ --SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests contrib -+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos contrib - SUBDIRS = po po-properties $(SRC_SUBDIRS) docs build m4macros +-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib ++SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos perf contrib + SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros # require automake 1.4 diff --git a/x11-toolkits/gtk30/files/patch-ak b/x11-toolkits/gtk30/files/patch-ak index cc94fa96593c..41bffeab1b08 100644 --- a/x11-toolkits/gtk30/files/patch-ak +++ b/x11-toolkits/gtk30/files/patch-ak @@ -1,5 +1,6 @@ $FreeBSD$ + $MCom: ports/x11-toolkits/gtk20/files/patch-ak,v 1.16 2005/06/28 05:40:15 adamw 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_gtkcalendar.c b/x11-toolkits/gtk30/files/patch-gtk_gtkcalendar.c new file mode 100644 index 000000000000..4dcf1fd052a5 --- /dev/null +++ b/x11-toolkits/gtk30/files/patch-gtk_gtkcalendar.c @@ -0,0 +1,10 @@ +--- 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_gtkentry.c b/x11-toolkits/gtk30/files/patch-gtk_gtkentry.c deleted file mode 100644 index e725de399cff..000000000000 --- a/x11-toolkits/gtk30/files/patch-gtk_gtkentry.c +++ /dev/null @@ -1,13 +0,0 @@ ---- gtk/gtkentry.c.orig Wed Aug 25 12:44:23 2004 -+++ gtk/gtkentry.c Wed Aug 25 12:44:52 2004 -@@ -1670,8 +1670,9 @@ - event->x + entry->scroll_offset, event->y)) - { - GdkDragContext *context; -+ guint actions; - GtkTargetList *target_list = gtk_target_list_new (NULL, 0); -- guint actions = entry->editable ? GDK_ACTION_COPY | GDK_ACTION_MOVE : GDK_ACTION_COPY; -+ actions = entry->editable ? GDK_ACTION_COPY | GDK_ACTION_MOVE : GDK_ACTION_COPY; - - gtk_target_list_add_text_targets (target_list); - diff --git a/x11-toolkits/gtk30/files/patch-gtk_gtkiconcache.c b/x11-toolkits/gtk30/files/patch-gtk_gtkiconcache.c deleted file mode 100644 index d393bd3dfa8d..000000000000 --- a/x11-toolkits/gtk30/files/patch-gtk_gtkiconcache.c +++ /dev/null @@ -1,20 +0,0 @@ ---- gtk/gtkiconcache.c.orig Sun Dec 12 16:09:13 2004 -+++ gtk/gtkiconcache.c Thu Dec 16 17:09:23 2004 -@@ -21,6 +21,8 @@ - #include "gtkdebug.h" - #include "gtkiconcache.h" - #include <glib/gstdio.h> -+#include <sys/types.h> -+#include <sys/stat.h> - - #ifdef HAVE_MMAP - #include <sys/mman.h> -@@ -29,8 +31,6 @@ - #include <windows.h> - #include <io.h> - #endif --#include <sys/types.h> --#include <sys/stat.h> - #ifdef HAVE_UNISTD_H - #include <unistd.h> - #endif diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist index ec10564dc771..a7a06be2c7d3 100644 --- a/x11-toolkits/gtk30/pkg-plist +++ b/x11-toolkits/gtk30/pkg-plist @@ -14,11 +14,13 @@ include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-features.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-io.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-marshal.h +include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-simple-anim.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-transform.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h include/gtk-2.0/gdk-pixbuf/gdk-pixdata.h include/gtk-2.0/gdk/gdk.h include/gtk-2.0/gdk/gdkalias.h +include/gtk-2.0/gdk/gdkcairo.h include/gtk-2.0/gdk/gdkcolor.h include/gtk-2.0/gdk/gdkcursor.h include/gtk-2.0/gdk/gdkdisplay.h @@ -253,16 +255,16 @@ lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.so lib/libgdk-x11-2.0.a lib/libgdk-x11-2.0.so -lib/libgdk-x11-2.0.so.600 +lib/libgdk-x11-2.0.so.0 lib/libgdk_pixbuf-2.0.a lib/libgdk_pixbuf-2.0.so -lib/libgdk_pixbuf-2.0.so.600 +lib/libgdk_pixbuf-2.0.so.0 lib/libgdk_pixbuf_xlib-2.0.a lib/libgdk_pixbuf_xlib-2.0.so -lib/libgdk_pixbuf_xlib-2.0.so.600 +lib/libgdk_pixbuf_xlib-2.0.so.0 lib/libgtk-x11-2.0.a lib/libgtk-x11-2.0.so -lib/libgtk-x11-2.0.so.600 +lib/libgtk-x11-2.0.so.0 libdata/pkgconfig/gdk-2.0.pc libdata/pkgconfig/gdk-pixbuf-2.0.pc libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc @@ -297,6 +299,7 @@ share/gtk-2.0/demo/gnu-keys.png share/gtk-2.0/demo/gtk-logo-rgb.gif share/gtk-2.0/demo/hypertext.c share/gtk-2.0/demo/iconview.c +share/gtk-2.0/demo/iconview_edit.c share/gtk-2.0/demo/images.c share/gtk-2.0/demo/list_store.c share/gtk-2.0/demo/menus.c @@ -385,6 +388,8 @@ share/locale/ja/LC_MESSAGES/gtk20-properties.mo share/locale/ja/LC_MESSAGES/gtk20.mo share/locale/ko/LC_MESSAGES/gtk20-properties.mo share/locale/ko/LC_MESSAGES/gtk20.mo +share/locale/ku/LC_MESSAGES/gtk20-properties.mo +share/locale/ku/LC_MESSAGES/gtk20.mo share/locale/li/LC_MESSAGES/gtk20-properties.mo share/locale/li/LC_MESSAGES/gtk20.mo share/locale/lt/LC_MESSAGES/gtk20-properties.mo @@ -445,6 +450,8 @@ share/locale/sv/LC_MESSAGES/gtk20-properties.mo share/locale/sv/LC_MESSAGES/gtk20.mo share/locale/ta/LC_MESSAGES/gtk20-properties.mo share/locale/ta/LC_MESSAGES/gtk20.mo +share/locale/te/LC_MESSAGES/gtk20-properties.mo +share/locale/te/LC_MESSAGES/gtk20.mo share/locale/th/LC_MESSAGES/gtk20-properties.mo share/locale/th/LC_MESSAGES/gtk20.mo share/locale/tk/LC_MESSAGES/gtk20-properties.mo @@ -470,20 +477,17 @@ share/locale/zh_CN/LC_MESSAGES/gtk20.mo share/locale/zh_TW/LC_MESSAGES/gtk20-properties.mo share/locale/zh_TW/LC_MESSAGES/gtk20.mo share/themes/Default/gtk-2.0-key/gtkrc -share/themes/Default/gtk-2.0/gtkrc share/themes/Emacs/gtk-2.0-key/gtkrc +share/themes/Raleigh/gtk-2.0/gtkrc +@exec /usr/bin/find %D/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 %D/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 @dirrm share/themes/Emacs @dirrm share/themes/Default/gtk-2.0-key -@dirrm share/themes/Default/gtk-2.0 @dirrm share/gtk-2.0/demo @dirrm share/gtk-2.0 -@unexec /bin/rmdir %D/lib/gtk-2.0/modules 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/lib/gtk-2.0/%%GTK_VERSION%%/loaders 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/lib/gtk-2.0/%%GTK_VERSION%%/immodules 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/lib/gtk-2.0/%%GTK_VERSION%%/engines 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/lib/gtk-2.0/%%GTK_VERSION%% 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/lib/gtk-2.0 2>/dev/null || /usr/bin/true @dirrm include/gtk-2.0/gtk @dirrm include/gtk-2.0/gdk-pixbuf-xlib @dirrm include/gtk-2.0/gdk-pixbuf @@ -494,27 +498,37 @@ share/themes/Emacs/gtk-2.0-key/gtkrc @exec /bin/mkdir -p %D/lib/gtk-2.0/%%GTK_VERSION%%/engines @unexec /bin/rmdir %D/share/themes/Default 2>/dev/null || /usr/bin/true @unexec /bin/rmdir %D/share/themes 2>/dev/null || /usr/bin/true -@unexec rmdir %D/share/locale/az_IR/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/az_IR 2> /dev/null || true -@unexec rmdir %D/share/locale/br/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/br 2> /dev/null || true -@unexec rmdir %D/share/locale/hy/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/hy 2> /dev/null || true -@unexec rmdir %D/share/locale/ia/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ia 2> /dev/null || true -@unexec rmdir %D/share/locale/mi/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/mi 2> /dev/null || true -@unexec rmdir %D/share/locale/mr/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/mr 2> /dev/null || true -@unexec rmdir %D/share/locale/nso/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/nso 2> /dev/null || true -@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/rw 2> /dev/null || true -@unexec rmdir %D/share/locale/sr@ije/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/sr@ije 2> /dev/null || true -@unexec rmdir %D/share/locale/uz@Latn/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/uz@Latn 2> /dev/null || true @unexec rmdir %D/share/locale/yi/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/yi 2> /dev/null || true -@unexec rmdir %D/share/locale/xh/LC_MESSAGES/ 2> /dev/null || true +@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/xh 2> /dev/null || true +@unexec rmdir %D/share/locale/te/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/te 2> /dev/null || true +@unexec rmdir %D/share/locale/uz@Latn/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/uz@Latn 2> /dev/null || true +@unexec rmdir %D/share/locale/sr@ije/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/sr@ije 2> /dev/null || true +@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/rw 2> /dev/null || true +@unexec rmdir %D/share/locale/nso/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/nso 2> /dev/null || true +@unexec rmdir %D/share/locale/mr/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/mr 2> /dev/null || true +@unexec rmdir %D/share/locale/mi/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/mi 2> /dev/null || true +@unexec rmdir %D/share/locale/ku/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/ku 2> /dev/null || true +@unexec rmdir %D/share/locale/ia/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/ia 2> /dev/null || true +@unexec rmdir %D/share/locale/hy/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/hy 2> /dev/null || true +@unexec rmdir %D/share/locale/br/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/br 2> /dev/null || true +@unexec rmdir %D/share/locale/az_IR/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/az_IR 2> /dev/null || true +@unexec /bin/rmdir %D/lib/gtk-2.0/modules 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/lib/gtk-2.0/%%GTK_VERSION%%/loaders 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/lib/gtk-2.0/%%GTK_VERSION%%/immodules 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/lib/gtk-2.0/%%GTK_VERSION%%/engines 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/lib/gtk-2.0/%%GTK_VERSION%% 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/lib/gtk-2.0 2>/dev/null || /usr/bin/true diff --git a/x11-toolkits/gtksourceview/Makefile b/x11-toolkits/gtksourceview/Makefile index a67fd229f3a3..0b738f66243c 100644 --- a/x11-toolkits/gtksourceview/Makefile +++ b/x11-toolkits/gtksourceview/Makefile @@ -3,13 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/x11-toolkits/gtksourceview/Makefile,v 1.23 2005/10/03 15:24:49 ahze Exp $ # PORTNAME= gtksourceview -PORTVERSION= 1.2.1 +PORTVERSION= 1.4.2 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.2 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.4 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -18,9 +19,10 @@ COMMENT= A text widget that adds syntax highlighting to the GtkTextView widget USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 INSTALLS_SHLIB= yes -USE_GNOME= gnomeprefix gnomehack libgnome libgnomeprintui +USE_GNOME= gnomeprefix gnomehack libgnome libgnomeprintui intlhack \ + ltverhack CONFIGURE_ARGS= --enable-compile-warnings=no CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib -lgnuregex" diff --git a/x11-toolkits/gtksourceview/distinfo b/x11-toolkits/gtksourceview/distinfo index 188e78930a68..5a1dfef26d5b 100644 --- a/x11-toolkits/gtksourceview/distinfo +++ b/x11-toolkits/gtksourceview/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gtksourceview-1.2.1.tar.bz2) = fb88eec6d174514a87f53e635f50041e -SIZE (gnome2/gtksourceview-1.2.1.tar.bz2) = 675115 +MD5 (gnome2/gtksourceview-1.4.2.tar.bz2) = 323a56ae9559af12f64fc5090955e68b +SIZE (gnome2/gtksourceview-1.4.2.tar.bz2) = 704867 diff --git a/x11-toolkits/gtksourceview/pkg-plist b/x11-toolkits/gtksourceview/pkg-plist index ce8bafb2b07b..185f1673872d 100644 --- a/x11-toolkits/gtksourceview/pkg-plist +++ b/x11-toolkits/gtksourceview/pkg-plist @@ -53,6 +53,7 @@ share/gnome/gtksourceview-1.0/language-specs/javascript.lang share/gnome/gtksourceview-1.0/language-specs/language.dtd share/gnome/gtksourceview-1.0/language-specs/latex.lang share/gnome/gtksourceview-1.0/language-specs/lua.lang +share/gnome/gtksourceview-1.0/language-specs/makefile.lang share/gnome/gtksourceview-1.0/language-specs/msil.lang share/gnome/gtksourceview-1.0/language-specs/nemerle.lang share/gnome/gtksourceview-1.0/language-specs/pascal.lang @@ -90,6 +91,7 @@ share/locale/fa/LC_MESSAGES/gtksourceview-1.0.mo share/locale/fi/LC_MESSAGES/gtksourceview-1.0.mo share/locale/fr/LC_MESSAGES/gtksourceview-1.0.mo share/locale/ga/LC_MESSAGES/gtksourceview-1.0.mo +share/locale/gl/LC_MESSAGES/gtksourceview-1.0.mo share/locale/gu/LC_MESSAGES/gtksourceview-1.0.mo share/locale/he/LC_MESSAGES/gtksourceview-1.0.mo share/locale/hi/LC_MESSAGES/gtksourceview-1.0.mo @@ -112,6 +114,7 @@ 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 share/locale/pt_BR/LC_MESSAGES/gtksourceview-1.0.mo +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 diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile index 7045ce502edc..dfef08682160 100644 --- a/x11-toolkits/libgnomeprintui/Makefile +++ b/x11-toolkits/libgnomeprintui/Makefile @@ -3,13 +3,14 @@ # Whom: Maxim Sobolev <sobomax@FreBSD.org> # # $FreeBSD$ +# $MCom: ports/x11-toolkits/libgnomeprintui/Makefile,v 1.53 2005/09/26 21:14:32 marcus Exp $ # PORTNAME= libgnomeprintui -PORTVERSION= 2.10.2 +PORTVERSION= 2.12.1 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -23,12 +24,14 @@ USE_X_PREFIX= yes USE_XPM= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack libgnomeprint libgnomecanvas \ - intlhack + intlhack ltverhack USE_REINPLACE= yes INSTALLS_SHLIB= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 USE_BISON= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +PLIST_SUB= VERSION=${PORTVERSION} + .include <bsd.port.mk> diff --git a/x11-toolkits/libgnomeprintui/distinfo b/x11-toolkits/libgnomeprintui/distinfo index 85294dc7b6da..bc22413317b5 100644 --- a/x11-toolkits/libgnomeprintui/distinfo +++ b/x11-toolkits/libgnomeprintui/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libgnomeprintui-2.10.2.tar.bz2) = 01fce7918f4e106e00ee8b5447783e4c -SIZE (gnome2/libgnomeprintui-2.10.2.tar.bz2) = 626042 +MD5 (gnome2/libgnomeprintui-2.12.1.tar.bz2) = fa0b0410c3ba8b6899c5ed278f02cbe5 +SIZE (gnome2/libgnomeprintui-2.12.1.tar.bz2) = 646459 diff --git a/x11-toolkits/libgnomeprintui/pkg-plist b/x11-toolkits/libgnomeprintui/pkg-plist index bd41a2e5cbd3..0a333a7a0faa 100644 --- a/x11-toolkits/libgnomeprintui/pkg-plist +++ b/x11-toolkits/libgnomeprintui/pkg-plist @@ -1,5 +1,6 @@ include/libgnomeprintui-2.2/libgnomeprintui/gnome-font-dialog.h include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-config-dialog.h +include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-content-selector.h include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-dialog.h include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-job-preview.h include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-paper-selector.h @@ -8,25 +9,9 @@ include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-unit-selector.h include/libgnomeprintui-2.2/libgnomeprintui/libgnomeprintui-enum-types.h lib/libgnomeprintui-2-2.a lib/libgnomeprintui-2-2.so -lib/libgnomeprintui-2-2.so.1 +lib/libgnomeprintui-2-2.so.0 libdata/pkgconfig/libgnomeprintui-2.2.pc -%%DOCSDIR%%/ch02.html -%%DOCSDIR%%/home.png -%%DOCSDIR%%/index.html -%%DOCSDIR%%/index.sgml -%%DOCSDIR%%/left.png -%%DOCSDIR%%/libgnomeprintui-gnome-font-dialog.html -%%DOCSDIR%%/libgnomeprintui-gnome-print-copies.html -%%DOCSDIR%%/libgnomeprintui-gnome-print-dialog.html -%%DOCSDIR%%/libgnomeprintui-gnome-print-job-preview.html -%%DOCSDIR%%/libgnomeprintui-gnome-print-paper-selector.html -%%DOCSDIR%%/libgnomeprintui-gnome-print-preview.html -%%DOCSDIR%%/libgnomeprintui-gnome-printer-selector.html -%%DOCSDIR%%/libgnomeprintui.devhelp -%%DOCSDIR%%/libgnomeprintui.html -%%DOCSDIR%%/right.png -%%DOCSDIR%%/style.css -%%DOCSDIR%%/up.png +share/gnome/libgnomeprintui/%%VERSION%%/gnome-print-job-preview.xml share/locale/af/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/am/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/ar/LC_MESSAGES/libgnomeprintui-2.2.mo @@ -80,6 +65,7 @@ share/locale/pt/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/pt_BR/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/ro/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/ru/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/rw/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/sk/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/sl/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/sq/LC_MESSAGES/libgnomeprintui-2.2.mo @@ -87,13 +73,16 @@ share/locale/sr/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/sr@Latn/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/sv/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/ta/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/te/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/th/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/tr/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/uk/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/vi/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/wa/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/xh/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/zh_CN/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/zh_TW/LC_MESSAGES/libgnomeprintui-2.2.mo -@dirrm %%DOCSDIR%% +@dirrm share/gnome/libgnomeprintui/%%VERSION%% +@dirrm share/gnome/libgnomeprintui @dirrm include/libgnomeprintui-2.2/libgnomeprintui @dirrm include/libgnomeprintui-2.2 diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile index 89ecfea12e81..f42acce28250 100644 --- a/x11-toolkits/libgnomeui/Makefile +++ b/x11-toolkits/libgnomeui/Makefile @@ -3,14 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreBSD.org> # # $FreeBSD$ -# +# $MCom: ports/x11-toolkits/libgnomeui/Makefile,v 1.66 2005/09/07 04:43:08 marcus Exp $ PORTNAME= libgnomeui -PORTVERSION= 2.10.1 +PORTVERSION= 2.12.0 PORTREVISION= 1 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -24,9 +24,9 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_XPM= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack gnomehier libbonoboui +USE_GNOME= gnomeprefix gnomehack gnomehier libbonoboui ltverhack INSTALLS_SHLIB= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 USE_BISON= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" diff --git a/x11-toolkits/libgnomeui/distinfo b/x11-toolkits/libgnomeui/distinfo index 77dc80cbe1ef..54f89dc79414 100644 --- a/x11-toolkits/libgnomeui/distinfo +++ b/x11-toolkits/libgnomeui/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libgnomeui-2.10.1.tar.bz2) = bc52006f097017adda8cb90e31743866 -SIZE (gnome2/libgnomeui-2.10.1.tar.bz2) = 1705230 +MD5 (gnome2/libgnomeui-2.12.0.tar.bz2) = 342a5b8a9d427ff950a71a245a5f4485 +SIZE (gnome2/libgnomeui-2.12.0.tar.bz2) = 1831358 diff --git a/x11-toolkits/libgnomeui/files/patch-file-chooser::gtkfilesystemgnomevfs.c b/x11-toolkits/libgnomeui/files/patch-file-chooser::gtkfilesystemgnomevfs.c deleted file mode 100644 index 9afa5350522e..000000000000 --- a/x11-toolkits/libgnomeui/files/patch-file-chooser::gtkfilesystemgnomevfs.c +++ /dev/null @@ -1,24 +0,0 @@ ---- file-chooser/gtkfilesystemgnomevfs.c.orig Sun Mar 20 20:58:22 2005 -+++ file-chooser/gtkfilesystemgnomevfs.c Sun Mar 20 20:59:03 2005 -@@ -2536,13 +2536,20 @@ - GtkFileSystemGnomeVFS *system_vfs; - GConfValue *value; - -+ GDK_THREADS_ENTER(); -+ - system_vfs = GTK_FILE_SYSTEM_GNOME_VFS (data); - - if (strcmp (gconf_entry_get_key (entry), BOOKMARKS_KEY) != 0) -- return; -+ { -+ GDK_THREADS_LEAVE(); -+ return; -+ } - - value = gconf_entry_get_value (entry); - set_bookmarks_from_value (system_vfs, value, TRUE); -+ -+ GDK_THREADS_LEAVE(); - } - #endif - diff --git a/x11-toolkits/libgnomeui/pkg-plist b/x11-toolkits/libgnomeui/pkg-plist index df103966c238..0ee38ebceff8 100644 --- a/x11-toolkits/libgnomeui/pkg-plist +++ b/x11-toolkits/libgnomeui/pkg-plist @@ -53,7 +53,7 @@ lib/gtk-2.0/%%GTK_VERSION%%/filesystems/libgnome-vfs.so lib/libglade/2.0/libgnome.so lib/libgnomeui-2.a lib/libgnomeui-2.so -lib/libgnomeui-2.so.1000 +lib/libgnomeui-2.so.0 libdata/pkgconfig/libgnomeui-2.0.pc libexec/gnome_segv2 %%DOCSDIR%%/GnomeAbout.html @@ -187,6 +187,7 @@ share/locale/it/LC_MESSAGES/libgnomeui-2.0.mo share/locale/ja/LC_MESSAGES/libgnomeui-2.0.mo share/locale/kn/LC_MESSAGES/libgnomeui-2.0.mo share/locale/ko/LC_MESSAGES/libgnomeui-2.0.mo +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 @@ -217,6 +218,7 @@ share/locale/sr@Latn/LC_MESSAGES/libgnomeui-2.0.mo share/locale/sr@ije/LC_MESSAGES/libgnomeui-2.0.mo share/locale/sv/LC_MESSAGES/libgnomeui-2.0.mo share/locale/ta/LC_MESSAGES/libgnomeui-2.0.mo +share/locale/te/LC_MESSAGES/libgnomeui-2.0.mo share/locale/th/LC_MESSAGES/libgnomeui-2.0.mo share/locale/tk/LC_MESSAGES/libgnomeui-2.0.mo share/locale/tr/LC_MESSAGES/libgnomeui-2.0.mo @@ -228,7 +230,11 @@ share/locale/yi/LC_MESSAGES/libgnomeui-2.0.mo share/locale/zh_CN/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 +@unexec rmdir %D/share/locale/te/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/te 2> /dev/null || true +@unexec rmdir %D/share/locale/ku/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/ku 2> /dev/null || true @dirrm %%DOCSDIR%% -@dirrm lib/gtk-2.0/%%GTK_VERSION%%/filesystems @dirrm include/libgnomeui-2.0/libgnomeui @dirrm include/libgnomeui-2.0 +@dirrm lib/gtk-2.0/%%GTK_VERSION%%/filesystems diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile index 9c2b7d217131..359ec22f9d79 100644 --- a/x11-toolkits/libwnck/Makefile +++ b/x11-toolkits/libwnck/Makefile @@ -3,13 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/x11-toolkits/libwnck/Makefile,v 1.52 2005/10/03 15:44:48 ahze Exp $ # PORTNAME= libwnck -PORTVERSION= 2.10.3 +PORTVERSION= 2.12.1 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -20,10 +21,10 @@ LIB_DEPENDS= startup-notification-1.0:${PORTSDIR}/x11/startup-notification USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOME= gnomehack gtk20 +USE_GNOME= gnomehack gtk20 ltverhack USE_BISON= yes INSTALLS_SHLIB= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11-toolkits/libwnck/distinfo b/x11-toolkits/libwnck/distinfo index 5f5414ccb045..c3ab6e15a530 100644 --- a/x11-toolkits/libwnck/distinfo +++ b/x11-toolkits/libwnck/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libwnck-2.10.3.tar.bz2) = 0df4df1ae1129e521c77420d33a5b7f6 -SIZE (gnome2/libwnck-2.10.3.tar.bz2) = 429835 +MD5 (gnome2/libwnck-2.12.1.tar.bz2) = f7aad7b8dad79b38d3055d84c3838e2c +SIZE (gnome2/libwnck-2.12.1.tar.bz2) = 441443 diff --git a/x11-toolkits/libwnck/pkg-plist b/x11-toolkits/libwnck/pkg-plist index 2986836ba3d4..0036c70b6062 100644 --- a/x11-toolkits/libwnck/pkg-plist +++ b/x11-toolkits/libwnck/pkg-plist @@ -12,7 +12,7 @@ include/libwnck-1.0/libwnck/wnck-enum-types.h include/libwnck-1.0/libwnck/workspace.h lib/libwnck-1.a lib/libwnck-1.so -lib/libwnck-1.so.16 +lib/libwnck-1.so.18 libdata/pkgconfig/libwnck-1.0.pc %%DOCSDIR%%/ch01.html %%DOCSDIR%%/home.png @@ -113,14 +113,6 @@ share/locale/wa/LC_MESSAGES/libwnck.mo share/locale/xh/LC_MESSAGES/libwnck.mo share/locale/zh_CN/LC_MESSAGES/libwnck.mo share/locale/zh_TW/LC_MESSAGES/libwnck.mo -@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/xh 2> /dev/null || true -@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/rw 2> /dev/null || true -@unexec rmdir %D/share/locale/mr/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/mr 2> /dev/null || true -@unexec rmdir %D/share/locale/mi/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/mi 2> /dev/null || true @dirrm %%DOCSDIR%% @dirrm include/libwnck-1.0/libwnck @dirrm include/libwnck-1.0 diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile index 19610636faf2..b84857142399 100644 --- a/x11-toolkits/pango/Makefile +++ b/x11-toolkits/pango/Makefile @@ -3,20 +3,22 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/x11-toolkits/pango/Makefile,v 1.43 2005/10/03 15:42:47 ahze Exp $ # PORTNAME= pango -PORTVERSION= 1.8.2 +PORTVERSION= 1.10.1 CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/1.8,} \ - ftp://ftp.gtk.org/pub/gtk/v2.6/ +MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/1.10,} \ + ftp://ftp.gtk.org/pub/gtk/v2.7/ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= An open-source framework for the layout and rendering of i18n text BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 -LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft +LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft \ + cairo.2:${PORTSDIR}/graphics/cairo RUN_DEPENDS= ${FONTSCALE}:${X_FONTS_TTF_PORT} \ ${FONTENCOD}:${X_FONTS_ENCODINGS_PORT} @@ -26,8 +28,8 @@ USE_X_PREFIX= yes USE_GMAKE= yes USE_REINPLACE= yes INSTALLS_SHLIB= yes -USE_LIBTOOL_VER=15 -USE_GNOME= gnomehack glib20 +USE_AUTOTOOLS= libtool:15 +USE_GNOME= gnomehack glib20 ltverhack CONFIGURE_ARGS= --with-qt=no \ --with-html-dir=${PREFIX}/share/doc \ --enable-static @@ -52,9 +54,6 @@ post-patch: @${FIND} ${WRKSRC}/pango/opentype -name "*.[ch]" | ${XARGS} \ ${REINPLACE_CMD} -e 's|internal/tterrors\.h|fterrors.h| ; \ s|TT_Err_|FT_Err_|g' - @${REINPLACE_CMD} -e 's|LT_VERSION_INFO="801:1:801"|LT_VERSION_INFO="800:1:800"|g' \ - ${WRKSRC}/configure - post-install: @${SED} -e 's|%%X11BASE%%|${X11BASE}|' < ${FILESDIR}/pkg-install.in \ > ${PKGINSTALL} diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo index d3637baa544b..4666201303b7 100644 --- a/x11-toolkits/pango/distinfo +++ b/x11-toolkits/pango/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/pango-1.8.2.tar.bz2) = f5b5da7a173f0566d8217ec112fde993 -SIZE (gnome2/pango-1.8.2.tar.bz2) = 1021372 +MD5 (gnome2/pango-1.10.1.tar.bz2) = 1ff4c96982f61ea6f390d09a4febdf18 +SIZE (gnome2/pango-1.10.1.tar.bz2) = 1186783 diff --git a/x11-toolkits/pango/files/patch-ac b/x11-toolkits/pango/files/patch-ac index 362dcd3f45d5..e6215105d2ee 100644 --- a/x11-toolkits/pango/files/patch-ac +++ b/x11-toolkits/pango/files/patch-ac @@ -1,5 +1,6 @@ $FreeBSD$ + $MCom: ports/x11-toolkits/pango/files/patch-ac,v 1.15 2005/06/28 05:40:16 adamw Exp $ --- Makefile.in.orig Mon Aug 2 19:12:56 2004 +++ Makefile.in Mon Aug 2 19:13:11 2004 diff --git a/x11-toolkits/pango/pkg-plist b/x11-toolkits/pango/pkg-plist index 46c8656d3cde..9eb6d24a8d7c 100644 --- a/x11-toolkits/pango/pkg-plist +++ b/x11-toolkits/pango/pkg-plist @@ -22,6 +22,7 @@ include/pango-1.0/pango/pango-tabs.h include/pango-1.0/pango/pango-types.h include/pango-1.0/pango/pango-utils.h include/pango-1.0/pango/pango.h +include/pango-1.0/pango/pangocairo.h include/pango-1.0/pango/pangofc-decoder.h include/pango-1.0/pango/pangofc-font.h include/pango-1.0/pango/pangofc-fontmap.h @@ -31,16 +32,19 @@ include/pango-1.0/pango/pangoxft-render.h include/pango-1.0/pango/pangoxft.h lib/libpango-1.0.a lib/libpango-1.0.so -lib/libpango-1.0.so.800 +lib/libpango-1.0.so.0 +lib/libpangocairo-1.0.a +lib/libpangocairo-1.0.so +lib/libpangocairo-1.0.so.0 lib/libpangoft2-1.0.a lib/libpangoft2-1.0.so -lib/libpangoft2-1.0.so.800 +lib/libpangoft2-1.0.so.0 lib/libpangox-1.0.a lib/libpangox-1.0.so -lib/libpangox-1.0.so.800 +lib/libpangox-1.0.so.0 lib/libpangoxft-1.0.a lib/libpangoxft-1.0.so -lib/libpangoxft-1.0.so.800 +lib/libpangoxft-1.0.so.0 lib/pango/%%VERSION%%/modules/pango-arabic-fc.so lib/pango/%%VERSION%%/modules/pango-basic-fc.so lib/pango/%%VERSION%%/modules/pango-basic-x.so @@ -52,6 +56,7 @@ lib/pango/%%VERSION%%/modules/pango-syriac-fc.so lib/pango/%%VERSION%%/modules/pango-thai-fc.so lib/pango/%%VERSION%%/modules/pango-tibetan-fc.so libdata/pkgconfig/pango.pc +libdata/pkgconfig/pangocairo.pc libdata/pkgconfig/pangoft2.pc libdata/pkgconfig/pangox.pc libdata/pkgconfig/pangoxft.pc @@ -68,6 +73,7 @@ libdata/pkgconfig/pangoxft.pc %%DOCSDIR%%/layout.gif %%DOCSDIR%%/left.png %%DOCSDIR%%/lowlevel.html +%%DOCSDIR%%/pango-Cairo-Rendering.html %%DOCSDIR%%/pango-Coverage-Maps.html %%DOCSDIR%%/pango-Engines.html %%DOCSDIR%%/pango-Fonts.html @@ -88,6 +94,7 @@ libdata/pkgconfig/pangoxft.pc %%DOCSDIR%%/pango.html %%DOCSDIR%%/rendering.html %%DOCSDIR%%/right.png +%%DOCSDIR%%/rotated-text.png %%DOCSDIR%%/style.css %%DOCSDIR%%/tools.html %%DOCSDIR%%/up.png |