diff options
358 files changed, 4567 insertions, 5489 deletions
diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile index 43121bd21a09..553b6210ba23 100644 --- a/accessibility/at-spi/Makefile +++ b/accessibility/at-spi/Makefile @@ -6,10 +6,10 @@ # PORTNAME= at-spi -PORTVERSION= 1.2.1 +PORTVERSION= 1.3.7 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.2 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.3 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/accessibility/at-spi/distinfo b/accessibility/at-spi/distinfo index 54ca92afb782..1c53333d61c8 100644 --- a/accessibility/at-spi/distinfo +++ b/accessibility/at-spi/distinfo @@ -1 +1 @@ -MD5 (gnome2/at-spi-1.2.1.tar.bz2) = 562620310d9150e4803a275311f0088d +MD5 (gnome2/at-spi-1.3.7.tar.bz2) = c5ee8c9ae592c547ac557fa58003b021 diff --git a/accessibility/at-spi/files/patch-atk-bridge_Makefile.in b/accessibility/at-spi/files/patch-atk-bridge_Makefile.in new file mode 100644 index 000000000000..9c50885971b2 --- /dev/null +++ b/accessibility/at-spi/files/patch-atk-bridge_Makefile.in @@ -0,0 +1,11 @@ +--- atk-bridge/Makefile.in.orig Sat Apr 12 01:06:28 2003 ++++ atk-bridge/Makefile.in Sat Apr 12 01:06:48 2003 +@@ -147,7 +147,7 @@ + + LDFLAGS = @LDFLAGS@ -no-undefined -module -avoid-version + +-libatk_bridge_la_LIBADD = $(ATK_BRIDGE_LIBS) $(top_builddir)/libspi/libspi.la ++libatk_bridge_la_LIBADD = $(ATK_BRIDGE_LIBS) -L$(top_builddir)/libspi/.libs $(top_builddir)/libspi/libspi.la + + CFLAGS = @CFLAGS@ $(ATK_BRIDGE_CFLAGS) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/accessibility/at-spi/files/patch-libspi_Makefile.in b/accessibility/at-spi/files/patch-libspi_Makefile.in new file mode 100644 index 000000000000..cfb55a212a86 --- /dev/null +++ b/accessibility/at-spi/files/patch-libspi_Makefile.in @@ -0,0 +1,11 @@ +--- libspi/Makefile.in.orig Fri May 2 13:36:07 2003 ++++ libspi/Makefile.in Fri May 2 13:36:37 2003 +@@ -539,7 +539,7 @@ + mostlyclean distclean maintainer-clean + + +-$(top_srcdir)/libspi/accessible.c $(top_srcdir)/libspi/base.h $(top_srcdir)/libspi/keystrokelistener.h $(top_srcdir)/libspi/libspi.h $(top_srcdir)/libspi/listener.h $(top_srcdir)/libspi/remoteobject.h : Accessibility.h ++accessible.c base.h keystrokelistener.h libspi.h listener.h remoteobject.h : Accessibility.h + + $(IDL_OUT) Accessibility-imodule.c : $(IDL_DEPS) $(ORBIT_IDL) + $(ORBIT_IDL) -D__ACCESSIBILITY_COMPILATION__ $(IDLFLAGS) $(top_srcdir)/idl/Accessibility.idl diff --git a/accessibility/at-spi/files/patch-registryd_Makefile.in b/accessibility/at-spi/files/patch-registryd_Makefile.in new file mode 100644 index 000000000000..7729e9da1400 --- /dev/null +++ b/accessibility/at-spi/files/patch-registryd_Makefile.in @@ -0,0 +1,11 @@ +--- registryd/Makefile.in.orig Fri Aug 8 12:15:34 2003 ++++ registryd/Makefile.in Fri Aug 8 12:20:05 2003 +@@ -150,7 +150,7 @@ + at_spi_registryd_SOURCES = desktop.c desktop.h deviceeventcontroller.c deviceeventcontroller.h registry-main.c registry.c registry.h + + +-LDADD = $(top_builddir)/libspi/libspi.la $(X_LIBS) $(XTST_LIBS) $(XEVIE_LIBS) $(REGISTRYD_LIBS) ++LDADD = -L$(top_builddir)/libspi/.libs $(top_builddir)/libspi/libspi.la $(X_LIBS) $(XTST_LIBS) $(XEVIE_LIBS) $(REGISTRYD_LIBS) + + serverinfodir = $(prefix)/libdata/bonobo/servers + serverinfo_DATA = Accessibility_Registry.server diff --git a/accessibility/at-spi/pkg-plist b/accessibility/at-spi/pkg-plist index 54c07250ed45..fe058837b88e 100644 --- a/accessibility/at-spi/pkg-plist +++ b/accessibility/at-spi/pkg-plist @@ -23,42 +23,41 @@ include/at-spi-1.0/libspi/relation.h include/at-spi-1.0/libspi/remoteobject.h include/at-spi-1.0/libspi/selection.h include/at-spi-1.0/libspi/stateset.h +include/at-spi-1.0/libspi/streamablecontent.h include/at-spi-1.0/libspi/table.h include/at-spi-1.0/libspi/text.h include/at-spi-1.0/libspi/value.h lib/libcspi.a lib/libcspi.so -lib/libcspi.so.0 +lib/libcspi.so.9 lib/libspi.a lib/libspi.so -lib/libspi.so.0 +lib/libspi.so.9 lib/gtk-2.0/modules/libatk-bridge.so lib/orbit-2.0/Accessibility_module.so libdata/bonobo/servers/Accessibility_Registry.server libdata/pkgconfig/cspi-1.0.pc libdata/pkgconfig/libspi-1.0.pc libexec/at-spi-registryd -share/doc/at-spi-cspi/at-spi-cspi-accessible-objects.html -share/doc/at-spi-cspi/at-spi-cspi-accessibleaction-interface.html -share/doc/at-spi-cspi/at-spi-cspi-accessibleapplication-api.html -share/doc/at-spi-cspi/at-spi-cspi-accessiblecomponent-interface.html -share/doc/at-spi-cspi/at-spi-cspi-accessibleeditabletext-interface.html -share/doc/at-spi-cspi/at-spi-cspi-accessiblehyperlink-interface.html -share/doc/at-spi-cspi/at-spi-cspi-accessiblehypertext-interface.html -share/doc/at-spi-cspi/at-spi-cspi-accessibleimage-interface.html -share/doc/at-spi-cspi/at-spi-cspi-accessiblerelations-and-relationsets.html -share/doc/at-spi-cspi/at-spi-cspi-accessibleselection-interface.html -share/doc/at-spi-cspi/at-spi-cspi-accessibletable-interface.html -share/doc/at-spi-cspi/at-spi-cspi-accessibletext-interface.html -share/doc/at-spi-cspi/at-spi-cspi-accessiblevalue-interface.html -share/doc/at-spi-cspi/at-spi-cspi-event-listener-support.html -share/doc/at-spi-cspi/at-spi-cspi-registry-queries.html -share/doc/at-spi-cspi/at-spi-cspi-spi-main-loop-and-initialization.html -share/doc/at-spi-cspi/at-spi-cspi-state-and-statesets.html -share/doc/at-spi-cspi/book1.html -share/doc/at-spi-cspi/c5968.html -share/doc/at-spi-cspi/c7152.html -share/doc/at-spi-cspi/index.sgml +share/doc/at-spi-cspi/at-spi-cspi-Accessible-Objects.html +share/doc/at-spi-cspi/at-spi-cspi-AccessibleAction-Interface.html +share/doc/at-spi-cspi/at-spi-cspi-AccessibleApplication-API.html +share/doc/at-spi-cspi/at-spi-cspi-AccessibleComponent-Interface.html +share/doc/at-spi-cspi/at-spi-cspi-AccessibleEditableText-Interface.html +share/doc/at-spi-cspi/at-spi-cspi-AccessibleHyperlink-Interface.html +share/doc/at-spi-cspi/at-spi-cspi-AccessibleHypertext-Interface.html +share/doc/at-spi-cspi/at-spi-cspi-AccessibleImage-Interface.html +share/doc/at-spi-cspi/at-spi-cspi-AccessibleRelations-and-RelationSets.html +share/doc/at-spi-cspi/at-spi-cspi-AccessibleSelection-Interface.html +share/doc/at-spi-cspi/at-spi-cspi-AccessibleTable-Interface.html +share/doc/at-spi-cspi/at-spi-cspi-AccessibleText-Interface.html +share/doc/at-spi-cspi/at-spi-cspi-AccessibleValue-Interface.html +share/doc/at-spi-cspi/at-spi-cspi-Event-Listener-Support.html +share/doc/at-spi-cspi/at-spi-cspi-Registry-queries.html +share/doc/at-spi-cspi/at-spi-cspi-SPI-main-loop-and-initialization.html +share/doc/at-spi-cspi/at-spi-cspi-State-and-StateSets.html +share/doc/at-spi-cspi/ch05.html +share/doc/at-spi-cspi/index.html share/doc/at-spi-cspi/spi-accessible.html share/doc/at-spi-cspi/spi-application.html share/doc/at-spi-cspi/spi-component.html diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile index c1e90ae997ae..cdb15a965be0 100644 --- a/accessibility/atk/Makefile +++ b/accessibility/atk/Makefile @@ -6,16 +6,11 @@ # PORTNAME= atk -PORTVERSION= 1.2.4 +PORTVERSION= 1.4.0 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME} \ ftp://ftp.gtk.org/pub/gtk/v2.0/ -MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.2 -#MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \ -# ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \ -# http://www.ameth.org/gimp/%SUBDIR%/ \ -# ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,} -#MASTER_SITE_SUBDIR= gtk/v1.3 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.4 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/accessibility/atk/distinfo b/accessibility/atk/distinfo index dba292c1ff10..dd36e926e35d 100644 --- a/accessibility/atk/distinfo +++ b/accessibility/atk/distinfo @@ -1 +1 @@ -MD5 (gnome2/atk-1.2.4.tar.bz2) = 2d6d50df31abe0e8892b5d3e7676a02d +MD5 (gnome2/atk-1.4.0.tar.bz2) = e501dde880fb2bbe77e428cfa2ee25f6 diff --git a/accessibility/atk/pkg-descr b/accessibility/atk/pkg-descr index c962374e2a31..b28d3e537b26 100644 --- a/accessibility/atk/pkg-descr +++ b/accessibility/atk/pkg-descr @@ -1,3 +1,12 @@ -GNOME accessibility toolkit (ATK). +Accessibility means helping people with disabilities to participate in +substantial life activities. That includes work, and the use of services, +products, and information. GNOME includes libraries and a support framework +that allow people with disabilities to utilize all of the functionality of the +GNOME user environment. + +The GNOME Accessibility Toolkit (ATK) describes a set of interfaces that need +to be implemented by GUI components to make them accessible. The interfaces are +toolkit-independent-- implementations could be written for any widget set, such +as GTK, Motif or Qt. WWW: http://developer.gnome.org/projects/gap/ diff --git a/accessibility/atk/pkg-plist b/accessibility/atk/pkg-plist index dc154a81a2b3..85189b700f6f 100644 --- a/accessibility/atk/pkg-plist +++ b/accessibility/atk/pkg-plist @@ -26,38 +26,39 @@ include/atk-1.0/atk/atkutil.h include/atk-1.0/atk/atkvalue.h lib/libatk-1.0.a lib/libatk-1.0.so -lib/libatk-1.0.so.200 +lib/libatk-1.0.so.400 libdata/pkgconfig/atk.pc -share/doc/atk/atk-atkstate.html -share/doc/atk/atk.html -share/doc/atk/atkaction.html -share/doc/atk/atkcomponent.html -share/doc/atk/atkdocument.html -share/doc/atk/atkeditabletext.html -share/doc/atk/atkgobjectaccessible.html -share/doc/atk/atkhyperlink.html -share/doc/atk/atkhypertext.html -share/doc/atk/atkimage.html -share/doc/atk/atknoopobject.html -share/doc/atk/atknoopobjectfactory.html -share/doc/atk/atkobject.html -share/doc/atk/atkobjectfactory.html -share/doc/atk/atkregistry.html -share/doc/atk/atkrelation.html -share/doc/atk/atkrelationset.html -share/doc/atk/atkselection.html -share/doc/atk/atkstateset.html -share/doc/atk/atkstreamablecontent.html -share/doc/atk/atktable.html -share/doc/atk/atktext.html -share/doc/atk/atkutil.html -share/doc/atk/atkvalue.html -share/doc/atk/book1.html -share/doc/atk/home.png -share/doc/atk/index.sgml -share/doc/atk/left.png -share/doc/atk/right.png -share/doc/atk/up.png +%%DOCSDIR%%/AtkAction.html +%%DOCSDIR%%/AtkComponent.html +%%DOCSDIR%%/AtkDocument.html +%%DOCSDIR%%/AtkEditableText.html +%%DOCSDIR%%/AtkGObjectAccessible.html +%%DOCSDIR%%/AtkHyperlink.html +%%DOCSDIR%%/AtkHypertext.html +%%DOCSDIR%%/AtkImage.html +%%DOCSDIR%%/AtkNoOpObject.html +%%DOCSDIR%%/AtkNoOpObjectFactory.html +%%DOCSDIR%%/AtkObject.html +%%DOCSDIR%%/AtkObjectFactory.html +%%DOCSDIR%%/AtkRegistry.html +%%DOCSDIR%%/AtkRelation.html +%%DOCSDIR%%/AtkRelationSet.html +%%DOCSDIR%%/AtkSelection.html +%%DOCSDIR%%/AtkStateSet.html +%%DOCSDIR%%/AtkStreamableContent.html +%%DOCSDIR%%/AtkTable.html +%%DOCSDIR%%/AtkText.html +%%DOCSDIR%%/AtkUtil.html +%%DOCSDIR%%/AtkValue.html +%%DOCSDIR%%/atk-AtkState.html +%%DOCSDIR%%/atk.devhelp +%%DOCSDIR%%/atk.html +%%DOCSDIR%%/home.png +%%DOCSDIR%%/index.html +%%DOCSDIR%%/index.sgml +%%DOCSDIR%%/left.png +%%DOCSDIR%%/right.png +%%DOCSDIR%%/up.png share/locale/am/LC_MESSAGES/atk10.mo share/locale/az/LC_MESSAGES/atk10.mo share/locale/be/LC_MESSAGES/atk10.mo @@ -65,6 +66,7 @@ share/locale/bg/LC_MESSAGES/atk10.mo share/locale/bn/LC_MESSAGES/atk10.mo share/locale/ca/LC_MESSAGES/atk10.mo share/locale/cs/LC_MESSAGES/atk10.mo +share/locale/cy/LC_MESSAGES/atk10.mo share/locale/da/LC_MESSAGES/atk10.mo share/locale/de/LC_MESSAGES/atk10.mo share/locale/el/LC_MESSAGES/atk10.mo @@ -74,6 +76,7 @@ share/locale/es/LC_MESSAGES/atk10.mo share/locale/fa/LC_MESSAGES/atk10.mo share/locale/fi/LC_MESSAGES/atk10.mo share/locale/fr/LC_MESSAGES/atk10.mo +share/locale/ga/LC_MESSAGES/atk10.mo share/locale/he/LC_MESSAGES/atk10.mo share/locale/hi/LC_MESSAGES/atk10.mo share/locale/hu/LC_MESSAGES/atk10.mo @@ -83,11 +86,13 @@ share/locale/it/LC_MESSAGES/atk10.mo share/locale/ja/LC_MESSAGES/atk10.mo share/locale/kn/LC_MESSAGES/atk10.mo share/locale/ko/LC_MESSAGES/atk10.mo +share/locale/li/LC_MESSAGES/atk10.mo share/locale/lv/LC_MESSAGES/atk10.mo share/locale/mk/LC_MESSAGES/atk10.mo share/locale/ml/LC_MESSAGES/atk10.mo share/locale/mn/LC_MESSAGES/atk10.mo share/locale/ms/LC_MESSAGES/atk10.mo +share/locale/ne/LC_MESSAGES/atk10.mo share/locale/nl/LC_MESSAGES/atk10.mo share/locale/no/LC_MESSAGES/atk10.mo share/locale/pl/LC_MESSAGES/atk10.mo @@ -108,6 +113,6 @@ share/locale/vi/LC_MESSAGES/atk10.mo share/locale/yi/LC_MESSAGES/atk10.mo share/locale/zh_CN/LC_MESSAGES/atk10.mo share/locale/zh_TW/LC_MESSAGES/atk10.mo -@dirrm share/doc/atk +@dirrm %%DOCSDIR%% @dirrm include/atk-1.0/atk @dirrm include/atk-1.0 diff --git a/accessibility/gail/Makefile b/accessibility/gail/Makefile index 2f81cac2a9a8..9a66364bd004 100644 --- a/accessibility/gail/Makefile +++ b/accessibility/gail/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gail -PORTVERSION= 1.2.2 +PORTVERSION= 1.4.0 CATEGORIES= x11-toolkits 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 diff --git a/accessibility/gail/distinfo b/accessibility/gail/distinfo index 7b01394f42b0..1c8abbab58fe 100644 --- a/accessibility/gail/distinfo +++ b/accessibility/gail/distinfo @@ -1 +1 @@ -MD5 (gnome2/gail-1.2.2.tar.bz2) = cace76d052501c10f57c145618205509 +MD5 (gnome2/gail-1.4.0.tar.bz2) = 6eba35f812cf007da332a9fef4865e71 diff --git a/accessibility/gail/files/patch-docs_reference_libgail-util_Makefile.in b/accessibility/gail/files/patch-docs_reference_libgail-util_Makefile.in new file mode 100644 index 000000000000..c61bc365ad8f --- /dev/null +++ b/accessibility/gail/files/patch-docs_reference_libgail-util_Makefile.in @@ -0,0 +1,11 @@ +--- docs/reference/libgail-util/Makefile.in.orig Thu May 15 14:45:49 2003 ++++ docs/reference/libgail-util/Makefile.in Thu May 15 14:47:43 2003 +@@ -299,8 +299,6 @@ + echo '-- Installing '$$i ; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ + done; \ +- echo '-- Installing $(srcdir)/html/index.sgml' ; \ +- $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \ + fi) + + # diff --git a/accessibility/gail/pkg-plist b/accessibility/gail/pkg-plist index a947bd3a9d5d..a45c4b6a4380 100644 --- a/accessibility/gail/pkg-plist +++ b/accessibility/gail/pkg-plist @@ -8,9 +8,11 @@ lib/libgailutil.so lib/libgailutil.so.17 libdata/pkgconfig/gail.pc share/doc/gail-libgail-util/book1.html +share/doc/gail-libgail-util/gail-libgail-util-GailMisc.html +share/doc/gail-libgail-util/gail-libgail-util-GailTextUtil.html share/doc/gail-libgail-util/gail-libgail-util-gailmisc.html share/doc/gail-libgail-util/gail-libgail-util-gailtextutil.html -share/doc/gail-libgail-util/index.sgml +share/doc/gail-libgail-util/index.html share/doc/gail-libgail-util/libgail-util-main.html @dirrm share/doc/gail-libgail-util @dirrm lib/gtk-2.0/modules diff --git a/accessibility/gok/Makefile b/accessibility/gok/Makefile index 020a95a5f68e..405fba06569d 100644 --- a/accessibility/gok/Makefile +++ b/accessibility/gok/Makefile @@ -6,15 +6,16 @@ # PORTNAME= gok -PORTVERSION= 0.7.5 -CATEGORIES= sysutils gnome +PORTVERSION= 0.8.2 +CATEGORIES= sysutils gnome accessibility MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.7 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.8 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME On-Screen Keyboard (GOK) +USE_BZIP2= yes USE_X_PREFIX= yes USE_GNOME= gnomehack gnomeprefix libgnomeui atspi libwnck USE_REINPLACE= yes diff --git a/accessibility/gok/distinfo b/accessibility/gok/distinfo index 243d98493042..76fde0ba0bf1 100644 --- a/accessibility/gok/distinfo +++ b/accessibility/gok/distinfo @@ -1 +1 @@ -MD5 (gnome2/gok-0.7.5.tar.gz) = 8ae32031b253371eb76be5f59c26bafd +MD5 (gnome2/gok-0.8.2.tar.bz2) = 3b495c7b8f8e10e370246c95d75f58eb diff --git a/accessibility/gok/files/patch-gok_gok-data.c b/accessibility/gok/files/patch-gok_gok-data.c index 901b763b08ab..e69de29bb2d1 100644 --- a/accessibility/gok/files/patch-gok_gok-data.c +++ b/accessibility/gok/files/patch-gok_gok-data.c @@ -1,12 +0,0 @@ ---- gok/gok-data.c.orig Mon Jun 2 21:49:16 2003 -+++ gok/gok-data.c Mon Jun 2 21:49:26 2003 -@@ -707,8 +707,8 @@ - */ - void gok_data_set_is_dock (GokDockType val) - { -- m_eDockType = val; - gchar *typestring; -+ m_eDockType = val; - switch (val) { - case GOK_DOCK_TOP: - typestring = "top"; diff --git a/accessibility/gok/pkg-plist b/accessibility/gok/pkg-plist index 35335cb46f8b..bdcaccbfbc81 100644 --- a/accessibility/gok/pkg-plist +++ b/accessibility/gok/pkg-plist @@ -19,6 +19,7 @@ etc/gconf/gconf.xml.defaults/apps/gok/feedbacks/goksound2/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gok/feedbacks/key_flashing/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gok/feedbacks/none/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gok/layout/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gok/spy/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gok/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gok/actions/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gok/actions/dwell/%gconf.xml @@ -39,65 +40,77 @@ etc/gconf/gconf.xml.defaults/schemas/apps/gok/feedbacks/goksound2/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gok/feedbacks/key_flashing/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gok/feedbacks/none/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gok/layout/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gok/spy/%gconf.xml etc/gconf/schemas/gok.schemas libdata/pkgconfig/gok-1.0.pc -share/doc/gok/c4.html -share/doc/gok/gok-arraylist.html -share/doc/gok/gok-callbacks.html -share/doc/gok/gok-command-common.html -share/doc/gok/gok-command-edge-data.html -share/doc/gok/gok-command-edge.html -share/doc/gok/gok-command-graph.html -share/doc/gok/gok-command-predictor.html -share/doc/gok/gok-command-vertex-data.html -share/doc/gok/gok-command-vertex.html -share/doc/gok/gok-global.html -share/doc/gok/gok-gok-action.html -share/doc/gok/gok-gok-branchback-stack.html -share/doc/gok/gok-gok-chunker.html -share/doc/gok/gok-gok-control.html -share/doc/gok/gok-gok-data.html -share/doc/gok/gok-gok-editor.html -share/doc/gok/gok-gok-feedback.html -share/doc/gok/gok-gok-file-util.html -share/doc/gok/gok-gok-gconf-keys.html -share/doc/gok/gok-gok-gconf.html -share/doc/gok/gok-gok-key.html -share/doc/gok/gok-gok-keyboard.html -share/doc/gok/gok-gok-keyslotter.html -share/doc/gok/gok-gok-log-priv.html -share/doc/gok/gok-gok-log-reader.html -share/doc/gok/gok-gok-log.html -share/doc/gok/gok-gok-modifier.html -share/doc/gok/gok-gok-output.html -share/doc/gok/gok-gok-page-accessmethod.html -share/doc/gok/gok-gok-page-actions.html -share/doc/gok/gok-gok-page-feedbacks.html -share/doc/gok/gok-gok-page-keysizespace.html -share/doc/gok/gok-gok-page-wordcomplete.html -share/doc/gok/gok-gok-predictor.html -share/doc/gok/gok-gok-scanner.html -share/doc/gok/gok-gok-settings-dialog.html -share/doc/gok/gok-gok-sound.html -share/doc/gok/gok-gok-spy-priv.html -share/doc/gok/gok-gok-spy.html -share/doc/gok/gok-gok-word-complete.html -share/doc/gok/gok-gok.html -share/doc/gok/gok-gokbutton.html -share/doc/gok/gok-gtkjoyswitch.html -share/doc/gok/gok-interface.html -share/doc/gok/gok-main.html -share/doc/gok/gok-support.html -share/doc/gok/gok-switchapi.html -share/doc/gok/gok-word-complete.html -share/doc/gok/index.html -share/doc/gok/index.sgml +%%DOCSDIR%%/c4.html +%%DOCSDIR%%/gok-arraylist.html +%%DOCSDIR%%/gok-callbacks.html +%%DOCSDIR%%/gok-command-common.html +%%DOCSDIR%%/gok-command-edge-data.html +%%DOCSDIR%%/gok-command-edge.html +%%DOCSDIR%%/gok-command-graph.html +%%DOCSDIR%%/gok-command-predictor.html +%%DOCSDIR%%/gok-command-vertex-data.html +%%DOCSDIR%%/gok-command-vertex.html +%%DOCSDIR%%/gok-global.html +%%DOCSDIR%%/gok-gok-action.html +%%DOCSDIR%%/gok-gok-branchback-stack.html +%%DOCSDIR%%/gok-gok-chunker.html +%%DOCSDIR%%/gok-gok-control.html +%%DOCSDIR%%/gok-gok-data.html +%%DOCSDIR%%/gok-gok-editor.html +%%DOCSDIR%%/gok-gok-feedback.html +%%DOCSDIR%%/gok-gok-file-util.html +%%DOCSDIR%%/gok-gok-gconf-keys.html +%%DOCSDIR%%/gok-gok-gconf.html +%%DOCSDIR%%/gok-gok-key.html +%%DOCSDIR%%/gok-gok-keyboard.html +%%DOCSDIR%%/gok-gok-keyslotter.html +%%DOCSDIR%%/gok-gok-log-priv.html +%%DOCSDIR%%/gok-gok-log-reader.html +%%DOCSDIR%%/gok-gok-log.html +%%DOCSDIR%%/gok-gok-modifier.html +%%DOCSDIR%%/gok-gok-output.html +%%DOCSDIR%%/gok-gok-page-accessmethod.html +%%DOCSDIR%%/gok-gok-page-actions.html +%%DOCSDIR%%/gok-gok-page-feedbacks.html +%%DOCSDIR%%/gok-gok-page-keysizespace.html +%%DOCSDIR%%/gok-gok-page-wordcomplete.html +%%DOCSDIR%%/gok-gok-predictor.html +%%DOCSDIR%%/gok-gok-scanner.html +%%DOCSDIR%%/gok-gok-settings-dialog.html +%%DOCSDIR%%/gok-gok-sound.html +%%DOCSDIR%%/gok-gok-spy-priv.html +%%DOCSDIR%%/gok-gok-spy.html +%%DOCSDIR%%/gok-gok-word-complete.html +%%DOCSDIR%%/gok-gok.html +%%DOCSDIR%%/gok-gokbutton.html +%%DOCSDIR%%/gok-gtkjoyswitch.html +%%DOCSDIR%%/gok-interface.html +%%DOCSDIR%%/gok-main.html +%%DOCSDIR%%/gok-support.html +%%DOCSDIR%%/gok-switchapi.html +%%DOCSDIR%%/gok-word-complete.html +%%DOCSDIR%%/index.html +%%DOCSDIR%%/index.sgml +share/gnome/applications/gok.desktop +share/gnome/gok/East.png share/gnome/gok/Keyboard.kbd +share/gnome/gok/NE.png +share/gnome/gok/NW.png +share/gnome/gok/North.png +share/gnome/gok/SE.png +share/gnome/gok/SW.png +share/gnome/gok/South.png +share/gnome/gok/West.png share/gnome/gok/alphabet.kbd share/gnome/gok/automatic-scanning.xam share/gnome/gok/dictionary.txt share/gnome/gok/direct-selection.xam share/gnome/gok/dwell-selection.xam +share/gnome/gok/empty.png +share/gnome/gok/gok.png share/gnome/gok/gok.rc share/gnome/gok/gok-controls.kbd share/gnome/gok/goklogo.png @@ -105,38 +118,60 @@ share/gnome/gok/goksound1.wav share/gnome/gok/goksound2.wav share/gnome/gok/inverse-scanning.xam share/gnome/gok/hide.kbd +share/gnome/gok/latched.png share/gnome/gok/launcher.kbd +share/gnome/gok/locked.png share/gnome/gok/main.kbd share/gnome/gok/manage.kbd +share/gnome/gok/mouse.kbd share/gnome/gok/move-resize.kbd +share/gnome/gok/quit.kbd share/gnome/gok/qwerty.kbd +share/gnome/gok/small-empty.png +share/gnome/gok/text-operations.kbd share/gnome/help/gok/C/gok.xml share/gnome/omf/gok/gok-C.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gok/gok-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gok/gok-C.omf || /usr/bin/true +share/gnome/pixmaps/gok.png share/locale/am/LC_MESSAGES/gok.mo +share/locale/az/LC_MESSAGES/gok.mo +share/locale/be/LC_MESSAGES/gok.mo share/locale/ca/LC_MESSAGES/gok.mo share/locale/cs/LC_MESSAGES/gok.mo +share/locale/cy/LC_MESSAGES/gok.mo share/locale/da/LC_MESSAGES/gok.mo share/locale/de/LC_MESSAGES/gok.mo +share/locale/el/LC_MESSAGES/gok.mo share/locale/es/LC_MESSAGES/gok.mo share/locale/fr/LC_MESSAGES/gok.mo +share/locale/hi/LC_MESSAGES/gok.mo share/locale/it/LC_MESSAGES/gok.mo share/locale/ja/LC_MESSAGES/gok.mo +share/locale/ko/LC_MESSAGES/gok.mo +share/locale/mk/LC_MESSAGES/gok.mo +share/locale/ml/LC_MESSAGES/gok.mo +share/locale/ms/LC_MESSAGES/gok.mo share/locale/nl/LC_MESSAGES/gok.mo share/locale/no/LC_MESSAGES/gok.mo +share/locale/pl/LC_MESSAGES/gok.mo share/locale/pt/LC_MESSAGES/gok.mo share/locale/pt_BR/LC_MESSAGES/gok.mo +share/locale/sl/LC_MESSAGES/gok.mo +share/locale/sq/LC_MESSAGES/gok.mo share/locale/sr/LC_MESSAGES/gok.mo share/locale/sr@Latn/LC_MESSAGES/gok.mo share/locale/sv/LC_MESSAGES/gok.mo share/locale/uk/LC_MESSAGES/gok.mo share/locale/vi/LC_MESSAGES/gok.mo +share/locale/zh_CN/LC_MESSAGES/gok.mo +share/locale/zh_TW/LC_MESSAGES/gok.mo @dirrm share/gnome/omf/gok @dirrm share/gnome/help/gok/C/figures @dirrm share/gnome/help/gok/C @dirrm share/gnome/help/gok @dirrm share/gnome/gok -@dirrm share/doc/gok +@dirrm %%DOCSDIR%% +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/spy @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/layout @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/feedbacks/none @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/feedbacks/key_flashing @@ -157,6 +192,7 @@ share/locale/vi/LC_MESSAGES/gok.mo @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/actions/dwell @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/actions @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok +@dirrm etc/gconf/gconf.xml.defaults/apps/gok/spy @dirrm etc/gconf/gconf.xml.defaults/apps/gok/layout @dirrm etc/gconf/gconf.xml.defaults/apps/gok/feedbacks/none @dirrm etc/gconf/gconf.xml.defaults/apps/gok/feedbacks/key_flashing @@ -177,4 +213,4 @@ share/locale/vi/LC_MESSAGES/gok.mo @dirrm etc/gconf/gconf.xml.defaults/apps/gok/actions/dwell @dirrm etc/gconf/gconf.xml.defaults/apps/gok/actions @dirrm etc/gconf/gconf.xml.defaults/apps/gok -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gok/gok-C.omf +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gok/gok-C.omf || /usr/bin/true diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile index de0126a63ca1..fa28a296e74a 100644 --- a/archivers/file-roller/Makefile +++ b/archivers/file-roller/Makefile @@ -6,11 +6,11 @@ # PORTNAME= fileroller -PORTVERSION= 2.2.5 +PORTVERSION= 2.4.0.1 PORTEPOCH= 1 CATEGORIES= archivers gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/file-roller/2.2 +MASTER_SITE_SUBDIR= sources/file-roller/2.4 DISTNAME= file-roller-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -18,11 +18,13 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= An archive manager for zip files, tar, etc RUN_DEPENDS= lha:${PORTSDIR}/archivers/lha \ - lzop:${PORTSDIR}/archivers/lzop + lzop:${PORTSDIR}/archivers/lzop \ + zoo:${PORTSDIR}/archivers/zoo .if !exists(/usr/bin/bzip2) RUN_DEPENDS+= bzip2:${PORTSDIR}/archivers/bzip2 .endif +USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack libgnomeui diff --git a/archivers/file-roller/distinfo b/archivers/file-roller/distinfo index 8f8c24d2e779..324640a2c041 100644 --- a/archivers/file-roller/distinfo +++ b/archivers/file-roller/distinfo @@ -1 +1 @@ -MD5 (gnome2/file-roller-2.2.5.tar.gz) = 161aa4e9d7032d298115d0386635a9e9 +MD5 (gnome2/file-roller-2.4.0.1.tar.bz2) = d268975b20679bc6b8f4f88492e7bfdf diff --git a/archivers/file-roller/files/patch-src_fr-command-tar.c b/archivers/file-roller/files/patch-src_fr-command-tar.c index 6ae5fcfa32bf..9a0fb58a82ed 100644 --- a/archivers/file-roller/files/patch-src_fr-command-tar.c +++ b/archivers/file-roller/files/patch-src_fr-command-tar.c @@ -1,32 +1,24 @@ ---- src/fr-command-tar.c.orig Fri Aug 9 09:10:51 2002 -+++ src/fr-command-tar.c Fri Oct 11 12:14:40 2002 -@@ -117,7 +117,7 @@ - { - int i; - char *field; -- int n = 6; -+ int n = 8; - - n--; - field = eat_spaces (line); -@@ -129,6 +129,10 @@ - return field; +--- src/fr-command-tar.c.orig Mon May 19 14:15:50 2003 ++++ src/fr-command-tar.c Tue May 20 20:43:39 2003 +@@ -83,6 +83,11 @@ + return mktime (&tm); } -+static char *months[] = { ++static char *months[] = { + "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", + "Nov", "Dec" +}; ++ static void process_line (char *line, -@@ -138,15 +142,30 @@ - FRCommand *comm = FR_COMMAND (data); - char **fields; - char *name_field; -+ int i; -+ struct tm tm = {0, }; -+ char **time_fields; +@@ -92,19 +97,34 @@ + FRCommand *comm = FR_COMMAND (data); + char **fields; + const char *name_field; ++ int i; ++ struct tm tm = {0, }; ++ char **time_fields; g_return_if_fail (line != NULL); @@ -53,3 +45,8 @@ /* Full path */ +- name_field = get_last_field (line, 6); ++ name_field = get_last_field (line, 8); + fields = g_strsplit (name_field, " -> ", 2); + + if (fields[1] == NULL) { diff --git a/archivers/file-roller/pkg-plist b/archivers/file-roller/pkg-plist index 1245807ca7e8..10aacc1c1ee4 100644 --- a/archivers/file-roller/pkg-plist +++ b/archivers/file-roller/pkg-plist @@ -10,10 +10,10 @@ etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/ui/%gconf.xml etc/gconf/schemas/file-roller.schemas lib/bonobo/libfile-roller-component.so libdata/bonobo/servers/File_Roller_Component.server -%%PORTDOCS%%share/doc/fileroller/AUTHORS -%%PORTDOCS%%share/doc/fileroller/NEWS -%%PORTDOCS%%share/doc/fileroller/README -%%PORTDOCS%%share/doc/fileroller/TODO +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/TODO share/gnome/application-registry/file-roller.applications share/gnome/applications/file-roller.desktop share/gnome/file-roller/glade/file_roller.glade @@ -27,20 +27,29 @@ share/gnome/help/file-roller/ru/figures/fr-mainwindow.png share/gnome/help/file-roller/ru/figures/fr-prefs.png share/gnome/help/file-roller/ru/file-roller.xml share/gnome/help/file-roller/ru/legal.xml +share/gnome/help/file-roller/uk/figures/fr-add-dialog.png +share/gnome/help/file-roller/uk/figures/fr-extract.png +share/gnome/help/file-roller/uk/figures/fr-mainwindow.png +share/gnome/help/file-roller/uk/figures/fr-prefs.png +share/gnome/help/file-roller/uk/file-roller.xml +share/gnome/help/file-roller/uk/legal.xml share/gnome/mime-info/file-roller.keys share/gnome/mime-info/file-roller.mime share/gnome/omf/file-roller/file-roller-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/file-roller/file-roller-ru.omf @exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-ru.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/file-roller/file-roller-uk.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-uk.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/file-roller.png share/locale/am/LC_MESSAGES/file-roller.mo -share/locale/ar/LC_MESSAGES/file-roller.mo share/locale/az/LC_MESSAGES/file-roller.mo share/locale/be/LC_MESSAGES/file-roller.mo share/locale/bg/LC_MESSAGES/file-roller.mo +share/locale/bn/LC_MESSAGES/file-roller.mo share/locale/ca/LC_MESSAGES/file-roller.mo share/locale/cs/LC_MESSAGES/file-roller.mo +share/locale/cy/LC_MESSAGES/file-roller.mo share/locale/da/LC_MESSAGES/file-roller.mo share/locale/de/LC_MESSAGES/file-roller.mo share/locale/el/LC_MESSAGES/file-roller.mo @@ -77,12 +86,15 @@ share/locale/sq/LC_MESSAGES/file-roller.mo share/locale/sr/LC_MESSAGES/file-roller.mo share/locale/sr@Latn/LC_MESSAGES/file-roller.mo share/locale/sv/LC_MESSAGES/file-roller.mo +share/locale/th/LC_MESSAGES/file-roller.mo share/locale/tr/LC_MESSAGES/file-roller.mo share/locale/uk/LC_MESSAGES/file-roller.mo share/locale/vi/LC_MESSAGES/file-roller.mo share/locale/zh_CN/LC_MESSAGES/file-roller.mo share/locale/zh_TW/LC_MESSAGES/file-roller.mo @dirrm share/gnome/omf/file-roller +@dirrm share/gnome/help/file-roller/uk/figures +@dirrm share/gnome/help/file-roller/uk @dirrm share/gnome/help/file-roller/ru/figures @dirrm share/gnome/help/file-roller/ru @dirrm share/gnome/help/file-roller/C/figures @@ -90,7 +102,7 @@ share/locale/zh_TW/LC_MESSAGES/file-roller.mo @dirrm share/gnome/help/file-roller @dirrm share/gnome/file-roller/glade @dirrm share/gnome/file-roller -%%PORTDOCS%%@dirrm share/doc/fileroller +%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/ui @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/listing @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/general @@ -99,5 +111,6 @@ share/locale/zh_TW/LC_MESSAGES/file-roller.mo @dirrm etc/gconf/gconf.xml.defaults/apps/file-roller/listing @dirrm etc/gconf/gconf.xml.defaults/apps/file-roller/general @dirrm etc/gconf/gconf.xml.defaults/apps/file-roller +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-uk.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-ru.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-C.omf 2>/dev/null || /usr/bin/true diff --git a/archivers/fileroller/Makefile b/archivers/fileroller/Makefile index de0126a63ca1..fa28a296e74a 100644 --- a/archivers/fileroller/Makefile +++ b/archivers/fileroller/Makefile @@ -6,11 +6,11 @@ # PORTNAME= fileroller -PORTVERSION= 2.2.5 +PORTVERSION= 2.4.0.1 PORTEPOCH= 1 CATEGORIES= archivers gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/file-roller/2.2 +MASTER_SITE_SUBDIR= sources/file-roller/2.4 DISTNAME= file-roller-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -18,11 +18,13 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= An archive manager for zip files, tar, etc RUN_DEPENDS= lha:${PORTSDIR}/archivers/lha \ - lzop:${PORTSDIR}/archivers/lzop + lzop:${PORTSDIR}/archivers/lzop \ + zoo:${PORTSDIR}/archivers/zoo .if !exists(/usr/bin/bzip2) RUN_DEPENDS+= bzip2:${PORTSDIR}/archivers/bzip2 .endif +USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack libgnomeui diff --git a/archivers/fileroller/distinfo b/archivers/fileroller/distinfo index 8f8c24d2e779..324640a2c041 100644 --- a/archivers/fileroller/distinfo +++ b/archivers/fileroller/distinfo @@ -1 +1 @@ -MD5 (gnome2/file-roller-2.2.5.tar.gz) = 161aa4e9d7032d298115d0386635a9e9 +MD5 (gnome2/file-roller-2.4.0.1.tar.bz2) = d268975b20679bc6b8f4f88492e7bfdf diff --git a/archivers/fileroller/files/patch-src_fr-command-tar.c b/archivers/fileroller/files/patch-src_fr-command-tar.c index 6ae5fcfa32bf..9a0fb58a82ed 100644 --- a/archivers/fileroller/files/patch-src_fr-command-tar.c +++ b/archivers/fileroller/files/patch-src_fr-command-tar.c @@ -1,32 +1,24 @@ ---- src/fr-command-tar.c.orig Fri Aug 9 09:10:51 2002 -+++ src/fr-command-tar.c Fri Oct 11 12:14:40 2002 -@@ -117,7 +117,7 @@ - { - int i; - char *field; -- int n = 6; -+ int n = 8; - - n--; - field = eat_spaces (line); -@@ -129,6 +129,10 @@ - return field; +--- src/fr-command-tar.c.orig Mon May 19 14:15:50 2003 ++++ src/fr-command-tar.c Tue May 20 20:43:39 2003 +@@ -83,6 +83,11 @@ + return mktime (&tm); } -+static char *months[] = { ++static char *months[] = { + "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", + "Nov", "Dec" +}; ++ static void process_line (char *line, -@@ -138,15 +142,30 @@ - FRCommand *comm = FR_COMMAND (data); - char **fields; - char *name_field; -+ int i; -+ struct tm tm = {0, }; -+ char **time_fields; +@@ -92,19 +97,34 @@ + FRCommand *comm = FR_COMMAND (data); + char **fields; + const char *name_field; ++ int i; ++ struct tm tm = {0, }; ++ char **time_fields; g_return_if_fail (line != NULL); @@ -53,3 +45,8 @@ /* Full path */ +- name_field = get_last_field (line, 6); ++ name_field = get_last_field (line, 8); + fields = g_strsplit (name_field, " -> ", 2); + + if (fields[1] == NULL) { diff --git a/archivers/fileroller/pkg-plist b/archivers/fileroller/pkg-plist index 1245807ca7e8..10aacc1c1ee4 100644 --- a/archivers/fileroller/pkg-plist +++ b/archivers/fileroller/pkg-plist @@ -10,10 +10,10 @@ etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/ui/%gconf.xml etc/gconf/schemas/file-roller.schemas lib/bonobo/libfile-roller-component.so libdata/bonobo/servers/File_Roller_Component.server -%%PORTDOCS%%share/doc/fileroller/AUTHORS -%%PORTDOCS%%share/doc/fileroller/NEWS -%%PORTDOCS%%share/doc/fileroller/README -%%PORTDOCS%%share/doc/fileroller/TODO +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/TODO share/gnome/application-registry/file-roller.applications share/gnome/applications/file-roller.desktop share/gnome/file-roller/glade/file_roller.glade @@ -27,20 +27,29 @@ share/gnome/help/file-roller/ru/figures/fr-mainwindow.png share/gnome/help/file-roller/ru/figures/fr-prefs.png share/gnome/help/file-roller/ru/file-roller.xml share/gnome/help/file-roller/ru/legal.xml +share/gnome/help/file-roller/uk/figures/fr-add-dialog.png +share/gnome/help/file-roller/uk/figures/fr-extract.png +share/gnome/help/file-roller/uk/figures/fr-mainwindow.png +share/gnome/help/file-roller/uk/figures/fr-prefs.png +share/gnome/help/file-roller/uk/file-roller.xml +share/gnome/help/file-roller/uk/legal.xml share/gnome/mime-info/file-roller.keys share/gnome/mime-info/file-roller.mime share/gnome/omf/file-roller/file-roller-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/file-roller/file-roller-ru.omf @exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-ru.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/file-roller/file-roller-uk.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-uk.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/file-roller.png share/locale/am/LC_MESSAGES/file-roller.mo -share/locale/ar/LC_MESSAGES/file-roller.mo share/locale/az/LC_MESSAGES/file-roller.mo share/locale/be/LC_MESSAGES/file-roller.mo share/locale/bg/LC_MESSAGES/file-roller.mo +share/locale/bn/LC_MESSAGES/file-roller.mo share/locale/ca/LC_MESSAGES/file-roller.mo share/locale/cs/LC_MESSAGES/file-roller.mo +share/locale/cy/LC_MESSAGES/file-roller.mo share/locale/da/LC_MESSAGES/file-roller.mo share/locale/de/LC_MESSAGES/file-roller.mo share/locale/el/LC_MESSAGES/file-roller.mo @@ -77,12 +86,15 @@ share/locale/sq/LC_MESSAGES/file-roller.mo share/locale/sr/LC_MESSAGES/file-roller.mo share/locale/sr@Latn/LC_MESSAGES/file-roller.mo share/locale/sv/LC_MESSAGES/file-roller.mo +share/locale/th/LC_MESSAGES/file-roller.mo share/locale/tr/LC_MESSAGES/file-roller.mo share/locale/uk/LC_MESSAGES/file-roller.mo share/locale/vi/LC_MESSAGES/file-roller.mo share/locale/zh_CN/LC_MESSAGES/file-roller.mo share/locale/zh_TW/LC_MESSAGES/file-roller.mo @dirrm share/gnome/omf/file-roller +@dirrm share/gnome/help/file-roller/uk/figures +@dirrm share/gnome/help/file-roller/uk @dirrm share/gnome/help/file-roller/ru/figures @dirrm share/gnome/help/file-roller/ru @dirrm share/gnome/help/file-roller/C/figures @@ -90,7 +102,7 @@ share/locale/zh_TW/LC_MESSAGES/file-roller.mo @dirrm share/gnome/help/file-roller @dirrm share/gnome/file-roller/glade @dirrm share/gnome/file-roller -%%PORTDOCS%%@dirrm share/doc/fileroller +%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/ui @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/listing @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/general @@ -99,5 +111,6 @@ share/locale/zh_TW/LC_MESSAGES/file-roller.mo @dirrm etc/gconf/gconf.xml.defaults/apps/file-roller/listing @dirrm etc/gconf/gconf.xml.defaults/apps/file-roller/general @dirrm etc/gconf/gconf.xml.defaults/apps/file-roller +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-uk.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-ru.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-C.omf 2>/dev/null || /usr/bin/true diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile index 910e2b3ea87e..5e719218cae1 100644 --- a/audio/gnome-media/Makefile +++ b/audio/gnome-media/Makefile @@ -6,15 +6,15 @@ # PORTNAME= gnomemedia2 -PORTVERSION= 2.2.2 +PORTVERSION= 2.4.0 CATEGORIES= audio gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-media/2.2 +MASTER_SITE_SUBDIR= sources/gnome-media/2.4 DISTNAME= gnome-media-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -COMMENT= Multimedia applications for the GNOME 2.0 desktop +COMMENT= Multimedia applications for the GNOME 2 desktop RUN_DEPENDS= sox:${PORTSDIR}/audio/sox LIB_DEPENDS= gstplay-0.6.1:${PORTSDIR}/multimedia/gstreamer-plugins @@ -22,11 +22,11 @@ LIB_DEPENDS= gstplay-0.6.1:${PORTSDIR}/multimedia/gstreamer-plugins USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_REINPLACE= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes -USE_GNOME= gnomeprefix gnomehack gnomehier gail gnomedesktop +GNOME_DESKTOP_VERSION=2 +USE_GNOME= gnomeprefix gnomehack gnomehier gnomedesktop gail CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" + LDFLAGS="-L${LOCALBASE}/lib" .include <bsd.port.mk> diff --git a/audio/gnome-media/distinfo b/audio/gnome-media/distinfo index 365fed9591ba..aa956f748927 100644 --- a/audio/gnome-media/distinfo +++ b/audio/gnome-media/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-media-2.2.2.tar.bz2) = 54b8e29b07de4a86abb1bc349d5c2145 +MD5 (gnome2/gnome-media-2.4.0.tar.bz2) = aa5d6a04049ea7552086a6bea47bf375 diff --git a/audio/gnome-media/files/patch-gmix_gmix.c b/audio/gnome-media/files/patch-gmix_gmix.c deleted file mode 100644 index d306c14e282d..000000000000 --- a/audio/gnome-media/files/patch-gmix_gmix.c +++ /dev/null @@ -1,42 +0,0 @@ ---- gmix/gmix.c.orig Sun Mar 16 16:09:01 2003 -+++ gmix/gmix.c Sun Mar 16 16:13:09 2003 -@@ -591,6 +591,11 @@ - /* Masks for the channel data - OSS blows compared to ALSA */ - int recmask, recsrc, stereodee; - -+ /* FreeBSD device name detection */ -+ FILE *sndstat; -+ char line[256]; -+ char *devname, *p; -+ - /* - * create new device configureation - */ -@@ -659,7 +665,26 @@ - } - #else - new_device->card_name = g_strdup_printf ("OSS-%d-%d", num + 1, num + 1); -- g_snprintf (new_device->info.name, 31, "Card %d", num+1); -+ /* get soundcard name from /dev/sndstat on FreeBSD */ -+ sndstat = fopen("/dev/sndstat", "r"); -+ if (!sndstat) -+ g_snprintf (new_device->info.name, 31, "Card %d", num+1); -+ else { -+ while (fgets (line, 255, sndstat)) { -+ if (!strncmp (line, "pcm", 3) && (atoi (&line[3]) == num)) -+ { -+ devname = line; -+ while (*devname++ != '<') -+ ; -+ p = devname; -+ while (*p != '>') -+ p++; -+ *p = '\0'; -+ g_snprintf (new_device->info.name, 31, devname); -+ } -+ } -+ fclose(sndstat); -+ } - #endif - /* - * several bitmasks describing the mixer diff --git a/audio/gnome-media/pkg-plist b/audio/gnome-media/pkg-plist index a6afc1b9428a..47d38d6ba3b2 100644 --- a/audio/gnome-media/pkg-plist +++ b/audio/gnome-media/pkg-plist @@ -39,9 +39,6 @@ share/gnome/help/gnome-cd/C/figures/cdplayer_trackeditor_window.png share/gnome/help/gnome-cd/C/figures/cdplayer_window.png share/gnome/help/gnome-cd/C/figures/eject_button.png share/gnome/help/gnome-cd/C/figures/forward_button.png -share/gnome/help/gnome-cd/C/figures/gnome-cd-prefs.png -share/gnome/help/gnome-cd/C/figures/gnome-cd-track.png -share/gnome/help/gnome-cd/C/figures/gnome-cd.png share/gnome/help/gnome-cd/C/figures/next_button.png share/gnome/help/gnome-cd/C/figures/pause_button.png share/gnome/help/gnome-cd/C/figures/play_button.png @@ -51,6 +48,8 @@ share/gnome/help/gnome-cd/C/figures/rewind_button.png share/gnome/help/gnome-cd/C/figures/stop_button.png share/gnome/help/gnome-cd/C/gnome-cd.xml share/gnome/help/gnome-cd/C/legal.xml +share/gnome/help/gnome-cd/de/legal.xml +share/gnome/help/gnome-cd/de/gnome-cd.xml share/gnome/help/gnome-cd/de/figures/cdplayer_trackeditor_button.png share/gnome/help/gnome-cd/de/figures/cdplayer_trackeditor_window.png share/gnome/help/gnome-cd/de/figures/cdplayer_window.png @@ -66,8 +65,8 @@ share/gnome/help/gnome-cd/de/figures/preferences_button.png share/gnome/help/gnome-cd/de/figures/previous_button.png share/gnome/help/gnome-cd/de/figures/rewind_button.png share/gnome/help/gnome-cd/de/figures/stop_button.png -share/gnome/help/gnome-cd/de/gnome-cd.xml -share/gnome/help/gnome-cd/de/legal.xml +share/gnome/help/gnome-cd/es/legal.xml +share/gnome/help/gnome-cd/es/gnome-cd.xml share/gnome/help/gnome-cd/es/figures/cdplayer_trackeditor_button.png share/gnome/help/gnome-cd/es/figures/cdplayer_trackeditor_window.png share/gnome/help/gnome-cd/es/figures/cdplayer_window.png @@ -83,8 +82,8 @@ share/gnome/help/gnome-cd/es/figures/preferences_button.png share/gnome/help/gnome-cd/es/figures/previous_button.png share/gnome/help/gnome-cd/es/figures/rewind_button.png share/gnome/help/gnome-cd/es/figures/stop_button.png -share/gnome/help/gnome-cd/es/gnome-cd.xml -share/gnome/help/gnome-cd/es/legal.xml +share/gnome/help/gnome-cd/fr/legal.xml +share/gnome/help/gnome-cd/fr/gnome-cd.xml share/gnome/help/gnome-cd/fr/figures/cdplayer_trackeditor_button.png share/gnome/help/gnome-cd/fr/figures/cdplayer_trackeditor_window.png share/gnome/help/gnome-cd/fr/figures/cdplayer_window.png @@ -100,8 +99,8 @@ share/gnome/help/gnome-cd/fr/figures/preferences_button.png share/gnome/help/gnome-cd/fr/figures/previous_button.png share/gnome/help/gnome-cd/fr/figures/rewind_button.png share/gnome/help/gnome-cd/fr/figures/stop_button.png -share/gnome/help/gnome-cd/fr/gnome-cd.xml -share/gnome/help/gnome-cd/fr/legal.xml +share/gnome/help/gnome-cd/it/legal.xml +share/gnome/help/gnome-cd/it/gnome-cd.xml share/gnome/help/gnome-cd/it/figures/cdplayer_trackeditor_button.png share/gnome/help/gnome-cd/it/figures/cdplayer_trackeditor_window.png share/gnome/help/gnome-cd/it/figures/cdplayer_window.png @@ -117,8 +116,25 @@ share/gnome/help/gnome-cd/it/figures/preferences_button.png share/gnome/help/gnome-cd/it/figures/previous_button.png share/gnome/help/gnome-cd/it/figures/rewind_button.png share/gnome/help/gnome-cd/it/figures/stop_button.png -share/gnome/help/gnome-cd/it/gnome-cd.xml -share/gnome/help/gnome-cd/it/legal.xml +share/gnome/help/gnome-cd/sv/legal.xml +share/gnome/help/gnome-cd/sv/gnome-cd.xml +share/gnome/help/gnome-cd/sv/figures/cdplayer_trackeditor_button.png +share/gnome/help/gnome-cd/sv/figures/cdplayer_trackeditor_window.png +share/gnome/help/gnome-cd/sv/figures/cdplayer_window.png +share/gnome/help/gnome-cd/sv/figures/eject_button.png +share/gnome/help/gnome-cd/sv/figures/forward_button.png +share/gnome/help/gnome-cd/sv/figures/gnome-cd-prefs.png +share/gnome/help/gnome-cd/sv/figures/gnome-cd-track.png +share/gnome/help/gnome-cd/sv/figures/gnome-cd.png +share/gnome/help/gnome-cd/sv/figures/next_button.png +share/gnome/help/gnome-cd/sv/figures/pause_button.png +share/gnome/help/gnome-cd/sv/figures/play_button.png +share/gnome/help/gnome-cd/sv/figures/preferences_button.png +share/gnome/help/gnome-cd/sv/figures/previous_button.png +share/gnome/help/gnome-cd/sv/figures/rewind_button.png +share/gnome/help/gnome-cd/sv/figures/stop_button.png +share/gnome/help/gnome-cd/ja/legal.xml +share/gnome/help/gnome-cd/ja/gnome-cd.xml share/gnome/help/gnome-cd/ja/figures/cdplayer_trackeditor_button.png share/gnome/help/gnome-cd/ja/figures/cdplayer_trackeditor_window.png share/gnome/help/gnome-cd/ja/figures/cdplayer_window.png @@ -134,8 +150,8 @@ share/gnome/help/gnome-cd/ja/figures/preferences_button.png share/gnome/help/gnome-cd/ja/figures/previous_button.png share/gnome/help/gnome-cd/ja/figures/rewind_button.png share/gnome/help/gnome-cd/ja/figures/stop_button.png -share/gnome/help/gnome-cd/ja/gnome-cd.xml -share/gnome/help/gnome-cd/ja/legal.xml +share/gnome/help/gnome-cd/ko/legal.xml +share/gnome/help/gnome-cd/ko/gnome-cd.xml share/gnome/help/gnome-cd/ko/figures/cdplayer_trackeditor_button.png share/gnome/help/gnome-cd/ko/figures/cdplayer_trackeditor_window.png share/gnome/help/gnome-cd/ko/figures/cdplayer_window.png @@ -151,25 +167,8 @@ share/gnome/help/gnome-cd/ko/figures/preferences_button.png share/gnome/help/gnome-cd/ko/figures/previous_button.png share/gnome/help/gnome-cd/ko/figures/rewind_button.png share/gnome/help/gnome-cd/ko/figures/stop_button.png -share/gnome/help/gnome-cd/ko/gnome-cd.xml -share/gnome/help/gnome-cd/ko/legal.xml -share/gnome/help/gnome-cd/sv/figures/cdplayer_trackeditor_button.png -share/gnome/help/gnome-cd/sv/figures/cdplayer_trackeditor_window.png -share/gnome/help/gnome-cd/sv/figures/cdplayer_window.png -share/gnome/help/gnome-cd/sv/figures/eject_button.png -share/gnome/help/gnome-cd/sv/figures/forward_button.png -share/gnome/help/gnome-cd/sv/figures/gnome-cd-prefs.png -share/gnome/help/gnome-cd/sv/figures/gnome-cd-track.png -share/gnome/help/gnome-cd/sv/figures/gnome-cd.png -share/gnome/help/gnome-cd/sv/figures/next_button.png -share/gnome/help/gnome-cd/sv/figures/pause_button.png -share/gnome/help/gnome-cd/sv/figures/play_button.png -share/gnome/help/gnome-cd/sv/figures/preferences_button.png -share/gnome/help/gnome-cd/sv/figures/previous_button.png -share/gnome/help/gnome-cd/sv/figures/rewind_button.png -share/gnome/help/gnome-cd/sv/figures/stop_button.png -share/gnome/help/gnome-cd/sv/gnome-cd.xml -share/gnome/help/gnome-cd/sv/legal.xml +share/gnome/help/gnome-cd/zh_CN/legal.xml +share/gnome/help/gnome-cd/zh_CN/gnome-cd.xml share/gnome/help/gnome-cd/zh_CN/figures/cdplayer_trackeditor_button.png share/gnome/help/gnome-cd/zh_CN/figures/cdplayer_trackeditor_window.png share/gnome/help/gnome-cd/zh_CN/figures/cdplayer_window.png @@ -185,8 +184,8 @@ share/gnome/help/gnome-cd/zh_CN/figures/preferences_button.png share/gnome/help/gnome-cd/zh_CN/figures/previous_button.png share/gnome/help/gnome-cd/zh_CN/figures/rewind_button.png share/gnome/help/gnome-cd/zh_CN/figures/stop_button.png -share/gnome/help/gnome-cd/zh_CN/gnome-cd.xml -share/gnome/help/gnome-cd/zh_CN/legal.xml +share/gnome/help/gnome-cd/zh_TW/legal.xml +share/gnome/help/gnome-cd/zh_TW/gnome-cd.xml share/gnome/help/gnome-cd/zh_TW/figures/cdplayer_trackeditor_button.png share/gnome/help/gnome-cd/zh_TW/figures/cdplayer_trackeditor_window.png share/gnome/help/gnome-cd/zh_TW/figures/cdplayer_window.png @@ -202,14 +201,6 @@ share/gnome/help/gnome-cd/zh_TW/figures/preferences_button.png share/gnome/help/gnome-cd/zh_TW/figures/previous_button.png share/gnome/help/gnome-cd/zh_TW/figures/rewind_button.png share/gnome/help/gnome-cd/zh_TW/figures/stop_button.png -share/gnome/help/gnome-cd/zh_TW/gnome-cd.xml -share/gnome/help/gnome-cd/zh_TW/legal.xml -share/gnome/help/gnome-sound-recorder/C/figures/grecord-prefs-path.png -share/gnome/help/gnome-sound-recorder/C/figures/grecord-prefs-play.png -share/gnome/help/gnome-sound-recorder/C/figures/grecord-prefs-rec.png -share/gnome/help/gnome-sound-recorder/C/figures/grecord-prefs-sound.png -share/gnome/help/gnome-sound-recorder/C/figures/grecord-prefs-ui.png -share/gnome/help/gnome-sound-recorder/C/figures/grecord.png share/gnome/help/gnome-sound-recorder/C/figures/grecord_window.png share/gnome/help/gnome-sound-recorder/C/gnome-sound-recorder.xml share/gnome/help/gnome-sound-recorder/C/legal.xml @@ -217,6 +208,8 @@ share/gnome/help/gnome-volume-control/C/figures/gmix-prefs.png share/gnome/help/gnome-volume-control/C/figures/gmix.png share/gnome/help/gnome-volume-control/C/gnome-volume-control.xml share/gnome/help/gnome-volume-control/C/legal.xml +share/gnome/help/grecord/de/legal.xml +share/gnome/help/grecord/de/grecord.xml share/gnome/help/grecord/de/figures/grecord-prefs-path.png share/gnome/help/grecord/de/figures/grecord-prefs-play.png share/gnome/help/grecord/de/figures/grecord-prefs-rec.png @@ -224,8 +217,8 @@ share/gnome/help/grecord/de/figures/grecord-prefs-sound.png share/gnome/help/grecord/de/figures/grecord-prefs-ui.png share/gnome/help/grecord/de/figures/grecord.png share/gnome/help/grecord/de/figures/grecord_window.png -share/gnome/help/grecord/de/grecord.xml -share/gnome/help/grecord/de/legal.xml +share/gnome/help/grecord/es/legal.xml +share/gnome/help/grecord/es/grecord.xml share/gnome/help/grecord/es/figures/grecord-prefs-path.png share/gnome/help/grecord/es/figures/grecord-prefs-play.png share/gnome/help/grecord/es/figures/grecord-prefs-rec.png @@ -233,8 +226,8 @@ share/gnome/help/grecord/es/figures/grecord-prefs-sound.png share/gnome/help/grecord/es/figures/grecord-prefs-ui.png share/gnome/help/grecord/es/figures/grecord.png share/gnome/help/grecord/es/figures/grecord_window.png -share/gnome/help/grecord/es/grecord.xml -share/gnome/help/grecord/es/legal.xml +share/gnome/help/grecord/fr/legal.xml +share/gnome/help/grecord/fr/grecord.xml share/gnome/help/grecord/fr/figures/grecord-prefs-path.png share/gnome/help/grecord/fr/figures/grecord-prefs-play.png share/gnome/help/grecord/fr/figures/grecord-prefs-rec.png @@ -242,8 +235,8 @@ share/gnome/help/grecord/fr/figures/grecord-prefs-sound.png share/gnome/help/grecord/fr/figures/grecord-prefs-ui.png share/gnome/help/grecord/fr/figures/grecord.png share/gnome/help/grecord/fr/figures/grecord_window.png -share/gnome/help/grecord/fr/grecord.xml -share/gnome/help/grecord/fr/legal.xml +share/gnome/help/grecord/it/legal.xml +share/gnome/help/grecord/it/grecord.xml share/gnome/help/grecord/it/figures/grecord-prefs-path.png share/gnome/help/grecord/it/figures/grecord-prefs-play.png share/gnome/help/grecord/it/figures/grecord-prefs-rec.png @@ -251,8 +244,17 @@ share/gnome/help/grecord/it/figures/grecord-prefs-sound.png share/gnome/help/grecord/it/figures/grecord-prefs-ui.png share/gnome/help/grecord/it/figures/grecord.png share/gnome/help/grecord/it/figures/grecord_window.png -share/gnome/help/grecord/it/grecord.xml -share/gnome/help/grecord/it/legal.xml +share/gnome/help/grecord/sv/legal.xml +share/gnome/help/grecord/sv/grecord.xml +share/gnome/help/grecord/sv/figures/grecord-prefs-path.png +share/gnome/help/grecord/sv/figures/grecord-prefs-play.png +share/gnome/help/grecord/sv/figures/grecord-prefs-rec.png +share/gnome/help/grecord/sv/figures/grecord-prefs-sound.png +share/gnome/help/grecord/sv/figures/grecord-prefs-ui.png +share/gnome/help/grecord/sv/figures/grecord.png +share/gnome/help/grecord/sv/figures/grecord_window.png +share/gnome/help/grecord/ja/legal.xml +share/gnome/help/grecord/ja/grecord.xml share/gnome/help/grecord/ja/figures/grecord-prefs-path.png share/gnome/help/grecord/ja/figures/grecord-prefs-play.png share/gnome/help/grecord/ja/figures/grecord-prefs-rec.png @@ -260,8 +262,8 @@ share/gnome/help/grecord/ja/figures/grecord-prefs-sound.png share/gnome/help/grecord/ja/figures/grecord-prefs-ui.png share/gnome/help/grecord/ja/figures/grecord.png share/gnome/help/grecord/ja/figures/grecord_window.png -share/gnome/help/grecord/ja/grecord.xml -share/gnome/help/grecord/ja/legal.xml +share/gnome/help/grecord/ko/legal.xml +share/gnome/help/grecord/ko/grecord.xml share/gnome/help/grecord/ko/figures/grecord-prefs-path.png share/gnome/help/grecord/ko/figures/grecord-prefs-play.png share/gnome/help/grecord/ko/figures/grecord-prefs-rec.png @@ -269,17 +271,8 @@ share/gnome/help/grecord/ko/figures/grecord-prefs-sound.png share/gnome/help/grecord/ko/figures/grecord-prefs-ui.png share/gnome/help/grecord/ko/figures/grecord.png share/gnome/help/grecord/ko/figures/grecord_window.png -share/gnome/help/grecord/ko/grecord.xml -share/gnome/help/grecord/ko/legal.xml -share/gnome/help/grecord/sv/figures/grecord-prefs-path.png -share/gnome/help/grecord/sv/figures/grecord-prefs-play.png -share/gnome/help/grecord/sv/figures/grecord-prefs-rec.png -share/gnome/help/grecord/sv/figures/grecord-prefs-sound.png -share/gnome/help/grecord/sv/figures/grecord-prefs-ui.png -share/gnome/help/grecord/sv/figures/grecord.png -share/gnome/help/grecord/sv/figures/grecord_window.png -share/gnome/help/grecord/sv/grecord.xml -share/gnome/help/grecord/sv/legal.xml +share/gnome/help/grecord/zh_CN/legal.xml +share/gnome/help/grecord/zh_CN/grecord.xml share/gnome/help/grecord/zh_CN/figures/grecord-prefs-path.png share/gnome/help/grecord/zh_CN/figures/grecord-prefs-play.png share/gnome/help/grecord/zh_CN/figures/grecord-prefs-rec.png @@ -287,8 +280,8 @@ share/gnome/help/grecord/zh_CN/figures/grecord-prefs-sound.png share/gnome/help/grecord/zh_CN/figures/grecord-prefs-ui.png share/gnome/help/grecord/zh_CN/figures/grecord.png share/gnome/help/grecord/zh_CN/figures/grecord_window.png -share/gnome/help/grecord/zh_CN/grecord.xml -share/gnome/help/grecord/zh_CN/legal.xml +share/gnome/help/grecord/zh_TW/legal.xml +share/gnome/help/grecord/zh_TW/grecord.xml share/gnome/help/grecord/zh_TW/figures/grecord-prefs-path.png share/gnome/help/grecord/zh_TW/figures/grecord-prefs-play.png share/gnome/help/grecord/zh_TW/figures/grecord-prefs-rec.png @@ -296,8 +289,6 @@ share/gnome/help/grecord/zh_TW/figures/grecord-prefs-sound.png share/gnome/help/grecord/zh_TW/figures/grecord-prefs-ui.png share/gnome/help/grecord/zh_TW/figures/grecord.png share/gnome/help/grecord/zh_TW/figures/grecord_window.png -share/gnome/help/grecord/zh_TW/grecord.xml -share/gnome/help/grecord/zh_TW/legal.xml share/gnome/idl/GNOME_Media_CDDBSlave2.idl share/gnome/omf/gnome-media/gnome-cd-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-cd-C.omf 2>/dev/null || /usr/bin/true @@ -309,12 +300,12 @@ share/gnome/omf/gnome-media/gnome-cd-fr.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-cd-fr.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-media/gnome-cd-it.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-cd-it.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-media/gnome-cd-sv.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-cd-sv.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-media/gnome-cd-ja.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-cd-ja.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-media/gnome-cd-ko.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-cd-ko.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-media/gnome-cd-sv.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-cd-sv.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-media/gnome-cd-zh_CN.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-cd-zh_CN.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-media/gnome-cd-zh_TW.omf @@ -331,12 +322,12 @@ share/gnome/omf/gnome-media/grecord-fr.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-fr.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-media/grecord-it.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-it.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-media/grecord-sv.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-sv.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-media/grecord-ja.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-ja.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-media/grecord-ko.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-ko.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-media/grecord-sv.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-sv.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-media/grecord-zh_CN.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-zh_CN.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-media/grecord-zh_TW.omf @@ -355,6 +346,29 @@ share/gnome/pixmaps/gnome-cd/media-rewind.png share/gnome/pixmaps/gnome-cd/media-stop.png share/gnome/pixmaps/gnome-cd/once.png share/gnome/pixmaps/gnome-cd/repeat.png +share/gnome/pixmaps/gnome-cd/themes/None/None.theme +share/gnome/pixmaps/gnome-cd/themes/None/a-eject-menu.png +share/gnome/pixmaps/gnome-cd/themes/None/a-first-menu.png +share/gnome/pixmaps/gnome-cd/themes/None/a-last-menu.png +share/gnome/pixmaps/gnome-cd/themes/None/a-play-menu.png +share/gnome/pixmaps/gnome-cd/themes/None/a-stop-menu.png +share/gnome/pixmaps/gnome-cd/themes/None/bottom-left.png +share/gnome/pixmaps/gnome-cd/themes/None/bottom-right.png +share/gnome/pixmaps/gnome-cd/themes/None/bottom.png +share/gnome/pixmaps/gnome-cd/themes/None/media-eject.png +share/gnome/pixmaps/gnome-cd/themes/None/media-fwd.png +share/gnome/pixmaps/gnome-cd/themes/None/media-next.png +share/gnome/pixmaps/gnome-cd/themes/None/media-pause.png +share/gnome/pixmaps/gnome-cd/themes/None/media-play.png +share/gnome/pixmaps/gnome-cd/themes/None/media-prev.png +share/gnome/pixmaps/gnome-cd/themes/None/media-rew.png +share/gnome/pixmaps/gnome-cd/themes/None/media-stop.png +share/gnome/pixmaps/gnome-cd/themes/None/middle-left.png +share/gnome/pixmaps/gnome-cd/themes/None/middle-right.png +share/gnome/pixmaps/gnome-cd/themes/None/middle.png +share/gnome/pixmaps/gnome-cd/themes/None/top-left.png +share/gnome/pixmaps/gnome-cd/themes/None/top-right.png +share/gnome/pixmaps/gnome-cd/themes/None/top.png share/gnome/pixmaps/gnome-cd/themes/lcd/bottom-left.png share/gnome/pixmaps/gnome-cd/themes/lcd/bottom-right.png share/gnome/pixmaps/gnome-cd/themes/lcd/bottom.png @@ -399,6 +413,7 @@ share/locale/ar/LC_MESSAGES/gnome-media-2.0.mo share/locale/az/LC_MESSAGES/gnome-media-2.0.mo share/locale/be/LC_MESSAGES/gnome-media-2.0.mo share/locale/bg/LC_MESSAGES/gnome-media-2.0.mo +share/locale/bn/LC_MESSAGES/gnome-media-2.0.mo share/locale/ca/LC_MESSAGES/gnome-media-2.0.mo share/locale/cs/LC_MESSAGES/gnome-media-2.0.mo share/locale/cy/LC_MESSAGES/gnome-media-2.0.mo @@ -423,6 +438,7 @@ share/locale/ja/LC_MESSAGES/gnome-media-2.0.mo share/locale/ko/LC_MESSAGES/gnome-media-2.0.mo share/locale/lt/LC_MESSAGES/gnome-media-2.0.mo share/locale/lv/LC_MESSAGES/gnome-media-2.0.mo +share/locale/mk/LC_MESSAGES/gnome-media-2.0.mo share/locale/ml/LC_MESSAGES/gnome-media-2.0.mo share/locale/mn/LC_MESSAGES/gnome-media-2.0.mo share/locale/ms/LC_MESSAGES/gnome-media-2.0.mo @@ -451,19 +467,57 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo @dirrm share/gnome/pixmaps/gnome-cd/themes/red-lcd @dirrm share/gnome/pixmaps/gnome-cd/themes/media @dirrm share/gnome/pixmaps/gnome-cd/themes/lcd +@dirrm share/gnome/pixmaps/gnome-cd/themes/None @dirrm share/gnome/pixmaps/gnome-cd/themes @dirrm share/gnome/pixmaps/gnome-cd -@dirrm share/gnome/gnome-sound-recorder/ui -@dirrm share/gnome/gnome-sound-recorder @dirrm share/gnome/gnome-media-2.0/interfaces @dirrm share/gnome/gnome-media-2.0/icons @dirrm share/gnome/gnome-media-2.0 +@dirrm share/gnome/gnome-sound-recorder/ui +@dirrm share/gnome/gnome-sound-recorder +@dirrm share/gnome/help/grecord/zh_TW/figures +@dirrm share/gnome/help/grecord/zh_TW +@dirrm share/gnome/help/grecord/zh_CN/figures +@dirrm share/gnome/help/grecord/zh_CN +@dirrm share/gnome/help/grecord/sv/figures +@dirrm share/gnome/help/grecord/sv +@dirrm share/gnome/help/grecord/ko/figures +@dirrm share/gnome/help/grecord/ko +@dirrm share/gnome/help/grecord/ja/figures +@dirrm share/gnome/help/grecord/ja +@dirrm share/gnome/help/grecord/it/figures +@dirrm share/gnome/help/grecord/it +@dirrm share/gnome/help/grecord/fr/figures +@dirrm share/gnome/help/grecord/fr +@dirrm share/gnome/help/grecord/es/figures +@dirrm share/gnome/help/grecord/es +@dirrm share/gnome/help/grecord/de/figures +@dirrm share/gnome/help/grecord/de +@dirrm share/gnome/help/grecord @dirrm share/gnome/help/gnome-volume-control/C/figures @dirrm share/gnome/help/gnome-volume-control/C @dirrm share/gnome/help/gnome-volume-control @dirrm share/gnome/help/gnome-sound-recorder/C/figures @dirrm share/gnome/help/gnome-sound-recorder/C @dirrm share/gnome/help/gnome-sound-recorder +@dirrm share/gnome/help/gnome-cd/zh_TW/figures +@dirrm share/gnome/help/gnome-cd/zh_TW +@dirrm share/gnome/help/gnome-cd/zh_CN/figures +@dirrm share/gnome/help/gnome-cd/zh_CN +@dirrm share/gnome/help/gnome-cd/sv/figures +@dirrm share/gnome/help/gnome-cd/sv +@dirrm share/gnome/help/gnome-cd/ko/figures +@dirrm share/gnome/help/gnome-cd/ko +@dirrm share/gnome/help/gnome-cd/ja/figures +@dirrm share/gnome/help/gnome-cd/ja +@dirrm share/gnome/help/gnome-cd/it/figures +@dirrm share/gnome/help/gnome-cd/it +@dirrm share/gnome/help/gnome-cd/fr/figures +@dirrm share/gnome/help/gnome-cd/fr +@dirrm share/gnome/help/gnome-cd/es/figures +@dirrm share/gnome/help/gnome-cd/es +@dirrm share/gnome/help/gnome-cd/de/figures +@dirrm share/gnome/help/gnome-cd/de @dirrm share/gnome/help/gnome-cd/C/figures @dirrm share/gnome/help/gnome-cd/C @dirrm share/gnome/help/gnome-cd @@ -479,23 +533,23 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-cd @dirrm etc/gconf/gconf.xml.defaults/apps/CDDB-Slave2 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-de.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-es.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-fr.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-it.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-ja.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-ko.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-sv.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-zh_CN.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-zh_TW.omf 2>/dev/null || /usr/bin/true +@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-de.omf 2>/dev/null || /usr/bin/true +@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-es.omf 2>/dev/null || /usr/bin/true +@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-fr.omf 2>/dev/null || /usr/bin/true +@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-it.omf 2>/dev/null || /usr/bin/true +@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-sv.omf 2>/dev/null || /usr/bin/true +@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-ja.omf 2>/dev/null || /usr/bin/true +@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-ko.omf 2>/dev/null || /usr/bin/true +@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-zh_CN.omf 2>/dev/null || /usr/bin/true +@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-zh_TW.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-volume-control-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-de.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-es.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-fr.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-it.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-ja.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-ko.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-sv.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-zh_CN.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-zh_TW.omf 2>/dev/null || /usr/bin/true +@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-de.omf 2>/dev/null || /usr/bin/true +@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-es.omf 2>/dev/null || /usr/bin/true +@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-fr.omf 2>/dev/null || /usr/bin/true +@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-it.omf 2>/dev/null || /usr/bin/true +@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-sv.omf 2>/dev/null || /usr/bin/true +@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-ja.omf 2>/dev/null || /usr/bin/true +@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-ko.omf 2>/dev/null || /usr/bin/true +@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-zh_CN.omf 2>/dev/null || /usr/bin/true +@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-zh_TW.omf 2>/dev/null || /usr/bin/true diff --git a/audio/gnomemedia2/Makefile b/audio/gnomemedia2/Makefile index 910e2b3ea87e..5e719218cae1 100644 --- a/audio/gnomemedia2/Makefile +++ b/audio/gnomemedia2/Makefile @@ -6,15 +6,15 @@ # PORTNAME= gnomemedia2 -PORTVERSION= 2.2.2 +PORTVERSION= 2.4.0 CATEGORIES= audio gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-media/2.2 +MASTER_SITE_SUBDIR= sources/gnome-media/2.4 DISTNAME= gnome-media-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -COMMENT= Multimedia applications for the GNOME 2.0 desktop +COMMENT= Multimedia applications for the GNOME 2 desktop RUN_DEPENDS= sox:${PORTSDIR}/audio/sox LIB_DEPENDS= gstplay-0.6.1:${PORTSDIR}/multimedia/gstreamer-plugins @@ -22,11 +22,11 @@ LIB_DEPENDS= gstplay-0.6.1:${PORTSDIR}/multimedia/gstreamer-plugins USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_REINPLACE= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes -USE_GNOME= gnomeprefix gnomehack gnomehier gail gnomedesktop +GNOME_DESKTOP_VERSION=2 +USE_GNOME= gnomeprefix gnomehack gnomehier gnomedesktop gail CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" + LDFLAGS="-L${LOCALBASE}/lib" .include <bsd.port.mk> diff --git a/audio/gnomemedia2/distinfo b/audio/gnomemedia2/distinfo index 365fed9591ba..aa956f748927 100644 --- a/audio/gnomemedia2/distinfo +++ b/audio/gnomemedia2/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-media-2.2.2.tar.bz2) = 54b8e29b07de4a86abb1bc349d5c2145 +MD5 (gnome2/gnome-media-2.4.0.tar.bz2) = aa5d6a04049ea7552086a6bea47bf375 diff --git a/audio/gnomemedia2/files/patch-gmix_gmix.c b/audio/gnomemedia2/files/patch-gmix_gmix.c deleted file mode 100644 index d306c14e282d..000000000000 --- a/audio/gnomemedia2/files/patch-gmix_gmix.c +++ /dev/null @@ -1,42 +0,0 @@ ---- gmix/gmix.c.orig Sun Mar 16 16:09:01 2003 -+++ gmix/gmix.c Sun Mar 16 16:13:09 2003 -@@ -591,6 +591,11 @@ - /* Masks for the channel data - OSS blows compared to ALSA */ - int recmask, recsrc, stereodee; - -+ /* FreeBSD device name detection */ -+ FILE *sndstat; -+ char line[256]; -+ char *devname, *p; -+ - /* - * create new device configureation - */ -@@ -659,7 +665,26 @@ - } - #else - new_device->card_name = g_strdup_printf ("OSS-%d-%d", num + 1, num + 1); -- g_snprintf (new_device->info.name, 31, "Card %d", num+1); -+ /* get soundcard name from /dev/sndstat on FreeBSD */ -+ sndstat = fopen("/dev/sndstat", "r"); -+ if (!sndstat) -+ g_snprintf (new_device->info.name, 31, "Card %d", num+1); -+ else { -+ while (fgets (line, 255, sndstat)) { -+ if (!strncmp (line, "pcm", 3) && (atoi (&line[3]) == num)) -+ { -+ devname = line; -+ while (*devname++ != '<') -+ ; -+ p = devname; -+ while (*p != '>') -+ p++; -+ *p = '\0'; -+ g_snprintf (new_device->info.name, 31, devname); -+ } -+ } -+ fclose(sndstat); -+ } - #endif - /* - * several bitmasks describing the mixer diff --git a/audio/gnomemedia2/pkg-plist b/audio/gnomemedia2/pkg-plist index a6afc1b9428a..47d38d6ba3b2 100644 --- a/audio/gnomemedia2/pkg-plist +++ b/audio/gnomemedia2/pkg-plist @@ -39,9 +39,6 @@ share/gnome/help/gnome-cd/C/figures/cdplayer_trackeditor_window.png share/gnome/help/gnome-cd/C/figures/cdplayer_window.png share/gnome/help/gnome-cd/C/figures/eject_button.png share/gnome/help/gnome-cd/C/figures/forward_button.png -share/gnome/help/gnome-cd/C/figures/gnome-cd-prefs.png -share/gnome/help/gnome-cd/C/figures/gnome-cd-track.png -share/gnome/help/gnome-cd/C/figures/gnome-cd.png share/gnome/help/gnome-cd/C/figures/next_button.png share/gnome/help/gnome-cd/C/figures/pause_button.png share/gnome/help/gnome-cd/C/figures/play_button.png @@ -51,6 +48,8 @@ share/gnome/help/gnome-cd/C/figures/rewind_button.png share/gnome/help/gnome-cd/C/figures/stop_button.png share/gnome/help/gnome-cd/C/gnome-cd.xml share/gnome/help/gnome-cd/C/legal.xml +share/gnome/help/gnome-cd/de/legal.xml +share/gnome/help/gnome-cd/de/gnome-cd.xml share/gnome/help/gnome-cd/de/figures/cdplayer_trackeditor_button.png share/gnome/help/gnome-cd/de/figures/cdplayer_trackeditor_window.png share/gnome/help/gnome-cd/de/figures/cdplayer_window.png @@ -66,8 +65,8 @@ share/gnome/help/gnome-cd/de/figures/preferences_button.png share/gnome/help/gnome-cd/de/figures/previous_button.png share/gnome/help/gnome-cd/de/figures/rewind_button.png share/gnome/help/gnome-cd/de/figures/stop_button.png -share/gnome/help/gnome-cd/de/gnome-cd.xml -share/gnome/help/gnome-cd/de/legal.xml +share/gnome/help/gnome-cd/es/legal.xml +share/gnome/help/gnome-cd/es/gnome-cd.xml share/gnome/help/gnome-cd/es/figures/cdplayer_trackeditor_button.png share/gnome/help/gnome-cd/es/figures/cdplayer_trackeditor_window.png share/gnome/help/gnome-cd/es/figures/cdplayer_window.png @@ -83,8 +82,8 @@ share/gnome/help/gnome-cd/es/figures/preferences_button.png share/gnome/help/gnome-cd/es/figures/previous_button.png share/gnome/help/gnome-cd/es/figures/rewind_button.png share/gnome/help/gnome-cd/es/figures/stop_button.png -share/gnome/help/gnome-cd/es/gnome-cd.xml -share/gnome/help/gnome-cd/es/legal.xml +share/gnome/help/gnome-cd/fr/legal.xml +share/gnome/help/gnome-cd/fr/gnome-cd.xml share/gnome/help/gnome-cd/fr/figures/cdplayer_trackeditor_button.png share/gnome/help/gnome-cd/fr/figures/cdplayer_trackeditor_window.png share/gnome/help/gnome-cd/fr/figures/cdplayer_window.png @@ -100,8 +99,8 @@ share/gnome/help/gnome-cd/fr/figures/preferences_button.png share/gnome/help/gnome-cd/fr/figures/previous_button.png share/gnome/help/gnome-cd/fr/figures/rewind_button.png share/gnome/help/gnome-cd/fr/figures/stop_button.png -share/gnome/help/gnome-cd/fr/gnome-cd.xml -share/gnome/help/gnome-cd/fr/legal.xml +share/gnome/help/gnome-cd/it/legal.xml +share/gnome/help/gnome-cd/it/gnome-cd.xml share/gnome/help/gnome-cd/it/figures/cdplayer_trackeditor_button.png share/gnome/help/gnome-cd/it/figures/cdplayer_trackeditor_window.png share/gnome/help/gnome-cd/it/figures/cdplayer_window.png @@ -117,8 +116,25 @@ share/gnome/help/gnome-cd/it/figures/preferences_button.png share/gnome/help/gnome-cd/it/figures/previous_button.png share/gnome/help/gnome-cd/it/figures/rewind_button.png share/gnome/help/gnome-cd/it/figures/stop_button.png -share/gnome/help/gnome-cd/it/gnome-cd.xml -share/gnome/help/gnome-cd/it/legal.xml +share/gnome/help/gnome-cd/sv/legal.xml +share/gnome/help/gnome-cd/sv/gnome-cd.xml +share/gnome/help/gnome-cd/sv/figures/cdplayer_trackeditor_button.png +share/gnome/help/gnome-cd/sv/figures/cdplayer_trackeditor_window.png +share/gnome/help/gnome-cd/sv/figures/cdplayer_window.png +share/gnome/help/gnome-cd/sv/figures/eject_button.png +share/gnome/help/gnome-cd/sv/figures/forward_button.png +share/gnome/help/gnome-cd/sv/figures/gnome-cd-prefs.png +share/gnome/help/gnome-cd/sv/figures/gnome-cd-track.png +share/gnome/help/gnome-cd/sv/figures/gnome-cd.png +share/gnome/help/gnome-cd/sv/figures/next_button.png +share/gnome/help/gnome-cd/sv/figures/pause_button.png +share/gnome/help/gnome-cd/sv/figures/play_button.png +share/gnome/help/gnome-cd/sv/figures/preferences_button.png +share/gnome/help/gnome-cd/sv/figures/previous_button.png +share/gnome/help/gnome-cd/sv/figures/rewind_button.png +share/gnome/help/gnome-cd/sv/figures/stop_button.png +share/gnome/help/gnome-cd/ja/legal.xml +share/gnome/help/gnome-cd/ja/gnome-cd.xml share/gnome/help/gnome-cd/ja/figures/cdplayer_trackeditor_button.png share/gnome/help/gnome-cd/ja/figures/cdplayer_trackeditor_window.png share/gnome/help/gnome-cd/ja/figures/cdplayer_window.png @@ -134,8 +150,8 @@ share/gnome/help/gnome-cd/ja/figures/preferences_button.png share/gnome/help/gnome-cd/ja/figures/previous_button.png share/gnome/help/gnome-cd/ja/figures/rewind_button.png share/gnome/help/gnome-cd/ja/figures/stop_button.png -share/gnome/help/gnome-cd/ja/gnome-cd.xml -share/gnome/help/gnome-cd/ja/legal.xml +share/gnome/help/gnome-cd/ko/legal.xml +share/gnome/help/gnome-cd/ko/gnome-cd.xml share/gnome/help/gnome-cd/ko/figures/cdplayer_trackeditor_button.png share/gnome/help/gnome-cd/ko/figures/cdplayer_trackeditor_window.png share/gnome/help/gnome-cd/ko/figures/cdplayer_window.png @@ -151,25 +167,8 @@ share/gnome/help/gnome-cd/ko/figures/preferences_button.png share/gnome/help/gnome-cd/ko/figures/previous_button.png share/gnome/help/gnome-cd/ko/figures/rewind_button.png share/gnome/help/gnome-cd/ko/figures/stop_button.png -share/gnome/help/gnome-cd/ko/gnome-cd.xml -share/gnome/help/gnome-cd/ko/legal.xml -share/gnome/help/gnome-cd/sv/figures/cdplayer_trackeditor_button.png -share/gnome/help/gnome-cd/sv/figures/cdplayer_trackeditor_window.png -share/gnome/help/gnome-cd/sv/figures/cdplayer_window.png -share/gnome/help/gnome-cd/sv/figures/eject_button.png -share/gnome/help/gnome-cd/sv/figures/forward_button.png -share/gnome/help/gnome-cd/sv/figures/gnome-cd-prefs.png -share/gnome/help/gnome-cd/sv/figures/gnome-cd-track.png -share/gnome/help/gnome-cd/sv/figures/gnome-cd.png -share/gnome/help/gnome-cd/sv/figures/next_button.png -share/gnome/help/gnome-cd/sv/figures/pause_button.png -share/gnome/help/gnome-cd/sv/figures/play_button.png -share/gnome/help/gnome-cd/sv/figures/preferences_button.png -share/gnome/help/gnome-cd/sv/figures/previous_button.png -share/gnome/help/gnome-cd/sv/figures/rewind_button.png -share/gnome/help/gnome-cd/sv/figures/stop_button.png -share/gnome/help/gnome-cd/sv/gnome-cd.xml -share/gnome/help/gnome-cd/sv/legal.xml +share/gnome/help/gnome-cd/zh_CN/legal.xml +share/gnome/help/gnome-cd/zh_CN/gnome-cd.xml share/gnome/help/gnome-cd/zh_CN/figures/cdplayer_trackeditor_button.png share/gnome/help/gnome-cd/zh_CN/figures/cdplayer_trackeditor_window.png share/gnome/help/gnome-cd/zh_CN/figures/cdplayer_window.png @@ -185,8 +184,8 @@ share/gnome/help/gnome-cd/zh_CN/figures/preferences_button.png share/gnome/help/gnome-cd/zh_CN/figures/previous_button.png share/gnome/help/gnome-cd/zh_CN/figures/rewind_button.png share/gnome/help/gnome-cd/zh_CN/figures/stop_button.png -share/gnome/help/gnome-cd/zh_CN/gnome-cd.xml -share/gnome/help/gnome-cd/zh_CN/legal.xml +share/gnome/help/gnome-cd/zh_TW/legal.xml +share/gnome/help/gnome-cd/zh_TW/gnome-cd.xml share/gnome/help/gnome-cd/zh_TW/figures/cdplayer_trackeditor_button.png share/gnome/help/gnome-cd/zh_TW/figures/cdplayer_trackeditor_window.png share/gnome/help/gnome-cd/zh_TW/figures/cdplayer_window.png @@ -202,14 +201,6 @@ share/gnome/help/gnome-cd/zh_TW/figures/preferences_button.png share/gnome/help/gnome-cd/zh_TW/figures/previous_button.png share/gnome/help/gnome-cd/zh_TW/figures/rewind_button.png share/gnome/help/gnome-cd/zh_TW/figures/stop_button.png -share/gnome/help/gnome-cd/zh_TW/gnome-cd.xml -share/gnome/help/gnome-cd/zh_TW/legal.xml -share/gnome/help/gnome-sound-recorder/C/figures/grecord-prefs-path.png -share/gnome/help/gnome-sound-recorder/C/figures/grecord-prefs-play.png -share/gnome/help/gnome-sound-recorder/C/figures/grecord-prefs-rec.png -share/gnome/help/gnome-sound-recorder/C/figures/grecord-prefs-sound.png -share/gnome/help/gnome-sound-recorder/C/figures/grecord-prefs-ui.png -share/gnome/help/gnome-sound-recorder/C/figures/grecord.png share/gnome/help/gnome-sound-recorder/C/figures/grecord_window.png share/gnome/help/gnome-sound-recorder/C/gnome-sound-recorder.xml share/gnome/help/gnome-sound-recorder/C/legal.xml @@ -217,6 +208,8 @@ share/gnome/help/gnome-volume-control/C/figures/gmix-prefs.png share/gnome/help/gnome-volume-control/C/figures/gmix.png share/gnome/help/gnome-volume-control/C/gnome-volume-control.xml share/gnome/help/gnome-volume-control/C/legal.xml +share/gnome/help/grecord/de/legal.xml +share/gnome/help/grecord/de/grecord.xml share/gnome/help/grecord/de/figures/grecord-prefs-path.png share/gnome/help/grecord/de/figures/grecord-prefs-play.png share/gnome/help/grecord/de/figures/grecord-prefs-rec.png @@ -224,8 +217,8 @@ share/gnome/help/grecord/de/figures/grecord-prefs-sound.png share/gnome/help/grecord/de/figures/grecord-prefs-ui.png share/gnome/help/grecord/de/figures/grecord.png share/gnome/help/grecord/de/figures/grecord_window.png -share/gnome/help/grecord/de/grecord.xml -share/gnome/help/grecord/de/legal.xml +share/gnome/help/grecord/es/legal.xml +share/gnome/help/grecord/es/grecord.xml share/gnome/help/grecord/es/figures/grecord-prefs-path.png share/gnome/help/grecord/es/figures/grecord-prefs-play.png share/gnome/help/grecord/es/figures/grecord-prefs-rec.png @@ -233,8 +226,8 @@ share/gnome/help/grecord/es/figures/grecord-prefs-sound.png share/gnome/help/grecord/es/figures/grecord-prefs-ui.png share/gnome/help/grecord/es/figures/grecord.png share/gnome/help/grecord/es/figures/grecord_window.png -share/gnome/help/grecord/es/grecord.xml -share/gnome/help/grecord/es/legal.xml +share/gnome/help/grecord/fr/legal.xml +share/gnome/help/grecord/fr/grecord.xml share/gnome/help/grecord/fr/figures/grecord-prefs-path.png share/gnome/help/grecord/fr/figures/grecord-prefs-play.png share/gnome/help/grecord/fr/figures/grecord-prefs-rec.png @@ -242,8 +235,8 @@ share/gnome/help/grecord/fr/figures/grecord-prefs-sound.png share/gnome/help/grecord/fr/figures/grecord-prefs-ui.png share/gnome/help/grecord/fr/figures/grecord.png share/gnome/help/grecord/fr/figures/grecord_window.png -share/gnome/help/grecord/fr/grecord.xml -share/gnome/help/grecord/fr/legal.xml +share/gnome/help/grecord/it/legal.xml +share/gnome/help/grecord/it/grecord.xml share/gnome/help/grecord/it/figures/grecord-prefs-path.png share/gnome/help/grecord/it/figures/grecord-prefs-play.png share/gnome/help/grecord/it/figures/grecord-prefs-rec.png @@ -251,8 +244,17 @@ share/gnome/help/grecord/it/figures/grecord-prefs-sound.png share/gnome/help/grecord/it/figures/grecord-prefs-ui.png share/gnome/help/grecord/it/figures/grecord.png share/gnome/help/grecord/it/figures/grecord_window.png -share/gnome/help/grecord/it/grecord.xml -share/gnome/help/grecord/it/legal.xml +share/gnome/help/grecord/sv/legal.xml +share/gnome/help/grecord/sv/grecord.xml +share/gnome/help/grecord/sv/figures/grecord-prefs-path.png +share/gnome/help/grecord/sv/figures/grecord-prefs-play.png +share/gnome/help/grecord/sv/figures/grecord-prefs-rec.png +share/gnome/help/grecord/sv/figures/grecord-prefs-sound.png +share/gnome/help/grecord/sv/figures/grecord-prefs-ui.png +share/gnome/help/grecord/sv/figures/grecord.png +share/gnome/help/grecord/sv/figures/grecord_window.png +share/gnome/help/grecord/ja/legal.xml +share/gnome/help/grecord/ja/grecord.xml share/gnome/help/grecord/ja/figures/grecord-prefs-path.png share/gnome/help/grecord/ja/figures/grecord-prefs-play.png share/gnome/help/grecord/ja/figures/grecord-prefs-rec.png @@ -260,8 +262,8 @@ share/gnome/help/grecord/ja/figures/grecord-prefs-sound.png share/gnome/help/grecord/ja/figures/grecord-prefs-ui.png share/gnome/help/grecord/ja/figures/grecord.png share/gnome/help/grecord/ja/figures/grecord_window.png -share/gnome/help/grecord/ja/grecord.xml -share/gnome/help/grecord/ja/legal.xml +share/gnome/help/grecord/ko/legal.xml +share/gnome/help/grecord/ko/grecord.xml share/gnome/help/grecord/ko/figures/grecord-prefs-path.png share/gnome/help/grecord/ko/figures/grecord-prefs-play.png share/gnome/help/grecord/ko/figures/grecord-prefs-rec.png @@ -269,17 +271,8 @@ share/gnome/help/grecord/ko/figures/grecord-prefs-sound.png share/gnome/help/grecord/ko/figures/grecord-prefs-ui.png share/gnome/help/grecord/ko/figures/grecord.png share/gnome/help/grecord/ko/figures/grecord_window.png -share/gnome/help/grecord/ko/grecord.xml -share/gnome/help/grecord/ko/legal.xml -share/gnome/help/grecord/sv/figures/grecord-prefs-path.png -share/gnome/help/grecord/sv/figures/grecord-prefs-play.png -share/gnome/help/grecord/sv/figures/grecord-prefs-rec.png -share/gnome/help/grecord/sv/figures/grecord-prefs-sound.png -share/gnome/help/grecord/sv/figures/grecord-prefs-ui.png -share/gnome/help/grecord/sv/figures/grecord.png -share/gnome/help/grecord/sv/figures/grecord_window.png -share/gnome/help/grecord/sv/grecord.xml -share/gnome/help/grecord/sv/legal.xml +share/gnome/help/grecord/zh_CN/legal.xml +share/gnome/help/grecord/zh_CN/grecord.xml share/gnome/help/grecord/zh_CN/figures/grecord-prefs-path.png share/gnome/help/grecord/zh_CN/figures/grecord-prefs-play.png share/gnome/help/grecord/zh_CN/figures/grecord-prefs-rec.png @@ -287,8 +280,8 @@ share/gnome/help/grecord/zh_CN/figures/grecord-prefs-sound.png share/gnome/help/grecord/zh_CN/figures/grecord-prefs-ui.png share/gnome/help/grecord/zh_CN/figures/grecord.png share/gnome/help/grecord/zh_CN/figures/grecord_window.png -share/gnome/help/grecord/zh_CN/grecord.xml -share/gnome/help/grecord/zh_CN/legal.xml +share/gnome/help/grecord/zh_TW/legal.xml +share/gnome/help/grecord/zh_TW/grecord.xml share/gnome/help/grecord/zh_TW/figures/grecord-prefs-path.png share/gnome/help/grecord/zh_TW/figures/grecord-prefs-play.png share/gnome/help/grecord/zh_TW/figures/grecord-prefs-rec.png @@ -296,8 +289,6 @@ share/gnome/help/grecord/zh_TW/figures/grecord-prefs-sound.png share/gnome/help/grecord/zh_TW/figures/grecord-prefs-ui.png share/gnome/help/grecord/zh_TW/figures/grecord.png share/gnome/help/grecord/zh_TW/figures/grecord_window.png -share/gnome/help/grecord/zh_TW/grecord.xml -share/gnome/help/grecord/zh_TW/legal.xml share/gnome/idl/GNOME_Media_CDDBSlave2.idl share/gnome/omf/gnome-media/gnome-cd-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-cd-C.omf 2>/dev/null || /usr/bin/true @@ -309,12 +300,12 @@ share/gnome/omf/gnome-media/gnome-cd-fr.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-cd-fr.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-media/gnome-cd-it.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-cd-it.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-media/gnome-cd-sv.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-cd-sv.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-media/gnome-cd-ja.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-cd-ja.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-media/gnome-cd-ko.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-cd-ko.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-media/gnome-cd-sv.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-cd-sv.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-media/gnome-cd-zh_CN.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-cd-zh_CN.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-media/gnome-cd-zh_TW.omf @@ -331,12 +322,12 @@ share/gnome/omf/gnome-media/grecord-fr.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-fr.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-media/grecord-it.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-it.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-media/grecord-sv.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-sv.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-media/grecord-ja.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-ja.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-media/grecord-ko.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-ko.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-media/grecord-sv.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-sv.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-media/grecord-zh_CN.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-zh_CN.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-media/grecord-zh_TW.omf @@ -355,6 +346,29 @@ share/gnome/pixmaps/gnome-cd/media-rewind.png share/gnome/pixmaps/gnome-cd/media-stop.png share/gnome/pixmaps/gnome-cd/once.png share/gnome/pixmaps/gnome-cd/repeat.png +share/gnome/pixmaps/gnome-cd/themes/None/None.theme +share/gnome/pixmaps/gnome-cd/themes/None/a-eject-menu.png +share/gnome/pixmaps/gnome-cd/themes/None/a-first-menu.png +share/gnome/pixmaps/gnome-cd/themes/None/a-last-menu.png +share/gnome/pixmaps/gnome-cd/themes/None/a-play-menu.png +share/gnome/pixmaps/gnome-cd/themes/None/a-stop-menu.png +share/gnome/pixmaps/gnome-cd/themes/None/bottom-left.png +share/gnome/pixmaps/gnome-cd/themes/None/bottom-right.png +share/gnome/pixmaps/gnome-cd/themes/None/bottom.png +share/gnome/pixmaps/gnome-cd/themes/None/media-eject.png +share/gnome/pixmaps/gnome-cd/themes/None/media-fwd.png +share/gnome/pixmaps/gnome-cd/themes/None/media-next.png +share/gnome/pixmaps/gnome-cd/themes/None/media-pause.png +share/gnome/pixmaps/gnome-cd/themes/None/media-play.png +share/gnome/pixmaps/gnome-cd/themes/None/media-prev.png +share/gnome/pixmaps/gnome-cd/themes/None/media-rew.png +share/gnome/pixmaps/gnome-cd/themes/None/media-stop.png +share/gnome/pixmaps/gnome-cd/themes/None/middle-left.png +share/gnome/pixmaps/gnome-cd/themes/None/middle-right.png +share/gnome/pixmaps/gnome-cd/themes/None/middle.png +share/gnome/pixmaps/gnome-cd/themes/None/top-left.png +share/gnome/pixmaps/gnome-cd/themes/None/top-right.png +share/gnome/pixmaps/gnome-cd/themes/None/top.png share/gnome/pixmaps/gnome-cd/themes/lcd/bottom-left.png share/gnome/pixmaps/gnome-cd/themes/lcd/bottom-right.png share/gnome/pixmaps/gnome-cd/themes/lcd/bottom.png @@ -399,6 +413,7 @@ share/locale/ar/LC_MESSAGES/gnome-media-2.0.mo share/locale/az/LC_MESSAGES/gnome-media-2.0.mo share/locale/be/LC_MESSAGES/gnome-media-2.0.mo share/locale/bg/LC_MESSAGES/gnome-media-2.0.mo +share/locale/bn/LC_MESSAGES/gnome-media-2.0.mo share/locale/ca/LC_MESSAGES/gnome-media-2.0.mo share/locale/cs/LC_MESSAGES/gnome-media-2.0.mo share/locale/cy/LC_MESSAGES/gnome-media-2.0.mo @@ -423,6 +438,7 @@ share/locale/ja/LC_MESSAGES/gnome-media-2.0.mo share/locale/ko/LC_MESSAGES/gnome-media-2.0.mo share/locale/lt/LC_MESSAGES/gnome-media-2.0.mo share/locale/lv/LC_MESSAGES/gnome-media-2.0.mo +share/locale/mk/LC_MESSAGES/gnome-media-2.0.mo share/locale/ml/LC_MESSAGES/gnome-media-2.0.mo share/locale/mn/LC_MESSAGES/gnome-media-2.0.mo share/locale/ms/LC_MESSAGES/gnome-media-2.0.mo @@ -451,19 +467,57 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo @dirrm share/gnome/pixmaps/gnome-cd/themes/red-lcd @dirrm share/gnome/pixmaps/gnome-cd/themes/media @dirrm share/gnome/pixmaps/gnome-cd/themes/lcd +@dirrm share/gnome/pixmaps/gnome-cd/themes/None @dirrm share/gnome/pixmaps/gnome-cd/themes @dirrm share/gnome/pixmaps/gnome-cd -@dirrm share/gnome/gnome-sound-recorder/ui -@dirrm share/gnome/gnome-sound-recorder @dirrm share/gnome/gnome-media-2.0/interfaces @dirrm share/gnome/gnome-media-2.0/icons @dirrm share/gnome/gnome-media-2.0 +@dirrm share/gnome/gnome-sound-recorder/ui +@dirrm share/gnome/gnome-sound-recorder +@dirrm share/gnome/help/grecord/zh_TW/figures +@dirrm share/gnome/help/grecord/zh_TW +@dirrm share/gnome/help/grecord/zh_CN/figures +@dirrm share/gnome/help/grecord/zh_CN +@dirrm share/gnome/help/grecord/sv/figures +@dirrm share/gnome/help/grecord/sv +@dirrm share/gnome/help/grecord/ko/figures +@dirrm share/gnome/help/grecord/ko +@dirrm share/gnome/help/grecord/ja/figures +@dirrm share/gnome/help/grecord/ja +@dirrm share/gnome/help/grecord/it/figures +@dirrm share/gnome/help/grecord/it +@dirrm share/gnome/help/grecord/fr/figures +@dirrm share/gnome/help/grecord/fr +@dirrm share/gnome/help/grecord/es/figures +@dirrm share/gnome/help/grecord/es +@dirrm share/gnome/help/grecord/de/figures +@dirrm share/gnome/help/grecord/de +@dirrm share/gnome/help/grecord @dirrm share/gnome/help/gnome-volume-control/C/figures @dirrm share/gnome/help/gnome-volume-control/C @dirrm share/gnome/help/gnome-volume-control @dirrm share/gnome/help/gnome-sound-recorder/C/figures @dirrm share/gnome/help/gnome-sound-recorder/C @dirrm share/gnome/help/gnome-sound-recorder +@dirrm share/gnome/help/gnome-cd/zh_TW/figures +@dirrm share/gnome/help/gnome-cd/zh_TW +@dirrm share/gnome/help/gnome-cd/zh_CN/figures +@dirrm share/gnome/help/gnome-cd/zh_CN +@dirrm share/gnome/help/gnome-cd/sv/figures +@dirrm share/gnome/help/gnome-cd/sv +@dirrm share/gnome/help/gnome-cd/ko/figures +@dirrm share/gnome/help/gnome-cd/ko +@dirrm share/gnome/help/gnome-cd/ja/figures +@dirrm share/gnome/help/gnome-cd/ja +@dirrm share/gnome/help/gnome-cd/it/figures +@dirrm share/gnome/help/gnome-cd/it +@dirrm share/gnome/help/gnome-cd/fr/figures +@dirrm share/gnome/help/gnome-cd/fr +@dirrm share/gnome/help/gnome-cd/es/figures +@dirrm share/gnome/help/gnome-cd/es +@dirrm share/gnome/help/gnome-cd/de/figures +@dirrm share/gnome/help/gnome-cd/de @dirrm share/gnome/help/gnome-cd/C/figures @dirrm share/gnome/help/gnome-cd/C @dirrm share/gnome/help/gnome-cd @@ -479,23 +533,23 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-cd @dirrm etc/gconf/gconf.xml.defaults/apps/CDDB-Slave2 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-de.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-es.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-fr.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-it.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-ja.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-ko.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-sv.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-zh_CN.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-zh_TW.omf 2>/dev/null || /usr/bin/true +@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-de.omf 2>/dev/null || /usr/bin/true +@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-es.omf 2>/dev/null || /usr/bin/true +@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-fr.omf 2>/dev/null || /usr/bin/true +@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-it.omf 2>/dev/null || /usr/bin/true +@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-sv.omf 2>/dev/null || /usr/bin/true +@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-ja.omf 2>/dev/null || /usr/bin/true +@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-ko.omf 2>/dev/null || /usr/bin/true +@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-zh_CN.omf 2>/dev/null || /usr/bin/true +@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-zh_TW.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-volume-control-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-de.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-es.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-fr.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-it.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-ja.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-ko.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-sv.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-zh_CN.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-zh_TW.omf 2>/dev/null || /usr/bin/true +@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-de.omf 2>/dev/null || /usr/bin/true +@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-es.omf 2>/dev/null || /usr/bin/true +@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-fr.omf 2>/dev/null || /usr/bin/true +@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-it.omf 2>/dev/null || /usr/bin/true +@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-sv.omf 2>/dev/null || /usr/bin/true +@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-ja.omf 2>/dev/null || /usr/bin/true +@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-ko.omf 2>/dev/null || /usr/bin/true +@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-zh_CN.omf 2>/dev/null || /usr/bin/true +@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-zh_TW.omf 2>/dev/null || /usr/bin/true diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile index eebffb793f2f..647d4b51a07e 100644 --- a/deskutils/gnome-utils/Makefile +++ b/deskutils/gnome-utils/Makefile @@ -6,11 +6,11 @@ # PORTNAME= gnomeutils2 -PORTVERSION= 2.2.3 +PORTVERSION= 2.4.0 PORTEPOCH= 1 CATEGORIES= deskutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-utils/2.2 +MASTER_SITE_SUBDIR= sources/gnome-utils/2.4 DISTNAME= gnome-utils-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -27,8 +27,6 @@ USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -MAN1= gnome-calculator.1 \ - gnome-character-map.1 gnome-dictionary.1 \ - gnome-search-tool.1 gnome-system-log.1 gdialog.1 +MAN1= gnome-dictionary.1 gnome-search-tool.1 gnome-system-log.1 .include <bsd.port.mk> diff --git a/deskutils/gnome-utils/distinfo b/deskutils/gnome-utils/distinfo index e129db538a78..7d698ea00191 100644 --- a/deskutils/gnome-utils/distinfo +++ b/deskutils/gnome-utils/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-utils-2.2.3.tar.bz2) = 2bde68d39e135a99dfd308a7ec7b6c4a +MD5 (gnome2/gnome-utils-2.4.0.tar.bz2) = 6986c0b7b5898f1f515add00b946ae48 diff --git a/deskutils/gnome-utils/files/patch-ad b/deskutils/gnome-utils/files/patch-ad deleted file mode 100644 index 65ebff071c14..000000000000 --- a/deskutils/gnome-utils/files/patch-ad +++ /dev/null @@ -1,28 +0,0 @@ ---- gdialog/dialog.h.orig Tue Jul 6 16:23:33 1999 -+++ gdialog/dialog.h Wed Aug 18 11:34:23 1999 -@@ -36,24 +36,7 @@ - #include <gnome.h> - #endif - --#ifdef ultrix --# include <cursesX.h> --#else --# if defined(USE_NCURSES) && !defined(RENAMED_NCURSES) --# include <ncurses.h> --# else --# if !defined(_XOPEN_SOURCE_EXTENDED) && !defined(__sgi) --# define hacked 1 --# define _XOPEN_SOURCE_EXTENDED --# define _ACS_COMPAT_CODE --# endif --# include <curses.h> --# ifdef hacked --# undef _XOPEN_SOURCE_EXTENDED --# undef _ACS_COMPAT_CODE --# endif --# endif --#endif -+#include <ncurses.h> - - /* - * Change these if you want diff --git a/deskutils/gnome-utils/files/patch-ai b/deskutils/gnome-utils/files/patch-ai index fb458fceab12..927a2b461d2f 100644 --- a/deskutils/gnome-utils/files/patch-ai +++ b/deskutils/gnome-utils/files/patch-ai @@ -1,11 +1,11 @@ ---- sgmldocs.make.orig Mon May 6 23:46:55 2002 -+++ sgmldocs.make Mon May 6 23:47:10 2002 -@@ -32,7 +32,7 @@ - # dist-hook: app-dist-hook - # - +--- xmldocs.make.orig Thu Aug 7 09:56:16 2003 ++++ xmldocs.make Thu Aug 7 13:55:58 2003 +@@ -36,7 +36,7 @@ + # ********** Begin of section some packagers may need to modify ********** + # This variable (docdir) specifies where the documents should be installed. + # This default value should work for most packages. -docdir = $(datadir)/gnome/help/$(docname)/$(lang) +docdir = $(datadir)/help/$(docname)/$(lang) - doc_DATA = index.html - + # ********** You should not have to edit below this line ********** + xml_files = $(entities) $(docname).xml diff --git a/deskutils/gnome-utils/files/patch-logview_logview.c b/deskutils/gnome-utils/files/patch-logview_logview.c index 3fe0abf93a19..1155fdb97624 100644 --- a/deskutils/gnome-utils/files/patch-logview_logview.c +++ b/deskutils/gnome-utils/files/patch-logview_logview.c @@ -1,5 +1,5 @@ ---- logview/logview.c.orig Sun Feb 16 15:34:59 2003 -+++ logview/logview.c Wed Apr 23 14:51:26 2003 +--- logview/logview.c.orig Sun Feb 16 15:36:07 2003 ++++ logview/logview.c Thu Apr 24 12:53:35 2003 @@ -774,7 +774,7 @@ if ( ! found) { @@ -27,11 +27,3 @@ if (access (full_name, R_OK) == 0) { found = TRUE; g_free (cfg->action_db_path); -@@ -882,7 +882,6 @@ - else - prefs->logfile = NULL; - } -- g_free (logfile); - } - - void SaveUserPrefs(UserPrefsStruct *prefs) diff --git a/deskutils/gnome-utils/pkg-descr b/deskutils/gnome-utils/pkg-descr index 7738e6fc53a3..3aaba4bf64ba 100644 --- a/deskutils/gnome-utils/pkg-descr +++ b/deskutils/gnome-utils/pkg-descr @@ -1,3 +1,3 @@ -GNOME 2 support utilities, including an on-the-fly dialog box tool -(like Zenity), a dictionary, a frontend for find(1), and a system log -viewer. +GNOME 2.0 support utilities, including an on-the-fly dialog box tool +(like Zenity), a dictionary, a frontend for find(1), a system log +viewer, and more. diff --git a/deskutils/gnome-utils/pkg-plist b/deskutils/gnome-utils/pkg-plist index 20c31677e486..7fd75b26c23b 100644 --- a/deskutils/gnome-utils/pkg-plist +++ b/deskutils/gnome-utils/pkg-plist @@ -1,19 +1,23 @@ -bin/gdialog -bin/gnome-calculator -bin/gnome-character-map bin/gnome-dictionary bin/gnome-search-tool bin/gnome-system-log +etc/gconf/gconf.xml.defaults/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnome-dictionary/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnome-search-tool/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnome-search-tool/select/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnome-system-log/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnome-dictionary/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnome-search-tool/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnome-search-tool/select/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnome-system-log/%gconf.xml etc/gconf/schemas/gdict.schemas +etc/gconf/schemas/gnome-search-tool.schemas etc/gconf/schemas/logview.schemas libdata/bonobo/servers/GNOME_GDictApplet.server libexec/gdict-applet -share/gnome/applications/gnome-calculator.desktop -share/gnome/applications/gnome-character-map.desktop share/gnome/applications/gnome-dictionary.desktop share/gnome/applications/gnome-search-tool.desktop share/gnome/applications/gnome-system-log.desktop @@ -21,76 +25,6 @@ share/gnome/gnome-2.0/ui/GNOME_GDictApplet.xml share/gnome/gnome-system-log/gnome-system-log-actions.db share/gnome/gnome-system-log/gnome-system-log-descript.db share/gnome/gnome-system-log/gnome-system-log-regexp.db -share/gnome/help/gdialog/C/figures/example-dialog.png -share/gnome/help/gdialog/C/figures/gdialog-msgbox.png -share/gnome/help/gdialog/C/figures/gdialog-yesno.png -share/gnome/help/gdialog/C/gdialog.xml -share/gnome/help/gdialog/C/legal.xml -share/gnome/help/gdialog/ja/figures/example-dialog.png -share/gnome/help/gdialog/ja/figures/gdialog-msgbox.png -share/gnome/help/gdialog/ja/figures/gdialog-yesno.png -share/gnome/help/gdialog/ja/gdialog.xml -share/gnome/help/gdialog/ja/legal.xml -share/gnome/help/gnome-calculator/C/figures/gcalc_window.png -share/gnome/help/gnome-calculator/C/gnome-calculator.xml -share/gnome/help/gnome-calculator/C/legal.xml -share/gnome/help/gnome-calculator/de/figures/gcalc-main.png -share/gnome/help/gnome-calculator/de/gnome-calculator.xml -share/gnome/help/gnome-calculator/de/legal.xml -share/gnome/help/gnome-calculator/es/figures/gcalc-main.png -share/gnome/help/gnome-calculator/es/gnome-calculator.xml -share/gnome/help/gnome-calculator/es/legal.xml -share/gnome/help/gnome-calculator/fr/figures/gcalc_window.png -share/gnome/help/gnome-calculator/fr/gnome-calculator.xml -share/gnome/help/gnome-calculator/fr/legal.xml -share/gnome/help/gnome-calculator/it/figures/gcalc-main.png -share/gnome/help/gnome-calculator/it/gnome-calculator.xml -share/gnome/help/gnome-calculator/it/legal.xml -share/gnome/help/gnome-calculator/ja/figures/gcalc_window.png -share/gnome/help/gnome-calculator/ja/gnome-calculator.xml -share/gnome/help/gnome-calculator/ja/legal.xml -share/gnome/help/gnome-calculator/ko/figures/gcalc_window.png -share/gnome/help/gnome-calculator/ko/gnome-calculator.xml -share/gnome/help/gnome-calculator/ko/legal.xml -share/gnome/help/gnome-calculator/sv/figures/gcalc_window.png -share/gnome/help/gnome-calculator/sv/gnome-calculator.xml -share/gnome/help/gnome-calculator/sv/legal.xml -share/gnome/help/gnome-calculator/zh_CN/figures/gcalc_window.png -share/gnome/help/gnome-calculator/zh_CN/gnome-calculator.xml -share/gnome/help/gnome-calculator/zh_CN/legal.xml -share/gnome/help/gnome-calculator/zh_TW/figures/gcalc_window.png -share/gnome/help/gnome-calculator/zh_TW/gnome-calculator.xml -share/gnome/help/gnome-calculator/zh_TW/legal.xml -share/gnome/help/gnome-character-map/C/figures/gnome-character-map.png -share/gnome/help/gnome-character-map/C/gnome-character-map.xml -share/gnome/help/gnome-character-map/C/legal.xml -share/gnome/help/gnome-character-map/de/figures/gnome-character-map.png -share/gnome/help/gnome-character-map/de/gnome-character-map.xml -share/gnome/help/gnome-character-map/de/legal.xml -share/gnome/help/gnome-character-map/es/figures/gnome-character-map.png -share/gnome/help/gnome-character-map/es/gnome-character-map.xml -share/gnome/help/gnome-character-map/es/legal.xml -share/gnome/help/gnome-character-map/fr/figures/gnome-character-map.png -share/gnome/help/gnome-character-map/fr/gnome-character-map.xml -share/gnome/help/gnome-character-map/fr/legal.xml -share/gnome/help/gnome-character-map/it/figures/gnome-character-map.png -share/gnome/help/gnome-character-map/it/gnome-character-map.xml -share/gnome/help/gnome-character-map/it/legal.xml -share/gnome/help/gnome-character-map/ja/figures/gnome-character-map.png -share/gnome/help/gnome-character-map/ja/gnome-character-map.xml -share/gnome/help/gnome-character-map/ja/legal.xml -share/gnome/help/gnome-character-map/ko/figures/gnome-character-map.png -share/gnome/help/gnome-character-map/ko/gnome-character-map.xml -share/gnome/help/gnome-character-map/ko/legal.xml -share/gnome/help/gnome-character-map/sv/figures/gnome-character-map.png -share/gnome/help/gnome-character-map/sv/gnome-character-map.xml -share/gnome/help/gnome-character-map/sv/legal.xml -share/gnome/help/gnome-character-map/zh_CN/figures/gnome-character-map.png -share/gnome/help/gnome-character-map/zh_CN/gnome-character-map.xml -share/gnome/help/gnome-character-map/zh_CN/legal.xml -share/gnome/help/gnome-character-map/zh_TW/figures/gnome-character-map.png -share/gnome/help/gnome-character-map/zh_TW/gnome-character-map.xml -share/gnome/help/gnome-character-map/zh_TW/legal.xml share/gnome/help/gnome-dictionary/C/figures/gdict_applet.png share/gnome/help/gnome-dictionary/C/figures/gdict_window.png share/gnome/help/gnome-dictionary/C/gnome-dictionary.xml @@ -102,9 +36,6 @@ share/gnome/help/gnome-dictionary/ja/legal.xml share/gnome/help/gnome-search-tool/C/figures/gnome-search-tool_window.png share/gnome/help/gnome-search-tool/C/gnome-search-tool.xml share/gnome/help/gnome-search-tool/C/legal.xml -share/gnome/help/gnome-search-tool/de/figures/gnome-search-tool_window.png -share/gnome/help/gnome-search-tool/de/gnome-search-tool.xml -share/gnome/help/gnome-search-tool/de/legal.xml share/gnome/help/gnome-search-tool/es/figures/gnome-search-tool_window.png share/gnome/help/gnome-search-tool/es/gnome-search-tool.xml share/gnome/help/gnome-search-tool/es/legal.xml @@ -159,58 +90,12 @@ share/gnome/help/gnome-system-log/zh_CN/legal.xml share/gnome/help/gnome-system-log/zh_TW/figures/syslog_window.png share/gnome/help/gnome-system-log/zh_TW/gnome-system-log.xml share/gnome/help/gnome-system-log/zh_TW/legal.xml -share/gnome/omf/gnome-utils/gdialog-C.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gdialog-C.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-utils/gdialog-ja.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gdialog-ja.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-utils/gnome-calculator-C.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-C.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-utils/gnome-calculator-de.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-de.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-utils/gnome-calculator-es.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-es.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-utils/gnome-calculator-fr.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-fr.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-utils/gnome-calculator-it.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-it.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-utils/gnome-calculator-ja.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-ja.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-utils/gnome-calculator-ko.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-ko.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-utils/gnome-calculator-sv.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-sv.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-utils/gnome-calculator-zh_CN.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-zh_CN.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-utils/gnome-calculator-zh_TW.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-zh_TW.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-utils/gnome-character-map-C.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-C.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-utils/gnome-character-map-de.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-de.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-utils/gnome-character-map-es.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-es.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-utils/gnome-character-map-fr.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-fr.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-utils/gnome-character-map-it.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-it.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-utils/gnome-character-map-ja.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-ja.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-utils/gnome-character-map-ko.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-ko.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-utils/gnome-character-map-sv.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-sv.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-utils/gnome-character-map-zh_CN.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-zh_CN.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-utils/gnome-character-map-zh_TW.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-zh_TW.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-utils/gnome-dictionary-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-dictionary-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-utils/gnome-dictionary-ja.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-dictionary-ja.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-utils/gnome-search-tool-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-C.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-utils/gnome-search-tool-de.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-de.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-utils/gnome-search-tool-es.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-es.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-utils/gnome-search-tool-fr.omf @@ -248,15 +133,17 @@ share/gnome/omf/gnome-utils/gnome-system-log-zh_CN.omf share/gnome/omf/gnome-utils/gnome-system-log-zh_TW.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-system-log-zh_TW.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/gdict.png -share/gnome/pixmaps/gnome-character-map.png +share/gnome/pixmaps/gnome-search-tool/gnome-search-tool-animation.png share/gnome/pixmaps/gnome-searchtool.png share/locale/am/LC_MESSAGES/gnome-utils-2.0.mo share/locale/ar/LC_MESSAGES/gnome-utils-2.0.mo share/locale/az/LC_MESSAGES/gnome-utils-2.0.mo share/locale/be/LC_MESSAGES/gnome-utils-2.0.mo share/locale/bg/LC_MESSAGES/gnome-utils-2.0.mo +share/locale/bn/LC_MESSAGES/gnome-utils-2.0.mo share/locale/ca/LC_MESSAGES/gnome-utils-2.0.mo share/locale/cs/LC_MESSAGES/gnome-utils-2.0.mo +share/locale/cy/LC_MESSAGES/gnome-utils-2.0.mo share/locale/da/LC_MESSAGES/gnome-utils-2.0.mo share/locale/de/LC_MESSAGES/gnome-utils-2.0.mo share/locale/el/LC_MESSAGES/gnome-utils-2.0.mo @@ -272,6 +159,7 @@ share/locale/gl/LC_MESSAGES/gnome-utils-2.0.mo share/locale/he/LC_MESSAGES/gnome-utils-2.0.mo share/locale/hi/LC_MESSAGES/gnome-utils-2.0.mo share/locale/hu/LC_MESSAGES/gnome-utils-2.0.mo +share/locale/id/LC_MESSAGES/gnome-utils-2.0.mo share/locale/it/LC_MESSAGES/gnome-utils-2.0.mo share/locale/ja/LC_MESSAGES/gnome-utils-2.0.mo share/locale/ko/LC_MESSAGES/gnome-utils-2.0.mo @@ -291,6 +179,7 @@ share/locale/ro/LC_MESSAGES/gnome-utils-2.0.mo share/locale/ru/LC_MESSAGES/gnome-utils-2.0.mo share/locale/sk/LC_MESSAGES/gnome-utils-2.0.mo share/locale/sl/LC_MESSAGES/gnome-utils-2.0.mo +share/locale/sq/LC_MESSAGES/gnome-utils-2.0.mo share/locale/sr/LC_MESSAGES/gnome-utils-2.0.mo share/locale/sr@Latn/LC_MESSAGES/gnome-utils-2.0.mo share/locale/sv/LC_MESSAGES/gnome-utils-2.0.mo @@ -301,7 +190,7 @@ share/locale/vi/LC_MESSAGES/gnome-utils-2.0.mo share/locale/wa/LC_MESSAGES/gnome-utils-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-utils-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo -@dirrm share/gnome/pixmaps/gnome-system-log +@dirrm share/gnome/pixmaps/gnome-search-tool @dirrm share/gnome/help/gnome-system-log/zh_TW/figures @dirrm share/gnome/help/gnome-system-log/zh_TW @dirrm share/gnome/help/gnome-system-log/zh_CN/figures @@ -339,8 +228,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo @dirrm share/gnome/help/gnome-search-tool/fr @dirrm share/gnome/help/gnome-search-tool/es/figures @dirrm share/gnome/help/gnome-search-tool/es -@dirrm share/gnome/help/gnome-search-tool/de/figures -@dirrm share/gnome/help/gnome-search-tool/de @dirrm share/gnome/help/gnome-search-tool/C/figures @dirrm share/gnome/help/gnome-search-tool/C @dirrm share/gnome/help/gnome-search-tool @@ -349,83 +236,18 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo @dirrm share/gnome/help/gnome-dictionary/C/figures @dirrm share/gnome/help/gnome-dictionary/C @dirrm share/gnome/help/gnome-dictionary -@dirrm share/gnome/help/gnome-character-map/zh_TW/figures -@dirrm share/gnome/help/gnome-character-map/zh_TW -@dirrm share/gnome/help/gnome-character-map/zh_CN/figures -@dirrm share/gnome/help/gnome-character-map/zh_CN -@dirrm share/gnome/help/gnome-character-map/sv/figures -@dirrm share/gnome/help/gnome-character-map/sv -@dirrm share/gnome/help/gnome-character-map/ko/figures -@dirrm share/gnome/help/gnome-character-map/ko -@dirrm share/gnome/help/gnome-character-map/ja/figures -@dirrm share/gnome/help/gnome-character-map/ja -@dirrm share/gnome/help/gnome-character-map/it/figures -@dirrm share/gnome/help/gnome-character-map/it -@dirrm share/gnome/help/gnome-character-map/fr/figures -@dirrm share/gnome/help/gnome-character-map/fr -@dirrm share/gnome/help/gnome-character-map/es/figures -@dirrm share/gnome/help/gnome-character-map/es -@dirrm share/gnome/help/gnome-character-map/de/figures -@dirrm share/gnome/help/gnome-character-map/de -@dirrm share/gnome/help/gnome-character-map/C/figures -@dirrm share/gnome/help/gnome-character-map/C -@dirrm share/gnome/help/gnome-character-map -@dirrm share/gnome/help/gnome-calculator/zh_TW/figures -@dirrm share/gnome/help/gnome-calculator/zh_TW -@dirrm share/gnome/help/gnome-calculator/zh_CN/figures -@dirrm share/gnome/help/gnome-calculator/zh_CN -@dirrm share/gnome/help/gnome-calculator/sv/figures -@dirrm share/gnome/help/gnome-calculator/sv -@dirrm share/gnome/help/gnome-calculator/ko/figures -@dirrm share/gnome/help/gnome-calculator/ko -@dirrm share/gnome/help/gnome-calculator/ja/figures -@dirrm share/gnome/help/gnome-calculator/ja -@dirrm share/gnome/help/gnome-calculator/it/figures -@dirrm share/gnome/help/gnome-calculator/it -@dirrm share/gnome/help/gnome-calculator/fr/figures -@dirrm share/gnome/help/gnome-calculator/fr -@dirrm share/gnome/help/gnome-calculator/es/figures -@dirrm share/gnome/help/gnome-calculator/es -@dirrm share/gnome/help/gnome-calculator/de/figures -@dirrm share/gnome/help/gnome-calculator/de -@dirrm share/gnome/help/gnome-calculator/C/figures -@dirrm share/gnome/help/gnome-calculator/C -@dirrm share/gnome/help/gnome-calculator -@dirrm share/gnome/help/gdialog/ja/figures -@dirrm share/gnome/help/gdialog/ja -@dirrm share/gnome/help/gdialog/C/figures -@dirrm share/gnome/help/gdialog/C @dirrm share/gnome/gnome-system-log @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-system-log +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-search-tool/select +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-search-tool @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-dictionary @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-system-log +@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-search-tool/select +@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-search-tool @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-dictionary -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gdialog-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gdialog-ja.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-de.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-es.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-fr.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-it.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-ja.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-ko.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-sv.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-zh_CN.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-zh_TW.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-de.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-es.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-fr.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-it.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-ja.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-ko.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-sv.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-zh_CN.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-zh_TW.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-dictionary-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-dictionary-ja.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-de.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-es.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-fr.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-it.omf 2>/dev/null || /usr/bin/true diff --git a/deskutils/gnomeutils2/Makefile b/deskutils/gnomeutils2/Makefile index eebffb793f2f..647d4b51a07e 100644 --- a/deskutils/gnomeutils2/Makefile +++ b/deskutils/gnomeutils2/Makefile @@ -6,11 +6,11 @@ # PORTNAME= gnomeutils2 -PORTVERSION= 2.2.3 +PORTVERSION= 2.4.0 PORTEPOCH= 1 CATEGORIES= deskutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-utils/2.2 +MASTER_SITE_SUBDIR= sources/gnome-utils/2.4 DISTNAME= gnome-utils-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -27,8 +27,6 @@ USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -MAN1= gnome-calculator.1 \ - gnome-character-map.1 gnome-dictionary.1 \ - gnome-search-tool.1 gnome-system-log.1 gdialog.1 +MAN1= gnome-dictionary.1 gnome-search-tool.1 gnome-system-log.1 .include <bsd.port.mk> diff --git a/deskutils/gnomeutils2/distinfo b/deskutils/gnomeutils2/distinfo index e129db538a78..7d698ea00191 100644 --- a/deskutils/gnomeutils2/distinfo +++ b/deskutils/gnomeutils2/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-utils-2.2.3.tar.bz2) = 2bde68d39e135a99dfd308a7ec7b6c4a +MD5 (gnome2/gnome-utils-2.4.0.tar.bz2) = 6986c0b7b5898f1f515add00b946ae48 diff --git a/deskutils/gnomeutils2/files/patch-ad b/deskutils/gnomeutils2/files/patch-ad deleted file mode 100644 index 65ebff071c14..000000000000 --- a/deskutils/gnomeutils2/files/patch-ad +++ /dev/null @@ -1,28 +0,0 @@ ---- gdialog/dialog.h.orig Tue Jul 6 16:23:33 1999 -+++ gdialog/dialog.h Wed Aug 18 11:34:23 1999 -@@ -36,24 +36,7 @@ - #include <gnome.h> - #endif - --#ifdef ultrix --# include <cursesX.h> --#else --# if defined(USE_NCURSES) && !defined(RENAMED_NCURSES) --# include <ncurses.h> --# else --# if !defined(_XOPEN_SOURCE_EXTENDED) && !defined(__sgi) --# define hacked 1 --# define _XOPEN_SOURCE_EXTENDED --# define _ACS_COMPAT_CODE --# endif --# include <curses.h> --# ifdef hacked --# undef _XOPEN_SOURCE_EXTENDED --# undef _ACS_COMPAT_CODE --# endif --# endif --#endif -+#include <ncurses.h> - - /* - * Change these if you want diff --git a/deskutils/gnomeutils2/files/patch-ai b/deskutils/gnomeutils2/files/patch-ai index fb458fceab12..927a2b461d2f 100644 --- a/deskutils/gnomeutils2/files/patch-ai +++ b/deskutils/gnomeutils2/files/patch-ai @@ -1,11 +1,11 @@ ---- sgmldocs.make.orig Mon May 6 23:46:55 2002 -+++ sgmldocs.make Mon May 6 23:47:10 2002 -@@ -32,7 +32,7 @@ - # dist-hook: app-dist-hook - # - +--- xmldocs.make.orig Thu Aug 7 09:56:16 2003 ++++ xmldocs.make Thu Aug 7 13:55:58 2003 +@@ -36,7 +36,7 @@ + # ********** Begin of section some packagers may need to modify ********** + # This variable (docdir) specifies where the documents should be installed. + # This default value should work for most packages. -docdir = $(datadir)/gnome/help/$(docname)/$(lang) +docdir = $(datadir)/help/$(docname)/$(lang) - doc_DATA = index.html - + # ********** You should not have to edit below this line ********** + xml_files = $(entities) $(docname).xml diff --git a/deskutils/gnomeutils2/files/patch-logview_logview.c b/deskutils/gnomeutils2/files/patch-logview_logview.c index 3fe0abf93a19..1155fdb97624 100644 --- a/deskutils/gnomeutils2/files/patch-logview_logview.c +++ b/deskutils/gnomeutils2/files/patch-logview_logview.c @@ -1,5 +1,5 @@ ---- logview/logview.c.orig Sun Feb 16 15:34:59 2003 -+++ logview/logview.c Wed Apr 23 14:51:26 2003 +--- logview/logview.c.orig Sun Feb 16 15:36:07 2003 ++++ logview/logview.c Thu Apr 24 12:53:35 2003 @@ -774,7 +774,7 @@ if ( ! found) { @@ -27,11 +27,3 @@ if (access (full_name, R_OK) == 0) { found = TRUE; g_free (cfg->action_db_path); -@@ -882,7 +882,6 @@ - else - prefs->logfile = NULL; - } -- g_free (logfile); - } - - void SaveUserPrefs(UserPrefsStruct *prefs) diff --git a/deskutils/gnomeutils2/pkg-descr b/deskutils/gnomeutils2/pkg-descr index 7738e6fc53a3..3aaba4bf64ba 100644 --- a/deskutils/gnomeutils2/pkg-descr +++ b/deskutils/gnomeutils2/pkg-descr @@ -1,3 +1,3 @@ -GNOME 2 support utilities, including an on-the-fly dialog box tool -(like Zenity), a dictionary, a frontend for find(1), and a system log -viewer. +GNOME 2.0 support utilities, including an on-the-fly dialog box tool +(like Zenity), a dictionary, a frontend for find(1), a system log +viewer, and more. diff --git a/deskutils/gnomeutils2/pkg-plist b/deskutils/gnomeutils2/pkg-plist index 20c31677e486..7fd75b26c23b 100644 --- a/deskutils/gnomeutils2/pkg-plist +++ b/deskutils/gnomeutils2/pkg-plist @@ -1,19 +1,23 @@ -bin/gdialog -bin/gnome-calculator -bin/gnome-character-map bin/gnome-dictionary bin/gnome-search-tool bin/gnome-system-log +etc/gconf/gconf.xml.defaults/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnome-dictionary/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnome-search-tool/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnome-search-tool/select/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnome-system-log/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnome-dictionary/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnome-search-tool/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnome-search-tool/select/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnome-system-log/%gconf.xml etc/gconf/schemas/gdict.schemas +etc/gconf/schemas/gnome-search-tool.schemas etc/gconf/schemas/logview.schemas libdata/bonobo/servers/GNOME_GDictApplet.server libexec/gdict-applet -share/gnome/applications/gnome-calculator.desktop -share/gnome/applications/gnome-character-map.desktop share/gnome/applications/gnome-dictionary.desktop share/gnome/applications/gnome-search-tool.desktop share/gnome/applications/gnome-system-log.desktop @@ -21,76 +25,6 @@ share/gnome/gnome-2.0/ui/GNOME_GDictApplet.xml share/gnome/gnome-system-log/gnome-system-log-actions.db share/gnome/gnome-system-log/gnome-system-log-descript.db share/gnome/gnome-system-log/gnome-system-log-regexp.db -share/gnome/help/gdialog/C/figures/example-dialog.png -share/gnome/help/gdialog/C/figures/gdialog-msgbox.png -share/gnome/help/gdialog/C/figures/gdialog-yesno.png -share/gnome/help/gdialog/C/gdialog.xml -share/gnome/help/gdialog/C/legal.xml -share/gnome/help/gdialog/ja/figures/example-dialog.png -share/gnome/help/gdialog/ja/figures/gdialog-msgbox.png -share/gnome/help/gdialog/ja/figures/gdialog-yesno.png -share/gnome/help/gdialog/ja/gdialog.xml -share/gnome/help/gdialog/ja/legal.xml -share/gnome/help/gnome-calculator/C/figures/gcalc_window.png -share/gnome/help/gnome-calculator/C/gnome-calculator.xml -share/gnome/help/gnome-calculator/C/legal.xml -share/gnome/help/gnome-calculator/de/figures/gcalc-main.png -share/gnome/help/gnome-calculator/de/gnome-calculator.xml -share/gnome/help/gnome-calculator/de/legal.xml -share/gnome/help/gnome-calculator/es/figures/gcalc-main.png -share/gnome/help/gnome-calculator/es/gnome-calculator.xml -share/gnome/help/gnome-calculator/es/legal.xml -share/gnome/help/gnome-calculator/fr/figures/gcalc_window.png -share/gnome/help/gnome-calculator/fr/gnome-calculator.xml -share/gnome/help/gnome-calculator/fr/legal.xml -share/gnome/help/gnome-calculator/it/figures/gcalc-main.png -share/gnome/help/gnome-calculator/it/gnome-calculator.xml -share/gnome/help/gnome-calculator/it/legal.xml -share/gnome/help/gnome-calculator/ja/figures/gcalc_window.png -share/gnome/help/gnome-calculator/ja/gnome-calculator.xml -share/gnome/help/gnome-calculator/ja/legal.xml -share/gnome/help/gnome-calculator/ko/figures/gcalc_window.png -share/gnome/help/gnome-calculator/ko/gnome-calculator.xml -share/gnome/help/gnome-calculator/ko/legal.xml -share/gnome/help/gnome-calculator/sv/figures/gcalc_window.png -share/gnome/help/gnome-calculator/sv/gnome-calculator.xml -share/gnome/help/gnome-calculator/sv/legal.xml -share/gnome/help/gnome-calculator/zh_CN/figures/gcalc_window.png -share/gnome/help/gnome-calculator/zh_CN/gnome-calculator.xml -share/gnome/help/gnome-calculator/zh_CN/legal.xml -share/gnome/help/gnome-calculator/zh_TW/figures/gcalc_window.png -share/gnome/help/gnome-calculator/zh_TW/gnome-calculator.xml -share/gnome/help/gnome-calculator/zh_TW/legal.xml -share/gnome/help/gnome-character-map/C/figures/gnome-character-map.png -share/gnome/help/gnome-character-map/C/gnome-character-map.xml -share/gnome/help/gnome-character-map/C/legal.xml -share/gnome/help/gnome-character-map/de/figures/gnome-character-map.png -share/gnome/help/gnome-character-map/de/gnome-character-map.xml -share/gnome/help/gnome-character-map/de/legal.xml -share/gnome/help/gnome-character-map/es/figures/gnome-character-map.png -share/gnome/help/gnome-character-map/es/gnome-character-map.xml -share/gnome/help/gnome-character-map/es/legal.xml -share/gnome/help/gnome-character-map/fr/figures/gnome-character-map.png -share/gnome/help/gnome-character-map/fr/gnome-character-map.xml -share/gnome/help/gnome-character-map/fr/legal.xml -share/gnome/help/gnome-character-map/it/figures/gnome-character-map.png -share/gnome/help/gnome-character-map/it/gnome-character-map.xml -share/gnome/help/gnome-character-map/it/legal.xml -share/gnome/help/gnome-character-map/ja/figures/gnome-character-map.png -share/gnome/help/gnome-character-map/ja/gnome-character-map.xml -share/gnome/help/gnome-character-map/ja/legal.xml -share/gnome/help/gnome-character-map/ko/figures/gnome-character-map.png -share/gnome/help/gnome-character-map/ko/gnome-character-map.xml -share/gnome/help/gnome-character-map/ko/legal.xml -share/gnome/help/gnome-character-map/sv/figures/gnome-character-map.png -share/gnome/help/gnome-character-map/sv/gnome-character-map.xml -share/gnome/help/gnome-character-map/sv/legal.xml -share/gnome/help/gnome-character-map/zh_CN/figures/gnome-character-map.png -share/gnome/help/gnome-character-map/zh_CN/gnome-character-map.xml -share/gnome/help/gnome-character-map/zh_CN/legal.xml -share/gnome/help/gnome-character-map/zh_TW/figures/gnome-character-map.png -share/gnome/help/gnome-character-map/zh_TW/gnome-character-map.xml -share/gnome/help/gnome-character-map/zh_TW/legal.xml share/gnome/help/gnome-dictionary/C/figures/gdict_applet.png share/gnome/help/gnome-dictionary/C/figures/gdict_window.png share/gnome/help/gnome-dictionary/C/gnome-dictionary.xml @@ -102,9 +36,6 @@ share/gnome/help/gnome-dictionary/ja/legal.xml share/gnome/help/gnome-search-tool/C/figures/gnome-search-tool_window.png share/gnome/help/gnome-search-tool/C/gnome-search-tool.xml share/gnome/help/gnome-search-tool/C/legal.xml -share/gnome/help/gnome-search-tool/de/figures/gnome-search-tool_window.png -share/gnome/help/gnome-search-tool/de/gnome-search-tool.xml -share/gnome/help/gnome-search-tool/de/legal.xml share/gnome/help/gnome-search-tool/es/figures/gnome-search-tool_window.png share/gnome/help/gnome-search-tool/es/gnome-search-tool.xml share/gnome/help/gnome-search-tool/es/legal.xml @@ -159,58 +90,12 @@ share/gnome/help/gnome-system-log/zh_CN/legal.xml share/gnome/help/gnome-system-log/zh_TW/figures/syslog_window.png share/gnome/help/gnome-system-log/zh_TW/gnome-system-log.xml share/gnome/help/gnome-system-log/zh_TW/legal.xml -share/gnome/omf/gnome-utils/gdialog-C.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gdialog-C.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-utils/gdialog-ja.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gdialog-ja.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-utils/gnome-calculator-C.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-C.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-utils/gnome-calculator-de.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-de.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-utils/gnome-calculator-es.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-es.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-utils/gnome-calculator-fr.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-fr.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-utils/gnome-calculator-it.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-it.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-utils/gnome-calculator-ja.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-ja.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-utils/gnome-calculator-ko.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-ko.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-utils/gnome-calculator-sv.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-sv.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-utils/gnome-calculator-zh_CN.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-zh_CN.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-utils/gnome-calculator-zh_TW.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-zh_TW.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-utils/gnome-character-map-C.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-C.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-utils/gnome-character-map-de.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-de.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-utils/gnome-character-map-es.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-es.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-utils/gnome-character-map-fr.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-fr.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-utils/gnome-character-map-it.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-it.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-utils/gnome-character-map-ja.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-ja.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-utils/gnome-character-map-ko.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-ko.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-utils/gnome-character-map-sv.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-sv.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-utils/gnome-character-map-zh_CN.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-zh_CN.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-utils/gnome-character-map-zh_TW.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-zh_TW.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-utils/gnome-dictionary-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-dictionary-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-utils/gnome-dictionary-ja.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-dictionary-ja.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-utils/gnome-search-tool-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-C.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-utils/gnome-search-tool-de.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-de.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-utils/gnome-search-tool-es.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-es.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-utils/gnome-search-tool-fr.omf @@ -248,15 +133,17 @@ share/gnome/omf/gnome-utils/gnome-system-log-zh_CN.omf share/gnome/omf/gnome-utils/gnome-system-log-zh_TW.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-system-log-zh_TW.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/gdict.png -share/gnome/pixmaps/gnome-character-map.png +share/gnome/pixmaps/gnome-search-tool/gnome-search-tool-animation.png share/gnome/pixmaps/gnome-searchtool.png share/locale/am/LC_MESSAGES/gnome-utils-2.0.mo share/locale/ar/LC_MESSAGES/gnome-utils-2.0.mo share/locale/az/LC_MESSAGES/gnome-utils-2.0.mo share/locale/be/LC_MESSAGES/gnome-utils-2.0.mo share/locale/bg/LC_MESSAGES/gnome-utils-2.0.mo +share/locale/bn/LC_MESSAGES/gnome-utils-2.0.mo share/locale/ca/LC_MESSAGES/gnome-utils-2.0.mo share/locale/cs/LC_MESSAGES/gnome-utils-2.0.mo +share/locale/cy/LC_MESSAGES/gnome-utils-2.0.mo share/locale/da/LC_MESSAGES/gnome-utils-2.0.mo share/locale/de/LC_MESSAGES/gnome-utils-2.0.mo share/locale/el/LC_MESSAGES/gnome-utils-2.0.mo @@ -272,6 +159,7 @@ share/locale/gl/LC_MESSAGES/gnome-utils-2.0.mo share/locale/he/LC_MESSAGES/gnome-utils-2.0.mo share/locale/hi/LC_MESSAGES/gnome-utils-2.0.mo share/locale/hu/LC_MESSAGES/gnome-utils-2.0.mo +share/locale/id/LC_MESSAGES/gnome-utils-2.0.mo share/locale/it/LC_MESSAGES/gnome-utils-2.0.mo share/locale/ja/LC_MESSAGES/gnome-utils-2.0.mo share/locale/ko/LC_MESSAGES/gnome-utils-2.0.mo @@ -291,6 +179,7 @@ share/locale/ro/LC_MESSAGES/gnome-utils-2.0.mo share/locale/ru/LC_MESSAGES/gnome-utils-2.0.mo share/locale/sk/LC_MESSAGES/gnome-utils-2.0.mo share/locale/sl/LC_MESSAGES/gnome-utils-2.0.mo +share/locale/sq/LC_MESSAGES/gnome-utils-2.0.mo share/locale/sr/LC_MESSAGES/gnome-utils-2.0.mo share/locale/sr@Latn/LC_MESSAGES/gnome-utils-2.0.mo share/locale/sv/LC_MESSAGES/gnome-utils-2.0.mo @@ -301,7 +190,7 @@ share/locale/vi/LC_MESSAGES/gnome-utils-2.0.mo share/locale/wa/LC_MESSAGES/gnome-utils-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-utils-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo -@dirrm share/gnome/pixmaps/gnome-system-log +@dirrm share/gnome/pixmaps/gnome-search-tool @dirrm share/gnome/help/gnome-system-log/zh_TW/figures @dirrm share/gnome/help/gnome-system-log/zh_TW @dirrm share/gnome/help/gnome-system-log/zh_CN/figures @@ -339,8 +228,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo @dirrm share/gnome/help/gnome-search-tool/fr @dirrm share/gnome/help/gnome-search-tool/es/figures @dirrm share/gnome/help/gnome-search-tool/es -@dirrm share/gnome/help/gnome-search-tool/de/figures -@dirrm share/gnome/help/gnome-search-tool/de @dirrm share/gnome/help/gnome-search-tool/C/figures @dirrm share/gnome/help/gnome-search-tool/C @dirrm share/gnome/help/gnome-search-tool @@ -349,83 +236,18 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo @dirrm share/gnome/help/gnome-dictionary/C/figures @dirrm share/gnome/help/gnome-dictionary/C @dirrm share/gnome/help/gnome-dictionary -@dirrm share/gnome/help/gnome-character-map/zh_TW/figures -@dirrm share/gnome/help/gnome-character-map/zh_TW -@dirrm share/gnome/help/gnome-character-map/zh_CN/figures -@dirrm share/gnome/help/gnome-character-map/zh_CN -@dirrm share/gnome/help/gnome-character-map/sv/figures -@dirrm share/gnome/help/gnome-character-map/sv -@dirrm share/gnome/help/gnome-character-map/ko/figures -@dirrm share/gnome/help/gnome-character-map/ko -@dirrm share/gnome/help/gnome-character-map/ja/figures -@dirrm share/gnome/help/gnome-character-map/ja -@dirrm share/gnome/help/gnome-character-map/it/figures -@dirrm share/gnome/help/gnome-character-map/it -@dirrm share/gnome/help/gnome-character-map/fr/figures -@dirrm share/gnome/help/gnome-character-map/fr -@dirrm share/gnome/help/gnome-character-map/es/figures -@dirrm share/gnome/help/gnome-character-map/es -@dirrm share/gnome/help/gnome-character-map/de/figures -@dirrm share/gnome/help/gnome-character-map/de -@dirrm share/gnome/help/gnome-character-map/C/figures -@dirrm share/gnome/help/gnome-character-map/C -@dirrm share/gnome/help/gnome-character-map -@dirrm share/gnome/help/gnome-calculator/zh_TW/figures -@dirrm share/gnome/help/gnome-calculator/zh_TW -@dirrm share/gnome/help/gnome-calculator/zh_CN/figures -@dirrm share/gnome/help/gnome-calculator/zh_CN -@dirrm share/gnome/help/gnome-calculator/sv/figures -@dirrm share/gnome/help/gnome-calculator/sv -@dirrm share/gnome/help/gnome-calculator/ko/figures -@dirrm share/gnome/help/gnome-calculator/ko -@dirrm share/gnome/help/gnome-calculator/ja/figures -@dirrm share/gnome/help/gnome-calculator/ja -@dirrm share/gnome/help/gnome-calculator/it/figures -@dirrm share/gnome/help/gnome-calculator/it -@dirrm share/gnome/help/gnome-calculator/fr/figures -@dirrm share/gnome/help/gnome-calculator/fr -@dirrm share/gnome/help/gnome-calculator/es/figures -@dirrm share/gnome/help/gnome-calculator/es -@dirrm share/gnome/help/gnome-calculator/de/figures -@dirrm share/gnome/help/gnome-calculator/de -@dirrm share/gnome/help/gnome-calculator/C/figures -@dirrm share/gnome/help/gnome-calculator/C -@dirrm share/gnome/help/gnome-calculator -@dirrm share/gnome/help/gdialog/ja/figures -@dirrm share/gnome/help/gdialog/ja -@dirrm share/gnome/help/gdialog/C/figures -@dirrm share/gnome/help/gdialog/C @dirrm share/gnome/gnome-system-log @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-system-log +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-search-tool/select +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-search-tool @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-dictionary @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-system-log +@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-search-tool/select +@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-search-tool @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-dictionary -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gdialog-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gdialog-ja.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-de.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-es.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-fr.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-it.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-ja.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-ko.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-sv.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-zh_CN.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-zh_TW.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-de.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-es.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-fr.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-it.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-ja.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-ko.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-sv.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-zh_CN.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-zh_TW.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-dictionary-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-dictionary-ja.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-de.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-es.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-fr.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-it.omf 2>/dev/null || /usr/bin/true diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile index 55a216f6c057..f65a936d9056 100644 --- a/devel/ORBit2/Makefile +++ b/devel/ORBit2/Makefile @@ -6,10 +6,10 @@ # PORTNAME= ORBit2 -PORTVERSION= 2.6.3 +PORTVERSION= 2.8.1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.6 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.8 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -22,8 +22,10 @@ USE_GMAKE= yes USE_REINPLACE= yes INSTALLS_SHLIB= yes USE_LIBTOOL= yes -USE_GNOME= gnomehack libidl linc -CONFIGURE_ARGS= --disable-indent +USE_GNOME= gnomehack libidl +CONFIGURE_ARGS= --disable-indent \ + --with-html-dir=${PREFIX}/share/doc \ + --disable-gtk-doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/devel/ORBit2/distinfo b/devel/ORBit2/distinfo index bd5b8a651fea..aef8b18f674b 100644 --- a/devel/ORBit2/distinfo +++ b/devel/ORBit2/distinfo @@ -1 +1 @@ -MD5 (gnome2/ORBit2-2.6.3.tar.bz2) = b6fc2b71018c46b2da607510492c597f +MD5 (gnome2/ORBit2-2.8.1.tar.bz2) = 062674985948deebf9f8a9117c3c7754 diff --git a/devel/ORBit2/files/patch-ORBit-2.0.pc.in b/devel/ORBit2/files/patch-ORBit-2.0.pc.in new file mode 100644 index 000000000000..bd616eaa2014 --- /dev/null +++ b/devel/ORBit2/files/patch-ORBit-2.0.pc.in @@ -0,0 +1,10 @@ +--- ORBit-2.0.pc.in.orig Sat May 31 11:04:33 2003 ++++ ORBit-2.0.pc.in Sun Jun 15 01:31:20 2003 +@@ -8,6 +8,6 @@ + Name: ORBit-2.0 + Description: High-performance CORBA Object Request Broker. + Version: @ORBIT_VERSION@ +-Requires: glib-2.0 gmodule-2.0 ++Requires: glib-2.0 gmodule-2.0 gthread-2.0 + Libs: -L${libdir} -lORBit-2 @ORBIT_LIBS@ @LIBS@ -lm + Cflags: -I${includedir}/orbit-2.0 -DORBIT2=1 diff --git a/devel/ORBit2/files/patch-ab b/devel/ORBit2/files/patch-ab index 308fddd87618..57f1e2d4c301 100644 --- a/devel/ORBit2/files/patch-ab +++ b/devel/ORBit2/files/patch-ab @@ -1,5 +1,5 @@ ---- Makefile.in.orig Sat Oct 19 15:24:09 2002 -+++ Makefile.in Sat Oct 19 15:25:58 2002 +--- Makefile.in.orig Sat Jun 14 01:50:29 2003 ++++ Makefile.in Sat Jun 14 01:51:03 2003 @@ -35,7 +35,7 @@ DESTDIR = @@ -9,16 +9,12 @@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = . -@@ -97,11 +97,10 @@ - STRIP = @STRIP@ - VERSION = @VERSION@ - WARN_CFLAGS = @WARN_CFLAGS@ --pkglibdir = @pkglibdir@ +@@ -115,7 +115,7 @@ AUTOMAKE_OPTIONS = 1.3 --SUBDIRS = src include test docs -+SUBDIRS = src include docs +-SUBDIRS = linc2 src include test docs ++SUBDIRS = linc2 src include docs bin_SCRIPTS = orbit2-config diff --git a/devel/ORBit2/files/patch-src::orb::util::Makefile.in b/devel/ORBit2/files/patch-src::orb::util::Makefile.in index f40acebc7738..0c2cb69a98bc 100644 --- a/devel/ORBit2/files/patch-src::orb::util::Makefile.in +++ b/devel/ORBit2/files/patch-src::orb::util::Makefile.in @@ -1,6 +1,6 @@ ---- src/orb/util/Makefile.in.orig Mon Jul 21 11:21:48 2003 -+++ src/orb/util/Makefile.in Mon Jul 21 11:22:19 2003 -@@ -104,7 +104,7 @@ +--- src/orb/util/Makefile.in.orig Tue Jul 15 13:16:53 2003 ++++ src/orb/util/Makefile.in Tue Jul 15 13:17:32 2003 +@@ -189,7 +189,7 @@ INCLUDES = \ -I$(top_srcdir)/include \ -I$(top_builddir)/include \ diff --git a/devel/ORBit2/files/patch-src_idl-compiler_orbit-idl-backend.c b/devel/ORBit2/files/patch-src_idl-compiler_orbit-idl-backend.c index dcc0e0ebb4f6..8ae3c76447c1 100644 --- a/devel/ORBit2/files/patch-src_idl-compiler_orbit-idl-backend.c +++ b/devel/ORBit2/files/patch-src_idl-compiler_orbit-idl-backend.c @@ -4,7 +4,7 @@ char **strv; int i; -+ paths = g_slist_prepend (paths, "/usr/X11R6/lib/orbit-2.0/idl-backends"); ++ paths = g_slist_prepend (paths, "%%X11BASE%%/lib/orbit-2.0/idl-backends"); + if (!(val = getenv ("GNOME2_PATH"))) return paths; diff --git a/devel/ORBit2/pkg-plist b/devel/ORBit2/pkg-plist index 7b378aaf3d26..723579770b17 100644 --- a/devel/ORBit2/pkg-plist +++ b/devel/ORBit2/pkg-plist @@ -1,3 +1,4 @@ +bin/linc-cleanup-sockets bin/orbit-idl-2 bin/orbit2-config @unexec if cmp -s %D/etc/orbit2rc.default %D/etc/orbit2rc; then rm -f %D/etc/orbit2rc; fi @@ -7,14 +8,6 @@ include/orbit-2.0/ORBitservices/CosNaming.h include/orbit-2.0/ORBitservices/CosNaming_impl.h include/orbit-2.0/ORBitservices/orbit-imodule.h include/orbit-2.0/orbit-idl/orbit-idl-backend.h -include/orbit-2.0/orbit/GIOP/giop-basics.h -include/orbit-2.0/orbit/GIOP/giop-connection.h -include/orbit-2.0/orbit/GIOP/giop-endian.h -include/orbit-2.0/orbit/GIOP/giop-recv-buffer.h -include/orbit-2.0/orbit/GIOP/giop-send-buffer.h -include/orbit-2.0/orbit/GIOP/giop-server.h -include/orbit-2.0/orbit/GIOP/giop-types.h -include/orbit-2.0/orbit/GIOP/giop.h include/orbit-2.0/orbit/dynamic/dynamic-defs.h include/orbit-2.0/orbit/dynamic/dynamic.h include/orbit-2.0/orbit/orb-core/allocators.h @@ -71,14 +64,24 @@ libdata/pkgconfig/ORBit-idl-2.0.pc libdata/pkgconfig/ORBit-imodule-2.0.pc libdata/pkgconfig/ORBit-CosNaming-2.0.pc share/aclocal/ORBit2.m4 +share/doc/ORBit2/ORBit2-orbit2-allocators.html +share/doc/ORBit2/ORBit2-orbit2-small.html +share/doc/ORBit2/ORBit2.devhelp +share/doc/ORBit2/general.html +share/doc/ORBit2/home.png +share/doc/ORBit2/index.html +share/doc/ORBit2/index.sgml +share/doc/ORBit2/left.png +share/doc/ORBit2/right.png +share/doc/ORBit2/up.png share/idl/orbit-2.0/CosNaming.idl @dirrm share/idl/orbit-2.0 +@dirrm share/doc/ORBit2 @unexec /bin/rmdir %D/share/idl 2>/dev/null || /usr/bin/true @dirrm include/orbit-2.0/orbit/util @dirrm include/orbit-2.0/orbit/poa @dirrm include/orbit-2.0/orbit/orb-core @dirrm include/orbit-2.0/orbit/dynamic -@dirrm include/orbit-2.0/orbit/GIOP @dirrm include/orbit-2.0/orbit @dirrm include/orbit-2.0/orbit-idl @dirrm include/orbit-2.0/ORBitservices diff --git a/devel/atk/Makefile b/devel/atk/Makefile index c1e90ae997ae..cdb15a965be0 100644 --- a/devel/atk/Makefile +++ b/devel/atk/Makefile @@ -6,16 +6,11 @@ # PORTNAME= atk -PORTVERSION= 1.2.4 +PORTVERSION= 1.4.0 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME} \ ftp://ftp.gtk.org/pub/gtk/v2.0/ -MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.2 -#MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \ -# ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \ -# http://www.ameth.org/gimp/%SUBDIR%/ \ -# ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,} -#MASTER_SITE_SUBDIR= gtk/v1.3 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.4 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/devel/atk/distinfo b/devel/atk/distinfo index dba292c1ff10..dd36e926e35d 100644 --- a/devel/atk/distinfo +++ b/devel/atk/distinfo @@ -1 +1 @@ -MD5 (gnome2/atk-1.2.4.tar.bz2) = 2d6d50df31abe0e8892b5d3e7676a02d +MD5 (gnome2/atk-1.4.0.tar.bz2) = e501dde880fb2bbe77e428cfa2ee25f6 diff --git a/devel/atk/pkg-descr b/devel/atk/pkg-descr index c962374e2a31..b28d3e537b26 100644 --- a/devel/atk/pkg-descr +++ b/devel/atk/pkg-descr @@ -1,3 +1,12 @@ -GNOME accessibility toolkit (ATK). +Accessibility means helping people with disabilities to participate in +substantial life activities. That includes work, and the use of services, +products, and information. GNOME includes libraries and a support framework +that allow people with disabilities to utilize all of the functionality of the +GNOME user environment. + +The GNOME Accessibility Toolkit (ATK) describes a set of interfaces that need +to be implemented by GUI components to make them accessible. The interfaces are +toolkit-independent-- implementations could be written for any widget set, such +as GTK, Motif or Qt. WWW: http://developer.gnome.org/projects/gap/ diff --git a/devel/atk/pkg-plist b/devel/atk/pkg-plist index dc154a81a2b3..85189b700f6f 100644 --- a/devel/atk/pkg-plist +++ b/devel/atk/pkg-plist @@ -26,38 +26,39 @@ include/atk-1.0/atk/atkutil.h include/atk-1.0/atk/atkvalue.h lib/libatk-1.0.a lib/libatk-1.0.so -lib/libatk-1.0.so.200 +lib/libatk-1.0.so.400 libdata/pkgconfig/atk.pc -share/doc/atk/atk-atkstate.html -share/doc/atk/atk.html -share/doc/atk/atkaction.html -share/doc/atk/atkcomponent.html -share/doc/atk/atkdocument.html -share/doc/atk/atkeditabletext.html -share/doc/atk/atkgobjectaccessible.html -share/doc/atk/atkhyperlink.html -share/doc/atk/atkhypertext.html -share/doc/atk/atkimage.html -share/doc/atk/atknoopobject.html -share/doc/atk/atknoopobjectfactory.html -share/doc/atk/atkobject.html -share/doc/atk/atkobjectfactory.html -share/doc/atk/atkregistry.html -share/doc/atk/atkrelation.html -share/doc/atk/atkrelationset.html -share/doc/atk/atkselection.html -share/doc/atk/atkstateset.html -share/doc/atk/atkstreamablecontent.html -share/doc/atk/atktable.html -share/doc/atk/atktext.html -share/doc/atk/atkutil.html -share/doc/atk/atkvalue.html -share/doc/atk/book1.html -share/doc/atk/home.png -share/doc/atk/index.sgml -share/doc/atk/left.png -share/doc/atk/right.png -share/doc/atk/up.png +%%DOCSDIR%%/AtkAction.html +%%DOCSDIR%%/AtkComponent.html +%%DOCSDIR%%/AtkDocument.html +%%DOCSDIR%%/AtkEditableText.html +%%DOCSDIR%%/AtkGObjectAccessible.html +%%DOCSDIR%%/AtkHyperlink.html +%%DOCSDIR%%/AtkHypertext.html +%%DOCSDIR%%/AtkImage.html +%%DOCSDIR%%/AtkNoOpObject.html +%%DOCSDIR%%/AtkNoOpObjectFactory.html +%%DOCSDIR%%/AtkObject.html +%%DOCSDIR%%/AtkObjectFactory.html +%%DOCSDIR%%/AtkRegistry.html +%%DOCSDIR%%/AtkRelation.html +%%DOCSDIR%%/AtkRelationSet.html +%%DOCSDIR%%/AtkSelection.html +%%DOCSDIR%%/AtkStateSet.html +%%DOCSDIR%%/AtkStreamableContent.html +%%DOCSDIR%%/AtkTable.html +%%DOCSDIR%%/AtkText.html +%%DOCSDIR%%/AtkUtil.html +%%DOCSDIR%%/AtkValue.html +%%DOCSDIR%%/atk-AtkState.html +%%DOCSDIR%%/atk.devhelp +%%DOCSDIR%%/atk.html +%%DOCSDIR%%/home.png +%%DOCSDIR%%/index.html +%%DOCSDIR%%/index.sgml +%%DOCSDIR%%/left.png +%%DOCSDIR%%/right.png +%%DOCSDIR%%/up.png share/locale/am/LC_MESSAGES/atk10.mo share/locale/az/LC_MESSAGES/atk10.mo share/locale/be/LC_MESSAGES/atk10.mo @@ -65,6 +66,7 @@ share/locale/bg/LC_MESSAGES/atk10.mo share/locale/bn/LC_MESSAGES/atk10.mo share/locale/ca/LC_MESSAGES/atk10.mo share/locale/cs/LC_MESSAGES/atk10.mo +share/locale/cy/LC_MESSAGES/atk10.mo share/locale/da/LC_MESSAGES/atk10.mo share/locale/de/LC_MESSAGES/atk10.mo share/locale/el/LC_MESSAGES/atk10.mo @@ -74,6 +76,7 @@ share/locale/es/LC_MESSAGES/atk10.mo share/locale/fa/LC_MESSAGES/atk10.mo share/locale/fi/LC_MESSAGES/atk10.mo share/locale/fr/LC_MESSAGES/atk10.mo +share/locale/ga/LC_MESSAGES/atk10.mo share/locale/he/LC_MESSAGES/atk10.mo share/locale/hi/LC_MESSAGES/atk10.mo share/locale/hu/LC_MESSAGES/atk10.mo @@ -83,11 +86,13 @@ share/locale/it/LC_MESSAGES/atk10.mo share/locale/ja/LC_MESSAGES/atk10.mo share/locale/kn/LC_MESSAGES/atk10.mo share/locale/ko/LC_MESSAGES/atk10.mo +share/locale/li/LC_MESSAGES/atk10.mo share/locale/lv/LC_MESSAGES/atk10.mo share/locale/mk/LC_MESSAGES/atk10.mo share/locale/ml/LC_MESSAGES/atk10.mo share/locale/mn/LC_MESSAGES/atk10.mo share/locale/ms/LC_MESSAGES/atk10.mo +share/locale/ne/LC_MESSAGES/atk10.mo share/locale/nl/LC_MESSAGES/atk10.mo share/locale/no/LC_MESSAGES/atk10.mo share/locale/pl/LC_MESSAGES/atk10.mo @@ -108,6 +113,6 @@ share/locale/vi/LC_MESSAGES/atk10.mo share/locale/yi/LC_MESSAGES/atk10.mo share/locale/zh_CN/LC_MESSAGES/atk10.mo share/locale/zh_TW/LC_MESSAGES/atk10.mo -@dirrm share/doc/atk +@dirrm %%DOCSDIR%% @dirrm include/atk-1.0/atk @dirrm include/atk-1.0 diff --git a/devel/bugbuddy2/Makefile b/devel/bugbuddy2/Makefile index e72a0c466384..8656a0efed6d 100644 --- a/devel/bugbuddy2/Makefile +++ b/devel/bugbuddy2/Makefile @@ -6,10 +6,10 @@ # PORTNAME= bugbuddy2 -PORTVERSION= 2.2.106 +PORTVERSION= 2.4.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/bug-buddy/2.2 +MASTER_SITE_SUBDIR= sources/bug-buddy/2.4 DISTNAME= bug-buddy-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/devel/bugbuddy2/distinfo b/devel/bugbuddy2/distinfo index cb95a77e1fa1..0043b27e38d0 100644 --- a/devel/bugbuddy2/distinfo +++ b/devel/bugbuddy2/distinfo @@ -1 +1 @@ -MD5 (gnome2/bug-buddy-2.2.106.tar.bz2) = 6f3ed4b1d3c6aed67cb74615f36b9cf6 +MD5 (gnome2/bug-buddy-2.4.0.tar.bz2) = 505e0d53826f0159ac101f0eef936c5f diff --git a/devel/bugbuddy2/pkg-plist b/devel/bugbuddy2/pkg-plist index b33c93157d1a..4ae2e7ab555a 100644 --- a/devel/bugbuddy2/pkg-plist +++ b/devel/bugbuddy2/pkg-plist @@ -26,8 +26,10 @@ share/locale/ar/LC_MESSAGES/bug-buddy.mo share/locale/az/LC_MESSAGES/bug-buddy.mo share/locale/be/LC_MESSAGES/bug-buddy.mo share/locale/bg/LC_MESSAGES/bug-buddy.mo +share/locale/bn/LC_MESSAGES/bug-buddy.mo share/locale/ca/LC_MESSAGES/bug-buddy.mo share/locale/cs/LC_MESSAGES/bug-buddy.mo +share/locale/cy/LC_MESSAGES/bug-buddy.mo share/locale/da/LC_MESSAGES/bug-buddy.mo share/locale/de/LC_MESSAGES/bug-buddy.mo share/locale/el/LC_MESSAGES/bug-buddy.mo @@ -40,6 +42,7 @@ share/locale/fr/LC_MESSAGES/bug-buddy.mo share/locale/ga/LC_MESSAGES/bug-buddy.mo share/locale/gl/LC_MESSAGES/bug-buddy.mo share/locale/he/LC_MESSAGES/bug-buddy.mo +share/locale/hi/LC_MESSAGES/bug-buddy.mo share/locale/hu/LC_MESSAGES/bug-buddy.mo share/locale/id/LC_MESSAGES/bug-buddy.mo share/locale/it/LC_MESSAGES/bug-buddy.mo @@ -65,6 +68,7 @@ share/locale/sq/LC_MESSAGES/bug-buddy.mo share/locale/sr/LC_MESSAGES/bug-buddy.mo share/locale/sr@Latn/LC_MESSAGES/bug-buddy.mo share/locale/sv/LC_MESSAGES/bug-buddy.mo +share/locale/th/LC_MESSAGES/bug-buddy.mo share/locale/tr/LC_MESSAGES/bug-buddy.mo share/locale/uk/LC_MESSAGES/bug-buddy.mo share/locale/vi/LC_MESSAGES/bug-buddy.mo diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile index 315d0857452a..05342793c398 100644 --- a/devel/gconf2/Makefile +++ b/devel/gconf2/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gconf2 -PORTVERSION= 2.2.1 +PORTVERSION= 2.4.0.1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/GConf/2.2 +MASTER_SITE_SUBDIR= sources/GConf/2.4 DISTNAME= GConf-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -20,10 +20,11 @@ USE_BZIP2= yes USE_GMAKE= yes USE_X_PREFIX= yes USE_REINPLACE= yes -USE_GNOME= gnomehack gnomehier orbit2 libxml2 gtk20 +USE_GNOME= gnomehack gnomehier orbit2 gtk20 libxml2 linc INSTALLS_SHLIB= yes USE_LIBTOOL= yes -CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc +CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ + --disable-gtk-doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/devel/gconf2/distinfo b/devel/gconf2/distinfo index 6485444046b3..41fb7d07650f 100644 --- a/devel/gconf2/distinfo +++ b/devel/gconf2/distinfo @@ -1 +1 @@ -MD5 (gnome2/GConf-2.2.1.tar.bz2) = 3788a2e63f200478caf2b16059327076 +MD5 (gnome2/GConf-2.4.0.1.tar.bz2) = 2f7548d0bad24d7c4beba54d0ec98a20 diff --git a/devel/gconf2/files/patch-backends::bdb-backend.c b/devel/gconf2/files/patch-backends::bdb-backend.c deleted file mode 100644 index 9c7fa1e3fdd4..000000000000 --- a/devel/gconf2/files/patch-backends::bdb-backend.c +++ /dev/null @@ -1,17 +0,0 @@ - -$FreeBSD$ - ---- backends/bdb-backend.c 2002/02/15 19:10:46 1.1 -+++ backends/bdb-backend.c 2002/02/15 19:11:25 -@@ -29,10 +29,9 @@ - #include <gconf/gconf-internals.h> - #include <gconf/gconf.h> - -+#include "config.h" - #include "bdb.h" - #include "dir-utils.h" -- --#include <db.h> - - #include <stdio.h> - #include <time.h> diff --git a/devel/gconf2/files/patch-configure b/devel/gconf2/files/patch-configure index b4a36bc497de..b41b752d81f0 100644 --- a/devel/gconf2/files/patch-configure +++ b/devel/gconf2/files/patch-configure @@ -1,9 +1,6 @@ - -$FreeBSD$ - ---- configure.orig Fri Apr 26 12:18:08 2002 -+++ configure Fri Apr 26 12:18:36 2002 -@@ -6797,6 +6797,7 @@ +--- configure.orig Sat May 3 13:11:21 2003 ++++ configure Sun Jun 15 01:22:52 2003 +@@ -8029,6 +8029,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -11,12 +8,3 @@ $FreeBSD$ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -7513,7 +7514,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - -- for db3libs in "-ldb-3.3" "-ldb-3.2" "-ldb-3.1" "-ldb-3"; do -+ for db3libs in "-ldb-3.3" "-ldb-3.2" "-ldb-3.1" "-ldb-3" "-ldb3"; do - if test "x${with_db3_libs}" != "x"; then - LIBS="$LIBS -L$with_db3_libs $db3libs" - else diff --git a/devel/gconf2/files/patch-gconf::gconf-internals.c b/devel/gconf2/files/patch-gconf::gconf-internals.c deleted file mode 100644 index cc04f6913284..000000000000 --- a/devel/gconf2/files/patch-gconf::gconf-internals.c +++ /dev/null @@ -1,15 +0,0 @@ - -$FreeBSD$ - ---- gconf/gconf-internals.c 2002/02/15 19:13:07 1.1 -+++ gconf/gconf-internals.c 2002/02/15 19:13:32 -@@ -26,6 +26,9 @@ - #include <string.h> - #include <sys/stat.h> - #include <sys/types.h> -+#include <sys/socket.h> -+#include <netinet/in.h> -+#include <arpa/inet.h> - #include <unistd.h> - #include <stdlib.h> - #include <stdio.h> diff --git a/devel/gconf2/pkg-descr b/devel/gconf2/pkg-descr index c4f8b27a2d51..0658ef70fa28 100644 --- a/devel/gconf2/pkg-descr +++ b/devel/gconf2/pkg-descr @@ -1,4 +1,22 @@ -GConf is a configuration database system for the GNOME desktop, -functionally similar to the Windows registry but lots better :-) +GConf attempts to leapfrog the registry concept. It's a library which provides +a simple configuration data storage interface to applications, and also an +architecture that tries to make things easy for system administrators. + +Here are some of the features of GConf: + + * Replaceable backend architecture. + + * Configuration key documentation. Applications can install documentation + along with their configuration data, explaining the possible settings and + the effect of each configuration key. + + * Data change notification service. If configuration data is changed, all + interested applications are notified. The notification service works + across the network, affecting all login sessions for a single user. + + * The client API is very abstract. + + * GConf does proper locking so that the configuration data doesn't get + corrupted when multiple applications try to use it. WWW: http://www.gnome.org/projects/gconf/ diff --git a/devel/gconf2/pkg-plist b/devel/gconf2/pkg-plist index 9057dc4c4ae5..cc70f2842c6a 100644 --- a/devel/gconf2/pkg-plist +++ b/devel/gconf2/pkg-plist @@ -22,8 +22,10 @@ share/locale/ar/LC_MESSAGES/GConf2.mo share/locale/az/LC_MESSAGES/GConf2.mo share/locale/be/LC_MESSAGES/GConf2.mo share/locale/bg/LC_MESSAGES/GConf2.mo +share/locale/bn/LC_MESSAGES/GConf2.mo share/locale/ca/LC_MESSAGES/GConf2.mo share/locale/cs/LC_MESSAGES/GConf2.mo +share/locale/cy/LC_MESSAGES/GConf2.mo share/locale/da/LC_MESSAGES/GConf2.mo share/locale/de/LC_MESSAGES/GConf2.mo share/locale/el/LC_MESSAGES/GConf2.mo @@ -36,6 +38,7 @@ share/locale/ga/LC_MESSAGES/GConf2.mo share/locale/gl/LC_MESSAGES/GConf2.mo share/locale/hi/LC_MESSAGES/GConf2.mo share/locale/hu/LC_MESSAGES/GConf2.mo +share/locale/id/LC_MESSAGES/GConf2.mo share/locale/it/LC_MESSAGES/GConf2.mo share/locale/ja/LC_MESSAGES/GConf2.mo share/locale/ko/LC_MESSAGES/GConf2.mo @@ -54,6 +57,7 @@ share/locale/ro/LC_MESSAGES/GConf2.mo share/locale/ru/LC_MESSAGES/GConf2.mo share/locale/sk/LC_MESSAGES/GConf2.mo share/locale/sl/LC_MESSAGES/GConf2.mo +share/locale/sq/LC_MESSAGES/GConf2.mo share/locale/sr/LC_MESSAGES/GConf2.mo share/locale/sr@Latn/LC_MESSAGES/GConf2.mo share/locale/sv/LC_MESSAGES/GConf2.mo @@ -64,8 +68,8 @@ share/locale/yi/LC_MESSAGES/GConf2.mo share/locale/zh_CN/LC_MESSAGES/GConf2.mo share/locale/zh_TW/LC_MESSAGES/GConf2.mo share/sgml/gconf/gconf-1.0.dtd -@dirrm share/sgml/gconf @dirrm share/doc/gconf +@dirrm share/sgml/gconf @dirrm lib/GConf/2 @dirrm include/gconf/2/gconf @dirrm include/gconf/2 diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile index 225db7b0369a..c8ea7f9aeedd 100644 --- a/devel/gnome-vfs/Makefile +++ b/devel/gnome-vfs/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gnomevfs2 -PORTVERSION= 2.2.5 +PORTVERSION= 2.4.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-vfs/2.2 +MASTER_SITE_SUBDIR= sources/gnome-vfs/2.4 DISTNAME= gnome-vfs-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -23,7 +23,6 @@ USE_GNOME= gnomeprefix gnomehack gnomehier gnomemimedata gconf2 libbonobo USE_REINPLACE= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes -CONFIGURE_ARGS= --with-gconf-source=xml::${PREFIX}/etc/gconf/gconf.xml.defaults CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ BSD_PTHREAD_LIBS=${PTHREAD_LIBS} diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo index 8ed8f2c5e44a..bddb12ef32a0 100644 --- a/devel/gnome-vfs/distinfo +++ b/devel/gnome-vfs/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-vfs-2.2.5.tar.bz2) = 6ed2702382675c78eed6a96b2296e51d +MD5 (gnome2/gnome-vfs-2.4.0.tar.bz2) = 2c7908e98b482add387e305619cfe4aa diff --git a/devel/gnome-vfs/files/patch-ab b/devel/gnome-vfs/files/patch-ab index 54f94cff127f..0a291f36c104 100644 --- a/devel/gnome-vfs/files/patch-ab +++ b/devel/gnome-vfs/files/patch-ab @@ -1,11 +1,10 @@ ---- Makefile.in.orig Wed May 21 12:53:27 2003 -+++ Makefile.in Wed May 21 12:53:59 2003 -@@ -173,7 +173,7 @@ +--- Makefile.in.orig Mon Aug 11 11:55:08 2003 ++++ Makefile.in Mon Aug 11 12:09:13 2003 +@@ -183,7 +183,6 @@ + devel-docs \ + doc \ + programs \ +- test \ + monikers \ + po - SUBDIRS_GNOME = monikers doc schemas - --SUBDIRS = libgnomevfs modules schemas devel-docs doc test monikers po -+SUBDIRS = libgnomevfs modules schemas devel-docs doc monikers po - - - EXTRA_DIST = HACKING TODO autogen.sh gnome-vfs.spec gnome-vfs-2.0.pc.in gnome-vfs-module-2.0.pc.in intltool-extract.in intltool-merge.in intltool-update.in diff --git a/devel/gnome-vfs/files/patch-ac b/devel/gnome-vfs/files/patch-ac index 557a7018d2c0..9362cac1715f 100644 --- a/devel/gnome-vfs/files/patch-ac +++ b/devel/gnome-vfs/files/patch-ac @@ -1,11 +1,11 @@ ---- modules/Makefile.in.orig Thu Aug 29 15:57:06 2002 -+++ modules/Makefile.in Thu Aug 29 15:58:00 2002 -@@ -180,7 +180,7 @@ - @BUILD_CDEMENU_MODULE_TRUE@CDEMENU_LTLIBS = libcdemenu-desktop.la +--- modules/Makefile.in.orig Tue May 6 15:39:48 2003 ++++ modules/Makefile.in Tue May 6 15:41:28 2003 +@@ -210,7 +210,7 @@ + @BUILD_CDEMENU_MODULE_TRUE@CDEMENU_LTLIBS = @BUILD_CDEMENU_MODULE_TRUE@libcdemenu-desktop.la @BUILD_CDEMENU_MODULE_FALSE@CDEMENU_LTLIBS = --module_flags = -export_dynamic -avoid-version -module -+module_flags = -export_dynamic -avoid-version -module $(PTHREAD_LIB) +-module_flags = -export_dynamic -avoid-version -module -no-undefined ++module_flags = -export_dynamic -avoid-version -module -no-undefined $(PTHREAD_LIB) modulesdir = $(libdir)/gnome-vfs-2.0/modules - modules_LTLIBRARIES = $(CDDA_LTLIBS) libextfs.la libfile.la libnntp.la libvfs-test.la $(HTTP_LTLIBS) libbzip2.la libgzip.la libftp.la libvfs-pipe.la libvfs-translate.la $(CDEMENU_LTLIBS) libssh.la libtar.la $(NULL) + modules_LTLIBRARIES = \ diff --git a/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in b/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in index 382207e778e5..be72a1825d12 100644 --- a/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in +++ b/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in @@ -1,11 +1,11 @@ ---- libgnomevfs/Makefile.in.orig Wed May 21 12:54:14 2003 -+++ libgnomevfs/Makefile.in Wed May 21 12:55:26 2003 -@@ -216,7 +216,7 @@ +--- libgnomevfs/Makefile.in.orig Mon Aug 11 12:09:33 2003 ++++ libgnomevfs/Makefile.in Mon Aug 11 12:10:10 2003 +@@ -352,7 +352,7 @@ # CLEANFILES = $(BUILT_SOURCES) # Platform specific includes -libgnomevfsplatformincludedir = $(libdir)/gnome-vfs-2.0/include +libgnomevfsplatformincludedir = $(includedir)/gnome-vfs-2.0/libgnomevfs - libgnomevfsplatforminclude_HEADERS = gnome-vfs-file-size.h - + libgnomevfsplatforminclude_HEADERS = \ + gnome-vfs-file-size.h diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c index 39d34d5573fb..8f8f15be3918 100644 --- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c +++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c @@ -1,6 +1,6 @@ ---- libgnomevfs/gnome-vfs-utils.c.orig Fri Dec 20 16:15:06 2002 -+++ libgnomevfs/gnome-vfs-utils.c Tue Jan 14 00:54:10 2003 -@@ -40,6 +40,7 @@ +--- libgnomevfs/gnome-vfs-utils.c.orig Fri Apr 25 06:52:18 2003 ++++ libgnomevfs/gnome-vfs-utils.c Tue May 6 15:44:27 2003 +@@ -42,6 +42,7 @@ #include <pwd.h> #include <stdlib.h> #include <string.h> @@ -8,12 +8,12 @@ #include <sys/stat.h> #include <sys/types.h> #include <unistd.h> -@@ -861,7 +862,7 @@ +@@ -840,7 +841,7 @@ paths = g_strsplit (gnome_var, ":", 0); for (temp_paths = paths; *temp_paths != NULL; temp_paths++) { - full_filename = g_strconcat (*temp_paths, "/share/pixmaps/", relative_filename, NULL); + full_filename = g_strconcat (*temp_paths, "/share/gnome/pixmaps/", relative_filename, NULL); - if (hack_file_exists (full_filename)) { + if (g_file_test (full_filename, G_FILE_TEST_EXISTS)) { g_strfreev (paths); return full_filename; diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist index 6eba37334dc7..1ec5a822ec34 100644 --- a/devel/gnome-vfs/pkg-plist +++ b/devel/gnome-vfs/pkg-plist @@ -1,7 +1,24 @@ +bin/gnomevfs-cat +bin/gnomevfs-copy +bin/gnomevfs-info +bin/gnomevfs-ls +bin/gnomevfs-mkdir +etc/gconf/gconf.xml.defaults/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/gnome/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/gnome/applications/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/gnome/applications/component_viewer/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/gnome/applications/terminal/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/component_viewer/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/terminal/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/system/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/system/http_proxy/%gconf.xml etc/gconf/gconf.xml.defaults/system/%gconf.xml etc/gconf/gconf.xml.defaults/system/http_proxy/%gconf.xml +etc/gconf/schemas/desktop_default_applications.schemas etc/gconf/schemas/system_http_proxy.schemas %%CDPARANOIA%%etc/gnome-vfs-2.0/modules/cdda-module.conf etc/gnome-vfs-2.0/modules/default-modules.conf @@ -66,7 +83,7 @@ lib/gnome-vfs-2.0/modules/libvfs-test.so lib/gnome-vfs-2.0/modules/libvfs-translate.so lib/libgnomevfs-2.a lib/libgnomevfs-2.so -lib/libgnomevfs-2.so.0 +lib/libgnomevfs-2.so.400 lib/vfs/2.0/extfs/README lib/vfs/2.0/extfs/a lib/vfs/2.0/extfs/ar @@ -89,10 +106,59 @@ libdata/pkgconfig/gnome-vfs-2.0.pc libdata/pkgconfig/gnome-vfs-module-2.0.pc share/doc/gnome-vfs-2.0/about.html share/doc/gnome-vfs-2.0/advanced-operations.html +share/doc/gnome-vfs-2.0/c9456.html +share/doc/gnome-vfs-2.0/c9466.html share/doc/gnome-vfs-2.0/ch08.html share/doc/gnome-vfs-2.0/data-types.html +share/doc/gnome-vfs-2.0/directory-operations.html +share/doc/gnome-vfs-2.0/everything-else.html +share/doc/gnome-vfs-2.0/file-operations.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-application-registry.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-async-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-cancellation.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-context.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-basic-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-find-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-list-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-advanced-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-basic-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-rw-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-size.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-trunc-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-inet-connection.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-init.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-method.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-database.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-monitor.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback-module-api.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-shared.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-monitor.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-parse-ls.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-result.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket-buffer.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-ssl.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-standard-callbacks.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-transform.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-uri.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-utils.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-xfer.html +share/doc/gnome-vfs-2.0/gnome-vfs-application-registry.html +share/doc/gnome-vfs-2.0/gnome-vfs-asynchronous-operations.html +share/doc/gnome-vfs-2.0/gnome-vfs-cancellation.html +share/doc/gnome-vfs-2.0/gnome-vfs-configuration.html +share/doc/gnome-vfs-2.0/gnome-vfs-context.html share/doc/gnome-vfs-2.0/gnome-vfs-directory-operations.html +share/doc/gnome-vfs-2.0/gnome-vfs-directory.html +share/doc/gnome-vfs-2.0/gnome-vfs-file-info.html share/doc/gnome-vfs-2.0/gnome-vfs-file-operations.html +share/doc/gnome-vfs-2.0/gnome-vfs-file-size.html +share/doc/gnome-vfs-2.0/gnome-vfs-finding-special-directories.html share/doc/gnome-vfs-2.0/gnome-vfs-first-steps.html share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-application-registry.html share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-async-ops.html @@ -101,6 +167,7 @@ share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-context.html share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-directory-basic-ops.html share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-directory-find-ops.html share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-directory-list-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-directory.html share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-advanced-ops.html share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-basic-ops.html share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-info-ops.html @@ -108,6 +175,7 @@ share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-info.html share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-rw-ops.html share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-size.html share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-trunc-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-find-directory.html share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-inet-connection.html share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-init.html share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-method.html @@ -119,6 +187,7 @@ share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-module-callback.html share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-module-shared.html share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-module.html share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-monitor.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-ops.html share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-parse-ls.html share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-result.html share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-socket-buffer.html @@ -129,11 +198,39 @@ share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-transform.html share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-uri.html share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-utils.html share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-xfer.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnomevfsmetadata.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnomevfsmimemonitor.html +share/doc/gnome-vfs-2.0/gnome-vfs-inet-connection.html +share/doc/gnome-vfs-2.0/gnome-vfs-initialization.html +share/doc/gnome-vfs-2.0/gnome-vfs-iobuf.html +share/doc/gnome-vfs-2.0/gnome-vfs-method.html +share/doc/gnome-vfs-2.0/gnome-vfs-mime-handlers.html +share/doc/gnome-vfs-2.0/gnome-vfs-mime-info.html +share/doc/gnome-vfs-2.0/gnome-vfs-mime-magic.html +share/doc/gnome-vfs-2.0/gnome-vfs-mime-monitor.html +share/doc/gnome-vfs-2.0/gnome-vfs-mime-sniff-buffer.html +share/doc/gnome-vfs-2.0/gnome-vfs-mime.html +share/doc/gnome-vfs-2.0/gnome-vfs-module-callback-module-api.html +share/doc/gnome-vfs-2.0/gnome-vfs-module-callbacks.html +share/doc/gnome-vfs-2.0/gnome-vfs-module-shared.html +share/doc/gnome-vfs-2.0/gnome-vfs-module.html +share/doc/gnome-vfs-2.0/gnome-vfs-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-parse-ls.html +share/doc/gnome-vfs-2.0/gnome-vfs-process.html +share/doc/gnome-vfs-2.0/gnome-vfs-result.html +share/doc/gnome-vfs-2.0/gnome-vfs-ssl.html +share/doc/gnome-vfs-2.0/gnome-vfs-standard-callbacks.html +share/doc/gnome-vfs-2.0/gnome-vfs-types.html +share/doc/gnome-vfs-2.0/gnome-vfs-uri.html +share/doc/gnome-vfs-2.0/gnome-vfs-utils.html share/doc/gnome-vfs-2.0/gnome-vfs-writing-modules.html +share/doc/gnome-vfs-2.0/gnome-vfs-xfer.html share/doc/gnome-vfs-2.0/index.html share/doc/gnome-vfs-2.0/index.sgml share/doc/gnome-vfs-2.0/mime-registry.html share/doc/gnome-vfs-2.0/modules.html +share/doc/gnome-vfs-2.0/writing-modules.html +share/doc/gnome-vfs-2.0/x27.html share/locale/am/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ar/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/az/LC_MESSAGES/gnome-vfs-2.0.mo @@ -143,6 +240,7 @@ share/locale/bn/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/bs/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ca/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/cs/LC_MESSAGES/gnome-vfs-2.0.mo +share/locale/cy/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/da/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/de/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/el/LC_MESSAGES/gnome-vfs-2.0.mo @@ -163,12 +261,14 @@ share/locale/is/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/it/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ja/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ko/LC_MESSAGES/gnome-vfs-2.0.mo +share/locale/li/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/lt/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/lv/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/mk/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ml/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/mn/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ms/LC_MESSAGES/gnome-vfs-2.0.mo +share/locale/ne/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/nl/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/nn/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/no/LC_MESSAGES/gnome-vfs-2.0.mo @@ -202,3 +302,13 @@ share/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo @dirrm etc/gconf/gconf.xml.defaults/system @dirrm etc/gconf/gconf.xml.defaults/schemas/system/http_proxy @dirrm etc/gconf/gconf.xml.defaults/schemas/system +@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/terminal +@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/component_viewer +@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications +@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome +@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop +@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications/terminal +@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications/component_viewer +@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications +@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome +@dirrm etc/gconf/gconf.xml.defaults/desktop diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile index 225db7b0369a..c8ea7f9aeedd 100644 --- a/devel/gnomevfs2/Makefile +++ b/devel/gnomevfs2/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gnomevfs2 -PORTVERSION= 2.2.5 +PORTVERSION= 2.4.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-vfs/2.2 +MASTER_SITE_SUBDIR= sources/gnome-vfs/2.4 DISTNAME= gnome-vfs-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -23,7 +23,6 @@ USE_GNOME= gnomeprefix gnomehack gnomehier gnomemimedata gconf2 libbonobo USE_REINPLACE= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes -CONFIGURE_ARGS= --with-gconf-source=xml::${PREFIX}/etc/gconf/gconf.xml.defaults CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ BSD_PTHREAD_LIBS=${PTHREAD_LIBS} diff --git a/devel/gnomevfs2/distinfo b/devel/gnomevfs2/distinfo index 8ed8f2c5e44a..bddb12ef32a0 100644 --- a/devel/gnomevfs2/distinfo +++ b/devel/gnomevfs2/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-vfs-2.2.5.tar.bz2) = 6ed2702382675c78eed6a96b2296e51d +MD5 (gnome2/gnome-vfs-2.4.0.tar.bz2) = 2c7908e98b482add387e305619cfe4aa diff --git a/devel/gnomevfs2/files/patch-ab b/devel/gnomevfs2/files/patch-ab index 54f94cff127f..0a291f36c104 100644 --- a/devel/gnomevfs2/files/patch-ab +++ b/devel/gnomevfs2/files/patch-ab @@ -1,11 +1,10 @@ ---- Makefile.in.orig Wed May 21 12:53:27 2003 -+++ Makefile.in Wed May 21 12:53:59 2003 -@@ -173,7 +173,7 @@ +--- Makefile.in.orig Mon Aug 11 11:55:08 2003 ++++ Makefile.in Mon Aug 11 12:09:13 2003 +@@ -183,7 +183,6 @@ + devel-docs \ + doc \ + programs \ +- test \ + monikers \ + po - SUBDIRS_GNOME = monikers doc schemas - --SUBDIRS = libgnomevfs modules schemas devel-docs doc test monikers po -+SUBDIRS = libgnomevfs modules schemas devel-docs doc monikers po - - - EXTRA_DIST = HACKING TODO autogen.sh gnome-vfs.spec gnome-vfs-2.0.pc.in gnome-vfs-module-2.0.pc.in intltool-extract.in intltool-merge.in intltool-update.in diff --git a/devel/gnomevfs2/files/patch-ac b/devel/gnomevfs2/files/patch-ac index 557a7018d2c0..9362cac1715f 100644 --- a/devel/gnomevfs2/files/patch-ac +++ b/devel/gnomevfs2/files/patch-ac @@ -1,11 +1,11 @@ ---- modules/Makefile.in.orig Thu Aug 29 15:57:06 2002 -+++ modules/Makefile.in Thu Aug 29 15:58:00 2002 -@@ -180,7 +180,7 @@ - @BUILD_CDEMENU_MODULE_TRUE@CDEMENU_LTLIBS = libcdemenu-desktop.la +--- modules/Makefile.in.orig Tue May 6 15:39:48 2003 ++++ modules/Makefile.in Tue May 6 15:41:28 2003 +@@ -210,7 +210,7 @@ + @BUILD_CDEMENU_MODULE_TRUE@CDEMENU_LTLIBS = @BUILD_CDEMENU_MODULE_TRUE@libcdemenu-desktop.la @BUILD_CDEMENU_MODULE_FALSE@CDEMENU_LTLIBS = --module_flags = -export_dynamic -avoid-version -module -+module_flags = -export_dynamic -avoid-version -module $(PTHREAD_LIB) +-module_flags = -export_dynamic -avoid-version -module -no-undefined ++module_flags = -export_dynamic -avoid-version -module -no-undefined $(PTHREAD_LIB) modulesdir = $(libdir)/gnome-vfs-2.0/modules - modules_LTLIBRARIES = $(CDDA_LTLIBS) libextfs.la libfile.la libnntp.la libvfs-test.la $(HTTP_LTLIBS) libbzip2.la libgzip.la libftp.la libvfs-pipe.la libvfs-translate.la $(CDEMENU_LTLIBS) libssh.la libtar.la $(NULL) + modules_LTLIBRARIES = \ diff --git a/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in b/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in index 382207e778e5..be72a1825d12 100644 --- a/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in +++ b/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in @@ -1,11 +1,11 @@ ---- libgnomevfs/Makefile.in.orig Wed May 21 12:54:14 2003 -+++ libgnomevfs/Makefile.in Wed May 21 12:55:26 2003 -@@ -216,7 +216,7 @@ +--- libgnomevfs/Makefile.in.orig Mon Aug 11 12:09:33 2003 ++++ libgnomevfs/Makefile.in Mon Aug 11 12:10:10 2003 +@@ -352,7 +352,7 @@ # CLEANFILES = $(BUILT_SOURCES) # Platform specific includes -libgnomevfsplatformincludedir = $(libdir)/gnome-vfs-2.0/include +libgnomevfsplatformincludedir = $(includedir)/gnome-vfs-2.0/libgnomevfs - libgnomevfsplatforminclude_HEADERS = gnome-vfs-file-size.h - + libgnomevfsplatforminclude_HEADERS = \ + gnome-vfs-file-size.h diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c index 39d34d5573fb..8f8f15be3918 100644 --- a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c +++ b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c @@ -1,6 +1,6 @@ ---- libgnomevfs/gnome-vfs-utils.c.orig Fri Dec 20 16:15:06 2002 -+++ libgnomevfs/gnome-vfs-utils.c Tue Jan 14 00:54:10 2003 -@@ -40,6 +40,7 @@ +--- libgnomevfs/gnome-vfs-utils.c.orig Fri Apr 25 06:52:18 2003 ++++ libgnomevfs/gnome-vfs-utils.c Tue May 6 15:44:27 2003 +@@ -42,6 +42,7 @@ #include <pwd.h> #include <stdlib.h> #include <string.h> @@ -8,12 +8,12 @@ #include <sys/stat.h> #include <sys/types.h> #include <unistd.h> -@@ -861,7 +862,7 @@ +@@ -840,7 +841,7 @@ paths = g_strsplit (gnome_var, ":", 0); for (temp_paths = paths; *temp_paths != NULL; temp_paths++) { - full_filename = g_strconcat (*temp_paths, "/share/pixmaps/", relative_filename, NULL); + full_filename = g_strconcat (*temp_paths, "/share/gnome/pixmaps/", relative_filename, NULL); - if (hack_file_exists (full_filename)) { + if (g_file_test (full_filename, G_FILE_TEST_EXISTS)) { g_strfreev (paths); return full_filename; diff --git a/devel/gnomevfs2/pkg-plist b/devel/gnomevfs2/pkg-plist index 6eba37334dc7..1ec5a822ec34 100644 --- a/devel/gnomevfs2/pkg-plist +++ b/devel/gnomevfs2/pkg-plist @@ -1,7 +1,24 @@ +bin/gnomevfs-cat +bin/gnomevfs-copy +bin/gnomevfs-info +bin/gnomevfs-ls +bin/gnomevfs-mkdir +etc/gconf/gconf.xml.defaults/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/gnome/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/gnome/applications/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/gnome/applications/component_viewer/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/gnome/applications/terminal/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/component_viewer/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/terminal/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/system/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/system/http_proxy/%gconf.xml etc/gconf/gconf.xml.defaults/system/%gconf.xml etc/gconf/gconf.xml.defaults/system/http_proxy/%gconf.xml +etc/gconf/schemas/desktop_default_applications.schemas etc/gconf/schemas/system_http_proxy.schemas %%CDPARANOIA%%etc/gnome-vfs-2.0/modules/cdda-module.conf etc/gnome-vfs-2.0/modules/default-modules.conf @@ -66,7 +83,7 @@ lib/gnome-vfs-2.0/modules/libvfs-test.so lib/gnome-vfs-2.0/modules/libvfs-translate.so lib/libgnomevfs-2.a lib/libgnomevfs-2.so -lib/libgnomevfs-2.so.0 +lib/libgnomevfs-2.so.400 lib/vfs/2.0/extfs/README lib/vfs/2.0/extfs/a lib/vfs/2.0/extfs/ar @@ -89,10 +106,59 @@ libdata/pkgconfig/gnome-vfs-2.0.pc libdata/pkgconfig/gnome-vfs-module-2.0.pc share/doc/gnome-vfs-2.0/about.html share/doc/gnome-vfs-2.0/advanced-operations.html +share/doc/gnome-vfs-2.0/c9456.html +share/doc/gnome-vfs-2.0/c9466.html share/doc/gnome-vfs-2.0/ch08.html share/doc/gnome-vfs-2.0/data-types.html +share/doc/gnome-vfs-2.0/directory-operations.html +share/doc/gnome-vfs-2.0/everything-else.html +share/doc/gnome-vfs-2.0/file-operations.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-application-registry.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-async-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-cancellation.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-context.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-basic-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-find-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-list-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-advanced-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-basic-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-rw-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-size.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-trunc-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-inet-connection.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-init.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-method.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-database.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-monitor.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback-module-api.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-shared.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-monitor.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-parse-ls.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-result.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket-buffer.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-ssl.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-standard-callbacks.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-transform.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-uri.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-utils.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-xfer.html +share/doc/gnome-vfs-2.0/gnome-vfs-application-registry.html +share/doc/gnome-vfs-2.0/gnome-vfs-asynchronous-operations.html +share/doc/gnome-vfs-2.0/gnome-vfs-cancellation.html +share/doc/gnome-vfs-2.0/gnome-vfs-configuration.html +share/doc/gnome-vfs-2.0/gnome-vfs-context.html share/doc/gnome-vfs-2.0/gnome-vfs-directory-operations.html +share/doc/gnome-vfs-2.0/gnome-vfs-directory.html +share/doc/gnome-vfs-2.0/gnome-vfs-file-info.html share/doc/gnome-vfs-2.0/gnome-vfs-file-operations.html +share/doc/gnome-vfs-2.0/gnome-vfs-file-size.html +share/doc/gnome-vfs-2.0/gnome-vfs-finding-special-directories.html share/doc/gnome-vfs-2.0/gnome-vfs-first-steps.html share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-application-registry.html share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-async-ops.html @@ -101,6 +167,7 @@ share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-context.html share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-directory-basic-ops.html share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-directory-find-ops.html share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-directory-list-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-directory.html share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-advanced-ops.html share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-basic-ops.html share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-info-ops.html @@ -108,6 +175,7 @@ share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-info.html share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-rw-ops.html share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-size.html share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-trunc-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-find-directory.html share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-inet-connection.html share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-init.html share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-method.html @@ -119,6 +187,7 @@ share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-module-callback.html share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-module-shared.html share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-module.html share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-monitor.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-ops.html share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-parse-ls.html share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-result.html share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-socket-buffer.html @@ -129,11 +198,39 @@ share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-transform.html share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-uri.html share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-utils.html share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-xfer.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnomevfsmetadata.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnomevfsmimemonitor.html +share/doc/gnome-vfs-2.0/gnome-vfs-inet-connection.html +share/doc/gnome-vfs-2.0/gnome-vfs-initialization.html +share/doc/gnome-vfs-2.0/gnome-vfs-iobuf.html +share/doc/gnome-vfs-2.0/gnome-vfs-method.html +share/doc/gnome-vfs-2.0/gnome-vfs-mime-handlers.html +share/doc/gnome-vfs-2.0/gnome-vfs-mime-info.html +share/doc/gnome-vfs-2.0/gnome-vfs-mime-magic.html +share/doc/gnome-vfs-2.0/gnome-vfs-mime-monitor.html +share/doc/gnome-vfs-2.0/gnome-vfs-mime-sniff-buffer.html +share/doc/gnome-vfs-2.0/gnome-vfs-mime.html +share/doc/gnome-vfs-2.0/gnome-vfs-module-callback-module-api.html +share/doc/gnome-vfs-2.0/gnome-vfs-module-callbacks.html +share/doc/gnome-vfs-2.0/gnome-vfs-module-shared.html +share/doc/gnome-vfs-2.0/gnome-vfs-module.html +share/doc/gnome-vfs-2.0/gnome-vfs-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-parse-ls.html +share/doc/gnome-vfs-2.0/gnome-vfs-process.html +share/doc/gnome-vfs-2.0/gnome-vfs-result.html +share/doc/gnome-vfs-2.0/gnome-vfs-ssl.html +share/doc/gnome-vfs-2.0/gnome-vfs-standard-callbacks.html +share/doc/gnome-vfs-2.0/gnome-vfs-types.html +share/doc/gnome-vfs-2.0/gnome-vfs-uri.html +share/doc/gnome-vfs-2.0/gnome-vfs-utils.html share/doc/gnome-vfs-2.0/gnome-vfs-writing-modules.html +share/doc/gnome-vfs-2.0/gnome-vfs-xfer.html share/doc/gnome-vfs-2.0/index.html share/doc/gnome-vfs-2.0/index.sgml share/doc/gnome-vfs-2.0/mime-registry.html share/doc/gnome-vfs-2.0/modules.html +share/doc/gnome-vfs-2.0/writing-modules.html +share/doc/gnome-vfs-2.0/x27.html share/locale/am/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ar/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/az/LC_MESSAGES/gnome-vfs-2.0.mo @@ -143,6 +240,7 @@ share/locale/bn/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/bs/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ca/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/cs/LC_MESSAGES/gnome-vfs-2.0.mo +share/locale/cy/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/da/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/de/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/el/LC_MESSAGES/gnome-vfs-2.0.mo @@ -163,12 +261,14 @@ share/locale/is/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/it/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ja/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ko/LC_MESSAGES/gnome-vfs-2.0.mo +share/locale/li/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/lt/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/lv/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/mk/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ml/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/mn/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ms/LC_MESSAGES/gnome-vfs-2.0.mo +share/locale/ne/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/nl/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/nn/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/no/LC_MESSAGES/gnome-vfs-2.0.mo @@ -202,3 +302,13 @@ share/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo @dirrm etc/gconf/gconf.xml.defaults/system @dirrm etc/gconf/gconf.xml.defaults/schemas/system/http_proxy @dirrm etc/gconf/gconf.xml.defaults/schemas/system +@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/terminal +@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/component_viewer +@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications +@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome +@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop +@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications/terminal +@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications/component_viewer +@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications +@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome +@dirrm etc/gconf/gconf.xml.defaults/desktop diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile index bd6b2098a51c..ca1d5b1681f0 100644 --- a/devel/libbonobo/Makefile +++ b/devel/libbonobo/Makefile @@ -6,10 +6,10 @@ # PORTNAME= libbonobo -PORTVERSION= 2.2.3 +PORTVERSION= 2.4.0 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.4 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -18,17 +18,16 @@ COMMENT= A component and compound document system for GNOME2 USE_BZIP2= yes USE_GMAKE= yes USE_BISON= yes -USE_REINPLACE= yes INSTALLS_SHLIB= yes -USE_LIBTOOL= yes -USE_GNOME= gnomehack bonoboactivation +GNU_CONFIGURE= yes +USE_PERL5= yes +USE_GNOME= gnomehack libxml2 orbit2 CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" MAKE_ENV= gnomelocaledir=${PREFIX}/share/locale -post-patch: - @${REINPLACE_CMD} -e "/^SUBDIRS/s/tests//" ${WRKSRC}/Makefile.in +MAN1= bonobo-activation-server.1 .include <bsd.port.mk> diff --git a/devel/libbonobo/distinfo b/devel/libbonobo/distinfo index 6f55c910fa4b..6b6d6d2ec391 100644 --- a/devel/libbonobo/distinfo +++ b/devel/libbonobo/distinfo @@ -1 +1 @@ -MD5 (gnome2/libbonobo-2.2.3.tar.bz2) = 706e3f722dc5ece02ae27c14984d9810 +MD5 (gnome2/libbonobo-2.4.0.tar.bz2) = 243a4914ae90d08da7cd34ae41e9cac6 diff --git a/devel/libbonobo/files/patch-Makefile.in b/devel/libbonobo/files/patch-Makefile.in new file mode 100644 index 000000000000..e8a60bd28cd8 --- /dev/null +++ b/devel/libbonobo/files/patch-Makefile.in @@ -0,0 +1,11 @@ +--- Makefile.in.orig Wed May 7 13:42:52 2003 ++++ Makefile.in Wed May 7 13:43:30 2003 +@@ -149,7 +149,7 @@ + SUBDIRS = \ + idl bonobo-activation bonobo \ + activation-server monikers \ +- utils samples tests doc po ++ utils samples doc po + + + libincludedir = $(includedir)/libbonobo-2.0 diff --git a/devel/libbonobo/files/patch-bonobo-activation::bonobo-activation-fork-server.c b/devel/libbonobo/files/patch-bonobo-activation::bonobo-activation-fork-server.c new file mode 100644 index 000000000000..db8d816a89d2 --- /dev/null +++ b/devel/libbonobo/files/patch-bonobo-activation::bonobo-activation-fork-server.c @@ -0,0 +1,11 @@ +--- bonobo-activation/bonobo-activation-fork-server.c.orig Fri Oct 18 06:15:11 2002 ++++ bonobo-activation/bonobo-activation-fork-server.c Sat Oct 19 15:35:03 2002 +@@ -364,6 +364,8 @@ + } else if ((childpid = fork ())) { + _exit (0); /* de-zombifier process, just exit */ + } else { ++ sigprocmask (SIG_SETMASK, &omask, NULL); ++ + setenv_activation_environment (environment); + + if (od_iorstr != NULL) { diff --git a/devel/libbonobo/files/patch-bonobo-activation_bonobo-activation-init.c b/devel/libbonobo/files/patch-bonobo-activation_bonobo-activation-init.c new file mode 100644 index 000000000000..52cfebcd945e --- /dev/null +++ b/devel/libbonobo/files/patch-bonobo-activation_bonobo-activation-init.c @@ -0,0 +1,18 @@ +--- bonobo-activation/bonobo-activation-init.c.orig Sat Jun 14 02:09:52 2003 ++++ bonobo-activation/bonobo-activation-init.c Sat Jun 14 02:10:13 2003 +@@ -34,6 +34,7 @@ + #include "bonobo-activation-private.h" + #include "bonobo-activation-register.h" + #include "bonobo-activation-version.h" ++#include <sys/types.h> + #include <netinet/in.h> + #include <arpa/inet.h> + #include <fcntl.h> +@@ -44,7 +45,6 @@ + #include <stdlib.h> + #include <string.h> + #include <sys/socket.h> +-#include <sys/types.h> + #include <sys/wait.h> + #include <unistd.h> + diff --git a/devel/libbonobo/files/patch-ltmain.sh b/devel/libbonobo/files/patch-ltmain.sh new file mode 100644 index 000000000000..2719aeb6ca5a --- /dev/null +++ b/devel/libbonobo/files/patch-ltmain.sh @@ -0,0 +1,51 @@ +--- ltmain.sh.orig Thu Jun 5 08:09:04 2003 ++++ ltmain.sh Sat Jun 14 01:36:34 2003 +@@ -1280,7 +1280,7 @@ + esac + elif test "X$arg" = "X-lc_r"; then + case $host in +- *-*-openbsd* | *-*-freebsd*) ++ *-*-openbsd* | *-*-freebsd4*) + # Do not include libc_r directly, use -pthread flag. + continue + ;; +@@ -1290,8 +1290,16 @@ + continue + ;; + ++ -pthread) ++ compile_command="$compile_command -pthread" ++ finalize_command="$finalize_command -pthread" ++ compiler_flags="$compiler_flags -pthread" ++ continue ++ ;; ++ + -module) + module=yes ++ build_old_libs=no + continue + ;; + +@@ -3000,6 +3008,9 @@ + # problems, so we reset it completely + verstring= + ;; ++ *-*-freebsd*) ++ # FreeBSD doesn't need this... ++ ;; + *) + verstring="0.0" + ;; +@@ -5428,10 +5439,12 @@ + fi + + # Install the pseudo-library for information purposes. ++ if /usr/bin/false; then + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + instname="$dir/$name"i + $show "$install_prog $instname $destdir/$name" + $run eval "$install_prog $instname $destdir/$name" || exit $? ++ fi + + # Maybe install the static library, too. + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/devel/libbonobo/files/patch-server::Makefile.in b/devel/libbonobo/files/patch-server::Makefile.in new file mode 100644 index 000000000000..c821efc8e636 --- /dev/null +++ b/devel/libbonobo/files/patch-server::Makefile.in @@ -0,0 +1,11 @@ +--- activation-server/Makefile.in.orig Wed May 7 16:36:09 2003 ++++ activation-server/Makefile.in Wed May 7 16:36:51 2003 +@@ -159,7 +159,7 @@ + -I$(top_builddir) \ + -I$(top_builddir)/bonobo-activation \ + -I$(top_srcdir)/bonobo-activation \ +- -DSERVERINFODIR=\"$(prefix)/libdata/bonobo/servers\" \ ++ -DSERVERINFODIR=\"$(prefix)/libdata/bonobo/servers:${X11BASE}/libdata/bonobo/servers:${LOCALBASE}/libdata/bonobo/servers\" \ + -DSERVER_LOCALEDIR=\""${prefix}/${DATADIRNAME}/locale"\" \ + $(SERVER_CFLAGS) \ + -DSERVER_CONFDIR=\"$(sysconfdir)\" \ diff --git a/devel/libbonobo/files/patch-server::activation-server-main.c b/devel/libbonobo/files/patch-server::activation-server-main.c new file mode 100644 index 000000000000..f1a74a4a370c --- /dev/null +++ b/devel/libbonobo/files/patch-server::activation-server-main.c @@ -0,0 +1,11 @@ +--- activation-server/activation-server-main.c.orig Fri Oct 18 06:15:12 2002 ++++ activation-server/activation-server-main.c Sat Nov 9 01:50:36 2002 +@@ -127,7 +127,7 @@ + g_string_append (gnome_od_source_dir, + gnome_dirs[i]); + g_string_append (gnome_od_source_dir, +- "/lib/bonobo/servers:"); ++ "/libdata/bonobo/servers:"); + } + g_strfreev (gnome_dirs); + g_string_append_c (real_od_source_dir, ':'); diff --git a/devel/libbonobo/files/patch-utils::bonobo-slay.in b/devel/libbonobo/files/patch-utils::bonobo-slay.in new file mode 100644 index 000000000000..44212a0418a1 --- /dev/null +++ b/devel/libbonobo/files/patch-utils::bonobo-slay.in @@ -0,0 +1,21 @@ +--- utils/bonobo-slay.in.orig Mon Mar 11 12:16:43 2002 ++++ utils/bonobo-slay.in Tue Apr 2 18:30:30 2002 +@@ -56,15 +56,15 @@ + + # get Bonobo files + # +-@bonobo_dirs = ( "@prefix@/lib/bonobo/servers" ); ++@bonobo_dirs = ( "@prefix@/libdata/bonobo/servers" ); + foreach $dir (split(':', $ENV{'BONOBO_ACTIVATION_INFO_PATH'})) { + if (-d $dir) { + push @bonobo_dirs, $dir; + } + } + foreach $dir (split(':', $ENV{'GNOME2_PATH'})) { +- if (-d "$dir/lib/bonobo/servers") { +- push @bonobo_dirs, "$dir/lib/bonobo/servers"; ++ if (-d "$dir/libdata/bonobo/servers") { ++ push @bonobo_dirs, "$dir/libdata/bonobo/servers"; + } + } + diff --git a/devel/libbonobo/pkg-plist b/devel/libbonobo/pkg-plist index f965241fed0d..85fe9e44ac05 100644 --- a/devel/libbonobo/pkg-plist +++ b/devel/libbonobo/pkg-plist @@ -1,9 +1,24 @@ +bin/activation-client +bin/bonobo-slay bin/echo-client-2 +etc/bonobo-activation/bonobo-activation-config.xml +include/bonobo-activation-2.0/bonobo-activation/Bonobo_Activation_types.h +include/bonobo-activation-2.0/bonobo-activation/Bonobo_GenericFactory.h +include/bonobo-activation-2.0/bonobo-activation/Bonobo_Unknown.h +include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-activate.h +include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-async.h +include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-init.h +include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-register.h +include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-server-info.h +include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-shlib.h +include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-version.h +include/bonobo-activation-2.0/bonobo-activation/bonobo-activation.h include/libbonobo-2.0/bonobo/Bonobo.h include/libbonobo-2.0/bonobo/bonobo-arg.h include/libbonobo-2.0/bonobo/bonobo-context.h include/libbonobo-2.0/bonobo/bonobo-event-source.h include/libbonobo-2.0/bonobo/bonobo-exception.h +include/libbonobo-2.0/bonobo/bonobo-foreign-object.h include/libbonobo-2.0/bonobo/bonobo-generic-factory.h include/libbonobo-2.0/bonobo/bonobo-i18n.h include/libbonobo-2.0/bonobo/bonobo-item-container.h @@ -36,10 +51,112 @@ lib/bonobo/monikers/libmoniker_std_2.so lib/libbonobo-2.a lib/libbonobo-2.so lib/libbonobo-2.so.0 +lib/libbonobo-activation.a +lib/libbonobo-activation.so +lib/libbonobo-activation.so.4 lib/orbit-2.0/Bonobo_module.so +libdata/bonobo/servers/Bonobo_CosNaming_NamingContext.server libdata/bonobo/servers/Bonobo_Moniker_std.server libdata/bonobo/servers/Bonobo_Sample_Echo.server +libdata/pkgconfig/bonobo-activation-2.0.pc libdata/pkgconfig/libbonobo-2.0.pc +libexec/bonobo-activation-server +sbin/bonobo-activation-sysconf +share/doc/bonobo-activation/api-reference.html +share/doc/bonobo-activation/architecture.html +share/doc/bonobo-activation/async-activation.html +share/doc/bonobo-activation/attribute-tag.html +share/doc/bonobo-activation/bonobo-activation-Debugging.html +share/doc/bonobo-activation/bonobo-activation-Initialization.html +share/doc/bonobo-activation/bonobo-activation-Query-and-Activation.html +share/doc/bonobo-activation/bonobo-activation-Registration.html +share/doc/bonobo-activation/bonobo-activation-Utilities.html +share/doc/bonobo-activation/bonobo-activation.devhelp +share/doc/bonobo-activation/bonobo-activation.png +share/doc/bonobo-activation/checklist.html +share/doc/bonobo-activation/configuring.html +share/doc/bonobo-activation/fdl-section1.html +share/doc/bonobo-activation/fdl-section10.html +share/doc/bonobo-activation/fdl-section2.html +share/doc/bonobo-activation/fdl-section3.html +share/doc/bonobo-activation/fdl-section4.html +share/doc/bonobo-activation/fdl-section5.html +share/doc/bonobo-activation/fdl-section6.html +share/doc/bonobo-activation/fdl-section7.html +share/doc/bonobo-activation/fdl-section8.html +share/doc/bonobo-activation/fdl-section9.html +share/doc/bonobo-activation/fdl-using.html +share/doc/bonobo-activation/fdl.html +share/doc/bonobo-activation/home.png +share/doc/bonobo-activation/index.html +share/doc/bonobo-activation/index.sgml +share/doc/bonobo-activation/left.png +share/doc/bonobo-activation/migrating.html +share/doc/bonobo-activation/query-langage.html +share/doc/bonobo-activation/query-syntax.html +share/doc/bonobo-activation/right.png +share/doc/bonobo-activation/server-arch.html +share/doc/bonobo-activation/server-xml-reference.html +share/doc/bonobo-activation/tutorial.html +share/doc/bonobo-activation/up.png +share/doc/libbonobo/debugging.html +share/doc/libbonobo/factories.html +share/doc/libbonobo/general.html +share/doc/libbonobo/home.png +share/doc/libbonobo/index.html +share/doc/libbonobo/index.sgml +share/doc/libbonobo/left.png +share/doc/libbonobo/libbonobo-bonobo-arg.html +share/doc/libbonobo/libbonobo-bonobo-config-database.html +share/doc/libbonobo/libbonobo-bonobo-context.html +share/doc/libbonobo/libbonobo-bonobo-event-source.html +share/doc/libbonobo/libbonobo-bonobo-exception.html +share/doc/libbonobo/libbonobo-bonobo-generic-factory.html +share/doc/libbonobo/libbonobo-bonobo-i18n.html +share/doc/libbonobo/libbonobo-bonobo-item-container.html +share/doc/libbonobo/libbonobo-bonobo-item-handler.html +share/doc/libbonobo/libbonobo-bonobo-listener.html +share/doc/libbonobo/libbonobo-bonobo-main.html +share/doc/libbonobo/libbonobo-bonobo-moniker-context.html +share/doc/libbonobo/libbonobo-bonobo-moniker-extender.html +share/doc/libbonobo/libbonobo-bonobo-moniker-simple.html +share/doc/libbonobo/libbonobo-bonobo-moniker-util.html +share/doc/libbonobo/libbonobo-bonobo-moniker.html +share/doc/libbonobo/libbonobo-bonobo-object.html +share/doc/libbonobo/libbonobo-bonobo-persist-client.html +share/doc/libbonobo/libbonobo-bonobo-persist-file.html +share/doc/libbonobo/libbonobo-bonobo-persist-stream.html +share/doc/libbonobo/libbonobo-bonobo-persist.html +share/doc/libbonobo/libbonobo-bonobo-property-bag-client.html +share/doc/libbonobo/libbonobo-bonobo-property-bag.html +share/doc/libbonobo/libbonobo-bonobo-running-context.html +share/doc/libbonobo/libbonobo-bonobo-shlib-factory.html +share/doc/libbonobo/libbonobo-bonobo-shutdown.html +share/doc/libbonobo/libbonobo-bonobo-storage-memory.html +share/doc/libbonobo/libbonobo-bonobo-storage.html +share/doc/libbonobo/libbonobo-bonobo-stream-client.html +share/doc/libbonobo/libbonobo-bonobo-stream-memory.html +share/doc/libbonobo/libbonobo-bonobo-types.html +share/doc/libbonobo/libbonobo-faq.html +share/doc/libbonobo/libbonobo.devhelp +share/doc/libbonobo/misc.html +share/doc/libbonobo/monikers-overview.html +share/doc/libbonobo/monikers.html +share/doc/libbonobo/persist-file.png +share/doc/libbonobo/persist-storage.png +share/doc/libbonobo/persist-stream.png +share/doc/libbonobo/persist.html +share/doc/libbonobo/persist.png +share/doc/libbonobo/properties.html +share/doc/libbonobo/property-bags.html +share/doc/libbonobo/refcounting.html +share/doc/libbonobo/right.png +share/doc/libbonobo/running-context.png +share/doc/libbonobo/storage.png +share/doc/libbonobo/stream.png +share/doc/libbonobo/streams.html +share/doc/libbonobo/unknown.png +share/doc/libbonobo/up.png share/idl/bonobo-2.0/Bonobo.idl share/idl/bonobo-2.0/Bonobo_Canvas.idl share/idl/bonobo-2.0/Bonobo_Clipboard.idl @@ -58,11 +175,17 @@ share/idl/bonobo-2.0/Bonobo_Sample_Echo.idl share/idl/bonobo-2.0/Bonobo_Storage.idl share/idl/bonobo-2.0/Bonobo_UI.idl share/idl/bonobo-2.0/Bonobo_Zoomable.idl +share/idl/bonobo-activation-2.0/Bonobo_ActivationContext.idl +share/idl/bonobo-activation-2.0/Bonobo_Activation_types.idl +share/idl/bonobo-activation-2.0/Bonobo_GenericFactory.idl +share/idl/bonobo-activation-2.0/Bonobo_ObjectDirectory.idl +share/idl/bonobo-activation-2.0/Bonobo_Unknown.idl share/locale/am/LC_MESSAGES/libbonobo-2.0.mo share/locale/ar/LC_MESSAGES/libbonobo-2.0.mo share/locale/az/LC_MESSAGES/libbonobo-2.0.mo share/locale/be/LC_MESSAGES/libbonobo-2.0.mo share/locale/bg/LC_MESSAGES/libbonobo-2.0.mo +share/locale/bn/LC_MESSAGES/libbonobo-2.0.mo share/locale/ca/LC_MESSAGES/libbonobo-2.0.mo share/locale/cs/LC_MESSAGES/libbonobo-2.0.mo share/locale/cy/LC_MESSAGES/libbonobo-2.0.mo @@ -74,13 +197,17 @@ share/locale/es/LC_MESSAGES/libbonobo-2.0.mo share/locale/fa/LC_MESSAGES/libbonobo-2.0.mo share/locale/fi/LC_MESSAGES/libbonobo-2.0.mo share/locale/fr/LC_MESSAGES/libbonobo-2.0.mo +share/locale/ga/LC_MESSAGES/libbonobo-2.0.mo share/locale/gl/LC_MESSAGES/libbonobo-2.0.mo share/locale/he/LC_MESSAGES/libbonobo-2.0.mo +share/locale/hi/LC_MESSAGES/libbonobo-2.0.mo share/locale/hu/LC_MESSAGES/libbonobo-2.0.mo share/locale/id/LC_MESSAGES/libbonobo-2.0.mo +share/locale/is/LC_MESSAGES/libbonobo-2.0.mo share/locale/it/LC_MESSAGES/libbonobo-2.0.mo share/locale/ja/LC_MESSAGES/libbonobo-2.0.mo share/locale/ko/LC_MESSAGES/libbonobo-2.0.mo +share/locale/li/LC_MESSAGES/libbonobo-2.0.mo share/locale/lv/LC_MESSAGES/libbonobo-2.0.mo share/locale/mk/LC_MESSAGES/libbonobo-2.0.mo share/locale/ml/LC_MESSAGES/libbonobo-2.0.mo @@ -104,15 +231,22 @@ share/locale/ta/LC_MESSAGES/libbonobo-2.0.mo share/locale/tr/LC_MESSAGES/libbonobo-2.0.mo share/locale/uk/LC_MESSAGES/libbonobo-2.0.mo share/locale/vi/LC_MESSAGES/libbonobo-2.0.mo +share/locale/wa/LC_MESSAGES/libbonobo-2.0.mo share/locale/yi/LC_MESSAGES/libbonobo-2.0.mo share/locale/zh_CN/LC_MESSAGES/libbonobo-2.0.mo share/locale/zh_TW/LC_MESSAGES/libbonobo-2.0.mo +@dirrm share/idl/bonobo-activation-2.0 @dirrm share/idl/bonobo-2.0 +@dirrm share/doc/bonobo-activation @dirrm share/doc/libbonobo -@dirrm lib/orbit-2.0 +@dirrm libdata/bonobo/servers +@dirrm libdata/bonobo @dirrm lib/bonobo-2.0/samples @dirrm lib/bonobo-2.0 @dirrm include/libbonobo-2.0/bonobo @dirrm include/libbonobo-2.0 +@dirrm include/bonobo-activation-2.0/bonobo-activation +@dirrm include/bonobo-activation-2.0 +@dirrm etc/bonobo-activation @unexec /bin/rmdir %D/lib/bonobo/monikers 2>/dev/null || /usr/bin/true @unexec /bin/rmdir %D/lib/bonobo 2>/dev/null || /usr/bin/true diff --git a/editors/gedit2/Makefile b/editors/gedit2/Makefile index c7aa77b91271..29665770ba14 100644 --- a/editors/gedit2/Makefile +++ b/editors/gedit2/Makefile @@ -6,29 +6,30 @@ # PORTNAME= gedit2 -PORTVERSION= 2.2.2 +PORTVERSION= 2.4.0 CATEGORIES= editors gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.2 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.4 DISTNAME= gedit-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -COMMENT= A small but powerful text editor for Gnome 2.0 Desktop Environment +COMMENT= A small but powerful text editor for Gnome 2 Desktop Environment LIB_DEPENDS= pspell.15:${PORTSDIR}/textproc/aspell -WRKSRC= ${WRKDIR}/gedit-${PORTVERSION} - USE_BZIP2= yes USE_X_PREFIX= yes USE_REINPLACE= yes +INSTALLS_SHLIB= yes USE_GMAKE= yes USE_LIBTOOL= yes -USE_GNOME= gnomeprefix gnomehack gnomehier libgnomeprintui eel2 +USE_GNOME= gnomeprefix gnomehack gnomehier libgnomeprintui libgnomeui \ + eel2 gtksourceview CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" + LDFLAGS="-L${LOCALBASE}/lib" +PLIST_SUB= VERSION="2.4" -MAN1= gedit.1 +MAN1= gedit.1 .include <bsd.port.mk> diff --git a/editors/gedit2/distinfo b/editors/gedit2/distinfo index 24950bbd96e5..5681a0d38dd6 100644 --- a/editors/gedit2/distinfo +++ b/editors/gedit2/distinfo @@ -1 +1 @@ -MD5 (gnome2/gedit-2.2.2.tar.bz2) = 9cd866f6e331fb3e5c65ed8200d9d154 +MD5 (gnome2/gedit-2.4.0.tar.bz2) = 0d8039773fd2f533bec4c9653854a4de diff --git a/editors/gedit2/pkg-descr b/editors/gedit2/pkg-descr index 6016fb0dbcf7..3ccfe39b038f 100644 --- a/editors/gedit2/pkg-descr +++ b/editors/gedit2/pkg-descr @@ -2,20 +2,20 @@ gEdit is a text editor for X using the GTK+ and GNOME libraries. It is being developed by Alex Roberts, Evan Lawrence and Chris Lahey (among others). -This version is quite a neat text editor, it contains the following +gEdit is quite a neat text editor. It contains the following features: - * Opening/Saving/Creating of files; - * File Revert; - * Cut/Copy/Paste and Select All text; - * Complete integration with the GNOME Environment, including GnomeMDI; - * Search and Replace; - * Global search; - * A complete preferences interface; - * Dynamically loading fonts; - * Splitscreen Mode; - * Printing support; - * Configurable Plugins system; - * Configurable window sizing; - * Unlimited Undo/Redo. + * Opening/Saving/Creating files + * File Revert + * Cut/Copy/Paste and Select All text + * Complete integration with the GNOME Environment, including GnomeMDI + * Search and Replace + * Global search + * A complete preferences interface + * Dynamically loading fonts + * Splitscreen Mode + * Printing support + * Configurable Plugins system + * Configurable window sizing + * Unlimited Undo/Redo WWW: http://gedit.sourceforge.net/ diff --git a/editors/gedit2/pkg-plist b/editors/gedit2/pkg-plist index c7753de587fa..ca311d5789dd 100644 --- a/editors/gedit2/pkg-plist +++ b/editors/gedit2/pkg-plist @@ -7,11 +7,11 @@ etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/auto_indent/%gconf. etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/colors/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/font/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/line_numbers/%gconf.xml -etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/load/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/save/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/tabs/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/undo/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/wrap_mode/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/encodings/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/print/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/print/fonts/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/print/page/%gconf.xml @@ -26,11 +26,11 @@ etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/auto_indent etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/colors/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/font/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/line_numbers/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/load/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/save/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/tabs/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/undo/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/wrap_mode/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/encodings/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/print/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/print/fonts/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/print/page/%gconf.xml @@ -39,14 +39,35 @@ etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/ui/recents/%gconf. etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/ui/statusbar/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/ui/toolbar/%gconf.xml etc/gconf/schemas/gedit.schemas -lib/gedit-2/plugins/ascii.gedit-plugin -lib/gedit-2/plugins/cvschangelog.gedit-plugin -lib/gedit-2/plugins/diff.gedit-plugin +include/gedit-%%VERSION%%/gedit/bonobo-mdi-child.h +include/gedit-%%VERSION%%/gedit/bonobo-mdi.h +include/gedit-%%VERSION%%/gedit/gedit-convert.h +include/gedit-%%VERSION%%/gedit/gedit-debug.h +include/gedit-%%VERSION%%/gedit/gedit-document.h +include/gedit-%%VERSION%%/gedit/gedit-encodings.h +include/gedit-%%VERSION%%/gedit/gedit-file.h +include/gedit-%%VERSION%%/gedit/gedit-mdi-child.h +include/gedit-%%VERSION%%/gedit/gedit-mdi.h +include/gedit-%%VERSION%%/gedit/gedit-menus.h +include/gedit-%%VERSION%%/gedit/gedit-metadata-manager.h +include/gedit-%%VERSION%%/gedit/gedit-output-window.h +include/gedit-%%VERSION%%/gedit/gedit-plugin.h +include/gedit-%%VERSION%%/gedit/gedit-prefs-manager-app.h +include/gedit-%%VERSION%%/gedit/gedit-prefs-manager.h +include/gedit-%%VERSION%%/gedit/gedit-print.h +include/gedit-%%VERSION%%/gedit/gedit-recent.h +include/gedit-%%VERSION%%/gedit/gedit-utils.h +include/gedit-%%VERSION%%/gedit/gedit-view.h +include/gedit-%%VERSION%%/gedit/gedit2.h +include/gedit-%%VERSION%%/gedit/recent-files/egg-recent-item.h +include/gedit-%%VERSION%%/gedit/recent-files/egg-recent-model.h +include/gedit-%%VERSION%%/gedit/recent-files/egg-recent-util.h +include/gedit-%%VERSION%%/gedit/recent-files/egg-recent-view-bonobo.h +include/gedit-%%VERSION%%/gedit/recent-files/egg-recent-view-gtk.h +include/gedit-%%VERSION%%/gedit/recent-files/egg-recent-view.h +lib/bonobo/libgedit-control.so lib/gedit-2/plugins/docinfo.gedit-plugin lib/gedit-2/plugins/indent.gedit-plugin -lib/gedit-2/plugins/libasciitable.so -lib/gedit-2/plugins/libcvschangelog.so -lib/gedit-2/plugins/libdiff.so lib/gedit-2/plugins/libdocinfo.so lib/gedit-2/plugins/libindent.so lib/gedit-2/plugins/libsample.so @@ -62,15 +83,15 @@ lib/gedit-2/plugins/spell.gedit-plugin lib/gedit-2/plugins/taglist.gedit-plugin lib/gedit-2/plugins/time.gedit-plugin libdata/bonobo/servers/GNOME_Gedit.server +libdata/pkgconfig/gedit-%%VERSION%%.pc share/gnome/application-registry/gedit.applications share/gnome/applications/gedit.desktop -share/gnome/gedit-2/glade/asciitable.glade2 -share/gnome/gedit-2/glade/diff.glade2 share/gnome/gedit-2/glade/docinfo.glade2 share/gnome/gedit-2/glade/gedit-encodings-dialog.glade2 share/gnome/gedit-2/glade/gedit-preferences.glade2 share/gnome/gedit-2/glade/goto-line.glade2 share/gnome/gedit-2/glade/languages-dialog.glade2 +share/gnome/gedit-2/glade/page-setup-dialog.glade2 share/gnome/gedit-2/glade/plugin-manager.glade2 share/gnome/gedit-2/glade/program-location-dialog.glade2 share/gnome/gedit-2/glade/replace.glade2 @@ -83,116 +104,121 @@ share/gnome/gedit-2/taglist/HTML.tags share/gnome/gedit-2/taglist/Latex.tags share/gnome/gedit-2/taglist/XSLT.tags share/gnome/gedit-2/ui/gedit-ui.xml +share/gnome/gnome-2.0/ui/gedit-viewer-ui.xml share/gnome/help/gedit/C/figures/gedit_recent_files_menu_icon.png share/gnome/help/gedit/C/figures/gedit_window.png share/gnome/help/gedit/C/gedit.xml share/gnome/help/gedit/C/legal.xml -share/gnome/help/gedit/de/legal.xml share/gnome/help/gedit/de/gedit.xml -share/gnome/help/gedit/es/legal.xml +share/gnome/help/gedit/de/legal.xml share/gnome/help/gedit/es/gedit.xml -share/gnome/help/gedit/fr/legal.xml +share/gnome/help/gedit/es/legal.xml share/gnome/help/gedit/fr/gedit.xml -share/gnome/help/gedit/it/legal.xml +share/gnome/help/gedit/fr/legal.xml share/gnome/help/gedit/it/gedit.xml -share/gnome/help/gedit/sv/legal.xml -share/gnome/help/gedit/sv/gedit.xml -share/gnome/help/gedit/ja/legal.xml +share/gnome/help/gedit/it/legal.xml share/gnome/help/gedit/ja/gedit.xml -share/gnome/help/gedit/ko/legal.xml +share/gnome/help/gedit/ja/legal.xml share/gnome/help/gedit/ko/gedit.xml +share/gnome/help/gedit/ko/legal.xml share/gnome/help/gedit/ro/figures/gedit_window.png share/gnome/help/gedit/ro/gedit.xml share/gnome/help/gedit/ro/legal.xml -share/gnome/help/gedit/zh_CN/legal.xml +share/gnome/help/gedit/sv/gedit.xml +share/gnome/help/gedit/sv/legal.xml share/gnome/help/gedit/zh_CN/gedit.xml -share/gnome/help/gedit/zh_TW/legal.xml +share/gnome/help/gedit/zh_CN/legal.xml share/gnome/help/gedit/zh_TW/gedit.xml +share/gnome/help/gedit/zh_TW/legal.xml share/gnome/idl/GNOME_Gedit.idl share/gnome/mime-info/gedit.keys share/gnome/omf/gedit/gedit-C.omf -share/gnome/omf/gedit/gedit-de.omf -share/gnome/omf/gedit/gedit-es.omf -share/gnome/omf/gedit/gedit-fr.omf -share/gnome/omf/gedit/gedit-it.omf -share/gnome/omf/gedit/gedit-sv.omf -share/gnome/omf/gedit/gedit-ja.omf -share/gnome/omf/gedit/gedit-ko.omf -share/gnome/omf/gedit/gedit-ro.omf -share/gnome/omf/gedit/gedit-zh_CN.omf -share/gnome/omf/gedit/gedit-zh_TW.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-C.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gedit/gedit-de.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-de.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gedit/gedit-es.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-es.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gedit/gedit-fr.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-fr.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gedit/gedit-it.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-it.omf 2>/dev/null || /usr/bin/true -@exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-sv.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gedit/gedit-ja.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-ja.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gedit/gedit-ko.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-ko.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gedit/gedit-ro.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-ro.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gedit/gedit-sv.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-sv.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gedit/gedit-zh_CN.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-zh_CN.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gedit/gedit-zh_TW.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-zh_TW.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/gedit-icon.png share/gnome/pixmaps/gedit-logo.png share/gnome/pixmaps/gedit-plugin-manager.png -share/locale/am/LC_MESSAGES/gedit-2.2.mo -share/locale/ar/LC_MESSAGES/gedit-2.2.mo -share/locale/az/LC_MESSAGES/gedit-2.2.mo -share/locale/be/LC_MESSAGES/gedit-2.2.mo -share/locale/bg/LC_MESSAGES/gedit-2.2.mo -share/locale/ca/LC_MESSAGES/gedit-2.2.mo -share/locale/cs/LC_MESSAGES/gedit-2.2.mo -share/locale/da/LC_MESSAGES/gedit-2.2.mo -share/locale/de/LC_MESSAGES/gedit-2.2.mo -share/locale/el/LC_MESSAGES/gedit-2.2.mo -share/locale/es/LC_MESSAGES/gedit-2.2.mo -share/locale/et/LC_MESSAGES/gedit-2.2.mo -share/locale/eu/LC_MESSAGES/gedit-2.2.mo -share/locale/fa/LC_MESSAGES/gedit-2.2.mo -share/locale/fi/LC_MESSAGES/gedit-2.2.mo -share/locale/fr/LC_MESSAGES/gedit-2.2.mo -share/locale/ga/LC_MESSAGES/gedit-2.2.mo -share/locale/gl/LC_MESSAGES/gedit-2.2.mo -share/locale/he/LC_MESSAGES/gedit-2.2.mo -share/locale/hi/LC_MESSAGES/gedit-2.2.mo -share/locale/hu/LC_MESSAGES/gedit-2.2.mo -share/locale/it/LC_MESSAGES/gedit-2.2.mo -share/locale/ja/LC_MESSAGES/gedit-2.2.mo -share/locale/kn/LC_MESSAGES/gedit-2.2.mo -share/locale/ko/LC_MESSAGES/gedit-2.2.mo -share/locale/lt/LC_MESSAGES/gedit-2.2.mo -share/locale/lv/LC_MESSAGES/gedit-2.2.mo -share/locale/mk/LC_MESSAGES/gedit-2.2.mo -share/locale/ml/LC_MESSAGES/gedit-2.2.mo -share/locale/mn/LC_MESSAGES/gedit-2.2.mo -share/locale/ms/LC_MESSAGES/gedit-2.2.mo -share/locale/nl/LC_MESSAGES/gedit-2.2.mo -share/locale/nn/LC_MESSAGES/gedit-2.2.mo -share/locale/no/LC_MESSAGES/gedit-2.2.mo -share/locale/pl/LC_MESSAGES/gedit-2.2.mo -share/locale/pt/LC_MESSAGES/gedit-2.2.mo -share/locale/pt_BR/LC_MESSAGES/gedit-2.2.mo -share/locale/ro/LC_MESSAGES/gedit-2.2.mo -share/locale/ru/LC_MESSAGES/gedit-2.2.mo -share/locale/sk/LC_MESSAGES/gedit-2.2.mo -share/locale/sl/LC_MESSAGES/gedit-2.2.mo -share/locale/sr/LC_MESSAGES/gedit-2.2.mo -share/locale/sr@Latn/LC_MESSAGES/gedit-2.2.mo -share/locale/sv/LC_MESSAGES/gedit-2.2.mo -share/locale/ta/LC_MESSAGES/gedit-2.2.mo -share/locale/th/LC_MESSAGES/gedit-2.2.mo -share/locale/tr/LC_MESSAGES/gedit-2.2.mo -share/locale/uk/LC_MESSAGES/gedit-2.2.mo -share/locale/vi/LC_MESSAGES/gedit-2.2.mo -share/locale/wa/LC_MESSAGES/gedit-2.2.mo -share/locale/zh_CN/LC_MESSAGES/gedit-2.2.mo -share/locale/zh_TW/LC_MESSAGES/gedit-2.2.mo +share/locale/am/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/ar/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/az/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/be/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/bg/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/bn/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/ca/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/cs/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/cy/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/da/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/de/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/el/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/es/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/et/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/eu/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/fa/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/fi/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/fr/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/ga/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/gl/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/he/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/hi/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/hu/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/it/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/ja/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/kn/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/ko/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/lt/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/lv/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/mk/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/ml/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/mn/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/ms/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/ne/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/nl/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/nn/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/no/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/pl/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/pt/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/pt_BR/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/ro/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/ru/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/sk/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/sl/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/sq/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/sr/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/sr@Latn/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/sv/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/ta/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/th/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/tr/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/uk/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/vi/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/wa/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/zh_CN/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/zh_TW/LC_MESSAGES/gedit-%%VERSION%%.mo @dirrm share/gnome/omf/gedit @dirrm share/gnome/help/gedit/zh_TW @dirrm share/gnome/help/gedit/zh_CN +@dirrm share/gnome/help/gedit/sv @dirrm share/gnome/help/gedit/ro/figures @dirrm share/gnome/help/gedit/ro -@dirrm share/gnome/help/gedit/sv @dirrm share/gnome/help/gedit/ko @dirrm share/gnome/help/gedit/ja @dirrm share/gnome/help/gedit/it @@ -206,6 +232,9 @@ share/locale/zh_TW/LC_MESSAGES/gedit-2.2.mo @dirrm share/gnome/gedit-2 @dirrm lib/gedit-2/plugins @dirrm lib/gedit-2 +@dirrm include/gedit-%%VERSION%%/gedit/recent-files +@dirrm include/gedit-%%VERSION%%/gedit +@dirrm include/gedit-%%VERSION%% @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/ui/toolbar @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/ui/statusbar @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/ui/recents @@ -213,12 +242,12 @@ share/locale/zh_TW/LC_MESSAGES/gedit-2.2.mo @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/print/page @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/print/fonts @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/print +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/encodings @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/wrap_mode @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/undo @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/tabs @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/save @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/line_numbers -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/load @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/font @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/colors @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/auto_indent @@ -232,26 +261,26 @@ share/locale/zh_TW/LC_MESSAGES/gedit-2.2.mo @dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/print/page @dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/print/fonts @dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/print +@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/encodings @dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/wrap_mode @dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/undo @dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/tabs @dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/save @dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/line_numbers -@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/load @dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/font @dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/colors @dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/auto_indent @dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor @dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences @dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2 +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-de.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-es.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-fr.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-it.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-ja.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-ko.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-ro.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-zh_TW.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-zh_CN.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-sv.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-ko.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-ja.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-it.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-fr.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-es.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-de.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-zh_CN.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-zh_TW.omf 2>/dev/null || /usr/bin/true diff --git a/editors/ghex2/Makefile b/editors/ghex2/Makefile index 6f1c8d1c8a82..7e5171fb2843 100644 --- a/editors/ghex2/Makefile +++ b/editors/ghex2/Makefile @@ -6,11 +6,10 @@ # PORTNAME= ghex2 -PORTVERSION= 2.2.1 -PORTREVISION= 2 +PORTVERSION= 2.4.0.1 CATEGORIES= editors gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.2 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.4 DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -20,10 +19,11 @@ COMMENT= GNOME 2 hex editor USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes +USE_REINPLACE= yes USE_GNOME= gnomeprefix gnomehack gail libgnomeprintui libgnomeui USE_LIBTOOL= yes -USE_REINPLACE= yes +INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" + LDFLAGS="-L${LOCALBASE}/lib" .include <bsd.port.mk> diff --git a/editors/ghex2/distinfo b/editors/ghex2/distinfo index 0c47977b9234..ed1ab7a182c1 100644 --- a/editors/ghex2/distinfo +++ b/editors/ghex2/distinfo @@ -1 +1 @@ -MD5 (gnome2/ghex-2.2.1.tar.bz2) = a10ef7db355d2c7790b5d999d0b3087a +MD5 (gnome2/ghex-2.4.0.1.tar.bz2) = 2add675fa3d8d61e71616d49bb7d861e diff --git a/devel/libbonobo/files/patch-configure b/editors/ghex2/files/patch-configure index d52c0a8a2fcc..f195f07b43c6 100644 --- a/devel/libbonobo/files/patch-configure +++ b/editors/ghex2/files/patch-configure @@ -1,9 +1,6 @@ - -$FreeBSD$ - ---- configure 2002/04/26 08:08:30 1.1 -+++ configure 2002/04/26 08:09:00 -@@ -7015,6 +7015,7 @@ +--- configure.orig Wed Dec 11 18:31:51 2002 ++++ configure Thu Dec 12 12:07:17 2002 +@@ -7414,6 +7414,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" diff --git a/editors/ghex2/files/patch-src_ui.c b/editors/ghex2/files/patch-src_ui.c deleted file mode 100644 index b79543ead137..000000000000 --- a/editors/ghex2/files/patch-src_ui.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/ui.c.orig Fri Jul 18 20:25:58 2003 -+++ src/ui.c Fri Jul 18 20:26:34 2003 -@@ -875,7 +875,7 @@ - g_return_if_fail (msg != NULL); - va_start(args, msg); - real_msg = g_strdup_vprintf(msg, args); -- va_end(msg); -+ va_end(args); - info_dlg = gtk_message_dialog_new ( - GTK_WINDOW (win), - GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, diff --git a/editors/ghex2/pkg-plist b/editors/ghex2/pkg-plist index 7f1081dc9d31..e0080d42706e 100644 --- a/editors/ghex2/pkg-plist +++ b/editors/ghex2/pkg-plist @@ -2,34 +2,84 @@ bin/ghex2 etc/gconf/gconf.xml.defaults/apps/ghex2/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/ghex2/%gconf.xml etc/gconf/schemas/ghex2.schemas +include/gtkhex/accessiblegtkhex.h +include/gtkhex/accessiblegtkhexfactory.h +include/gtkhex/gtkhex.h +include/gtkhex/hex-document.h +lib/libgtkhex.a +lib/libgtkhex.so +lib/libgtkhex.so.0 +libdata/pkgconfig/gtkhex.pc share/gnome/applications/ghex.desktop share/gnome/gnome-2.0/ui/ghex-ui.xml -share/gnome/help/ghex2/ja/ghex2.sgml -share/gnome/help/ghex2/ja/ghexconverter.png -share/gnome/help/ghex2/ja/ghexdisplaypref.png -share/gnome/help/ghex2/ja/ghexfind.png -share/gnome/help/ghex2/ja/ghexfindreplace.png -share/gnome/help/ghex2/ja/ghexfullwindow.png -share/gnome/help/ghex2/ja/ghexmdiprefs.png -share/gnome/help/ghex2/ja/ghexmenubar.png -share/gnome/help/ghex2/ja/ghexmenues.html -share/gnome/help/ghex2/ja/ghexprefedit.png -share/gnome/help/ghex2/ja/ghexprintprefs.png -share/gnome/help/ghex2/ja/index.html -share/gnome/help/ghex2/ja/topic.dat -share/gnome/help/ghex2/ja/usage.html share/gnome/help/ghex2/C/figures/ghex_window_empty.png share/gnome/help/ghex2/C/figures/ghex_window_open.png share/gnome/help/ghex2/C/ghex2.xml share/gnome/help/ghex2/C/legal.xml share/gnome/help/ghex2/C/topic.dat +share/gnome/help/ghex2/de/figures/ghex_window_empty.png +share/gnome/help/ghex2/de/figures/ghex_window_open.png +share/gnome/help/ghex2/de/ghex2.xml +share/gnome/help/ghex2/de/legal.xml +share/gnome/help/ghex2/es/figures/ghex_window_empty.png +share/gnome/help/ghex2/es/figures/ghex_window_open.png +share/gnome/help/ghex2/es/ghex2.xml +share/gnome/help/ghex2/es/legal.xml +share/gnome/help/ghex2/es/topic.dat +share/gnome/help/ghex2/fr/figures/ghex_window_empty.png +share/gnome/help/ghex2/fr/figures/ghex_window_open.png +share/gnome/help/ghex2/fr/ghex2.xml +share/gnome/help/ghex2/fr/legal.xml +share/gnome/help/ghex2/it/figures/ghex_window_empty.png +share/gnome/help/ghex2/it/figures/ghex_window_open.png +share/gnome/help/ghex2/it/ghex2.xml +share/gnome/help/ghex2/it/legal.xml +share/gnome/help/ghex2/ja/figures/ghex_window_empty.png +share/gnome/help/ghex2/ja/figures/ghex_window_open.png +share/gnome/help/ghex2/ja/ghex2.xml +share/gnome/help/ghex2/ja/legal.xml +share/gnome/help/ghex2/ja/topic.dat +share/gnome/help/ghex2/ko/figures/ghex_window_empty.png +share/gnome/help/ghex2/ko/figures/ghex_window_open.png +share/gnome/help/ghex2/ko/ghex2.xml +share/gnome/help/ghex2/ko/legal.xml +share/gnome/help/ghex2/sv/figures/ghex_window_empty.png +share/gnome/help/ghex2/sv/figures/ghex_window_open.png +share/gnome/help/ghex2/sv/ghex2.xml +share/gnome/help/ghex2/sv/legal.xml +share/gnome/help/ghex2/sv/topic.dat +share/gnome/help/ghex2/zh_CN/figures/ghex_window_empty.png +share/gnome/help/ghex2/zh_CN/figures/ghex_window_open.png +share/gnome/help/ghex2/zh_CN/ghex2.xml +share/gnome/help/ghex2/zh_CN/legal.xml +share/gnome/help/ghex2/zh_TW/figures/ghex_window_empty.png +share/gnome/help/ghex2/zh_TW/figures/ghex_window_open.png +share/gnome/help/ghex2/zh_TW/ghex2.xml +share/gnome/help/ghex2/zh_TW/legal.xml share/gnome/omf/ghex/ghex-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/ghex/ghex-C.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/ghex/ghex-ja.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/ghex/ghex-ja.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/ghex/ghex2-de.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/ghex/ghex2-de.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/ghex/ghex2-es.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/ghex/ghex2-es.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/ghex/ghex2-fr.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/ghex/ghex2-fr.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/ghex/ghex2-it.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/ghex/ghex2-it.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/ghex/ghex2-ja.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/ghex/ghex2-ja.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/ghex/ghex2-ko.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/ghex/ghex2-ko.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/ghex/ghex2-sv.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/ghex/ghex2-sv.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/ghex/ghex2-zh_CN.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/ghex/ghex2-zh_CN.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/ghex/ghex2-zh_TW.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/ghex/ghex2-zh_TW.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/gnome-ghex.png -share/locale/az/LC_MESSAGES/ghex-2.0.mo share/locale/am/LC_MESSAGES/ghex-2.0.mo +share/locale/az/LC_MESSAGES/ghex-2.0.mo +share/locale/be/LC_MESSAGES/ghex-2.0.mo share/locale/bg/LC_MESSAGES/ghex-2.0.mo share/locale/ca/LC_MESSAGES/ghex-2.0.mo share/locale/cs/LC_MESSAGES/ghex-2.0.mo @@ -49,6 +99,7 @@ share/locale/hu/LC_MESSAGES/ghex-2.0.mo share/locale/it/LC_MESSAGES/ghex-2.0.mo share/locale/ja/LC_MESSAGES/ghex-2.0.mo share/locale/ko/LC_MESSAGES/ghex-2.0.mo +share/locale/ml/LC_MESSAGES/ghex-2.0.mo share/locale/ms/LC_MESSAGES/ghex-2.0.mo share/locale/nl/LC_MESSAGES/ghex-2.0.mo share/locale/nn/LC_MESSAGES/ghex-2.0.mo @@ -60,6 +111,8 @@ share/locale/ro/LC_MESSAGES/ghex-2.0.mo share/locale/ru/LC_MESSAGES/ghex-2.0.mo share/locale/sk/LC_MESSAGES/ghex-2.0.mo share/locale/sl/LC_MESSAGES/ghex-2.0.mo +share/locale/sr/LC_MESSAGES/ghex-2.0.mo +share/locale/sr@Latn/LC_MESSAGES/ghex-2.0.mo share/locale/sv/LC_MESSAGES/ghex-2.0.mo share/locale/tr/LC_MESSAGES/ghex-2.0.mo share/locale/uk/LC_MESSAGES/ghex-2.0.mo @@ -68,12 +121,37 @@ share/locale/wa/LC_MESSAGES/ghex-2.0.mo share/locale/zh_CN/LC_MESSAGES/ghex-2.0.mo share/locale/zh_TW/LC_MESSAGES/ghex-2.0.mo @dirrm share/gnome/omf/ghex +@dirrm share/gnome/help/ghex2/zh_TW/figures +@dirrm share/gnome/help/ghex2/zh_TW +@dirrm share/gnome/help/ghex2/zh_CN/figures +@dirrm share/gnome/help/ghex2/zh_CN +@dirrm share/gnome/help/ghex2/sv/figures +@dirrm share/gnome/help/ghex2/sv +@dirrm share/gnome/help/ghex2/ko/figures +@dirrm share/gnome/help/ghex2/ko +@dirrm share/gnome/help/ghex2/ja/figures +@dirrm share/gnome/help/ghex2/ja +@dirrm share/gnome/help/ghex2/it/figures +@dirrm share/gnome/help/ghex2/it +@dirrm share/gnome/help/ghex2/fr/figures +@dirrm share/gnome/help/ghex2/fr +@dirrm share/gnome/help/ghex2/es/figures +@dirrm share/gnome/help/ghex2/es +@dirrm share/gnome/help/ghex2/de/figures +@dirrm share/gnome/help/ghex2/de @dirrm share/gnome/help/ghex2/C/figures @dirrm share/gnome/help/ghex2/C -@dirrm share/gnome/help/ghex2/ja/stylesheet-images -@dirrm share/gnome/help/ghex2/ja @dirrm share/gnome/help/ghex2 +@dirrm include/gtkhex @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/ghex2 @dirrm etc/gconf/gconf.xml.defaults/apps/ghex2 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/ghex/ghex-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/ghex/ghex-ja.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/ghex/ghex2-de.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/ghex/ghex2-es.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/ghex/ghex2-fr.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/ghex/ghex2-it.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/ghex/ghex2-ja.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/ghex/ghex2-ko.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/ghex/ghex2-sv.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/ghex/ghex2-zh_CN.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/ghex/ghex2-zh_TW.omf 2>/dev/null || /usr/bin/true diff --git a/games/gcompris2/Makefile b/games/gcompris2/Makefile index 5e1ecd9c31d7..795138e8ce78 100644 --- a/games/gcompris2/Makefile +++ b/games/gcompris2/Makefile @@ -7,7 +7,7 @@ PORTNAME= gcompris2 PORTVERSION= 2.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= gcompris diff --git a/games/gcompris2/files/patch-src::boards::menu.c b/games/gcompris2/files/patch-src::boards::menu.c new file mode 100644 index 000000000000..a5908d515cca --- /dev/null +++ b/games/gcompris2/files/patch-src::boards::menu.c @@ -0,0 +1,10 @@ +--- src/boards/menu.c.orig Wed Apr 23 21:38:22 2003 ++++ src/boards/menu.c Wed Apr 23 21:39:20 2003 +@@ -153,6 +153,7 @@ + gcomprisBoard->maxlevel=1; + gcompris_bar_set(GCOMPRIS_BAR_CONFIG|GCOMPRIS_BAR_ABOUT); + ++ gnome_canvas_update_now(gcomprisBoard->canvas); + menu_pause(FALSE); + + } diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile index 1e8550b7848a..879130a64981 100644 --- a/games/gnome-games/Makefile +++ b/games/gnome-games/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomegames2 -PORTVERSION= 2.2.1 -PORTREVISION= 3 +PORTVERSION= 2.4.0 CATEGORIES= games gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-games/2.2 +MASTER_SITE_SUBDIR= sources/gnome-games/2.4 DISTNAME= gnome-games-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -30,9 +29,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" post-patch: - @find ${WRKSRC} -name "*.[ch]" | xargs ${REINPLACE_CMD} -e \ + @${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \ 's|malloc\.h|stdlib.h|g' - @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ - 's|games\.games|games:games|g' .include <bsd.port.mk> diff --git a/games/gnome-games/distinfo b/games/gnome-games/distinfo index 97b59f44a41a..5038e683d94f 100644 --- a/games/gnome-games/distinfo +++ b/games/gnome-games/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-games-2.2.1.tar.bz2) = 15b47c5f3cba31aaadd21ea51af2833b +MD5 (gnome2/gnome-games-2.4.0.tar.bz2) = a1a2935642921e7defce3a0a5c54bdbd diff --git a/games/gnome-games/files/patch-ab b/games/gnome-games/files/patch-ab index 0075d0dd4b16..67cea1ce8155 100644 --- a/games/gnome-games/files/patch-ab +++ b/games/gnome-games/files/patch-ab @@ -1,24 +1,11 @@ ---- gnome-stones/objects/Makefile.in.orig Wed Aug 28 22:11:08 2002 -+++ gnome-stones/objects/Makefile.in Wed Aug 28 23:17:53 2002 -@@ -133,7 +133,7 @@ +--- gnome-stones/objects/Makefile.in.orig Sun Jun 15 20:28:06 2003 ++++ gnome-stones/objects/Makefile.in Sun Jun 15 20:28:06 2003 +@@ -136,7 +136,7 @@ GSTONES_SRC_DIR = $(srcdir)/../ -objectdir = $(libdir)/gnome-stones/objects +objectdir = $(datadir)/gnome-stones/objects - INCLUDES = -I$(GSTONES_SRC_DIR) $(GNOME_GAMES_CFLAGS) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -I$(includedir) -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED - -@@ -150,10 +150,10 @@ - - DEFS = @DEFS@ -I. -I$(srcdir) -I../.. - LIBS = @LIBS@ --libgnome_stones_la_LDFLAGS = -+libgnome_stones_la_LDFLAGS = -avoid-version - libgnome_stones_la_LIBADD = - libgnome_stones_la_OBJECTS = gnome-stones.lo --libgnomekoban_la_LDFLAGS = -+libgnomekoban_la_LDFLAGS = -avoid-version - libgnomekoban_la_LIBADD = - libgnomekoban_la_OBJECTS = gnomekoban.lo - COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + INCLUDES = \ + -I$(GSTONES_SRC_DIR) \ diff --git a/games/gnome-games/files/patch-ac b/games/gnome-games/files/patch-ac index 65e3bbe8c565..4f62486fb3b2 100644 --- a/games/gnome-games/files/patch-ac +++ b/games/gnome-games/files/patch-ac @@ -1,5 +1,5 @@ ---- freecell/gdk-card-image/Makefile.in.orig Wed May 8 16:32:35 2002 -+++ freecell/gdk-card-image/Makefile.in Wed May 8 16:32:41 2002 +--- gdk-card-image/Makefile.in.orig Wed May 8 16:32:35 2002 ++++ gdk-card-image/Makefile.in Wed May 8 16:32:41 2002 @@ -164,7 +164,7 @@ libgdkcardimage_la_SOURCES = gdk-card-image.c libgdkcardimageincludedir = $(includedir)/gdkcardimage diff --git a/games/gnome-games/files/patch-ae b/games/gnome-games/files/patch-ae deleted file mode 100644 index 397fca112a9b..000000000000 --- a/games/gnome-games/files/patch-ae +++ /dev/null @@ -1,10 +0,0 @@ ---- aisleriot/menu.c.orig Wed May 8 16:33:36 2002 -+++ aisleriot/menu.c Wed May 8 16:33:47 2002 -@@ -18,6 +18,7 @@ - */ - - #include <config.h> -+#include <sys/types.h> - #include <dirent.h> - #include "gnome.h" - #include "sol.h" diff --git a/games/gnome-games/files/patch-gnect_data_Makefile.in b/games/gnome-games/files/patch-gnect_data_Makefile.in deleted file mode 100644 index 08a1f4d64147..000000000000 --- a/games/gnome-games/files/patch-gnect_data_Makefile.in +++ /dev/null @@ -1,30 +0,0 @@ ---- gnect/data/Makefile.in.orig Sun May 25 13:52:25 2003 -+++ gnect/data/Makefile.in Sun May 25 13:56:14 2003 -@@ -300,7 +300,7 @@ - install-exec-am: - install-exec: install-exec-am - --install-data-am: install-GamesDATA install-schemaDATA \ -+install-data-am: install-GamesDATA install-schemaDATA install-data-local \ - install-soundlistDATA install-themeDATA \ - install-velenaDATA - install-data: install-data-am -@@ -351,7 +351,7 @@ - maintainer-clean: maintainer-clean-am - - .PHONY: uninstall-GamesDATA install-GamesDATA uninstall-schemaDATA \ --install-schemaDATA uninstall-soundlistDATA install-soundlistDATA \ -+install-schemaDATA install-data-local uninstall-soundlistDATA install-soundlistDATA \ - uninstall-themeDATA install-themeDATA uninstall-velenaDATA \ - install-velenaDATA tags distdir info-am info dvi-am dvi check check-am \ - installcheck-am installcheck install-exec-am install-exec \ -@@ -363,6 +363,9 @@ - @INTLTOOL_DESKTOP_RULE@ - @INTLTOOL_SCHEMAS_RULE@ - @INTLTOOL_SOUNDLIST_RULE@ -+ -+install-data-local: -+ -GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA) - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/games/gnome-games/files/patch-gnect_src_prefs.c b/games/gnome-games/files/patch-gnect_src_prefs.c deleted file mode 100644 index 2737e28846a7..000000000000 --- a/games/gnome-games/files/patch-gnect_src_prefs.c +++ /dev/null @@ -1,51 +0,0 @@ ---- gnect/src/prefs.c.orig Sun May 25 14:21:05 2003 -+++ gnect/src/prefs.c Sun May 25 14:21:15 2003 -@@ -264,40 +264,6 @@ - - - --static void --sanity_check(void) --{ -- gchar *tileset; -- GError *error = NULL; -- -- tileset = gconf_client_get_string (gnect_gconf_client, -- "/apps/gnect/theme", &error); -- if (error) { -- GtkWidget *dialog; -- dialog = gtk_message_dialog_new (NULL, -- 0, -- GTK_MESSAGE_ERROR, -- GTK_BUTTONS_CLOSE, -- _("There was an error accessing GConf: %s"), -- error->message); -- gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); -- gtk_dialog_run(GTK_DIALOG(dialog)); -- exit(1); -- } else if (!tileset) { -- GtkWidget *dialog; -- dialog = gtk_message_dialog_new (NULL, -- 0, -- GTK_MESSAGE_ERROR, -- GTK_BUTTONS_CLOSE, -- _("The default configuration values could not be retrieved correctly. Please check your GConf configuration, specifically that the schemas are installed correctly")); -- gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); -- gtk_dialog_run(GTK_DIALOG(dialog)); -- exit(1); -- } else { -- g_free (tileset); -- } --} -- - void - prefs_init (gint argc, gchar **argv) - { -@@ -313,7 +279,6 @@ - - gconf_init (argc, argv, NULL); - gnect_gconf_client = gconf_client_get_default (); -- sanity_check(); - gconf_client_add_dir (gnect_gconf_client, "/apps/gnect", - GCONF_CLIENT_PRELOAD_NONE, NULL); - diff --git a/games/gnome-games/files/patch-mahjongg_Makefile.in b/games/gnome-games/files/patch-mahjongg_Makefile.in deleted file mode 100644 index 917c7420673a..000000000000 --- a/games/gnome-games/files/patch-mahjongg_Makefile.in +++ /dev/null @@ -1,18 +0,0 @@ ---- mahjongg/Makefile.in.orig Sun Jan 19 14:54:47 2003 -+++ mahjongg/Makefile.in Sun Jan 19 14:56:21 2003 -@@ -593,9 +593,12 @@ - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA) - -$(mkinstalldirs) $(DESTDIR)$(scoredir) - $(mkinstalldirs) $(DESTDIR)$(bgdir) -- touch $(DESTDIR)$(scoredir)/mahjongg.{easy,difficult}.scores -- -chown games.games $(DESTDIR)$(scoredir)/mahjongg.{easy,difficult}.scores -- -chmod 664 $(DESTDIR)$(scoredir)/mahjongg.{easy,difficult}.scores -+ touch $(DESTDIR)$(scoredir)/mahjongg.easy.scores -+ touch $(DESTDIR)$(scoredir)/mahjongg.difficult.scores -+ -chown games:games $(DESTDIR)$(scoredir)/mahjongg.easy.scores -+ -chown games:games $(DESTDIR)$(scoredir)/mahjongg.difficult.scores -+ -chmod 664 $(DESTDIR)$(scoredir)/mahjongg.easy.scores -+ -chmod 664 $(DESTDIR)$(scoredir)/mahjongg.difficult.scores - -chgrp games $(DESTDIR)$(bindir)/mahjongg && chmod 2555 $(DESTDIR)$(bindir)/mahjongg - $(mkinstalldirs) $(DESTDIR)$(Gamesdir) - diff --git a/games/gnome-games/pkg-install b/games/gnome-games/pkg-install index c754797a5caf..039d300d69a5 100644 --- a/games/gnome-games/pkg-install +++ b/games/gnome-games/pkg-install @@ -4,17 +4,9 @@ if [ -n "${PACKAGE_BUILDING}" ]; then exit 0 fi -SCORES="glines.scores gnibbles.1.0.scores gnibbles.1.1.scores gnibbles.2.0.scores gnibbles.2.1.scores gnibbles.3.0.scores gnibbles.3.1.scores gnibbles.4.0.scores gnibbles.4.1.scores gnobots2.classic_robots-safe.scores gnobots2.classic_robots-super-safe.scores gnobots2.classic_robots.scores gnobots2.nightmare-safe.scores gnobots2.nightmare-super-safe.scores gnobots2.nightmare.scores gnobots2.robots2-safe.scores gnobots2.robots2-super-safe.scores gnobots2.robots2.scores gnobots2.robots2_easy-safe.scores gnobots2.robots2_easy-super-safe.scores gnobots2.robots2_easy.scores gnobots2.robots_with_safe_teleport-safe.scores gnobots2.robots_with_safe_teleport-super-safe.scores gnobots2.robots_with_safe_teleport.scores gnome-stones.scores gnome-xbill.scores gnometris.scores gnomine.Biiiig.scores gnomine.Custom.scores gnomine.Medium.scores gnomine.Tiny.scores gnotravex.2x2.scores gnotravex.3x3.scores gnotravex.4x4.scores gnotravex.5x5.scores gnotravex.6x6.scores gnotski.1.scores gnotski.11.scores gnotski.12.scores gnotski.13.scores gnotski.14.scores gnotski.15.scores gnotski.16.scores gnotski.17.scores gnotski.2.scores gnotski.21.scores gnotski.22.scores gnotski.23.scores gnotski.24.scores gnotski.25.scores gnotski.26.scores gnotski.3.scores gnotski.4.scores gnotski.5.scores gnotski.6.scores gnotski.7.scores gtali.scores iagno.b1.scores iagno.b2.scores iagno.b3.scores iagno.w1.scores iagno.w2.scores iagno.w3.scores mahjongg.difficult.scores mahjongg.easy.scores same-gnome.scores" - -if [ "$1" = "MAINTAINER" ]; then - for i in ${SCORES}; do - echo "@unexec [ -s %D/share/gnome/games/${i} ] || rm -f %D/share/gnome/games/${i}" - done - exit 0 -fi - if [ "$2" = "POST-INSTALL" ]; then mkdir -p ${PKG_PREFIX}/share/gnome/games + SCORES="glines.scores gnibbles.1.0.scores gnibbles.1.1.scores gnibbles.2.0.scores gnibbles.2.1.scores gnibbles.3.0.scores gnibbles.3.1.scores gnibbles.4.0.scores gnibbles.4.1.scores gnobots2.classic_robots-safe.scores gnobots2.classic_robots-super-safe.scores gnobots2.classic_robots.scores gnobots2.nightmare-safe.scores gnobots2.nightmare-super-safe.scores gnobots2.nightmare.scores gnobots2.robots2-safe.scores gnobots2.robots2-super-safe.scores gnobots2.robots2.scores gnobots2.robots2_easy-safe.scores gnobots2.robots2_easy-super-safe.scores gnobots2.robots2_easy.scores gnobots2.robots_with_safe_teleport-safe.scores gnobots2.robots_with_safe_teleport-super-safe.scores gnobots2.robots_with_safe_teleport.scores gnome-stones.scores gnometris.scores gnomine.Custom.scores gnomine.Large.scores gnomine.Medium.scores gnomine.Small.scores gnotravex.2x2.scores gnotravex.3x3.scores gnotravex.4x4.scores gnotravex.5x5.scores gnotravex.6x6.scores gnotski.1.scores gnotski.11.scores gnotski.12.scores gnotski.13.scores gnotski.14.scores gnotski.15.scores gnotski.16.scores gnotski.17.scores gnotski.2.scores gnotski.21.scores gnotski.22.scores gnotski.23.scores gnotski.24.scores gnotski.25.scores gnotski.26.scores gnotski.3.scores gnotski.4.scores gnotski.5.scores gnotski.6.scores gnotski.7.scores gtali.scores iagno.b1.scores iagno.b2.scores iagno.b3.scores iagno.w1.scores iagno.w2.scores iagno.w3.scores mahjongg.difficult.scores mahjongg.easy.scores same-gnome.scores" for i in ${SCORES}; do if [ ! -f ${PKG_PREFIX}/share/gnome/games/${i} ]; then touch -f ${PKG_PREFIX}/share/gnome/games/${i} diff --git a/games/gnome-games/pkg-plist b/games/gnome-games/pkg-plist index e7c02977d397..25d955dcdca8 100644 --- a/games/gnome-games/pkg-plist +++ b/games/gnome-games/pkg-plist @@ -1,12 +1,10 @@ -bin/ctali -bin/freecell +bin/blackjack bin/gataxx bin/glines bin/gnect bin/gnibbles bin/gnobots2 bin/gnome-stones -bin/gnome-xbill bin/gnometris bin/gnomine bin/gnotravex @@ -16,36 +14,77 @@ bin/iagno bin/mahjongg bin/same-gnome bin/sol -etc/gconf/gconf.xml.defaults/apps/freecell/%gconf.xml -etc/gconf/gconf.xml.defaults/apps/freecell/option/%gconf.xml -etc/gconf/gconf.xml.defaults/apps/freecell/score/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/aisleriot/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/blackjack/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/blackjack/deck/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/blackjack/global/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/blackjack/settings/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gataxx/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/glines/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/glines/preferences/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/glines/saved/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnect/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnibbles/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm/0/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm/1/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm/2/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm/3/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnobots2/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnobots2/preferences/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnome-stones/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnome-stones/preferences/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnometris/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnometris/options/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnomine/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnomine/geometry/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnotravex/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gtali/%gconf.xml etc/gconf/gconf.xml.defaults/apps/iagno/%gconf.xml etc/gconf/gconf.xml.defaults/apps/mahjongg/%gconf.xml etc/gconf/gconf.xml.defaults/apps/same-gnome/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/freecell/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/freecell/option/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/freecell/score/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/aisleriot/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/blackjack/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/blackjack/deck/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/blackjack/global/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/blackjack/settings/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gataxx/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/glines/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/glines/preferences/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/glines/saved/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnect/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm/0/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm/1/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm/2/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm/3/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnobots2/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnobots2/preferences/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnome-stones/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnome-stones/preferences/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnometris/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnometris/options/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnomine/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnomine/geometry/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnotravex/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gtali/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/iagno/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/mahjongg/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/same-gnome/%gconf.xml -etc/gconf/schemas/freecell.schemas +etc/gconf/schemas/aisleriot.schemas +etc/gconf/schemas/blackjack.schemas etc/gconf/schemas/gataxx.schemas +etc/gconf/schemas/glines.schemas etc/gconf/schemas/gnect.schemas +etc/gconf/schemas/gnibbles.schemas +etc/gconf/schemas/gnobots2.schemas +etc/gconf/schemas/gnome-stones.schemas etc/gconf/schemas/gnometris.schemas etc/gconf/schemas/gnomine.schemas +etc/gconf/schemas/gnotravex.schemas etc/gconf/schemas/gtali.schemas etc/gconf/schemas/iagno.schemas etc/gconf/schemas/mahjongg.schemas @@ -59,6 +98,7 @@ include/gdkcardimage/gdk-card-image.h lib/libgdkcardimage.a lib/libgdkcardimage.so lib/libgdkcardimage.so.1 +share/gnome/applications/blackjack.desktop share/gnome/applications/freecell.desktop share/gnome/applications/gataxx.desktop share/gnome/applications/glines.desktop @@ -75,7 +115,11 @@ share/gnome/applications/iagno.desktop share/gnome/applications/mahjongg.desktop share/gnome/applications/same-gnome.desktop share/gnome/applications/sol.desktop -share/gnome/applications/xbill.desktop +share/gnome/blackjack/Ameristar.rules +share/gnome/blackjack/Atlantic_City.rules +share/gnome/blackjack/Vegas_Downtown.rules +share/gnome/blackjack/Vegas_Strip.rules +share/gnome/blackjack/Vegas_Strip.rules.dat @unexec [ -s %D/share/gnome/games/glines.scores ] || rm -f %D/share/gnome/games/glines.scores @unexec [ -s %D/share/gnome/games/gnibbles.1.0.scores ] || rm -f %D/share/gnome/games/gnibbles.1.0.scores @unexec [ -s %D/share/gnome/games/gnibbles.1.1.scores ] || rm -f %D/share/gnome/games/gnibbles.1.1.scores @@ -101,12 +145,11 @@ share/gnome/applications/xbill.desktop @unexec [ -s %D/share/gnome/games/gnobots2.robots_with_safe_teleport-super-safe.scores ] || rm -f %D/share/gnome/games/gnobots2.robots_with_safe_teleport-super-safe.scores @unexec [ -s %D/share/gnome/games/gnobots2.robots_with_safe_teleport.scores ] || rm -f %D/share/gnome/games/gnobots2.robots_with_safe_teleport.scores @unexec [ -s %D/share/gnome/games/gnome-stones.scores ] || rm -f %D/share/gnome/games/gnome-stones.scores -@unexec [ -s %D/share/gnome/games/gnome-xbill.scores ] || rm -f %D/share/gnome/games/gnome-xbill.scores @unexec [ -s %D/share/gnome/games/gnometris.scores ] || rm -f %D/share/gnome/games/gnometris.scores -@unexec [ -s %D/share/gnome/games/gnomine.Biiiig.scores ] || rm -f %D/share/gnome/games/gnomine.Biiiig.scores @unexec [ -s %D/share/gnome/games/gnomine.Custom.scores ] || rm -f %D/share/gnome/games/gnomine.Custom.scores +@unexec [ -s %D/share/gnome/games/gnomine.Large.scores ] || rm -f %D/share/gnome/games/gnomine.Large.scores @unexec [ -s %D/share/gnome/games/gnomine.Medium.scores ] || rm -f %D/share/gnome/games/gnomine.Medium.scores -@unexec [ -s %D/share/gnome/games/gnomine.Tiny.scores ] || rm -f %D/share/gnome/games/gnomine.Tiny.scores +@unexec [ -s %D/share/gnome/games/gnomine.Small.scores ] || rm -f %D/share/gnome/games/gnomine.Small.scores @unexec [ -s %D/share/gnome/games/gnotravex.2x2.scores ] || rm -f %D/share/gnome/games/gnotravex.2x2.scores @unexec [ -s %D/share/gnome/games/gnotravex.3x3.scores ] || rm -f %D/share/gnome/games/gnotravex.3x3.scores @unexec [ -s %D/share/gnome/games/gnotravex.4x4.scores ] || rm -f %D/share/gnome/games/gnotravex.4x4.scores @@ -273,6 +316,10 @@ share/gnome/help/aisleriot/C/will_o_the_wisp.xml share/gnome/help/aisleriot/C/yield.xml share/gnome/help/aisleriot/C/yukon.xml share/gnome/help/aisleriot/C/zebra.xml +share/gnome/help/blackjack/C/blackjack.xml +share/gnome/help/blackjack/C/figures/blackjack_start_window.png +share/gnome/help/blackjack/C/figures/blackjack_win_window.png +share/gnome/help/blackjack/C/legal.xml share/gnome/help/gataxx/C/figures/gataxx-legalmoves.png share/gnome/help/gataxx/C/figures/gataxx-prefs.png share/gnome/help/gataxx/C/figures/gataxx-startgame.png @@ -343,13 +390,10 @@ share/gnome/help/iagno/C/figures/PLAYER.png share/gnome/help/iagno/C/figures/START.png share/gnome/help/iagno/C/iagno.xml share/gnome/help/iagno/C/legal.xml -share/gnome/help/mahjongg/C/figures/color.png -share/gnome/help/mahjongg/C/figures/confirm.png share/gnome/help/mahjongg/C/figures/mahjongg.png share/gnome/help/mahjongg/C/figures/no-match.png share/gnome/help/mahjongg/C/figures/no-move.png share/gnome/help/mahjongg/C/figures/preferences.png -share/gnome/help/mahjongg/C/figures/scores.png share/gnome/help/mahjongg/C/figures/seed.png share/gnome/help/mahjongg/C/figures/toolbar.png share/gnome/help/mahjongg/C/legal.xml @@ -358,32 +402,14 @@ share/gnome/help/same-gnome/C/figures/blink-sync.png share/gnome/help/same-gnome/C/figures/preferences.png share/gnome/help/same-gnome/C/figures/same-main-window.png share/gnome/help/same-gnome/C/figures/same-planets-fig.png -share/gnome/help/same-gnome/C/figures/score-dialog.png share/gnome/help/same-gnome/C/legal.xml share/gnome/help/same-gnome/C/same-gnome.xml -share/gnome/help/xbill/C/figures/bucket.png -share/gnome/help/xbill/C/figures/cable.png -share/gnome/help/xbill/C/figures/computer.png -share/gnome/help/xbill/C/figures/fakeseg.png -share/gnome/help/xbill/C/figures/fallenos.png -share/gnome/help/xbill/C/figures/infected.png -share/gnome/help/xbill/C/figures/mainwin.png -share/gnome/help/xbill/C/figures/microbill.png -share/gnome/help/xbill/C/figures/network.png -share/gnome/help/xbill/C/figures/remove.png -share/gnome/help/xbill/C/figures/removeos.png -share/gnome/help/xbill/C/figures/score.png -share/gnome/help/xbill/C/figures/scores.png -share/gnome/help/xbill/C/figures/spark.png -share/gnome/help/xbill/C/figures/splat.png -share/gnome/help/xbill/C/figures/startgame.png -share/gnome/help/xbill/C/figures/toasters.png -share/gnome/help/xbill/C/legal.xml -share/gnome/help/xbill/C/xbill.xml share/gnome/mime-info/gnome-stones.keys share/gnome/mime-info/gnome-stones.mime share/gnome/omf/gnome-games/aisleriot-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/aisleriot-C.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-games/blackjack-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/blackjack-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-games/gataxx-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gataxx-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-games/glines-C.omf @@ -410,20 +436,29 @@ share/gnome/omf/gnome-games/mahjongg-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/mahjongg-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-games/same-gnome-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/same-gnome-C.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-games/xbill-C.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/xbill-C.omf 2>/dev/null || /usr/bin/true +share/gnome/pixmaps/blackjack/baize.png +share/gnome/pixmaps/blackjack/blackjack-splash.png +share/gnome/pixmaps/blackjack/chip-1.png +share/gnome/pixmaps/blackjack/chip-100.png +share/gnome/pixmaps/blackjack/chip-25.png +share/gnome/pixmaps/blackjack/chip-5.png +share/gnome/pixmaps/cards/backs/antique-red.png share/gnome/pixmaps/cards/backs/beige.png +share/gnome/pixmaps/cards/backs/dondorf-flower.png share/gnome/pixmaps/cards/backs/face.png share/gnome/pixmaps/cards/backs/grey.png share/gnome/pixmaps/cards/backs/rods.png +share/gnome/pixmaps/cards/backs/tux.png share/gnome/pixmaps/cards/baize.png share/gnome/pixmaps/cards/honors/bonded.png +share/gnome/pixmaps/cards/honors/dondorf.png share/gnome/pixmaps/cards/honors/xpat.png share/gnome/pixmaps/cards/jokers/gnome.png share/gnome/pixmaps/cards/ranks/bold-09x14.png share/gnome/pixmaps/cards/ranks/fine-07x12.png share/gnome/pixmaps/cards/slots/hand.png share/gnome/pixmaps/cards/slots/plain.png +share/gnome/pixmaps/cards/slots/white-outline.png share/gnome/pixmaps/cards/splash.png share/gnome/pixmaps/cards/suits_large/knuth-09x10.png share/gnome/pixmaps/cards/suits_large/knuth-15x19.png @@ -444,22 +479,12 @@ share/gnome/pixmaps/cards/suits_small/knuth-09x10.png share/gnome/pixmaps/cards/suits_small/xpat-11x11.png share/gnome/pixmaps/cards/suits_small/xpat-15x15.png share/gnome/pixmaps/gataxx.png -share/gnome/pixmaps/gataxx/blend.png -share/gnome/pixmaps/gataxx/classic.png -share/gnome/pixmaps/gataxx/flipblend.png -share/gnome/pixmaps/gataxx/metal.png -share/gnome/pixmaps/gataxx/metal2.png -share/gnome/pixmaps/gataxx/shrink.png -share/gnome/pixmaps/gataxx/sunmoon.png -share/gnome/pixmaps/gataxx/woodtrim.png share/gnome/pixmaps/glines.png share/gnome/pixmaps/glines/ball.png -share/gnome/pixmaps/glines/black.xpm share/gnome/pixmaps/glines/classic.png share/gnome/pixmaps/glines/dots.png -share/gnome/pixmaps/glines/gray.xpm +share/gnome/pixmaps/glines/gumball.png share/gnome/pixmaps/glines/pulse.png -share/gnome/pixmaps/glines/woody.xpm share/gnome/pixmaps/gnect-icon.png share/gnome/pixmaps/gnect/bg_grotty.jpg share/gnome/pixmaps/gnect/bg_nightfall.jpg @@ -487,7 +512,18 @@ share/gnome/pixmaps/gnobots2/splat.png share/gnome/pixmaps/gnobots2/windows.png share/gnome/pixmaps/gnobots2/yahoo.png share/gnome/pixmaps/gnome-aisleriot.png +share/gnome/pixmaps/gnome-blackjack.png +share/gnome/pixmaps/gnome-cardgame.png +share/gnome/pixmaps/gnome-die1.png +share/gnome/pixmaps/gnome-die2.png +share/gnome/pixmaps/gnome-die3.png +share/gnome/pixmaps/gnome-die4.png +share/gnome/pixmaps/gnome-die5.png +share/gnome/pixmaps/gnome-die6.png share/gnome/pixmaps/gnome-gnobots2.png +share/gnome/pixmaps/gnome-gnomine.png +share/gnome/pixmaps/gnome-gnotravex.png +share/gnome/pixmaps/gnome-gsame.png share/gnome/pixmaps/gnome-gtali.png share/gnome/pixmaps/gnome-gtetris.png share/gnome/pixmaps/gnome-mahjongg.png @@ -509,9 +545,8 @@ share/gnome/pixmaps/gnome-stones/explosion.png share/gnome/pixmaps/gnome-stones/firefly.png share/gnome/pixmaps/gnome-stones/frame.png share/gnome/pixmaps/gnome-stones/gnome.png -share/gnome/pixmaps/gnome-stones/title.png +share/gnome/pixmaps/gnome-stones/title-tile.png share/gnome/pixmaps/gnome-stones/wall.png -share/gnome/pixmaps/gnome-xbill.png share/gnome/pixmaps/gnometris/5blocks-tig.png share/gnome/pixmaps/gnometris/5blocks-tim.png share/gnome/pixmaps/gnometris/5blocks.png @@ -519,27 +554,28 @@ share/gnome/pixmaps/gnometris/7blocks-tig.png share/gnome/pixmaps/gnometris/7blocks.png share/gnome/pixmaps/gnometris/7stones-gn.png share/gnome/pixmaps/gnometris/7stones2-gn.png -share/gnome/pixmaps/gnometris/bg/dog-bg.png -share/gnome/pixmaps/gnometris/bg/fishy-bg.png -share/gnome/pixmaps/gnometris/bg/geschier-bg.png -share/gnome/pixmaps/gnometris/bg/gitter-bg.png -share/gnome/pixmaps/gnometris/bg/gnometris-bg.png -share/gnome/pixmaps/gnometris/bg/greyprint-bg.png -share/gnome/pixmaps/gnometris/bg/leaves-bg.png -share/gnome/pixmaps/gnometris/bg/rhinoceros-bg.png -share/gnome/pixmaps/gnometris/bg/scrcow-bg.png -share/gnome/pixmaps/gnometris/bg/sweet-bg.png -share/gnome/pixmaps/gnometris/bg/trees-bg.png -share/gnome/pixmaps/gnometris/bg/vortex-bg.png -share/gnome/pixmaps/gnometris/bg/watery-bg.png -share/gnome/pixmaps/gnometris/bg/weirdo-bg.png +share/gnome/pixmaps/gnometris/bg/dog-bg.jpg +share/gnome/pixmaps/gnometris/bg/fishy-bg.jpg +share/gnome/pixmaps/gnometris/bg/geschier-bg.jpg +share/gnome/pixmaps/gnometris/bg/gitter-bg.jpg +share/gnome/pixmaps/gnometris/bg/gnometris-bg.jpg +share/gnome/pixmaps/gnometris/bg/greyprint-bg.jpg +share/gnome/pixmaps/gnometris/bg/leaves-bg.jpg +share/gnome/pixmaps/gnometris/bg/rhinoceros-bg.jpg +share/gnome/pixmaps/gnometris/bg/scrcow-bg.jpg +share/gnome/pixmaps/gnometris/bg/sweet-bg.jpg +share/gnome/pixmaps/gnometris/bg/trees-bg.jpg +share/gnome/pixmaps/gnometris/bg/vortex-bg.jpg +share/gnome/pixmaps/gnometris/bg/watery-bg.jpg +share/gnome/pixmaps/gnometris/bg/weirdo-bg.jpg share/gnome/pixmaps/gnomine/face-cool.xpm share/gnome/pixmaps/gnomine/face-sad.xpm share/gnome/pixmaps/gnomine/face-smile.xpm share/gnome/pixmaps/gnomine/face-win.xpm share/gnome/pixmaps/gnomine/face-worried.xpm -share/gnome/pixmaps/gnotravex/gnome-gnotravex.png -share/gnome/pixmaps/gnotravex/gnotravex.png +share/gnome/pixmaps/gnomine/flag-question.png +share/gnome/pixmaps/gnomine/flag.png +share/gnome/pixmaps/gnomine/mine.png share/gnome/pixmaps/gnotski-icon.png share/gnome/pixmaps/gnotski.png share/gnome/pixmaps/iagno.png @@ -659,88 +695,15 @@ share/gnome/sounds/gnome-stones/get_diamond.wav share/gnome/sounds/gnome-stones/title.wav share/gnome/sounds/iagno/flip-piece.wav share/gnome/sounds/iagno/gameover.wav -share/gnome/xbill/cursors/apple.xpm -share/gnome/xbill/cursors/beos.xpm -share/gnome/xbill/cursors/bsd.xpm -share/gnome/xbill/cursors/bucket.xpm -share/gnome/xbill/cursors/caldera.xpm -share/gnome/xbill/cursors/debian.xpm -share/gnome/xbill/cursors/hand_down.xpm -share/gnome/xbill/cursors/hand_down_mask.xpm -share/gnome/xbill/cursors/hand_up.xpm -share/gnome/xbill/cursors/hand_up_mask.xpm -share/gnome/xbill/cursors/hurd.xpm -share/gnome/xbill/cursors/linux.xpm -share/gnome/xbill/cursors/mandrake.xpm -share/gnome/xbill/cursors/next.xpm -share/gnome/xbill/cursors/os2.xpm -share/gnome/xbill/cursors/redhat.xpm -share/gnome/xbill/cursors/sgi.xpm -share/gnome/xbill/cursors/slackware.xpm -share/gnome/xbill/cursors/sun.xpm -share/gnome/xbill/cursors/suse.xpm -share/gnome/xbill/cursors/turbolinux.xpm -share/gnome/xbill/pixmaps/about.xpm -share/gnome/xbill/pixmaps/apple.xpm -share/gnome/xbill/pixmaps/beos.xpm -share/gnome/xbill/pixmaps/billA_0.xpm -share/gnome/xbill/pixmaps/billA_1.xpm -share/gnome/xbill/pixmaps/billA_10.xpm -share/gnome/xbill/pixmaps/billA_11.xpm -share/gnome/xbill/pixmaps/billA_12.xpm -share/gnome/xbill/pixmaps/billA_2.xpm -share/gnome/xbill/pixmaps/billA_3.xpm -share/gnome/xbill/pixmaps/billA_4.xpm -share/gnome/xbill/pixmaps/billA_5.xpm -share/gnome/xbill/pixmaps/billA_6.xpm -share/gnome/xbill/pixmaps/billA_7.xpm -share/gnome/xbill/pixmaps/billA_8.xpm -share/gnome/xbill/pixmaps/billA_9.xpm -share/gnome/xbill/pixmaps/billD_0.xpm -share/gnome/xbill/pixmaps/billD_1.xpm -share/gnome/xbill/pixmaps/billD_2.xpm -share/gnome/xbill/pixmaps/billD_3.xpm -share/gnome/xbill/pixmaps/billD_4.xpm -share/gnome/xbill/pixmaps/billL_0.xpm -share/gnome/xbill/pixmaps/billL_1.xpm -share/gnome/xbill/pixmaps/billL_2.xpm -share/gnome/xbill/pixmaps/billR_0.xpm -share/gnome/xbill/pixmaps/billR_1.xpm -share/gnome/xbill/pixmaps/billR_2.xpm -share/gnome/xbill/pixmaps/bsd.xpm -share/gnome/xbill/pixmaps/bsdcpu.xpm -share/gnome/xbill/pixmaps/bucket.xpm -share/gnome/xbill/pixmaps/caldera.xpm -share/gnome/xbill/pixmaps/debian.xpm -share/gnome/xbill/pixmaps/hurd.xpm -share/gnome/xbill/pixmaps/icon.xpm -share/gnome/xbill/pixmaps/linux.xpm -share/gnome/xbill/pixmaps/logo.xpm -share/gnome/xbill/pixmaps/maccpu.xpm -share/gnome/xbill/pixmaps/mandrake.xpm -share/gnome/xbill/pixmaps/next.xpm -share/gnome/xbill/pixmaps/nextcpu.xpm -share/gnome/xbill/pixmaps/os2.xpm -share/gnome/xbill/pixmaps/os2cpu.xpm -share/gnome/xbill/pixmaps/redhat.xpm -share/gnome/xbill/pixmaps/sgi.xpm -share/gnome/xbill/pixmaps/sgicpu.xpm -share/gnome/xbill/pixmaps/slackware.xpm -share/gnome/xbill/pixmaps/spark_0.xpm -share/gnome/xbill/pixmaps/spark_1.xpm -share/gnome/xbill/pixmaps/sun.xpm -share/gnome/xbill/pixmaps/suncpu.xpm -share/gnome/xbill/pixmaps/suse.xpm -share/gnome/xbill/pixmaps/toaster.xpm -share/gnome/xbill/pixmaps/turbolinux.xpm -share/gnome/xbill/pixmaps/wingdows.xpm share/locale/am/LC_MESSAGES/gnome-games.mo share/locale/ar/LC_MESSAGES/gnome-games.mo +share/locale/az/LC_MESSAGES/gnome-games.mo share/locale/be/LC_MESSAGES/gnome-games.mo share/locale/bg/LC_MESSAGES/gnome-games.mo share/locale/bn/LC_MESSAGES/gnome-games.mo share/locale/ca/LC_MESSAGES/gnome-games.mo share/locale/cs/LC_MESSAGES/gnome-games.mo +share/locale/cy/LC_MESSAGES/gnome-games.mo share/locale/da/LC_MESSAGES/gnome-games.mo share/locale/de/LC_MESSAGES/gnome-games.mo share/locale/el/LC_MESSAGES/gnome-games.mo @@ -754,13 +717,16 @@ share/locale/fr/LC_MESSAGES/gnome-games.mo share/locale/ga/LC_MESSAGES/gnome-games.mo share/locale/gl/LC_MESSAGES/gnome-games.mo share/locale/he/LC_MESSAGES/gnome-games.mo +share/locale/hi/LC_MESSAGES/gnome-games.mo share/locale/hu/LC_MESSAGES/gnome-games.mo +share/locale/id/LC_MESSAGES/gnome-games.mo share/locale/it/LC_MESSAGES/gnome-games.mo share/locale/ja/LC_MESSAGES/gnome-games.mo share/locale/ko/LC_MESSAGES/gnome-games.mo share/locale/lt/LC_MESSAGES/gnome-games.mo share/locale/lv/LC_MESSAGES/gnome-games.mo share/locale/mk/LC_MESSAGES/gnome-games.mo +share/locale/ml/LC_MESSAGES/gnome-games.mo share/locale/mn/LC_MESSAGES/gnome-games.mo share/locale/ms/LC_MESSAGES/gnome-games.mo share/locale/nl/LC_MESSAGES/gnome-games.mo @@ -773,6 +739,8 @@ share/locale/ro/LC_MESSAGES/gnome-games.mo share/locale/ru/LC_MESSAGES/gnome-games.mo share/locale/sk/LC_MESSAGES/gnome-games.mo share/locale/sl/LC_MESSAGES/gnome-games.mo +share/locale/sr/LC_MESSAGES/gnome-games.mo +share/locale/sr@Latn/LC_MESSAGES/gnome-games.mo share/locale/sv/LC_MESSAGES/gnome-games.mo share/locale/tr/LC_MESSAGES/gnome-games.mo share/locale/uk/LC_MESSAGES/gnome-games.mo @@ -782,10 +750,10 @@ share/locale/zh_CN/LC_MESSAGES/gnome-games.mo share/locale/zh_TW/LC_MESSAGES/gnome-games.mo @dirrm share/gnome/sounds/gnome-stones @dirrm share/gnome/pixmaps/gnomine -@dirrm share/gnome/help/xbill/C/figures -@dirrm share/gnome/help/xbill/C -@dirrm share/gnome/help/xbill +@dirrm share/gnome/pixmaps/blackjack @dirrm share/gnome/help/same-gnome/C/figures +@dirrm share/gnome/help/gnotski/C/figures +@dirrm share/gnome/help/gnotski/C @dirrm share/gnome/help/gnotski @dirrm share/gnome/help/gnomine/C/figures @dirrm share/gnome/help/gnomine/C @@ -793,32 +761,69 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo @dirrm share/gnome/help/glines/C/figures @dirrm share/gnome/help/glines/C @dirrm share/gnome/help/glines +@dirrm share/gnome/blackjack @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/same-gnome @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mahjongg @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/iagno @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gtali +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnotravex +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-stones/preferences +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-stones +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnobots2/preferences +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnobots2 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomine/geometry @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomine @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnometris/options @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnometris +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm/3 +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm/2 +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm/1 +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm/0 +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnect +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/glines/saved +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/glines/preferences +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/glines @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gataxx -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/freecell/score -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/freecell/option -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/freecell +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/blackjack/settings +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/blackjack/global +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/blackjack/deck +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/blackjack +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/aisleriot @dirrm etc/gconf/gconf.xml.defaults/apps/same-gnome @dirrm etc/gconf/gconf.xml.defaults/apps/mahjongg @dirrm etc/gconf/gconf.xml.defaults/apps/iagno @dirrm etc/gconf/gconf.xml.defaults/apps/gtali +@dirrm etc/gconf/gconf.xml.defaults/apps/gnotravex @dirrm etc/gconf/gconf.xml.defaults/apps/gnomine/geometry @dirrm etc/gconf/gconf.xml.defaults/apps/gnomine @dirrm etc/gconf/gconf.xml.defaults/apps/gnometris/options @dirrm etc/gconf/gconf.xml.defaults/apps/gnometris +@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-stones/preferences +@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-stones +@dirrm etc/gconf/gconf.xml.defaults/apps/gnobots2/preferences +@dirrm etc/gconf/gconf.xml.defaults/apps/gnobots2 +@dirrm etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm/3 +@dirrm etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm/2 +@dirrm etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm/1 +@dirrm etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm/0 +@dirrm etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm +@dirrm etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences +@dirrm etc/gconf/gconf.xml.defaults/apps/gnibbles +@dirrm etc/gconf/gconf.xml.defaults/apps/glines/saved +@dirrm etc/gconf/gconf.xml.defaults/apps/glines/preferences +@dirrm etc/gconf/gconf.xml.defaults/apps/glines @dirrm etc/gconf/gconf.xml.defaults/apps/gnect -@dirrm etc/gconf/gconf.xml.defaults/apps/freecell/score -@dirrm etc/gconf/gconf.xml.defaults/apps/freecell/option -@dirrm etc/gconf/gconf.xml.defaults/apps/freecell +@dirrm etc/gconf/gconf.xml.defaults/apps/gataxx +@dirrm etc/gconf/gconf.xml.defaults/apps/blackjack/settings +@dirrm etc/gconf/gconf.xml.defaults/apps/blackjack/global +@dirrm etc/gconf/gconf.xml.defaults/apps/blackjack/deck +@dirrm etc/gconf/gconf.xml.defaults/apps/blackjack +@dirrm etc/gconf/gconf.xml.defaults/apps/aisleriot @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/aisleriot-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/blackjack-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gataxx-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/glines-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnect-C.omf 2>/dev/null || /usr/bin/true @@ -832,4 +837,3 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/iagno-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/mahjongg-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/same-gnome-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/xbill-C.omf 2>/dev/null || /usr/bin/true diff --git a/games/gnomegames2/Makefile b/games/gnomegames2/Makefile index 1e8550b7848a..879130a64981 100644 --- a/games/gnomegames2/Makefile +++ b/games/gnomegames2/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomegames2 -PORTVERSION= 2.2.1 -PORTREVISION= 3 +PORTVERSION= 2.4.0 CATEGORIES= games gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-games/2.2 +MASTER_SITE_SUBDIR= sources/gnome-games/2.4 DISTNAME= gnome-games-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -30,9 +29,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" post-patch: - @find ${WRKSRC} -name "*.[ch]" | xargs ${REINPLACE_CMD} -e \ + @${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \ 's|malloc\.h|stdlib.h|g' - @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ - 's|games\.games|games:games|g' .include <bsd.port.mk> diff --git a/games/gnomegames2/distinfo b/games/gnomegames2/distinfo index 97b59f44a41a..5038e683d94f 100644 --- a/games/gnomegames2/distinfo +++ b/games/gnomegames2/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-games-2.2.1.tar.bz2) = 15b47c5f3cba31aaadd21ea51af2833b +MD5 (gnome2/gnome-games-2.4.0.tar.bz2) = a1a2935642921e7defce3a0a5c54bdbd diff --git a/games/gnomegames2/files/patch-ab b/games/gnomegames2/files/patch-ab index 0075d0dd4b16..67cea1ce8155 100644 --- a/games/gnomegames2/files/patch-ab +++ b/games/gnomegames2/files/patch-ab @@ -1,24 +1,11 @@ ---- gnome-stones/objects/Makefile.in.orig Wed Aug 28 22:11:08 2002 -+++ gnome-stones/objects/Makefile.in Wed Aug 28 23:17:53 2002 -@@ -133,7 +133,7 @@ +--- gnome-stones/objects/Makefile.in.orig Sun Jun 15 20:28:06 2003 ++++ gnome-stones/objects/Makefile.in Sun Jun 15 20:28:06 2003 +@@ -136,7 +136,7 @@ GSTONES_SRC_DIR = $(srcdir)/../ -objectdir = $(libdir)/gnome-stones/objects +objectdir = $(datadir)/gnome-stones/objects - INCLUDES = -I$(GSTONES_SRC_DIR) $(GNOME_GAMES_CFLAGS) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -I$(includedir) -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED - -@@ -150,10 +150,10 @@ - - DEFS = @DEFS@ -I. -I$(srcdir) -I../.. - LIBS = @LIBS@ --libgnome_stones_la_LDFLAGS = -+libgnome_stones_la_LDFLAGS = -avoid-version - libgnome_stones_la_LIBADD = - libgnome_stones_la_OBJECTS = gnome-stones.lo --libgnomekoban_la_LDFLAGS = -+libgnomekoban_la_LDFLAGS = -avoid-version - libgnomekoban_la_LIBADD = - libgnomekoban_la_OBJECTS = gnomekoban.lo - COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + INCLUDES = \ + -I$(GSTONES_SRC_DIR) \ diff --git a/games/gnomegames2/files/patch-ac b/games/gnomegames2/files/patch-ac index 65e3bbe8c565..4f62486fb3b2 100644 --- a/games/gnomegames2/files/patch-ac +++ b/games/gnomegames2/files/patch-ac @@ -1,5 +1,5 @@ ---- freecell/gdk-card-image/Makefile.in.orig Wed May 8 16:32:35 2002 -+++ freecell/gdk-card-image/Makefile.in Wed May 8 16:32:41 2002 +--- gdk-card-image/Makefile.in.orig Wed May 8 16:32:35 2002 ++++ gdk-card-image/Makefile.in Wed May 8 16:32:41 2002 @@ -164,7 +164,7 @@ libgdkcardimage_la_SOURCES = gdk-card-image.c libgdkcardimageincludedir = $(includedir)/gdkcardimage diff --git a/games/gnomegames2/files/patch-ae b/games/gnomegames2/files/patch-ae deleted file mode 100644 index 397fca112a9b..000000000000 --- a/games/gnomegames2/files/patch-ae +++ /dev/null @@ -1,10 +0,0 @@ ---- aisleriot/menu.c.orig Wed May 8 16:33:36 2002 -+++ aisleriot/menu.c Wed May 8 16:33:47 2002 -@@ -18,6 +18,7 @@ - */ - - #include <config.h> -+#include <sys/types.h> - #include <dirent.h> - #include "gnome.h" - #include "sol.h" diff --git a/games/gnomegames2/files/patch-gnect_data_Makefile.in b/games/gnomegames2/files/patch-gnect_data_Makefile.in deleted file mode 100644 index 08a1f4d64147..000000000000 --- a/games/gnomegames2/files/patch-gnect_data_Makefile.in +++ /dev/null @@ -1,30 +0,0 @@ ---- gnect/data/Makefile.in.orig Sun May 25 13:52:25 2003 -+++ gnect/data/Makefile.in Sun May 25 13:56:14 2003 -@@ -300,7 +300,7 @@ - install-exec-am: - install-exec: install-exec-am - --install-data-am: install-GamesDATA install-schemaDATA \ -+install-data-am: install-GamesDATA install-schemaDATA install-data-local \ - install-soundlistDATA install-themeDATA \ - install-velenaDATA - install-data: install-data-am -@@ -351,7 +351,7 @@ - maintainer-clean: maintainer-clean-am - - .PHONY: uninstall-GamesDATA install-GamesDATA uninstall-schemaDATA \ --install-schemaDATA uninstall-soundlistDATA install-soundlistDATA \ -+install-schemaDATA install-data-local uninstall-soundlistDATA install-soundlistDATA \ - uninstall-themeDATA install-themeDATA uninstall-velenaDATA \ - install-velenaDATA tags distdir info-am info dvi-am dvi check check-am \ - installcheck-am installcheck install-exec-am install-exec \ -@@ -363,6 +363,9 @@ - @INTLTOOL_DESKTOP_RULE@ - @INTLTOOL_SCHEMAS_RULE@ - @INTLTOOL_SOUNDLIST_RULE@ -+ -+install-data-local: -+ -GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA) - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/games/gnomegames2/files/patch-gnect_src_prefs.c b/games/gnomegames2/files/patch-gnect_src_prefs.c deleted file mode 100644 index 2737e28846a7..000000000000 --- a/games/gnomegames2/files/patch-gnect_src_prefs.c +++ /dev/null @@ -1,51 +0,0 @@ ---- gnect/src/prefs.c.orig Sun May 25 14:21:05 2003 -+++ gnect/src/prefs.c Sun May 25 14:21:15 2003 -@@ -264,40 +264,6 @@ - - - --static void --sanity_check(void) --{ -- gchar *tileset; -- GError *error = NULL; -- -- tileset = gconf_client_get_string (gnect_gconf_client, -- "/apps/gnect/theme", &error); -- if (error) { -- GtkWidget *dialog; -- dialog = gtk_message_dialog_new (NULL, -- 0, -- GTK_MESSAGE_ERROR, -- GTK_BUTTONS_CLOSE, -- _("There was an error accessing GConf: %s"), -- error->message); -- gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); -- gtk_dialog_run(GTK_DIALOG(dialog)); -- exit(1); -- } else if (!tileset) { -- GtkWidget *dialog; -- dialog = gtk_message_dialog_new (NULL, -- 0, -- GTK_MESSAGE_ERROR, -- GTK_BUTTONS_CLOSE, -- _("The default configuration values could not be retrieved correctly. Please check your GConf configuration, specifically that the schemas are installed correctly")); -- gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); -- gtk_dialog_run(GTK_DIALOG(dialog)); -- exit(1); -- } else { -- g_free (tileset); -- } --} -- - void - prefs_init (gint argc, gchar **argv) - { -@@ -313,7 +279,6 @@ - - gconf_init (argc, argv, NULL); - gnect_gconf_client = gconf_client_get_default (); -- sanity_check(); - gconf_client_add_dir (gnect_gconf_client, "/apps/gnect", - GCONF_CLIENT_PRELOAD_NONE, NULL); - diff --git a/games/gnomegames2/files/patch-mahjongg_Makefile.in b/games/gnomegames2/files/patch-mahjongg_Makefile.in deleted file mode 100644 index 917c7420673a..000000000000 --- a/games/gnomegames2/files/patch-mahjongg_Makefile.in +++ /dev/null @@ -1,18 +0,0 @@ ---- mahjongg/Makefile.in.orig Sun Jan 19 14:54:47 2003 -+++ mahjongg/Makefile.in Sun Jan 19 14:56:21 2003 -@@ -593,9 +593,12 @@ - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA) - -$(mkinstalldirs) $(DESTDIR)$(scoredir) - $(mkinstalldirs) $(DESTDIR)$(bgdir) -- touch $(DESTDIR)$(scoredir)/mahjongg.{easy,difficult}.scores -- -chown games.games $(DESTDIR)$(scoredir)/mahjongg.{easy,difficult}.scores -- -chmod 664 $(DESTDIR)$(scoredir)/mahjongg.{easy,difficult}.scores -+ touch $(DESTDIR)$(scoredir)/mahjongg.easy.scores -+ touch $(DESTDIR)$(scoredir)/mahjongg.difficult.scores -+ -chown games:games $(DESTDIR)$(scoredir)/mahjongg.easy.scores -+ -chown games:games $(DESTDIR)$(scoredir)/mahjongg.difficult.scores -+ -chmod 664 $(DESTDIR)$(scoredir)/mahjongg.easy.scores -+ -chmod 664 $(DESTDIR)$(scoredir)/mahjongg.difficult.scores - -chgrp games $(DESTDIR)$(bindir)/mahjongg && chmod 2555 $(DESTDIR)$(bindir)/mahjongg - $(mkinstalldirs) $(DESTDIR)$(Gamesdir) - diff --git a/games/gnomegames2/pkg-install b/games/gnomegames2/pkg-install index c754797a5caf..039d300d69a5 100644 --- a/games/gnomegames2/pkg-install +++ b/games/gnomegames2/pkg-install @@ -4,17 +4,9 @@ if [ -n "${PACKAGE_BUILDING}" ]; then exit 0 fi -SCORES="glines.scores gnibbles.1.0.scores gnibbles.1.1.scores gnibbles.2.0.scores gnibbles.2.1.scores gnibbles.3.0.scores gnibbles.3.1.scores gnibbles.4.0.scores gnibbles.4.1.scores gnobots2.classic_robots-safe.scores gnobots2.classic_robots-super-safe.scores gnobots2.classic_robots.scores gnobots2.nightmare-safe.scores gnobots2.nightmare-super-safe.scores gnobots2.nightmare.scores gnobots2.robots2-safe.scores gnobots2.robots2-super-safe.scores gnobots2.robots2.scores gnobots2.robots2_easy-safe.scores gnobots2.robots2_easy-super-safe.scores gnobots2.robots2_easy.scores gnobots2.robots_with_safe_teleport-safe.scores gnobots2.robots_with_safe_teleport-super-safe.scores gnobots2.robots_with_safe_teleport.scores gnome-stones.scores gnome-xbill.scores gnometris.scores gnomine.Biiiig.scores gnomine.Custom.scores gnomine.Medium.scores gnomine.Tiny.scores gnotravex.2x2.scores gnotravex.3x3.scores gnotravex.4x4.scores gnotravex.5x5.scores gnotravex.6x6.scores gnotski.1.scores gnotski.11.scores gnotski.12.scores gnotski.13.scores gnotski.14.scores gnotski.15.scores gnotski.16.scores gnotski.17.scores gnotski.2.scores gnotski.21.scores gnotski.22.scores gnotski.23.scores gnotski.24.scores gnotski.25.scores gnotski.26.scores gnotski.3.scores gnotski.4.scores gnotski.5.scores gnotski.6.scores gnotski.7.scores gtali.scores iagno.b1.scores iagno.b2.scores iagno.b3.scores iagno.w1.scores iagno.w2.scores iagno.w3.scores mahjongg.difficult.scores mahjongg.easy.scores same-gnome.scores" - -if [ "$1" = "MAINTAINER" ]; then - for i in ${SCORES}; do - echo "@unexec [ -s %D/share/gnome/games/${i} ] || rm -f %D/share/gnome/games/${i}" - done - exit 0 -fi - if [ "$2" = "POST-INSTALL" ]; then mkdir -p ${PKG_PREFIX}/share/gnome/games + SCORES="glines.scores gnibbles.1.0.scores gnibbles.1.1.scores gnibbles.2.0.scores gnibbles.2.1.scores gnibbles.3.0.scores gnibbles.3.1.scores gnibbles.4.0.scores gnibbles.4.1.scores gnobots2.classic_robots-safe.scores gnobots2.classic_robots-super-safe.scores gnobots2.classic_robots.scores gnobots2.nightmare-safe.scores gnobots2.nightmare-super-safe.scores gnobots2.nightmare.scores gnobots2.robots2-safe.scores gnobots2.robots2-super-safe.scores gnobots2.robots2.scores gnobots2.robots2_easy-safe.scores gnobots2.robots2_easy-super-safe.scores gnobots2.robots2_easy.scores gnobots2.robots_with_safe_teleport-safe.scores gnobots2.robots_with_safe_teleport-super-safe.scores gnobots2.robots_with_safe_teleport.scores gnome-stones.scores gnometris.scores gnomine.Custom.scores gnomine.Large.scores gnomine.Medium.scores gnomine.Small.scores gnotravex.2x2.scores gnotravex.3x3.scores gnotravex.4x4.scores gnotravex.5x5.scores gnotravex.6x6.scores gnotski.1.scores gnotski.11.scores gnotski.12.scores gnotski.13.scores gnotski.14.scores gnotski.15.scores gnotski.16.scores gnotski.17.scores gnotski.2.scores gnotski.21.scores gnotski.22.scores gnotski.23.scores gnotski.24.scores gnotski.25.scores gnotski.26.scores gnotski.3.scores gnotski.4.scores gnotski.5.scores gnotski.6.scores gnotski.7.scores gtali.scores iagno.b1.scores iagno.b2.scores iagno.b3.scores iagno.w1.scores iagno.w2.scores iagno.w3.scores mahjongg.difficult.scores mahjongg.easy.scores same-gnome.scores" for i in ${SCORES}; do if [ ! -f ${PKG_PREFIX}/share/gnome/games/${i} ]; then touch -f ${PKG_PREFIX}/share/gnome/games/${i} diff --git a/games/gnomegames2/pkg-plist b/games/gnomegames2/pkg-plist index e7c02977d397..25d955dcdca8 100644 --- a/games/gnomegames2/pkg-plist +++ b/games/gnomegames2/pkg-plist @@ -1,12 +1,10 @@ -bin/ctali -bin/freecell +bin/blackjack bin/gataxx bin/glines bin/gnect bin/gnibbles bin/gnobots2 bin/gnome-stones -bin/gnome-xbill bin/gnometris bin/gnomine bin/gnotravex @@ -16,36 +14,77 @@ bin/iagno bin/mahjongg bin/same-gnome bin/sol -etc/gconf/gconf.xml.defaults/apps/freecell/%gconf.xml -etc/gconf/gconf.xml.defaults/apps/freecell/option/%gconf.xml -etc/gconf/gconf.xml.defaults/apps/freecell/score/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/aisleriot/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/blackjack/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/blackjack/deck/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/blackjack/global/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/blackjack/settings/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gataxx/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/glines/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/glines/preferences/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/glines/saved/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnect/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnibbles/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm/0/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm/1/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm/2/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm/3/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnobots2/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnobots2/preferences/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnome-stones/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnome-stones/preferences/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnometris/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnometris/options/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnomine/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnomine/geometry/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnotravex/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gtali/%gconf.xml etc/gconf/gconf.xml.defaults/apps/iagno/%gconf.xml etc/gconf/gconf.xml.defaults/apps/mahjongg/%gconf.xml etc/gconf/gconf.xml.defaults/apps/same-gnome/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/freecell/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/freecell/option/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/freecell/score/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/aisleriot/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/blackjack/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/blackjack/deck/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/blackjack/global/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/blackjack/settings/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gataxx/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/glines/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/glines/preferences/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/glines/saved/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnect/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm/0/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm/1/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm/2/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm/3/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnobots2/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnobots2/preferences/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnome-stones/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnome-stones/preferences/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnometris/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnometris/options/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnomine/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnomine/geometry/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnotravex/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gtali/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/iagno/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/mahjongg/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/same-gnome/%gconf.xml -etc/gconf/schemas/freecell.schemas +etc/gconf/schemas/aisleriot.schemas +etc/gconf/schemas/blackjack.schemas etc/gconf/schemas/gataxx.schemas +etc/gconf/schemas/glines.schemas etc/gconf/schemas/gnect.schemas +etc/gconf/schemas/gnibbles.schemas +etc/gconf/schemas/gnobots2.schemas +etc/gconf/schemas/gnome-stones.schemas etc/gconf/schemas/gnometris.schemas etc/gconf/schemas/gnomine.schemas +etc/gconf/schemas/gnotravex.schemas etc/gconf/schemas/gtali.schemas etc/gconf/schemas/iagno.schemas etc/gconf/schemas/mahjongg.schemas @@ -59,6 +98,7 @@ include/gdkcardimage/gdk-card-image.h lib/libgdkcardimage.a lib/libgdkcardimage.so lib/libgdkcardimage.so.1 +share/gnome/applications/blackjack.desktop share/gnome/applications/freecell.desktop share/gnome/applications/gataxx.desktop share/gnome/applications/glines.desktop @@ -75,7 +115,11 @@ share/gnome/applications/iagno.desktop share/gnome/applications/mahjongg.desktop share/gnome/applications/same-gnome.desktop share/gnome/applications/sol.desktop -share/gnome/applications/xbill.desktop +share/gnome/blackjack/Ameristar.rules +share/gnome/blackjack/Atlantic_City.rules +share/gnome/blackjack/Vegas_Downtown.rules +share/gnome/blackjack/Vegas_Strip.rules +share/gnome/blackjack/Vegas_Strip.rules.dat @unexec [ -s %D/share/gnome/games/glines.scores ] || rm -f %D/share/gnome/games/glines.scores @unexec [ -s %D/share/gnome/games/gnibbles.1.0.scores ] || rm -f %D/share/gnome/games/gnibbles.1.0.scores @unexec [ -s %D/share/gnome/games/gnibbles.1.1.scores ] || rm -f %D/share/gnome/games/gnibbles.1.1.scores @@ -101,12 +145,11 @@ share/gnome/applications/xbill.desktop @unexec [ -s %D/share/gnome/games/gnobots2.robots_with_safe_teleport-super-safe.scores ] || rm -f %D/share/gnome/games/gnobots2.robots_with_safe_teleport-super-safe.scores @unexec [ -s %D/share/gnome/games/gnobots2.robots_with_safe_teleport.scores ] || rm -f %D/share/gnome/games/gnobots2.robots_with_safe_teleport.scores @unexec [ -s %D/share/gnome/games/gnome-stones.scores ] || rm -f %D/share/gnome/games/gnome-stones.scores -@unexec [ -s %D/share/gnome/games/gnome-xbill.scores ] || rm -f %D/share/gnome/games/gnome-xbill.scores @unexec [ -s %D/share/gnome/games/gnometris.scores ] || rm -f %D/share/gnome/games/gnometris.scores -@unexec [ -s %D/share/gnome/games/gnomine.Biiiig.scores ] || rm -f %D/share/gnome/games/gnomine.Biiiig.scores @unexec [ -s %D/share/gnome/games/gnomine.Custom.scores ] || rm -f %D/share/gnome/games/gnomine.Custom.scores +@unexec [ -s %D/share/gnome/games/gnomine.Large.scores ] || rm -f %D/share/gnome/games/gnomine.Large.scores @unexec [ -s %D/share/gnome/games/gnomine.Medium.scores ] || rm -f %D/share/gnome/games/gnomine.Medium.scores -@unexec [ -s %D/share/gnome/games/gnomine.Tiny.scores ] || rm -f %D/share/gnome/games/gnomine.Tiny.scores +@unexec [ -s %D/share/gnome/games/gnomine.Small.scores ] || rm -f %D/share/gnome/games/gnomine.Small.scores @unexec [ -s %D/share/gnome/games/gnotravex.2x2.scores ] || rm -f %D/share/gnome/games/gnotravex.2x2.scores @unexec [ -s %D/share/gnome/games/gnotravex.3x3.scores ] || rm -f %D/share/gnome/games/gnotravex.3x3.scores @unexec [ -s %D/share/gnome/games/gnotravex.4x4.scores ] || rm -f %D/share/gnome/games/gnotravex.4x4.scores @@ -273,6 +316,10 @@ share/gnome/help/aisleriot/C/will_o_the_wisp.xml share/gnome/help/aisleriot/C/yield.xml share/gnome/help/aisleriot/C/yukon.xml share/gnome/help/aisleriot/C/zebra.xml +share/gnome/help/blackjack/C/blackjack.xml +share/gnome/help/blackjack/C/figures/blackjack_start_window.png +share/gnome/help/blackjack/C/figures/blackjack_win_window.png +share/gnome/help/blackjack/C/legal.xml share/gnome/help/gataxx/C/figures/gataxx-legalmoves.png share/gnome/help/gataxx/C/figures/gataxx-prefs.png share/gnome/help/gataxx/C/figures/gataxx-startgame.png @@ -343,13 +390,10 @@ share/gnome/help/iagno/C/figures/PLAYER.png share/gnome/help/iagno/C/figures/START.png share/gnome/help/iagno/C/iagno.xml share/gnome/help/iagno/C/legal.xml -share/gnome/help/mahjongg/C/figures/color.png -share/gnome/help/mahjongg/C/figures/confirm.png share/gnome/help/mahjongg/C/figures/mahjongg.png share/gnome/help/mahjongg/C/figures/no-match.png share/gnome/help/mahjongg/C/figures/no-move.png share/gnome/help/mahjongg/C/figures/preferences.png -share/gnome/help/mahjongg/C/figures/scores.png share/gnome/help/mahjongg/C/figures/seed.png share/gnome/help/mahjongg/C/figures/toolbar.png share/gnome/help/mahjongg/C/legal.xml @@ -358,32 +402,14 @@ share/gnome/help/same-gnome/C/figures/blink-sync.png share/gnome/help/same-gnome/C/figures/preferences.png share/gnome/help/same-gnome/C/figures/same-main-window.png share/gnome/help/same-gnome/C/figures/same-planets-fig.png -share/gnome/help/same-gnome/C/figures/score-dialog.png share/gnome/help/same-gnome/C/legal.xml share/gnome/help/same-gnome/C/same-gnome.xml -share/gnome/help/xbill/C/figures/bucket.png -share/gnome/help/xbill/C/figures/cable.png -share/gnome/help/xbill/C/figures/computer.png -share/gnome/help/xbill/C/figures/fakeseg.png -share/gnome/help/xbill/C/figures/fallenos.png -share/gnome/help/xbill/C/figures/infected.png -share/gnome/help/xbill/C/figures/mainwin.png -share/gnome/help/xbill/C/figures/microbill.png -share/gnome/help/xbill/C/figures/network.png -share/gnome/help/xbill/C/figures/remove.png -share/gnome/help/xbill/C/figures/removeos.png -share/gnome/help/xbill/C/figures/score.png -share/gnome/help/xbill/C/figures/scores.png -share/gnome/help/xbill/C/figures/spark.png -share/gnome/help/xbill/C/figures/splat.png -share/gnome/help/xbill/C/figures/startgame.png -share/gnome/help/xbill/C/figures/toasters.png -share/gnome/help/xbill/C/legal.xml -share/gnome/help/xbill/C/xbill.xml share/gnome/mime-info/gnome-stones.keys share/gnome/mime-info/gnome-stones.mime share/gnome/omf/gnome-games/aisleriot-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/aisleriot-C.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-games/blackjack-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/blackjack-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-games/gataxx-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gataxx-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-games/glines-C.omf @@ -410,20 +436,29 @@ share/gnome/omf/gnome-games/mahjongg-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/mahjongg-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-games/same-gnome-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/same-gnome-C.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-games/xbill-C.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/xbill-C.omf 2>/dev/null || /usr/bin/true +share/gnome/pixmaps/blackjack/baize.png +share/gnome/pixmaps/blackjack/blackjack-splash.png +share/gnome/pixmaps/blackjack/chip-1.png +share/gnome/pixmaps/blackjack/chip-100.png +share/gnome/pixmaps/blackjack/chip-25.png +share/gnome/pixmaps/blackjack/chip-5.png +share/gnome/pixmaps/cards/backs/antique-red.png share/gnome/pixmaps/cards/backs/beige.png +share/gnome/pixmaps/cards/backs/dondorf-flower.png share/gnome/pixmaps/cards/backs/face.png share/gnome/pixmaps/cards/backs/grey.png share/gnome/pixmaps/cards/backs/rods.png +share/gnome/pixmaps/cards/backs/tux.png share/gnome/pixmaps/cards/baize.png share/gnome/pixmaps/cards/honors/bonded.png +share/gnome/pixmaps/cards/honors/dondorf.png share/gnome/pixmaps/cards/honors/xpat.png share/gnome/pixmaps/cards/jokers/gnome.png share/gnome/pixmaps/cards/ranks/bold-09x14.png share/gnome/pixmaps/cards/ranks/fine-07x12.png share/gnome/pixmaps/cards/slots/hand.png share/gnome/pixmaps/cards/slots/plain.png +share/gnome/pixmaps/cards/slots/white-outline.png share/gnome/pixmaps/cards/splash.png share/gnome/pixmaps/cards/suits_large/knuth-09x10.png share/gnome/pixmaps/cards/suits_large/knuth-15x19.png @@ -444,22 +479,12 @@ share/gnome/pixmaps/cards/suits_small/knuth-09x10.png share/gnome/pixmaps/cards/suits_small/xpat-11x11.png share/gnome/pixmaps/cards/suits_small/xpat-15x15.png share/gnome/pixmaps/gataxx.png -share/gnome/pixmaps/gataxx/blend.png -share/gnome/pixmaps/gataxx/classic.png -share/gnome/pixmaps/gataxx/flipblend.png -share/gnome/pixmaps/gataxx/metal.png -share/gnome/pixmaps/gataxx/metal2.png -share/gnome/pixmaps/gataxx/shrink.png -share/gnome/pixmaps/gataxx/sunmoon.png -share/gnome/pixmaps/gataxx/woodtrim.png share/gnome/pixmaps/glines.png share/gnome/pixmaps/glines/ball.png -share/gnome/pixmaps/glines/black.xpm share/gnome/pixmaps/glines/classic.png share/gnome/pixmaps/glines/dots.png -share/gnome/pixmaps/glines/gray.xpm +share/gnome/pixmaps/glines/gumball.png share/gnome/pixmaps/glines/pulse.png -share/gnome/pixmaps/glines/woody.xpm share/gnome/pixmaps/gnect-icon.png share/gnome/pixmaps/gnect/bg_grotty.jpg share/gnome/pixmaps/gnect/bg_nightfall.jpg @@ -487,7 +512,18 @@ share/gnome/pixmaps/gnobots2/splat.png share/gnome/pixmaps/gnobots2/windows.png share/gnome/pixmaps/gnobots2/yahoo.png share/gnome/pixmaps/gnome-aisleriot.png +share/gnome/pixmaps/gnome-blackjack.png +share/gnome/pixmaps/gnome-cardgame.png +share/gnome/pixmaps/gnome-die1.png +share/gnome/pixmaps/gnome-die2.png +share/gnome/pixmaps/gnome-die3.png +share/gnome/pixmaps/gnome-die4.png +share/gnome/pixmaps/gnome-die5.png +share/gnome/pixmaps/gnome-die6.png share/gnome/pixmaps/gnome-gnobots2.png +share/gnome/pixmaps/gnome-gnomine.png +share/gnome/pixmaps/gnome-gnotravex.png +share/gnome/pixmaps/gnome-gsame.png share/gnome/pixmaps/gnome-gtali.png share/gnome/pixmaps/gnome-gtetris.png share/gnome/pixmaps/gnome-mahjongg.png @@ -509,9 +545,8 @@ share/gnome/pixmaps/gnome-stones/explosion.png share/gnome/pixmaps/gnome-stones/firefly.png share/gnome/pixmaps/gnome-stones/frame.png share/gnome/pixmaps/gnome-stones/gnome.png -share/gnome/pixmaps/gnome-stones/title.png +share/gnome/pixmaps/gnome-stones/title-tile.png share/gnome/pixmaps/gnome-stones/wall.png -share/gnome/pixmaps/gnome-xbill.png share/gnome/pixmaps/gnometris/5blocks-tig.png share/gnome/pixmaps/gnometris/5blocks-tim.png share/gnome/pixmaps/gnometris/5blocks.png @@ -519,27 +554,28 @@ share/gnome/pixmaps/gnometris/7blocks-tig.png share/gnome/pixmaps/gnometris/7blocks.png share/gnome/pixmaps/gnometris/7stones-gn.png share/gnome/pixmaps/gnometris/7stones2-gn.png -share/gnome/pixmaps/gnometris/bg/dog-bg.png -share/gnome/pixmaps/gnometris/bg/fishy-bg.png -share/gnome/pixmaps/gnometris/bg/geschier-bg.png -share/gnome/pixmaps/gnometris/bg/gitter-bg.png -share/gnome/pixmaps/gnometris/bg/gnometris-bg.png -share/gnome/pixmaps/gnometris/bg/greyprint-bg.png -share/gnome/pixmaps/gnometris/bg/leaves-bg.png -share/gnome/pixmaps/gnometris/bg/rhinoceros-bg.png -share/gnome/pixmaps/gnometris/bg/scrcow-bg.png -share/gnome/pixmaps/gnometris/bg/sweet-bg.png -share/gnome/pixmaps/gnometris/bg/trees-bg.png -share/gnome/pixmaps/gnometris/bg/vortex-bg.png -share/gnome/pixmaps/gnometris/bg/watery-bg.png -share/gnome/pixmaps/gnometris/bg/weirdo-bg.png +share/gnome/pixmaps/gnometris/bg/dog-bg.jpg +share/gnome/pixmaps/gnometris/bg/fishy-bg.jpg +share/gnome/pixmaps/gnometris/bg/geschier-bg.jpg +share/gnome/pixmaps/gnometris/bg/gitter-bg.jpg +share/gnome/pixmaps/gnometris/bg/gnometris-bg.jpg +share/gnome/pixmaps/gnometris/bg/greyprint-bg.jpg +share/gnome/pixmaps/gnometris/bg/leaves-bg.jpg +share/gnome/pixmaps/gnometris/bg/rhinoceros-bg.jpg +share/gnome/pixmaps/gnometris/bg/scrcow-bg.jpg +share/gnome/pixmaps/gnometris/bg/sweet-bg.jpg +share/gnome/pixmaps/gnometris/bg/trees-bg.jpg +share/gnome/pixmaps/gnometris/bg/vortex-bg.jpg +share/gnome/pixmaps/gnometris/bg/watery-bg.jpg +share/gnome/pixmaps/gnometris/bg/weirdo-bg.jpg share/gnome/pixmaps/gnomine/face-cool.xpm share/gnome/pixmaps/gnomine/face-sad.xpm share/gnome/pixmaps/gnomine/face-smile.xpm share/gnome/pixmaps/gnomine/face-win.xpm share/gnome/pixmaps/gnomine/face-worried.xpm -share/gnome/pixmaps/gnotravex/gnome-gnotravex.png -share/gnome/pixmaps/gnotravex/gnotravex.png +share/gnome/pixmaps/gnomine/flag-question.png +share/gnome/pixmaps/gnomine/flag.png +share/gnome/pixmaps/gnomine/mine.png share/gnome/pixmaps/gnotski-icon.png share/gnome/pixmaps/gnotski.png share/gnome/pixmaps/iagno.png @@ -659,88 +695,15 @@ share/gnome/sounds/gnome-stones/get_diamond.wav share/gnome/sounds/gnome-stones/title.wav share/gnome/sounds/iagno/flip-piece.wav share/gnome/sounds/iagno/gameover.wav -share/gnome/xbill/cursors/apple.xpm -share/gnome/xbill/cursors/beos.xpm -share/gnome/xbill/cursors/bsd.xpm -share/gnome/xbill/cursors/bucket.xpm -share/gnome/xbill/cursors/caldera.xpm -share/gnome/xbill/cursors/debian.xpm -share/gnome/xbill/cursors/hand_down.xpm -share/gnome/xbill/cursors/hand_down_mask.xpm -share/gnome/xbill/cursors/hand_up.xpm -share/gnome/xbill/cursors/hand_up_mask.xpm -share/gnome/xbill/cursors/hurd.xpm -share/gnome/xbill/cursors/linux.xpm -share/gnome/xbill/cursors/mandrake.xpm -share/gnome/xbill/cursors/next.xpm -share/gnome/xbill/cursors/os2.xpm -share/gnome/xbill/cursors/redhat.xpm -share/gnome/xbill/cursors/sgi.xpm -share/gnome/xbill/cursors/slackware.xpm -share/gnome/xbill/cursors/sun.xpm -share/gnome/xbill/cursors/suse.xpm -share/gnome/xbill/cursors/turbolinux.xpm -share/gnome/xbill/pixmaps/about.xpm -share/gnome/xbill/pixmaps/apple.xpm -share/gnome/xbill/pixmaps/beos.xpm -share/gnome/xbill/pixmaps/billA_0.xpm -share/gnome/xbill/pixmaps/billA_1.xpm -share/gnome/xbill/pixmaps/billA_10.xpm -share/gnome/xbill/pixmaps/billA_11.xpm -share/gnome/xbill/pixmaps/billA_12.xpm -share/gnome/xbill/pixmaps/billA_2.xpm -share/gnome/xbill/pixmaps/billA_3.xpm -share/gnome/xbill/pixmaps/billA_4.xpm -share/gnome/xbill/pixmaps/billA_5.xpm -share/gnome/xbill/pixmaps/billA_6.xpm -share/gnome/xbill/pixmaps/billA_7.xpm -share/gnome/xbill/pixmaps/billA_8.xpm -share/gnome/xbill/pixmaps/billA_9.xpm -share/gnome/xbill/pixmaps/billD_0.xpm -share/gnome/xbill/pixmaps/billD_1.xpm -share/gnome/xbill/pixmaps/billD_2.xpm -share/gnome/xbill/pixmaps/billD_3.xpm -share/gnome/xbill/pixmaps/billD_4.xpm -share/gnome/xbill/pixmaps/billL_0.xpm -share/gnome/xbill/pixmaps/billL_1.xpm -share/gnome/xbill/pixmaps/billL_2.xpm -share/gnome/xbill/pixmaps/billR_0.xpm -share/gnome/xbill/pixmaps/billR_1.xpm -share/gnome/xbill/pixmaps/billR_2.xpm -share/gnome/xbill/pixmaps/bsd.xpm -share/gnome/xbill/pixmaps/bsdcpu.xpm -share/gnome/xbill/pixmaps/bucket.xpm -share/gnome/xbill/pixmaps/caldera.xpm -share/gnome/xbill/pixmaps/debian.xpm -share/gnome/xbill/pixmaps/hurd.xpm -share/gnome/xbill/pixmaps/icon.xpm -share/gnome/xbill/pixmaps/linux.xpm -share/gnome/xbill/pixmaps/logo.xpm -share/gnome/xbill/pixmaps/maccpu.xpm -share/gnome/xbill/pixmaps/mandrake.xpm -share/gnome/xbill/pixmaps/next.xpm -share/gnome/xbill/pixmaps/nextcpu.xpm -share/gnome/xbill/pixmaps/os2.xpm -share/gnome/xbill/pixmaps/os2cpu.xpm -share/gnome/xbill/pixmaps/redhat.xpm -share/gnome/xbill/pixmaps/sgi.xpm -share/gnome/xbill/pixmaps/sgicpu.xpm -share/gnome/xbill/pixmaps/slackware.xpm -share/gnome/xbill/pixmaps/spark_0.xpm -share/gnome/xbill/pixmaps/spark_1.xpm -share/gnome/xbill/pixmaps/sun.xpm -share/gnome/xbill/pixmaps/suncpu.xpm -share/gnome/xbill/pixmaps/suse.xpm -share/gnome/xbill/pixmaps/toaster.xpm -share/gnome/xbill/pixmaps/turbolinux.xpm -share/gnome/xbill/pixmaps/wingdows.xpm share/locale/am/LC_MESSAGES/gnome-games.mo share/locale/ar/LC_MESSAGES/gnome-games.mo +share/locale/az/LC_MESSAGES/gnome-games.mo share/locale/be/LC_MESSAGES/gnome-games.mo share/locale/bg/LC_MESSAGES/gnome-games.mo share/locale/bn/LC_MESSAGES/gnome-games.mo share/locale/ca/LC_MESSAGES/gnome-games.mo share/locale/cs/LC_MESSAGES/gnome-games.mo +share/locale/cy/LC_MESSAGES/gnome-games.mo share/locale/da/LC_MESSAGES/gnome-games.mo share/locale/de/LC_MESSAGES/gnome-games.mo share/locale/el/LC_MESSAGES/gnome-games.mo @@ -754,13 +717,16 @@ share/locale/fr/LC_MESSAGES/gnome-games.mo share/locale/ga/LC_MESSAGES/gnome-games.mo share/locale/gl/LC_MESSAGES/gnome-games.mo share/locale/he/LC_MESSAGES/gnome-games.mo +share/locale/hi/LC_MESSAGES/gnome-games.mo share/locale/hu/LC_MESSAGES/gnome-games.mo +share/locale/id/LC_MESSAGES/gnome-games.mo share/locale/it/LC_MESSAGES/gnome-games.mo share/locale/ja/LC_MESSAGES/gnome-games.mo share/locale/ko/LC_MESSAGES/gnome-games.mo share/locale/lt/LC_MESSAGES/gnome-games.mo share/locale/lv/LC_MESSAGES/gnome-games.mo share/locale/mk/LC_MESSAGES/gnome-games.mo +share/locale/ml/LC_MESSAGES/gnome-games.mo share/locale/mn/LC_MESSAGES/gnome-games.mo share/locale/ms/LC_MESSAGES/gnome-games.mo share/locale/nl/LC_MESSAGES/gnome-games.mo @@ -773,6 +739,8 @@ share/locale/ro/LC_MESSAGES/gnome-games.mo share/locale/ru/LC_MESSAGES/gnome-games.mo share/locale/sk/LC_MESSAGES/gnome-games.mo share/locale/sl/LC_MESSAGES/gnome-games.mo +share/locale/sr/LC_MESSAGES/gnome-games.mo +share/locale/sr@Latn/LC_MESSAGES/gnome-games.mo share/locale/sv/LC_MESSAGES/gnome-games.mo share/locale/tr/LC_MESSAGES/gnome-games.mo share/locale/uk/LC_MESSAGES/gnome-games.mo @@ -782,10 +750,10 @@ share/locale/zh_CN/LC_MESSAGES/gnome-games.mo share/locale/zh_TW/LC_MESSAGES/gnome-games.mo @dirrm share/gnome/sounds/gnome-stones @dirrm share/gnome/pixmaps/gnomine -@dirrm share/gnome/help/xbill/C/figures -@dirrm share/gnome/help/xbill/C -@dirrm share/gnome/help/xbill +@dirrm share/gnome/pixmaps/blackjack @dirrm share/gnome/help/same-gnome/C/figures +@dirrm share/gnome/help/gnotski/C/figures +@dirrm share/gnome/help/gnotski/C @dirrm share/gnome/help/gnotski @dirrm share/gnome/help/gnomine/C/figures @dirrm share/gnome/help/gnomine/C @@ -793,32 +761,69 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo @dirrm share/gnome/help/glines/C/figures @dirrm share/gnome/help/glines/C @dirrm share/gnome/help/glines +@dirrm share/gnome/blackjack @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/same-gnome @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mahjongg @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/iagno @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gtali +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnotravex +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-stones/preferences +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-stones +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnobots2/preferences +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnobots2 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomine/geometry @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomine @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnometris/options @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnometris +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm/3 +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm/2 +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm/1 +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm/0 +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnect +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/glines/saved +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/glines/preferences +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/glines @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gataxx -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/freecell/score -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/freecell/option -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/freecell +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/blackjack/settings +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/blackjack/global +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/blackjack/deck +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/blackjack +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/aisleriot @dirrm etc/gconf/gconf.xml.defaults/apps/same-gnome @dirrm etc/gconf/gconf.xml.defaults/apps/mahjongg @dirrm etc/gconf/gconf.xml.defaults/apps/iagno @dirrm etc/gconf/gconf.xml.defaults/apps/gtali +@dirrm etc/gconf/gconf.xml.defaults/apps/gnotravex @dirrm etc/gconf/gconf.xml.defaults/apps/gnomine/geometry @dirrm etc/gconf/gconf.xml.defaults/apps/gnomine @dirrm etc/gconf/gconf.xml.defaults/apps/gnometris/options @dirrm etc/gconf/gconf.xml.defaults/apps/gnometris +@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-stones/preferences +@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-stones +@dirrm etc/gconf/gconf.xml.defaults/apps/gnobots2/preferences +@dirrm etc/gconf/gconf.xml.defaults/apps/gnobots2 +@dirrm etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm/3 +@dirrm etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm/2 +@dirrm etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm/1 +@dirrm etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm/0 +@dirrm etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm +@dirrm etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences +@dirrm etc/gconf/gconf.xml.defaults/apps/gnibbles +@dirrm etc/gconf/gconf.xml.defaults/apps/glines/saved +@dirrm etc/gconf/gconf.xml.defaults/apps/glines/preferences +@dirrm etc/gconf/gconf.xml.defaults/apps/glines @dirrm etc/gconf/gconf.xml.defaults/apps/gnect -@dirrm etc/gconf/gconf.xml.defaults/apps/freecell/score -@dirrm etc/gconf/gconf.xml.defaults/apps/freecell/option -@dirrm etc/gconf/gconf.xml.defaults/apps/freecell +@dirrm etc/gconf/gconf.xml.defaults/apps/gataxx +@dirrm etc/gconf/gconf.xml.defaults/apps/blackjack/settings +@dirrm etc/gconf/gconf.xml.defaults/apps/blackjack/global +@dirrm etc/gconf/gconf.xml.defaults/apps/blackjack/deck +@dirrm etc/gconf/gconf.xml.defaults/apps/blackjack +@dirrm etc/gconf/gconf.xml.defaults/apps/aisleriot @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/aisleriot-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/blackjack-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gataxx-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/glines-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnect-C.omf 2>/dev/null || /usr/bin/true @@ -832,4 +837,3 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/iagno-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/mahjongg-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/same-gnome-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/xbill-C.omf 2>/dev/null || /usr/bin/true diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile index 42b8c0b10844..b65209bd9313 100644 --- a/graphics/eog2/Makefile +++ b/graphics/eog2/Makefile @@ -6,10 +6,10 @@ # PORTNAME= eog2 -PORTVERSION= 2.2.1 +PORTVERSION= 2.4.0 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.2 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.4 DISTNAME= eog-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -19,11 +19,16 @@ COMMENT= The Eye Of Gnome image viewer USE_BZIP2= yes USE_GMAKE= yes USE_REINPLACE= yes -USE_GNOME= gnomeprefix gnomehack gnomehier libgnomeui libgnomeprintui \ - librsvg2 +USE_GNOME= gnomeprefix gnomehack gnomehier eel2 libgnomeprintui librsvg2 USE_X_PREFIX= yes USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" + LDFLAGS="-L${LOCALBASE}/lib" + +.include <bsd.port.pre.mk> -.include <bsd.port.mk> +.if defined(WITH_EXIF) || exists(${LOCALBASE}/lib/libexif.so.8) +LIB_DEPENDS+= exif.8:${PORTSDIR}/graphics/libexif +.endif + +.include <bsd.port.post.mk> diff --git a/graphics/eog2/distinfo b/graphics/eog2/distinfo index 8c032b7a1ffa..edbb82d0720b 100644 --- a/graphics/eog2/distinfo +++ b/graphics/eog2/distinfo @@ -1 +1 @@ -MD5 (gnome2/eog-2.2.1.tar.bz2) = 6251a7d4a6484187e9236a3f20b6d719 +MD5 (gnome2/eog-2.4.0.tar.bz2) = daebc6c3dbce24e72141437568a2618d diff --git a/graphics/eog2/pkg-plist b/graphics/eog2/pkg-plist index be4fc01eaba7..e24c07bd172e 100644 --- a/graphics/eog2/pkg-plist +++ b/graphics/eog2/pkg-plist @@ -1,38 +1,90 @@ bin/eog etc/gconf/gconf.xml.defaults/apps/eog/%gconf.xml -etc/gconf/gconf.xml.defaults/apps/eog/full_screen/%gconf.xml etc/gconf/gconf.xml.defaults/apps/eog/view/%gconf.xml etc/gconf/gconf.xml.defaults/apps/eog/window/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/eog/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/eog/full_screen/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/eog/view/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/eog/window/%gconf.xml etc/gconf/schemas/eog.schemas libdata/bonobo/servers/GNOME_EOG.server +libdata/bonobo/servers/GNOME_EOG_Collection.server +libexec/eog-collection-view libexec/eog-image-viewer share/gnome/applications/eog.desktop share/gnome/eog/glade/eog.glade +share/gnome/eog/gpi-dialog.glade +share/gnome/gnome-2.0/ui/eog-collection-view-ui.xml share/gnome/gnome-2.0/ui/eog-image-view-ctrl-ui.xml share/gnome/gnome-2.0/ui/eog-image-view-ui.xml share/gnome/gnome-2.0/ui/eog-shell-ui.xml share/gnome/help/eog/C/eog.xml share/gnome/help/eog/C/figures/eog_start_window.png share/gnome/help/eog/C/legal.xml +share/gnome/help/eog/de/eog.xml +share/gnome/help/eog/de/figures/eog_start_window.png +share/gnome/help/eog/de/legal.xml +share/gnome/help/eog/es/eog.xml +share/gnome/help/eog/es/figures/eog_start_window.png +share/gnome/help/eog/es/legal.xml +share/gnome/help/eog/fr/eog.xml +share/gnome/help/eog/fr/figures/eog_start_window.png +share/gnome/help/eog/fr/legal.xml +share/gnome/help/eog/it/eog.xml +share/gnome/help/eog/it/figures/eog_start_window.png +share/gnome/help/eog/it/legal.xml +share/gnome/help/eog/ja/eog.xml +share/gnome/help/eog/ja/figures/eog_start_window.png +share/gnome/help/eog/ja/legal.xml +share/gnome/help/eog/ko/eog.xml +share/gnome/help/eog/ko/figures/eog_start_window.png +share/gnome/help/eog/ko/legal.xml +share/gnome/help/eog/sv/eog.xml +share/gnome/help/eog/sv/figures/eog_start_window.png +share/gnome/help/eog/sv/legal.xml +share/gnome/help/eog/zh_CN/eog.xml +share/gnome/help/eog/zh_CN/figures/eog_start_window.png +share/gnome/help/eog/zh_CN/legal.xml +share/gnome/help/eog/zh_TW/eog.xml +share/gnome/help/eog/zh_TW/figures/eog_start_window.png +share/gnome/help/eog/zh_TW/legal.xml share/gnome/idl/Eog.idl share/gnome/omf/eog/eog-C.omf -@exec scrollkeeper-install %D/share/gnome/omf/eog/eog-C.omf 2>/dev/null || /usr/bin/true +@exec scrollkeeper-install -q %D/share/gnome/omf/eog/eog-C.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/eog/eog-de.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/eog/eog-de.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/eog/eog-es.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/eog/eog-es.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/eog/eog-fr.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/eog/eog-fr.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/eog/eog-it.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/eog/eog-it.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/eog/eog-ja.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/eog/eog-ja.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/eog/eog-ko.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/eog/eog-ko.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/eog/eog-sv.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/eog/eog-sv.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/eog/eog-zh_CN.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/eog/eog-zh_CN.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/eog/eog-zh_TW.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/eog/eog-zh_TW.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/eog/down-right.png share/gnome/pixmaps/eog/orient-horizontal.png share/gnome/pixmaps/eog/orient-vertical.png share/gnome/pixmaps/eog/right-down.png +share/gnome/pixmaps/eog/stock-rotate-90-16.png +share/gnome/pixmaps/eog/stock-rotate-270-16.png +share/gnome/pixmaps/eog/stock-rotate-180-16.png share/gnome/pixmaps/gnome-eog.png share/locale/am/LC_MESSAGES/eog.mo share/locale/ar/LC_MESSAGES/eog.mo share/locale/az/LC_MESSAGES/eog.mo share/locale/be/LC_MESSAGES/eog.mo share/locale/bg/LC_MESSAGES/eog.mo +share/locale/bn/LC_MESSAGES/eog.mo share/locale/ca/LC_MESSAGES/eog.mo share/locale/cs/LC_MESSAGES/eog.mo +share/locale/cy/LC_MESSAGES/eog.mo share/locale/da/LC_MESSAGES/eog.mo share/locale/de/LC_MESSAGES/eog.mo share/locale/el/LC_MESSAGES/eog.mo @@ -44,8 +96,10 @@ share/locale/fr/LC_MESSAGES/eog.mo share/locale/ga/LC_MESSAGES/eog.mo share/locale/gl/LC_MESSAGES/eog.mo share/locale/he/LC_MESSAGES/eog.mo +share/locale/hi/LC_MESSAGES/eog.mo share/locale/hu/LC_MESSAGES/eog.mo share/locale/id/LC_MESSAGES/eog.mo +share/locale/is/LC_MESSAGES/eog.mo share/locale/it/LC_MESSAGES/eog.mo share/locale/ja/LC_MESSAGES/eog.mo share/locale/kn/LC_MESSAGES/eog.mo @@ -53,6 +107,7 @@ share/locale/ko/LC_MESSAGES/eog.mo share/locale/lt/LC_MESSAGES/eog.mo share/locale/lv/LC_MESSAGES/eog.mo share/locale/mk/LC_MESSAGES/eog.mo +share/locale/ml/LC_MESSAGES/eog.mo share/locale/mn/LC_MESSAGES/eog.mo share/locale/ms/LC_MESSAGES/eog.mo share/locale/nl/LC_MESSAGES/eog.mo @@ -66,8 +121,11 @@ share/locale/ru/LC_MESSAGES/eog.mo share/locale/sk/LC_MESSAGES/eog.mo share/locale/sl/LC_MESSAGES/eog.mo share/locale/sq/LC_MESSAGES/eog.mo +share/locale/sr/LC_MESSAGES/eog.mo +share/locale/sr@Latn/LC_MESSAGES/eog.mo share/locale/sv/LC_MESSAGES/eog.mo share/locale/ta/LC_MESSAGES/eog.mo +share/locale/th/LC_MESSAGES/eog.mo share/locale/tr/LC_MESSAGES/eog.mo share/locale/uk/LC_MESSAGES/eog.mo share/locale/vi/LC_MESSAGES/eog.mo @@ -75,7 +133,40 @@ share/locale/wa/LC_MESSAGES/eog.mo share/locale/zh_CN/LC_MESSAGES/eog.mo share/locale/zh_TW/LC_MESSAGES/eog.mo @dirrm share/gnome/omf/eog +@dirrm share/gnome/help/eog/zh_TW/figures +@dirrm share/gnome/help/eog/zh_TW +@dirrm share/gnome/help/eog/zh_CN/figures +@dirrm share/gnome/help/eog/zh_CN +@dirrm share/gnome/help/eog/sv/figures +@dirrm share/gnome/help/eog/sv +@dirrm share/gnome/help/eog/ko/figures +@dirrm share/gnome/help/eog/ko +@dirrm share/gnome/help/eog/ja/figures +@dirrm share/gnome/help/eog/ja +@dirrm share/gnome/help/eog/it/figures +@dirrm share/gnome/help/eog/it +@dirrm share/gnome/help/eog/fr/figures +@dirrm share/gnome/help/eog/fr +@dirrm share/gnome/help/eog/es/figures +@dirrm share/gnome/help/eog/es +@dirrm share/gnome/help/eog/de/figures +@dirrm share/gnome/help/eog/de @dirrm share/gnome/help/eog/C/figures @dirrm share/gnome/eog/glade @dirrm share/gnome/eog -@unexec scrollkeeper-uninstall %D/share/gnome/omf/eog/eog-C.omf 2>/dev/null || /usr/bin/true +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/eog/window +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/eog/view +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/eog +@dirrm etc/gconf/gconf.xml.defaults/apps/eog/window +@dirrm etc/gconf/gconf.xml.defaults/apps/eog/view +@dirrm etc/gconf/gconf.xml.defaults/apps/eog +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-de.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-es.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-fr.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-it.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-ja.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-ko.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-sv.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-zh_CN.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-zh_TW.omf 2>/dev/null || /usr/bin/true diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile index d75f3f70b62f..8f26ad958d92 100644 --- a/graphics/libgnomecanvas/Makefile +++ b/graphics/libgnomecanvas/Makefile @@ -6,10 +6,10 @@ # PORTNAME= libgnomecanvas -PORTVERSION= 2.2.1 +PORTVERSION= 2.4.0 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.4 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -21,6 +21,7 @@ USE_X_PREFIX= yes USE_REINPLACE= yes INSTALLS_SHLIB= yes USE_LIBTOOL= yes +USE_GNOMENG= yes USE_GNOME= gnomehack libglade2 libartlgpl2 CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc diff --git a/graphics/libgnomecanvas/distinfo b/graphics/libgnomecanvas/distinfo index 9ed901d768ba..49e6d07fec03 100644 --- a/graphics/libgnomecanvas/distinfo +++ b/graphics/libgnomecanvas/distinfo @@ -1 +1 @@ -MD5 (gnome2/libgnomecanvas-2.2.1.tar.bz2) = 4023de1258dfdfe0d7b26db05b528edd +MD5 (gnome2/libgnomecanvas-2.4.0.tar.bz2) = c212a7cac06b7f9e68ed2de38df6e54d diff --git a/graphics/libgnomecanvas/pkg-plist b/graphics/libgnomecanvas/pkg-plist index 8af32e2d5fd6..a20514a4aaa6 100644 --- a/graphics/libgnomecanvas/pkg-plist +++ b/graphics/libgnomecanvas/pkg-plist @@ -15,10 +15,12 @@ include/libgnomecanvas-2.0/libgnomecanvas/libgnomecanvas.h lib/libglade/2.0/libcanvas.so lib/libgnomecanvas-2.a lib/libgnomecanvas-2.so -lib/libgnomecanvas-2.so.200 +lib/libgnomecanvas-2.so.400 libdata/pkgconfig/libgnomecanvas-2.0.pc share/doc/libgnomecanvas/c35.html share/doc/libgnomecanvas/c4.html +share/doc/libgnomecanvas/index.html +share/doc/libgnomecanvas/index.sgml share/doc/libgnomecanvas/gnomecanvas.html share/doc/libgnomecanvas/gnomecanvasbpath.html share/doc/libgnomecanvas/gnomecanvasclipgroup.html @@ -34,40 +36,26 @@ share/doc/libgnomecanvas/gnomecanvasrichtext.html share/doc/libgnomecanvas/gnomecanvasshape.html share/doc/libgnomecanvas/gnomecanvastext.html share/doc/libgnomecanvas/gnomecanvaswidget.html -share/doc/libgnomecanvas/index.html -share/doc/libgnomecanvas/index.sgml -share/doc/libgnomecanvas/libgnomecanvas-gnome-canvas-i18n.html -share/doc/libgnomecanvas/libgnomecanvas-gnome-canvas-marshal.html +share/doc/libgnomecanvas/home.png +share/doc/libgnomecanvas/left.png share/doc/libgnomecanvas/libgnomecanvas-gnome-canvas-path-def.html share/doc/libgnomecanvas/libgnomecanvas-gnome-canvas-util.html -share/doc/libgnomecanvas/libgnomecanvas-gnomecanvas.html -share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasbpath.html -share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasclipgroup.html -share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasellipse.html -share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasgroup.html -share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasitem.html -share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasline.html -share/doc/libgnomecanvas/libgnomecanvas-gnomecanvaspathdef.html -share/doc/libgnomecanvas/libgnomecanvas-gnomecanvaspixbuf.html -share/doc/libgnomecanvas/libgnomecanvas-gnomecanvaspolygon.html -share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasre.html -share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasrect.html -share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasrichtext.html -share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasshape.html -share/doc/libgnomecanvas/libgnomecanvas-gnomecanvastext.html -share/doc/libgnomecanvas/libgnomecanvas-gnomecanvaswidget.html -share/doc/libgnomecanvas/libgnomecanvas-libgnomecanvas.html +share/doc/libgnomecanvas/right.png +share/doc/libgnomecanvas/up.png share/locale/am/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/ar/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/az/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/be/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/bg/LC_MESSAGES/libgnomecanvas-2.0.mo +share/locale/bn/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/ca/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/cs/LC_MESSAGES/libgnomecanvas-2.0.mo +share/locale/cy/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/da/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/de/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/el/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/es/LC_MESSAGES/libgnomecanvas-2.0.mo +share/locale/eo/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/et/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/fa/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/fi/LC_MESSAGES/libgnomecanvas-2.0.mo @@ -77,15 +65,18 @@ share/locale/he/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/hi/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/hu/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/id/LC_MESSAGES/libgnomecanvas-2.0.mo +share/locale/is/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/it/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/ja/LC_MESSAGES/libgnomecanvas-2.0.mo -share/locale/kn/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/ko/LC_MESSAGES/libgnomecanvas-2.0.mo +share/locale/kn/LC_MESSAGES/libgnomecanvas-2.0.mo +share/locale/li/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/lv/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/mk/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/ml/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/mn/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/ms/LC_MESSAGES/libgnomecanvas-2.0.mo +share/locale/ne/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/nl/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/nn/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/no/LC_MESSAGES/libgnomecanvas-2.0.mo @@ -96,6 +87,7 @@ share/locale/ro/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/ru/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/sk/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/sl/LC_MESSAGES/libgnomecanvas-2.0.mo +share/locale/sq/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/sr/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/sr@Latn/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/sv/LC_MESSAGES/libgnomecanvas-2.0.mo diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile index d3ba995acfbc..6e4dbb12d526 100644 --- a/graphics/librsvg2/Makefile +++ b/graphics/librsvg2/Makefile @@ -6,11 +6,10 @@ # PORTNAME= librsvg2 -PORTVERSION= 2.2.5 -PORTREVISION= 2 +PORTVERSION= 2.4.0 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.2 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.4 DISTNAME= librsvg-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -19,7 +18,8 @@ COMMENT= Library for parsing and rendering SVG vector-graphic files BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ - popt.0:${PORTSDIR}/devel/popt + popt.0:${PORTSDIR}/devel/popt \ + gsf-1.9:${PORTSDIR}/devel/libgsf RUN_DEPENDS= ${X11BASE}/lib/gtk-2.0/2.2.0/engines/libmetal.so:${PORTSDIR}/x11-toolkits/gtk-engines2 USE_BZIP2= yes @@ -28,9 +28,9 @@ USE_X_PREFIX= yes INSTALLS_SHLIB= yes USE_LIBTOOL= yes USE_REINPLACE= yes -USE_GNOME= gnomehack gtk20 libartlgpl2 libxml2 libgsf +USE_GNOME= gnomehack gtk20 libartlgpl2 libxml2 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" + LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --with-svgz \ --disable-gtk-doc PLIST_SUB= GTK_VERSION="2.2.0" diff --git a/graphics/librsvg2/distinfo b/graphics/librsvg2/distinfo index 3a3e9c8b579d..4796a4a1f2a1 100644 --- a/graphics/librsvg2/distinfo +++ b/graphics/librsvg2/distinfo @@ -1 +1 @@ -MD5 (gnome2/librsvg-2.2.5.tar.bz2) = db71094f14f460142b356c5ce6b9f835 +MD5 (gnome2/librsvg-2.4.0.tar.bz2) = 1a073864e5f6e9793cf23e38dc723803 diff --git a/graphics/librsvg2/files/patch-rsvg.c b/graphics/librsvg2/files/patch-rsvg.c deleted file mode 100644 index 54b3861e208f..000000000000 --- a/graphics/librsvg2/files/patch-rsvg.c +++ /dev/null @@ -1,34 +0,0 @@ ---- rsvg.c.orig Thu Jul 31 02:03:34 2003 -+++ rsvg.c Thu Jul 31 02:26:35 2003 -@@ -332,13 +332,14 @@ - { - RsvgSaxHandlerGstops *z = (RsvgSaxHandlerGstops *)self; - RsvgHandle *ctx = z->ctx; -+ RsvgSaxHandler *prev = &z->parent->super; - - if (!strcmp((char *)name, z->parent_tag)) - { - if (ctx->handler != NULL) - { - ctx->handler->free (ctx->handler); -- ctx->handler = &z->parent->super; -+ ctx->handler = prev; - } - } - } -@@ -679,13 +680,14 @@ - { - RsvgSaxHandlerStyle *z = (RsvgSaxHandlerStyle *)self; - RsvgHandle *ctx = z->ctx; -+ RsvgSaxHandler *prev = &z->parent->super; - - if (!strcmp ((char *)name, "style")) - { - if (ctx->handler != NULL) - { - ctx->handler->free (ctx->handler); -- ctx->handler = &z->parent->super; -+ ctx->handler = prev; - } - } - } diff --git a/graphics/librsvg2/pkg-plist b/graphics/librsvg2/pkg-plist index 21f66f6f4d6d..f9c5935081bb 100644 --- a/graphics/librsvg2/pkg-plist +++ b/graphics/librsvg2/pkg-plist @@ -6,17 +6,17 @@ lib/gtk-2.0/%%GTK_VERSION%%/engines/libsvg.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/svg_loader.so lib/librsvg-2.a lib/librsvg-2.so -lib/librsvg-2.so.4 +lib/librsvg-2.so.6 libdata/pkgconfig/librsvg-2.0.pc %%GIMP:%%libexec/gimp/1.3/plug-ins/svg share/doc/librsvg/html/home.png -share/doc/librsvg/html/i909.html +share/doc/librsvg/html/i1013.html share/doc/librsvg/html/index.html share/doc/librsvg/html/index.sgml share/doc/librsvg/html/left.png share/doc/librsvg/html/r22.html -share/doc/librsvg/html/r320.html -share/doc/librsvg/html/r354.html +share/doc/librsvg/html/r376.html +share/doc/librsvg/html/r413.html share/doc/librsvg/html/right.png share/doc/librsvg/html/rsvg-convenience-functions.html share/doc/librsvg/html/rsvg-core-api.html diff --git a/misc/gnome-mime-data/Makefile b/misc/gnome-mime-data/Makefile index c2398db0bce5..0a71aa6ba360 100644 --- a/misc/gnome-mime-data/Makefile +++ b/misc/gnome-mime-data/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomemimedata -PORTVERSION= 2.2.1 -PORTREVISION= 1 +PORTVERSION= 2.4.0 CATEGORIES= misc gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-mime-data/2.2 +MASTER_SITE_SUBDIR= sources/gnome-mime-data/2.4 DISTNAME= gnome-mime-data-${PORTVERSION} DIST_SUBDIR= gnome diff --git a/misc/gnome-mime-data/distinfo b/misc/gnome-mime-data/distinfo index 421ccdc27beb..b220e9a7b7aa 100644 --- a/misc/gnome-mime-data/distinfo +++ b/misc/gnome-mime-data/distinfo @@ -1 +1 @@ -MD5 (gnome/gnome-mime-data-2.2.1.tar.bz2) = 05f5a490434c33a060ea7d140f60981f +MD5 (gnome/gnome-mime-data-2.4.0.tar.bz2) = b8f1b383a23d734bec8bc33a03cb3690 diff --git a/misc/gnome-mime-data/pkg-plist b/misc/gnome-mime-data/pkg-plist index 0772e3d3ae97..548dce8cb04d 100644 --- a/misc/gnome-mime-data/pkg-plist +++ b/misc/gnome-mime-data/pkg-plist @@ -3,188 +3,19 @@ libdata/pkgconfig/gnome-mime-data-2.0.pc share/gnome/application-registry/gnome-vfs.applications share/gnome/mime-info/gnome-vfs.keys share/gnome/mime-info/gnome-vfs.mime -share/gnome/pixmaps/document-icons/gnome-application-encapsulated_postscript.png -share/gnome/pixmaps/document-icons/gnome-application-msword.png -share/gnome/pixmaps/document-icons/gnome-application-pdf.png -share/gnome/pixmaps/document-icons/gnome-application-pgp.png -share/gnome/pixmaps/document-icons/gnome-application-pgp-encrypted.png -share/gnome/pixmaps/document-icons/gnome-application-pgp-keys.png -share/gnome/pixmaps/document-icons/gnome-application-postscript.png -share/gnome/pixmaps/document-icons/gnome-application-qif.png -share/gnome/pixmaps/document-icons/gnome-application-rtf.png -share/gnome/pixmaps/document-icons/gnome-application-smil.png -share/gnome/pixmaps/document-icons/gnome-application-vnd.lotus-1-2-3.png -share/gnome/pixmaps/document-icons/gnome-application-vnd.ms-excel.png -share/gnome/pixmaps/document-icons/gnome-application-vnd.ms-powerpoint.png -share/gnome/pixmaps/document-icons/gnome-application-vnd.rn-realmedia.png -share/gnome/pixmaps/document-icons/gnome-application-vnd.stardivision.calc.png -share/gnome/pixmaps/document-icons/gnome-application-vnd.stardivision.impress.png -share/gnome/pixmaps/document-icons/gnome-application-vnd.stardivision.writer.png -share/gnome/pixmaps/document-icons/gnome-application-vnd.sun.xml.calc.png -share/gnome/pixmaps/document-icons/gnome-application-vnd.sun.xml.impress.png -share/gnome/pixmaps/document-icons/gnome-application-vnd.sun.xml.writer.png -share/gnome/pixmaps/document-icons/gnome-application-x-abiword.png -share/gnome/pixmaps/document-icons/gnome-application-x-applix-spreadsheet.png -share/gnome/pixmaps/document-icons/gnome-application-x-applix-word.png -share/gnome/pixmaps/document-icons/gnome-application-x-arj.png -share/gnome/pixmaps/document-icons/gnome-application-x-backup.png -share/gnome/pixmaps/document-icons/gnome-application-x-blender.png -share/gnome/pixmaps/document-icons/gnome-application-x-bzip.png -share/gnome/pixmaps/document-icons/gnome-application-x-compress.png -share/gnome/pixmaps/document-icons/gnome-application-x-dc-rom.png -share/gnome/pixmaps/document-icons/gnome-application-x-deb.png -share/gnome/pixmaps/document-icons/gnome-application-x-dia-diagram.png -share/gnome/pixmaps/document-icons/gnome-application-x-dvi.png -share/gnome/pixmaps/document-icons/gnome-application-x-e-theme.png -share/gnome/pixmaps/document-icons/gnome-application-x-flac.png -share/gnome/pixmaps/document-icons/gnome-application-x-font-sunos-news.png -share/gnome/pixmaps/document-icons/gnome-application-x-gameboy-rom.png -share/gnome/pixmaps/document-icons/gnome-application-x-genesis-rom.png -share/gnome/pixmaps/document-icons/gnome-application-x-gnome-app-info.png -share/gnome/pixmaps/document-icons/gnome-application-x-gnumeric.png -share/gnome/pixmaps/document-icons/gnome-application-x-gtktalog.png -share/gnome/pixmaps/document-icons/gnome-application-x-gzip.png -share/gnome/pixmaps/document-icons/gnome-application-x-jar.png -share/gnome/pixmaps/document-icons/gnome-application-x-java-byte-code.png -share/gnome/pixmaps/document-icons/gnome-application-x-kde-app-info.png -share/gnome/pixmaps/document-icons/gnome-application-x-killustrator.png -share/gnome/pixmaps/document-icons/gnome-application-x-kpresenter.png -share/gnome/pixmaps/document-icons/gnome-application-x-kspread.png -share/gnome/pixmaps/document-icons/gnome-application-x-kword.png -share/gnome/pixmaps/document-icons/gnome-application-x-msx-rom.png -share/gnome/pixmaps/document-icons/gnome-application-x-n64-rom.png -share/gnome/pixmaps/document-icons/gnome-application-x-nes-rom.png -share/gnome/pixmaps/document-icons/gnome-application-x-ogg.png -share/gnome/pixmaps/document-icons/gnome-application-x-php.png -share/gnome/pixmaps/document-icons/gnome-application-x-python-bytecode.png -share/gnome/pixmaps/document-icons/gnome-application-x-reject.png -share/gnome/pixmaps/document-icons/gnome-application-x-rpm.png -share/gnome/pixmaps/document-icons/gnome-application-x-scheme-source.png -share/gnome/pixmaps/document-icons/gnome-application-x-sms-rom.png -share/gnome/pixmaps/document-icons/gnome-application-x-sql.png -share/gnome/pixmaps/document-icons/gnome-application-x-stuffit.png -share/gnome/pixmaps/document-icons/gnome-audio-ac3.png -share/gnome/pixmaps/document-icons/gnome-audio-basic.png -share/gnome/pixmaps/document-icons/gnome-audio-midi.png -share/gnome/pixmaps/document-icons/gnome-audio-mpeg.png -share/gnome/pixmaps/document-icons/gnome-audio-ulaw.png -share/gnome/pixmaps/document-icons/gnome-audio-x-aiff.png -share/gnome/pixmaps/document-icons/gnome-audio-x-bmx.png -share/gnome/pixmaps/document-icons/gnome-audio-x-it.png -share/gnome/pixmaps/document-icons/gnome-audio-x-mod.png -share/gnome/pixmaps/document-icons/gnome-audio-x-pn-realaudio.png -share/gnome/pixmaps/document-icons/gnome-audio-x-s3m.png -share/gnome/pixmaps/document-icons/gnome-audio-x-stm.png -share/gnome/pixmaps/document-icons/gnome-audio-x-voc.png -share/gnome/pixmaps/document-icons/gnome-audio-x-wav.png -share/gnome/pixmaps/document-icons/gnome-audio-x-xi.png -share/gnome/pixmaps/document-icons/gnome-audio-x-xm.png -share/gnome/pixmaps/document-icons/gnome-audio.png -share/gnome/pixmaps/document-icons/gnome-compressed.png -share/gnome/pixmaps/document-icons/gnome-font-afm.png -share/gnome/pixmaps/document-icons/gnome-font-bdf.png -share/gnome/pixmaps/document-icons/gnome-font-linux-psf.png -share/gnome/pixmaps/document-icons/gnome-font-ttf.png -share/gnome/pixmaps/document-icons/gnome-font-x-pcf.png -share/gnome/pixmaps/document-icons/gnome-http-url.png -share/gnome/pixmaps/document-icons/gnome-image-bmp.png -share/gnome/pixmaps/document-icons/gnome-image-generic.png -share/gnome/pixmaps/document-icons/gnome-image-gif.png -share/gnome/pixmaps/document-icons/gnome-image-ief.png -share/gnome/pixmaps/document-icons/gnome-image-jpeg.png -share/gnome/pixmaps/document-icons/gnome-image-pbm.png -share/gnome/pixmaps/document-icons/gnome-image-pgm.png -share/gnome/pixmaps/document-icons/gnome-image-png.png -share/gnome/pixmaps/document-icons/gnome-image-pnm.png -share/gnome/pixmaps/document-icons/gnome-image-ppm.png -share/gnome/pixmaps/document-icons/gnome-image-psd.png -share/gnome/pixmaps/document-icons/gnome-image-ras.png -share/gnome/pixmaps/document-icons/gnome-image-rgb.png -share/gnome/pixmaps/document-icons/gnome-image-svg.png -share/gnome/pixmaps/document-icons/gnome-image-tga.png -share/gnome/pixmaps/document-icons/gnome-image-tiff.png -share/gnome/pixmaps/document-icons/gnome-image-x-3ds.png -share/gnome/pixmaps/document-icons/gnome-image-x-applix-graphic.png -share/gnome/pixmaps/document-icons/gnome-image-x-lwo.png -share/gnome/pixmaps/document-icons/gnome-image-x-lws.png -share/gnome/pixmaps/document-icons/gnome-image-x-xfig.png -share/gnome/pixmaps/document-icons/gnome-image-xbm.png -share/gnome/pixmaps/document-icons/gnome-image-xcf.png -share/gnome/pixmaps/document-icons/gnome-image-xpm.png -share/gnome/pixmaps/document-icons/gnome-image-xwd.png -share/gnome/pixmaps/document-icons/gnome-library.png -share/gnome/pixmaps/document-icons/gnome-objectfile.png -share/gnome/pixmaps/document-icons/gnome-package.png -share/gnome/pixmaps/document-icons/gnome-tex.png -share/gnome/pixmaps/document-icons/gnome-text-abiword.png -share/gnome/pixmaps/document-icons/gnome-text-css.png -share/gnome/pixmaps/document-icons/gnome-text-html.png -share/gnome/pixmaps/document-icons/gnome-text-x-authors.png -share/gnome/pixmaps/document-icons/gnome-text-x-c.png -share/gnome/pixmaps/document-icons/gnome-text-x-c++.png -share/gnome/pixmaps/document-icons/gnome-text-x-c-header.png -share/gnome/pixmaps/document-icons/gnome-text-x-copying.png -share/gnome/pixmaps/document-icons/gnome-text-x-credits.png -share/gnome/pixmaps/document-icons/gnome-text-x-csh.png -share/gnome/pixmaps/document-icons/gnome-text-x-haskell.png -share/gnome/pixmaps/document-icons/gnome-text-x-install.png -share/gnome/pixmaps/document-icons/gnome-text-x-java.png -share/gnome/pixmaps/document-icons/gnome-text-x-literate-haskell.png -share/gnome/pixmaps/document-icons/gnome-text-x-lyx.png -share/gnome/pixmaps/document-icons/gnome-text-x-makefile.png -share/gnome/pixmaps/document-icons/gnome-text-x-patch.png -share/gnome/pixmaps/document-icons/gnome-text-x-perl.png -share/gnome/pixmaps/document-icons/gnome-text-x-python.png -share/gnome/pixmaps/document-icons/gnome-text-x-readme.png -share/gnome/pixmaps/document-icons/gnome-text-x-sh.png -share/gnome/pixmaps/document-icons/gnome-text-x-sql.png -share/gnome/pixmaps/document-icons/gnome-text-x-zsh.png -share/gnome/pixmaps/document-icons/gnome-text-xml.png -share/gnome/pixmaps/document-icons/gnome-textfile.png -share/gnome/pixmaps/document-icons/gnome-video-mpeg.png -share/gnome/pixmaps/document-icons/gnome-video-quicktime.png -share/gnome/pixmaps/document-icons/gnome-video-x-ms-asf.png -share/gnome/pixmaps/document-icons/gnome-video-x-ms-wmv.png -share/gnome/pixmaps/document-icons/gnome-video-x-msvideo.png -share/gnome/pixmaps/document-icons/gnome-x-font-afm.png -share/gnome/pixmaps/document-icons/gnome-x-troff-man.png -share/gnome/pixmaps/document-icons/i-blockdev.png -share/gnome/pixmaps/document-icons/i-cdrom-audio.png -share/gnome/pixmaps/document-icons/i-cdrom.png -share/gnome/pixmaps/document-icons/i-chardev.png -share/gnome/pixmaps/document-icons/i-core.png -share/gnome/pixmaps/document-icons/i-dvd.png -share/gnome/pixmaps/document-icons/i-executable.png -share/gnome/pixmaps/document-icons/i-fifo.png -share/gnome/pixmaps/document-icons/i-floppy.png -share/gnome/pixmaps/document-icons/i-ftp.png -share/gnome/pixmaps/document-icons/i-harddisk.png -share/gnome/pixmaps/document-icons/i-manual.png -share/gnome/pixmaps/document-icons/i-music-12.png -share/gnome/pixmaps/document-icons/i-music-24.png -share/gnome/pixmaps/document-icons/i-music-36.png -share/gnome/pixmaps/document-icons/i-music.png -share/gnome/pixmaps/document-icons/i-network.png -share/gnome/pixmaps/document-icons/i-nfs.png -share/gnome/pixmaps/document-icons/i-printer.png -share/gnome/pixmaps/document-icons/i-regular-72.png -share/gnome/pixmaps/document-icons/i-regular-96.png -share/gnome/pixmaps/document-icons/i-regular.png -share/gnome/pixmaps/document-icons/i-regular.xml -share/gnome/pixmaps/document-icons/i-smb.png -share/gnome/pixmaps/document-icons/i-sock.png -share/gnome/pixmaps/document-icons/i-spreadsheet.png -share/gnome/pixmaps/document-icons/i-web.png -share/gnome/pixmaps/document-icons/i-zipdisk.png share/locale/am/LC_MESSAGES/gnome-mime-data.mo +share/locale/ar/LC_MESSAGES/gnome-mime-data.mo share/locale/az/LC_MESSAGES/gnome-mime-data.mo share/locale/be/LC_MESSAGES/gnome-mime-data.mo share/locale/bg/LC_MESSAGES/gnome-mime-data.mo share/locale/bn/LC_MESSAGES/gnome-mime-data.mo share/locale/ca/LC_MESSAGES/gnome-mime-data.mo +share/locale/cs/LC_MESSAGES/gnome-mime-data.mo +share/locale/cy/LC_MESSAGES/gnome-mime-data.mo share/locale/da/LC_MESSAGES/gnome-mime-data.mo share/locale/de/LC_MESSAGES/gnome-mime-data.mo share/locale/el/LC_MESSAGES/gnome-mime-data.mo +share/locale/eo/LC_MESSAGES/gnome-mime-data.mo share/locale/es/LC_MESSAGES/gnome-mime-data.mo share/locale/et/LC_MESSAGES/gnome-mime-data.mo share/locale/eu/LC_MESSAGES/gnome-mime-data.mo @@ -197,15 +28,18 @@ share/locale/he/LC_MESSAGES/gnome-mime-data.mo share/locale/hi/LC_MESSAGES/gnome-mime-data.mo share/locale/hu/LC_MESSAGES/gnome-mime-data.mo share/locale/id/LC_MESSAGES/gnome-mime-data.mo +share/locale/is/LC_MESSAGES/gnome-mime-data.mo share/locale/it/LC_MESSAGES/gnome-mime-data.mo share/locale/ja/LC_MESSAGES/gnome-mime-data.mo share/locale/ko/LC_MESSAGES/gnome-mime-data.mo +share/locale/li/LC_MESSAGES/gnome-mime-data.mo share/locale/lt/LC_MESSAGES/gnome-mime-data.mo share/locale/lv/LC_MESSAGES/gnome-mime-data.mo share/locale/mk/LC_MESSAGES/gnome-mime-data.mo share/locale/ml/LC_MESSAGES/gnome-mime-data.mo share/locale/mn/LC_MESSAGES/gnome-mime-data.mo share/locale/ms/LC_MESSAGES/gnome-mime-data.mo +share/locale/ne/LC_MESSAGES/gnome-mime-data.mo share/locale/nl/LC_MESSAGES/gnome-mime-data.mo share/locale/nn/LC_MESSAGES/gnome-mime-data.mo share/locale/no/LC_MESSAGES/gnome-mime-data.mo @@ -216,6 +50,7 @@ share/locale/ro/LC_MESSAGES/gnome-mime-data.mo share/locale/ru/LC_MESSAGES/gnome-mime-data.mo share/locale/sk/LC_MESSAGES/gnome-mime-data.mo share/locale/sl/LC_MESSAGES/gnome-mime-data.mo +share/locale/sq/LC_MESSAGES/gnome-mime-data.mo share/locale/sr/LC_MESSAGES/gnome-mime-data.mo share/locale/sr@Latn/LC_MESSAGES/gnome-mime-data.mo share/locale/sv/LC_MESSAGES/gnome-mime-data.mo @@ -226,4 +61,3 @@ share/locale/wa/LC_MESSAGES/gnome-mime-data.mo share/locale/yi/LC_MESSAGES/gnome-mime-data.mo share/locale/zh_CN/LC_MESSAGES/gnome-mime-data.mo share/locale/zh_TW/LC_MESSAGES/gnome-mime-data.mo -@dirrm share/gnome/pixmaps/document-icons diff --git a/misc/gnome-user-docs/Makefile b/misc/gnome-user-docs/Makefile index 27932db97bda..f2306c401dae 100644 --- a/misc/gnome-user-docs/Makefile +++ b/misc/gnome-user-docs/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomeuserdocs2 -PORTVERSION= 2.0.6 -PORTREVISION= 1 +PORTVERSION= 2.4.0 CATEGORIES= misc gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome2-user-docs/2.0 +MASTER_SITE_SUBDIR= sources/gnome2-user-docs/2.4 DISTNAME= gnome2-user-docs-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/misc/gnome-user-docs/distinfo b/misc/gnome-user-docs/distinfo index 915b95a00a74..be2961a4bb51 100644 --- a/misc/gnome-user-docs/distinfo +++ b/misc/gnome-user-docs/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome2-user-docs-2.0.6.tar.bz2) = 78eefb360be381d34dcb1a98a3be5ff7 +MD5 (gnome2/gnome2-user-docs-2.4.0.tar.bz2) = 76a72340cc012148ed822857b1c7cf28 diff --git a/misc/gnome-user-docs/pkg-plist b/misc/gnome-user-docs/pkg-plist index 00a90f65b784..d2499be23c80 100644 --- a/misc/gnome-user-docs/pkg-plist +++ b/misc/gnome-user-docs/pkg-plist @@ -43,106 +43,35 @@ share/gnome/help/system-admin-guide/C/themes.xml share/gnome/help/user-guide/C/figures/applet_popup.png share/gnome/help/user-guide/C/figures/ask_pointer.png share/gnome/help/user-guide/C/figures/caution.png -share/gnome/help/user-guide/C/figures/cc_accessibility_window.png -share/gnome/help/user-guide/C/figures/cc_accessx.png -share/gnome/help/user-guide/C/figures/cc_accessx_filters_tab.png -share/gnome/help/user-guide/C/figures/cc_accessx_keyboard_tab.png -share/gnome/help/user-guide/C/figures/cc_accessx_misc_tab.png -share/gnome/help/user-guide/C/figures/cc_accessx_mouse_tab.png -share/gnome/help/user-guide/C/figures/cc_advanced_window.png -share/gnome/help/user-guide/C/figures/cc_appearance_tab.png -share/gnome/help/user-guide/C/figures/cc_apps_tab.png -share/gnome/help/user-guide/C/figures/cc_background_tab.png -share/gnome/help/user-guide/C/figures/cc_basic_keyboardshortcuts.png -share/gnome/help/user-guide/C/figures/cc_basic_keyboardsound_tab.png -share/gnome/help/user-guide/C/figures/cc_basic_mousemotion_tab.png -share/gnome/help/user-guide/C/figures/cc_basic_mousepointers_tab.png -share/gnome/help/user-guide/C/figures/cc_ccdb.png -share/gnome/help/user-guide/C/figures/cc_currentsession.png -share/gnome/help/user-guide/C/figures/cc_defaultbrowser_tab.png -share/gnome/help/user-guide/C/figures/cc_defaulteditor_tab.png -share/gnome/help/user-guide/C/figures/cc_defaulthelp_tab.png -share/gnome/help/user-guide/C/figures/cc_defaultterminal_tab.png -share/gnome/help/user-guide/C/figures/cc_defaultwbrowser_tab.png -share/gnome/help/user-guide/C/figures/cc_filesprograms_tab.png -share/gnome/help/user-guide/C/figures/cc_font_tab.png -share/gnome/help/user-guide/C/figures/cc_htmlkeyboard_tab.png -share/gnome/help/user-guide/C/figures/cc_htmlmisc_tab.png -share/gnome/help/user-guide/C/figures/cc_keyboard_tab.png -share/gnome/help/user-guide/C/figures/cc_keyboardsound_tab.png -share/gnome/help/user-guide/C/figures/cc_main_window.png -share/gnome/help/user-guide/C/figures/cc_metacity.png -share/gnome/help/user-guide/C/figures/cc_mimetypes_tab.png -share/gnome/help/user-guide/C/figures/cc_mouse_tab.png -share/gnome/help/user-guide/C/figures/cc_network.png -share/gnome/help/user-guide/C/figures/cc_panel.png -share/gnome/help/user-guide/C/figures/cc_session_options.png -share/gnome/help/user-guide/C/figures/cc_session_startupprogs.png -share/gnome/help/user-guide/C/figures/cc_sound_events.png -share/gnome/help/user-guide/C/figures/cc_sound_general.png -share/gnome/help/user-guide/C/figures/cc_theme_tab.png -share/gnome/help/user-guide/C/figures/cc_theme_tool.png -share/gnome/help/user-guide/C/figures/cc_theme_window_tab.png -share/gnome/help/user-guide/C/figures/cc_windows.png share/gnome/help/user-guide/C/figures/column_resize_pointer.png -share/gnome/help/user-guide/C/figures/controlcenter_anno_window.png -share/gnome/help/user-guide/C/figures/controlcenter_icon.png share/gnome/help/user-guide/C/figures/copy_pointer.png share/gnome/help/user-guide/C/figures/corner_resize_pointer.png -share/gnome/help/user-guide/C/figures/drawerprop_dialog.png share/gnome/help/user-guide/C/figures/file_manager_menu.png share/gnome/help/user-guide/C/figures/footprint_icon.png +share/gnome/help/user-guide/C/figures/force_quit.png share/gnome/help/user-guide/C/figures/four_hide_button.png -share/gnome/help/user-guide/C/figures/gedit2_window.png -share/gnome/help/user-guide/C/figures/gedit_pref2_dialog.png share/gnome/help/user-guide/C/figures/gedit_pref_dialog.png share/gnome/help/user-guide/C/figures/gedit_window.png share/gnome/help/user-guide/C/figures/gnome-logo-icon.png -share/gnome/help/user-guide/C/figures/gnome-logo.png share/gnome/help/user-guide/C/figures/gnome_panel.png -share/gnome/help/user-guide/C/figures/gnometerminal_icon.png -share/gnome/help/user-guide/C/figures/help_icon.png share/gnome/help/user-guide/C/figures/horiz_resize_pointer.png share/gnome/help/user-guide/C/figures/launcher_popup.png -share/gnome/help/user-guide/C/figures/launcherprop1_dialog.png -share/gnome/help/user-guide/C/figures/launcherprop2_dialog.png share/gnome/help/user-guide/C/figures/link_pointer.png share/gnome/help/user-guide/C/figures/lockscreen_icon.png share/gnome/help/user-guide/C/figures/logout_icon.png -share/gnome/help/user-guide/C/figures/menu_editor_anno_window.png +share/gnome/help/user-guide/C/figures/menu_bar_applet.png share/gnome/help/user-guide/C/figures/menu_panel.png share/gnome/help/user-guide/C/figures/move_panel_object_pointer.png share/gnome/help/user-guide/C/figures/move_pointer.png -share/gnome/help/user-guide/C/figures/naut_anno_desktop.png -share/gnome/help/user-guide/C/figures/naut_desktop.png -share/gnome/help/user-guide/C/figures/naut_file_navigation_pane.png -share/gnome/help/user-guide/C/figures/naut_folder_navigation_pane.png -share/gnome/help/user-guide/C/figures/naut_history_tab.png +share/gnome/help/user-guide/C/figures/naut_audioview_window.png share/gnome/help/user-guide/C/figures/naut_home_launcher.png share/gnome/help/user-guide/C/figures/naut_iconview_anno_window.png share/gnome/help/user-guide/C/figures/naut_iconview_window.png share/gnome/help/user-guide/C/figures/naut_link_emblem.png -share/gnome/help/user-guide/C/figures/naut_listview_anno_window.png share/gnome/help/user-guide/C/figures/naut_listview_window.png -share/gnome/help/user-guide/C/figures/naut_navigation_anno_pane.png -share/gnome/help/user-guide/C/figures/naut_news_edit_tab.png -share/gnome/help/user-guide/C/figures/naut_news_select_tab.png -share/gnome/help/user-guide/C/figures/naut_news_tab.png share/gnome/help/user-guide/C/figures/naut_noread_emblem.png share/gnome/help/user-guide/C/figures/naut_normal_size_button.png -share/gnome/help/user-guide/C/figures/naut_notes_tab.png share/gnome/help/user-guide/C/figures/naut_nowrite_emblem.png -share/gnome/help/user-guide/C/figures/naut_pref_appear_dialog.png -share/gnome/help/user-guide/C/figures/naut_pref_icon_dialog.png -share/gnome/help/user-guide/C/figures/naut_pref_iconcaptions_dialog.png -share/gnome/help/user-guide/C/figures/naut_pref_navigation_dialog.png -share/gnome/help/user-guide/C/figures/naut_pref_sidebar_dialog.png -share/gnome/help/user-guide/C/figures/naut_pref_speed_dialog.png -share/gnome/help/user-guide/C/figures/naut_pref_trash_dialog.png -share/gnome/help/user-guide/C/figures/naut_pref_view_dialog.png -share/gnome/help/user-guide/C/figures/naut_pref_window_dialog.png -share/gnome/help/user-guide/C/figures/naut_prop_basic_window.png -share/gnome/help/user-guide/C/figures/naut_prop_emblem_window.png share/gnome/help/user-guide/C/figures/naut_sampleemblem1_icon.png share/gnome/help/user-guide/C/figures/naut_sampleemblem2_icon.png share/gnome/help/user-guide/C/figures/naut_sampleemblem3_icon.png @@ -152,45 +81,26 @@ share/gnome/help/user-guide/C/figures/naut_sort_arrow_icon.png share/gnome/help/user-guide/C/figures/naut_starthere_launcher.png share/gnome/help/user-guide/C/figures/naut_trash_launcher.png share/gnome/help/user-guide/C/figures/naut_tree_tab.png -share/gnome/help/user-guide/C/figures/naut_viewasother_dialog.png share/gnome/help/user-guide/C/figures/naut_viewpane_text_window.png -share/gnome/help/user-guide/C/figures/naut_website_window.png -share/gnome/help/user-guide/C/figures/naut_zoom_anno_control.png share/gnome/help/user-guide/C/figures/naut_zoom_in_button.png share/gnome/help/user-guide/C/figures/naut_zoom_out_button.png -share/gnome/help/user-guide/C/figures/netscape_icon.png share/gnome/help/user-guide/C/figures/normal_pointer.png share/gnome/help/user-guide/C/figures/not_available_pointer.png share/gnome/help/user-guide/C/figures/note.png +share/gnome/help/user-guide/C/figures/notification_area_icon.png share/gnome/help/user-guide/C/figures/open_drawer.png share/gnome/help/user-guide/C/figures/open_main_menu.png share/gnome/help/user-guide/C/figures/openwindows_menu.png share/gnome/help/user-guide/C/figures/panel_object_popup_menu.png -share/gnome/help/user-guide/C/figures/panelprop_dialog.png -share/gnome/help/user-guide/C/figures/rmedia_floppy_format_dialog.png -share/gnome/help/user-guide/C/figures/rmedia_format_dialog.png -share/gnome/help/user-guide/C/figures/rmedia_properties1_dialog.png -share/gnome/help/user-guide/C/figures/rmedia_protection_dialog.png -share/gnome/help/user-guide/C/figures/rmedia_slice_dialog.png share/gnome/help/user-guide/C/figures/run_button.png -share/gnome/help/user-guide/C/figures/runprogram2_dialog.png -share/gnome/help/user-guide/C/figures/runprogram_dialog.png -share/gnome/help/user-guide/C/figures/runprogram_icon.png share/gnome/help/user-guide/C/figures/sample_anno_panel.png share/gnome/help/user-guide/C/figures/sample_applet.png -share/gnome/help/user-guide/C/figures/sampleemblem_icon.png share/gnome/help/user-guide/C/figures/screenshot_button.png share/gnome/help/user-guide/C/figures/searchtool_button.png -share/gnome/help/user-guide/C/figures/statusdock2_button.png -share/gnome/help/user-guide/C/figures/statusdock_button.png -share/gnome/help/user-guide/C/figures/tasklist_applet.png -share/gnome/help/user-guide/C/figures/tasklist_group2_applet.png -share/gnome/help/user-guide/C/figures/tasklist_group_applet.png +share/gnome/help/user-guide/C/figures/show_desktop_button.png share/gnome/help/user-guide/C/figures/tip.png -share/gnome/help/user-guide/C/figures/titlebar_anno_msw_window.png share/gnome/help/user-guide/C/figures/titlebar_anno_window.png share/gnome/help/user-guide/C/figures/typical_anno_desktop.png -share/gnome/help/user-guide/C/figures/typical_anno_menu.png share/gnome/help/user-guide/C/figures/typical_menu.png share/gnome/help/user-guide/C/figures/vert_resize_pointer.png share/gnome/help/user-guide/C/figures/warning.png @@ -226,259 +136,6 @@ share/gnome/help/user-guide/C/wgosnautilus.xml share/gnome/help/user-guide/C/wgosoverview.xml share/gnome/help/user-guide/C/wgospanel.xml share/gnome/help/user-guide/C/wgosstartsession.xml -share/gnome/help/user-guide/hu/figures/ask_pointer.png -share/gnome/help/user-guide/hu/figures/column_resize_pointer.png -share/gnome/help/user-guide/hu/figures/copy_pointer.png -share/gnome/help/user-guide/hu/figures/corner_resize_pointer.png -share/gnome/help/user-guide/hu/figures/file_manager_menu.png -share/gnome/help/user-guide/hu/figures/footprint_icon.png -share/gnome/help/user-guide/hu/figures/four_hide_button.png -share/gnome/help/user-guide/hu/figures/gnome_panel.png -share/gnome/help/user-guide/hu/figures/horiz_resize_pointer.png -share/gnome/help/user-guide/hu/figures/launcher_popup.png -share/gnome/help/user-guide/hu/figures/link_pointer.png -share/gnome/help/user-guide/hu/figures/lockscreen_icon.png -share/gnome/help/user-guide/hu/figures/logout_icon.png -share/gnome/help/user-guide/hu/figures/move_panel_object_pointer.png -share/gnome/help/user-guide/hu/figures/move_pointer.png -share/gnome/help/user-guide/hu/figures/naut_file_navigation_pane.png -share/gnome/help/user-guide/hu/figures/naut_home_launcher.png -share/gnome/help/user-guide/hu/figures/naut_iconview_anno_window.png -share/gnome/help/user-guide/hu/figures/naut_iconview_window.png -share/gnome/help/user-guide/hu/figures/naut_link_emblem.png -share/gnome/help/user-guide/hu/figures/naut_listview_window.png -share/gnome/help/user-guide/hu/figures/naut_noread_emblem.png -share/gnome/help/user-guide/hu/figures/naut_normal_size_button.png -share/gnome/help/user-guide/hu/figures/naut_nowrite_emblem.png -share/gnome/help/user-guide/hu/figures/naut_sampleemblem1_icon.png -share/gnome/help/user-guide/hu/figures/naut_sampleemblem2_icon.png -share/gnome/help/user-guide/hu/figures/naut_sampleemblem3_icon.png -share/gnome/help/user-guide/hu/figures/naut_sampleemblem_icon.png -share/gnome/help/user-guide/hu/figures/naut_samplesymlink_icon.png -share/gnome/help/user-guide/hu/figures/naut_sort_arrow_icon.png -share/gnome/help/user-guide/hu/figures/naut_starthere_launcher.png -share/gnome/help/user-guide/hu/figures/naut_trash_launcher.png -share/gnome/help/user-guide/hu/figures/naut_viewpane_text_window.png -share/gnome/help/user-guide/hu/figures/naut_zoom_anno_control.png -share/gnome/help/user-guide/hu/figures/naut_zoom_in_button.png -share/gnome/help/user-guide/hu/figures/naut_zoom_out_button.png -share/gnome/help/user-guide/hu/figures/normal_pointer.png -share/gnome/help/user-guide/hu/figures/not_available_pointer.png -share/gnome/help/user-guide/hu/figures/open_drawer.png -share/gnome/help/user-guide/hu/figures/open_main_menu.png -share/gnome/help/user-guide/hu/figures/openwindows_menu.png -share/gnome/help/user-guide/hu/figures/panel_object_popup_menu.png -share/gnome/help/user-guide/hu/figures/sample_anno_panel.png -share/gnome/help/user-guide/hu/figures/sample_applet.png -share/gnome/help/user-guide/hu/figures/titlebar_anno_window.png -share/gnome/help/user-guide/hu/figures/typical_anno_desktop.png -share/gnome/help/user-guide/hu/figures/typical_menu.png -share/gnome/help/user-guide/hu/figures/vert_resize_pointer.png -share/gnome/help/user-guide/hu/figures/window_list_applet.png -share/gnome/help/user-guide/hu/figures/window_list_group_applet.png -share/gnome/help/user-guide/hu/figures/window_menu.png -share/gnome/help/user-guide/hu/figures/workspace_switcher_applet.png -share/gnome/help/user-guide/hu/front.xml -share/gnome/help/user-guide/hu/glossary.xml -share/gnome/help/user-guide/hu/gosbasic.xml -share/gnome/help/user-guide/hu/goscustaccess.xml -share/gnome/help/user-guide/hu/goscustdesk.xml -share/gnome/help/user-guide/hu/goscustlookandfeel.xml -share/gnome/help/user-guide/hu/gosdeskback.xml -share/gnome/help/user-guide/hu/goseditmainmenu.xml -share/gnome/help/user-guide/hu/gosmetacity.xml -share/gnome/help/user-guide/hu/gosnautilus.xml -share/gnome/help/user-guide/hu/gosoverview.xml -share/gnome/help/user-guide/hu/gospanel.xml -share/gnome/help/user-guide/hu/gosstartsession.xml -share/gnome/help/user-guide/hu/legal.xml -share/gnome/help/user-guide/hu/part1.xml -share/gnome/help/user-guide/hu/part2.xml -share/gnome/help/user-guide/hu/user-guide.xml -share/gnome/help/user-guide/hu/wgosbasic.xml -share/gnome/help/user-guide/hu/wgoscustaccess.xml -share/gnome/help/user-guide/hu/wgoscustdesk.xml -share/gnome/help/user-guide/hu/wgoscustlookandfeel.xml -share/gnome/help/user-guide/hu/wgosdeskback.xml -share/gnome/help/user-guide/hu/wgoseditmainmenu.xml -share/gnome/help/user-guide/hu/wgosmetacity.xml -share/gnome/help/user-guide/hu/wgosnautilus.xml -share/gnome/help/user-guide/hu/wgosoverview.xml -share/gnome/help/user-guide/hu/wgospanel.xml -share/gnome/help/user-guide/hu/wgosstartsession.xml -share/gnome/help/user-guide/ro/figures/applet_popup.png -share/gnome/help/user-guide/ro/figures/ask_pointer.png -share/gnome/help/user-guide/ro/figures/cc_accessibility_window.png -share/gnome/help/user-guide/ro/figures/cc_accessx.png -share/gnome/help/user-guide/ro/figures/cc_accessx_keyboard_tab.png -share/gnome/help/user-guide/ro/figures/cc_accessx_misc_tab.png -share/gnome/help/user-guide/ro/figures/cc_advanced_window.png -share/gnome/help/user-guide/ro/figures/cc_appearance_tab.png -share/gnome/help/user-guide/ro/figures/cc_apps_tab.png -share/gnome/help/user-guide/ro/figures/cc_background_tab.png -share/gnome/help/user-guide/ro/figures/cc_basic_keyboardshortcuts.png -share/gnome/help/user-guide/ro/figures/cc_basic_keyboardsound_tab.png -share/gnome/help/user-guide/ro/figures/cc_basic_mousemotion_tab.png -share/gnome/help/user-guide/ro/figures/cc_basic_mousepointers_tab.png -share/gnome/help/user-guide/ro/figures/cc_ccdb.png -share/gnome/help/user-guide/ro/figures/cc_currentsession.png -share/gnome/help/user-guide/ro/figures/cc_defaultbrowser_tab.png -share/gnome/help/user-guide/ro/figures/cc_defaulteditor_tab.png -share/gnome/help/user-guide/ro/figures/cc_defaulthelp_tab.png -share/gnome/help/user-guide/ro/figures/cc_defaultterminal_tab.png -share/gnome/help/user-guide/ro/figures/cc_defaultwbrowser_tab.png -share/gnome/help/user-guide/ro/figures/cc_filesprograms_tab.png -share/gnome/help/user-guide/ro/figures/cc_font_tab.png -share/gnome/help/user-guide/ro/figures/cc_htmlkeyboard_tab.png -share/gnome/help/user-guide/ro/figures/cc_htmlmisc_tab.png -share/gnome/help/user-guide/ro/figures/cc_keyboard_tab.png -share/gnome/help/user-guide/ro/figures/cc_keyboardsound_tab.png -share/gnome/help/user-guide/ro/figures/cc_main_window.png -share/gnome/help/user-guide/ro/figures/cc_metacity.png -share/gnome/help/user-guide/ro/figures/cc_mimetypes_tab.png -share/gnome/help/user-guide/ro/figures/cc_mouse_tab.png -share/gnome/help/user-guide/ro/figures/cc_network.png -share/gnome/help/user-guide/ro/figures/cc_panel.png -share/gnome/help/user-guide/ro/figures/cc_session_options.png -share/gnome/help/user-guide/ro/figures/cc_session_startupprogs.png -share/gnome/help/user-guide/ro/figures/cc_sound_events.png -share/gnome/help/user-guide/ro/figures/cc_sound_general.png -share/gnome/help/user-guide/ro/figures/cc_theme_tab.png -share/gnome/help/user-guide/ro/figures/cc_theme_window_tab.png -share/gnome/help/user-guide/ro/figures/column_resize_pointer.png -share/gnome/help/user-guide/ro/figures/controlcenter_anno_window.png -share/gnome/help/user-guide/ro/figures/controlcenter_icon.png -share/gnome/help/user-guide/ro/figures/copy_pointer.png -share/gnome/help/user-guide/ro/figures/corner_resize_pointer.png -share/gnome/help/user-guide/ro/figures/drawerprop_dialog.png -share/gnome/help/user-guide/ro/figures/file_manager_menu.png -share/gnome/help/user-guide/ro/figures/footprint_icon.png -share/gnome/help/user-guide/ro/figures/four_hide_button.png -share/gnome/help/user-guide/ro/figures/gedit2_window.png -share/gnome/help/user-guide/ro/figures/gedit_pref2_dialog.png -share/gnome/help/user-guide/ro/figures/gedit_pref_dialog.png -share/gnome/help/user-guide/ro/figures/gedit_window.png -share/gnome/help/user-guide/ro/figures/gnome-logo.png -share/gnome/help/user-guide/ro/figures/gnome_panel.png -share/gnome/help/user-guide/ro/figures/gnometerminal_icon.png -share/gnome/help/user-guide/ro/figures/help_icon.png -share/gnome/help/user-guide/ro/figures/horiz_resize_pointer.png -share/gnome/help/user-guide/ro/figures/launcher_popup.png -share/gnome/help/user-guide/ro/figures/launcherprop1_dialog.png -share/gnome/help/user-guide/ro/figures/launcherprop2_dialog.png -share/gnome/help/user-guide/ro/figures/link_pointer.png -share/gnome/help/user-guide/ro/figures/lockscreen_icon.png -share/gnome/help/user-guide/ro/figures/logout_icon.png -share/gnome/help/user-guide/ro/figures/menu_editor_anno_window.png -share/gnome/help/user-guide/ro/figures/menu_panel.png -share/gnome/help/user-guide/ro/figures/move_panel_object_pointer.png -share/gnome/help/user-guide/ro/figures/move_pointer.png -share/gnome/help/user-guide/ro/figures/naut_anno_desktop.png -share/gnome/help/user-guide/ro/figures/naut_desktop.png -share/gnome/help/user-guide/ro/figures/naut_file_navigation_pane.png -share/gnome/help/user-guide/ro/figures/naut_folder_navigation_pane.png -share/gnome/help/user-guide/ro/figures/naut_history_tab.png -share/gnome/help/user-guide/ro/figures/naut_home_launcher.png -share/gnome/help/user-guide/ro/figures/naut_iconview_anno_window.png -share/gnome/help/user-guide/ro/figures/naut_iconview_window.png -share/gnome/help/user-guide/ro/figures/naut_link_emblem.png -share/gnome/help/user-guide/ro/figures/naut_listview_anno_window.png -share/gnome/help/user-guide/ro/figures/naut_listview_window.png -share/gnome/help/user-guide/ro/figures/naut_navigation_anno_pane.png -share/gnome/help/user-guide/ro/figures/naut_news_edit_tab.png -share/gnome/help/user-guide/ro/figures/naut_news_select_tab.png -share/gnome/help/user-guide/ro/figures/naut_news_tab.png -share/gnome/help/user-guide/ro/figures/naut_noread_emblem.png -share/gnome/help/user-guide/ro/figures/naut_normal_size_button.png -share/gnome/help/user-guide/ro/figures/naut_notes_tab.png -share/gnome/help/user-guide/ro/figures/naut_nowrite_emblem.png -share/gnome/help/user-guide/ro/figures/naut_pref_appear_dialog.png -share/gnome/help/user-guide/ro/figures/naut_pref_icon_dialog.png -share/gnome/help/user-guide/ro/figures/naut_pref_iconcaptions_dialog.png -share/gnome/help/user-guide/ro/figures/naut_pref_navigation_dialog.png -share/gnome/help/user-guide/ro/figures/naut_pref_sidebar_dialog.png -share/gnome/help/user-guide/ro/figures/naut_pref_speed_dialog.png -share/gnome/help/user-guide/ro/figures/naut_pref_trash_dialog.png -share/gnome/help/user-guide/ro/figures/naut_pref_view_dialog.png -share/gnome/help/user-guide/ro/figures/naut_pref_window_dialog.png -share/gnome/help/user-guide/ro/figures/naut_prop_basic_window.png -share/gnome/help/user-guide/ro/figures/naut_prop_emblem_window.png -share/gnome/help/user-guide/ro/figures/naut_sampleemblem1_icon.png -share/gnome/help/user-guide/ro/figures/naut_sampleemblem2_icon.png -share/gnome/help/user-guide/ro/figures/naut_sampleemblem3_icon.png -share/gnome/help/user-guide/ro/figures/naut_sampleemblem_icon.png -share/gnome/help/user-guide/ro/figures/naut_samplesymlink_icon.png -share/gnome/help/user-guide/ro/figures/naut_sort_arrow_icon.png -share/gnome/help/user-guide/ro/figures/naut_starthere_launcher.png -share/gnome/help/user-guide/ro/figures/naut_trash_launcher.png -share/gnome/help/user-guide/ro/figures/naut_tree_tab.png -share/gnome/help/user-guide/ro/figures/naut_viewasother_dialog.png -share/gnome/help/user-guide/ro/figures/naut_viewpane_text_window.png -share/gnome/help/user-guide/ro/figures/naut_website_window.png -share/gnome/help/user-guide/ro/figures/naut_zoom_anno_control.png -share/gnome/help/user-guide/ro/figures/naut_zoom_in_button.png -share/gnome/help/user-guide/ro/figures/naut_zoom_out_button.png -share/gnome/help/user-guide/ro/figures/netscape_icon.png -share/gnome/help/user-guide/ro/figures/normal_pointer.png -share/gnome/help/user-guide/ro/figures/not_available_pointer.png -share/gnome/help/user-guide/ro/figures/open_drawer.png -share/gnome/help/user-guide/ro/figures/open_main_menu.png -share/gnome/help/user-guide/ro/figures/openwindows_menu.png -share/gnome/help/user-guide/ro/figures/panel_object_popup_menu.png -share/gnome/help/user-guide/ro/figures/panelprop_dialog.png -share/gnome/help/user-guide/ro/figures/rmedia_format_dialog.png -share/gnome/help/user-guide/ro/figures/rmedia_properties1_dialog.png -share/gnome/help/user-guide/ro/figures/rmedia_protection_dialog.png -share/gnome/help/user-guide/ro/figures/rmedia_slice_dialog.png -share/gnome/help/user-guide/ro/figures/runprogram2_dialog.png -share/gnome/help/user-guide/ro/figures/runprogram_dialog.png -share/gnome/help/user-guide/ro/figures/runprogram_icon.png -share/gnome/help/user-guide/ro/figures/sample_anno_panel.png -share/gnome/help/user-guide/ro/figures/sample_applet.png -share/gnome/help/user-guide/ro/figures/sampleemblem_icon.png -share/gnome/help/user-guide/ro/figures/statusdock2_button.png -share/gnome/help/user-guide/ro/figures/statusdock_button.png -share/gnome/help/user-guide/ro/figures/tasklist_applet.png -share/gnome/help/user-guide/ro/figures/tasklist_group2_applet.png -share/gnome/help/user-guide/ro/figures/tasklist_group_applet.png -share/gnome/help/user-guide/ro/figures/titlebar_anno_msw_window.png -share/gnome/help/user-guide/ro/figures/titlebar_anno_window.png -share/gnome/help/user-guide/ro/figures/typical_anno_desktop.png -share/gnome/help/user-guide/ro/figures/typical_anno_menu.png -share/gnome/help/user-guide/ro/figures/typical_menu.png -share/gnome/help/user-guide/ro/figures/vert_resize_pointer.png -share/gnome/help/user-guide/ro/figures/window_list_applet.png -share/gnome/help/user-guide/ro/figures/window_list_group_applet.png -share/gnome/help/user-guide/ro/figures/window_menu.png -share/gnome/help/user-guide/ro/figures/workspace_switcher_applet.png -share/gnome/help/user-guide/ro/front.xml -share/gnome/help/user-guide/ro/glossary.xml -share/gnome/help/user-guide/ro/gosbasic.xml -share/gnome/help/user-guide/ro/goscustaccess.xml -share/gnome/help/user-guide/ro/goscustdesk.xml -share/gnome/help/user-guide/ro/goscustlookandfeel.xml -share/gnome/help/user-guide/ro/gosdeskback.xml -share/gnome/help/user-guide/ro/goseditmainmenu.xml -share/gnome/help/user-guide/ro/gosmetacity.xml -share/gnome/help/user-guide/ro/gosnautilus.xml -share/gnome/help/user-guide/ro/gosoverview.xml -share/gnome/help/user-guide/ro/gospanel.xml -share/gnome/help/user-guide/ro/gosstartsession.xml -share/gnome/help/user-guide/ro/legal.xml -share/gnome/help/user-guide/ro/part1.xml -share/gnome/help/user-guide/ro/part2.xml -share/gnome/help/user-guide/ro/user-guide.xml -share/gnome/help/user-guide/ro/wgosbasic.xml -share/gnome/help/user-guide/ro/wgoscustaccess.xml -share/gnome/help/user-guide/ro/wgoscustdesk.xml -share/gnome/help/user-guide/ro/wgoscustlookandfeel.xml -share/gnome/help/user-guide/ro/wgosdeskback.xml -share/gnome/help/user-guide/ro/wgoseditmainmenu.xml -share/gnome/help/user-guide/ro/wgosmetacity.xml -share/gnome/help/user-guide/ro/wgosnautilus.xml -share/gnome/help/user-guide/ro/wgosoverview.xml -share/gnome/help/user-guide/ro/wgospanel.xml -share/gnome/help/user-guide/ro/wgosstartsession.xml share/gnome/omf/gnome2-user-docs/gnome-access-guide-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome2-user-docs/gnome-access-guide-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome2-user-docs/introduction-to-gnome-C.omf @@ -487,120 +144,46 @@ share/gnome/omf/gnome2-user-docs/system-admin-guide-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome2-user-docs/system-admin-guide-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/user-guide/gosbasic-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/gosbasic-C.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/user-guide/gosbasic-hu.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/gosbasic-hu.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/user-guide/gosbasic-ro.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/gosbasic-ro.omf 2>/dev/null || /usr/bin/true share/gnome/omf/user-guide/goscustaccess-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/goscustaccess-C.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/user-guide/goscustaccess-hu.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/goscustaccess-hu.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/user-guide/goscustaccess-ro.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/goscustaccess-ro.omf 2>/dev/null || /usr/bin/true share/gnome/omf/user-guide/goscustdesk-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/goscustdesk-C.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/user-guide/goscustdesk-hu.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/goscustdesk-hu.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/user-guide/goscustdesk-ro.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/goscustdesk-ro.omf 2>/dev/null || /usr/bin/true share/gnome/omf/user-guide/goscustlookandfeel-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/goscustlookandfeel-C.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/user-guide/goscustlookandfeel-hu.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/goscustlookandfeel-hu.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/user-guide/goscustlookandfeel-ro.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/goscustlookandfeel-ro.omf 2>/dev/null || /usr/bin/true share/gnome/omf/user-guide/gosdeskback-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/gosdeskback-C.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/user-guide/gosdeskback-hu.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/gosdeskback-hu.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/user-guide/gosdeskback-ro.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/gosdeskback-ro.omf 2>/dev/null || /usr/bin/true share/gnome/omf/user-guide/goseditmainmenu-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/goseditmainmenu-C.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/user-guide/goseditmainmenu-hu.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/goseditmainmenu-hu.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/user-guide/goseditmainmenu-ro.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/goseditmainmenu-ro.omf 2>/dev/null || /usr/bin/true share/gnome/omf/user-guide/gosmetacity-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/gosmetacity-C.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/user-guide/gosmetacity-hu.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/gosmetacity-hu.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/user-guide/gosmetacity-ro.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/gosmetacity-ro.omf 2>/dev/null || /usr/bin/true share/gnome/omf/user-guide/gosnautilus-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/gosnautilus-C.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/user-guide/gosnautilus-hu.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/gosnautilus-hu.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/user-guide/gosnautilus-ro.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/gosnautilus-ro.omf 2>/dev/null || /usr/bin/true share/gnome/omf/user-guide/gosoverview-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/gosoverview-C.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/user-guide/gosoverview-hu.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/gosoverview-hu.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/user-guide/gosoverview-ro.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/gosoverview-ro.omf 2>/dev/null || /usr/bin/true share/gnome/omf/user-guide/gospanel-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/gospanel-C.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/user-guide/gospanel-hu.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/gospanel-hu.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/user-guide/gospanel-ro.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/gospanel-ro.omf 2>/dev/null || /usr/bin/true share/gnome/omf/user-guide/gosstartsession-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/gosstartsession-C.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/user-guide/gosstartsession-hu.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/gosstartsession-hu.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/user-guide/gosstartsession-ro.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/gosstartsession-ro.omf 2>/dev/null || /usr/bin/true @dirrm share/gnome/omf/user-guide @dirrm share/gnome/omf/gnome2-user-docs -@dirrm share/gnome/help/user-guide/ro/figures -@dirrm share/gnome/help/user-guide/ro -@dirrm share/gnome/help/user-guide/hu/figures -@dirrm share/gnome/help/user-guide/hu @dirrm share/gnome/help/user-guide/C/figures @dirrm share/gnome/help/user-guide/C -@dirrm share/gnome/help/user-guide @dirrm share/gnome/help/system-admin-guide/C -@dirrm share/gnome/help/system-admin-guide @dirrm share/gnome/help/introduction-to-gnome/C/figures @dirrm share/gnome/help/introduction-to-gnome/C -@dirrm share/gnome/help/introduction-to-gnome @dirrm share/gnome/help/gnome-access-guide/C/figures @dirrm share/gnome/help/gnome-access-guide/C -@dirrm share/gnome/help/gnome-access-guide @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome2-user-docs/gnome-access-guide-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome2-user-docs/introduction-to-gnome-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome2-user-docs/system-admin-guide-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/gosbasic-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/gosbasic-hu.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/gosbasic-ro.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/goscustaccess-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/goscustaccess-hu.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/goscustaccess-ro.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/goscustdesk-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/goscustdesk-hu.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/goscustdesk-ro.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/goscustlookandfeel-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/goscustlookandfeel-hu.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/goscustlookandfeel-ro.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/gosdeskback-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/gosdeskback-hu.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/gosdeskback-ro.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/goseditmainmenu-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/goseditmainmenu-hu.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/goseditmainmenu-ro.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/gosmetacity-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/gosmetacity-hu.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/gosmetacity-ro.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/gosnautilus-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/gosnautilus-hu.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/gosnautilus-ro.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/gosoverview-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/gosoverview-hu.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/gosoverview-ro.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/gospanel-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/gospanel-hu.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/gospanel-ro.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/gosstartsession-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/gosstartsession-hu.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/gosstartsession-ro.omf 2>/dev/null || /usr/bin/true diff --git a/misc/gnomemimedata/Makefile b/misc/gnomemimedata/Makefile index c2398db0bce5..0a71aa6ba360 100644 --- a/misc/gnomemimedata/Makefile +++ b/misc/gnomemimedata/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomemimedata -PORTVERSION= 2.2.1 -PORTREVISION= 1 +PORTVERSION= 2.4.0 CATEGORIES= misc gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-mime-data/2.2 +MASTER_SITE_SUBDIR= sources/gnome-mime-data/2.4 DISTNAME= gnome-mime-data-${PORTVERSION} DIST_SUBDIR= gnome diff --git a/misc/gnomemimedata/distinfo b/misc/gnomemimedata/distinfo index 421ccdc27beb..b220e9a7b7aa 100644 --- a/misc/gnomemimedata/distinfo +++ b/misc/gnomemimedata/distinfo @@ -1 +1 @@ -MD5 (gnome/gnome-mime-data-2.2.1.tar.bz2) = 05f5a490434c33a060ea7d140f60981f +MD5 (gnome/gnome-mime-data-2.4.0.tar.bz2) = b8f1b383a23d734bec8bc33a03cb3690 diff --git a/misc/gnomemimedata/pkg-plist b/misc/gnomemimedata/pkg-plist index 0772e3d3ae97..548dce8cb04d 100644 --- a/misc/gnomemimedata/pkg-plist +++ b/misc/gnomemimedata/pkg-plist @@ -3,188 +3,19 @@ libdata/pkgconfig/gnome-mime-data-2.0.pc share/gnome/application-registry/gnome-vfs.applications share/gnome/mime-info/gnome-vfs.keys share/gnome/mime-info/gnome-vfs.mime -share/gnome/pixmaps/document-icons/gnome-application-encapsulated_postscript.png -share/gnome/pixmaps/document-icons/gnome-application-msword.png -share/gnome/pixmaps/document-icons/gnome-application-pdf.png -share/gnome/pixmaps/document-icons/gnome-application-pgp.png -share/gnome/pixmaps/document-icons/gnome-application-pgp-encrypted.png -share/gnome/pixmaps/document-icons/gnome-application-pgp-keys.png -share/gnome/pixmaps/document-icons/gnome-application-postscript.png -share/gnome/pixmaps/document-icons/gnome-application-qif.png -share/gnome/pixmaps/document-icons/gnome-application-rtf.png -share/gnome/pixmaps/document-icons/gnome-application-smil.png -share/gnome/pixmaps/document-icons/gnome-application-vnd.lotus-1-2-3.png -share/gnome/pixmaps/document-icons/gnome-application-vnd.ms-excel.png -share/gnome/pixmaps/document-icons/gnome-application-vnd.ms-powerpoint.png -share/gnome/pixmaps/document-icons/gnome-application-vnd.rn-realmedia.png -share/gnome/pixmaps/document-icons/gnome-application-vnd.stardivision.calc.png -share/gnome/pixmaps/document-icons/gnome-application-vnd.stardivision.impress.png -share/gnome/pixmaps/document-icons/gnome-application-vnd.stardivision.writer.png -share/gnome/pixmaps/document-icons/gnome-application-vnd.sun.xml.calc.png -share/gnome/pixmaps/document-icons/gnome-application-vnd.sun.xml.impress.png -share/gnome/pixmaps/document-icons/gnome-application-vnd.sun.xml.writer.png -share/gnome/pixmaps/document-icons/gnome-application-x-abiword.png -share/gnome/pixmaps/document-icons/gnome-application-x-applix-spreadsheet.png -share/gnome/pixmaps/document-icons/gnome-application-x-applix-word.png -share/gnome/pixmaps/document-icons/gnome-application-x-arj.png -share/gnome/pixmaps/document-icons/gnome-application-x-backup.png -share/gnome/pixmaps/document-icons/gnome-application-x-blender.png -share/gnome/pixmaps/document-icons/gnome-application-x-bzip.png -share/gnome/pixmaps/document-icons/gnome-application-x-compress.png -share/gnome/pixmaps/document-icons/gnome-application-x-dc-rom.png -share/gnome/pixmaps/document-icons/gnome-application-x-deb.png -share/gnome/pixmaps/document-icons/gnome-application-x-dia-diagram.png -share/gnome/pixmaps/document-icons/gnome-application-x-dvi.png -share/gnome/pixmaps/document-icons/gnome-application-x-e-theme.png -share/gnome/pixmaps/document-icons/gnome-application-x-flac.png -share/gnome/pixmaps/document-icons/gnome-application-x-font-sunos-news.png -share/gnome/pixmaps/document-icons/gnome-application-x-gameboy-rom.png -share/gnome/pixmaps/document-icons/gnome-application-x-genesis-rom.png -share/gnome/pixmaps/document-icons/gnome-application-x-gnome-app-info.png -share/gnome/pixmaps/document-icons/gnome-application-x-gnumeric.png -share/gnome/pixmaps/document-icons/gnome-application-x-gtktalog.png -share/gnome/pixmaps/document-icons/gnome-application-x-gzip.png -share/gnome/pixmaps/document-icons/gnome-application-x-jar.png -share/gnome/pixmaps/document-icons/gnome-application-x-java-byte-code.png -share/gnome/pixmaps/document-icons/gnome-application-x-kde-app-info.png -share/gnome/pixmaps/document-icons/gnome-application-x-killustrator.png -share/gnome/pixmaps/document-icons/gnome-application-x-kpresenter.png -share/gnome/pixmaps/document-icons/gnome-application-x-kspread.png -share/gnome/pixmaps/document-icons/gnome-application-x-kword.png -share/gnome/pixmaps/document-icons/gnome-application-x-msx-rom.png -share/gnome/pixmaps/document-icons/gnome-application-x-n64-rom.png -share/gnome/pixmaps/document-icons/gnome-application-x-nes-rom.png -share/gnome/pixmaps/document-icons/gnome-application-x-ogg.png -share/gnome/pixmaps/document-icons/gnome-application-x-php.png -share/gnome/pixmaps/document-icons/gnome-application-x-python-bytecode.png -share/gnome/pixmaps/document-icons/gnome-application-x-reject.png -share/gnome/pixmaps/document-icons/gnome-application-x-rpm.png -share/gnome/pixmaps/document-icons/gnome-application-x-scheme-source.png -share/gnome/pixmaps/document-icons/gnome-application-x-sms-rom.png -share/gnome/pixmaps/document-icons/gnome-application-x-sql.png -share/gnome/pixmaps/document-icons/gnome-application-x-stuffit.png -share/gnome/pixmaps/document-icons/gnome-audio-ac3.png -share/gnome/pixmaps/document-icons/gnome-audio-basic.png -share/gnome/pixmaps/document-icons/gnome-audio-midi.png -share/gnome/pixmaps/document-icons/gnome-audio-mpeg.png -share/gnome/pixmaps/document-icons/gnome-audio-ulaw.png -share/gnome/pixmaps/document-icons/gnome-audio-x-aiff.png -share/gnome/pixmaps/document-icons/gnome-audio-x-bmx.png -share/gnome/pixmaps/document-icons/gnome-audio-x-it.png -share/gnome/pixmaps/document-icons/gnome-audio-x-mod.png -share/gnome/pixmaps/document-icons/gnome-audio-x-pn-realaudio.png -share/gnome/pixmaps/document-icons/gnome-audio-x-s3m.png -share/gnome/pixmaps/document-icons/gnome-audio-x-stm.png -share/gnome/pixmaps/document-icons/gnome-audio-x-voc.png -share/gnome/pixmaps/document-icons/gnome-audio-x-wav.png -share/gnome/pixmaps/document-icons/gnome-audio-x-xi.png -share/gnome/pixmaps/document-icons/gnome-audio-x-xm.png -share/gnome/pixmaps/document-icons/gnome-audio.png -share/gnome/pixmaps/document-icons/gnome-compressed.png -share/gnome/pixmaps/document-icons/gnome-font-afm.png -share/gnome/pixmaps/document-icons/gnome-font-bdf.png -share/gnome/pixmaps/document-icons/gnome-font-linux-psf.png -share/gnome/pixmaps/document-icons/gnome-font-ttf.png -share/gnome/pixmaps/document-icons/gnome-font-x-pcf.png -share/gnome/pixmaps/document-icons/gnome-http-url.png -share/gnome/pixmaps/document-icons/gnome-image-bmp.png -share/gnome/pixmaps/document-icons/gnome-image-generic.png -share/gnome/pixmaps/document-icons/gnome-image-gif.png -share/gnome/pixmaps/document-icons/gnome-image-ief.png -share/gnome/pixmaps/document-icons/gnome-image-jpeg.png -share/gnome/pixmaps/document-icons/gnome-image-pbm.png -share/gnome/pixmaps/document-icons/gnome-image-pgm.png -share/gnome/pixmaps/document-icons/gnome-image-png.png -share/gnome/pixmaps/document-icons/gnome-image-pnm.png -share/gnome/pixmaps/document-icons/gnome-image-ppm.png -share/gnome/pixmaps/document-icons/gnome-image-psd.png -share/gnome/pixmaps/document-icons/gnome-image-ras.png -share/gnome/pixmaps/document-icons/gnome-image-rgb.png -share/gnome/pixmaps/document-icons/gnome-image-svg.png -share/gnome/pixmaps/document-icons/gnome-image-tga.png -share/gnome/pixmaps/document-icons/gnome-image-tiff.png -share/gnome/pixmaps/document-icons/gnome-image-x-3ds.png -share/gnome/pixmaps/document-icons/gnome-image-x-applix-graphic.png -share/gnome/pixmaps/document-icons/gnome-image-x-lwo.png -share/gnome/pixmaps/document-icons/gnome-image-x-lws.png -share/gnome/pixmaps/document-icons/gnome-image-x-xfig.png -share/gnome/pixmaps/document-icons/gnome-image-xbm.png -share/gnome/pixmaps/document-icons/gnome-image-xcf.png -share/gnome/pixmaps/document-icons/gnome-image-xpm.png -share/gnome/pixmaps/document-icons/gnome-image-xwd.png -share/gnome/pixmaps/document-icons/gnome-library.png -share/gnome/pixmaps/document-icons/gnome-objectfile.png -share/gnome/pixmaps/document-icons/gnome-package.png -share/gnome/pixmaps/document-icons/gnome-tex.png -share/gnome/pixmaps/document-icons/gnome-text-abiword.png -share/gnome/pixmaps/document-icons/gnome-text-css.png -share/gnome/pixmaps/document-icons/gnome-text-html.png -share/gnome/pixmaps/document-icons/gnome-text-x-authors.png -share/gnome/pixmaps/document-icons/gnome-text-x-c.png -share/gnome/pixmaps/document-icons/gnome-text-x-c++.png -share/gnome/pixmaps/document-icons/gnome-text-x-c-header.png -share/gnome/pixmaps/document-icons/gnome-text-x-copying.png -share/gnome/pixmaps/document-icons/gnome-text-x-credits.png -share/gnome/pixmaps/document-icons/gnome-text-x-csh.png -share/gnome/pixmaps/document-icons/gnome-text-x-haskell.png -share/gnome/pixmaps/document-icons/gnome-text-x-install.png -share/gnome/pixmaps/document-icons/gnome-text-x-java.png -share/gnome/pixmaps/document-icons/gnome-text-x-literate-haskell.png -share/gnome/pixmaps/document-icons/gnome-text-x-lyx.png -share/gnome/pixmaps/document-icons/gnome-text-x-makefile.png -share/gnome/pixmaps/document-icons/gnome-text-x-patch.png -share/gnome/pixmaps/document-icons/gnome-text-x-perl.png -share/gnome/pixmaps/document-icons/gnome-text-x-python.png -share/gnome/pixmaps/document-icons/gnome-text-x-readme.png -share/gnome/pixmaps/document-icons/gnome-text-x-sh.png -share/gnome/pixmaps/document-icons/gnome-text-x-sql.png -share/gnome/pixmaps/document-icons/gnome-text-x-zsh.png -share/gnome/pixmaps/document-icons/gnome-text-xml.png -share/gnome/pixmaps/document-icons/gnome-textfile.png -share/gnome/pixmaps/document-icons/gnome-video-mpeg.png -share/gnome/pixmaps/document-icons/gnome-video-quicktime.png -share/gnome/pixmaps/document-icons/gnome-video-x-ms-asf.png -share/gnome/pixmaps/document-icons/gnome-video-x-ms-wmv.png -share/gnome/pixmaps/document-icons/gnome-video-x-msvideo.png -share/gnome/pixmaps/document-icons/gnome-x-font-afm.png -share/gnome/pixmaps/document-icons/gnome-x-troff-man.png -share/gnome/pixmaps/document-icons/i-blockdev.png -share/gnome/pixmaps/document-icons/i-cdrom-audio.png -share/gnome/pixmaps/document-icons/i-cdrom.png -share/gnome/pixmaps/document-icons/i-chardev.png -share/gnome/pixmaps/document-icons/i-core.png -share/gnome/pixmaps/document-icons/i-dvd.png -share/gnome/pixmaps/document-icons/i-executable.png -share/gnome/pixmaps/document-icons/i-fifo.png -share/gnome/pixmaps/document-icons/i-floppy.png -share/gnome/pixmaps/document-icons/i-ftp.png -share/gnome/pixmaps/document-icons/i-harddisk.png -share/gnome/pixmaps/document-icons/i-manual.png -share/gnome/pixmaps/document-icons/i-music-12.png -share/gnome/pixmaps/document-icons/i-music-24.png -share/gnome/pixmaps/document-icons/i-music-36.png -share/gnome/pixmaps/document-icons/i-music.png -share/gnome/pixmaps/document-icons/i-network.png -share/gnome/pixmaps/document-icons/i-nfs.png -share/gnome/pixmaps/document-icons/i-printer.png -share/gnome/pixmaps/document-icons/i-regular-72.png -share/gnome/pixmaps/document-icons/i-regular-96.png -share/gnome/pixmaps/document-icons/i-regular.png -share/gnome/pixmaps/document-icons/i-regular.xml -share/gnome/pixmaps/document-icons/i-smb.png -share/gnome/pixmaps/document-icons/i-sock.png -share/gnome/pixmaps/document-icons/i-spreadsheet.png -share/gnome/pixmaps/document-icons/i-web.png -share/gnome/pixmaps/document-icons/i-zipdisk.png share/locale/am/LC_MESSAGES/gnome-mime-data.mo +share/locale/ar/LC_MESSAGES/gnome-mime-data.mo share/locale/az/LC_MESSAGES/gnome-mime-data.mo share/locale/be/LC_MESSAGES/gnome-mime-data.mo share/locale/bg/LC_MESSAGES/gnome-mime-data.mo share/locale/bn/LC_MESSAGES/gnome-mime-data.mo share/locale/ca/LC_MESSAGES/gnome-mime-data.mo +share/locale/cs/LC_MESSAGES/gnome-mime-data.mo +share/locale/cy/LC_MESSAGES/gnome-mime-data.mo share/locale/da/LC_MESSAGES/gnome-mime-data.mo share/locale/de/LC_MESSAGES/gnome-mime-data.mo share/locale/el/LC_MESSAGES/gnome-mime-data.mo +share/locale/eo/LC_MESSAGES/gnome-mime-data.mo share/locale/es/LC_MESSAGES/gnome-mime-data.mo share/locale/et/LC_MESSAGES/gnome-mime-data.mo share/locale/eu/LC_MESSAGES/gnome-mime-data.mo @@ -197,15 +28,18 @@ share/locale/he/LC_MESSAGES/gnome-mime-data.mo share/locale/hi/LC_MESSAGES/gnome-mime-data.mo share/locale/hu/LC_MESSAGES/gnome-mime-data.mo share/locale/id/LC_MESSAGES/gnome-mime-data.mo +share/locale/is/LC_MESSAGES/gnome-mime-data.mo share/locale/it/LC_MESSAGES/gnome-mime-data.mo share/locale/ja/LC_MESSAGES/gnome-mime-data.mo share/locale/ko/LC_MESSAGES/gnome-mime-data.mo +share/locale/li/LC_MESSAGES/gnome-mime-data.mo share/locale/lt/LC_MESSAGES/gnome-mime-data.mo share/locale/lv/LC_MESSAGES/gnome-mime-data.mo share/locale/mk/LC_MESSAGES/gnome-mime-data.mo share/locale/ml/LC_MESSAGES/gnome-mime-data.mo share/locale/mn/LC_MESSAGES/gnome-mime-data.mo share/locale/ms/LC_MESSAGES/gnome-mime-data.mo +share/locale/ne/LC_MESSAGES/gnome-mime-data.mo share/locale/nl/LC_MESSAGES/gnome-mime-data.mo share/locale/nn/LC_MESSAGES/gnome-mime-data.mo share/locale/no/LC_MESSAGES/gnome-mime-data.mo @@ -216,6 +50,7 @@ share/locale/ro/LC_MESSAGES/gnome-mime-data.mo share/locale/ru/LC_MESSAGES/gnome-mime-data.mo share/locale/sk/LC_MESSAGES/gnome-mime-data.mo share/locale/sl/LC_MESSAGES/gnome-mime-data.mo +share/locale/sq/LC_MESSAGES/gnome-mime-data.mo share/locale/sr/LC_MESSAGES/gnome-mime-data.mo share/locale/sr@Latn/LC_MESSAGES/gnome-mime-data.mo share/locale/sv/LC_MESSAGES/gnome-mime-data.mo @@ -226,4 +61,3 @@ share/locale/wa/LC_MESSAGES/gnome-mime-data.mo share/locale/yi/LC_MESSAGES/gnome-mime-data.mo share/locale/zh_CN/LC_MESSAGES/gnome-mime-data.mo share/locale/zh_TW/LC_MESSAGES/gnome-mime-data.mo -@dirrm share/gnome/pixmaps/document-icons diff --git a/misc/gnomeuserdocs2/Makefile b/misc/gnomeuserdocs2/Makefile index 27932db97bda..f2306c401dae 100644 --- a/misc/gnomeuserdocs2/Makefile +++ b/misc/gnomeuserdocs2/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomeuserdocs2 -PORTVERSION= 2.0.6 -PORTREVISION= 1 +PORTVERSION= 2.4.0 CATEGORIES= misc gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome2-user-docs/2.0 +MASTER_SITE_SUBDIR= sources/gnome2-user-docs/2.4 DISTNAME= gnome2-user-docs-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/misc/gnomeuserdocs2/distinfo b/misc/gnomeuserdocs2/distinfo index 915b95a00a74..be2961a4bb51 100644 --- a/misc/gnomeuserdocs2/distinfo +++ b/misc/gnomeuserdocs2/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome2-user-docs-2.0.6.tar.bz2) = 78eefb360be381d34dcb1a98a3be5ff7 +MD5 (gnome2/gnome2-user-docs-2.4.0.tar.bz2) = 76a72340cc012148ed822857b1c7cf28 diff --git a/misc/gnomeuserdocs2/pkg-plist b/misc/gnomeuserdocs2/pkg-plist index 00a90f65b784..d2499be23c80 100644 --- a/misc/gnomeuserdocs2/pkg-plist +++ b/misc/gnomeuserdocs2/pkg-plist @@ -43,106 +43,35 @@ share/gnome/help/system-admin-guide/C/themes.xml share/gnome/help/user-guide/C/figures/applet_popup.png share/gnome/help/user-guide/C/figures/ask_pointer.png share/gnome/help/user-guide/C/figures/caution.png -share/gnome/help/user-guide/C/figures/cc_accessibility_window.png -share/gnome/help/user-guide/C/figures/cc_accessx.png -share/gnome/help/user-guide/C/figures/cc_accessx_filters_tab.png -share/gnome/help/user-guide/C/figures/cc_accessx_keyboard_tab.png -share/gnome/help/user-guide/C/figures/cc_accessx_misc_tab.png -share/gnome/help/user-guide/C/figures/cc_accessx_mouse_tab.png -share/gnome/help/user-guide/C/figures/cc_advanced_window.png -share/gnome/help/user-guide/C/figures/cc_appearance_tab.png -share/gnome/help/user-guide/C/figures/cc_apps_tab.png -share/gnome/help/user-guide/C/figures/cc_background_tab.png -share/gnome/help/user-guide/C/figures/cc_basic_keyboardshortcuts.png -share/gnome/help/user-guide/C/figures/cc_basic_keyboardsound_tab.png -share/gnome/help/user-guide/C/figures/cc_basic_mousemotion_tab.png -share/gnome/help/user-guide/C/figures/cc_basic_mousepointers_tab.png -share/gnome/help/user-guide/C/figures/cc_ccdb.png -share/gnome/help/user-guide/C/figures/cc_currentsession.png -share/gnome/help/user-guide/C/figures/cc_defaultbrowser_tab.png -share/gnome/help/user-guide/C/figures/cc_defaulteditor_tab.png -share/gnome/help/user-guide/C/figures/cc_defaulthelp_tab.png -share/gnome/help/user-guide/C/figures/cc_defaultterminal_tab.png -share/gnome/help/user-guide/C/figures/cc_defaultwbrowser_tab.png -share/gnome/help/user-guide/C/figures/cc_filesprograms_tab.png -share/gnome/help/user-guide/C/figures/cc_font_tab.png -share/gnome/help/user-guide/C/figures/cc_htmlkeyboard_tab.png -share/gnome/help/user-guide/C/figures/cc_htmlmisc_tab.png -share/gnome/help/user-guide/C/figures/cc_keyboard_tab.png -share/gnome/help/user-guide/C/figures/cc_keyboardsound_tab.png -share/gnome/help/user-guide/C/figures/cc_main_window.png -share/gnome/help/user-guide/C/figures/cc_metacity.png -share/gnome/help/user-guide/C/figures/cc_mimetypes_tab.png -share/gnome/help/user-guide/C/figures/cc_mouse_tab.png -share/gnome/help/user-guide/C/figures/cc_network.png -share/gnome/help/user-guide/C/figures/cc_panel.png -share/gnome/help/user-guide/C/figures/cc_session_options.png -share/gnome/help/user-guide/C/figures/cc_session_startupprogs.png -share/gnome/help/user-guide/C/figures/cc_sound_events.png -share/gnome/help/user-guide/C/figures/cc_sound_general.png -share/gnome/help/user-guide/C/figures/cc_theme_tab.png -share/gnome/help/user-guide/C/figures/cc_theme_tool.png -share/gnome/help/user-guide/C/figures/cc_theme_window_tab.png -share/gnome/help/user-guide/C/figures/cc_windows.png share/gnome/help/user-guide/C/figures/column_resize_pointer.png -share/gnome/help/user-guide/C/figures/controlcenter_anno_window.png -share/gnome/help/user-guide/C/figures/controlcenter_icon.png share/gnome/help/user-guide/C/figures/copy_pointer.png share/gnome/help/user-guide/C/figures/corner_resize_pointer.png -share/gnome/help/user-guide/C/figures/drawerprop_dialog.png share/gnome/help/user-guide/C/figures/file_manager_menu.png share/gnome/help/user-guide/C/figures/footprint_icon.png +share/gnome/help/user-guide/C/figures/force_quit.png share/gnome/help/user-guide/C/figures/four_hide_button.png -share/gnome/help/user-guide/C/figures/gedit2_window.png -share/gnome/help/user-guide/C/figures/gedit_pref2_dialog.png share/gnome/help/user-guide/C/figures/gedit_pref_dialog.png share/gnome/help/user-guide/C/figures/gedit_window.png share/gnome/help/user-guide/C/figures/gnome-logo-icon.png -share/gnome/help/user-guide/C/figures/gnome-logo.png share/gnome/help/user-guide/C/figures/gnome_panel.png -share/gnome/help/user-guide/C/figures/gnometerminal_icon.png -share/gnome/help/user-guide/C/figures/help_icon.png share/gnome/help/user-guide/C/figures/horiz_resize_pointer.png share/gnome/help/user-guide/C/figures/launcher_popup.png -share/gnome/help/user-guide/C/figures/launcherprop1_dialog.png -share/gnome/help/user-guide/C/figures/launcherprop2_dialog.png share/gnome/help/user-guide/C/figures/link_pointer.png share/gnome/help/user-guide/C/figures/lockscreen_icon.png share/gnome/help/user-guide/C/figures/logout_icon.png -share/gnome/help/user-guide/C/figures/menu_editor_anno_window.png +share/gnome/help/user-guide/C/figures/menu_bar_applet.png share/gnome/help/user-guide/C/figures/menu_panel.png share/gnome/help/user-guide/C/figures/move_panel_object_pointer.png share/gnome/help/user-guide/C/figures/move_pointer.png -share/gnome/help/user-guide/C/figures/naut_anno_desktop.png -share/gnome/help/user-guide/C/figures/naut_desktop.png -share/gnome/help/user-guide/C/figures/naut_file_navigation_pane.png -share/gnome/help/user-guide/C/figures/naut_folder_navigation_pane.png -share/gnome/help/user-guide/C/figures/naut_history_tab.png +share/gnome/help/user-guide/C/figures/naut_audioview_window.png share/gnome/help/user-guide/C/figures/naut_home_launcher.png share/gnome/help/user-guide/C/figures/naut_iconview_anno_window.png share/gnome/help/user-guide/C/figures/naut_iconview_window.png share/gnome/help/user-guide/C/figures/naut_link_emblem.png -share/gnome/help/user-guide/C/figures/naut_listview_anno_window.png share/gnome/help/user-guide/C/figures/naut_listview_window.png -share/gnome/help/user-guide/C/figures/naut_navigation_anno_pane.png -share/gnome/help/user-guide/C/figures/naut_news_edit_tab.png -share/gnome/help/user-guide/C/figures/naut_news_select_tab.png -share/gnome/help/user-guide/C/figures/naut_news_tab.png share/gnome/help/user-guide/C/figures/naut_noread_emblem.png share/gnome/help/user-guide/C/figures/naut_normal_size_button.png -share/gnome/help/user-guide/C/figures/naut_notes_tab.png share/gnome/help/user-guide/C/figures/naut_nowrite_emblem.png -share/gnome/help/user-guide/C/figures/naut_pref_appear_dialog.png -share/gnome/help/user-guide/C/figures/naut_pref_icon_dialog.png -share/gnome/help/user-guide/C/figures/naut_pref_iconcaptions_dialog.png -share/gnome/help/user-guide/C/figures/naut_pref_navigation_dialog.png -share/gnome/help/user-guide/C/figures/naut_pref_sidebar_dialog.png -share/gnome/help/user-guide/C/figures/naut_pref_speed_dialog.png -share/gnome/help/user-guide/C/figures/naut_pref_trash_dialog.png -share/gnome/help/user-guide/C/figures/naut_pref_view_dialog.png -share/gnome/help/user-guide/C/figures/naut_pref_window_dialog.png -share/gnome/help/user-guide/C/figures/naut_prop_basic_window.png -share/gnome/help/user-guide/C/figures/naut_prop_emblem_window.png share/gnome/help/user-guide/C/figures/naut_sampleemblem1_icon.png share/gnome/help/user-guide/C/figures/naut_sampleemblem2_icon.png share/gnome/help/user-guide/C/figures/naut_sampleemblem3_icon.png @@ -152,45 +81,26 @@ share/gnome/help/user-guide/C/figures/naut_sort_arrow_icon.png share/gnome/help/user-guide/C/figures/naut_starthere_launcher.png share/gnome/help/user-guide/C/figures/naut_trash_launcher.png share/gnome/help/user-guide/C/figures/naut_tree_tab.png -share/gnome/help/user-guide/C/figures/naut_viewasother_dialog.png share/gnome/help/user-guide/C/figures/naut_viewpane_text_window.png -share/gnome/help/user-guide/C/figures/naut_website_window.png -share/gnome/help/user-guide/C/figures/naut_zoom_anno_control.png share/gnome/help/user-guide/C/figures/naut_zoom_in_button.png share/gnome/help/user-guide/C/figures/naut_zoom_out_button.png -share/gnome/help/user-guide/C/figures/netscape_icon.png share/gnome/help/user-guide/C/figures/normal_pointer.png share/gnome/help/user-guide/C/figures/not_available_pointer.png share/gnome/help/user-guide/C/figures/note.png +share/gnome/help/user-guide/C/figures/notification_area_icon.png share/gnome/help/user-guide/C/figures/open_drawer.png share/gnome/help/user-guide/C/figures/open_main_menu.png share/gnome/help/user-guide/C/figures/openwindows_menu.png share/gnome/help/user-guide/C/figures/panel_object_popup_menu.png -share/gnome/help/user-guide/C/figures/panelprop_dialog.png -share/gnome/help/user-guide/C/figures/rmedia_floppy_format_dialog.png -share/gnome/help/user-guide/C/figures/rmedia_format_dialog.png -share/gnome/help/user-guide/C/figures/rmedia_properties1_dialog.png -share/gnome/help/user-guide/C/figures/rmedia_protection_dialog.png -share/gnome/help/user-guide/C/figures/rmedia_slice_dialog.png share/gnome/help/user-guide/C/figures/run_button.png -share/gnome/help/user-guide/C/figures/runprogram2_dialog.png -share/gnome/help/user-guide/C/figures/runprogram_dialog.png -share/gnome/help/user-guide/C/figures/runprogram_icon.png share/gnome/help/user-guide/C/figures/sample_anno_panel.png share/gnome/help/user-guide/C/figures/sample_applet.png -share/gnome/help/user-guide/C/figures/sampleemblem_icon.png share/gnome/help/user-guide/C/figures/screenshot_button.png share/gnome/help/user-guide/C/figures/searchtool_button.png -share/gnome/help/user-guide/C/figures/statusdock2_button.png -share/gnome/help/user-guide/C/figures/statusdock_button.png -share/gnome/help/user-guide/C/figures/tasklist_applet.png -share/gnome/help/user-guide/C/figures/tasklist_group2_applet.png -share/gnome/help/user-guide/C/figures/tasklist_group_applet.png +share/gnome/help/user-guide/C/figures/show_desktop_button.png share/gnome/help/user-guide/C/figures/tip.png -share/gnome/help/user-guide/C/figures/titlebar_anno_msw_window.png share/gnome/help/user-guide/C/figures/titlebar_anno_window.png share/gnome/help/user-guide/C/figures/typical_anno_desktop.png -share/gnome/help/user-guide/C/figures/typical_anno_menu.png share/gnome/help/user-guide/C/figures/typical_menu.png share/gnome/help/user-guide/C/figures/vert_resize_pointer.png share/gnome/help/user-guide/C/figures/warning.png @@ -226,259 +136,6 @@ share/gnome/help/user-guide/C/wgosnautilus.xml share/gnome/help/user-guide/C/wgosoverview.xml share/gnome/help/user-guide/C/wgospanel.xml share/gnome/help/user-guide/C/wgosstartsession.xml -share/gnome/help/user-guide/hu/figures/ask_pointer.png -share/gnome/help/user-guide/hu/figures/column_resize_pointer.png -share/gnome/help/user-guide/hu/figures/copy_pointer.png -share/gnome/help/user-guide/hu/figures/corner_resize_pointer.png -share/gnome/help/user-guide/hu/figures/file_manager_menu.png -share/gnome/help/user-guide/hu/figures/footprint_icon.png -share/gnome/help/user-guide/hu/figures/four_hide_button.png -share/gnome/help/user-guide/hu/figures/gnome_panel.png -share/gnome/help/user-guide/hu/figures/horiz_resize_pointer.png -share/gnome/help/user-guide/hu/figures/launcher_popup.png -share/gnome/help/user-guide/hu/figures/link_pointer.png -share/gnome/help/user-guide/hu/figures/lockscreen_icon.png -share/gnome/help/user-guide/hu/figures/logout_icon.png -share/gnome/help/user-guide/hu/figures/move_panel_object_pointer.png -share/gnome/help/user-guide/hu/figures/move_pointer.png -share/gnome/help/user-guide/hu/figures/naut_file_navigation_pane.png -share/gnome/help/user-guide/hu/figures/naut_home_launcher.png -share/gnome/help/user-guide/hu/figures/naut_iconview_anno_window.png -share/gnome/help/user-guide/hu/figures/naut_iconview_window.png -share/gnome/help/user-guide/hu/figures/naut_link_emblem.png -share/gnome/help/user-guide/hu/figures/naut_listview_window.png -share/gnome/help/user-guide/hu/figures/naut_noread_emblem.png -share/gnome/help/user-guide/hu/figures/naut_normal_size_button.png -share/gnome/help/user-guide/hu/figures/naut_nowrite_emblem.png -share/gnome/help/user-guide/hu/figures/naut_sampleemblem1_icon.png -share/gnome/help/user-guide/hu/figures/naut_sampleemblem2_icon.png -share/gnome/help/user-guide/hu/figures/naut_sampleemblem3_icon.png -share/gnome/help/user-guide/hu/figures/naut_sampleemblem_icon.png -share/gnome/help/user-guide/hu/figures/naut_samplesymlink_icon.png -share/gnome/help/user-guide/hu/figures/naut_sort_arrow_icon.png -share/gnome/help/user-guide/hu/figures/naut_starthere_launcher.png -share/gnome/help/user-guide/hu/figures/naut_trash_launcher.png -share/gnome/help/user-guide/hu/figures/naut_viewpane_text_window.png -share/gnome/help/user-guide/hu/figures/naut_zoom_anno_control.png -share/gnome/help/user-guide/hu/figures/naut_zoom_in_button.png -share/gnome/help/user-guide/hu/figures/naut_zoom_out_button.png -share/gnome/help/user-guide/hu/figures/normal_pointer.png -share/gnome/help/user-guide/hu/figures/not_available_pointer.png -share/gnome/help/user-guide/hu/figures/open_drawer.png -share/gnome/help/user-guide/hu/figures/open_main_menu.png -share/gnome/help/user-guide/hu/figures/openwindows_menu.png -share/gnome/help/user-guide/hu/figures/panel_object_popup_menu.png -share/gnome/help/user-guide/hu/figures/sample_anno_panel.png -share/gnome/help/user-guide/hu/figures/sample_applet.png -share/gnome/help/user-guide/hu/figures/titlebar_anno_window.png -share/gnome/help/user-guide/hu/figures/typical_anno_desktop.png -share/gnome/help/user-guide/hu/figures/typical_menu.png -share/gnome/help/user-guide/hu/figures/vert_resize_pointer.png -share/gnome/help/user-guide/hu/figures/window_list_applet.png -share/gnome/help/user-guide/hu/figures/window_list_group_applet.png -share/gnome/help/user-guide/hu/figures/window_menu.png -share/gnome/help/user-guide/hu/figures/workspace_switcher_applet.png -share/gnome/help/user-guide/hu/front.xml -share/gnome/help/user-guide/hu/glossary.xml -share/gnome/help/user-guide/hu/gosbasic.xml -share/gnome/help/user-guide/hu/goscustaccess.xml -share/gnome/help/user-guide/hu/goscustdesk.xml -share/gnome/help/user-guide/hu/goscustlookandfeel.xml -share/gnome/help/user-guide/hu/gosdeskback.xml -share/gnome/help/user-guide/hu/goseditmainmenu.xml -share/gnome/help/user-guide/hu/gosmetacity.xml -share/gnome/help/user-guide/hu/gosnautilus.xml -share/gnome/help/user-guide/hu/gosoverview.xml -share/gnome/help/user-guide/hu/gospanel.xml -share/gnome/help/user-guide/hu/gosstartsession.xml -share/gnome/help/user-guide/hu/legal.xml -share/gnome/help/user-guide/hu/part1.xml -share/gnome/help/user-guide/hu/part2.xml -share/gnome/help/user-guide/hu/user-guide.xml -share/gnome/help/user-guide/hu/wgosbasic.xml -share/gnome/help/user-guide/hu/wgoscustaccess.xml -share/gnome/help/user-guide/hu/wgoscustdesk.xml -share/gnome/help/user-guide/hu/wgoscustlookandfeel.xml -share/gnome/help/user-guide/hu/wgosdeskback.xml -share/gnome/help/user-guide/hu/wgoseditmainmenu.xml -share/gnome/help/user-guide/hu/wgosmetacity.xml -share/gnome/help/user-guide/hu/wgosnautilus.xml -share/gnome/help/user-guide/hu/wgosoverview.xml -share/gnome/help/user-guide/hu/wgospanel.xml -share/gnome/help/user-guide/hu/wgosstartsession.xml -share/gnome/help/user-guide/ro/figures/applet_popup.png -share/gnome/help/user-guide/ro/figures/ask_pointer.png -share/gnome/help/user-guide/ro/figures/cc_accessibility_window.png -share/gnome/help/user-guide/ro/figures/cc_accessx.png -share/gnome/help/user-guide/ro/figures/cc_accessx_keyboard_tab.png -share/gnome/help/user-guide/ro/figures/cc_accessx_misc_tab.png -share/gnome/help/user-guide/ro/figures/cc_advanced_window.png -share/gnome/help/user-guide/ro/figures/cc_appearance_tab.png -share/gnome/help/user-guide/ro/figures/cc_apps_tab.png -share/gnome/help/user-guide/ro/figures/cc_background_tab.png -share/gnome/help/user-guide/ro/figures/cc_basic_keyboardshortcuts.png -share/gnome/help/user-guide/ro/figures/cc_basic_keyboardsound_tab.png -share/gnome/help/user-guide/ro/figures/cc_basic_mousemotion_tab.png -share/gnome/help/user-guide/ro/figures/cc_basic_mousepointers_tab.png -share/gnome/help/user-guide/ro/figures/cc_ccdb.png -share/gnome/help/user-guide/ro/figures/cc_currentsession.png -share/gnome/help/user-guide/ro/figures/cc_defaultbrowser_tab.png -share/gnome/help/user-guide/ro/figures/cc_defaulteditor_tab.png -share/gnome/help/user-guide/ro/figures/cc_defaulthelp_tab.png -share/gnome/help/user-guide/ro/figures/cc_defaultterminal_tab.png -share/gnome/help/user-guide/ro/figures/cc_defaultwbrowser_tab.png -share/gnome/help/user-guide/ro/figures/cc_filesprograms_tab.png -share/gnome/help/user-guide/ro/figures/cc_font_tab.png -share/gnome/help/user-guide/ro/figures/cc_htmlkeyboard_tab.png -share/gnome/help/user-guide/ro/figures/cc_htmlmisc_tab.png -share/gnome/help/user-guide/ro/figures/cc_keyboard_tab.png -share/gnome/help/user-guide/ro/figures/cc_keyboardsound_tab.png -share/gnome/help/user-guide/ro/figures/cc_main_window.png -share/gnome/help/user-guide/ro/figures/cc_metacity.png -share/gnome/help/user-guide/ro/figures/cc_mimetypes_tab.png -share/gnome/help/user-guide/ro/figures/cc_mouse_tab.png -share/gnome/help/user-guide/ro/figures/cc_network.png -share/gnome/help/user-guide/ro/figures/cc_panel.png -share/gnome/help/user-guide/ro/figures/cc_session_options.png -share/gnome/help/user-guide/ro/figures/cc_session_startupprogs.png -share/gnome/help/user-guide/ro/figures/cc_sound_events.png -share/gnome/help/user-guide/ro/figures/cc_sound_general.png -share/gnome/help/user-guide/ro/figures/cc_theme_tab.png -share/gnome/help/user-guide/ro/figures/cc_theme_window_tab.png -share/gnome/help/user-guide/ro/figures/column_resize_pointer.png -share/gnome/help/user-guide/ro/figures/controlcenter_anno_window.png -share/gnome/help/user-guide/ro/figures/controlcenter_icon.png -share/gnome/help/user-guide/ro/figures/copy_pointer.png -share/gnome/help/user-guide/ro/figures/corner_resize_pointer.png -share/gnome/help/user-guide/ro/figures/drawerprop_dialog.png -share/gnome/help/user-guide/ro/figures/file_manager_menu.png -share/gnome/help/user-guide/ro/figures/footprint_icon.png -share/gnome/help/user-guide/ro/figures/four_hide_button.png -share/gnome/help/user-guide/ro/figures/gedit2_window.png -share/gnome/help/user-guide/ro/figures/gedit_pref2_dialog.png -share/gnome/help/user-guide/ro/figures/gedit_pref_dialog.png -share/gnome/help/user-guide/ro/figures/gedit_window.png -share/gnome/help/user-guide/ro/figures/gnome-logo.png -share/gnome/help/user-guide/ro/figures/gnome_panel.png -share/gnome/help/user-guide/ro/figures/gnometerminal_icon.png -share/gnome/help/user-guide/ro/figures/help_icon.png -share/gnome/help/user-guide/ro/figures/horiz_resize_pointer.png -share/gnome/help/user-guide/ro/figures/launcher_popup.png -share/gnome/help/user-guide/ro/figures/launcherprop1_dialog.png -share/gnome/help/user-guide/ro/figures/launcherprop2_dialog.png -share/gnome/help/user-guide/ro/figures/link_pointer.png -share/gnome/help/user-guide/ro/figures/lockscreen_icon.png -share/gnome/help/user-guide/ro/figures/logout_icon.png -share/gnome/help/user-guide/ro/figures/menu_editor_anno_window.png -share/gnome/help/user-guide/ro/figures/menu_panel.png -share/gnome/help/user-guide/ro/figures/move_panel_object_pointer.png -share/gnome/help/user-guide/ro/figures/move_pointer.png -share/gnome/help/user-guide/ro/figures/naut_anno_desktop.png -share/gnome/help/user-guide/ro/figures/naut_desktop.png -share/gnome/help/user-guide/ro/figures/naut_file_navigation_pane.png -share/gnome/help/user-guide/ro/figures/naut_folder_navigation_pane.png -share/gnome/help/user-guide/ro/figures/naut_history_tab.png -share/gnome/help/user-guide/ro/figures/naut_home_launcher.png -share/gnome/help/user-guide/ro/figures/naut_iconview_anno_window.png -share/gnome/help/user-guide/ro/figures/naut_iconview_window.png -share/gnome/help/user-guide/ro/figures/naut_link_emblem.png -share/gnome/help/user-guide/ro/figures/naut_listview_anno_window.png -share/gnome/help/user-guide/ro/figures/naut_listview_window.png -share/gnome/help/user-guide/ro/figures/naut_navigation_anno_pane.png -share/gnome/help/user-guide/ro/figures/naut_news_edit_tab.png -share/gnome/help/user-guide/ro/figures/naut_news_select_tab.png -share/gnome/help/user-guide/ro/figures/naut_news_tab.png -share/gnome/help/user-guide/ro/figures/naut_noread_emblem.png -share/gnome/help/user-guide/ro/figures/naut_normal_size_button.png -share/gnome/help/user-guide/ro/figures/naut_notes_tab.png -share/gnome/help/user-guide/ro/figures/naut_nowrite_emblem.png -share/gnome/help/user-guide/ro/figures/naut_pref_appear_dialog.png -share/gnome/help/user-guide/ro/figures/naut_pref_icon_dialog.png -share/gnome/help/user-guide/ro/figures/naut_pref_iconcaptions_dialog.png -share/gnome/help/user-guide/ro/figures/naut_pref_navigation_dialog.png -share/gnome/help/user-guide/ro/figures/naut_pref_sidebar_dialog.png -share/gnome/help/user-guide/ro/figures/naut_pref_speed_dialog.png -share/gnome/help/user-guide/ro/figures/naut_pref_trash_dialog.png -share/gnome/help/user-guide/ro/figures/naut_pref_view_dialog.png -share/gnome/help/user-guide/ro/figures/naut_pref_window_dialog.png -share/gnome/help/user-guide/ro/figures/naut_prop_basic_window.png -share/gnome/help/user-guide/ro/figures/naut_prop_emblem_window.png -share/gnome/help/user-guide/ro/figures/naut_sampleemblem1_icon.png -share/gnome/help/user-guide/ro/figures/naut_sampleemblem2_icon.png -share/gnome/help/user-guide/ro/figures/naut_sampleemblem3_icon.png -share/gnome/help/user-guide/ro/figures/naut_sampleemblem_icon.png -share/gnome/help/user-guide/ro/figures/naut_samplesymlink_icon.png -share/gnome/help/user-guide/ro/figures/naut_sort_arrow_icon.png -share/gnome/help/user-guide/ro/figures/naut_starthere_launcher.png -share/gnome/help/user-guide/ro/figures/naut_trash_launcher.png -share/gnome/help/user-guide/ro/figures/naut_tree_tab.png -share/gnome/help/user-guide/ro/figures/naut_viewasother_dialog.png -share/gnome/help/user-guide/ro/figures/naut_viewpane_text_window.png -share/gnome/help/user-guide/ro/figures/naut_website_window.png -share/gnome/help/user-guide/ro/figures/naut_zoom_anno_control.png -share/gnome/help/user-guide/ro/figures/naut_zoom_in_button.png -share/gnome/help/user-guide/ro/figures/naut_zoom_out_button.png -share/gnome/help/user-guide/ro/figures/netscape_icon.png -share/gnome/help/user-guide/ro/figures/normal_pointer.png -share/gnome/help/user-guide/ro/figures/not_available_pointer.png -share/gnome/help/user-guide/ro/figures/open_drawer.png -share/gnome/help/user-guide/ro/figures/open_main_menu.png -share/gnome/help/user-guide/ro/figures/openwindows_menu.png -share/gnome/help/user-guide/ro/figures/panel_object_popup_menu.png -share/gnome/help/user-guide/ro/figures/panelprop_dialog.png -share/gnome/help/user-guide/ro/figures/rmedia_format_dialog.png -share/gnome/help/user-guide/ro/figures/rmedia_properties1_dialog.png -share/gnome/help/user-guide/ro/figures/rmedia_protection_dialog.png -share/gnome/help/user-guide/ro/figures/rmedia_slice_dialog.png -share/gnome/help/user-guide/ro/figures/runprogram2_dialog.png -share/gnome/help/user-guide/ro/figures/runprogram_dialog.png -share/gnome/help/user-guide/ro/figures/runprogram_icon.png -share/gnome/help/user-guide/ro/figures/sample_anno_panel.png -share/gnome/help/user-guide/ro/figures/sample_applet.png -share/gnome/help/user-guide/ro/figures/sampleemblem_icon.png -share/gnome/help/user-guide/ro/figures/statusdock2_button.png -share/gnome/help/user-guide/ro/figures/statusdock_button.png -share/gnome/help/user-guide/ro/figures/tasklist_applet.png -share/gnome/help/user-guide/ro/figures/tasklist_group2_applet.png -share/gnome/help/user-guide/ro/figures/tasklist_group_applet.png -share/gnome/help/user-guide/ro/figures/titlebar_anno_msw_window.png -share/gnome/help/user-guide/ro/figures/titlebar_anno_window.png -share/gnome/help/user-guide/ro/figures/typical_anno_desktop.png -share/gnome/help/user-guide/ro/figures/typical_anno_menu.png -share/gnome/help/user-guide/ro/figures/typical_menu.png -share/gnome/help/user-guide/ro/figures/vert_resize_pointer.png -share/gnome/help/user-guide/ro/figures/window_list_applet.png -share/gnome/help/user-guide/ro/figures/window_list_group_applet.png -share/gnome/help/user-guide/ro/figures/window_menu.png -share/gnome/help/user-guide/ro/figures/workspace_switcher_applet.png -share/gnome/help/user-guide/ro/front.xml -share/gnome/help/user-guide/ro/glossary.xml -share/gnome/help/user-guide/ro/gosbasic.xml -share/gnome/help/user-guide/ro/goscustaccess.xml -share/gnome/help/user-guide/ro/goscustdesk.xml -share/gnome/help/user-guide/ro/goscustlookandfeel.xml -share/gnome/help/user-guide/ro/gosdeskback.xml -share/gnome/help/user-guide/ro/goseditmainmenu.xml -share/gnome/help/user-guide/ro/gosmetacity.xml -share/gnome/help/user-guide/ro/gosnautilus.xml -share/gnome/help/user-guide/ro/gosoverview.xml -share/gnome/help/user-guide/ro/gospanel.xml -share/gnome/help/user-guide/ro/gosstartsession.xml -share/gnome/help/user-guide/ro/legal.xml -share/gnome/help/user-guide/ro/part1.xml -share/gnome/help/user-guide/ro/part2.xml -share/gnome/help/user-guide/ro/user-guide.xml -share/gnome/help/user-guide/ro/wgosbasic.xml -share/gnome/help/user-guide/ro/wgoscustaccess.xml -share/gnome/help/user-guide/ro/wgoscustdesk.xml -share/gnome/help/user-guide/ro/wgoscustlookandfeel.xml -share/gnome/help/user-guide/ro/wgosdeskback.xml -share/gnome/help/user-guide/ro/wgoseditmainmenu.xml -share/gnome/help/user-guide/ro/wgosmetacity.xml -share/gnome/help/user-guide/ro/wgosnautilus.xml -share/gnome/help/user-guide/ro/wgosoverview.xml -share/gnome/help/user-guide/ro/wgospanel.xml -share/gnome/help/user-guide/ro/wgosstartsession.xml share/gnome/omf/gnome2-user-docs/gnome-access-guide-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome2-user-docs/gnome-access-guide-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome2-user-docs/introduction-to-gnome-C.omf @@ -487,120 +144,46 @@ share/gnome/omf/gnome2-user-docs/system-admin-guide-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome2-user-docs/system-admin-guide-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/user-guide/gosbasic-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/gosbasic-C.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/user-guide/gosbasic-hu.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/gosbasic-hu.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/user-guide/gosbasic-ro.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/gosbasic-ro.omf 2>/dev/null || /usr/bin/true share/gnome/omf/user-guide/goscustaccess-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/goscustaccess-C.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/user-guide/goscustaccess-hu.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/goscustaccess-hu.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/user-guide/goscustaccess-ro.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/goscustaccess-ro.omf 2>/dev/null || /usr/bin/true share/gnome/omf/user-guide/goscustdesk-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/goscustdesk-C.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/user-guide/goscustdesk-hu.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/goscustdesk-hu.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/user-guide/goscustdesk-ro.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/goscustdesk-ro.omf 2>/dev/null || /usr/bin/true share/gnome/omf/user-guide/goscustlookandfeel-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/goscustlookandfeel-C.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/user-guide/goscustlookandfeel-hu.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/goscustlookandfeel-hu.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/user-guide/goscustlookandfeel-ro.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/goscustlookandfeel-ro.omf 2>/dev/null || /usr/bin/true share/gnome/omf/user-guide/gosdeskback-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/gosdeskback-C.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/user-guide/gosdeskback-hu.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/gosdeskback-hu.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/user-guide/gosdeskback-ro.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/gosdeskback-ro.omf 2>/dev/null || /usr/bin/true share/gnome/omf/user-guide/goseditmainmenu-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/goseditmainmenu-C.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/user-guide/goseditmainmenu-hu.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/goseditmainmenu-hu.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/user-guide/goseditmainmenu-ro.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/goseditmainmenu-ro.omf 2>/dev/null || /usr/bin/true share/gnome/omf/user-guide/gosmetacity-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/gosmetacity-C.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/user-guide/gosmetacity-hu.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/gosmetacity-hu.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/user-guide/gosmetacity-ro.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/gosmetacity-ro.omf 2>/dev/null || /usr/bin/true share/gnome/omf/user-guide/gosnautilus-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/gosnautilus-C.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/user-guide/gosnautilus-hu.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/gosnautilus-hu.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/user-guide/gosnautilus-ro.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/gosnautilus-ro.omf 2>/dev/null || /usr/bin/true share/gnome/omf/user-guide/gosoverview-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/gosoverview-C.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/user-guide/gosoverview-hu.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/gosoverview-hu.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/user-guide/gosoverview-ro.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/gosoverview-ro.omf 2>/dev/null || /usr/bin/true share/gnome/omf/user-guide/gospanel-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/gospanel-C.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/user-guide/gospanel-hu.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/gospanel-hu.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/user-guide/gospanel-ro.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/gospanel-ro.omf 2>/dev/null || /usr/bin/true share/gnome/omf/user-guide/gosstartsession-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/gosstartsession-C.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/user-guide/gosstartsession-hu.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/gosstartsession-hu.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/user-guide/gosstartsession-ro.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/gosstartsession-ro.omf 2>/dev/null || /usr/bin/true @dirrm share/gnome/omf/user-guide @dirrm share/gnome/omf/gnome2-user-docs -@dirrm share/gnome/help/user-guide/ro/figures -@dirrm share/gnome/help/user-guide/ro -@dirrm share/gnome/help/user-guide/hu/figures -@dirrm share/gnome/help/user-guide/hu @dirrm share/gnome/help/user-guide/C/figures @dirrm share/gnome/help/user-guide/C -@dirrm share/gnome/help/user-guide @dirrm share/gnome/help/system-admin-guide/C -@dirrm share/gnome/help/system-admin-guide @dirrm share/gnome/help/introduction-to-gnome/C/figures @dirrm share/gnome/help/introduction-to-gnome/C -@dirrm share/gnome/help/introduction-to-gnome @dirrm share/gnome/help/gnome-access-guide/C/figures @dirrm share/gnome/help/gnome-access-guide/C -@dirrm share/gnome/help/gnome-access-guide @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome2-user-docs/gnome-access-guide-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome2-user-docs/introduction-to-gnome-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome2-user-docs/system-admin-guide-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/gosbasic-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/gosbasic-hu.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/gosbasic-ro.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/goscustaccess-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/goscustaccess-hu.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/goscustaccess-ro.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/goscustdesk-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/goscustdesk-hu.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/goscustdesk-ro.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/goscustlookandfeel-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/goscustlookandfeel-hu.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/goscustlookandfeel-ro.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/gosdeskback-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/gosdeskback-hu.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/gosdeskback-ro.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/goseditmainmenu-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/goseditmainmenu-hu.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/goseditmainmenu-ro.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/gosmetacity-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/gosmetacity-hu.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/gosmetacity-ro.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/gosnautilus-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/gosnautilus-hu.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/gosnautilus-ro.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/gosoverview-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/gosoverview-hu.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/gosoverview-ro.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/gospanel-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/gospanel-hu.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/gospanel-ro.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/gosstartsession-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/gosstartsession-hu.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/gosstartsession-ro.omf 2>/dev/null || /usr/bin/true diff --git a/multimedia/acme/Makefile b/multimedia/acme/Makefile index fcc246503812..b073178a2674 100644 --- a/multimedia/acme/Makefile +++ b/multimedia/acme/Makefile @@ -6,10 +6,10 @@ # PORTNAME= acme -PORTVERSION= 2.0.6 +PORTVERSION= 2.4.0 CATEGORIES= multimedia gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.0 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.4 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/multimedia/acme/distinfo b/multimedia/acme/distinfo index 0c6be7a0c288..28200346a5f7 100644 --- a/multimedia/acme/distinfo +++ b/multimedia/acme/distinfo @@ -1 +1 @@ -MD5 (gnome2/acme-2.0.6.tar.bz2) = 231e19a92aa0e9f04282e19036daefad +MD5 (gnome2/acme-2.4.0.tar.bz2) = b61dd0d693064be42d59c6a9a8830cec diff --git a/multimedia/acme/pkg-plist b/multimedia/acme/pkg-plist index 8b27e412cd89..d13945c3373e 100644 --- a/multimedia/acme/pkg-plist +++ b/multimedia/acme/pkg-plist @@ -29,7 +29,9 @@ share/locale/et/LC_MESSAGES/acme.mo share/locale/fa/LC_MESSAGES/acme.mo share/locale/fi/LC_MESSAGES/acme.mo share/locale/fr/LC_MESSAGES/acme.mo +share/locale/ga/LC_MESSAGES/acme.mo share/locale/he/LC_MESSAGES/acme.mo +share/locale/hi/LC_MESSAGES/acme.mo share/locale/hu/LC_MESSAGES/acme.mo share/locale/id/LC_MESSAGES/acme.mo share/locale/is/LC_MESSAGES/acme.mo diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile index 05af689a3dce..5dc091b70ff9 100644 --- a/multimedia/gstreamer-plugins/Makefile +++ b/multimedia/gstreamer-plugins/Makefile @@ -6,27 +6,27 @@ # PORTNAME= gstreamer -PORTVERSION= 0.6.2 -PORTREVISION= 1 +PORTVERSION= 0.6.3 CATEGORIES= multimedia audio -#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -#MASTER_SITE_SUBDIR= ${PORTNAME} -MASTER_SITES= http://gstreamer.net/releases/${PORTVERSION}/src/ +MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITE_SUBDIR= sources/gst-plugins/0.6 PKGNAMESUFFIX= -plugins DISTNAME= gst-plugins-${PORTVERSION} +DIST_SUBDIR= gnome2 MAINTAINER= lioux@FreeBSD.org COMMENT= GStreamer written collection of plugins handling several media types -BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig LIB_DEPENDS= gstreamer-0.6.1:${PORTSDIR}/multimedia/gstreamer \ popt.0:${PORTSDIR}/devel/popt \ USE_X_PREFIX= yes +USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gnomehack \ gnomehier \ gnomeprefix \ + pkgconfig \ gconf2 USE_LIBTOOL= yes USE_REINPLACE= yes @@ -195,9 +195,10 @@ WITH_LIBDV=yes .endif # libdvdnav -.if exists(${LOCALBASE}/lib/libdvdnav.so) -WITH_LIBDVDNAV=yes -.endif +# XXX libdvdnav needs to be updated to 0.1.9 or higher +#.if exists(${LOCALBASE}/lib/libdvdnav.so) +.undef WITH_LIBDVDNAV +#.endif # libdvdread .if exists(${LOCALBASE}/lib/libdvdread.a) @@ -590,7 +591,7 @@ PLIST_SUB+= VORBIS="" CONFIGURE_ARGS+= --disable-xmms PLIST_SUB+= XMMS="@comment " .else -LIB_DEPENDS+= xmms.4:${PORTSDIR}/multimedia/xmms +LIB_DEPENDS+= xmms.3:${PORTSDIR}/multimedia/xmms CONFIGURE_ARGS+= --with-xmms-prefix=${X11BASE} \ --with-xmms-exec-prefix=${X11BASE} diff --git a/multimedia/gstreamer-plugins/distinfo b/multimedia/gstreamer-plugins/distinfo index a6d06ee91e34..8ff1da2054a0 100644 --- a/multimedia/gstreamer-plugins/distinfo +++ b/multimedia/gstreamer-plugins/distinfo @@ -1 +1 @@ -MD5 (gst-plugins-0.6.2.tar.gz) = ef7b6ce20e32e9abae22aeb2169f4055 +MD5 (gnome2/gst-plugins-0.6.3.tar.bz2) = 3cc128c526e1537267df74fd201b7376 diff --git a/multimedia/gstreamer-plugins/pkg-plist b/multimedia/gstreamer-plugins/pkg-plist index b7c7fb09c62f..e87114aefeaa 100644 --- a/multimedia/gstreamer-plugins/pkg-plist +++ b/multimedia/gstreamer-plugins/pkg-plist @@ -55,6 +55,7 @@ lib/gstreamer-%%VERSION%%/libgstlevel.so %%LIBMAD%%lib/gstreamer-%%VERSION%%/libgstmad.so lib/gstreamer-%%VERSION%%/libgstmedian.so %%LIBMIKMOD%%lib/gstreamer-%%VERSION%%/libgstmikmod.so +lib/gstreamer-%%VERSION%%/libgstmodplug.so lib/gstreamer-%%VERSION%%/libgstmono2stereo.so lib/gstreamer-%%VERSION%%/libgstmonoscope.so lib/gstreamer-%%VERSION%%/libgstmp1videoparse.so diff --git a/multimedia/gstreamer-plugins80/Makefile b/multimedia/gstreamer-plugins80/Makefile index 05af689a3dce..5dc091b70ff9 100644 --- a/multimedia/gstreamer-plugins80/Makefile +++ b/multimedia/gstreamer-plugins80/Makefile @@ -6,27 +6,27 @@ # PORTNAME= gstreamer -PORTVERSION= 0.6.2 -PORTREVISION= 1 +PORTVERSION= 0.6.3 CATEGORIES= multimedia audio -#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -#MASTER_SITE_SUBDIR= ${PORTNAME} -MASTER_SITES= http://gstreamer.net/releases/${PORTVERSION}/src/ +MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITE_SUBDIR= sources/gst-plugins/0.6 PKGNAMESUFFIX= -plugins DISTNAME= gst-plugins-${PORTVERSION} +DIST_SUBDIR= gnome2 MAINTAINER= lioux@FreeBSD.org COMMENT= GStreamer written collection of plugins handling several media types -BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig LIB_DEPENDS= gstreamer-0.6.1:${PORTSDIR}/multimedia/gstreamer \ popt.0:${PORTSDIR}/devel/popt \ USE_X_PREFIX= yes +USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gnomehack \ gnomehier \ gnomeprefix \ + pkgconfig \ gconf2 USE_LIBTOOL= yes USE_REINPLACE= yes @@ -195,9 +195,10 @@ WITH_LIBDV=yes .endif # libdvdnav -.if exists(${LOCALBASE}/lib/libdvdnav.so) -WITH_LIBDVDNAV=yes -.endif +# XXX libdvdnav needs to be updated to 0.1.9 or higher +#.if exists(${LOCALBASE}/lib/libdvdnav.so) +.undef WITH_LIBDVDNAV +#.endif # libdvdread .if exists(${LOCALBASE}/lib/libdvdread.a) @@ -590,7 +591,7 @@ PLIST_SUB+= VORBIS="" CONFIGURE_ARGS+= --disable-xmms PLIST_SUB+= XMMS="@comment " .else -LIB_DEPENDS+= xmms.4:${PORTSDIR}/multimedia/xmms +LIB_DEPENDS+= xmms.3:${PORTSDIR}/multimedia/xmms CONFIGURE_ARGS+= --with-xmms-prefix=${X11BASE} \ --with-xmms-exec-prefix=${X11BASE} diff --git a/multimedia/gstreamer-plugins80/distinfo b/multimedia/gstreamer-plugins80/distinfo index a6d06ee91e34..8ff1da2054a0 100644 --- a/multimedia/gstreamer-plugins80/distinfo +++ b/multimedia/gstreamer-plugins80/distinfo @@ -1 +1 @@ -MD5 (gst-plugins-0.6.2.tar.gz) = ef7b6ce20e32e9abae22aeb2169f4055 +MD5 (gnome2/gst-plugins-0.6.3.tar.bz2) = 3cc128c526e1537267df74fd201b7376 diff --git a/multimedia/gstreamer-plugins80/pkg-plist b/multimedia/gstreamer-plugins80/pkg-plist index b7c7fb09c62f..e87114aefeaa 100644 --- a/multimedia/gstreamer-plugins80/pkg-plist +++ b/multimedia/gstreamer-plugins80/pkg-plist @@ -55,6 +55,7 @@ lib/gstreamer-%%VERSION%%/libgstlevel.so %%LIBMAD%%lib/gstreamer-%%VERSION%%/libgstmad.so lib/gstreamer-%%VERSION%%/libgstmedian.so %%LIBMIKMOD%%lib/gstreamer-%%VERSION%%/libgstmikmod.so +lib/gstreamer-%%VERSION%%/libgstmodplug.so lib/gstreamer-%%VERSION%%/libgstmono2stereo.so lib/gstreamer-%%VERSION%%/libgstmonoscope.so lib/gstreamer-%%VERSION%%/libgstmp1videoparse.so diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile index 339eeb40cea6..6837c81a3e93 100644 --- a/multimedia/gstreamer/Makefile +++ b/multimedia/gstreamer/Makefile @@ -6,16 +6,15 @@ # PORTNAME= gstreamer -PORTVERSION= 0.6.2 +PORTVERSION= 0.6.3 CATEGORIES= multimedia -#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -#MASTER_SITE_SUBDIR= ${PORTNAME} -MASTER_SITES= http://gstreamer.net/releases/${PORTVERSION}/src/ +MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.6 +DIST_SUBDIR= gnome2 MAINTAINER= lioux@FreeBSD.org COMMENT= Development framework for creating media applications -BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt USE_X_PREFIX= yes @@ -27,6 +26,7 @@ WANT_GNOME= yes USE_GNOME= gnomehack \ gnomeprefix \ glib20 \ + pkgconfig \ libxml2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-tests \ diff --git a/multimedia/gstreamer/distinfo b/multimedia/gstreamer/distinfo index d6774301ed85..3f25c2c82e79 100644 --- a/multimedia/gstreamer/distinfo +++ b/multimedia/gstreamer/distinfo @@ -1 +1 @@ -MD5 (gstreamer-0.6.2.tar.bz2) = 56de8c6b9128cfd9f9758ed13ec8abeb +MD5 (gnome2/gstreamer-0.6.3.tar.bz2) = f9e9401c709074dc7bd600b0f3baab37 diff --git a/multimedia/gstreamer/files/patch-configure b/multimedia/gstreamer/files/patch-configure deleted file mode 100644 index 805a86c3b3d9..000000000000 --- a/multimedia/gstreamer/files/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig Wed Jan 22 09:17:40 2003 -+++ configure Wed Jan 29 14:49:56 2003 -@@ -7712,7 +7713,7 @@ - if test "x$COMPILER" = "xforte"; then - GST_ERROR= - else -- if test "x$GST_CVS"="xyes"; then -+ if test "x$GST_CVS" = "xyes"; then - GST_ERROR="-Wall -Werror" - else - GST_ERROR="-Wall" diff --git a/multimedia/gstreamer/files/patch-gst::gstthreaddummy.c b/multimedia/gstreamer/files/patch-gst::gstthreaddummy.c new file mode 100644 index 000000000000..479a05ba9c9b --- /dev/null +++ b/multimedia/gstreamer/files/patch-gst::gstthreaddummy.c @@ -0,0 +1,12 @@ +--- gst/gstthreaddummy.c.orig Sat Aug 30 19:30:10 2003 ++++ gst/gstthreaddummy.c Sat Aug 30 19:30:34 2003 +@@ -17,7 +17,9 @@ + * Boston, MA 02111-1307, USA. + */ + ++#include <sys/types.h> + #include <sys/time.h> ++#include <unistd.h> + #include <glib.h> + #include "gstlog.h" + diff --git a/multimedia/gstreamer/files/patch-libs::ext::cothreads::tests::Makefile.in b/multimedia/gstreamer/files/patch-libs::ext::cothreads::tests::Makefile.in index fd554c27807f..02dae54758d0 100644 --- a/multimedia/gstreamer/files/patch-libs::ext::cothreads::tests::Makefile.in +++ b/multimedia/gstreamer/files/patch-libs::ext::cothreads::tests::Makefile.in @@ -1,11 +1,11 @@ ---- libs/ext/cothreads/tests/Makefile.in.orig Sat Sep 28 23:05:55 2002 -+++ libs/ext/cothreads/tests/Makefile.in Sat Sep 28 23:06:23 2002 -@@ -83,7 +83,7 @@ +--- libs/ext/cothreads/tests/Makefile.in.orig Sat Aug 30 19:28:04 2003 ++++ libs/ext/cothreads/tests/Makefile.in Sat Aug 30 19:28:39 2003 +@@ -68,7 +68,7 @@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ -GTHREAD_LIBS = @GTHREAD_LIBS@ +GTHREAD_LIBS = -lc @GTHREAD_LIBS@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ diff --git a/multimedia/gstreamer80/Makefile b/multimedia/gstreamer80/Makefile index 339eeb40cea6..6837c81a3e93 100644 --- a/multimedia/gstreamer80/Makefile +++ b/multimedia/gstreamer80/Makefile @@ -6,16 +6,15 @@ # PORTNAME= gstreamer -PORTVERSION= 0.6.2 +PORTVERSION= 0.6.3 CATEGORIES= multimedia -#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -#MASTER_SITE_SUBDIR= ${PORTNAME} -MASTER_SITES= http://gstreamer.net/releases/${PORTVERSION}/src/ +MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.6 +DIST_SUBDIR= gnome2 MAINTAINER= lioux@FreeBSD.org COMMENT= Development framework for creating media applications -BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt USE_X_PREFIX= yes @@ -27,6 +26,7 @@ WANT_GNOME= yes USE_GNOME= gnomehack \ gnomeprefix \ glib20 \ + pkgconfig \ libxml2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-tests \ diff --git a/multimedia/gstreamer80/distinfo b/multimedia/gstreamer80/distinfo index d6774301ed85..3f25c2c82e79 100644 --- a/multimedia/gstreamer80/distinfo +++ b/multimedia/gstreamer80/distinfo @@ -1 +1 @@ -MD5 (gstreamer-0.6.2.tar.bz2) = 56de8c6b9128cfd9f9758ed13ec8abeb +MD5 (gnome2/gstreamer-0.6.3.tar.bz2) = f9e9401c709074dc7bd600b0f3baab37 diff --git a/multimedia/gstreamer80/files/patch-configure b/multimedia/gstreamer80/files/patch-configure deleted file mode 100644 index 805a86c3b3d9..000000000000 --- a/multimedia/gstreamer80/files/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig Wed Jan 22 09:17:40 2003 -+++ configure Wed Jan 29 14:49:56 2003 -@@ -7712,7 +7713,7 @@ - if test "x$COMPILER" = "xforte"; then - GST_ERROR= - else -- if test "x$GST_CVS"="xyes"; then -+ if test "x$GST_CVS" = "xyes"; then - GST_ERROR="-Wall -Werror" - else - GST_ERROR="-Wall" diff --git a/multimedia/gstreamer80/files/patch-gst::gstthreaddummy.c b/multimedia/gstreamer80/files/patch-gst::gstthreaddummy.c new file mode 100644 index 000000000000..479a05ba9c9b --- /dev/null +++ b/multimedia/gstreamer80/files/patch-gst::gstthreaddummy.c @@ -0,0 +1,12 @@ +--- gst/gstthreaddummy.c.orig Sat Aug 30 19:30:10 2003 ++++ gst/gstthreaddummy.c Sat Aug 30 19:30:34 2003 +@@ -17,7 +17,9 @@ + * Boston, MA 02111-1307, USA. + */ + ++#include <sys/types.h> + #include <sys/time.h> ++#include <unistd.h> + #include <glib.h> + #include "gstlog.h" + diff --git a/multimedia/gstreamer80/files/patch-libs::ext::cothreads::tests::Makefile.in b/multimedia/gstreamer80/files/patch-libs::ext::cothreads::tests::Makefile.in index fd554c27807f..02dae54758d0 100644 --- a/multimedia/gstreamer80/files/patch-libs::ext::cothreads::tests::Makefile.in +++ b/multimedia/gstreamer80/files/patch-libs::ext::cothreads::tests::Makefile.in @@ -1,11 +1,11 @@ ---- libs/ext/cothreads/tests/Makefile.in.orig Sat Sep 28 23:05:55 2002 -+++ libs/ext/cothreads/tests/Makefile.in Sat Sep 28 23:06:23 2002 -@@ -83,7 +83,7 @@ +--- libs/ext/cothreads/tests/Makefile.in.orig Sat Aug 30 19:28:04 2003 ++++ libs/ext/cothreads/tests/Makefile.in Sat Aug 30 19:28:39 2003 +@@ -68,7 +68,7 @@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ -GTHREAD_LIBS = @GTHREAD_LIBS@ +GTHREAD_LIBS = -lc @GTHREAD_LIBS@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ diff --git a/multimedia/nautilus-media/Makefile b/multimedia/nautilus-media/Makefile index 50ebbb412cd4..83d36a633660 100644 --- a/multimedia/nautilus-media/Makefile +++ b/multimedia/nautilus-media/Makefile @@ -6,10 +6,10 @@ # PORTNAME= nautilus-media -PORTVERSION= 0.2.2 +PORTVERSION= 0.3.3.1 CATEGORIES= multimedia gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.2 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.3 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/multimedia/nautilus-media/distinfo b/multimedia/nautilus-media/distinfo index ed505822a40a..142de3adc207 100644 --- a/multimedia/nautilus-media/distinfo +++ b/multimedia/nautilus-media/distinfo @@ -1 +1 @@ -MD5 (gnome2/nautilus-media-0.2.2.tar.bz2) = 7143d3624d808453ee2cba1328517532 +MD5 (gnome2/nautilus-media-0.3.3.1.tar.bz2) = 10e16c2db8bb62e96ef79b0f25af8f68 diff --git a/multimedia/nautilus-media/files/patch-media-info_media-info.c b/multimedia/nautilus-media/files/patch-media-info_media-info.c new file mode 100644 index 000000000000..e97ea45a788f --- /dev/null +++ b/multimedia/nautilus-media/files/patch-media-info_media-info.c @@ -0,0 +1,15 @@ +--- media-info/media-info.c.orig Tue Aug 12 15:08:26 2003 ++++ media-info/media-info.c Tue Aug 12 15:08:53 2003 +@@ -258,10 +258,11 @@ + gboolean + gst_media_info_read_idler (GstMediaInfo *info, GstMediaInfoStream **streamp) + { ++ GstMediaInfoPriv *priv; + /* if it's NULL then we're sure something went wrong higher up) */ + if (info == NULL) return FALSE; + +- GstMediaInfoPriv *priv = info->priv; ++ priv = info->priv; + + g_assert (streamp != NULL); + switch (priv->state) diff --git a/multimedia/nautilus-media/pkg-plist b/multimedia/nautilus-media/pkg-plist index c7e7b7f2a33e..3edf1be94a77 100644 --- a/multimedia/nautilus-media/pkg-plist +++ b/multimedia/nautilus-media/pkg-plist @@ -25,6 +25,7 @@ share/locale/bg/LC_MESSAGES/nautilus-media.mo share/locale/bn/LC_MESSAGES/nautilus-media.mo share/locale/ca/LC_MESSAGES/nautilus-media.mo share/locale/cs/LC_MESSAGES/nautilus-media.mo +share/locale/cy/LC_MESSAGES/nautilus-media.mo share/locale/de/LC_MESSAGES/nautilus-media.mo share/locale/da/LC_MESSAGES/nautilus-media.mo share/locale/el/LC_MESSAGES/nautilus-media.mo @@ -35,12 +36,15 @@ share/locale/fi/LC_MESSAGES/nautilus-media.mo share/locale/fr/LC_MESSAGES/nautilus-media.mo share/locale/ga/LC_MESSAGES/nautilus-media.mo share/locale/he/LC_MESSAGES/nautilus-media.mo +share/locale/hi/LC_MESSAGES/nautilus-media.mo share/locale/hu/LC_MESSAGES/nautilus-media.mo share/locale/id/LC_MESSAGES/nautilus-media.mo share/locale/is/LC_MESSAGES/nautilus-media.mo share/locale/it/LC_MESSAGES/nautilus-media.mo share/locale/ja/LC_MESSAGES/nautilus-media.mo share/locale/ko/LC_MESSAGES/nautilus-media.mo +share/locale/li/LC_MESSAGES/nautilus-media.mo +share/locale/lt/LC_MESSAGES/nautilus-media.mo share/locale/lv/LC_MESSAGES/nautilus-media.mo share/locale/mk/LC_MESSAGES/nautilus-media.mo share/locale/ml/LC_MESSAGES/nautilus-media.mo diff --git a/print/ggv2/Makefile b/print/ggv2/Makefile index 5c5d083e78f1..0e0ec33e8237 100644 --- a/print/ggv2/Makefile +++ b/print/ggv2/Makefile @@ -6,10 +6,10 @@ # PORTNAME= ggv2 -PORTVERSION= 2.0.1 +PORTVERSION= 2.4.0.1 CATEGORIES= print gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.0 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.4 DISTNAME= ggv-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/print/ggv2/distinfo b/print/ggv2/distinfo index 89cfb8add5bf..4ea6114b58fe 100644 --- a/print/ggv2/distinfo +++ b/print/ggv2/distinfo @@ -1 +1 @@ -MD5 (gnome2/ggv-2.0.1.tar.bz2) = 29aefe42e3f81f9ba65b8e3befb958bd +MD5 (gnome2/ggv-2.4.0.1.tar.bz2) = 749b7c7f16807dcf924db2475b87f34e diff --git a/print/ggv2/pkg-plist b/print/ggv2/pkg-plist index e9c10eee9e62..e80c738314b3 100644 --- a/print/ggv2/pkg-plist +++ b/print/ggv2/pkg-plist @@ -18,7 +18,7 @@ share/gnome/applications/ggv.desktop share/gnome/gnome-2.0/ui/ggv-control-ui.xml share/gnome/gnome-2.0/ui/ggv-postscript-view-ui.xml share/gnome/gnome-2.0/ui/ggv-ui.xml -share/gnome/help/ggv/C/figures/example_screenshot.png +share/gnome/help/ggv/C/figures/ggv_window.png share/gnome/help/ggv/C/ggv.xml share/gnome/help/ggv/C/legal.xml share/gnome/help/ggv/C/topic.dat @@ -85,8 +85,10 @@ share/locale/am/LC_MESSAGES/ggv.mo share/locale/az/LC_MESSAGES/ggv.mo share/locale/be/LC_MESSAGES/ggv.mo share/locale/bg/LC_MESSAGES/ggv.mo +share/locale/bn/LC_MESSAGES/ggv.mo share/locale/ca/LC_MESSAGES/ggv.mo share/locale/cs/LC_MESSAGES/ggv.mo +share/locale/cy/LC_MESSAGES/ggv.mo share/locale/da/LC_MESSAGES/ggv.mo share/locale/de/LC_MESSAGES/ggv.mo share/locale/el/LC_MESSAGES/ggv.mo @@ -125,8 +127,10 @@ share/locale/sk/LC_MESSAGES/ggv.mo share/locale/sl/LC_MESSAGES/ggv.mo share/locale/sr/LC_MESSAGES/ggv.mo share/locale/sr@Latn/LC_MESSAGES/ggv.mo +share/locale/sq/LC_MESSAGES/ggv.mo share/locale/sv/LC_MESSAGES/ggv.mo share/locale/ta/LC_MESSAGES/ggv.mo +share/locale/th/LC_MESSAGES/ggv.mo share/locale/tr/LC_MESSAGES/ggv.mo share/locale/uk/LC_MESSAGES/ggv.mo share/locale/vi/LC_MESSAGES/ggv.mo diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile index e20d734538f3..2788c6b22684 100644 --- a/print/libgnomeprint/Makefile +++ b/print/libgnomeprint/Makefile @@ -6,11 +6,10 @@ # PORTNAME= libgnomeprint -PORTVERSION= 2.2.1.3 -PORTREVISION= 1 +PORTVERSION= 2.3.1 CATEGORIES= print gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.3 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/print/libgnomeprint/distinfo b/print/libgnomeprint/distinfo index c1738ce7afdf..c971480b34cd 100644 --- a/print/libgnomeprint/distinfo +++ b/print/libgnomeprint/distinfo @@ -1 +1 @@ -MD5 (gnome2/libgnomeprint-2.2.1.3.tar.bz2) = 36c7db0cd889767a327f118430a13317 +MD5 (gnome2/libgnomeprint-2.3.1.tar.bz2) = 5a755924f0bb2dd0a846a6d02acab058 diff --git a/print/libgnomeprint/files/patch-libgnomeprint::transports::Makefile.in b/print/libgnomeprint/files/patch-libgnomeprint::transports::Makefile.in deleted file mode 100644 index fd2c0da7ea23..000000000000 --- a/print/libgnomeprint/files/patch-libgnomeprint::transports::Makefile.in +++ /dev/null @@ -1,29 +0,0 @@ ---- libgnomeprint/transports/Makefile.in.orig Mon Jun 10 22:16:36 2002 -+++ libgnomeprint/transports/Makefile.in Mon Jun 10 22:22:35 2002 -@@ -121,7 +121,7 @@ - - libgnomeprint_file_la_SOURCES = $(FILE_SRC) - --libgnomeprint_file_la_LDFLAGS = -version-info 0:0:0 -module -+libgnomeprint_file_la_LDFLAGS = -avoid-version -module - - libgnomeprint_file_la_LIBADD = - -@@ -132,7 +132,7 @@ - - libgnomeprint_lpr_la_SOURCES = $(LPR_SRC) - --libgnomeprint_lpr_la_LDFLAGS = -version-info 0:0:0 -module -+libgnomeprint_lpr_la_LDFLAGS = -avoid-version -module - - libgnomeprint_lpr_la_LIBADD = - -@@ -143,7 +143,7 @@ - - libgnomeprint_custom_la_SOURCES = $(CUSTOM_SRC) - --libgnomeprint_custom_la_LDFLAGS = -version-info 0:0:0 -module -+libgnomeprint_custom_la_LDFLAGS = -avoid-version -module - - libgnomeprint_custom_la_LIBADD = - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/print/libgnomeprint/pkg-plist b/print/libgnomeprint/pkg-plist index 1ce047e08b16..c96532fc24e9 100644 --- a/print/libgnomeprint/pkg-plist +++ b/print/libgnomeprint/pkg-plist @@ -12,6 +12,7 @@ include/libgnomeprint-2.2/libgnomeprint/gnome-rfont.h include/libgnomeprint-2.2/libgnomeprint/gp-gc.h include/libgnomeprint-2.2/libgnomeprint/libgnomeprint-enum-types.h include/libgnomeprint-2.2/libgnomeprint/private/gnome-font-private.h +include/libgnomeprint-2.2/libgnomeprint/private/gnome-fontmap.h include/libgnomeprint-2.2/libgnomeprint/private/gnome-glyphlist-private.h include/libgnomeprint-2.2/libgnomeprint/private/gnome-print-config-private.h include/libgnomeprint-2.2/libgnomeprint/private/gnome-print-private.h @@ -30,7 +31,7 @@ include/libgnomeprint-2.2/libgnomeprint/private/gpa-settings.h include/libgnomeprint-2.2/libgnomeprint/private/gpa-utils.h lib/libgnomeprint-2-2.a lib/libgnomeprint-2-2.so -lib/libgnomeprint-2-2.so.0 +lib/libgnomeprint-2-2.so.1 %%CUPS:%%lib/libgnomeprint/%%VERSION%%/modules/libgnomeprintcups.a %%CUPS:%%lib/libgnomeprint/%%VERSION%%/modules/libgnomeprintcups.so %%CUPS:%%lib/libgnomeprint/%%VERSION%%/modules/libgnomeprintcups.so.0 @@ -38,30 +39,35 @@ lib/libgnomeprint/%%VERSION%%/modules/transports/libgnomeprint-custom.so lib/libgnomeprint/%%VERSION%%/modules/transports/libgnomeprint-file.so lib/libgnomeprint/%%VERSION%%/modules/transports/libgnomeprint-lpr.so libdata/pkgconfig/libgnomeprint-2.2.pc -share/doc/libgnomeprint-2.2/index.html -share/doc/libgnomeprint-2.2/index.sgml -share/doc/libgnomeprint-2.2/libgnomeprint-building.html -share/doc/libgnomeprint-2.2/libgnomeprint-compiling.html -share/doc/libgnomeprint-2.2/libgnomeprint-gnome-font-face.html -share/doc/libgnomeprint-2.2/libgnomeprint-gnome-font.html -share/doc/libgnomeprint-2.2/libgnomeprint-gnome-glyphlist.html -share/doc/libgnomeprint-2.2/libgnomeprint-gnome-pgl.html -share/doc/libgnomeprint-2.2/libgnomeprint-gnome-print-config.html -share/doc/libgnomeprint-2.2/libgnomeprint-gnome-print-job.html -share/doc/libgnomeprint-2.2/libgnomeprint-gnome-print-master.html -share/doc/libgnomeprint-2.2/libgnomeprint-gnome-print-paper.html -share/doc/libgnomeprint-2.2/libgnomeprint-gnome-print-unit.html -share/doc/libgnomeprint-2.2/libgnomeprint-gnome-print.html -share/doc/libgnomeprint-2.2/libgnomeprint-gnome-rfont.html -share/doc/libgnomeprint-2.2/libgnomeprint-question-index.html -share/doc/libgnomeprint-2.2/libgnomeprint-resources.html -share/doc/libgnomeprint-2.2/libgnomeprint.html -share/doc/libgnomeprint-2.2/libgnomeprintunsorted.html +share/doc/libgnomeprint/home.png +share/doc/libgnomeprint/index.html +share/doc/libgnomeprint/index.sgml +share/doc/libgnomeprint/left.png +share/doc/libgnomeprint/libgnomeprint-building.html +share/doc/libgnomeprint/libgnomeprint-compiling.html +share/doc/libgnomeprint/libgnomeprint-gnome-font-face.html +share/doc/libgnomeprint/libgnomeprint-gnome-font.html +share/doc/libgnomeprint/libgnomeprint-gnome-glyphlist.html +share/doc/libgnomeprint/libgnomeprint-gnome-pgl.html +share/doc/libgnomeprint/libgnomeprint-gnome-print-config.html +share/doc/libgnomeprint/libgnomeprint-gnome-print-job.html +share/doc/libgnomeprint/libgnomeprint-gnome-print-master.html +share/doc/libgnomeprint/libgnomeprint-gnome-print-paper.html +share/doc/libgnomeprint/libgnomeprint-gnome-print-unit.html +share/doc/libgnomeprint/libgnomeprint-gnome-print.html +share/doc/libgnomeprint/libgnomeprint-gnome-rfont.html +share/doc/libgnomeprint/libgnomeprint-resources.html +share/doc/libgnomeprint/libgnomeprint.html +share/doc/libgnomeprint/libgnomeprintunsorted.html +share/doc/libgnomeprint/right.png +share/doc/libgnomeprint/up.png share/gnome/libgnomeprint/%%VERSION%%/globals.xml share/gnome/libgnomeprint/%%VERSION%%/models/GNOME-GENERIC-PS.xml share/gnome/libgnomeprint/%%VERSION%%/models/GNOME-PDF-WRITER.xml +share/gnome/libgnomeprint/%%VERSION%%/models/uninstalled/GNOME-META.xml share/gnome/libgnomeprint/%%VERSION%%/printers/GENERIC.xml share/gnome/libgnomeprint/%%VERSION%%/printers/PDF-WRITER.xml +share/gnome/libgnomeprint/%%VERSION%%/printers/uninstalled/META.xml share/locale/az/LC_MESSAGES/libgnomeprint-2.2.mo share/locale/am/LC_MESSAGES/libgnomeprint-2.2.mo share/locale/ar/LC_MESSAGES/libgnomeprint-2.2.mo @@ -70,6 +76,7 @@ share/locale/bg/LC_MESSAGES/libgnomeprint-2.2.mo share/locale/bn/LC_MESSAGES/libgnomeprint-2.2.mo share/locale/ca/LC_MESSAGES/libgnomeprint-2.2.mo share/locale/cs/LC_MESSAGES/libgnomeprint-2.2.mo +share/locale/cy/LC_MESSAGES/libgnomeprint-2.2.mo share/locale/da/LC_MESSAGES/libgnomeprint-2.2.mo share/locale/de/LC_MESSAGES/libgnomeprint-2.2.mo share/locale/el/LC_MESSAGES/libgnomeprint-2.2.mo @@ -106,17 +113,20 @@ share/locale/sr/LC_MESSAGES/libgnomeprint-2.2.mo share/locale/sr@Latn/LC_MESSAGES/libgnomeprint-2.2.mo share/locale/sv/LC_MESSAGES/libgnomeprint-2.2.mo share/locale/ta/LC_MESSAGES/libgnomeprint-2.2.mo +share/locale/th/LC_MESSAGES/libgnomeprint-2.2.mo share/locale/tr/LC_MESSAGES/libgnomeprint-2.2.mo share/locale/uk/LC_MESSAGES/libgnomeprint-2.2.mo share/locale/vi/LC_MESSAGES/libgnomeprint-2.2.mo share/locale/wa/LC_MESSAGES/libgnomeprint-2.2.mo share/locale/zh_CN/LC_MESSAGES/libgnomeprint-2.2.mo share/locale/zh_TW/LC_MESSAGES/libgnomeprint-2.2.mo +@dirrm share/gnome/libgnomeprint/%%VERSION%%/printers/uninstalled @dirrm share/gnome/libgnomeprint/%%VERSION%%/printers +@dirrm share/gnome/libgnomeprint/%%VERSION%%/models/uninstalled @dirrm share/gnome/libgnomeprint/%%VERSION%%/models @dirrm share/gnome/libgnomeprint/%%VERSION%% @dirrm share/gnome/libgnomeprint -@dirrm share/doc/libgnomeprint-2.2 +@dirrm share/doc/libgnomeprint @dirrm lib/libgnomeprint/%%VERSION%%/modules/transports @dirrm lib/libgnomeprint/%%VERSION%%/modules @dirrm lib/libgnomeprint/%%VERSION%% diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile index 561c4edcd44b..2f38204e4160 100644 --- a/sysutils/gconf-editor/Makefile +++ b/sysutils/gconf-editor/Makefile @@ -6,11 +6,11 @@ # PORTNAME= gconf-editor -PORTVERSION= 0.4.1 +PORTVERSION= 2.4.0 PORTEPOCH= 1 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.4 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.4 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/sysutils/gconf-editor/distinfo b/sysutils/gconf-editor/distinfo index b643444c5f49..837b0be5f8ae 100644 --- a/sysutils/gconf-editor/distinfo +++ b/sysutils/gconf-editor/distinfo @@ -1 +1 @@ -MD5 (gnome2/gconf-editor-0.4.1.tar.bz2) = 3ccff570fb185134452e04a35e6af6b4 +MD5 (gnome2/gconf-editor-2.4.0.tar.bz2) = 7ebc352062fc8b6d3c09a69ad6e963a7 diff --git a/sysutils/gconf-editor/pkg-plist b/sysutils/gconf-editor/pkg-plist index b1c82d484abb..55767281a4e8 100644 --- a/sysutils/gconf-editor/pkg-plist +++ b/sysutils/gconf-editor/pkg-plist @@ -15,8 +15,10 @@ share/locale/ar/LC_MESSAGES/gconf-editor.mo share/locale/az/LC_MESSAGES/gconf-editor.mo share/locale/be/LC_MESSAGES/gconf-editor.mo share/locale/bg/LC_MESSAGES/gconf-editor.mo +share/locale/bn/LC_MESSAGES/gconf-editor.mo share/locale/ca/LC_MESSAGES/gconf-editor.mo share/locale/cs/LC_MESSAGES/gconf-editor.mo +share/locale/cy/LC_MESSAGES/gconf-editor.mo share/locale/da/LC_MESSAGES/gconf-editor.mo share/locale/de/LC_MESSAGES/gconf-editor.mo share/locale/el/LC_MESSAGES/gconf-editor.mo @@ -35,7 +37,10 @@ share/locale/it/LC_MESSAGES/gconf-editor.mo share/locale/ja/LC_MESSAGES/gconf-editor.mo share/locale/kn/LC_MESSAGES/gconf-editor.mo share/locale/ko/LC_MESSAGES/gconf-editor.mo +share/locale/li/LC_MESSAGES/gconf-editor.mo +share/locale/lt/LC_MESSAGES/gconf-editor.mo share/locale/lv/LC_MESSAGES/gconf-editor.mo +share/locale/mk/LC_MESSAGES/gconf-editor.mo share/locale/ml/LC_MESSAGES/gconf-editor.mo share/locale/mn/LC_MESSAGES/gconf-editor.mo share/locale/ms/LC_MESSAGES/gconf-editor.mo diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile index a740f6b1916c..5af729474976 100644 --- a/sysutils/gnome-control-center/Makefile +++ b/sysutils/gnome-control-center/Makefile @@ -6,25 +6,29 @@ # PORTNAME= gnomecontrolcenter2 -PORTVERSION= 2.2.2 +PORTVERSION= 2.4.0 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/control-center/2.2 +MASTER_SITE_SUBDIR= sources/control-center/2.4 DISTNAME= control-center-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -COMMENT= Control center for GNOME 2.0 project +COMMENT= Control center for GNOME 2 project USE_BZIP2= yes USE_X_PREFIX= yes USE_REINPLACE= yes USE_GMAKE= yes GNOME_DESKTOP_VERSION=2 -USE_GNOME= gnomeprefix gnomehack gnomehier gnomedesktop metacity -USE_LIBTOOL= yes +USE_GNOME= gnomeprefix gnomehack gnomehier metacity nautilus2 +GNU_CONFIGURE= yes INSTALLS_SHLIB= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" + +post-patch: + @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ + 's|[{]prefix[}]/share/pixmaps|{datadir}/pixmaps|g' .include <bsd.port.mk> diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo index 348a7f947f01..660289920173 100644 --- a/sysutils/gnome-control-center/distinfo +++ b/sysutils/gnome-control-center/distinfo @@ -1 +1 @@ -MD5 (gnome2/control-center-2.2.2.tar.bz2) = d5288d0e4249a5afdef494d5c59cb1bc +MD5 (gnome2/control-center-2.4.0.tar.bz2) = 44115d3174d2f603f34a336ada562bae diff --git a/sysutils/gnome-control-center/files/patch-configure b/sysutils/gnome-control-center/files/patch-configure index 1f63c8a48e05..83ef8876cbb3 100644 --- a/sysutils/gnome-control-center/files/patch-configure +++ b/sysutils/gnome-control-center/files/patch-configure @@ -1,13 +1,5 @@ --- configure.orig Wed Dec 18 16:10:09 2002 +++ configure Sun Dec 22 16:36:03 2002 -@@ -8516,6 +8516,7 @@ - - # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+$ac_aux_dir/ltconfig $LIBTOOL_DEPS - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' @@ -12607,7 +12608,7 @@ diff --git a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_Makefile.in b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_Makefile.in deleted file mode 100644 index 49e81252a028..000000000000 --- a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- gnome-settings-daemon/Makefile.in.orig Fri Jan 17 12:30:39 2003 -+++ gnome-settings-daemon/Makefile.in Fri Jan 17 12:33:06 2003 -@@ -195,7 +195,7 @@ - $(GNOME_SETTINGS_DAEMON_LIBS) \ - $(top_builddir)/libbackground/libbackground.la \ - $(top_builddir)/libsounds/libsounds.a \ -- -L$(top_builddir)/libwindow-settings/ -lgnome-window-settings \ -+ -L$(top_builddir)/libwindow-settings/.libs -lgnome-window-settings \ - $(XF86MISC_LIBS) - - diff --git a/sysutils/gnome-control-center/files/patch-libbackground_Makefile.in b/sysutils/gnome-control-center/files/patch-libbackground_Makefile.in deleted file mode 100644 index d8ece4b307ac..000000000000 --- a/sysutils/gnome-control-center/files/patch-libbackground_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- libbackground/Makefile.in.orig Fri Jan 17 12:33:42 2003 -+++ libbackground/Makefile.in Fri Jan 17 12:34:13 2003 -@@ -151,7 +151,7 @@ - - INCLUDES = \ - -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ -- -DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \ -+ -DGNOME_ICONDIR=\""${datadir}/pixmaps"\" \ - -DG_LOG_DOMAIN=\"capplet-common\" \ - -I$(top_srcdir)/ \ - @CAPPLET_CFLAGS@ diff --git a/sysutils/gnome-control-center/files/patch-libwindow-settings_Makefile.in b/sysutils/gnome-control-center/files/patch-libwindow-settings_Makefile.in deleted file mode 100644 index c4d9211b70e2..000000000000 --- a/sysutils/gnome-control-center/files/patch-libwindow-settings_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- libwindow-settings/Makefile.in.orig Fri Jan 17 12:34:44 2003 -+++ libwindow-settings/Makefile.in Fri Jan 17 12:35:43 2003 -@@ -151,7 +151,7 @@ - - INCLUDES = \ - -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ -- -DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \ -+ -DGNOME_ICONDIR=\""${datadir}/pixmaps"\" \ - -DG_LOG_DOMAIN=\"capplet-common\" \ - -DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(WM_MODULE_DIR)"\" \ - -I$(top_srcdir)/ \ diff --git a/sysutils/gnome-control-center/files/patch-ltmain.sh b/sysutils/gnome-control-center/files/patch-ltmain.sh new file mode 100644 index 000000000000..49efbb5decf5 --- /dev/null +++ b/sysutils/gnome-control-center/files/patch-ltmain.sh @@ -0,0 +1,51 @@ +--- ltmain.sh.orig Thu May 1 11:30:14 2003 ++++ ltmain.sh Mon Aug 11 14:38:46 2003 +@@ -1280,7 +1280,7 @@ + esac + elif test "X$arg" = "X-lc_r"; then + case $host in +- *-*-openbsd* | *-*-freebsd*) ++ *-*-openbsd* | *-*-freebsd4*) + # Do not include libc_r directly, use -pthread flag. + continue + ;; +@@ -1290,8 +1290,16 @@ + continue + ;; + ++ -pthread) ++ compile_command="$compile_command -pthread" ++ finalize_command="$finalize_command -pthread" ++ compiler_flags="$compiler_flags -pthread" ++ continue ++ ;; ++ + -module) + module=yes ++ build_old_libs=no + continue + ;; + +@@ -3000,6 +3008,9 @@ + # problems, so we reset it completely + verstring= + ;; ++ *-*-freebsd*) ++ # FreeBSD doesn't need this... ++ ;; + *) + verstring="0.0" + ;; +@@ -5428,10 +5439,12 @@ + fi + + # Install the pseudo-library for information purposes. ++ if /usr/bin/false; then + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + instname="$dir/$name"i + $show "$install_prog $instname $destdir/$name" + $run eval "$install_prog $instname $destdir/$name" || exit $? ++ fi + + # Maybe install the static library, too. + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/sysutils/gnome-control-center/files/patch-vfs_methods_themus_theme-method.c b/sysutils/gnome-control-center/files/patch-vfs_methods_themus_theme-method.c new file mode 100644 index 000000000000..a9add20e26dd --- /dev/null +++ b/sysutils/gnome-control-center/files/patch-vfs_methods_themus_theme-method.c @@ -0,0 +1,10 @@ +--- vfs-methods/themus/theme-method.c.orig Fri Jun 13 07:52:44 2003 ++++ vfs-methods/themus/theme-method.c Sat Jun 28 12:50:39 2003 +@@ -19,6 +19,7 @@ + + #include <string.h> + #include <errno.h> ++#include <libintl.h> + #include <sys/stat.h> + #include <sys/types.h> + diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist index bddf0905df36..00cba32274e8 100644 --- a/sysutils/gnome-control-center/pkg-plist +++ b/sysutils/gnome-control-center/pkg-plist @@ -1,42 +1,76 @@ bin/gnome-accessibility-keyboard-properties +bin/gnome-at-properties bin/gnome-background-properties bin/gnome-control-center bin/gnome-default-applications-properties +bin/gnome-display-properties bin/gnome-file-types-properties bin/gnome-font-properties +bin/gnome-font-viewer bin/gnome-keybinding-properties bin/gnome-keyboard-properties bin/gnome-mouse-properties bin/gnome-network-preferences bin/gnome-settings-daemon bin/gnome-sound-properties +bin/themus-theme-applier bin/gnome-theme-manager +bin/gnome-theme-thumbnailer +bin/gnome-thumbnail-font +bin/gnome-typing-monitor bin/gnome-ui-properties bin/gnome-window-properties etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/editor/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/screensaver/%gconf.xml etc/gconf/gconf.xml.defaults/desktop/gnome/font_rendering/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-otf/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-pcf/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-ttf/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-type1/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-theme-installed/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-theme/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/editor/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/screensaver/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/font_rendering/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-otf/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-pcf/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-ttf/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-type1/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gnome-theme-installed/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gnome-theme/%gconf.xml etc/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas etc/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas etc/gconf/schemas/desktop_gnome_font_rendering.schemas +etc/gconf/schemas/fontilus.schemas +etc/gconf/schemas/themus.schemas +etc/gnome-vfs-2.0/modules/font-method.conf +etc/gnome-vfs-2.0/modules/theme-method.conf include/gnome-window-settings-2.0/gnome-window-manager.h include/gnome-window-settings-2.0/gnome-wm-manager.h +lib/bonobo/libthemus-theme-properties-view.so +lib/gnome-vfs-2.0/modules/libfont-method.so +lib/gnome-vfs-2.0/modules/libtheme-method.so lib/libgnome-window-settings.a lib/libgnome-window-settings.so lib/libgnome-window-settings.so.1 +lib/window-manager-settings/libmetacity.a lib/window-manager-settings/libmetacity.so libdata/bonobo/servers/GNOME_SettingsDaemon.server +libdata/bonobo/servers/Themus_Properties_View.server +libdata/bonobo/servers/fontilus.server libdata/pkgconfig/gnome-window-settings-2.0.pc +libexec/fontilus-context-menu +share/gnome/application-registry/fontilus.applications +share/gnome/application-registry/themus.applications share/gnome/applications/gnomecc.desktop share/gnome/control-center-2.0/capplets/accessibility-keyboard.desktop +share/gnome/control-center-2.0/capplets/at-properties.desktop share/gnome/control-center-2.0/capplets/background.desktop share/gnome/control-center-2.0/capplets/behavior.desktop share/gnome/control-center-2.0/capplets/default-applications.desktop +share/gnome/control-center-2.0/capplets/display-properties.desktop share/gnome/control-center-2.0/capplets/file-types.desktop share/gnome/control-center-2.0/capplets/font-properties.desktop share/gnome/control-center-2.0/capplets/gnome-network-preferences.desktop @@ -48,13 +82,17 @@ share/gnome/control-center-2.0/capplets/sound.desktop share/gnome/control-center-2.0/capplets/window-properties.desktop share/gnome/control-center-2.0/icons/accessibility-directory.png share/gnome/control-center-2.0/icons/accessibility-keyboard-capplet.png +share/gnome/control-center-2.0/icons/at-enable-capplet.png share/gnome/control-center-2.0/icons/background-capplet.png share/gnome/control-center-2.0/icons/behavior-capplet.png share/gnome/control-center-2.0/icons/default-applications-capplet.png +share/gnome/control-center-2.0/icons/display-capplet.png share/gnome/control-center-2.0/icons/font-capplet.png +share/gnome/control-center-2.0/icons/gnome-network-capplet.png share/gnome/control-center-2.0/icons/mouse-capplet.png share/gnome/control-center-2.0/icons/sound-capplet.png share/gnome/control-center-2.0/icons/window-capplet.png +share/gnome/control-center-2.0/interfaces/at-enable-dialog.glade share/gnome/control-center-2.0/interfaces/background-properties.glade share/gnome/control-center-2.0/interfaces/file-types-properties.glade share/gnome/control-center-2.0/interfaces/font-properties.glade @@ -65,15 +103,22 @@ share/gnome/control-center-2.0/interfaces/gnome-keyboard-properties.glade share/gnome/control-center-2.0/interfaces/gnome-mouse-properties.glade share/gnome/control-center-2.0/interfaces/gnome-network-preferences.glade share/gnome/control-center-2.0/interfaces/gnome-ui-properties.glade +share/gnome/control-center-2.0/interfaces/gnome-window-properties.glade share/gnome/control-center-2.0/interfaces/sound-properties.glade share/gnome/control-center-2.0/interfaces/theme-install.glade share/gnome/control-center-2.0/interfaces/theme-properties.glade -share/gnome/control-center-2.0/interfaces/gnome-window-properties.glade share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-bouncekey.png share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-mousekey.png share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-slowkey.png share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-stickykey.png share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-togglekey.png +share/gnome/control-center-2.0/pixmaps/at-enable-capplet.png +share/gnome/control-center-2.0/pixmaps/at-startup.png +share/gnome/control-center-2.0/pixmaps/at-support.png +share/gnome/control-center-2.0/pixmaps/bar-disabled.png +share/gnome/control-center-2.0/pixmaps/bar-green.png +share/gnome/control-center-2.0/pixmaps/bar-red.png +share/gnome/control-center-2.0/pixmaps/bar.png share/gnome/control-center-2.0/pixmaps/double-click-maybe.png share/gnome/control-center-2.0/pixmaps/double-click-off.png share/gnome/control-center-2.0/pixmaps/double-click-on.png @@ -88,23 +133,40 @@ share/gnome/control-center-2.0/pixmaps/mouse-cursor-white-large.png share/gnome/control-center-2.0/pixmaps/mouse-cursor-white.png share/gnome/control-center-2.0/pixmaps/mouse-left.png share/gnome/control-center-2.0/pixmaps/mouse-right.png +share/gnome/control-center-2.0/pixmaps/ocean-stripes.png +share/gnome/control-center-2.0/pixmaps/sound-capplet.png +share/gnome/control-center-2.0/pixmaps/stop.png share/gnome/control-center-2.0/pixmaps/subpixel-bgr.png share/gnome/control-center-2.0/pixmaps/subpixel-rgb.png share/gnome/control-center-2.0/pixmaps/subpixel-vbgr.png share/gnome/control-center-2.0/pixmaps/subpixel-vrgb.png share/gnome/control-center-2.0/pixmaps/theme-thumbnailing.png +share/gnome/control-center-2.0/pixmaps/visual-bell.png +share/gnome/control-center-2.0/xrdb/Editres.ad +share/gnome/control-center-2.0/xrdb/Emacs.ad +share/gnome/control-center-2.0/xrdb/General.ad +share/gnome/control-center-2.0/xrdb/Motif.ad +share/gnome/control-center-2.0/xrdb/Tk.ad +share/gnome/control-center-2.0/xrdb/Xaw.ad +share/gnome/control-center/apply-font.glade share/gnome/cursor-fonts/cursor-large-white.pcf share/gnome/cursor-fonts/cursor-large.pcf share/gnome/cursor-fonts/cursor-white.pcf share/gnome/gnome-2.0/ui/gnomecc-ui.xml share/gnome/idl/ConfigArchiver.idl share/gnome/idl/GNOME_SettingsDaemon.idl +share/gnome/mime-info/fontilus.keys +share/gnome/mime-info/fontilus.mime +share/gnome/mime-info/themus.keys share/gnome/pixmaps/accessibility-keyboard-capplet.png +share/gnome/pixmaps/at-enable-capplet.png share/gnome/pixmaps/background-capplet.png share/gnome/pixmaps/behavior-capplet.png share/gnome/pixmaps/control-center2.png share/gnome/pixmaps/default-applications-capplet.png +share/gnome/pixmaps/display-capplet.png share/gnome/pixmaps/font-capplet.png +share/gnome/pixmaps/gnome-ccthemes.png share/gnome/pixmaps/gnomecc-2/active.png share/gnome/pixmaps/gnomecc-2/bcg_top.png share/gnome/pixmaps/gnomecc-2/blank.png @@ -112,17 +174,20 @@ share/gnome/pixmaps/gnomecc-2/title.png share/gnome/pixmaps/keyboard-capplet.png share/gnome/pixmaps/keyboard-shortcut.png share/gnome/pixmaps/mouse-capplet.png -share/gnome/pixmaps/sound-capplet.png share/gnome/pixmaps/window-capplet.png share/gnome/vfolders/Accessibility.directory share/gnome/vfolders/Advanced.directory +share/gnome/vfolders/font-method.directory +share/gnome/vfolders/theme-method.directory share/locale/am/LC_MESSAGES/control-center-2.0.mo share/locale/ar/LC_MESSAGES/control-center-2.0.mo share/locale/az/LC_MESSAGES/control-center-2.0.mo share/locale/be/LC_MESSAGES/control-center-2.0.mo share/locale/bg/LC_MESSAGES/control-center-2.0.mo +share/locale/bn/LC_MESSAGES/control-center-2.0.mo share/locale/ca/LC_MESSAGES/control-center-2.0.mo share/locale/cs/LC_MESSAGES/control-center-2.0.mo +share/locale/cy/LC_MESSAGES/control-center-2.0.mo share/locale/da/LC_MESSAGES/control-center-2.0.mo share/locale/de/LC_MESSAGES/control-center-2.0.mo share/locale/el/LC_MESSAGES/control-center-2.0.mo @@ -135,8 +200,11 @@ share/locale/fr/LC_MESSAGES/control-center-2.0.mo share/locale/ga/LC_MESSAGES/control-center-2.0.mo share/locale/gl/LC_MESSAGES/control-center-2.0.mo share/locale/he/LC_MESSAGES/control-center-2.0.mo +share/locale/hi/LC_MESSAGES/control-center-2.0.mo share/locale/hr/LC_MESSAGES/control-center-2.0.mo share/locale/hu/LC_MESSAGES/control-center-2.0.mo +share/locale/id/LC_MESSAGES/control-center-2.0.mo +share/locale/is/LC_MESSAGES/control-center-2.0.mo share/locale/it/LC_MESSAGES/control-center-2.0.mo share/locale/ja/LC_MESSAGES/control-center-2.0.mo share/locale/ko/LC_MESSAGES/control-center-2.0.mo @@ -161,6 +229,7 @@ share/locale/sr/LC_MESSAGES/control-center-2.0.mo share/locale/sr@Latn/LC_MESSAGES/control-center-2.0.mo share/locale/sv/LC_MESSAGES/control-center-2.0.mo share/locale/ta/LC_MESSAGES/control-center-2.0.mo +share/locale/th/LC_MESSAGES/control-center-2.0.mo share/locale/tr/LC_MESSAGES/control-center-2.0.mo share/locale/uk/LC_MESSAGES/control-center-2.0.mo share/locale/vi/LC_MESSAGES/control-center-2.0.mo @@ -169,16 +238,29 @@ share/locale/zh_CN/LC_MESSAGES/control-center-2.0.mo share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo @dirrm share/gnome/pixmaps/gnomecc-2 @dirrm share/gnome/cursor-fonts +@dirrm share/gnome/control-center-2.0/xrdb @dirrm share/gnome/control-center-2.0/pixmaps @dirrm share/gnome/control-center-2.0/interfaces @dirrm share/gnome/control-center-2.0/icons @dirrm share/gnome/applications @dirrm lib/window-manager-settings @dirrm include/gnome-window-settings-2.0 +@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gnome-theme-installed +@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gnome-theme +@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-type1 +@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-ttf +@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-pcf +@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-otf @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/font_rendering @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/screensaver @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/editor @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon +@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-theme-installed +@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-theme +@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-type1 +@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-ttf +@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-pcf +@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-otf @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/font_rendering @dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/screensaver @dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/editor diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile index 570f8c96e235..1cfc0ea85e44 100644 --- a/sysutils/gnome-system-monitor/Makefile +++ b/sysutils/gnome-system-monitor/Makefile @@ -6,16 +6,15 @@ # PORTNAME= gnomesystemmonitor -PORTVERSION= 2.0.5 -PORTREVISION= 1 +PORTVERSION= 2.4.0 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-system-monitor/2.0 +MASTER_SITE_SUBDIR= sources/gnome-system-monitor/2.4 DISTNAME= gnome-system-monitor-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -COMMENT= GNOME 2.0 system monitor program +COMMENT= GNOME 2 system monitor program LIB_DEPENDS= gtop-2.0.2:${PORTSDIR}/devel/libgtop2 diff --git a/sysutils/gnome-system-monitor/distinfo b/sysutils/gnome-system-monitor/distinfo index 0e6bd079ac54..3063caabeafe 100644 --- a/sysutils/gnome-system-monitor/distinfo +++ b/sysutils/gnome-system-monitor/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-system-monitor-2.0.5.tar.bz2) = 42d4ea444ecda4ba95d27baae3532583 +MD5 (gnome2/gnome-system-monitor-2.4.0.tar.bz2) = f855d85adcc2eb0f20f639cbc2f00cbf diff --git a/sysutils/gnome-system-monitor/files/patch-configure b/sysutils/gnome-system-monitor/files/patch-configure index ec8d268afa07..504276306bba 100644 --- a/sysutils/gnome-system-monitor/files/patch-configure +++ b/sysutils/gnome-system-monitor/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Sat Jun 7 01:23:06 2003 -+++ configure Sat Jun 7 01:23:17 2003 -@@ -4014,7 +4014,7 @@ +--- configure.orig Mon Nov 25 21:02:50 2002 ++++ configure Fri Nov 29 20:30:44 2002 +@@ -3731,7 +3731,7 @@ cat >>confdefs.h <<_ACEOF @@ -9,3 +9,12 @@ _ACEOF +@@ -6630,7 +6630,7 @@ + s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t + s,@PKG_CONFIG@,$PKG_CONFIG,;t t + s,@PROCMAN_CFLAGS@,$PROCMAN_CFLAGS,;t t +-s,@PROCMAN_LIBS@,$PROCMAN_LIBS,;t t ++s,@PROCMAN_LIBS@, $PROCMAN_LIBS,;t t + s,@GCONF_SCHEMA_CONFIG_SOURCE@,$GCONF_SCHEMA_CONFIG_SOURCE,;t t + s,@GCONF_SCHEMA_FILE_DIR@,$GCONF_SCHEMA_FILE_DIR,;t t + s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t diff --git a/sysutils/gnome-system-monitor/pkg-plist b/sysutils/gnome-system-monitor/pkg-plist index 2ab1491579c8..d035ed3953c7 100644 --- a/sysutils/gnome-system-monitor/pkg-plist +++ b/sysutils/gnome-system-monitor/pkg-plist @@ -34,14 +34,15 @@ share/locale/bg/LC_MESSAGES/gnome-system-monitor.mo share/locale/bn/LC_MESSAGES/gnome-system-monitor.mo share/locale/ca/LC_MESSAGES/gnome-system-monitor.mo share/locale/cs/LC_MESSAGES/gnome-system-monitor.mo +share/locale/cy/LC_MESSAGES/gnome-system-monitor.mo share/locale/da/LC_MESSAGES/gnome-system-monitor.mo share/locale/de/LC_MESSAGES/gnome-system-monitor.mo share/locale/el/LC_MESSAGES/gnome-system-monitor.mo share/locale/es/LC_MESSAGES/gnome-system-monitor.mo -share/locale/et/LC_MESSAGES/gnome-system-monitor.mo share/locale/fa/LC_MESSAGES/gnome-system-monitor.mo share/locale/fi/LC_MESSAGES/gnome-system-monitor.mo share/locale/fr/LC_MESSAGES/gnome-system-monitor.mo +share/locale/ga/LC_MESSAGES/gnome-system-monitor.mo share/locale/gl/LC_MESSAGES/gnome-system-monitor.mo share/locale/he/LC_MESSAGES/gnome-system-monitor.mo share/locale/hi/LC_MESSAGES/gnome-system-monitor.mo @@ -50,6 +51,7 @@ share/locale/id/LC_MESSAGES/gnome-system-monitor.mo share/locale/it/LC_MESSAGES/gnome-system-monitor.mo share/locale/ja/LC_MESSAGES/gnome-system-monitor.mo share/locale/ko/LC_MESSAGES/gnome-system-monitor.mo +share/locale/li/LC_MESSAGES/gnome-system-monitor.mo share/locale/lv/LC_MESSAGES/gnome-system-monitor.mo share/locale/mk/LC_MESSAGES/gnome-system-monitor.mo share/locale/ml/LC_MESSAGES/gnome-system-monitor.mo @@ -64,10 +66,10 @@ share/locale/ro/LC_MESSAGES/gnome-system-monitor.mo share/locale/ru/LC_MESSAGES/gnome-system-monitor.mo share/locale/sk/LC_MESSAGES/gnome-system-monitor.mo share/locale/sl/LC_MESSAGES/gnome-system-monitor.mo -share/locale/sv/LC_MESSAGES/gnome-system-monitor.mo -share/locale/sq/LC_MESSAGES/gnome-system-monitor.mo share/locale/sr/LC_MESSAGES/gnome-system-monitor.mo share/locale/sr@Latn/LC_MESSAGES/gnome-system-monitor.mo +share/locale/sv/LC_MESSAGES/gnome-system-monitor.mo +share/locale/sq/LC_MESSAGES/gnome-system-monitor.mo share/locale/tr/LC_MESSAGES/gnome-system-monitor.mo share/locale/uk/LC_MESSAGES/gnome-system-monitor.mo share/locale/vi/LC_MESSAGES/gnome-system-monitor.mo diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile index a740f6b1916c..5af729474976 100644 --- a/sysutils/gnomecontrolcenter2/Makefile +++ b/sysutils/gnomecontrolcenter2/Makefile @@ -6,25 +6,29 @@ # PORTNAME= gnomecontrolcenter2 -PORTVERSION= 2.2.2 +PORTVERSION= 2.4.0 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/control-center/2.2 +MASTER_SITE_SUBDIR= sources/control-center/2.4 DISTNAME= control-center-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -COMMENT= Control center for GNOME 2.0 project +COMMENT= Control center for GNOME 2 project USE_BZIP2= yes USE_X_PREFIX= yes USE_REINPLACE= yes USE_GMAKE= yes GNOME_DESKTOP_VERSION=2 -USE_GNOME= gnomeprefix gnomehack gnomehier gnomedesktop metacity -USE_LIBTOOL= yes +USE_GNOME= gnomeprefix gnomehack gnomehier metacity nautilus2 +GNU_CONFIGURE= yes INSTALLS_SHLIB= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" + +post-patch: + @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ + 's|[{]prefix[}]/share/pixmaps|{datadir}/pixmaps|g' .include <bsd.port.mk> diff --git a/sysutils/gnomecontrolcenter2/distinfo b/sysutils/gnomecontrolcenter2/distinfo index 348a7f947f01..660289920173 100644 --- a/sysutils/gnomecontrolcenter2/distinfo +++ b/sysutils/gnomecontrolcenter2/distinfo @@ -1 +1 @@ -MD5 (gnome2/control-center-2.2.2.tar.bz2) = d5288d0e4249a5afdef494d5c59cb1bc +MD5 (gnome2/control-center-2.4.0.tar.bz2) = 44115d3174d2f603f34a336ada562bae diff --git a/sysutils/gnomecontrolcenter2/files/patch-configure b/sysutils/gnomecontrolcenter2/files/patch-configure index 1f63c8a48e05..83ef8876cbb3 100644 --- a/sysutils/gnomecontrolcenter2/files/patch-configure +++ b/sysutils/gnomecontrolcenter2/files/patch-configure @@ -1,13 +1,5 @@ --- configure.orig Wed Dec 18 16:10:09 2002 +++ configure Sun Dec 22 16:36:03 2002 -@@ -8516,6 +8516,7 @@ - - # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+$ac_aux_dir/ltconfig $LIBTOOL_DEPS - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' @@ -12607,7 +12608,7 @@ diff --git a/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_Makefile.in b/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_Makefile.in deleted file mode 100644 index 49e81252a028..000000000000 --- a/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- gnome-settings-daemon/Makefile.in.orig Fri Jan 17 12:30:39 2003 -+++ gnome-settings-daemon/Makefile.in Fri Jan 17 12:33:06 2003 -@@ -195,7 +195,7 @@ - $(GNOME_SETTINGS_DAEMON_LIBS) \ - $(top_builddir)/libbackground/libbackground.la \ - $(top_builddir)/libsounds/libsounds.a \ -- -L$(top_builddir)/libwindow-settings/ -lgnome-window-settings \ -+ -L$(top_builddir)/libwindow-settings/.libs -lgnome-window-settings \ - $(XF86MISC_LIBS) - - diff --git a/sysutils/gnomecontrolcenter2/files/patch-libbackground_Makefile.in b/sysutils/gnomecontrolcenter2/files/patch-libbackground_Makefile.in deleted file mode 100644 index d8ece4b307ac..000000000000 --- a/sysutils/gnomecontrolcenter2/files/patch-libbackground_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- libbackground/Makefile.in.orig Fri Jan 17 12:33:42 2003 -+++ libbackground/Makefile.in Fri Jan 17 12:34:13 2003 -@@ -151,7 +151,7 @@ - - INCLUDES = \ - -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ -- -DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \ -+ -DGNOME_ICONDIR=\""${datadir}/pixmaps"\" \ - -DG_LOG_DOMAIN=\"capplet-common\" \ - -I$(top_srcdir)/ \ - @CAPPLET_CFLAGS@ diff --git a/sysutils/gnomecontrolcenter2/files/patch-libwindow-settings_Makefile.in b/sysutils/gnomecontrolcenter2/files/patch-libwindow-settings_Makefile.in deleted file mode 100644 index c4d9211b70e2..000000000000 --- a/sysutils/gnomecontrolcenter2/files/patch-libwindow-settings_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- libwindow-settings/Makefile.in.orig Fri Jan 17 12:34:44 2003 -+++ libwindow-settings/Makefile.in Fri Jan 17 12:35:43 2003 -@@ -151,7 +151,7 @@ - - INCLUDES = \ - -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ -- -DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \ -+ -DGNOME_ICONDIR=\""${datadir}/pixmaps"\" \ - -DG_LOG_DOMAIN=\"capplet-common\" \ - -DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(WM_MODULE_DIR)"\" \ - -I$(top_srcdir)/ \ diff --git a/sysutils/gnomecontrolcenter2/files/patch-ltmain.sh b/sysutils/gnomecontrolcenter2/files/patch-ltmain.sh new file mode 100644 index 000000000000..49efbb5decf5 --- /dev/null +++ b/sysutils/gnomecontrolcenter2/files/patch-ltmain.sh @@ -0,0 +1,51 @@ +--- ltmain.sh.orig Thu May 1 11:30:14 2003 ++++ ltmain.sh Mon Aug 11 14:38:46 2003 +@@ -1280,7 +1280,7 @@ + esac + elif test "X$arg" = "X-lc_r"; then + case $host in +- *-*-openbsd* | *-*-freebsd*) ++ *-*-openbsd* | *-*-freebsd4*) + # Do not include libc_r directly, use -pthread flag. + continue + ;; +@@ -1290,8 +1290,16 @@ + continue + ;; + ++ -pthread) ++ compile_command="$compile_command -pthread" ++ finalize_command="$finalize_command -pthread" ++ compiler_flags="$compiler_flags -pthread" ++ continue ++ ;; ++ + -module) + module=yes ++ build_old_libs=no + continue + ;; + +@@ -3000,6 +3008,9 @@ + # problems, so we reset it completely + verstring= + ;; ++ *-*-freebsd*) ++ # FreeBSD doesn't need this... ++ ;; + *) + verstring="0.0" + ;; +@@ -5428,10 +5439,12 @@ + fi + + # Install the pseudo-library for information purposes. ++ if /usr/bin/false; then + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + instname="$dir/$name"i + $show "$install_prog $instname $destdir/$name" + $run eval "$install_prog $instname $destdir/$name" || exit $? ++ fi + + # Maybe install the static library, too. + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/sysutils/gnomecontrolcenter2/files/patch-vfs_methods_themus_theme-method.c b/sysutils/gnomecontrolcenter2/files/patch-vfs_methods_themus_theme-method.c new file mode 100644 index 000000000000..a9add20e26dd --- /dev/null +++ b/sysutils/gnomecontrolcenter2/files/patch-vfs_methods_themus_theme-method.c @@ -0,0 +1,10 @@ +--- vfs-methods/themus/theme-method.c.orig Fri Jun 13 07:52:44 2003 ++++ vfs-methods/themus/theme-method.c Sat Jun 28 12:50:39 2003 +@@ -19,6 +19,7 @@ + + #include <string.h> + #include <errno.h> ++#include <libintl.h> + #include <sys/stat.h> + #include <sys/types.h> + diff --git a/sysutils/gnomecontrolcenter2/pkg-plist b/sysutils/gnomecontrolcenter2/pkg-plist index bddf0905df36..00cba32274e8 100644 --- a/sysutils/gnomecontrolcenter2/pkg-plist +++ b/sysutils/gnomecontrolcenter2/pkg-plist @@ -1,42 +1,76 @@ bin/gnome-accessibility-keyboard-properties +bin/gnome-at-properties bin/gnome-background-properties bin/gnome-control-center bin/gnome-default-applications-properties +bin/gnome-display-properties bin/gnome-file-types-properties bin/gnome-font-properties +bin/gnome-font-viewer bin/gnome-keybinding-properties bin/gnome-keyboard-properties bin/gnome-mouse-properties bin/gnome-network-preferences bin/gnome-settings-daemon bin/gnome-sound-properties +bin/themus-theme-applier bin/gnome-theme-manager +bin/gnome-theme-thumbnailer +bin/gnome-thumbnail-font +bin/gnome-typing-monitor bin/gnome-ui-properties bin/gnome-window-properties etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/editor/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/screensaver/%gconf.xml etc/gconf/gconf.xml.defaults/desktop/gnome/font_rendering/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-otf/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-pcf/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-ttf/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-type1/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-theme-installed/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-theme/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/editor/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/screensaver/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/font_rendering/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-otf/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-pcf/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-ttf/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-type1/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gnome-theme-installed/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gnome-theme/%gconf.xml etc/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas etc/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas etc/gconf/schemas/desktop_gnome_font_rendering.schemas +etc/gconf/schemas/fontilus.schemas +etc/gconf/schemas/themus.schemas +etc/gnome-vfs-2.0/modules/font-method.conf +etc/gnome-vfs-2.0/modules/theme-method.conf include/gnome-window-settings-2.0/gnome-window-manager.h include/gnome-window-settings-2.0/gnome-wm-manager.h +lib/bonobo/libthemus-theme-properties-view.so +lib/gnome-vfs-2.0/modules/libfont-method.so +lib/gnome-vfs-2.0/modules/libtheme-method.so lib/libgnome-window-settings.a lib/libgnome-window-settings.so lib/libgnome-window-settings.so.1 +lib/window-manager-settings/libmetacity.a lib/window-manager-settings/libmetacity.so libdata/bonobo/servers/GNOME_SettingsDaemon.server +libdata/bonobo/servers/Themus_Properties_View.server +libdata/bonobo/servers/fontilus.server libdata/pkgconfig/gnome-window-settings-2.0.pc +libexec/fontilus-context-menu +share/gnome/application-registry/fontilus.applications +share/gnome/application-registry/themus.applications share/gnome/applications/gnomecc.desktop share/gnome/control-center-2.0/capplets/accessibility-keyboard.desktop +share/gnome/control-center-2.0/capplets/at-properties.desktop share/gnome/control-center-2.0/capplets/background.desktop share/gnome/control-center-2.0/capplets/behavior.desktop share/gnome/control-center-2.0/capplets/default-applications.desktop +share/gnome/control-center-2.0/capplets/display-properties.desktop share/gnome/control-center-2.0/capplets/file-types.desktop share/gnome/control-center-2.0/capplets/font-properties.desktop share/gnome/control-center-2.0/capplets/gnome-network-preferences.desktop @@ -48,13 +82,17 @@ share/gnome/control-center-2.0/capplets/sound.desktop share/gnome/control-center-2.0/capplets/window-properties.desktop share/gnome/control-center-2.0/icons/accessibility-directory.png share/gnome/control-center-2.0/icons/accessibility-keyboard-capplet.png +share/gnome/control-center-2.0/icons/at-enable-capplet.png share/gnome/control-center-2.0/icons/background-capplet.png share/gnome/control-center-2.0/icons/behavior-capplet.png share/gnome/control-center-2.0/icons/default-applications-capplet.png +share/gnome/control-center-2.0/icons/display-capplet.png share/gnome/control-center-2.0/icons/font-capplet.png +share/gnome/control-center-2.0/icons/gnome-network-capplet.png share/gnome/control-center-2.0/icons/mouse-capplet.png share/gnome/control-center-2.0/icons/sound-capplet.png share/gnome/control-center-2.0/icons/window-capplet.png +share/gnome/control-center-2.0/interfaces/at-enable-dialog.glade share/gnome/control-center-2.0/interfaces/background-properties.glade share/gnome/control-center-2.0/interfaces/file-types-properties.glade share/gnome/control-center-2.0/interfaces/font-properties.glade @@ -65,15 +103,22 @@ share/gnome/control-center-2.0/interfaces/gnome-keyboard-properties.glade share/gnome/control-center-2.0/interfaces/gnome-mouse-properties.glade share/gnome/control-center-2.0/interfaces/gnome-network-preferences.glade share/gnome/control-center-2.0/interfaces/gnome-ui-properties.glade +share/gnome/control-center-2.0/interfaces/gnome-window-properties.glade share/gnome/control-center-2.0/interfaces/sound-properties.glade share/gnome/control-center-2.0/interfaces/theme-install.glade share/gnome/control-center-2.0/interfaces/theme-properties.glade -share/gnome/control-center-2.0/interfaces/gnome-window-properties.glade share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-bouncekey.png share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-mousekey.png share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-slowkey.png share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-stickykey.png share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-togglekey.png +share/gnome/control-center-2.0/pixmaps/at-enable-capplet.png +share/gnome/control-center-2.0/pixmaps/at-startup.png +share/gnome/control-center-2.0/pixmaps/at-support.png +share/gnome/control-center-2.0/pixmaps/bar-disabled.png +share/gnome/control-center-2.0/pixmaps/bar-green.png +share/gnome/control-center-2.0/pixmaps/bar-red.png +share/gnome/control-center-2.0/pixmaps/bar.png share/gnome/control-center-2.0/pixmaps/double-click-maybe.png share/gnome/control-center-2.0/pixmaps/double-click-off.png share/gnome/control-center-2.0/pixmaps/double-click-on.png @@ -88,23 +133,40 @@ share/gnome/control-center-2.0/pixmaps/mouse-cursor-white-large.png share/gnome/control-center-2.0/pixmaps/mouse-cursor-white.png share/gnome/control-center-2.0/pixmaps/mouse-left.png share/gnome/control-center-2.0/pixmaps/mouse-right.png +share/gnome/control-center-2.0/pixmaps/ocean-stripes.png +share/gnome/control-center-2.0/pixmaps/sound-capplet.png +share/gnome/control-center-2.0/pixmaps/stop.png share/gnome/control-center-2.0/pixmaps/subpixel-bgr.png share/gnome/control-center-2.0/pixmaps/subpixel-rgb.png share/gnome/control-center-2.0/pixmaps/subpixel-vbgr.png share/gnome/control-center-2.0/pixmaps/subpixel-vrgb.png share/gnome/control-center-2.0/pixmaps/theme-thumbnailing.png +share/gnome/control-center-2.0/pixmaps/visual-bell.png +share/gnome/control-center-2.0/xrdb/Editres.ad +share/gnome/control-center-2.0/xrdb/Emacs.ad +share/gnome/control-center-2.0/xrdb/General.ad +share/gnome/control-center-2.0/xrdb/Motif.ad +share/gnome/control-center-2.0/xrdb/Tk.ad +share/gnome/control-center-2.0/xrdb/Xaw.ad +share/gnome/control-center/apply-font.glade share/gnome/cursor-fonts/cursor-large-white.pcf share/gnome/cursor-fonts/cursor-large.pcf share/gnome/cursor-fonts/cursor-white.pcf share/gnome/gnome-2.0/ui/gnomecc-ui.xml share/gnome/idl/ConfigArchiver.idl share/gnome/idl/GNOME_SettingsDaemon.idl +share/gnome/mime-info/fontilus.keys +share/gnome/mime-info/fontilus.mime +share/gnome/mime-info/themus.keys share/gnome/pixmaps/accessibility-keyboard-capplet.png +share/gnome/pixmaps/at-enable-capplet.png share/gnome/pixmaps/background-capplet.png share/gnome/pixmaps/behavior-capplet.png share/gnome/pixmaps/control-center2.png share/gnome/pixmaps/default-applications-capplet.png +share/gnome/pixmaps/display-capplet.png share/gnome/pixmaps/font-capplet.png +share/gnome/pixmaps/gnome-ccthemes.png share/gnome/pixmaps/gnomecc-2/active.png share/gnome/pixmaps/gnomecc-2/bcg_top.png share/gnome/pixmaps/gnomecc-2/blank.png @@ -112,17 +174,20 @@ share/gnome/pixmaps/gnomecc-2/title.png share/gnome/pixmaps/keyboard-capplet.png share/gnome/pixmaps/keyboard-shortcut.png share/gnome/pixmaps/mouse-capplet.png -share/gnome/pixmaps/sound-capplet.png share/gnome/pixmaps/window-capplet.png share/gnome/vfolders/Accessibility.directory share/gnome/vfolders/Advanced.directory +share/gnome/vfolders/font-method.directory +share/gnome/vfolders/theme-method.directory share/locale/am/LC_MESSAGES/control-center-2.0.mo share/locale/ar/LC_MESSAGES/control-center-2.0.mo share/locale/az/LC_MESSAGES/control-center-2.0.mo share/locale/be/LC_MESSAGES/control-center-2.0.mo share/locale/bg/LC_MESSAGES/control-center-2.0.mo +share/locale/bn/LC_MESSAGES/control-center-2.0.mo share/locale/ca/LC_MESSAGES/control-center-2.0.mo share/locale/cs/LC_MESSAGES/control-center-2.0.mo +share/locale/cy/LC_MESSAGES/control-center-2.0.mo share/locale/da/LC_MESSAGES/control-center-2.0.mo share/locale/de/LC_MESSAGES/control-center-2.0.mo share/locale/el/LC_MESSAGES/control-center-2.0.mo @@ -135,8 +200,11 @@ share/locale/fr/LC_MESSAGES/control-center-2.0.mo share/locale/ga/LC_MESSAGES/control-center-2.0.mo share/locale/gl/LC_MESSAGES/control-center-2.0.mo share/locale/he/LC_MESSAGES/control-center-2.0.mo +share/locale/hi/LC_MESSAGES/control-center-2.0.mo share/locale/hr/LC_MESSAGES/control-center-2.0.mo share/locale/hu/LC_MESSAGES/control-center-2.0.mo +share/locale/id/LC_MESSAGES/control-center-2.0.mo +share/locale/is/LC_MESSAGES/control-center-2.0.mo share/locale/it/LC_MESSAGES/control-center-2.0.mo share/locale/ja/LC_MESSAGES/control-center-2.0.mo share/locale/ko/LC_MESSAGES/control-center-2.0.mo @@ -161,6 +229,7 @@ share/locale/sr/LC_MESSAGES/control-center-2.0.mo share/locale/sr@Latn/LC_MESSAGES/control-center-2.0.mo share/locale/sv/LC_MESSAGES/control-center-2.0.mo share/locale/ta/LC_MESSAGES/control-center-2.0.mo +share/locale/th/LC_MESSAGES/control-center-2.0.mo share/locale/tr/LC_MESSAGES/control-center-2.0.mo share/locale/uk/LC_MESSAGES/control-center-2.0.mo share/locale/vi/LC_MESSAGES/control-center-2.0.mo @@ -169,16 +238,29 @@ share/locale/zh_CN/LC_MESSAGES/control-center-2.0.mo share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo @dirrm share/gnome/pixmaps/gnomecc-2 @dirrm share/gnome/cursor-fonts +@dirrm share/gnome/control-center-2.0/xrdb @dirrm share/gnome/control-center-2.0/pixmaps @dirrm share/gnome/control-center-2.0/interfaces @dirrm share/gnome/control-center-2.0/icons @dirrm share/gnome/applications @dirrm lib/window-manager-settings @dirrm include/gnome-window-settings-2.0 +@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gnome-theme-installed +@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gnome-theme +@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-type1 +@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-ttf +@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-pcf +@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-otf @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/font_rendering @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/screensaver @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/editor @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon +@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-theme-installed +@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-theme +@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-type1 +@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-ttf +@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-pcf +@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-otf @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/font_rendering @dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/screensaver @dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/editor diff --git a/sysutils/gnomesystemmonitor/Makefile b/sysutils/gnomesystemmonitor/Makefile index 570f8c96e235..1cfc0ea85e44 100644 --- a/sysutils/gnomesystemmonitor/Makefile +++ b/sysutils/gnomesystemmonitor/Makefile @@ -6,16 +6,15 @@ # PORTNAME= gnomesystemmonitor -PORTVERSION= 2.0.5 -PORTREVISION= 1 +PORTVERSION= 2.4.0 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-system-monitor/2.0 +MASTER_SITE_SUBDIR= sources/gnome-system-monitor/2.4 DISTNAME= gnome-system-monitor-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -COMMENT= GNOME 2.0 system monitor program +COMMENT= GNOME 2 system monitor program LIB_DEPENDS= gtop-2.0.2:${PORTSDIR}/devel/libgtop2 diff --git a/sysutils/gnomesystemmonitor/distinfo b/sysutils/gnomesystemmonitor/distinfo index 0e6bd079ac54..3063caabeafe 100644 --- a/sysutils/gnomesystemmonitor/distinfo +++ b/sysutils/gnomesystemmonitor/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-system-monitor-2.0.5.tar.bz2) = 42d4ea444ecda4ba95d27baae3532583 +MD5 (gnome2/gnome-system-monitor-2.4.0.tar.bz2) = f855d85adcc2eb0f20f639cbc2f00cbf diff --git a/sysutils/gnomesystemmonitor/files/patch-configure b/sysutils/gnomesystemmonitor/files/patch-configure index ec8d268afa07..504276306bba 100644 --- a/sysutils/gnomesystemmonitor/files/patch-configure +++ b/sysutils/gnomesystemmonitor/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Sat Jun 7 01:23:06 2003 -+++ configure Sat Jun 7 01:23:17 2003 -@@ -4014,7 +4014,7 @@ +--- configure.orig Mon Nov 25 21:02:50 2002 ++++ configure Fri Nov 29 20:30:44 2002 +@@ -3731,7 +3731,7 @@ cat >>confdefs.h <<_ACEOF @@ -9,3 +9,12 @@ _ACEOF +@@ -6630,7 +6630,7 @@ + s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t + s,@PKG_CONFIG@,$PKG_CONFIG,;t t + s,@PROCMAN_CFLAGS@,$PROCMAN_CFLAGS,;t t +-s,@PROCMAN_LIBS@,$PROCMAN_LIBS,;t t ++s,@PROCMAN_LIBS@, $PROCMAN_LIBS,;t t + s,@GCONF_SCHEMA_CONFIG_SOURCE@,$GCONF_SCHEMA_CONFIG_SOURCE,;t t + s,@GCONF_SCHEMA_FILE_DIR@,$GCONF_SCHEMA_FILE_DIR,;t t + s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t diff --git a/sysutils/gnomesystemmonitor/pkg-plist b/sysutils/gnomesystemmonitor/pkg-plist index 2ab1491579c8..d035ed3953c7 100644 --- a/sysutils/gnomesystemmonitor/pkg-plist +++ b/sysutils/gnomesystemmonitor/pkg-plist @@ -34,14 +34,15 @@ share/locale/bg/LC_MESSAGES/gnome-system-monitor.mo share/locale/bn/LC_MESSAGES/gnome-system-monitor.mo share/locale/ca/LC_MESSAGES/gnome-system-monitor.mo share/locale/cs/LC_MESSAGES/gnome-system-monitor.mo +share/locale/cy/LC_MESSAGES/gnome-system-monitor.mo share/locale/da/LC_MESSAGES/gnome-system-monitor.mo share/locale/de/LC_MESSAGES/gnome-system-monitor.mo share/locale/el/LC_MESSAGES/gnome-system-monitor.mo share/locale/es/LC_MESSAGES/gnome-system-monitor.mo -share/locale/et/LC_MESSAGES/gnome-system-monitor.mo share/locale/fa/LC_MESSAGES/gnome-system-monitor.mo share/locale/fi/LC_MESSAGES/gnome-system-monitor.mo share/locale/fr/LC_MESSAGES/gnome-system-monitor.mo +share/locale/ga/LC_MESSAGES/gnome-system-monitor.mo share/locale/gl/LC_MESSAGES/gnome-system-monitor.mo share/locale/he/LC_MESSAGES/gnome-system-monitor.mo share/locale/hi/LC_MESSAGES/gnome-system-monitor.mo @@ -50,6 +51,7 @@ share/locale/id/LC_MESSAGES/gnome-system-monitor.mo share/locale/it/LC_MESSAGES/gnome-system-monitor.mo share/locale/ja/LC_MESSAGES/gnome-system-monitor.mo share/locale/ko/LC_MESSAGES/gnome-system-monitor.mo +share/locale/li/LC_MESSAGES/gnome-system-monitor.mo share/locale/lv/LC_MESSAGES/gnome-system-monitor.mo share/locale/mk/LC_MESSAGES/gnome-system-monitor.mo share/locale/ml/LC_MESSAGES/gnome-system-monitor.mo @@ -64,10 +66,10 @@ share/locale/ro/LC_MESSAGES/gnome-system-monitor.mo share/locale/ru/LC_MESSAGES/gnome-system-monitor.mo share/locale/sk/LC_MESSAGES/gnome-system-monitor.mo share/locale/sl/LC_MESSAGES/gnome-system-monitor.mo -share/locale/sv/LC_MESSAGES/gnome-system-monitor.mo -share/locale/sq/LC_MESSAGES/gnome-system-monitor.mo share/locale/sr/LC_MESSAGES/gnome-system-monitor.mo share/locale/sr@Latn/LC_MESSAGES/gnome-system-monitor.mo +share/locale/sv/LC_MESSAGES/gnome-system-monitor.mo +share/locale/sq/LC_MESSAGES/gnome-system-monitor.mo share/locale/tr/LC_MESSAGES/gnome-system-monitor.mo share/locale/uk/LC_MESSAGES/gnome-system-monitor.mo share/locale/vi/LC_MESSAGES/gnome-system-monitor.mo diff --git a/sysutils/gok/Makefile b/sysutils/gok/Makefile index 020a95a5f68e..405fba06569d 100644 --- a/sysutils/gok/Makefile +++ b/sysutils/gok/Makefile @@ -6,15 +6,16 @@ # PORTNAME= gok -PORTVERSION= 0.7.5 -CATEGORIES= sysutils gnome +PORTVERSION= 0.8.2 +CATEGORIES= sysutils gnome accessibility MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.7 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.8 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME On-Screen Keyboard (GOK) +USE_BZIP2= yes USE_X_PREFIX= yes USE_GNOME= gnomehack gnomeprefix libgnomeui atspi libwnck USE_REINPLACE= yes diff --git a/sysutils/gok/distinfo b/sysutils/gok/distinfo index 243d98493042..76fde0ba0bf1 100644 --- a/sysutils/gok/distinfo +++ b/sysutils/gok/distinfo @@ -1 +1 @@ -MD5 (gnome2/gok-0.7.5.tar.gz) = 8ae32031b253371eb76be5f59c26bafd +MD5 (gnome2/gok-0.8.2.tar.bz2) = 3b495c7b8f8e10e370246c95d75f58eb diff --git a/sysutils/gok/files/patch-gok_gok-data.c b/sysutils/gok/files/patch-gok_gok-data.c index 901b763b08ab..e69de29bb2d1 100644 --- a/sysutils/gok/files/patch-gok_gok-data.c +++ b/sysutils/gok/files/patch-gok_gok-data.c @@ -1,12 +0,0 @@ ---- gok/gok-data.c.orig Mon Jun 2 21:49:16 2003 -+++ gok/gok-data.c Mon Jun 2 21:49:26 2003 -@@ -707,8 +707,8 @@ - */ - void gok_data_set_is_dock (GokDockType val) - { -- m_eDockType = val; - gchar *typestring; -+ m_eDockType = val; - switch (val) { - case GOK_DOCK_TOP: - typestring = "top"; diff --git a/sysutils/gok/pkg-plist b/sysutils/gok/pkg-plist index 35335cb46f8b..bdcaccbfbc81 100644 --- a/sysutils/gok/pkg-plist +++ b/sysutils/gok/pkg-plist @@ -19,6 +19,7 @@ etc/gconf/gconf.xml.defaults/apps/gok/feedbacks/goksound2/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gok/feedbacks/key_flashing/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gok/feedbacks/none/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gok/layout/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gok/spy/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gok/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gok/actions/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gok/actions/dwell/%gconf.xml @@ -39,65 +40,77 @@ etc/gconf/gconf.xml.defaults/schemas/apps/gok/feedbacks/goksound2/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gok/feedbacks/key_flashing/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gok/feedbacks/none/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gok/layout/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gok/spy/%gconf.xml etc/gconf/schemas/gok.schemas libdata/pkgconfig/gok-1.0.pc -share/doc/gok/c4.html -share/doc/gok/gok-arraylist.html -share/doc/gok/gok-callbacks.html -share/doc/gok/gok-command-common.html -share/doc/gok/gok-command-edge-data.html -share/doc/gok/gok-command-edge.html -share/doc/gok/gok-command-graph.html -share/doc/gok/gok-command-predictor.html -share/doc/gok/gok-command-vertex-data.html -share/doc/gok/gok-command-vertex.html -share/doc/gok/gok-global.html -share/doc/gok/gok-gok-action.html -share/doc/gok/gok-gok-branchback-stack.html -share/doc/gok/gok-gok-chunker.html -share/doc/gok/gok-gok-control.html -share/doc/gok/gok-gok-data.html -share/doc/gok/gok-gok-editor.html -share/doc/gok/gok-gok-feedback.html -share/doc/gok/gok-gok-file-util.html -share/doc/gok/gok-gok-gconf-keys.html -share/doc/gok/gok-gok-gconf.html -share/doc/gok/gok-gok-key.html -share/doc/gok/gok-gok-keyboard.html -share/doc/gok/gok-gok-keyslotter.html -share/doc/gok/gok-gok-log-priv.html -share/doc/gok/gok-gok-log-reader.html -share/doc/gok/gok-gok-log.html -share/doc/gok/gok-gok-modifier.html -share/doc/gok/gok-gok-output.html -share/doc/gok/gok-gok-page-accessmethod.html -share/doc/gok/gok-gok-page-actions.html -share/doc/gok/gok-gok-page-feedbacks.html -share/doc/gok/gok-gok-page-keysizespace.html -share/doc/gok/gok-gok-page-wordcomplete.html -share/doc/gok/gok-gok-predictor.html -share/doc/gok/gok-gok-scanner.html -share/doc/gok/gok-gok-settings-dialog.html -share/doc/gok/gok-gok-sound.html -share/doc/gok/gok-gok-spy-priv.html -share/doc/gok/gok-gok-spy.html -share/doc/gok/gok-gok-word-complete.html -share/doc/gok/gok-gok.html -share/doc/gok/gok-gokbutton.html -share/doc/gok/gok-gtkjoyswitch.html -share/doc/gok/gok-interface.html -share/doc/gok/gok-main.html -share/doc/gok/gok-support.html -share/doc/gok/gok-switchapi.html -share/doc/gok/gok-word-complete.html -share/doc/gok/index.html -share/doc/gok/index.sgml +%%DOCSDIR%%/c4.html +%%DOCSDIR%%/gok-arraylist.html +%%DOCSDIR%%/gok-callbacks.html +%%DOCSDIR%%/gok-command-common.html +%%DOCSDIR%%/gok-command-edge-data.html +%%DOCSDIR%%/gok-command-edge.html +%%DOCSDIR%%/gok-command-graph.html +%%DOCSDIR%%/gok-command-predictor.html +%%DOCSDIR%%/gok-command-vertex-data.html +%%DOCSDIR%%/gok-command-vertex.html +%%DOCSDIR%%/gok-global.html +%%DOCSDIR%%/gok-gok-action.html +%%DOCSDIR%%/gok-gok-branchback-stack.html +%%DOCSDIR%%/gok-gok-chunker.html +%%DOCSDIR%%/gok-gok-control.html +%%DOCSDIR%%/gok-gok-data.html +%%DOCSDIR%%/gok-gok-editor.html +%%DOCSDIR%%/gok-gok-feedback.html +%%DOCSDIR%%/gok-gok-file-util.html +%%DOCSDIR%%/gok-gok-gconf-keys.html +%%DOCSDIR%%/gok-gok-gconf.html +%%DOCSDIR%%/gok-gok-key.html +%%DOCSDIR%%/gok-gok-keyboard.html +%%DOCSDIR%%/gok-gok-keyslotter.html +%%DOCSDIR%%/gok-gok-log-priv.html +%%DOCSDIR%%/gok-gok-log-reader.html +%%DOCSDIR%%/gok-gok-log.html +%%DOCSDIR%%/gok-gok-modifier.html +%%DOCSDIR%%/gok-gok-output.html +%%DOCSDIR%%/gok-gok-page-accessmethod.html +%%DOCSDIR%%/gok-gok-page-actions.html +%%DOCSDIR%%/gok-gok-page-feedbacks.html +%%DOCSDIR%%/gok-gok-page-keysizespace.html +%%DOCSDIR%%/gok-gok-page-wordcomplete.html +%%DOCSDIR%%/gok-gok-predictor.html +%%DOCSDIR%%/gok-gok-scanner.html +%%DOCSDIR%%/gok-gok-settings-dialog.html +%%DOCSDIR%%/gok-gok-sound.html +%%DOCSDIR%%/gok-gok-spy-priv.html +%%DOCSDIR%%/gok-gok-spy.html +%%DOCSDIR%%/gok-gok-word-complete.html +%%DOCSDIR%%/gok-gok.html +%%DOCSDIR%%/gok-gokbutton.html +%%DOCSDIR%%/gok-gtkjoyswitch.html +%%DOCSDIR%%/gok-interface.html +%%DOCSDIR%%/gok-main.html +%%DOCSDIR%%/gok-support.html +%%DOCSDIR%%/gok-switchapi.html +%%DOCSDIR%%/gok-word-complete.html +%%DOCSDIR%%/index.html +%%DOCSDIR%%/index.sgml +share/gnome/applications/gok.desktop +share/gnome/gok/East.png share/gnome/gok/Keyboard.kbd +share/gnome/gok/NE.png +share/gnome/gok/NW.png +share/gnome/gok/North.png +share/gnome/gok/SE.png +share/gnome/gok/SW.png +share/gnome/gok/South.png +share/gnome/gok/West.png share/gnome/gok/alphabet.kbd share/gnome/gok/automatic-scanning.xam share/gnome/gok/dictionary.txt share/gnome/gok/direct-selection.xam share/gnome/gok/dwell-selection.xam +share/gnome/gok/empty.png +share/gnome/gok/gok.png share/gnome/gok/gok.rc share/gnome/gok/gok-controls.kbd share/gnome/gok/goklogo.png @@ -105,38 +118,60 @@ share/gnome/gok/goksound1.wav share/gnome/gok/goksound2.wav share/gnome/gok/inverse-scanning.xam share/gnome/gok/hide.kbd +share/gnome/gok/latched.png share/gnome/gok/launcher.kbd +share/gnome/gok/locked.png share/gnome/gok/main.kbd share/gnome/gok/manage.kbd +share/gnome/gok/mouse.kbd share/gnome/gok/move-resize.kbd +share/gnome/gok/quit.kbd share/gnome/gok/qwerty.kbd +share/gnome/gok/small-empty.png +share/gnome/gok/text-operations.kbd share/gnome/help/gok/C/gok.xml share/gnome/omf/gok/gok-C.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gok/gok-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gok/gok-C.omf || /usr/bin/true +share/gnome/pixmaps/gok.png share/locale/am/LC_MESSAGES/gok.mo +share/locale/az/LC_MESSAGES/gok.mo +share/locale/be/LC_MESSAGES/gok.mo share/locale/ca/LC_MESSAGES/gok.mo share/locale/cs/LC_MESSAGES/gok.mo +share/locale/cy/LC_MESSAGES/gok.mo share/locale/da/LC_MESSAGES/gok.mo share/locale/de/LC_MESSAGES/gok.mo +share/locale/el/LC_MESSAGES/gok.mo share/locale/es/LC_MESSAGES/gok.mo share/locale/fr/LC_MESSAGES/gok.mo +share/locale/hi/LC_MESSAGES/gok.mo share/locale/it/LC_MESSAGES/gok.mo share/locale/ja/LC_MESSAGES/gok.mo +share/locale/ko/LC_MESSAGES/gok.mo +share/locale/mk/LC_MESSAGES/gok.mo +share/locale/ml/LC_MESSAGES/gok.mo +share/locale/ms/LC_MESSAGES/gok.mo share/locale/nl/LC_MESSAGES/gok.mo share/locale/no/LC_MESSAGES/gok.mo +share/locale/pl/LC_MESSAGES/gok.mo share/locale/pt/LC_MESSAGES/gok.mo share/locale/pt_BR/LC_MESSAGES/gok.mo +share/locale/sl/LC_MESSAGES/gok.mo +share/locale/sq/LC_MESSAGES/gok.mo share/locale/sr/LC_MESSAGES/gok.mo share/locale/sr@Latn/LC_MESSAGES/gok.mo share/locale/sv/LC_MESSAGES/gok.mo share/locale/uk/LC_MESSAGES/gok.mo share/locale/vi/LC_MESSAGES/gok.mo +share/locale/zh_CN/LC_MESSAGES/gok.mo +share/locale/zh_TW/LC_MESSAGES/gok.mo @dirrm share/gnome/omf/gok @dirrm share/gnome/help/gok/C/figures @dirrm share/gnome/help/gok/C @dirrm share/gnome/help/gok @dirrm share/gnome/gok -@dirrm share/doc/gok +@dirrm %%DOCSDIR%% +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/spy @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/layout @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/feedbacks/none @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/feedbacks/key_flashing @@ -157,6 +192,7 @@ share/locale/vi/LC_MESSAGES/gok.mo @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/actions/dwell @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/actions @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok +@dirrm etc/gconf/gconf.xml.defaults/apps/gok/spy @dirrm etc/gconf/gconf.xml.defaults/apps/gok/layout @dirrm etc/gconf/gconf.xml.defaults/apps/gok/feedbacks/none @dirrm etc/gconf/gconf.xml.defaults/apps/gok/feedbacks/key_flashing @@ -177,4 +213,4 @@ share/locale/vi/LC_MESSAGES/gok.mo @dirrm etc/gconf/gconf.xml.defaults/apps/gok/actions/dwell @dirrm etc/gconf/gconf.xml.defaults/apps/gok/actions @dirrm etc/gconf/gconf.xml.defaults/apps/gok -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gok/gok-C.omf +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gok/gok-C.omf || /usr/bin/true diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile index 3feac8619e9e..bded43452526 100644 --- a/textproc/libxml2/Makefile +++ b/textproc/libxml2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= libxml2 -PORTVERSION= 2.5.10 +PORTVERSION= 2.5.11 CATEGORIES= textproc gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.5 diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo index d7bc5676ac14..65a99039df65 100644 --- a/textproc/libxml2/distinfo +++ b/textproc/libxml2/distinfo @@ -1 +1 @@ -MD5 (gnome2/libxml2-2.5.10.tar.bz2) = cb2934ee74ff4349b0005d8fa29a7532 +MD5 (gnome2/libxml2-2.5.11.tar.bz2) = 5b6d9dae5f07f5827e194c69ac1723c1 diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile index 48023c861f18..7f5ea6fa3711 100644 --- a/textproc/libxslt/Makefile +++ b/textproc/libxslt/Makefile @@ -6,7 +6,7 @@ # PORTNAME= libxslt -PORTVERSION= 1.0.32 +PORTVERSION= 1.0.33 CATEGORIES= textproc gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0 @@ -29,6 +29,7 @@ MAN1= xsltproc.1 .if !defined(WITHOUT_PYTHON) USE_PYTHON= yes PLIST_SUB+= PYTHON:="" +CONFIGURE_ARGS+= --with-python=${LOCALBASE} .else CONFIGURE_ARGS+= --without-python PLIST_SUB+= PYTHON:="@comment " diff --git a/textproc/libxslt/distinfo b/textproc/libxslt/distinfo index 3212611e4dbb..19196123260b 100644 --- a/textproc/libxslt/distinfo +++ b/textproc/libxslt/distinfo @@ -1 +1 @@ -MD5 (gnome2/libxslt-1.0.32.tar.bz2) = 4cfebed101914dd7ef3d3f13d467a80a +MD5 (gnome2/libxslt-1.0.33.tar.bz2) = 699e52b3eb862224d5f5b84c03f08676 diff --git a/textproc/libxslt/files/patch-aa b/textproc/libxslt/files/patch-aa index 3b6e73087588..759d51f2d130 100644 --- a/textproc/libxslt/files/patch-aa +++ b/textproc/libxslt/files/patch-aa @@ -1,13 +1,15 @@ ---- Makefile.in.orig Thu Sep 26 14:59:25 2002 -+++ Makefile.in Tue Oct 8 01:09:21 2002 -@@ -123,19 +123,17 @@ +--- Makefile.in.orig Fri Sep 12 15:22:17 2003 ++++ Makefile.in Fri Sep 12 15:24:38 2003 +@@ -139,21 +139,20 @@ @WITH_DEBUGGER_TRUE@ libexslt \ @WITH_DEBUGGER_TRUE@ xsltproc \ @WITH_DEBUGGER_TRUE@ doc \ -@WITH_DEBUGGER_TRUE@ @PYTHON_SUBDIR@ \ -@WITH_DEBUGGER_TRUE@ tests -+@WITH_DEBUGGER_TRUE@ @WITH_PYTHON_TRUE@ @PYTHON_SUBDIR@ \ - @WITH_DEBUGGER_FALSE@SUBDIRS = @WITH_DEBUGGER_FALSE@\ ++@WITH_DEBUGGER_TRUE@ @WITH_PYTHON_TRUE@ @PYTHON_SUBDIR@ ++ + + @WITH_DEBUGGER_FALSE@SUBDIRS = \ @WITH_DEBUGGER_FALSE@ libxslt \ @WITH_DEBUGGER_FALSE@ libexslt \ @WITH_DEBUGGER_FALSE@ xsltproc \ @@ -16,6 +18,7 @@ -@WITH_DEBUGGER_FALSE@ tests +@WITH_DEBUGGER_FALSE@ @WITH_PYTHON_TRUE@ @PYTHON_SUBDIR@ + DIST_SUBDIRS = libxslt libexslt xsltproc python doc tests breakpoint -confexecdir = $(libdir) diff --git a/textproc/libxslt/files/patch-configure b/textproc/libxslt/files/patch-configure index 7b6b036578e7..e644cf75e11d 100644 --- a/textproc/libxslt/files/patch-configure +++ b/textproc/libxslt/files/patch-configure @@ -1,9 +1,6 @@ - -$FreeBSD$ - ---- configure 2002/04/26 09:54:14 1.1 -+++ configure 2002/04/26 09:54:23 -@@ -5341,6 +5341,7 @@ +--- configure.orig Fri Sep 12 08:23:19 2003 ++++ configure Fri Sep 12 15:29:42 2003 +@@ -8644,6 +8644,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -11,3 +8,12 @@ $FreeBSD$ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' +@@ -10300,7 +10301,7 @@ + fi + if test "$with_python" != "" + then +- pythondir='$(PYTHON_SITE_PACKAGES)' ++ pythondir='$(libdir)/python${PYTHON_VERSION}/site-packages' + else + pythondir='$(libdir)/python${PYTHON_VERSION}/site-packages' + fi diff --git a/textproc/libxslt/files/patch-python::tests::Makefile.in b/textproc/libxslt/files/patch-python::tests::Makefile.in index da548b13d60b..b2b22d6ee478 100644 --- a/textproc/libxslt/files/patch-python::tests::Makefile.in +++ b/textproc/libxslt/files/patch-python::tests::Makefile.in @@ -1,12 +1,9 @@ - -$FreeBSD$ - ---- python/tests/Makefile.in.orig Mon Apr 15 21:07:35 2002 -+++ python/tests/Makefile.in Thu Apr 18 14:25:35 2002 -@@ -117,7 +117,7 @@ - XSLT_LIBDIR = @XSLT_LIBDIR@ - XSLT_LIBS = @XSLT_LIBS@ - +--- python/tests/Makefile.in.orig Fri Sep 12 15:25:00 2003 ++++ python/tests/Makefile.in Fri Sep 12 15:25:38 2003 +@@ -133,7 +133,7 @@ + am__quote = @am__quote@ + install_sh = @install_sh@ + pythondir = @pythondir@ -EXAMPLE_DIR = $(datadir)/doc/libxslt-python-$(LIBXSLT_VERSION)/examples +EXAMPLE_DIR = $(datadir)/doc/libxslt-python/examples diff --git a/textproc/libxslt/pkg-plist b/textproc/libxslt/pkg-plist index d3e29d94f299..379423f136aa 100644 --- a/textproc/libxslt/pkg-plist +++ b/textproc/libxslt/pkg-plist @@ -3,6 +3,7 @@ bin/xsltproc etc/xsltConf.sh include/libexslt/exslt.h include/libexslt/exsltconfig.h +include/libexslt/exsltexports.h include/libxslt/attributes.h include/libxslt/documents.h include/libxslt/extensions.h @@ -21,6 +22,7 @@ include/libxslt/variables.h include/libxslt/xslt.h include/libxslt/xsltInternals.h include/libxslt/xsltconfig.h +include/libxslt/xsltexports.h include/libxslt/xsltutils.h lib/libexslt.a lib/libexslt.so @@ -38,6 +40,7 @@ share/aclocal/libxslt.m4 %%PYTHON:%%share/doc/libxslt-python/TODO %%PYTHON:%%share/doc/libxslt-python/examples/basic.py %%PYTHON:%%share/doc/libxslt-python/examples/exslt.py +%%PYTHON:%%share/doc/libxslt-python/examples/extelem.py %%PYTHON:%%share/doc/libxslt-python/examples/extfunc.py %%PYTHON:%%share/doc/libxslt-python/examples/pyxsltproc.py %%PYTHON:%%share/doc/libxslt-python/examples/test.xml @@ -85,7 +88,6 @@ share/doc/libxslt/html/libxslt-transform.html share/doc/libxslt/html/libxslt-variables.html share/doc/libxslt/html/libxslt-xslt.html share/doc/libxslt/html/libxslt-xsltInternals.html -share/doc/libxslt/html/libxslt-xsltinternals.html share/doc/libxslt/html/libxslt-xsltutils.html share/doc/libxslt/html/news.html share/doc/libxslt/html/node.gif diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile index 7473e02b1560..5c1d961c378b 100644 --- a/www/libgtkhtml/Makefile +++ b/www/libgtkhtml/Makefile @@ -6,11 +6,10 @@ # PORTNAME= libgtkhtml -PORTVERSION= 2.2.4 -PORTREVISION= 1 +PORTVERSION= 2.4.0 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.4 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/www/libgtkhtml/distinfo b/www/libgtkhtml/distinfo index 2781a6057391..f4d626ca6d06 100644 --- a/www/libgtkhtml/distinfo +++ b/www/libgtkhtml/distinfo @@ -1 +1 @@ -MD5 (gnome2/libgtkhtml-2.2.4.tar.bz2) = 26443c4027470c4510d221af30a2c3f6 +MD5 (gnome2/libgtkhtml-2.4.0.tar.bz2) = ee2aba8198ebde0c33fe43bc61c20834 diff --git a/www/libgtkhtml/files/patch-libgtkhtml_util_htmlatomlist.c b/www/libgtkhtml/files/patch-libgtkhtml_util_htmlatomlist.c deleted file mode 100644 index 5eec5f729744..000000000000 --- a/www/libgtkhtml/files/patch-libgtkhtml_util_htmlatomlist.c +++ /dev/null @@ -1,25 +0,0 @@ ---- libgtkhtml/util/htmlatomlist.c.orig Mon May 26 14:13:28 2003 -+++ libgtkhtml/util/htmlatomlist.c Mon May 26 15:29:00 2003 -@@ -68,10 +68,11 @@ - HtmlAtom atom; - gchar *ptr; - gboolean found; -+ gpointer old_atom; - - ptr = g_strdown (g_strdup (str)); - -- found = g_hash_table_lookup_extended (al->table, ptr, NULL, (gpointer) &atom); -+ found = g_hash_table_lookup_extended (al->table, ptr, NULL, &old_atom); - - if (!found) { - if (al->len % 512 == 0) -@@ -81,6 +82,9 @@ - atom = al->len; - g_hash_table_insert (al->table, al->data[al->len], GUINT_TO_POINTER (atom)); - al->len++; -+ } -+ else { -+ atom = GPOINTER_TO_UINT (old_atom); - } - - g_free (ptr); diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile index 0bf6c2b25e1f..8cbb405cb1e9 100644 --- a/x11-fm/nautilus2/Makefile +++ b/x11-fm/nautilus2/Makefile @@ -6,10 +6,10 @@ # PORTNAME= nautilus2 -PORTVERSION= 2.2.4 +PORTVERSION= 2.4.0 CATEGORIES= x11-fm gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.2 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.4 DIST_SUBDIR= gnome2 DISTNAME= nautilus-${PORTVERSION} @@ -21,17 +21,17 @@ BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 USE_BZIP2= yes USE_GMAKE= yes USE_X_PREFIX= yes -USE_GNOME= gnomeprefix gnomehack gnomehier gnomedesktop eel2 librsvg2 \ - gnomecontrolcenter2 +USE_GNOME= gnomeprefix gnomehack gnomehier gnomedesktop eel2 librsvg2 GNOME_DESKTOP_VERSION=2 INSTALLS_SHLIB= yes -USE_LIBTOOL= yes +GNU_CONFIGURE= yes USE_REINPLACE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -fno-rtti -fno-exceptions" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib -liconv" \ LIBPNG="-L${LOCALBASE}/lib -lpng -lz ${MOZILLA_LIBS}" CONFIGURE_ARGS= --with-freetype2-lib-place=${LOCALBASE}/lib \ - --with-freetype2-include-place=${LOCALBASE}/include/freetype2 + --with-freetype2-include-place=${LOCALBASE}/include/freetype2 \ + --enable-static MAKE_ENV= G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias" post-install: diff --git a/x11-fm/nautilus2/distinfo b/x11-fm/nautilus2/distinfo index 0113dd7b2bcd..40a3b0590e2b 100644 --- a/x11-fm/nautilus2/distinfo +++ b/x11-fm/nautilus2/distinfo @@ -1 +1 @@ -MD5 (gnome2/nautilus-2.2.4.tar.bz2) = cb189d8a53dca17e5345261bd819c421 +MD5 (gnome2/nautilus-2.4.0.tar.bz2) = ec3e317a12072b79d9b915c256400ed9 diff --git a/x11-fm/nautilus2/files/patch-aa b/x11-fm/nautilus2/files/patch-aa index bff0e4a65988..3881dec5e6a5 100644 --- a/x11-fm/nautilus2/files/patch-aa +++ b/x11-fm/nautilus2/files/patch-aa @@ -1,14 +1,6 @@ ---- configure.orig Mon Jan 13 10:45:25 2003 -+++ configure Tue Jan 14 13:11:53 2003 -@@ -8294,6 +8294,7 @@ - - # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+$ac_aux_dir/ltconfig $LIBTOOL_DEPS - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -12661,7 +12662,7 @@ +--- configure.orig Sat Jun 28 00:42:27 2003 ++++ configure Sat Jun 28 00:44:45 2003 +@@ -12860,7 +12860,7 @@ LIBNAUTILUS_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_MODULES`" @@ -17,7 +9,7 @@ CORE_MODULES="eel-2.0 librsvg-2.0 bonobo-activation-2.0 libbonobo-2.0 libbonoboui-2.0 esound gnome-desktop-2.0 $EXTRA_CORE_MODULES" -@@ -12669,7 +12670,7 @@ +@@ -12868,7 +12868,7 @@ CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $CDDA_LIBS $LIBJPEG $x_libs" @@ -26,16 +18,16 @@ COMPONENT_MODULES="eel-2.0 libbonoboui-2.0 gnome-vfs-module-2.0 gnome-desktop-2.0" -@@ -13593,7 +13594,7 @@ - s,@LIBTOOL@,$LIBTOOL,;t t +@@ -13849,7 +13849,7 @@ s,@PKG_CONFIG@,$PKG_CONFIG,;t t + s,@STARTUP_NOTIFICATION_PACKAGE@,$STARTUP_NOTIFICATION_PACKAGE,;t t s,@ALL_CFLAGS@,$ALL_CFLAGS,;t t -s,@ALL_LIBS@,$ALL_LIBS,;t t +s~@ALL_LIBS@~$ALL_LIBS~;t t s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t - s,@ALLOCA@,$ALLOCA,;t t s,@USE_NLS@,$USE_NLS,;t t -@@ -13643,25 +13644,25 @@ + s,@MSGFMT@,$MSGFMT,;t t +@@ -13901,26 +13901,26 @@ s,@HAVE_JW_FALSE@,$HAVE_JW_FALSE,;t t s,@HAVE_JW@,$HAVE_JW,;t t s,@MEDUSA_CFLAGS@,$MEDUSA_CFLAGS,;t t @@ -43,6 +35,7 @@ +s~@MEDUSA_LIBS@~$MEDUSA_LIBS~;t t s,@LIBJPEG@,$LIBJPEG,;t t s,@GIMPHWRAPBOX_CFLAGS@,$GIMPHWRAPBOX_CFLAGS,;t t + s,@GSEQUENCE_CFLAGS@,$GSEQUENCE_CFLAGS,;t t s,@LIBEGG_CFLAGS@,$LIBEGG_CFLAGS,;t t s,@LIBNAUTILUS_CFLAGS@,$LIBNAUTILUS_CFLAGS,;t t -s,@LIBNAUTILUS_LIBS@,$LIBNAUTILUS_LIBS,;t t diff --git a/x11-fm/nautilus2/files/patch-libnautilus-private::nautilus-volume-monitor.c b/x11-fm/nautilus2/files/patch-libnautilus-private::nautilus-volume-monitor.c index bcf3479a9a07..b63431e8a341 100644 --- a/x11-fm/nautilus2/files/patch-libnautilus-private::nautilus-volume-monitor.c +++ b/x11-fm/nautilus2/files/patch-libnautilus-private::nautilus-volume-monitor.c @@ -1,6 +1,6 @@ ---- libnautilus-private/nautilus-volume-monitor.c.orig Fri Feb 28 09:52:23 2003 -+++ libnautilus-private/nautilus-volume-monitor.c Mon Mar 10 18:13:57 2003 -@@ -59,6 +59,18 @@ +--- libnautilus-private/nautilus-volume-monitor.c.orig Sun May 4 04:36:53 2003 ++++ libnautilus-private/nautilus-volume-monitor.c Wed May 7 00:50:22 2003 +@@ -59,6 +59,16 @@ #include <sys/types.h> #include <unistd.h> @@ -9,17 +9,15 @@ +#include <sys/ucred.h> +#include <sys/mount.h> + -+#define HAVE_GETMNTINFO +#define HAVE_SETFSENT -+#define HAVE_FSTAB_H +#define FREEBSD_MNT +#define setmntent(f,m) setfsent() +#endif + #ifdef HAVE_SYS_VFSTAB_H #include <sys/vfstab.h> - #else -@@ -103,7 +115,7 @@ + #elif HAVE_FSTAB_H +@@ -120,7 +130,7 @@ #define MNTOPT_RO "ro" #endif @@ -27,8 +25,8 @@ +#if !defined(HAVE_SETMNTENT) && !defined(HAVE_SETFSENT) #define setmntent(f,m) fopen(f,m) #endif - -@@ -492,6 +504,9 @@ + #ifndef HAVE_ENDMNTENT +@@ -519,6 +529,9 @@ static gboolean has_removable_mntent_options (MountTableEntry *ent) { @@ -38,7 +36,7 @@ #ifdef HAVE_HASMNTOPT /* Use "owner" or "user" or "users" as our way of determining a removable volume */ if (hasmntopt (ent, "user") != NULL -@@ -501,6 +516,12 @@ +@@ -528,6 +541,12 @@ return TRUE; } #endif @@ -51,7 +49,7 @@ #ifdef SOLARIS_MNT if (eel_str_has_prefix (ent->mnt_special, "/vol/")) { -@@ -522,10 +543,15 @@ +@@ -667,10 +686,15 @@ static GList * get_removable_volumes (NautilusVolumeMonitor *monitor) { @@ -68,9 +66,9 @@ + MountTableEntry *ent = NULL; + NautilusVolume *volume = NULL; char * fs_opt; - #ifdef HAVE_SYS_MNTTAB_H + #if defined(HAVE_SYS_MNTTAB_H) || defined(AIX_MNT) MountTableEntry ent_storage; -@@ -533,26 +559,27 @@ +@@ -678,26 +702,27 @@ #ifdef HAVE_GETMNTINFO int count, index; #endif @@ -103,30 +101,30 @@ return NULL; } -@@ -587,9 +614,21 @@ +@@ -742,9 +767,21 @@ (monitor, volume, ent->mnt_type, volumes); } } +#elif defined (HAVE_SETFSENT) + while ((fsent = getfsent ()) != NULL) { -+ if (strstr (fsent->fs_mntops, "noauto") != NULL) { -+ volume = create_volume (fsent->fs_spec, fsent->fs_file); -+ volumes = finish_creating_volume_and_prepend -+ (monitor, volume, fsent->fs_vfstype, volumes); -+ } ++ if (strstr (fsent->fs_mntops, "noauto") != NULL) { ++ volume = create_volume (fsent->fs_spec, fsent->fs_file); ++ volumes = finish_creating_volume_and_prepend ++ (monitor, volume, fsent->fs_vfstype, volumes); ++ } + } #endif - + +#ifndef HAVE_SETFSENT - fclose (file); + endmntent (file); +#else + endfsent(); +#endif #ifdef HAVE_CDDA volume = create_volume (CD_AUDIO_PATH, CD_AUDIO_PATH); -@@ -619,7 +658,7 @@ +@@ -774,7 +811,7 @@ return result; } @@ -135,7 +133,7 @@ static gboolean volume_is_removable (const NautilusVolume *volume) -@@ -885,7 +924,7 @@ +@@ -1040,7 +1077,7 @@ char *command; if (path != NULL) { @@ -144,26 +142,27 @@ eel_gnome_shell_execute (command); g_free (command); } -@@ -963,23 +1002,34 @@ - - +@@ -1197,23 +1234,34 @@ + return volumes; + } --#ifdef SOLARIS_MNT -+#if defined(SOLARIS_MNT) || defined(FREEBSD_MNT) +-#elif defined(SOLARIS_MNT) ++#elif defined(SOLARIS_MNT) || defined(FREEBSD_MNT) static GList * get_mount_list (NautilusVolumeMonitor *monitor) { - FILE *fh; GList *volumes; +- MountTableEntry ent; + NautilusVolume *volume; +#ifndef HAVE_SETFSENT - MountTableEntry ent; ++ MountTableEntry ent; + FILE *fh; +#else -+ MountTableEntry *ent; ++ MountTableEntry *ent; + int fh, index; +#endif - NautilusVolume *volume; volumes = NULL; @@ -171,7 +170,7 @@ fh = setmntent (MOUNT_TABLE_PATH, "r"); if (fh == NULL) { +#else -+ fh = getmntinfo (&ent, MNT_WAIT); ++ fh = getmntinfo (&ent, MNT_WAIT); + if (fh == 0) { +#endif return NULL; @@ -181,73 +180,77 @@ while (! getmntent(fh, &ent)) { volume = create_volume (ent.mnt_special, ent.mnt_mountp); volume->is_removable = has_removable_mntent_options (&ent); -@@ -988,6 +1038,16 @@ +@@ -1222,6 +1270,16 @@ } - fclose (fh); + endmntent (fh); +#else -+ /* getmentinfo returns a pointer to static data. Do not free. */ -+ for (index = 0; index < fh; index++) { -+ volume = create_volume (ent[index].f_mntfromname, -+ ent[index].f_mntonname); -+ volume->is_removable = has_removable_mntent_options (ent + index); -+ volumes = finish_creating_volume_and_prepend -+ (monitor, volume, ent[index].f_fstypename, volumes); -+ } ++ /* getmentinfo returns a pointer to static data. Do not free. */ ++ for (index = 0; index < fh; index++) { ++ volume = create_volume (ent[index].f_mntfromname, ++ ent[index].f_mntonname); ++ volume->is_removable = has_removable_mntent_options (ent + index); ++ volumes = finish_creating_volume_and_prepend ++ (monitor, volume, ent[index].f_fstypename, volumes); ++ } +#endif return volumes; } -@@ -1214,9 +1274,38 @@ +@@ -1448,7 +1506,7 @@ static int get_cdrom_type (const char *vol_dev_path, int* fd) { --#ifndef SOLARIS_MNT -+#if !defined(SOLARIS_MNT) && !defined(FREEBSD_MNT) - *fd = open (vol_dev_path, O_RDONLY|O_NONBLOCK); - return ioctl (*fd, CDROM_DISC_STATUS, CDSL_CURRENT); +-#ifdef SOLARIS_MNT ++#if defined(SOLARIS_MNT) + GString *new_dev_path; + struct cdrom_tocentry entry; + struct cdrom_tochdr header; +@@ -1487,6 +1545,34 @@ + return type; + #elif defined(AIX_MNT) + return CDS_NO_INFO; +#elif defined(FREEBSD_MNT) -+ struct ioc_toc_header header; -+ struct ioc_read_toc_single_entry entry; -+ int type; ++ struct ioc_toc_header header; ++ struct ioc_read_toc_single_entry entry; ++ int type; + -+ *fd = open (vol_dev_path, O_RDONLY|O_NONBLOCK); -+ if (*fd < 0) { -+ return CDS_DATA_1; -+ } -+ -+ if ( ioctl(*fd, CDIOREADTOCHEADER, &header) == 0) { -+ return CDS_DATA_1; -+ } ++ *fd = open (vol_dev_path, O_RDONLY|O_NONBLOCK); ++ if (*fd < 0) { ++ return CDS_DATA_1; ++ } + -+ type = CDS_DATA_1; ++ if ( ioctl(*fd, CDIOREADTOCHEADER, &header) == 0) { ++ return CDS_DATA_1; ++ } + -+ for (entry.track = header.starting_track; -+ entry.track <= header.ending_track; -+ entry.track++) { -+ entry.address_format = CD_LBA_FORMAT; -+ if (ioctl (*fd, CDIOREADTOCENTRY, &entry) == 0) { -+ if (entry.entry.control & CDROM_DATA_TRACK) { -+ type = CDS_AUDIO; -+ break; -+ } -+ } -+ } ++ type = CDS_DATA_1; ++ for (entry.track = header.starting_track; ++ entry.track <= header.ending_track; ++ entry.track++) { ++ entry.address_format = CD_LBA_FORMAT; ++ if (ioctl (*fd, CDIOREADTOCENTRY, &entry) == 0) { ++ if (entry.entry.control & CDROM_DATA_TRACK) { ++ type = CDS_AUDIO; ++ break; ++ } ++ } ++ } + -+ return type; ++ return type; #else - GString *new_dev_path; - struct cdrom_tocentry entry; -@@ -1768,7 +1857,7 @@ + *fd = open (vol_dev_path, O_RDONLY|O_NONBLOCK); + return ioctl (*fd, CDROM_DISC_STATUS, CDSL_CURRENT); +@@ -2004,7 +2090,7 @@ for (node = volume_list; node != NULL; node = node->next) { volume = node->data; --#ifndef SOLARIS_MNT -+#if !defined(SOLARIS_MNT) && !defined(FREEBSD_MNT) - /* These are set up by get_current_mount_list for Solaris. */ +-#if !defined(SOLARIS_MNT) && !defined(AIX_MNT) ++#if !defined(SOLARIS_MNT) && !defined(AIX_MNT) && !defined(FREEBSD_MNT) + /* These are set up by get_current_mount_list for Solaris&AIX.*/ volume->is_removable = volume_is_removable (volume); #endif -@@ -1797,7 +1886,7 @@ +@@ -2033,7 +2119,7 @@ ok = mount_volume_auto_add (volume); } else if (strcmp (file_system_type_name, "cdda") == 0) { ok = mount_volume_cdda_add (volume); @@ -256,7 +259,7 @@ ok = mount_volume_iso9660_add (volume); } else if (strcmp (file_system_type_name, "nfs") == 0) { ok = mount_volume_nfs_add (volume); -@@ -1835,8 +1924,8 @@ +@@ -2071,8 +2157,8 @@ } else if (eel_str_has_prefix (volume->device_path, "/dev/cdrom")) { volume->device_type = NAUTILUS_DEVICE_CDROM_DRIVE; volume->is_removable = TRUE; diff --git a/x11-fm/nautilus2/files/patch-ltmain.sh b/x11-fm/nautilus2/files/patch-ltmain.sh new file mode 100644 index 000000000000..854b2a10a327 --- /dev/null +++ b/x11-fm/nautilus2/files/patch-ltmain.sh @@ -0,0 +1,51 @@ +--- ltmain.sh.orig Sat Feb 8 09:47:44 2003 ++++ ltmain.sh Mon Jun 30 18:31:09 2003 +@@ -1075,7 +1075,7 @@ + esac + elif test "X$arg" = "X-lc_r"; then + case $host in +- *-*-openbsd* | *-*-freebsd*) ++ *-*-openbsd* | *-*-freebsd4*) + # Do not include libc_r directly, use -pthread flag. + continue + ;; +@@ -1085,8 +1085,16 @@ + continue + ;; + ++ -pthread) ++ compile_command="$compile_command -pthread" ++ finalize_command="$finalize_command -pthread" ++ compiler_flags="$compiler_flags -pthread" ++ continue ++ ;; ++ + -module) + module=yes ++ build_old_libs=no + continue + ;; + +@@ -2503,6 +2511,9 @@ + *-*-openbsd* | *-*-freebsd*) + # Do not include libc due to us having libc/libc_r. + ;; ++ *-*-freebsd*) ++ # FreeBSD doesn't need this... ++ ;; + *) + # Add libc to deplibs on all other systems if necessary. + if test $build_libtool_need_lc = "yes"; then +@@ -4330,10 +4341,12 @@ + fi + + # Install the pseudo-library for information purposes. ++ if /usr/bin/false; then + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + instname="$dir/$name"i + $show "$install_prog $instname $destdir/$name" + $run eval "$install_prog $instname $destdir/$name" || exit $? ++ fi + + # Maybe install the static library, too. + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/x11-fm/nautilus2/pkg-plist b/x11-fm/nautilus2/pkg-plist index ee9869cad7c9..b371b220b1ac 100644 --- a/x11-fm/nautilus2/pkg-plist +++ b/x11-fm/nautilus2/pkg-plist @@ -9,12 +9,14 @@ etc/X11/starthere/serverconfig.desktop etc/X11/starthere/sysconfig.desktop etc/X11/sysconfig/.directory etc/gconf/gconf.xml.defaults/apps/nautilus/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/nautilus/desktop/%gconf.xml etc/gconf/gconf.xml.defaults/apps/nautilus/icon_view/%gconf.xml etc/gconf/gconf.xml.defaults/apps/nautilus/list_view/%gconf.xml etc/gconf/gconf.xml.defaults/apps/nautilus/preferences/%gconf.xml etc/gconf/gconf.xml.defaults/apps/nautilus/sidebar_panels/%gconf.xml etc/gconf/gconf.xml.defaults/apps/nautilus/sidebar_panels/tree/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/desktop/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/icon_view/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/list_view/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/preferences/%gconf.xml @@ -116,7 +118,6 @@ share/gnome/nautilus/starthere-link.desktop share/gnome/nautilus/starthere.desktop share/gnome/nautilus/static_bookmarks.xml share/gnome/network/nautilus-server-connect.desktop -share/gnome/pixmaps/nautilus/nautilus-desktop.png share/gnome/pixmaps/nautilus/CD_drive.png share/gnome/pixmaps/nautilus/HD_drive.png share/gnome/pixmaps/nautilus/Search.png @@ -127,163 +128,39 @@ share/gnome/pixmaps/nautilus/colors.png share/gnome/pixmaps/nautilus/cpu.png share/gnome/pixmaps/nautilus/crux_eggplant/Search.png share/gnome/pixmaps/nautilus/crux_eggplant/crux_eggplant.xml -share/gnome/pixmaps/nautilus/crux_eggplant/decrement-i.png -share/gnome/pixmaps/nautilus/crux_eggplant/decrement.png -share/gnome/pixmaps/nautilus/crux_eggplant/increment-i.png -share/gnome/pixmaps/nautilus/crux_eggplant/increment.png -share/gnome/pixmaps/nautilus/crux_eggplant/number_strip.png -share/gnome/pixmaps/nautilus/crux_eggplant/theme_preview.png -share/gnome/pixmaps/nautilus/crux_eggplant/throbber/001.png -share/gnome/pixmaps/nautilus/crux_eggplant/throbber/002.png -share/gnome/pixmaps/nautilus/crux_eggplant/throbber/003.png -share/gnome/pixmaps/nautilus/crux_eggplant/throbber/004.png -share/gnome/pixmaps/nautilus/crux_eggplant/throbber/005.png -share/gnome/pixmaps/nautilus/crux_eggplant/throbber/006.png -share/gnome/pixmaps/nautilus/crux_eggplant/throbber/007.png -share/gnome/pixmaps/nautilus/crux_eggplant/throbber/008.png -share/gnome/pixmaps/nautilus/crux_eggplant/throbber/009.png -share/gnome/pixmaps/nautilus/crux_eggplant/throbber/010.png -share/gnome/pixmaps/nautilus/crux_eggplant/throbber/011.png -share/gnome/pixmaps/nautilus/crux_eggplant/throbber/012.png -share/gnome/pixmaps/nautilus/crux_eggplant/throbber/013.png -share/gnome/pixmaps/nautilus/crux_eggplant/throbber/014.png -share/gnome/pixmaps/nautilus/crux_eggplant/throbber/015.png -share/gnome/pixmaps/nautilus/crux_eggplant/throbber/016.png -share/gnome/pixmaps/nautilus/crux_eggplant/throbber/017.png -share/gnome/pixmaps/nautilus/crux_eggplant/throbber/018.png -share/gnome/pixmaps/nautilus/crux_eggplant/throbber/019.png -share/gnome/pixmaps/nautilus/crux_eggplant/throbber/020.png -share/gnome/pixmaps/nautilus/crux_eggplant/throbber/021.png -share/gnome/pixmaps/nautilus/crux_eggplant/throbber/022.png -share/gnome/pixmaps/nautilus/crux_eggplant/throbber/023.png -share/gnome/pixmaps/nautilus/crux_eggplant/throbber/024.png -share/gnome/pixmaps/nautilus/crux_eggplant/throbber/025.png -share/gnome/pixmaps/nautilus/crux_eggplant/throbber/026.png -share/gnome/pixmaps/nautilus/crux_eggplant/throbber/027.png -share/gnome/pixmaps/nautilus/crux_eggplant/throbber/028.png -share/gnome/pixmaps/nautilus/crux_eggplant/throbber/029.png -share/gnome/pixmaps/nautilus/crux_eggplant/throbber/030.png -share/gnome/pixmaps/nautilus/crux_eggplant/throbber/rest.png -share/gnome/pixmaps/nautilus/crux_eggplant/zoom_body.png share/gnome/pixmaps/nautilus/crux_teal/Search.png share/gnome/pixmaps/nautilus/crux_teal/crux_teal.xml -share/gnome/pixmaps/nautilus/crux_teal/decrement-i.png -share/gnome/pixmaps/nautilus/crux_teal/decrement.png -share/gnome/pixmaps/nautilus/crux_teal/increment-i.png -share/gnome/pixmaps/nautilus/crux_teal/increment.png -share/gnome/pixmaps/nautilus/crux_teal/number_strip.png -share/gnome/pixmaps/nautilus/crux_teal/theme_preview.png -share/gnome/pixmaps/nautilus/crux_teal/throbber/001.png -share/gnome/pixmaps/nautilus/crux_teal/throbber/002.png -share/gnome/pixmaps/nautilus/crux_teal/throbber/003.png -share/gnome/pixmaps/nautilus/crux_teal/throbber/004.png -share/gnome/pixmaps/nautilus/crux_teal/throbber/005.png -share/gnome/pixmaps/nautilus/crux_teal/throbber/006.png -share/gnome/pixmaps/nautilus/crux_teal/throbber/007.png -share/gnome/pixmaps/nautilus/crux_teal/throbber/008.png -share/gnome/pixmaps/nautilus/crux_teal/throbber/009.png -share/gnome/pixmaps/nautilus/crux_teal/throbber/010.png -share/gnome/pixmaps/nautilus/crux_teal/throbber/011.png -share/gnome/pixmaps/nautilus/crux_teal/throbber/012.png -share/gnome/pixmaps/nautilus/crux_teal/throbber/013.png -share/gnome/pixmaps/nautilus/crux_teal/throbber/014.png -share/gnome/pixmaps/nautilus/crux_teal/throbber/015.png -share/gnome/pixmaps/nautilus/crux_teal/throbber/016.png -share/gnome/pixmaps/nautilus/crux_teal/throbber/017.png -share/gnome/pixmaps/nautilus/crux_teal/throbber/018.png -share/gnome/pixmaps/nautilus/crux_teal/throbber/019.png -share/gnome/pixmaps/nautilus/crux_teal/throbber/020.png -share/gnome/pixmaps/nautilus/crux_teal/throbber/021.png -share/gnome/pixmaps/nautilus/crux_teal/throbber/022.png -share/gnome/pixmaps/nautilus/crux_teal/throbber/023.png -share/gnome/pixmaps/nautilus/crux_teal/throbber/024.png -share/gnome/pixmaps/nautilus/crux_teal/throbber/025.png -share/gnome/pixmaps/nautilus/crux_teal/throbber/026.png -share/gnome/pixmaps/nautilus/crux_teal/throbber/027.png -share/gnome/pixmaps/nautilus/crux_teal/throbber/028.png -share/gnome/pixmaps/nautilus/crux_teal/throbber/029.png -share/gnome/pixmaps/nautilus/crux_teal/throbber/030.png -share/gnome/pixmaps/nautilus/crux_teal/throbber/rest.png -share/gnome/pixmaps/nautilus/crux_teal/zoom_body.png -share/gnome/pixmaps/nautilus/decrement.png share/gnome/pixmaps/nautilus/default/Search.png -share/gnome/pixmaps/nautilus/default/decrement.png share/gnome/pixmaps/nautilus/default/default.xml -share/gnome/pixmaps/nautilus/default/increment.png -share/gnome/pixmaps/nautilus/default/number_strip.png share/gnome/pixmaps/nautilus/default/side_bar_image.png -share/gnome/pixmaps/nautilus/default/theme_preview.png -share/gnome/pixmaps/nautilus/default/zoom_body.png share/gnome/pixmaps/nautilus/emblems.png share/gnome/pixmaps/nautilus/erase.png share/gnome/pixmaps/nautilus/gnome/Services.png share/gnome/pixmaps/nautilus/gnome/gnome.xml -share/gnome/pixmaps/nautilus/gnome/theme_preview.png -share/gnome/pixmaps/nautilus/gnome/throbber/001.png -share/gnome/pixmaps/nautilus/gnome/throbber/002.png -share/gnome/pixmaps/nautilus/gnome/throbber/003.png -share/gnome/pixmaps/nautilus/gnome/throbber/004.png -share/gnome/pixmaps/nautilus/gnome/throbber/005.png -share/gnome/pixmaps/nautilus/gnome/throbber/006.png -share/gnome/pixmaps/nautilus/gnome/throbber/rest.png -share/gnome/pixmaps/nautilus/increment.png share/gnome/pixmaps/nautilus/knob.png share/gnome/pixmaps/nautilus/memory_chip.gif +share/gnome/pixmaps/nautilus/nautilus-desktop.png +share/gnome/pixmaps/nautilus/nautilus-file-management-properties.png share/gnome/pixmaps/nautilus/nautilus-launch-icon.png share/gnome/pixmaps/nautilus/nautilus-mini-logo.png share/gnome/pixmaps/nautilus/nautilus-server-connect.png share/gnome/pixmaps/nautilus/note-indicator.png -share/gnome/pixmaps/nautilus/number_strip.png +share/gnome/pixmaps/nautilus/side_bar_image.png share/gnome/pixmaps/nautilus/sierra/green_weave.png -share/gnome/pixmaps/nautilus/sierra/number_strip.png share/gnome/pixmaps/nautilus/sierra/sierra.xml -share/gnome/pixmaps/nautilus/sierra/theme_preview.png -share/gnome/pixmaps/nautilus/side_bar_image.png share/gnome/pixmaps/nautilus/tahoe/bluewall.png -share/gnome/pixmaps/nautilus/tahoe/number_strip.png share/gnome/pixmaps/nautilus/tahoe/tahoe.xml -share/gnome/pixmaps/nautilus/tahoe/theme_preview.png share/gnome/pixmaps/nautilus/text-selection-frame.png -share/gnome/pixmaps/nautilus/throbber/001.png -share/gnome/pixmaps/nautilus/throbber/002.png -share/gnome/pixmaps/nautilus/throbber/003.png -share/gnome/pixmaps/nautilus/throbber/004.png -share/gnome/pixmaps/nautilus/throbber/005.png -share/gnome/pixmaps/nautilus/throbber/006.png -share/gnome/pixmaps/nautilus/throbber/007.png -share/gnome/pixmaps/nautilus/throbber/008.png -share/gnome/pixmaps/nautilus/throbber/009.png -share/gnome/pixmaps/nautilus/throbber/010.png -share/gnome/pixmaps/nautilus/throbber/011.png -share/gnome/pixmaps/nautilus/throbber/012.png -share/gnome/pixmaps/nautilus/throbber/013.png -share/gnome/pixmaps/nautilus/throbber/014.png -share/gnome/pixmaps/nautilus/throbber/015.png -share/gnome/pixmaps/nautilus/throbber/016.png -share/gnome/pixmaps/nautilus/throbber/017.png -share/gnome/pixmaps/nautilus/throbber/018.png -share/gnome/pixmaps/nautilus/throbber/019.png -share/gnome/pixmaps/nautilus/throbber/020.png -share/gnome/pixmaps/nautilus/throbber/021.png -share/gnome/pixmaps/nautilus/throbber/022.png -share/gnome/pixmaps/nautilus/throbber/023.png -share/gnome/pixmaps/nautilus/throbber/024.png -share/gnome/pixmaps/nautilus/throbber/025.png -share/gnome/pixmaps/nautilus/throbber/026.png -share/gnome/pixmaps/nautilus/throbber/027.png -share/gnome/pixmaps/nautilus/throbber/028.png -share/gnome/pixmaps/nautilus/throbber/029.png -share/gnome/pixmaps/nautilus/throbber/030.png -share/gnome/pixmaps/nautilus/throbber/rest.png share/gnome/pixmaps/nautilus/thumbnail_frame.png -share/gnome/pixmaps/nautilus/zoom_body.png share/locale/am/LC_MESSAGES/nautilus.mo share/locale/ar/LC_MESSAGES/nautilus.mo share/locale/az/LC_MESSAGES/nautilus.mo share/locale/be/LC_MESSAGES/nautilus.mo share/locale/bg/LC_MESSAGES/nautilus.mo +share/locale/bn/LC_MESSAGES/nautilus.mo share/locale/ca/LC_MESSAGES/nautilus.mo share/locale/cs/LC_MESSAGES/nautilus.mo +share/locale/cy/LC_MESSAGES/nautilus.mo share/locale/da/LC_MESSAGES/nautilus.mo share/locale/de/LC_MESSAGES/nautilus.mo share/locale/el/LC_MESSAGES/nautilus.mo @@ -299,15 +176,19 @@ share/locale/gl/LC_MESSAGES/nautilus.mo share/locale/he/LC_MESSAGES/nautilus.mo share/locale/hi/LC_MESSAGES/nautilus.mo share/locale/hu/LC_MESSAGES/nautilus.mo +share/locale/id/LC_MESSAGES/nautilus.mo +share/locale/is/LC_MESSAGES/nautilus.mo share/locale/it/LC_MESSAGES/nautilus.mo share/locale/ja/LC_MESSAGES/nautilus.mo share/locale/ko/LC_MESSAGES/nautilus.mo +share/locale/li/LC_MESSAGES/nautilus.mo share/locale/lt/LC_MESSAGES/nautilus.mo share/locale/lv/LC_MESSAGES/nautilus.mo share/locale/mk/LC_MESSAGES/nautilus.mo share/locale/ml/LC_MESSAGES/nautilus.mo share/locale/mn/LC_MESSAGES/nautilus.mo share/locale/ms/LC_MESSAGES/nautilus.mo +share/locale/ne/LC_MESSAGES/nautilus.mo share/locale/nl/LC_MESSAGES/nautilus.mo share/locale/nn/LC_MESSAGES/nautilus.mo share/locale/no/LC_MESSAGES/nautilus.mo @@ -322,12 +203,11 @@ share/locale/sq/LC_MESSAGES/nautilus.mo share/locale/sr/LC_MESSAGES/nautilus.mo share/locale/sr@Latn/LC_MESSAGES/nautilus.mo share/locale/sv/LC_MESSAGES/nautilus.mo -share/locale/ta/LC_MESSAGES/nautilus.mo share/locale/th/LC_MESSAGES/nautilus.mo share/locale/tr/LC_MESSAGES/nautilus.mo share/locale/uk/LC_MESSAGES/nautilus.mo -share/locale/wa/LC_MESSAGES/nautilus.mo share/locale/vi/LC_MESSAGES/nautilus.mo +share/locale/wa/LC_MESSAGES/nautilus.mo share/locale/yi/LC_MESSAGES/nautilus.mo share/locale/zh_CN/LC_MESSAGES/nautilus.mo share/locale/zh_TW/LC_MESSAGES/nautilus.mo @@ -339,10 +219,12 @@ share/locale/zh_TW/LC_MESSAGES/nautilus.mo @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/preferences @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/list_view @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/icon_view +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/desktop @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus @dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/sidebar_panels/tree @dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/sidebar_panels @dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/preferences @dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/list_view @dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/icon_view +@dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/desktop @dirrm etc/gconf/gconf.xml.defaults/apps/nautilus diff --git a/x11-themes/gnome-themes/Makefile b/x11-themes/gnome-themes/Makefile index 18d28258364d..0a6fe90fa29e 100644 --- a/x11-themes/gnome-themes/Makefile +++ b/x11-themes/gnome-themes/Makefile @@ -6,27 +6,25 @@ # PORTNAME= gnome-themes -PORTVERSION= 2.2.2 +PORTVERSION= 2.4.0 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.4 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= A collection of themes and icons for GNOME 2 designed for accessibility -BUILD_DEPENDS= ${X11BASE}/lib/gtk-2.0/2.2.0/engines/libthinice.so:${PORTSDIR}/x11-toolkits/gtk-thinice-engine \ - ${X11BASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-toolkits/gtk-engines2 -RUN_DEPENDS= ${X11BASE}/lib/gtk-2.0/2.2.0/engines/libthinice.so:${PORTSDIR}/x11-toolkits/gtk-thinice-engine \ - ${X11BASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-toolkits/gtk-engines2 +BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-toolkits/gtk-engines2 +RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-toolkits/gtk-engines2 USE_BZIP2= yes USE_X_PREFIX= yes USE_REINPLACE= yes USE_LIBTOOL= yes -USE_GNOME= gnomehack metacity +USE_GNOME= gnomehack metacity libgnomeui CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" + LDFLAGS="-L${LOCALBASE}/lib" post-patch: @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ diff --git a/x11-themes/gnome-themes/distinfo b/x11-themes/gnome-themes/distinfo index 71091d975407..def286a7c89e 100644 --- a/x11-themes/gnome-themes/distinfo +++ b/x11-themes/gnome-themes/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-themes-2.2.2.tar.bz2) = 41095ed3c7d8a6f761d92a1bc13bfdb0 +MD5 (gnome2/gnome-themes-2.4.0.tar.bz2) = 57ae1cf8a8bac1a461310f26347605e6 diff --git a/x11-themes/gnome-themes/files/patch-configure b/x11-themes/gnome-themes/files/patch-configure index 2a763b11ffe5..3a3c068040c5 100644 --- a/x11-themes/gnome-themes/files/patch-configure +++ b/x11-themes/gnome-themes/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Wed Mar 12 07:49:35 2003 -+++ configure Thu Mar 13 23:50:27 2003 -@@ -7641,6 +7641,7 @@ +--- configure.orig Fri May 16 15:56:25 2003 ++++ configure Fri May 16 23:10:03 2003 +@@ -18073,6 +18073,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -8,80 +8,3 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -7707,22 +7708,16 @@ - echo "$as_me:$LINENO: checking for gtk+-2.0 >= 1.3.11 - gdk-pixbuf-2.0 >= 1.3.11 - gtk-engines-2 -- gtk-thinice-engine-2 -- libgnomeui-2.0 -- libglade-2.0" >&5 -+ gtk-thinice-engine-2" >&5 - echo $ECHO_N "checking for gtk+-2.0 >= 1.3.11 - gdk-pixbuf-2.0 >= 1.3.11 - gtk-engines-2 -- gtk-thinice-engine-2 -- libgnomeui-2.0 -- libglade-2.0... $ECHO_C" >&6 -+ gtk-thinice-engine-2... $ECHO_C" >&6 - - if $PKG_CONFIG --exists "gtk+-2.0 >= 1.3.11 - gdk-pixbuf-2.0 >= 1.3.11 - gtk-engines-2 -- gtk-thinice-engine-2 -- libgnomeui-2.0 -- libglade-2.0" ; then -+ gtk-thinice-engine-2" ; then - echo "$as_me:$LINENO: result: yes" >&5 - echo "${ECHO_T}yes" >&6 - succeeded=yes -@@ -7732,9 +7727,7 @@ - GTKTHEME_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 1.3.11 - gdk-pixbuf-2.0 >= 1.3.11 - gtk-engines-2 -- gtk-thinice-engine-2 -- libgnomeui-2.0 -- libglade-2.0"` -+ gtk-thinice-engine-2"` - echo "$as_me:$LINENO: result: $GTKTHEME_CFLAGS" >&5 - echo "${ECHO_T}$GTKTHEME_CFLAGS" >&6 - -@@ -7743,9 +7736,7 @@ - GTKTHEME_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 1.3.11 - gdk-pixbuf-2.0 >= 1.3.11 - gtk-engines-2 -- gtk-thinice-engine-2 -- libgnomeui-2.0 -- libglade-2.0"` -+ gtk-thinice-engine-2"` - echo "$as_me:$LINENO: result: $GTKTHEME_LIBS" >&5 - echo "${ECHO_T}$GTKTHEME_LIBS" >&6 - else -@@ -7756,9 +7747,7 @@ - GTKTHEME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= 1.3.11 - gdk-pixbuf-2.0 >= 1.3.11 - gtk-engines-2 -- gtk-thinice-engine-2 -- libgnomeui-2.0 -- libglade-2.0"` -+ gtk-thinice-engine-2"` - echo $GTKTHEME_PKG_ERRORS - fi - -@@ -7776,15 +7765,11 @@ - { { echo "$as_me:$LINENO: error: Library requirements (gtk+-2.0 >= 1.3.11 - gdk-pixbuf-2.0 >= 1.3.11 - gtk-engines-2 -- gtk-thinice-engine-2 -- libgnomeui-2.0 -- libglade-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 -+ gtk-thinice-engine-2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 - echo "$as_me: error: Library requirements (gtk+-2.0 >= 1.3.11 - gdk-pixbuf-2.0 >= 1.3.11 - gtk-engines-2 -- gtk-thinice-engine-2 -- libgnomeui-2.0 -- libglade-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} -+ gtk-thinice-engine-2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} - { (exit 1); exit 1; }; } - fi - diff --git a/x11-themes/gnome-themes/pkg-plist b/x11-themes/gnome-themes/pkg-plist index e87b8bcc477d..44fb48c7ec8d 100644 --- a/x11-themes/gnome-themes/pkg-plist +++ b/x11-themes/gnome-themes/pkg-plist @@ -2,6 +2,7 @@ lib/gtk-2.0/2.2.0/engines/libcrux-engine.so lib/gtk-2.0/2.2.0/engines/libhcengine.so lib/gtk-2.0/2.2.0/engines/liblighthouseblue.so lib/gtk-2.0/2.2.0/engines/libmist.so +lib/gtk-2.0/2.2.0/engines/libthinice.so share/eazel-engine/arrow_down-spinner.png share/eazel-engine/arrow_down.png share/eazel-engine/arrow_left.png @@ -931,6 +932,7 @@ share/locale/bg/LC_MESSAGES/gnome-themes.mo share/locale/bn/LC_MESSAGES/gnome-themes.mo share/locale/ca/LC_MESSAGES/gnome-themes.mo share/locale/cs/LC_MESSAGES/gnome-themes.mo +share/locale/cy/LC_MESSAGES/gnome-themes.mo share/locale/da/LC_MESSAGES/gnome-themes.mo share/locale/de/LC_MESSAGES/gnome-themes.mo share/locale/el/LC_MESSAGES/gnome-themes.mo @@ -939,15 +941,20 @@ share/locale/et/LC_MESSAGES/gnome-themes.mo share/locale/fa/LC_MESSAGES/gnome-themes.mo share/locale/fi/LC_MESSAGES/gnome-themes.mo share/locale/fr/LC_MESSAGES/gnome-themes.mo +share/locale/ga/LC_MESSAGES/gnome-themes.mo share/locale/he/LC_MESSAGES/gnome-themes.mo share/locale/hi/LC_MESSAGES/gnome-themes.mo share/locale/hu/LC_MESSAGES/gnome-themes.mo share/locale/id/LC_MESSAGES/gnome-themes.mo +share/locale/is/LC_MESSAGES/gnome-themes.mo share/locale/it/LC_MESSAGES/gnome-themes.mo share/locale/ja/LC_MESSAGES/gnome-themes.mo share/locale/ko/LC_MESSAGES/gnome-themes.mo +share/locale/li/LC_MESSAGES/gnome-themes.mo +share/locale/lt/LC_MESSAGES/gnome-themes.mo share/locale/lv/LC_MESSAGES/gnome-themes.mo share/locale/mk/LC_MESSAGES/gnome-themes.mo +share/locale/ml/LC_MESSAGES/gnome-themes.mo share/locale/mn/LC_MESSAGES/gnome-themes.mo share/locale/ms/LC_MESSAGES/gnome-themes.mo share/locale/nl/LC_MESSAGES/gnome-themes.mo @@ -967,6 +974,7 @@ share/locale/th/LC_MESSAGES/gnome-themes.mo share/locale/tr/LC_MESSAGES/gnome-themes.mo share/locale/uk/LC_MESSAGES/gnome-themes.mo share/locale/vi/LC_MESSAGES/gnome-themes.mo +share/locale/wa/LC_MESSAGES/gnome-themes.mo share/locale/zh_CN/LC_MESSAGES/gnome-themes.mo share/locale/zh_TW/LC_MESSAGES/gnome-themes.mo share/themes/Crux/gtk-2.0/gtkrc @@ -1024,6 +1032,7 @@ share/themes/HighContrastLargePrint/pixmaps/media-next.png share/themes/HighContrastLargePrint/pixmaps/media-pause.png share/themes/HighContrastLargePrint/pixmaps/media-play.png share/themes/HighContrastLargePrint/pixmaps/media-prev.png +share/themes/HighContrastLargePrint/pixmaps/media-record.png share/themes/HighContrastLargePrint/pixmaps/media-stop.png share/themes/HighContrastLargePrint/pixmaps/printer-broken.png share/themes/HighContrastLargePrint/pixmaps/printer-default.png @@ -1157,6 +1166,7 @@ share/themes/HighContrastLargePrintInverse/pixmaps/media-next.png share/themes/HighContrastLargePrintInverse/pixmaps/media-pause.png share/themes/HighContrastLargePrintInverse/pixmaps/media-play.png share/themes/HighContrastLargePrintInverse/pixmaps/media-prev.png +share/themes/HighContrastLargePrintInverse/pixmaps/media-record.png share/themes/HighContrastLargePrintInverse/pixmaps/media-stop.png share/themes/HighContrastLargePrintInverse/pixmaps/printer-broken.png share/themes/HighContrastLargePrintInverse/pixmaps/printer-default.png @@ -1290,6 +1300,7 @@ share/themes/LargePrint/pixmaps/media-next.png share/themes/LargePrint/pixmaps/media-pause.png share/themes/LargePrint/pixmaps/media-play.png share/themes/LargePrint/pixmaps/media-prev.png +share/themes/LargePrint/pixmaps/media-record.png share/themes/LargePrint/pixmaps/media-stop.png share/themes/LargePrint/pixmaps/printer-broken.png share/themes/LargePrint/pixmaps/printer-default.png @@ -1426,6 +1437,7 @@ share/themes/LowContrastLargePrint/pixmaps/media-next.png share/themes/LowContrastLargePrint/pixmaps/media-pause.png share/themes/LowContrastLargePrint/pixmaps/media-play.png share/themes/LowContrastLargePrint/pixmaps/media-prev.png +share/themes/LowContrastLargePrint/pixmaps/media-record.png share/themes/LowContrastLargePrint/pixmaps/media-stop.png share/themes/LowContrastLargePrint/pixmaps/printer-broken.png share/themes/LowContrastLargePrint/pixmaps/printer-default.png @@ -1575,8 +1587,11 @@ share/themes/Smokey-Blue/gtk-2.0/lines_background_blue.png share/themes/Smokey-Blue/gtk-2.0/option1.png share/themes/Smokey-Blue/gtk-2.0/option2.png share/themes/Smokey-Blue/index.theme +share/themes/ThinIce/gtk-2.0/gtkrc share/themes/Traditional/index.theme @dirrm share/themes/Traditional +@dirrm share/themes/ThinIce/gtk-2.0 +@dirrm share/themes/ThinIce @dirrm share/themes/Smokey-Blue/gtk-2.0 @dirrm share/themes/Smokey-Blue @dirrm share/themes/Simple/gtk-2.0 diff --git a/x11-toolkits/at-spi/Makefile b/x11-toolkits/at-spi/Makefile index 43121bd21a09..553b6210ba23 100644 --- a/x11-toolkits/at-spi/Makefile +++ b/x11-toolkits/at-spi/Makefile @@ -6,10 +6,10 @@ # PORTNAME= at-spi -PORTVERSION= 1.2.1 +PORTVERSION= 1.3.7 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.2 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.3 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/x11-toolkits/at-spi/distinfo b/x11-toolkits/at-spi/distinfo index 54ca92afb782..1c53333d61c8 100644 --- a/x11-toolkits/at-spi/distinfo +++ b/x11-toolkits/at-spi/distinfo @@ -1 +1 @@ -MD5 (gnome2/at-spi-1.2.1.tar.bz2) = 562620310d9150e4803a275311f0088d +MD5 (gnome2/at-spi-1.3.7.tar.bz2) = c5ee8c9ae592c547ac557fa58003b021 diff --git a/x11-toolkits/at-spi/files/patch-atk-bridge_Makefile.in b/x11-toolkits/at-spi/files/patch-atk-bridge_Makefile.in new file mode 100644 index 000000000000..9c50885971b2 --- /dev/null +++ b/x11-toolkits/at-spi/files/patch-atk-bridge_Makefile.in @@ -0,0 +1,11 @@ +--- atk-bridge/Makefile.in.orig Sat Apr 12 01:06:28 2003 ++++ atk-bridge/Makefile.in Sat Apr 12 01:06:48 2003 +@@ -147,7 +147,7 @@ + + LDFLAGS = @LDFLAGS@ -no-undefined -module -avoid-version + +-libatk_bridge_la_LIBADD = $(ATK_BRIDGE_LIBS) $(top_builddir)/libspi/libspi.la ++libatk_bridge_la_LIBADD = $(ATK_BRIDGE_LIBS) -L$(top_builddir)/libspi/.libs $(top_builddir)/libspi/libspi.la + + CFLAGS = @CFLAGS@ $(ATK_BRIDGE_CFLAGS) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/x11-toolkits/at-spi/files/patch-libspi_Makefile.in b/x11-toolkits/at-spi/files/patch-libspi_Makefile.in new file mode 100644 index 000000000000..cfb55a212a86 --- /dev/null +++ b/x11-toolkits/at-spi/files/patch-libspi_Makefile.in @@ -0,0 +1,11 @@ +--- libspi/Makefile.in.orig Fri May 2 13:36:07 2003 ++++ libspi/Makefile.in Fri May 2 13:36:37 2003 +@@ -539,7 +539,7 @@ + mostlyclean distclean maintainer-clean + + +-$(top_srcdir)/libspi/accessible.c $(top_srcdir)/libspi/base.h $(top_srcdir)/libspi/keystrokelistener.h $(top_srcdir)/libspi/libspi.h $(top_srcdir)/libspi/listener.h $(top_srcdir)/libspi/remoteobject.h : Accessibility.h ++accessible.c base.h keystrokelistener.h libspi.h listener.h remoteobject.h : Accessibility.h + + $(IDL_OUT) Accessibility-imodule.c : $(IDL_DEPS) $(ORBIT_IDL) + $(ORBIT_IDL) -D__ACCESSIBILITY_COMPILATION__ $(IDLFLAGS) $(top_srcdir)/idl/Accessibility.idl diff --git a/x11-toolkits/at-spi/files/patch-registryd_Makefile.in b/x11-toolkits/at-spi/files/patch-registryd_Makefile.in new file mode 100644 index 000000000000..7729e9da1400 --- /dev/null +++ b/x11-toolkits/at-spi/files/patch-registryd_Makefile.in @@ -0,0 +1,11 @@ +--- registryd/Makefile.in.orig Fri Aug 8 12:15:34 2003 ++++ registryd/Makefile.in Fri Aug 8 12:20:05 2003 +@@ -150,7 +150,7 @@ + at_spi_registryd_SOURCES = desktop.c desktop.h deviceeventcontroller.c deviceeventcontroller.h registry-main.c registry.c registry.h + + +-LDADD = $(top_builddir)/libspi/libspi.la $(X_LIBS) $(XTST_LIBS) $(XEVIE_LIBS) $(REGISTRYD_LIBS) ++LDADD = -L$(top_builddir)/libspi/.libs $(top_builddir)/libspi/libspi.la $(X_LIBS) $(XTST_LIBS) $(XEVIE_LIBS) $(REGISTRYD_LIBS) + + serverinfodir = $(prefix)/libdata/bonobo/servers + serverinfo_DATA = Accessibility_Registry.server diff --git a/x11-toolkits/at-spi/pkg-plist b/x11-toolkits/at-spi/pkg-plist index 54c07250ed45..fe058837b88e 100644 --- a/x11-toolkits/at-spi/pkg-plist +++ b/x11-toolkits/at-spi/pkg-plist @@ -23,42 +23,41 @@ include/at-spi-1.0/libspi/relation.h include/at-spi-1.0/libspi/remoteobject.h include/at-spi-1.0/libspi/selection.h include/at-spi-1.0/libspi/stateset.h +include/at-spi-1.0/libspi/streamablecontent.h include/at-spi-1.0/libspi/table.h include/at-spi-1.0/libspi/text.h include/at-spi-1.0/libspi/value.h lib/libcspi.a lib/libcspi.so -lib/libcspi.so.0 +lib/libcspi.so.9 lib/libspi.a lib/libspi.so -lib/libspi.so.0 +lib/libspi.so.9 lib/gtk-2.0/modules/libatk-bridge.so lib/orbit-2.0/Accessibility_module.so libdata/bonobo/servers/Accessibility_Registry.server libdata/pkgconfig/cspi-1.0.pc libdata/pkgconfig/libspi-1.0.pc libexec/at-spi-registryd -share/doc/at-spi-cspi/at-spi-cspi-accessible-objects.html -share/doc/at-spi-cspi/at-spi-cspi-accessibleaction-interface.html -share/doc/at-spi-cspi/at-spi-cspi-accessibleapplication-api.html -share/doc/at-spi-cspi/at-spi-cspi-accessiblecomponent-interface.html -share/doc/at-spi-cspi/at-spi-cspi-accessibleeditabletext-interface.html -share/doc/at-spi-cspi/at-spi-cspi-accessiblehyperlink-interface.html -share/doc/at-spi-cspi/at-spi-cspi-accessiblehypertext-interface.html -share/doc/at-spi-cspi/at-spi-cspi-accessibleimage-interface.html -share/doc/at-spi-cspi/at-spi-cspi-accessiblerelations-and-relationsets.html -share/doc/at-spi-cspi/at-spi-cspi-accessibleselection-interface.html -share/doc/at-spi-cspi/at-spi-cspi-accessibletable-interface.html -share/doc/at-spi-cspi/at-spi-cspi-accessibletext-interface.html -share/doc/at-spi-cspi/at-spi-cspi-accessiblevalue-interface.html -share/doc/at-spi-cspi/at-spi-cspi-event-listener-support.html -share/doc/at-spi-cspi/at-spi-cspi-registry-queries.html -share/doc/at-spi-cspi/at-spi-cspi-spi-main-loop-and-initialization.html -share/doc/at-spi-cspi/at-spi-cspi-state-and-statesets.html -share/doc/at-spi-cspi/book1.html -share/doc/at-spi-cspi/c5968.html -share/doc/at-spi-cspi/c7152.html -share/doc/at-spi-cspi/index.sgml +share/doc/at-spi-cspi/at-spi-cspi-Accessible-Objects.html +share/doc/at-spi-cspi/at-spi-cspi-AccessibleAction-Interface.html +share/doc/at-spi-cspi/at-spi-cspi-AccessibleApplication-API.html +share/doc/at-spi-cspi/at-spi-cspi-AccessibleComponent-Interface.html +share/doc/at-spi-cspi/at-spi-cspi-AccessibleEditableText-Interface.html +share/doc/at-spi-cspi/at-spi-cspi-AccessibleHyperlink-Interface.html +share/doc/at-spi-cspi/at-spi-cspi-AccessibleHypertext-Interface.html +share/doc/at-spi-cspi/at-spi-cspi-AccessibleImage-Interface.html +share/doc/at-spi-cspi/at-spi-cspi-AccessibleRelations-and-RelationSets.html +share/doc/at-spi-cspi/at-spi-cspi-AccessibleSelection-Interface.html +share/doc/at-spi-cspi/at-spi-cspi-AccessibleTable-Interface.html +share/doc/at-spi-cspi/at-spi-cspi-AccessibleText-Interface.html +share/doc/at-spi-cspi/at-spi-cspi-AccessibleValue-Interface.html +share/doc/at-spi-cspi/at-spi-cspi-Event-Listener-Support.html +share/doc/at-spi-cspi/at-spi-cspi-Registry-queries.html +share/doc/at-spi-cspi/at-spi-cspi-SPI-main-loop-and-initialization.html +share/doc/at-spi-cspi/at-spi-cspi-State-and-StateSets.html +share/doc/at-spi-cspi/ch05.html +share/doc/at-spi-cspi/index.html share/doc/at-spi-cspi/spi-accessible.html share/doc/at-spi-cspi/spi-application.html share/doc/at-spi-cspi/spi-component.html diff --git a/x11-toolkits/eel2/Makefile b/x11-toolkits/eel2/Makefile index 8ddd07a436fe..2596492612f9 100644 --- a/x11-toolkits/eel2/Makefile +++ b/x11-toolkits/eel2/Makefile @@ -6,10 +6,10 @@ # PORTNAME= eel2 -PORTVERSION= 2.2.4 +PORTVERSION= 2.4.0 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.2 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.4 DIST_SUBDIR= gnome2 DISTNAME= eel-${PORTVERSION} @@ -27,6 +27,6 @@ USE_REINPLACE= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS= --enable-shared --enable-static CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" + LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" .include <bsd.port.mk> diff --git a/x11-toolkits/eel2/distinfo b/x11-toolkits/eel2/distinfo index af1f88db108e..9120d5dfa753 100644 --- a/x11-toolkits/eel2/distinfo +++ b/x11-toolkits/eel2/distinfo @@ -1 +1 @@ -MD5 (gnome2/eel-2.2.4.tar.bz2) = 39d3ff28fbadd7341521644269d467b5 +MD5 (gnome2/eel-2.4.0.tar.bz2) = d15b6faec48f203d4e319a2364585511 diff --git a/x11-toolkits/eel2/pkg-plist b/x11-toolkits/eel2/pkg-plist index 31ab646e9c0d..74a9dfab0e38 100644 --- a/x11-toolkits/eel2/pkg-plist +++ b/x11-toolkits/eel2/pkg-plist @@ -6,7 +6,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-caption-table.h include/eel-2/eel/eel-caption.h include/eel-2/eel/eel-cell-renderer-pixbuf-list.h include/eel-2/eel/eel-dateedit-extensions.h @@ -33,7 +32,6 @@ include/eel-2/eel/eel-input-event-box.h include/eel-2/eel/eel-labeled-image.h include/eel-2/eel/eel-marshal.h include/eel-2/eel/eel-pango-extensions.h -include/eel-2/eel/eel-password-dialog.h include/eel-2/eel/eel-preferences-glade.h include/eel-2/eel/eel-preferences.h include/eel-2/eel/eel-radio-button-group.h @@ -50,7 +48,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.4 +lib/libeel-2.so.6 libdata/pkgconfig/eel-2.0.pc share/locale/am/LC_MESSAGES/eel-2.0.mo share/locale/ar/LC_MESSAGES/eel-2.0.mo @@ -61,6 +59,7 @@ share/locale/bn/LC_MESSAGES/eel-2.0.mo share/locale/bs/LC_MESSAGES/eel-2.0.mo share/locale/ca/LC_MESSAGES/eel-2.0.mo share/locale/cs/LC_MESSAGES/eel-2.0.mo +share/locale/cy/LC_MESSAGES/eel-2.0.mo share/locale/da/LC_MESSAGES/eel-2.0.mo share/locale/de/LC_MESSAGES/eel-2.0.mo share/locale/el/LC_MESSAGES/eel-2.0.mo @@ -82,12 +81,14 @@ share/locale/it/LC_MESSAGES/eel-2.0.mo share/locale/ja/LC_MESSAGES/eel-2.0.mo share/locale/ko/LC_MESSAGES/eel-2.0.mo share/locale/kn/LC_MESSAGES/eel-2.0.mo +share/locale/li/LC_MESSAGES/eel-2.0.mo share/locale/lt/LC_MESSAGES/eel-2.0.mo share/locale/lv/LC_MESSAGES/eel-2.0.mo share/locale/mk/LC_MESSAGES/eel-2.0.mo share/locale/ml/LC_MESSAGES/eel-2.0.mo share/locale/mn/LC_MESSAGES/eel-2.0.mo share/locale/ms/LC_MESSAGES/eel-2.0.mo +share/locale/ne/LC_MESSAGES/eel-2.0.mo share/locale/nl/LC_MESSAGES/eel-2.0.mo share/locale/nn/LC_MESSAGES/eel-2.0.mo share/locale/no/LC_MESSAGES/eel-2.0.mo diff --git a/x11-toolkits/gail/Makefile b/x11-toolkits/gail/Makefile index 2f81cac2a9a8..9a66364bd004 100644 --- a/x11-toolkits/gail/Makefile +++ b/x11-toolkits/gail/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gail -PORTVERSION= 1.2.2 +PORTVERSION= 1.4.0 CATEGORIES= x11-toolkits 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 diff --git a/x11-toolkits/gail/distinfo b/x11-toolkits/gail/distinfo index 7b01394f42b0..1c8abbab58fe 100644 --- a/x11-toolkits/gail/distinfo +++ b/x11-toolkits/gail/distinfo @@ -1 +1 @@ -MD5 (gnome2/gail-1.2.2.tar.bz2) = cace76d052501c10f57c145618205509 +MD5 (gnome2/gail-1.4.0.tar.bz2) = 6eba35f812cf007da332a9fef4865e71 diff --git a/x11-toolkits/gail/files/patch-docs_reference_libgail-util_Makefile.in b/x11-toolkits/gail/files/patch-docs_reference_libgail-util_Makefile.in new file mode 100644 index 000000000000..c61bc365ad8f --- /dev/null +++ b/x11-toolkits/gail/files/patch-docs_reference_libgail-util_Makefile.in @@ -0,0 +1,11 @@ +--- docs/reference/libgail-util/Makefile.in.orig Thu May 15 14:45:49 2003 ++++ docs/reference/libgail-util/Makefile.in Thu May 15 14:47:43 2003 +@@ -299,8 +299,6 @@ + echo '-- Installing '$$i ; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ + done; \ +- echo '-- Installing $(srcdir)/html/index.sgml' ; \ +- $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \ + fi) + + # diff --git a/x11-toolkits/gail/pkg-plist b/x11-toolkits/gail/pkg-plist index a947bd3a9d5d..a45c4b6a4380 100644 --- a/x11-toolkits/gail/pkg-plist +++ b/x11-toolkits/gail/pkg-plist @@ -8,9 +8,11 @@ lib/libgailutil.so lib/libgailutil.so.17 libdata/pkgconfig/gail.pc share/doc/gail-libgail-util/book1.html +share/doc/gail-libgail-util/gail-libgail-util-GailMisc.html +share/doc/gail-libgail-util/gail-libgail-util-GailTextUtil.html share/doc/gail-libgail-util/gail-libgail-util-gailmisc.html share/doc/gail-libgail-util/gail-libgail-util-gailtextutil.html -share/doc/gail-libgail-util/index.sgml +share/doc/gail-libgail-util/index.html share/doc/gail-libgail-util/libgail-util-main.html @dirrm share/doc/gail-libgail-util @dirrm lib/gtk-2.0/modules diff --git a/x11-toolkits/gnome-themes/Makefile b/x11-toolkits/gnome-themes/Makefile index 18d28258364d..0a6fe90fa29e 100644 --- a/x11-toolkits/gnome-themes/Makefile +++ b/x11-toolkits/gnome-themes/Makefile @@ -6,27 +6,25 @@ # PORTNAME= gnome-themes -PORTVERSION= 2.2.2 +PORTVERSION= 2.4.0 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.4 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= A collection of themes and icons for GNOME 2 designed for accessibility -BUILD_DEPENDS= ${X11BASE}/lib/gtk-2.0/2.2.0/engines/libthinice.so:${PORTSDIR}/x11-toolkits/gtk-thinice-engine \ - ${X11BASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-toolkits/gtk-engines2 -RUN_DEPENDS= ${X11BASE}/lib/gtk-2.0/2.2.0/engines/libthinice.so:${PORTSDIR}/x11-toolkits/gtk-thinice-engine \ - ${X11BASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-toolkits/gtk-engines2 +BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-toolkits/gtk-engines2 +RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-toolkits/gtk-engines2 USE_BZIP2= yes USE_X_PREFIX= yes USE_REINPLACE= yes USE_LIBTOOL= yes -USE_GNOME= gnomehack metacity +USE_GNOME= gnomehack metacity libgnomeui CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" + LDFLAGS="-L${LOCALBASE}/lib" post-patch: @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ diff --git a/x11-toolkits/gnome-themes/distinfo b/x11-toolkits/gnome-themes/distinfo index 71091d975407..def286a7c89e 100644 --- a/x11-toolkits/gnome-themes/distinfo +++ b/x11-toolkits/gnome-themes/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-themes-2.2.2.tar.bz2) = 41095ed3c7d8a6f761d92a1bc13bfdb0 +MD5 (gnome2/gnome-themes-2.4.0.tar.bz2) = 57ae1cf8a8bac1a461310f26347605e6 diff --git a/x11-toolkits/gnome-themes/files/patch-configure b/x11-toolkits/gnome-themes/files/patch-configure index 2a763b11ffe5..3a3c068040c5 100644 --- a/x11-toolkits/gnome-themes/files/patch-configure +++ b/x11-toolkits/gnome-themes/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Wed Mar 12 07:49:35 2003 -+++ configure Thu Mar 13 23:50:27 2003 -@@ -7641,6 +7641,7 @@ +--- configure.orig Fri May 16 15:56:25 2003 ++++ configure Fri May 16 23:10:03 2003 +@@ -18073,6 +18073,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -8,80 +8,3 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -7707,22 +7708,16 @@ - echo "$as_me:$LINENO: checking for gtk+-2.0 >= 1.3.11 - gdk-pixbuf-2.0 >= 1.3.11 - gtk-engines-2 -- gtk-thinice-engine-2 -- libgnomeui-2.0 -- libglade-2.0" >&5 -+ gtk-thinice-engine-2" >&5 - echo $ECHO_N "checking for gtk+-2.0 >= 1.3.11 - gdk-pixbuf-2.0 >= 1.3.11 - gtk-engines-2 -- gtk-thinice-engine-2 -- libgnomeui-2.0 -- libglade-2.0... $ECHO_C" >&6 -+ gtk-thinice-engine-2... $ECHO_C" >&6 - - if $PKG_CONFIG --exists "gtk+-2.0 >= 1.3.11 - gdk-pixbuf-2.0 >= 1.3.11 - gtk-engines-2 -- gtk-thinice-engine-2 -- libgnomeui-2.0 -- libglade-2.0" ; then -+ gtk-thinice-engine-2" ; then - echo "$as_me:$LINENO: result: yes" >&5 - echo "${ECHO_T}yes" >&6 - succeeded=yes -@@ -7732,9 +7727,7 @@ - GTKTHEME_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 1.3.11 - gdk-pixbuf-2.0 >= 1.3.11 - gtk-engines-2 -- gtk-thinice-engine-2 -- libgnomeui-2.0 -- libglade-2.0"` -+ gtk-thinice-engine-2"` - echo "$as_me:$LINENO: result: $GTKTHEME_CFLAGS" >&5 - echo "${ECHO_T}$GTKTHEME_CFLAGS" >&6 - -@@ -7743,9 +7736,7 @@ - GTKTHEME_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 1.3.11 - gdk-pixbuf-2.0 >= 1.3.11 - gtk-engines-2 -- gtk-thinice-engine-2 -- libgnomeui-2.0 -- libglade-2.0"` -+ gtk-thinice-engine-2"` - echo "$as_me:$LINENO: result: $GTKTHEME_LIBS" >&5 - echo "${ECHO_T}$GTKTHEME_LIBS" >&6 - else -@@ -7756,9 +7747,7 @@ - GTKTHEME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= 1.3.11 - gdk-pixbuf-2.0 >= 1.3.11 - gtk-engines-2 -- gtk-thinice-engine-2 -- libgnomeui-2.0 -- libglade-2.0"` -+ gtk-thinice-engine-2"` - echo $GTKTHEME_PKG_ERRORS - fi - -@@ -7776,15 +7765,11 @@ - { { echo "$as_me:$LINENO: error: Library requirements (gtk+-2.0 >= 1.3.11 - gdk-pixbuf-2.0 >= 1.3.11 - gtk-engines-2 -- gtk-thinice-engine-2 -- libgnomeui-2.0 -- libglade-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 -+ gtk-thinice-engine-2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 - echo "$as_me: error: Library requirements (gtk+-2.0 >= 1.3.11 - gdk-pixbuf-2.0 >= 1.3.11 - gtk-engines-2 -- gtk-thinice-engine-2 -- libgnomeui-2.0 -- libglade-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} -+ gtk-thinice-engine-2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} - { (exit 1); exit 1; }; } - fi - diff --git a/x11-toolkits/gnome-themes/pkg-plist b/x11-toolkits/gnome-themes/pkg-plist index e87b8bcc477d..44fb48c7ec8d 100644 --- a/x11-toolkits/gnome-themes/pkg-plist +++ b/x11-toolkits/gnome-themes/pkg-plist @@ -2,6 +2,7 @@ lib/gtk-2.0/2.2.0/engines/libcrux-engine.so lib/gtk-2.0/2.2.0/engines/libhcengine.so lib/gtk-2.0/2.2.0/engines/liblighthouseblue.so lib/gtk-2.0/2.2.0/engines/libmist.so +lib/gtk-2.0/2.2.0/engines/libthinice.so share/eazel-engine/arrow_down-spinner.png share/eazel-engine/arrow_down.png share/eazel-engine/arrow_left.png @@ -931,6 +932,7 @@ share/locale/bg/LC_MESSAGES/gnome-themes.mo share/locale/bn/LC_MESSAGES/gnome-themes.mo share/locale/ca/LC_MESSAGES/gnome-themes.mo share/locale/cs/LC_MESSAGES/gnome-themes.mo +share/locale/cy/LC_MESSAGES/gnome-themes.mo share/locale/da/LC_MESSAGES/gnome-themes.mo share/locale/de/LC_MESSAGES/gnome-themes.mo share/locale/el/LC_MESSAGES/gnome-themes.mo @@ -939,15 +941,20 @@ share/locale/et/LC_MESSAGES/gnome-themes.mo share/locale/fa/LC_MESSAGES/gnome-themes.mo share/locale/fi/LC_MESSAGES/gnome-themes.mo share/locale/fr/LC_MESSAGES/gnome-themes.mo +share/locale/ga/LC_MESSAGES/gnome-themes.mo share/locale/he/LC_MESSAGES/gnome-themes.mo share/locale/hi/LC_MESSAGES/gnome-themes.mo share/locale/hu/LC_MESSAGES/gnome-themes.mo share/locale/id/LC_MESSAGES/gnome-themes.mo +share/locale/is/LC_MESSAGES/gnome-themes.mo share/locale/it/LC_MESSAGES/gnome-themes.mo share/locale/ja/LC_MESSAGES/gnome-themes.mo share/locale/ko/LC_MESSAGES/gnome-themes.mo +share/locale/li/LC_MESSAGES/gnome-themes.mo +share/locale/lt/LC_MESSAGES/gnome-themes.mo share/locale/lv/LC_MESSAGES/gnome-themes.mo share/locale/mk/LC_MESSAGES/gnome-themes.mo +share/locale/ml/LC_MESSAGES/gnome-themes.mo share/locale/mn/LC_MESSAGES/gnome-themes.mo share/locale/ms/LC_MESSAGES/gnome-themes.mo share/locale/nl/LC_MESSAGES/gnome-themes.mo @@ -967,6 +974,7 @@ share/locale/th/LC_MESSAGES/gnome-themes.mo share/locale/tr/LC_MESSAGES/gnome-themes.mo share/locale/uk/LC_MESSAGES/gnome-themes.mo share/locale/vi/LC_MESSAGES/gnome-themes.mo +share/locale/wa/LC_MESSAGES/gnome-themes.mo share/locale/zh_CN/LC_MESSAGES/gnome-themes.mo share/locale/zh_TW/LC_MESSAGES/gnome-themes.mo share/themes/Crux/gtk-2.0/gtkrc @@ -1024,6 +1032,7 @@ share/themes/HighContrastLargePrint/pixmaps/media-next.png share/themes/HighContrastLargePrint/pixmaps/media-pause.png share/themes/HighContrastLargePrint/pixmaps/media-play.png share/themes/HighContrastLargePrint/pixmaps/media-prev.png +share/themes/HighContrastLargePrint/pixmaps/media-record.png share/themes/HighContrastLargePrint/pixmaps/media-stop.png share/themes/HighContrastLargePrint/pixmaps/printer-broken.png share/themes/HighContrastLargePrint/pixmaps/printer-default.png @@ -1157,6 +1166,7 @@ share/themes/HighContrastLargePrintInverse/pixmaps/media-next.png share/themes/HighContrastLargePrintInverse/pixmaps/media-pause.png share/themes/HighContrastLargePrintInverse/pixmaps/media-play.png share/themes/HighContrastLargePrintInverse/pixmaps/media-prev.png +share/themes/HighContrastLargePrintInverse/pixmaps/media-record.png share/themes/HighContrastLargePrintInverse/pixmaps/media-stop.png share/themes/HighContrastLargePrintInverse/pixmaps/printer-broken.png share/themes/HighContrastLargePrintInverse/pixmaps/printer-default.png @@ -1290,6 +1300,7 @@ share/themes/LargePrint/pixmaps/media-next.png share/themes/LargePrint/pixmaps/media-pause.png share/themes/LargePrint/pixmaps/media-play.png share/themes/LargePrint/pixmaps/media-prev.png +share/themes/LargePrint/pixmaps/media-record.png share/themes/LargePrint/pixmaps/media-stop.png share/themes/LargePrint/pixmaps/printer-broken.png share/themes/LargePrint/pixmaps/printer-default.png @@ -1426,6 +1437,7 @@ share/themes/LowContrastLargePrint/pixmaps/media-next.png share/themes/LowContrastLargePrint/pixmaps/media-pause.png share/themes/LowContrastLargePrint/pixmaps/media-play.png share/themes/LowContrastLargePrint/pixmaps/media-prev.png +share/themes/LowContrastLargePrint/pixmaps/media-record.png share/themes/LowContrastLargePrint/pixmaps/media-stop.png share/themes/LowContrastLargePrint/pixmaps/printer-broken.png share/themes/LowContrastLargePrint/pixmaps/printer-default.png @@ -1575,8 +1587,11 @@ share/themes/Smokey-Blue/gtk-2.0/lines_background_blue.png share/themes/Smokey-Blue/gtk-2.0/option1.png share/themes/Smokey-Blue/gtk-2.0/option2.png share/themes/Smokey-Blue/index.theme +share/themes/ThinIce/gtk-2.0/gtkrc share/themes/Traditional/index.theme @dirrm share/themes/Traditional +@dirrm share/themes/ThinIce/gtk-2.0 +@dirrm share/themes/ThinIce @dirrm share/themes/Smokey-Blue/gtk-2.0 @dirrm share/themes/Smokey-Blue @dirrm share/themes/Simple/gtk-2.0 diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile index 20eb2d7f170e..e3ece0690fc5 100644 --- a/x11-toolkits/libbonoboui/Makefile +++ b/x11-toolkits/libbonoboui/Makefile @@ -6,10 +6,10 @@ # PORTNAME= libbonoboui -PORTVERSION= 2.2.4 +PORTVERSION= 2.4.0 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.4 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/x11-toolkits/libbonoboui/distinfo b/x11-toolkits/libbonoboui/distinfo index 124f41e5ddc4..1d6f2f98d6c9 100644 --- a/x11-toolkits/libbonoboui/distinfo +++ b/x11-toolkits/libbonoboui/distinfo @@ -1 +1 @@ -MD5 (gnome2/libbonoboui-2.2.4.tar.bz2) = bbf8715be93ac8e6dbc70a16a6353d0a +MD5 (gnome2/libbonoboui-2.4.0.tar.bz2) = 176e1a094ecbfaf765c9996fc3eccf3c diff --git a/x11-toolkits/libbonoboui/files/patch-Makefile.in b/x11-toolkits/libbonoboui/files/patch-Makefile.in index 3512fa0d365e..156a4f587188 100644 --- a/x11-toolkits/libbonoboui/files/patch-Makefile.in +++ b/x11-toolkits/libbonoboui/files/patch-Makefile.in @@ -1,9 +1,9 @@ ---- Makefile.in.orig Tue Jul 29 21:56:19 2003 -+++ Makefile.in Tue Jul 29 21:56:48 2003 -@@ -133,7 +133,7 @@ - cxxflags_set = @cxxflags_set@ - gnomelocaledir = @gnomelocaledir@ - install_sh = @install_sh@ +--- Makefile.in.orig Sat Jun 14 04:47:53 2003 ++++ Makefile.in Sat Jun 14 04:48:13 2003 +@@ -192,7 +192,7 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ -SUBDIRS = bonobo glade samples tests po doc +SUBDIRS = bonobo glade samples po doc diff --git a/x11-toolkits/libbonoboui/pkg-plist b/x11-toolkits/libbonoboui/pkg-plist index a3acc2d68002..3bc4954d1eb2 100644 --- a/x11-toolkits/libbonoboui/pkg-plist +++ b/x11-toolkits/libbonoboui/pkg-plist @@ -37,6 +37,7 @@ lib/libbonoboui-2.so lib/libbonoboui-2.so.0 lib/libglade/2.0/libbonobo.so libdata/bonobo/servers/Bonobo_Sample_Controls.server +libdata/bonobo/servers/CanvDemo.server libdata/pkgconfig/libbonoboui-2.0.pc share/doc/libbonoboui/bonobo-controls.html share/doc/libbonoboui/bonobo-support-utilities.html @@ -72,6 +73,7 @@ share/doc/libbonoboui/libbonoboui-faq.html share/doc/libbonoboui/libbonoboui.devhelp share/doc/libbonoboui/right.png share/doc/libbonoboui/up.png +share/gnome/gnome-2.0/ui/Bonobo_Sample_Container-ui.xml share/gnome/gnome-2.0/ui/Bonobo_Sample_Hello.xml share/locale/am/LC_MESSAGES/libbonoboui-2.0.mo share/locale/ar/LC_MESSAGES/libbonoboui-2.0.mo @@ -92,10 +94,12 @@ share/locale/he/LC_MESSAGES/libbonoboui-2.0.mo share/locale/hi/LC_MESSAGES/libbonoboui-2.0.mo share/locale/hu/LC_MESSAGES/libbonoboui-2.0.mo 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/kn/LC_MESSAGES/libbonoboui-2.0.mo share/locale/ko/LC_MESSAGES/libbonoboui-2.0.mo +share/locale/li/LC_MESSAGES/libbonoboui-2.0.mo share/locale/lv/LC_MESSAGES/libbonoboui-2.0.mo share/locale/ml/LC_MESSAGES/libbonoboui-2.0.mo share/locale/mn/LC_MESSAGES/libbonoboui-2.0.mo diff --git a/x11-toolkits/libgail-gnome/Makefile b/x11-toolkits/libgail-gnome/Makefile index c1ef23fa98b1..2b633ac049fe 100644 --- a/x11-toolkits/libgail-gnome/Makefile +++ b/x11-toolkits/libgail-gnome/Makefile @@ -7,7 +7,7 @@ PORTNAME= libgail-gnome PORTVERSION= 1.0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0 diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile index bef064ea9bd8..f78676fdcbdc 100644 --- a/x11-toolkits/libgnomeprintui/Makefile +++ b/x11-toolkits/libgnomeprintui/Makefile @@ -6,10 +6,10 @@ # PORTNAME= libgnomeprintui -PORTVERSION= 2.2.1.3 +PORTVERSION= 2.3.1 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.3 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/x11-toolkits/libgnomeprintui/distinfo b/x11-toolkits/libgnomeprintui/distinfo index c512cf3141e8..dc1f241615b3 100644 --- a/x11-toolkits/libgnomeprintui/distinfo +++ b/x11-toolkits/libgnomeprintui/distinfo @@ -1 +1 @@ -MD5 (gnome2/libgnomeprintui-2.2.1.3.tar.bz2) = 7a55f50151fe54ff9d92544b5b0fdd6d +MD5 (gnome2/libgnomeprintui-2.3.1.tar.bz2) = d6efea19435e8659c26fe4d4fd480336 diff --git a/x11-toolkits/libgnomeprintui/pkg-plist b/x11-toolkits/libgnomeprintui/pkg-plist index 51060b0eb257..8129d2da4be8 100644 --- a/x11-toolkits/libgnomeprintui/pkg-plist +++ b/x11-toolkits/libgnomeprintui/pkg-plist @@ -6,11 +6,13 @@ include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-preview.h include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-unit-selector.h lib/libgnomeprintui-2-2.a lib/libgnomeprintui-2-2.so -lib/libgnomeprintui-2-2.so.0 +lib/libgnomeprintui-2-2.so.1 libdata/pkgconfig/libgnomeprintui-2.2.pc share/doc/libgnomeprintui/c7.html +share/doc/libgnomeprintui/home.png share/doc/libgnomeprintui/index.html share/doc/libgnomeprintui/index.sgml +share/doc/libgnomeprintui/left.png share/doc/libgnomeprintui/libgnomeprintui-gnome-font-dialog.html share/doc/libgnomeprintui/libgnomeprintui-gnome-print-copies.html share/doc/libgnomeprintui/libgnomeprintui-gnome-print-dialog.html @@ -20,6 +22,8 @@ share/doc/libgnomeprintui/libgnomeprintui-gnome-print-preview.html share/doc/libgnomeprintui/libgnomeprintui-gnome-printer-dialog.html share/doc/libgnomeprintui/libgnomeprintui-gnome-printer-selector.html share/doc/libgnomeprintui/libgnomeprintui.html +share/doc/libgnomeprintui/right.png +share/doc/libgnomeprintui/up.png share/locale/am/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/ar/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/az/LC_MESSAGES/libgnomeprintui-2.2.mo @@ -28,6 +32,7 @@ share/locale/bg/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/bn/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/ca/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/cs/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/cy/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/da/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/de/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/el/LC_MESSAGES/libgnomeprintui-2.2.mo @@ -49,9 +54,9 @@ share/locale/it/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/ja/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/kn/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/ko/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/li/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/lt/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/lv/LC_MESSAGES/libgnomeprintui-2.2.mo -share/locale/mk/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/ml/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/mn/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/ms/LC_MESSAGES/libgnomeprintui-2.2.mo diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile index 2e5ce8983bbf..c06e101516de 100644 --- a/x11-toolkits/libgnomeui/Makefile +++ b/x11-toolkits/libgnomeui/Makefile @@ -6,10 +6,11 @@ # PORTNAME= libgnomeui -PORTVERSION= 2.2.2 +PORTVERSION= 2.4.0.1 +PORTREVISION= 1 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.4 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -22,7 +23,6 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_XPM= yes USE_GMAKE= yes -USE_REINPLACE= yes USE_GNOME= gnomeprefix gnomehack gnomehier libbonoboui INSTALLS_SHLIB= yes USE_LIBTOOL= yes diff --git a/x11-toolkits/libgnomeui/distinfo b/x11-toolkits/libgnomeui/distinfo index 7a9f1dd050e2..51f00e14c13d 100644 --- a/x11-toolkits/libgnomeui/distinfo +++ b/x11-toolkits/libgnomeui/distinfo @@ -1 +1 @@ -MD5 (gnome2/libgnomeui-2.2.2.tar.bz2) = 2d58cd438aabffc00e65ecd4bab63349 +MD5 (gnome2/libgnomeui-2.4.0.1.tar.bz2) = 196f4a3f1f4a531ff57acaa879e98dd2 diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui_Makefile.in b/x11-toolkits/libgnomeui/files/patch-libgnomeui_Makefile.in index c8ff2dcd7d66..69f8b2e7c4d5 100644 --- a/x11-toolkits/libgnomeui/files/patch-libgnomeui_Makefile.in +++ b/x11-toolkits/libgnomeui/files/patch-libgnomeui_Makefile.in @@ -1,6 +1,6 @@ ---- libgnomeui/Makefile.in.orig Wed Jun 4 10:23:03 2003 -+++ libgnomeui/Makefile.in Wed Jun 4 10:23:38 2003 -@@ -144,7 +144,7 @@ +--- libgnomeui/Makefile.in.orig Fri Jun 13 14:41:05 2003 ++++ libgnomeui/Makefile.in Fri Jun 13 14:41:43 2003 +@@ -148,7 +148,7 @@ # libgnomeuiincludedir = $(includedir)/libgnomeui-2.0/libgnomeui diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-icon-lookup.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-icon-lookup.c new file mode 100644 index 000000000000..ecb6739ab17b --- /dev/null +++ b/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-icon-lookup.c @@ -0,0 +1,24 @@ +--- libgnomeui/gnome-icon-lookup.c.orig Thu Sep 18 02:13:50 2003 ++++ libgnomeui/gnome-icon-lookup.c Thu Sep 18 02:16:19 2003 +@@ -107,6 +107,10 @@ + + if (vfs_mime_name) + { ++ /* Handle absolute files */ ++ if (vfs_mime_name[0] == '/') ++ return g_strdup (vfs_mime_name); ++ + p = strrchr(vfs_mime_name, '.'); + + if (p) +@@ -293,7 +297,9 @@ + if (mime_type) + { + mime_name = get_vfs_mime_name (mime_type); +- if (mime_name && gnome_icon_theme_has_icon (icon_theme, mime_name)) ++ if (mime_name && ++ ((mime_name[0] == '/' && g_file_test (mime_name, G_FILE_TEST_IS_REGULAR) || ++ gnome_icon_theme_has_icon (icon_theme, mime_name)))) + return mime_name; + g_free (mime_name); + diff --git a/x11-toolkits/libgnomeui/pkg-plist b/x11-toolkits/libgnomeui/pkg-plist index fe141862799b..e7113b5466a7 100644 --- a/x11-toolkits/libgnomeui/pkg-plist +++ b/x11-toolkits/libgnomeui/pkg-plist @@ -4,6 +4,7 @@ include/libgnomeui-2.0/libgnomeui/gnome-app-helper.h include/libgnomeui-2.0/libgnomeui/gnome-app-util.h include/libgnomeui-2.0/libgnomeui/gnome-app.h include/libgnomeui-2.0/libgnomeui/gnome-appbar.h +include/libgnomeui-2.0/libgnomeui/gnome-authentication-manager.h include/libgnomeui-2.0/libgnomeui/gnome-client.h include/libgnomeui-2.0/libgnomeui/gnome-color-picker.h include/libgnomeui-2.0/libgnomeui/gnome-dateedit.h @@ -29,6 +30,7 @@ include/libgnomeui-2.0/libgnomeui/gnome-mdi-generic-child.h include/libgnomeui-2.0/libgnomeui/gnome-mdi-session.h include/libgnomeui-2.0/libgnomeui/gnome-mdi.h include/libgnomeui-2.0/libgnomeui/gnome-messagebox.h +include/libgnomeui-2.0/libgnomeui/gnome-password-dialog.h include/libgnomeui-2.0/libgnomeui/gnome-pixmap-entry.h include/libgnomeui-2.0/libgnomeui/gnome-pixmap.h include/libgnomeui-2.0/libgnomeui/gnome-popup-menu.h @@ -48,43 +50,46 @@ include/libgnomeui-2.0/libgnomeui/libgnomeui.h lib/libglade/2.0/libgnome.so lib/libgnomeui-2.a lib/libgnomeui-2.so -lib/libgnomeui-2.so.200 +lib/libgnomeui-2.so.400 libdata/pkgconfig/libgnomeui-2.0.pc libexec/gnome_segv2 +share/doc/libgnomeui/GnomeAbout.html +share/doc/libgnomeui/GnomeApp.html +share/doc/libgnomeui/GnomeAppBar.html +share/doc/libgnomeui/GnomeClient.html +share/doc/libgnomeui/GnomeColorPicker.html +share/doc/libgnomeui/GnomeDateEdit.html +share/doc/libgnomeui/GnomeDialog.html +share/doc/libgnomeui/GnomeDruid.html +share/doc/libgnomeui/GnomeDruidPage.html +share/doc/libgnomeui/GnomeDruidPageEdge.html +share/doc/libgnomeui/GnomeDruidPageStandard.html +share/doc/libgnomeui/GnomeEntry.html +share/doc/libgnomeui/GnomeFileEntry.html +share/doc/libgnomeui/GnomeFontPicker.html +share/doc/libgnomeui/GnomeHRef.html +share/doc/libgnomeui/GnomeIconEntry.html +share/doc/libgnomeui/GnomeIconList.html +share/doc/libgnomeui/GnomeIconSelection.html +share/doc/libgnomeui/GnomeMDI.html +share/doc/libgnomeui/GnomeMDIChild.html +share/doc/libgnomeui/GnomeMDIGenericChild.html +share/doc/libgnomeui/GnomeMessageBox.html +share/doc/libgnomeui/GnomePixmap.html +share/doc/libgnomeui/GnomePixmapEntry.html +share/doc/libgnomeui/GnomePropertyBox.html +share/doc/libgnomeui/GnomeScores.html share/doc/libgnomeui/application-mgmt.html -share/doc/libgnomeui/c4.html +share/doc/libgnomeui/ch01.html share/doc/libgnomeui/deprecated.html share/doc/libgnomeui/druids.html share/doc/libgnomeui/fixme.html -share/doc/libgnomeui/gnomeabout.html -share/doc/libgnomeui/gnomeapp.html -share/doc/libgnomeui/gnomeappbar.html -share/doc/libgnomeui/gnomeclient.html -share/doc/libgnomeui/gnomecolorpicker.html -share/doc/libgnomeui/gnomedateedit.html -share/doc/libgnomeui/gnomedialog.html -share/doc/libgnomeui/gnomedruid.html -share/doc/libgnomeui/gnomedruidpage.html -share/doc/libgnomeui/gnomedruidpageedge.html -share/doc/libgnomeui/gnomedruidpagestandard.html -share/doc/libgnomeui/gnomeentry.html -share/doc/libgnomeui/gnomefileentry.html -share/doc/libgnomeui/gnomefontpicker.html -share/doc/libgnomeui/gnomehref.html -share/doc/libgnomeui/gnomeiconentry.html -share/doc/libgnomeui/gnomeiconlist.html -share/doc/libgnomeui/gnomeiconselection.html -share/doc/libgnomeui/gnomeicontextitem.html -share/doc/libgnomeui/gnomemdi.html -share/doc/libgnomeui/gnomemdichild.html -share/doc/libgnomeui/gnomemdigenericchild.html -share/doc/libgnomeui/gnomemessagebox.html -share/doc/libgnomeui/gnomepixmap.html -share/doc/libgnomeui/gnomepixmapentry.html -share/doc/libgnomeui/gnomepropertybox.html -share/doc/libgnomeui/gnomescores.html share/doc/libgnomeui/index.html share/doc/libgnomeui/index.sgml +share/doc/libgnomeui/libgnomeui-GnomeIconLookup.html +share/doc/libgnomeui/libgnomeui-GnomeIconTheme.html +share/doc/libgnomeui/libgnomeui-GnomeThemeFile.html +share/doc/libgnomeui/libgnomeui-GnomeThumbnail.html share/doc/libgnomeui/libgnomeui-gnome-app-helper.html share/doc/libgnomeui/libgnomeui-gnome-app-util.html share/doc/libgnomeui/libgnomeui-gnome-dialog-util.html @@ -96,10 +101,6 @@ share/doc/libgnomeui/libgnomeui-gnome-ui-init.html share/doc/libgnomeui/libgnomeui-gnome-uidefs.html share/doc/libgnomeui/libgnomeui-gnome-vfs-util.html share/doc/libgnomeui/libgnomeui-gnome-window.html -share/doc/libgnomeui/libgnomeui-gnomeiconlookup.html -share/doc/libgnomeui/libgnomeui-gnomeicontheme.html -share/doc/libgnomeui/libgnomeui-gnomethemefile.html -share/doc/libgnomeui/libgnomeui-gnomethumbnail.html share/doc/libgnomeui/libgnomeui-gnometypebuiltins.html share/doc/libgnomeui/libgnomeui-objects.html share/doc/libgnomeui/miscellaneous.html @@ -114,6 +115,7 @@ share/locale/ar/LC_MESSAGES/libgnomeui-2.0.mo 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/ca/LC_MESSAGES/libgnomeui-2.0.mo share/locale/cs/LC_MESSAGES/libgnomeui-2.0.mo share/locale/cy/LC_MESSAGES/libgnomeui-2.0.mo @@ -137,6 +139,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/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/mk/LC_MESSAGES/libgnomeui-2.0.mo @@ -153,6 +156,7 @@ share/locale/ro/LC_MESSAGES/libgnomeui-2.0.mo share/locale/ru/LC_MESSAGES/libgnomeui-2.0.mo share/locale/sk/LC_MESSAGES/libgnomeui-2.0.mo share/locale/sl/LC_MESSAGES/libgnomeui-2.0.mo +share/locale/sq/LC_MESSAGES/libgnomeui-2.0.mo share/locale/sr/LC_MESSAGES/libgnomeui-2.0.mo share/locale/sr@Latn/LC_MESSAGES/libgnomeui-2.0.mo share/locale/sv/LC_MESSAGES/libgnomeui-2.0.mo diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile index d528f1bf3e81..87e8908a6f80 100644 --- a/x11-toolkits/libwnck/Makefile +++ b/x11-toolkits/libwnck/Makefile @@ -6,10 +6,10 @@ # PORTNAME= libwnck -PORTVERSION= 2.2.2 +PORTVERSION= 2.4.0.1 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.4 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/x11-toolkits/libwnck/distinfo b/x11-toolkits/libwnck/distinfo index 8fc395f30cbe..57becd510ec1 100644 --- a/x11-toolkits/libwnck/distinfo +++ b/x11-toolkits/libwnck/distinfo @@ -1 +1 @@ -MD5 (gnome2/libwnck-2.2.2.tar.bz2) = f2498192c020c40303bf477e6b100055 +MD5 (gnome2/libwnck-2.4.0.1.tar.bz2) = 7a7007b285a4e3c39a7bb113cb2be45b diff --git a/x11-toolkits/libwnck/pkg-plist b/x11-toolkits/libwnck/pkg-plist index 13af8fb66b65..8094fd6082e1 100644 --- a/x11-toolkits/libwnck/pkg-plist +++ b/x11-toolkits/libwnck/pkg-plist @@ -11,7 +11,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.9 +lib/libwnck-1.so.11 libdata/pkgconfig/libwnck-1.0.pc share/locale/am/LC_MESSAGES/libwnck.mo share/locale/ar/LC_MESSAGES/libwnck.mo @@ -21,9 +21,11 @@ share/locale/bg/LC_MESSAGES/libwnck.mo share/locale/bn/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/el/LC_MESSAGES/libwnck.mo +share/locale/eo/LC_MESSAGES/libwnck.mo share/locale/es/LC_MESSAGES/libwnck.mo share/locale/et/LC_MESSAGES/libwnck.mo share/locale/fa/LC_MESSAGES/libwnck.mo @@ -40,6 +42,8 @@ share/locale/it/LC_MESSAGES/libwnck.mo share/locale/ja/LC_MESSAGES/libwnck.mo share/locale/kn/LC_MESSAGES/libwnck.mo share/locale/ko/LC_MESSAGES/libwnck.mo +share/locale/li/LC_MESSAGES/libwnck.mo +share/locale/lt/LC_MESSAGES/libwnck.mo share/locale/lv/LC_MESSAGES/libwnck.mo share/locale/mk/LC_MESSAGES/libwnck.mo share/locale/ml/LC_MESSAGES/libwnck.mo @@ -54,10 +58,10 @@ share/locale/pt_BR/LC_MESSAGES/libwnck.mo share/locale/ro/LC_MESSAGES/libwnck.mo share/locale/ru/LC_MESSAGES/libwnck.mo share/locale/sk/LC_MESSAGES/libwnck.mo -share/locale/sl/LC_MESSAGES/libwnck.mo share/locale/sq/LC_MESSAGES/libwnck.mo share/locale/sr/LC_MESSAGES/libwnck.mo share/locale/sr@Latn/LC_MESSAGES/libwnck.mo +share/locale/sl/LC_MESSAGES/libwnck.mo share/locale/sv/LC_MESSAGES/libwnck.mo share/locale/ta/LC_MESSAGES/libwnck.mo share/locale/th/LC_MESSAGES/libwnck.mo diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile index e319fee4fa57..23290abd992d 100644 --- a/x11-toolkits/vte/Makefile +++ b/x11-toolkits/vte/Makefile @@ -6,10 +6,10 @@ # PORTNAME= vte -PORTVERSION= 0.10.29 +PORTVERSION= 0.11.10 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.10 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.11 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -23,10 +23,21 @@ USE_BISON= yes INSTALLS_SHLIB= yes USE_LIBTOOL= yes USE_GNOME= gnomeprefix gnomehack gtk20 -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ + BSD_PTHREAD_LIBS="${PTHREAD_LIBS}" CONFIGURE_ARGS= --disable-python +.ifdef(WITH_GLX) +CONFIGURE_ARGS+= --with-glX +.endif + +pre-everything:: + @${ECHO_MSG} "" + @${ECHO_MSG} "Vte supports the following configurable option(s):" + @${ECHO_MSG} " WITH_GLX=yes Enable support for DRI rendering (may improve performance)" + @${ECHO_MSG} "" + post-patch: @${REINPLACE_CMD} -e 's|malloc\.h|stdlib.h|g' \ ${WRKSRC}/gnome-pty-helper/gnome-pty-helper.c diff --git a/x11-toolkits/vte/distinfo b/x11-toolkits/vte/distinfo index 0da53fe475b2..505d4768788b 100644 --- a/x11-toolkits/vte/distinfo +++ b/x11-toolkits/vte/distinfo @@ -1 +1 @@ -MD5 (gnome2/vte-0.10.29.tar.bz2) = f1bba34a7c3cadde8d1b9a333163184b +MD5 (gnome2/vte-0.11.10.tar.bz2) = 71facdedd477749908402a6931d36e64 diff --git a/x11-toolkits/vte/files/patch-configure b/x11-toolkits/vte/files/patch-configure index 72106cddb908..955fd6d5115e 100644 --- a/x11-toolkits/vte/files/patch-configure +++ b/x11-toolkits/vte/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Tue Dec 3 02:15:27 2002 -+++ configure Wed Dec 4 02:01:09 2002 -@@ -8643,6 +8643,7 @@ +--- configure.orig Tue May 6 10:14:49 2003 ++++ configure Wed May 7 02:24:01 2003 +@@ -8724,6 +8724,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -8,3 +8,14 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' +@@ -13009,10 +13010,6 @@ + fi + rm -f conftest* + +- +-cat >>confdefs.h <<\_ACEOF +-#define _XOPEN_SOURCE_EXTENDED 1 +-_ACEOF + + + cat >>confdefs.h <<\_ACEOF diff --git a/x11-toolkits/vte/files/patch-gnome-pty-helper_Makefile.in b/x11-toolkits/vte/files/patch-gnome-pty-helper_Makefile.in index e609f0e131fe..fdb419f853c2 100644 --- a/x11-toolkits/vte/files/patch-gnome-pty-helper_Makefile.in +++ b/x11-toolkits/vte/files/patch-gnome-pty-helper_Makefile.in @@ -1,6 +1,23 @@ ---- gnome-pty-helper/Makefile.in.orig Wed Nov 27 13:30:48 2002 -+++ gnome-pty-helper/Makefile.in Wed Nov 27 13:31:05 2002 -@@ -425,8 +425,8 @@ +--- gnome-pty-helper/Makefile.in.orig Mon Jun 2 20:23:02 2003 ++++ gnome-pty-helper/Makefile.in Mon Jun 2 20:26:54 2003 +@@ -65,6 +65,7 @@ + LDFLAGS = @LDFLAGS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ ++BSD_PTHREAD_LIBS = @BSD_PTHREAD_LIBS@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +@@ -217,7 +218,7 @@ + -test -z "$(libexec_PROGRAMS)" || rm -f $(libexec_PROGRAMS) + gnome-pty-helper$(EXEEXT): $(gnome_pty_helper_OBJECTS) $(gnome_pty_helper_DEPENDENCIES) + @rm -f gnome-pty-helper$(EXEEXT) +- $(LINK) $(gnome_pty_helper_LDFLAGS) $(gnome_pty_helper_OBJECTS) $(gnome_pty_helper_LDADD) $(LIBS) ++ $(LINK) $(gnome_pty_helper_LDFLAGS) $(gnome_pty_helper_OBJECTS) $(gnome_pty_helper_LDADD) $(LIBS) $(BSD_PTHREAD_LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) core *.core +@@ -514,8 +515,8 @@ install-exec-hook: diff --git a/x11-toolkits/vte/files/patch-gnome-pty-helper_configure b/x11-toolkits/vte/files/patch-gnome-pty-helper_configure new file mode 100644 index 000000000000..668f2a6dba5b --- /dev/null +++ b/x11-toolkits/vte/files/patch-gnome-pty-helper_configure @@ -0,0 +1,10 @@ +--- gnome-pty-helper/configure.orig Mon Jun 2 20:27:32 2003 ++++ gnome-pty-helper/configure Mon Jun 2 20:28:06 2003 +@@ -6318,6 +6318,7 @@ + s,@ECHO_N@,$ECHO_N,;t t + s,@ECHO_T@,$ECHO_T,;t t + s,@LIBS@,$LIBS,;t t ++s,@BSD_PTHREAD_LIBS@,$BSD_PTHREAD_LIBS,;t t + s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t + s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t + s,@INSTALL_DATA@,$INSTALL_DATA,;t t diff --git a/x11-toolkits/vte/files/patch-src_dumpkeys.c b/x11-toolkits/vte/files/patch-src_dumpkeys.c index 74852c5eb9ef..9c7110edf5d5 100644 --- a/x11-toolkits/vte/files/patch-src_dumpkeys.c +++ b/x11-toolkits/vte/files/patch-src_dumpkeys.c @@ -2,7 +2,7 @@ +++ src/dumpkeys.c Wed Dec 4 02:04:30 2002 @@ -18,11 +18,11 @@ - #ident "$Id: patch-src_dumpkeys.c,v 1.1 2002/12/04 07:10:42 marcus Exp $" + #ident "$Id: patch-src_dumpkeys.c,v 1.3 2003/04/12 04:52:53 marcus Exp $" #include "../config.h" +#include <sys/types.h> #ifdef HAVE_SYS_SELECT_H diff --git a/x11-toolkits/vte/files/patch-src_keymap.c b/x11-toolkits/vte/files/patch-src_keymap.c index 16012c800304..db657443b846 100644 --- a/x11-toolkits/vte/files/patch-src_keymap.c +++ b/x11-toolkits/vte/files/patch-src_keymap.c @@ -2,7 +2,7 @@ +++ src/keymap.c Tue Oct 22 17:42:33 2002 @@ -18,6 +18,7 @@ - #ident "$Id: patch-src_keymap.c,v 1.1 2002/10/22 21:53:50 marcus Exp $" + #ident "$Id: patch-src_keymap.c,v 1.3 2003/04/12 04:52:53 marcus Exp $" #include "../config.h" +#include <sys/types.h> #include <stdlib.h> diff --git a/x11-toolkits/vte/files/patch-src_pty.c b/x11-toolkits/vte/files/patch-src_pty.c index f88e85642dee..3601fb3d69f0 100644 --- a/x11-toolkits/vte/files/patch-src_pty.c +++ b/x11-toolkits/vte/files/patch-src_pty.c @@ -1,13 +1,10 @@ ---- src/pty.c.orig Tue May 13 01:18:15 2003 -+++ src/pty.c Tue May 13 01:26:22 2003 -@@ -48,6 +48,10 @@ +--- src/pty.c.orig Sat Apr 12 00:47:10 2003 ++++ src/pty.c Sat Apr 12 00:47:34 2003 +@@ -45,6 +45,7 @@ + #include "pty.h" + + #ifdef VTE_USE_GNOME_PTY_HELPER ++#include "../gnome-pty-helper/config.h" #include "../gnome-pty-helper/gnome-pty.h" #endif -+#ifdef __FreeBSD__ -+#define HAVE_RECVMSG 1 -+#endif -+ - #ifdef MSG_NOSIGNAL - #define PTY_RECVMSG_FLAGS MSG_NOSIGNAL - #else diff --git a/x11-toolkits/vte/files/patch-src_vte.c b/x11-toolkits/vte/files/patch-src_vte.c deleted file mode 100644 index 9c267212f5c1..000000000000 --- a/x11-toolkits/vte/files/patch-src_vte.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/vte.c.orig Tue Mar 4 14:25:26 2003 -+++ src/vte.c Wed Mar 26 01:42:42 2003 -@@ -547,7 +547,7 @@ - static wchar_t - vte_wc_from_unichar(VteTerminal *terminal, gunichar c) - { --#ifdef __STDC_ISO_10646__ -+#if defined(__STDC_ISO_10646__) || (defined(__FreeBSD__) && __FreeBSD_version < 500000) - return (wchar_t) c; - #else - gpointer original, result; diff --git a/x11-toolkits/vte/pkg-plist b/x11-toolkits/vte/pkg-plist index 30ebb21d7f75..d9d48291e46d 100644 --- a/x11-toolkits/vte/pkg-plist +++ b/x11-toolkits/vte/pkg-plist @@ -5,13 +5,14 @@ include/vte/vte.h include/vte/vteaccess.h lib/libvte.a lib/libvte.so -lib/libvte.so.4 +lib/libvte.so.5 lib/vte/decset lib/vte/interpret lib/vte/iso8859mode lib/vte/nativeecho lib/vte/osc lib/vte/slowcat +lib/vte/vterdb lib/vte/utf8echo lib/vte/utf8mode lib/vte/window @@ -40,7 +41,9 @@ share/locale/is/LC_MESSAGES/vte.mo share/locale/it/LC_MESSAGES/vte.mo share/locale/ja/LC_MESSAGES/vte.mo share/locale/ko/LC_MESSAGES/vte.mo +share/locale/li/LC_MESSAGES/vte.mo share/locale/lv/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/ms/LC_MESSAGES/vte.mo diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile index e33c61128113..6b01f2fde44b 100644 --- a/x11-wm/metacity/Makefile +++ b/x11-wm/metacity/Makefile @@ -6,11 +6,10 @@ # PORTNAME= metacity -PORTVERSION= 2.4.55 -PORTREVISION= 1 +PORTVERSION= 2.6.1 CATEGORIES= x11-wm MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.4 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.6 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/x11-wm/metacity/distinfo b/x11-wm/metacity/distinfo index 38b9a3dbdd30..85e7cddda0c3 100644 --- a/x11-wm/metacity/distinfo +++ b/x11-wm/metacity/distinfo @@ -1 +1 @@ -MD5 (gnome2/metacity-2.4.55.tar.bz2) = 33c09d4de65b4bd5d991ef7ee9272e34 +MD5 (gnome2/metacity-2.6.1.tar.bz2) = 0380801dae821ff67b8c8cb3410ecb01 diff --git a/x11-wm/metacity/files/patch-src_theme-parser.c b/x11-wm/metacity/files/patch-src_theme-parser.c deleted file mode 100644 index 31116ba15cb8..000000000000 --- a/x11-wm/metacity/files/patch-src_theme-parser.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/theme-parser.c.orig Sat May 24 19:12:06 2003 -+++ src/theme-parser.c Sat May 24 19:12:43 2003 -@@ -4261,7 +4261,7 @@ - GError *error; - ParseInfo info; - char *text; -- int length; -+ gsize length; - char *theme_file; - char *theme_dir; - MetaTheme *retval; diff --git a/x11-wm/metacity/pkg-plist b/x11-wm/metacity/pkg-plist index 23906efd0081..721dec3d9fae 100644 --- a/x11-wm/metacity/pkg-plist +++ b/x11-wm/metacity/pkg-plist @@ -124,19 +124,22 @@ share/locale/be/LC_MESSAGES/metacity.mo share/locale/bg/LC_MESSAGES/metacity.mo share/locale/ca/LC_MESSAGES/metacity.mo share/locale/cs/LC_MESSAGES/metacity.mo +share/locale/cy/LC_MESSAGES/metacity.mo share/locale/da/LC_MESSAGES/metacity.mo share/locale/de/LC_MESSAGES/metacity.mo share/locale/el/LC_MESSAGES/metacity.mo share/locale/en_GB/LC_MESSAGES/metacity.mo share/locale/es/LC_MESSAGES/metacity.mo -share/locale/et/LC_MESSAGES/metacity.mo share/locale/fa/LC_MESSAGES/metacity.mo share/locale/fi/LC_MESSAGES/metacity.mo share/locale/fr/LC_MESSAGES/metacity.mo share/locale/ga/LC_MESSAGES/metacity.mo share/locale/gl/LC_MESSAGES/metacity.mo share/locale/he/LC_MESSAGES/metacity.mo +share/locale/hi/LC_MESSAGES/metacity.mo share/locale/hu/LC_MESSAGES/metacity.mo +share/locale/id/LC_MESSAGES/metacity.mo +share/locale/is/LC_MESSAGES/metacity.mo share/locale/it/LC_MESSAGES/metacity.mo share/locale/ja/LC_MESSAGES/metacity.mo share/locale/ko/LC_MESSAGES/metacity.mo @@ -154,12 +157,14 @@ share/locale/ro/LC_MESSAGES/metacity.mo share/locale/ru/LC_MESSAGES/metacity.mo share/locale/sk/LC_MESSAGES/metacity.mo share/locale/sl/LC_MESSAGES/metacity.mo +share/locale/sq/LC_MESSAGES/metacity.mo share/locale/sr/LC_MESSAGES/metacity.mo share/locale/sr@Latn/LC_MESSAGES/metacity.mo share/locale/sv/LC_MESSAGES/metacity.mo share/locale/tr/LC_MESSAGES/metacity.mo share/locale/uk/LC_MESSAGES/metacity.mo share/locale/vi/LC_MESSAGES/metacity.mo +share/locale/wa/LC_MESSAGES/metacity.mo share/locale/zh_CN/LC_MESSAGES/metacity.mo share/locale/zh_TW/LC_MESSAGES/metacity.mo @dirrm share/gnome/themes/Simple/metacity-1 diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile index a7936f0e8f8a..1b1bbdd63130 100644 --- a/x11/gdm2/Makefile +++ b/x11/gdm2/Makefile @@ -6,7 +6,8 @@ # PORTNAME= gdm2 -PORTVERSION= 2.4.1.6 +PORTVERSION= 2.4.4.1 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.4 @@ -23,10 +24,12 @@ USE_GNOME= gnomeprefix gnomehack gnomehier libgnomeui librsvg2 GNU_CONFIGURE= yes USE_REINPLACE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-L${LOCALBASE}/lib" + LDFLAGS="-L${LOCALBASE}/lib" GDMDIR?= ${PREFIX}/etc/gdm +MAN1= gdm.1 + .include <bsd.port.pre.mk> .if exists(/usr/include/security/pam_misc.h) @@ -35,15 +38,6 @@ PLIST_SUB= PAM_MISC="" PLIST_SUB= PAM_MISC="@comment " .endif -.if !defined(BATCH) && !defined(PACKAGE_BUILDING) -IS_INTERACTIVE= yes -.endif - -.if !defined(BATCH) && !defined(PACKAGE_BUILDING) -pre-fetch: - ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL -.endif - post-extract: @${SED} -e "s,%%PREFIX%%,${PREFIX},g" \ ${FILESDIR}/gdm.sh.sample > ${WRKSRC}/gdm.sh.sample diff --git a/x11/gdm2/distinfo b/x11/gdm2/distinfo index c864a5809534..2e71c2da729e 100644 --- a/x11/gdm2/distinfo +++ b/x11/gdm2/distinfo @@ -1 +1 @@ -MD5 (gnome2/gdm-2.4.1.6.tar.bz2) = ef8cba099c650bd46661b764db2717bd +MD5 (gnome2/gdm-2.4.4.1.tar.bz2) = 50e5fd07bf1a15b1638f41787415f81c diff --git a/x11/gdm2/files/patch-ab b/x11/gdm2/files/patch-ab index 10b04a198600..c3380dabafba 100644 --- a/x11/gdm2/files/patch-ab +++ b/x11/gdm2/files/patch-ab @@ -1,84 +1,47 @@ ---- config/gdm.conf.in.orig Fri Aug 23 18:53:53 2002 -+++ config/gdm.conf.in Sun Oct 13 17:57:14 2002 -@@ -33,14 +33,14 @@ - # The gdm configuration program that is run from the login screen, you should - # probably leave this alone - Configurator=@EXPANDED_GDMCONFIGDIR@/gdmsetup --disable-sound --disable-crash-dialog --GnomeDefaultSession=@EXPANDED_DATADIR@/gnome/default.session -+GnomeDefaultSession=@EXPANDED_DATADIR@/default.session - # The chooser program. Must output the chosen host on stdout, probably you - # should leave this alone - Chooser=@EXPANDED_BINDIR@/gdmchooser - # Default path to set. The profile scripts will likely override this - DefaultPath=/bin:/usr/bin:/usr/bin/X11:/usr/X11R6/bin:/usr/local/bin:@EXPANDED_BINDIR@ - # Default path for root. The profile scripts will likely override this --RootPath=/sbin:/usr/sbin:/bin:/usr/bin:/usr/bin/X11:/usr/X11R6/bin:/usr/local/bin:@EXPANDED_BINDIR@ -+RootPath=/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin:/usr/local/bin:@EXPANDED_BINDIR@ - DisplayInitDir=@EXPANDED_SYSCONFDIR@/gdm/Init - # Greeter for local (non-xdmcp) logins. Change gdmlogin to gdmgreeter to - # get the new graphical greeter. -@@ -57,7 +57,7 @@ +--- config/gdm.conf.in.orig Wed Aug 20 13:40:45 2003 ++++ config/gdm.conf.in Wed Aug 20 22:29:47 2003 +@@ -73,7 +73,7 @@ # To try to kill all clients started at greeter time or in the Init script. # doesn't always work, only if those clients have a window of their own - KillInitClients=true --LogDir=@EXPANDED_AUTHDIR@ + #KillInitClients=true +-LogDir=@EXPANDED_LOGDIR@ +LogDir=/var/log # You should probably never change this value unless you have a weird setup PidFile=/var/run/gdm.pid - PostSessionScriptDir=@EXPANDED_SYSCONFDIR@/gdm/PostSession/ -@@ -72,7 +72,7 @@ + # Note that a post login script is run before a PreSession script. +@@ -93,7 +93,7 @@ # Reboot, Halt and suspend commands, you can add different commands # separated by a semicolon and gdm will use the first one it can find - RebootCommand=/sbin/shutdown -r now;/usr/sbin/shutdown -r now --HaltCommand=/usr/bin/poweroff;/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now + #RebootCommand=/usr/bin/reboot;/sbin/reboot;/sbin/shutdown -r now;/usr/sbin/shutdown -r now +-#HaltCommand=/usr/bin/poweroff;/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now +HaltCommand=/sbin/shutdown -p now;/usr/sbin/shutdown -p now - SuspendCommand= + #SuspendCommand= # Probably should not touch the below this is the standard setup ServAuthDir=@EXPANDED_AUTHDIR@ -@@ -84,16 +84,16 @@ - UserAuthFBDir=/tmp - UserAuthFile=.Xauthority - # The X server to use if we can't figure out what else to run. --StandardXServer=/usr/X11R6/bin/X -+StandardXServer=@EXPANDED_BINDIR@/X - # The maximum number of flexible X servers to run. - FlexibleXServers=5 - # the X nest command --Xnest=/usr/X11R6/bin/Xnest -name Xnest -+Xnest=@EXPANDED_BINDIR@/Xnest -name Xnest - # Automatic VT allocation. Right now only works on Linux. This way +@@ -123,7 +123,7 @@ # we force X to use specific vts. turn VTAllocation to false if this # is causing problems. - FirstVT=7 --VTAllocation=true + #FirstVT=7 +-#VTAllocation=true +VTAllocation=false - - [security] - # If any distributions ship with this one off, they should be shot -@@ -153,7 +153,7 @@ + # Should double login be treated with a warning (and possibility to change + # vts on linux systems for console logins) + #DoubleLoginWarning=true +@@ -200,7 +200,7 @@ # The 'theme'. By default we're using the default gtk theme # Of course assuming that gtk got installed in the same prefix, # if not change this. --GtkRC=@EXPANDED_DATADIR@/themes/Default/gtk/gtkrc +-#GtkRC=@EXPANDED_DATADIR@/themes/Default/gtk/gtkrc +GtkRC=@EXPANDED_DATADIR@/../themes/Default/gtk-2.0/gtkrc # Maximum size of an icon, larger icons are scaled down - MaxIconWidth=128 - MaxIconHeight=128 -@@ -281,7 +281,7 @@ - # Definition of the standard X server. - [server-Standard] - name=Standard server --command=/usr/X11R6/bin/X -+command=@EXPANDED_BINDIR@/X vt9 - flexible=true - - # To use this server type you should add -query host or -indirect host -@@ -289,7 +289,7 @@ - [server-Terminal] - name=Terminal server - # Add -terminate to make things behave more nicely --command=/usr/X11R6/bin/X -terminate -+command=@EXPANDED_BINDIR@/X -terminate - # Make this not appear in the flexible servers (we need extra params - # anyway, and terminate would be bad for xdmcp) - flexible=false + #MaxIconWidth=128 + #MaxIconHeight=128 +@@ -372,7 +372,7 @@ + # to the command line + [server-Chooser] + name=Chooser server +-command=@X_SERVER@ ++command=@X_SERVER@ vt9 + # Make this not appear in the flexible servers for now, but if you + # wish to allow a chooser server then make this true. This is the + # only way to make a flexible chooser server that behaves nicely. diff --git a/x11/gdm2/files/patch-at b/x11/gdm2/files/patch-at deleted file mode 100644 index 2e73a9b0b71f..000000000000 --- a/x11/gdm2/files/patch-at +++ /dev/null @@ -1,11 +0,0 @@ ---- utils/Makefile.in.orig Tue May 21 00:01:55 2002 -+++ utils/Makefile.in Tue May 21 00:02:20 2002 -@@ -160,7 +160,7 @@ - gdmmktemp_SOURCES = gdmmktemp.c - - --gdmaskpass_LDADD = $(INTLLIBS) -lpam -lpam_misc -+gdmaskpass_LDADD = $(INTLLIBS) -lpam - - - gdmopen_LDADD = $(INTLLIBS) diff --git a/x11/gdm2/files/patch-config_Makefile.in b/x11/gdm2/files/patch-config_Makefile.in deleted file mode 100644 index 0f65061f2425..000000000000 --- a/x11/gdm2/files/patch-config_Makefile.in +++ /dev/null @@ -1,101 +0,0 @@ ---- config/Makefile.in.orig Tue Aug 20 16:46:29 2002 -+++ config/Makefile.in Tue Aug 20 17:03:19 2002 -@@ -286,71 +286,73 @@ - fi - $(INSTALL_DATA) gdm.conf $(DESTDIR)$(confdir)/factory-gdm.conf - -- $(INSTALL_SCRIPT) $(srcdir)/XKeepsCrashing $(DESTDIR)$(confdir)/XKeepsCrashing -+ if test '!' -f $(DESTDIR)$(confdir)/XKeepsCrashing; then \ -+ $(INSTALL_SCRIPT) $(srcdir)/XKeepsCrashing $(DESTDIR)$(confdir)/XKeepsCrashing; \ -+ fi -+ $(INSTALL_SCRIPT) $(srcdir)/XKeepsCrashing $(DESTDIR)$(confdir)/factory-XKeepsCrashing - -- -if test -f $(DESTDIR)$(localedir)/locale.alias; then \ -- cp -f $(DESTDIR)$(localedir)/locale.alias $(DESTDIR)$(localedir)/locale.alias.orig; \ -+ if test '!' -f $(DESTDIR)$(localedir)/locale.alias; then \ -+ $(INSTALL_DATA) $(srcdir)/locale.alias $(DESTDIR)$(localedir)/locale.alias; \ - fi -- $(INSTALL_DATA) $(srcdir)/locale.alias $(DESTDIR)$(localedir)/locale.alias -+ $(INSTALL_DATA) $(srcdir)/locale.alias $(DESTDIR)$(localedir)/factory-locale.alias - - if test '!' -d $(DESTDIR)$(sessdir); then \ - $(mkinstalldirs) $(DESTDIR)$(sessdir); \ - chmod 755 $(DESTDIR)$(sessdir); \ - fi - -- -if test -f $(DESTDIR)$(sessdir)/Xsession; then \ -- cp -f $(DESTDIR)$(sessdir)/Xsession $(DESTDIR)$(sessdir)/Xsession.orig; \ -+ if test '!' -f $(DESTDIR)$(sessdir)/Xsession; then \ -+ $(INSTALL_SCRIPT) Xsession $(DESTDIR)$(sessdir)/Xsession; \ - fi -- $(INSTALL_SCRIPT) Xsession $(DESTDIR)$(sessdir)/Xsession -+ $(INSTALL_SCRIPT) Xsession $(DESTDIR)$(sessdir)/factory-Xsession - -- -if test -f $(DESTDIR)$(sessdir)/Gnome; then \ -- cp -f $(DESTDIR)$(sessdir)/Gnome $(DESTDIR)$(sessdir)/Gnome.orig; \ -+ if test '!' -f $(DESTDIR)$(sessdir)/Gnome; then \ -+ $(INSTALL_SCRIPT) Gnome $(DESTDIR)$(sessdir)/Gnome; \ - fi -- $(INSTALL_SCRIPT) Gnome $(DESTDIR)$(sessdir)/Gnome -+ $(INSTALL_SCRIPT) Gnome $(DESTDIR)$(sessdir)/factory-Gnome - - -if test -f /usr/bin/switchdesk; then \ -- if test -f $(DESTDIR)$(sessdir)/Default; then \ -- cp -f $(DESTDIR)$(sessdir)/Default $(DESTDIR)$(sessdir)/Default.orig; \ -+ if test '!' -f $(DESTDIR)$(sessdir)/Default; then \ -+ $(LN_S) -f $(sessdir)/Xsession $(DESTDIR)$(sessdir)/Default; \ - fi; \ -- $(LN_S) -f Xsession $(DESTDIR)$(sessdir)/Default; \ - fi - - if test '!' -d $(DESTDIR)$(initdir); then \ - $(mkinstalldirs) $(DESTDIR)$(initdir); \ - chmod 755 $(DESTDIR)$(initdir); \ - fi -- -if test -f $(DESTDIR)$(initdir)/Default; then \ -- cp -f $(DESTDIR)$(initdir)/Default $(DESTDIR)$(initdir)/Default.orig; \ -+ if test '!' -f $(DESTDIR)$(initdir)/Default; then \ -+ $(INSTALL_SCRIPT) $(srcdir)/Default $(DESTDIR)$(initdir)/Default; \ - fi -- $(INSTALL_SCRIPT) $(srcdir)/Default $(DESTDIR)$(initdir)/Default -+ $(INSTALL_SCRIPT) $(srcdir)/Default $(DESTDIR)$(initdir)/factory-Default - - if test '!' -d $(DESTDIR)$(predir); then \ - $(mkinstalldirs) $(DESTDIR)$(predir); \ - chmod 755 $(DESTDIR)$(predir); \ - fi -- -if test -f $(DESTDIR)$(predir)/Default; then \ -- cp -f $(DESTDIR)$(predir)/Default $(DESTDIR)$(predir)/Default.orig; \ -+ if test '!' -f $(DESTDIR)$(predir)/Default; then \ -+ $(INSTALL_SCRIPT) $(srcdir)/PreSession $(DESTDIR)$(predir)/Default; \ - fi -- $(INSTALL_SCRIPT) $(srcdir)/PreSession $(DESTDIR)$(predir)/Default -+ $(INSTALL_SCRIPT) $(srcdir)/PreSession $(DESTDIR)$(predir)/factory-Default - - if test '!' -d $(DESTDIR)$(postdir); then \ - $(mkinstalldirs) $(DESTDIR)$(postdir); \ - chmod 755 $(DESTDIR)$(postdir); \ - fi -- -if test -f $(DESTDIR)$(postdir)/Default; then \ -- cp -f $(DESTDIR)$(postdir)/Default $(DESTDIR)$(postdir)/Default.orig; \ -+ if test '!' -f $(DESTDIR)$(postdir)/Default; then \ -+ $(INSTALL_SCRIPT) $(srcdir)/PostSession $(DESTDIR)$(postdir)/Default; \ - fi -- $(INSTALL_SCRIPT) $(srcdir)/PostSession $(DESTDIR)$(postdir)/Default -+ $(INSTALL_SCRIPT) $(srcdir)/PostSession $(DESTDIR)$(postdir)/factory-Default - - if test '!' -d $(DESTDIR)$(gnomercdir); then \ - $(mkinstalldirs) $(DESTDIR)$(gnomercdir); \ - chmod 755 $(DESTDIR)$(gnomercdir); \ - fi - -- -if test -f $(DESTDIR)$(gnomercdir)/gnomerc; then \ -- cp -f $(DESTDIR)$(gnomercdir)/gnomerc $(DESTDIR)$(gnomercdir)/gnomerc.orig; \ -+ if test '!' -f $(DESTDIR)$(gnomercdir)/gnomerc; then \ -+ $(INSTALL_SCRIPT) gnomerc $(DESTDIR)$(gnomercdir)/gnomerc; \ - fi -- $(INSTALL_SCRIPT) gnomerc $(DESTDIR)$(gnomercdir)/gnomerc -+ $(INSTALL_SCRIPT) gnomerc $(DESTDIR)$(gnomercdir)/factory-gnomerc - - if test '!' -d $(DESTDIR)$(authdir); then \ - $(mkinstalldirs) $(DESTDIR)$(authdir); \ diff --git a/x11/gdm2/files/patch-config_PostSession b/x11/gdm2/files/patch-config_PostSession deleted file mode 100644 index 98433e06673e..000000000000 --- a/x11/gdm2/files/patch-config_PostSession +++ /dev/null @@ -1,11 +0,0 @@ ---- config/PostSession.orig Wed Dec 4 14:05:13 2002 -+++ config/PostSession Wed Dec 4 14:05:34 2002 -@@ -2,7 +2,7 @@ - - PATH=/usr/bin/X11:/usr/X11R6/bin:/opt/X11R6/bin:$PATH - --if command -v sessreg > /dev/null 2>&1; then -+if /usr/bin/which -s sessreg > /dev/null 2>&1; then - sessreg -d -w /var/log/wtmp -u /var/run/utmp -x "$X_SERVERS" -h "$REMOTE_HOST" -l $DISPLAY $USER - fi - exit 0 diff --git a/x11/gdm2/files/patch-config_PreSession b/x11/gdm2/files/patch-config_PreSession deleted file mode 100644 index 4a37fa9db2f9..000000000000 --- a/x11/gdm2/files/patch-config_PreSession +++ /dev/null @@ -1,16 +0,0 @@ ---- config/PreSession.orig Wed Dec 4 14:05:38 2002 -+++ config/PreSession Wed Dec 4 14:06:04 2002 -@@ -8,11 +8,11 @@ - # - PATH=/usr/bin/X11:/usr/X11R6/bin:/opt/X11R6/bin:$PATH - --if command -v xsetroot > /dev/null 2>&1; then -+if /usr/bin/which -s xsetroot > /dev/null 2>&1; then - xsetroot -cursor_name left_ptr -solid "#363047" - fi - --if command -v sessreg > /dev/null 2>&1; then -+if /usr/bin/which -s sessreg > /dev/null 2>&1; then - # some output for easy debugging - echo "$0: Registering your session with wtmp and utmp" - echo "$0: running: sessreg -a -w /var/log/wtmp -u /var/run/utmp -x \"$X_SERVERS\" -h \"$REMOTE_HOST\" -l $DISPLAY $USER" diff --git a/x11/gdm2/files/patch-config_locale.alias b/x11/gdm2/files/patch-config_locale.alias index c29dfa7f5bcb..45001031a696 100644 --- a/x11/gdm2/files/patch-config_locale.alias +++ b/x11/gdm2/files/patch-config_locale.alias @@ -1,5 +1,5 @@ ---- config/locale.alias.orig Sat Mar 15 05:31:02 2003 -+++ config/locale.alias Mon May 5 21:44:02 2003 +--- config/locale.alias.orig Thu May 15 22:56:46 2003 ++++ config/locale.alias Mon Sep 15 23:41:05 2003 @@ -14,76 +14,36 @@ # # - George @@ -83,30 +83,30 @@ +Croatian hr_HR.UTF-8,hr_HR.ISO_8859-2 +Czech cs_CZ.UTF-8,cs_CZ.ISO_8859-2 +Danish da_DK.UTF-8,da_DK.ISO_8859-1 -+Dutch nl_NL.UTF-8,nl_NL.ISO_8859-1 ++Dutch nl_NL.UTF-8,nl_NL.ISO_8859-15 +Estonian et_EE.UTF-8,et_EE.ISO_8859-15 +English(American) en_US.UTF-8,en_US.ISO_8859-1 +English(Australian) en_AU.UTF-8,en_AU.ISO_8859-1 +English(British) en_GB.UTF-8,en_GB.ISO_8859-1 -+Finnish fi_FI.UTF-8,fi_FI.ISO_8859-1 -+French fr_FR.UTF-8,fr_FR.ISO_8859-1 -+German de_DE.UTF-8,de_DE.ISO_8859-1 ++Finnish fi_FI.UTF-8,fi_FI.ISO_8859-15 ++French fr_FR.UTF-8,fr_FR.ISO_8859-15 ++German de_DE.UTF-8,de_DE.ISO_8859-15 +Greek el_GR.UTF-8,el_GR.ISO_8859-7 +Hungarian hu_HU.UTF-8,hu_HU.ISO_8859-2 +Icelandic is_IS.UTF-8,is_IS.ISO_8859-1 -+Italian it_IT.UTF-8,it_IT.ISO_8859-1 ++Italian it_IT.UTF-8,it_IT.ISO_8859-15 +Japanese ja_JP.UTF-8,ja_JP.EUC +Korean ko_KR.UTF-8,ko_KR.EUC +Lithuanian lt_LT.UTF-8,lt_LT.ISO_8859-4 +Norwegian(bokmal) no_NO.UTF-8,no_NO.ISO_8859-1 +Polish pl_PL.UTF-8,pl_PL.ISO_8859-2 -+Portuguese pt_PT.UTF-8,pt_PT.ISO_8859-1 ++Portuguese pt_PT.UTF-8,pt_PT.ISO_8859-15 +Portuguese(Brazilian) pt_BR.UTF-8,pt_BR.ISO8859-1 +Romanian ro_RO.UTF-8,ro_RO.ISO8859-2 +Russian ru_RU.UTF-8,ru_RU.ISO_8859-5 +Slovak sk_SK.UTF-8,sk_SK.ISO_8859-2 +Slovenian sl_SI.UTF-8,sl_SI.ISO_8859-2 -+Spanish es_ES.UTF-8,es_ES.ISO_8859-1 ++Spanish es_ES.UTF-8,es_ES.ISO_8859-15 +Swedish sv_SE.UTF-8,sv_SE.ISO_8859-1 +Turkish tr_TR.UTF-8,tr_TR.ISO_8859-9 +Ukrainian uk_UA.UTF-8,uk_UA.ISO8859-5 diff --git a/x11/gdm2/files/patch-configure b/x11/gdm2/files/patch-configure index e6e122ab8c2d..cbbc44334163 100644 --- a/x11/gdm2/files/patch-configure +++ b/x11/gdm2/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Mon May 5 12:32:19 2003 -+++ configure Mon May 5 21:45:38 2003 -@@ -9772,6 +9772,8 @@ +--- configure.orig Sat Jun 28 18:15:07 2003 ++++ configure Sat Jun 28 18:15:08 2003 +@@ -20222,6 +20222,8 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ diff --git a/x11/gdm2/files/patch-daemon_gdm.c b/x11/gdm2/files/patch-daemon_gdm.c index 76c115f8b982..787890f2a06e 100644 --- a/x11/gdm2/files/patch-daemon_gdm.c +++ b/x11/gdm2/files/patch-daemon_gdm.c @@ -1,6 +1,6 @@ ---- daemon/gdm.c.orig Thu May 30 11:02:29 2002 -+++ daemon/gdm.c Thu May 30 10:59:19 2002 -@@ -36,7 +36,7 @@ +--- daemon/gdm.c.orig Wed Jun 25 17:04:49 2003 ++++ daemon/gdm.c Sat Jun 28 18:17:44 2003 +@@ -38,7 +38,7 @@ #include <locale.h> /* This should be moved to auth.c I suppose */ diff --git a/x11/gdm2/files/patch-daemon_slave.c b/x11/gdm2/files/patch-daemon_slave.c deleted file mode 100644 index 27ac0544a6df..000000000000 --- a/x11/gdm2/files/patch-daemon_slave.c +++ /dev/null @@ -1,12 +0,0 @@ ---- daemon/slave.c.orig Wed Sep 18 02:25:09 2002 -+++ daemon/slave.c Wed Sep 18 02:25:15 2002 -@@ -2327,7 +2327,8 @@ - if (setusercontext (NULL, pwent, pwent->pw_uid, - LOGIN_SETLOGIN | LOGIN_SETPATH | - LOGIN_SETPRIORITY | LOGIN_SETRESOURCES | -- LOGIN_SETUMASK | LOGIN_SETUSER) < 0) -+ LOGIN_SETUMASK | LOGIN_SETUSER | -+ LOGIN_SETENV) < 0) - gdm_child_exit (DISPLAY_REMANAGE, - _("%s: setusercontext() failed for %s. " - "Aborting."), "gdm_slave_session_start", diff --git a/x11/gdm2/files/patch-gui::gdmsetup.c b/x11/gdm2/files/patch-gui::gdmsetup.c deleted file mode 100644 index 33924be670f7..000000000000 --- a/x11/gdm2/files/patch-gui::gdmsetup.c +++ /dev/null @@ -1,11 +0,0 @@ ---- gui/gdmsetup.c.orig Sun Aug 4 16:08:52 2002 -+++ gui/gdmsetup.c Sun Aug 4 16:09:09 2002 -@@ -1512,7 +1512,7 @@ - success = TRUE; - - /* HACK! */ -- cmd = g_strdup_printf ("/bin/chown -R root.root %s", dir); -+ cmd = g_strdup_printf ("/usr/sbin/chown -R gdm:gdm %s", dir); - system (cmd); - g_free (cmd); - diff --git a/x11/gdm2/files/patch-gui_gdmphotosetup.c b/x11/gdm2/files/patch-gui_gdmphotosetup.c deleted file mode 100644 index 6121bdf93f9f..000000000000 --- a/x11/gdm2/files/patch-gui_gdmphotosetup.c +++ /dev/null @@ -1,10 +0,0 @@ ---- gui/gdmphotosetup.c.orig Mon May 5 21:47:14 2003 -+++ gui/gdmphotosetup.c Mon May 5 21:47:39 2003 -@@ -22,6 +22,7 @@ - #include <libgnome/libgnome.h> - #include <libgnomeui/libgnomeui.h> - #include <sys/types.h> -+#include <signal.h> - #include <sys/stat.h> - #include <fcntl.h> - #include <errno.h> diff --git a/x11/gdm2/files/patch-ltmain.sh b/x11/gdm2/files/patch-ltmain.sh index c99e4f3bc218..04395ca76c1d 100644 --- a/x11/gdm2/files/patch-ltmain.sh +++ b/x11/gdm2/files/patch-ltmain.sh @@ -1,5 +1,5 @@ ---- ltmain.sh.orig Tue Jul 1 14:15:27 2003 -+++ ltmain.sh Fri Aug 1 15:54:24 2003 +--- ltmain.sh.orig Tue Jun 24 14:39:01 2003 ++++ ltmain.sh Sat Jun 28 18:20:02 2003 @@ -1280,7 +1280,7 @@ esac elif test "X$arg" = "X-lc_r"; then diff --git a/x11/gdm2/pkg-install b/x11/gdm2/pkg-install index e373a44e33ca..b8f29b328edf 100644 --- a/x11/gdm2/pkg-install +++ b/x11/gdm2/pkg-install @@ -40,7 +40,3 @@ if [ "$2" = "POST-INSTALL" ]; then ${CHMOD} 0750 ${PKG_PREFIX}/share/gnome/gdm exit 0 fi - -if [ -z "${BATCH}" ]; then - /usr/bin/dialog --yesno "GDM may contain vulnerabilities leading local root compromise, and it is reported widely with various security sites and groups. It is not recommended that this port be installed in public environment. Do you wish to accept the security risk and build GDM anyway?" 10 60 || /usr/bin/false -fi diff --git a/x11/gdm2/pkg-message b/x11/gdm2/pkg-message index 91ce3698bdce..6f3b7dcba333 100644 --- a/x11/gdm2/pkg-message +++ b/x11/gdm2/pkg-message @@ -1,20 +1,25 @@ GDM is installed. -Please note the following: -- This port has been tested on 5.0-CURRENT and 4.4-RELEASE and higher. -- If you are running a version of FreeBSD prior to 4.5-PRERELEASE, you should - append these lines to your /etc/pam.conf, otherwise GDM will refuse all - logins: +Do _NOT_ use /etc/ttys to start gdm at boot time. This will result in gdm +hanging or restarting constantly. Instead, copy the included gdm.sh.sample +script to gdm.sh, and restart. This script is found, by default, in +/usr/X11R6/etc/rc.d. -# gdm config -gdm auth requisite pam_unix.so try_first_pass -gdm account requisite pam_unix.so try_first_pass -gdm session required pam_permit.so +GDM uses its own locale.alias file to determine its language and especially +the GNOME-2 fontencoding. This file is located, by default, in +/usr/X11R6/etc/gdm/locale.alias. By default, the character set for every +county using the EURO currency is set to ISO8859-15 in order to enable the +EURO sign. If you don't feel comfortable with this, edit this file according +to your preferences. -- Do _NOT_ use /etc/ttys to start gdm at boot time. This will result in gdm - hanging or restarting constantly. Instead, copy the included gdm.sh.sample - script to gdm.sh, and restart. This script is found, by default, in - /usr/X11R6/etc/rc.d. +If you are running 5.x and you are running 5.1-RELEASE or earlier, GDM will +fail to work due to a bug in OpenPAM. You can download a patch from +http://www.FreeBSD.org/~marcus/pam_get_user.c.diff. You must also have the +FreeBSD src tree on your system. Do the following to apply the patch: -These notes were written by: Yukihiro Nakai <nakai@FreeBSD.org> -and updated by: Joe Marcus Clarke <marcus@FreeBSD.org> +# cd /usr +# patch -p < /path/to/pam_get_user.c.diff + + +Then rebuild and install world. Note, this bug does _NOT_ affect FreeBSD +4.x. diff --git a/x11/gdm2/pkg-plist b/x11/gdm2/pkg-plist index 2068ea98c795..d5a0e5916241 100644 --- a/x11/gdm2/pkg-plist +++ b/x11/gdm2/pkg-plist @@ -6,42 +6,35 @@ bin/gdmchooser bin/gdmflexiserver bin/gdmgreeter bin/gdmlogin -bin/gdmmktemp bin/gdmphotosetup bin/gdmsetup bin/gdmthemetester -@unexec if cmp -s %D/etc/gdm/Init/Default %D/etc/gdm/Init/factory-Default; then rm -f %D/etc/gdm/Init/Default; fi -etc/gdm/Init/factory-Default -@exec [ -f %B/Default ] || cp %B/%f %B/Default -@unexec if cmp -s %D/etc/gdm/PostSession/Default %D/etc/gdm/PostSession/factory-Default; then rm -f %D/etc/gdm/PostSession/Default; fi -etc/gdm/PostSession/factory-Default -@exec [ -f %B/Default ] || cp %B/%f %B/Default -@unexec if cmp -s %D/etc/gdm/PreSession/Default %D/etc/gdm/PreSession/factory-Default; then rm -f %D/etc/gdm/PreSession/Default; fi -etc/gdm/PreSession/factory-Default -@exec [ -f %B/Default ] || cp %B/%f %B/Default -@unexec if cmp -s %D/etc/gdm/Sessions/Gnome %D/etc/gdm/Sessions/factory-Gnome; then rm -f %D/etc/gdm/Sessions/Gnome; fi -etc/gdm/Sessions/factory-Gnome -@exec [ -f %B/Gnome ] || cp %B/%f %B/Gnome -@unexec if cmp -s %D/etc/gdm/Sessions/Xsession %D/etc/gdm/Sessions/factory-Xsession; then rm -f %D/etc/gdm/Sessions/Xsession; fi -etc/gdm/Sessions/factory-Xsession -@exec [ -f %B/Xsession ] || cp %B/%f %B/Xsession -@unexec if cmp -s %D/etc/gdm/XKeepsCrashing %D/etc/gdm/factory-XKeepsCrashing; then rm -f %D/etc/gdm/XKeepsCrashing; fi -etc/gdm/factory-XKeepsCrashing -@exec [ -f %B/XKeepsCrashing ] || cp %B/%f %B/XKeepsCrashing -@unexec if cmp -s %D/etc/gdm/gnomerc %D/etc/gdm/factory-gnomerc; then rm -f %D/etc/gdm/gnomerc; fi -etc/gdm/factory-gnomerc -@exec [ -f %B/gnomerc ] || cp %B/%f %B/gnomerc +etc/dm/Sessions/Default.desktop +etc/dm/Sessions/gnome.desktop +etc/gdm/Init/Default +etc/gdm/PostLogin/Default.sample +etc/gdm/PostSession/Default +etc/gdm/PreSession/Default +etc/gdm/XKeepsCrashing +etc/gdm/Xsession @unexec if cmp -s %D/etc/gdm/gdm.conf %D/etc/gdm/factory-gdm.conf; then rm -f %D/etc/gdm/gdm.conf; fi etc/gdm/factory-gdm.conf @exec [ -f %B/gdm.conf ] || cp %B/%f %B/gdm.conf -@unexec if cmp -s %D/etc/gdm/locale.alias %D/etc/gdm/factory-locale.alias; then rm -f %D/etc/gdm/locale.alias; fi -etc/gdm/factory-locale.alias -@exec [ -f %B/locale.alias ] || cp %B/%f %B/locale.alias +etc/gdm/locale.alias +@unexec if cmp -s %D/etc/gdm/modules/AccessDwellMouseEvents %D/etc/gdm/modules/factory-AccessDwellMouseEvents; then rm -f %D/etc/gdm/modules/AccessDwellMouseEvents; fi +etc/gdm/modules/factory-AccessDwellMouseEvents +@exec [ -f %B/AccessDwellMouseEvents ] || cp %B/%f %B/AccessDwellMouseEvents +@unexec if cmp -s %D/etc/gdm/modules/AccessKeyMouseEvents %D/etc/gdm/modules/factory-AccessKeyMouseEvents; then rm -f %D/etc/gdm/modules/AccessKeyMouseEvents; fi +etc/gdm/modules/factory-AccessKeyMouseEvents +@exec [ -f %B/AccessKeyMouseEvents ] || cp %B/%f %B/AccessKeyMouseEvents etc/rc.d/gdm.sh.sample +lib/gtk-2.0/modules/libdwellmouselistener.so +lib/gtk-2.0/modules/libkeymouselistener.so +%%PAM_MISC%%libexec/gdmaskpass +libexec/gdmtranslate sbin/gdm-restart sbin/gdm-safe-restart sbin/gdm-stop -%%PAM_MISC%%sbin/gdmaskpass sbin/gdmconfig share/gnome/applications/gdmflexiserver-xnest.desktop share/gnome/applications/gdmflexiserver.desktop @@ -49,6 +42,15 @@ share/gnome/applications/gdmsetup.desktop share/gnome/capplets/gdmphotosetup.desktop share/gnome/gdm/gdmchooser.glade share/gnome/gdm/gdmsetup.glade +share/gnome/gdm/themes/happygnome-list/GdmGreeterTheme.desktop +share/gnome/gdm/themes/happygnome-list/background.svg +share/gnome/gdm/themes/happygnome-list/disconnect.png +share/gnome/gdm/themes/happygnome-list/gnome-logo.png +share/gnome/gdm/themes/happygnome-list/happygnome.xml +share/gnome/gdm/themes/happygnome-list/options.png +share/gnome/gdm/themes/happygnome-list/screenshot.png +share/gnome/gdm/themes/happygnome-list/session.png +share/gnome/gdm/themes/happygnome-list/system.png share/gnome/gdm/themes/happygnome/GdmGreeterTheme.desktop share/gnome/gdm/themes/happygnome/background.svg share/gnome/gdm/themes/happygnome/disconnect.png @@ -65,6 +67,10 @@ share/gnome/gdm/themes/circles/flower.png share/gnome/gdm/themes/circles/help.png share/gnome/gdm/themes/circles/options.png share/gnome/gdm/themes/circles/screenshot.png +share/gnome/help/gdm/C/gdm.xml +share/gnome/help/gdm/C/legal.xml +share/gnome/omf/gdm/gdm-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gdm/gdm-C.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/gdm-foot-logo.png share/gnome/pixmaps/gdm.png share/gnome/pixmaps/login-photo.png @@ -78,6 +84,7 @@ share/locale/bg/LC_MESSAGES/gdm-2.4.mo share/locale/bn/LC_MESSAGES/gdm-2.4.mo share/locale/ca/LC_MESSAGES/gdm-2.4.mo share/locale/cs/LC_MESSAGES/gdm-2.4.mo +share/locale/cy/LC_MESSAGES/gdm-2.4.mo share/locale/da/LC_MESSAGES/gdm-2.4.mo share/locale/de/LC_MESSAGES/gdm-2.4.mo share/locale/el/LC_MESSAGES/gdm-2.4.mo @@ -112,6 +119,7 @@ share/locale/ro/LC_MESSAGES/gdm-2.4.mo share/locale/ru/LC_MESSAGES/gdm-2.4.mo share/locale/sk/LC_MESSAGES/gdm-2.4.mo share/locale/sl/LC_MESSAGES/gdm-2.4.mo +share/locale/sq/LC_MESSAGES/gdm-2.4.mo share/locale/sr/LC_MESSAGES/gdm-2.4.mo share/locale/sr@Latn/LC_MESSAGES/gdm-2.4.mo share/locale/sv/LC_MESSAGES/gdm-2.4.mo @@ -123,7 +131,13 @@ share/locale/vi/LC_MESSAGES/gdm-2.4.mo share/locale/wa/LC_MESSAGES/gdm-2.4.mo share/locale/zh_CN/LC_MESSAGES/gdm-2.4.mo share/locale/zh_TW/LC_MESSAGES/gdm-2.4.mo +@dirrm share/gnome/omf/gdm +@dirrm share/gnome/help/gdm/C @dirrm share/gnome/gdm/themes/happygnome +@dirrm share/gnome/gdm/themes/happygnome-list @dirrm share/gnome/gdm/themes/circles @dirrm share/gnome/gdm/themes @dirrm etc/pam.d +@dirrm etc/gdm/modules +@unexec /bin/rmdir %D/etc/dm 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gdm/gdm-C.omf 2>/dev/null || /usr/bin/true diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile index 9bef6cc276b8..0a07d795a9cc 100644 --- a/x11/gnome-applets/Makefile +++ b/x11/gnome-applets/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomeapplets2 -PORTVERSION= 2.2.2 -PORTREVISION= 3 +PORTVERSION= 2.4.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-applets/2.2 +MASTER_SITE_SUBDIR= sources/gnome-applets/2.4 DISTNAME= gnome-applets-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo index e16c408d8425..52d4f73acccc 100644 --- a/x11/gnome-applets/distinfo +++ b/x11/gnome-applets/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-applets-2.2.2.tar.bz2) = d8a8fdbae66274bab4a309073d2072ab +MD5 (gnome2/gnome-applets-2.4.0.tar.bz2) = c17dba203ea379af5da056862672026c diff --git a/x11/gnome-applets/files/patch-aa b/x11/gnome-applets/files/patch-aa index ffe06143e3f0..7c9edcd6d43a 100644 --- a/x11/gnome-applets/files/patch-aa +++ b/x11/gnome-applets/files/patch-aa @@ -1,6 +1,6 @@ ---- configure.orig Mon Dec 16 17:15:36 2002 -+++ configure Thu Dec 19 13:43:27 2002 -@@ -7862,6 +7862,7 @@ +--- configure.orig Sun Jun 1 13:55:59 2003 ++++ configure Mon Jun 2 02:36:19 2003 +@@ -7863,6 +7863,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -8,7 +8,7 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -12328,6 +12329,7 @@ +@@ -11202,6 +11203,7 @@ *irix*) CDROM_HOST=irix; CDROM_LIBS="-lcdaudio -lmediad -lds";cd_device_path="/dev/cdrom";; *linux*) CDROM_HOST=linux;cd_device_path="/dev/cdrom";; *netbsd*) CDROM_HOST=netbsd;cd_device_path="/dev/rcd0";; @@ -16,28 +16,7 @@ *solaris*) CDROM_HOST=solaris;cd_device_path="/vol/dev/aliases/cdrom0";cdplayer_type_sun=true;; esac case "$host" in -@@ -12391,6 +12393,20 @@ - fi - - ;; -+ i386-*-freebsd*) -+ HAVE_LIBAPM=no -+if test "x$HAVE_LIBAPM" = "xyes"; then -+ HAVE_LIBAPM_TRUE= -+ HAVE_LIBAPM_FALSE='#' -+else -+ HAVE_LIBAPM_TRUE='#' -+ HAVE_LIBAPM_FALSE= -+fi -+ ;; -+ *-*-freebsd*) -+ build_battstat_applet=no -+ -+ ;; - *-*-linux*) - echo "$as_me:$LINENO: checking for apm_read in -lapm" >&5 - echo $ECHO_N "checking for apm_read in -lapm... $ECHO_C" >&6 -@@ -13688,14 +13704,14 @@ +@@ -12771,14 +12773,14 @@ ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" cat >>confdefs.h <<_ACEOF diff --git a/x11/gnome-applets/files/patch-battstat_Makefile.in b/x11/gnome-applets/files/patch-battstat_Makefile.in index f47e6bab6dae..1908749369cb 100644 --- a/x11/gnome-applets/files/patch-battstat_Makefile.in +++ b/x11/gnome-applets/files/patch-battstat_Makefile.in @@ -1,21 +1,21 @@ ---- battstat/Makefile.in.orig Thu Dec 19 13:50:27 2002 -+++ battstat/Makefile.in Thu Dec 19 13:51:02 2002 -@@ -148,11 +148,11 @@ +--- battstat/Makefile.in.orig Sun Jun 29 16:43:23 2003 ++++ battstat/Makefile.in Sun Jun 29 16:45:10 2003 +@@ -146,11 +146,11 @@ pixmapsdir = $(datadir)/pixmaps pixmaps_DATA = battstat.png - @HAVE_LIBAPM_TRUE@APMLIB = @HAVE_LIBAPM_TRUE@-lapm --@HAVE_LIBAPM_FALSE@APMLIB = @HAVE_LIBAPM_FALSE@apmlib/libapm.a -+@HAVE_LIBAPM_FALSE@APMLIB = + @HAVE_LIBAPM_TRUE@APMLIB = -lapm +-@HAVE_LIBAPM_FALSE@APMLIB = apmlib/libapm.a ++@HAVE_LIBAPM_FALSE@APMLIB = @HAVE_LIBAPM_TRUE@APMDIR = --@HAVE_LIBAPM_FALSE@APMDIR = @HAVE_LIBAPM_FALSE@apmlib -+@HAVE_LIBAPM_FALSE@APMDIR = +-@HAVE_LIBAPM_FALSE@APMDIR = apmlib ++@HAVE_LIBAPM_FALSE@APMDIR = @HAVE_LIBAPM_TRUE@APMINC = --@HAVE_LIBAPM_FALSE@APMINC = @HAVE_LIBAPM_FALSE@-Iapmlib/ -+@HAVE_LIBAPM_FALSE@APMINC = +-@HAVE_LIBAPM_FALSE@APMINC = -Iapmlib/ ++@HAVE_LIBAPM_FALSE@APMINC = SUBDIRS = docs sounds $(APMDIR) -@@ -223,8 +223,7 @@ +@@ -199,8 +199,7 @@ @HAVE_LIBAPM_TRUE@battstat_applet_2_DEPENDENCIES = \ @HAVE_LIBAPM_TRUE@$(top_builddir)/screen-exec/libscreen-exec.la @HAVE_LIBAPM_FALSE@battstat_applet_2_DEPENDENCIES = \ diff --git a/x11/gnome-applets/files/patch-charpick_charpick.c b/x11/gnome-applets/files/patch-charpick_charpick.c new file mode 100644 index 000000000000..7d0ee91eb476 --- /dev/null +++ b/x11/gnome-applets/files/patch-charpick_charpick.c @@ -0,0 +1,11 @@ +--- charpick/charpick.c.orig Wed Sep 10 13:33:00 2003 ++++ charpick/charpick.c Wed Sep 10 13:33:19 2003 +@@ -3,7 +3,7 @@ + */ + + #include <config.h> +-#ifndef sun ++#if !defined(sun) && !defined(__FreeBSD__) + #include <tgmath.h> + #endif + #include <panel-applet.h> diff --git a/x11/gnome-applets/files/patch-gweather::Locations b/x11/gnome-applets/files/patch-gweather::Locations deleted file mode 100644 index 3e14e26d8de3..000000000000 --- a/x11/gnome-applets/files/patch-gweather::Locations +++ /dev/null @@ -1,35 +0,0 @@ - -$FreeBSD$ - ---- gweather/Locations.orig Wed May 15 00:32:46 2002 -+++ gweather/Locations Tue May 21 19:00:43 2002 -@@ -1588,7 +1588,7 @@ - - [EU] - name=Europe --states=AB OS BE BA BG CZ HR CY DK EE FI FR MK DE GI GR HU IE IS IT LV LT LU MT MD NL NO PL PT RO RU SK SI SP SE CH TR UK YU -+states=AB OS BE BA BG CZ HR CY DK EE FI FR MK DE GI GR HU IE IS IT LV LT LU MT MD NL NO PL PT RO RU SK SI SP SE CH TR UA UK YU - - [EU_AB] - name=Albania -@@ -1857,6 +1857,20 @@ - loc50=Yakutsk UEEE ------ --- - loc51=Yekaterinburg USSS ------ --- - loc52=Yuzhno-Sakhalinsk UHSS ------ --- -+ -+[EU_UA] -+name=Ukraine -+loc0=Kiev UKBB ------ --- -+loc1=Donetsk UKCC ------ --- -+loc2=Dnepropetrovsk UKDD ------ --- -+loc3=Krivoy\\ Rog UKDR ------ --- -+loc4=Simferopol UKFF ------ --- -+loc5=Kharkov UKHH ------ --- -+loc6=Ivano-frankovsk UKLI ------ --- -+loc7=Lvov UKLL ------ --- -+loc8=Rovno UKLR ------ --- -+loc9=Uzhgorod UKLU ------ --- -+loc10=Odessa UKOO ------ --- - - [EU_SK] - name=Slovakia diff --git a/x11/gnome-applets/files/patch-stickynotes_Makefile.in b/x11/gnome-applets/files/patch-stickynotes_Makefile.in new file mode 100644 index 000000000000..973b7e342c3e --- /dev/null +++ b/x11/gnome-applets/files/patch-stickynotes_Makefile.in @@ -0,0 +1,11 @@ +--- stickynotes/Makefile.in.orig Thu Aug 28 01:00:09 2003 ++++ stickynotes/Makefile.in Thu Aug 28 01:00:26 2003 +@@ -142,7 +142,7 @@ + + SUBDIRS = pixmaps docs + +-CFLAGS = -Wall -g ++CFLAGS += -Wall -g + + INCLUDES = -I. -I$(srcdir) $(GNOME_APPLETS_CFLAGS) $(LIBGLADE_CFLAGS) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DSTICKYNOTES_GLADEDIR=\"$(gladedir)\" -DSTICKYNOTES_ICONDIR=\"$(icondir)\" + diff --git a/x11/gnome-applets/files/patch-wireless_wireless-applet.c b/x11/gnome-applets/files/patch-wireless_wireless-applet.c index 3b247a47b947..5c1e32e88b09 100644 --- a/x11/gnome-applets/files/patch-wireless_wireless-applet.c +++ b/x11/gnome-applets/files/patch-wireless_wireless-applet.c @@ -1,6 +1,6 @@ ---- wireless/wireless-applet.c.orig Mon May 19 00:50:43 2003 -+++ wireless/wireless-applet.c Wed Aug 20 12:12:05 2003 -@@ -30,12 +30,27 @@ +--- wireless/wireless-applet.c.orig Sat Aug 23 09:10:54 2003 ++++ wireless/wireless-applet.c Thu Aug 28 00:44:16 2003 +@@ -30,12 +30,25 @@ #include <math.h> #include <dirent.h> @@ -10,10 +10,8 @@ +#include <net/if.h> +#include <net/if_var.h> +#include <dev/an/if_aironet_ieee.h> -+#if __FreeBSD_version >= 460100 +#include <dev/wi/if_wavelan_ieee.h> +#endif -+#endif + #include <gnome.h> #include <panel-applet.h> @@ -28,32 +26,33 @@ #define CFG_UPDATE_INTERVAL 2 typedef enum { -@@ -93,6 +108,14 @@ +@@ -89,6 +102,12 @@ WirelessApplet *applet); static void wireless_applet_about_cb (BonoboUIComponent *uic, WirelessApplet *applet); +#ifdef __FreeBSD__ +static int an_getval(WirelessApplet *applet, char *device, struct an_req *areq); +static void get_an_data(WirelessApplet *applet, char *device, long int *level); -+#if __FreeBSD_version >= 460100 +static int wi_getval(WirelessApplet *applet, char *device, struct wi_req *areq); +static void get_wi_data(WirelessApplet *applet, char *device, long int *level); +#endif -+#endif static const BonoboUIVerb wireless_menu_verbs [] = { BONOBO_UI_UNSAFE_VERB ("WirelessProperties", -@@ -150,7 +173,9 @@ +@@ -143,9 +162,11 @@ g_free (tmp); /* Update the image */ +#ifndef __FreeBSD__ - percent = CLAMP (percent, 0, 100); + percent = CLAMP (percent, -1, 100); +#endif - if (applet->pixmaps[percent] != applet->current_pixmap) - { -@@ -234,6 +259,7 @@ +- if (percent < 0) ++ if (percent < 0 || percent > 100) + state = PIX_BROKEN; + else if (percent == 0) + state = PIX_NO_LINK; +@@ -176,6 +197,7 @@ int percent; /* Calculate the percentage based on the link quality */ @@ -61,7 +60,7 @@ if (level < 0) { percent = -1; } else { -@@ -244,8 +270,11 @@ +@@ -186,6 +208,9 @@ percent = CLAMP (percent, 0, 100); } } @@ -69,17 +68,13 @@ + percent = (int)level; +#endif -- if (percent < 0) { -+ if (percent < 0 || percent > 100) { - applet->state = BUSTED_LINK; - wireless_applet_animation_state (applet); - } else if (percent == 0) { -@@ -387,22 +416,182 @@ - applet->show_dialogs = show; + wireless_applet_draw (applet, percent); + } +@@ -228,22 +253,179 @@ + } } +#ifdef __FreeBSD__ -+#if __FreeBSD_version >= 460100 +static int +wi_getval(WirelessApplet *applet, char *device, struct wi_req *wreq) +{ @@ -135,7 +130,7 @@ + + return; +} -+#endif ++ +static int +an_getval(WirelessApplet *applet, char *device, struct an_req *areq) +{ @@ -244,7 +239,6 @@ + wireless_applet_update_state (applet, device, 0, level, 0); + } + } -+#if __FreeBSD_version >= 460100 + else + if (g_strncasecmp(device, "wi", 2)==0) { + applet->devices = g_list_prepend (applet->devices, g_strdup (device)); @@ -253,13 +247,12 @@ + wireless_applet_update_state (applet, device, 0, level, 0); + } + } -+#endif + ifs++; +#else char *ptr; fgets (line, 256, applet->file); -@@ -435,6 +624,7 @@ +@@ -276,6 +458,7 @@ wireless_applet_update_state (applet, device, link, level, noise); } } @@ -267,7 +260,7 @@ } while (1); if (g_list_length (applet->devices)==1) { -@@ -446,17 +636,23 @@ +@@ -287,17 +470,23 @@ } /* rewind the /proc/net/wireless file */ @@ -291,7 +284,7 @@ wireless_applet_read_device_state (applet); -@@ -522,6 +718,7 @@ +@@ -344,6 +533,7 @@ static void start_file_read (WirelessApplet *applet) { @@ -299,7 +292,7 @@ applet->file = fopen ("/proc/net/wireless", "rt"); if (applet->file == NULL) { gtk_tooltips_set_tip (applet->tips, -@@ -530,6 +727,7 @@ +@@ -352,6 +542,7 @@ NULL); show_error_dialog (_("There doesn't seem to be any wireless devices configured on your system.\nPlease verify your configuration if you think this is incorrect.")); } @@ -307,7 +300,7 @@ } static void -@@ -775,8 +973,10 @@ +@@ -577,8 +768,10 @@ applet->prefs = NULL; } @@ -317,4 +310,4 @@ +#endif } - static GtkWidget * + static void diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist index afbdd9de3754..73b9b72d75d2 100644 --- a/x11/gnome-applets/pkg-plist +++ b/x11/gnome-applets/pkg-plist @@ -1,4 +1,8 @@ bin/gkb_xmmap +bin/gnome-keyboard-layout +etc/gconf/gconf.xml.defaults/apps/stickynotes_applet/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/stickynotes_applet/defaults/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/stickynotes_applet/settings/%gconf.xml %%BATTERY%%etc/gconf/gconf.xml.defaults/schemas/apps/battstat-applet/%gconf.xml %%BATTERY%%etc/gconf/gconf.xml.defaults/schemas/apps/battstat-applet/prefs/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/cdplayer-applet/%gconf.xml @@ -15,12 +19,19 @@ etc/gconf/gconf.xml.defaults/schemas/apps/gtik/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gtik/prefs/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gweather/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gweather/prefs/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/prefs/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/mini-commander/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/mini-commander/prefs/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/mixer_applet/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/mixer_applet/prefs/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/modemlights/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/modemlights/prefs/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/multiload/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/multiload/prefs/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/stickynotes_applet/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/stickynotes_applet/defaults/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/stickynotes_applet/settings/%gconf.xml %%BATTERY%%etc/gconf/schemas/battstat.schemas etc/gconf/schemas/cdplayer.schemas etc/gconf/schemas/charpick.schemas @@ -29,11 +40,16 @@ etc/gconf/schemas/geyes.schemas etc/gconf/schemas/gkb.schemas etc/gconf/schemas/gtik.schemas etc/gconf/schemas/gweather.schemas +etc/gconf/schemas/mailcheck.schemas etc/gconf/schemas/mini-commander.schemas +etc/gconf/schemas/mixer.schemas etc/gconf/schemas/modemlights.schemas etc/gconf/schemas/multiload.schemas +etc/gconf/schemas/stickynotes.schemas %%BATTERY%%etc/sound/events/battstat_applet.soundlist -%%BATTERY%%libdata/bonobo/servers/GNOME_BattstatApplet.server +etc/sound/events/mailcheck.soundlist +libdata/bonobo/servers/GNOME_AccessxStatusApplet.server +libdata/bonobo/servers/GNOME_BattstatApplet.server libdata/bonobo/servers/GNOME_CDPlayerApplet.server libdata/bonobo/servers/GNOME_CharpickerApplet.server libdata/bonobo/servers/GNOME_DriveMountApplet.server @@ -41,11 +57,14 @@ libdata/bonobo/servers/GNOME_GWeatherApplet_Factory.server libdata/bonobo/servers/GNOME_GeyesApplet.server libdata/bonobo/servers/GNOME_GtikApplet.server libdata/bonobo/servers/GNOME_KeyboardApplet_Factory.server +libdata/bonobo/servers/GNOME_MailcheckApplet_Factory.server libdata/bonobo/servers/GNOME_MiniCommanderApplet.server libdata/bonobo/servers/GNOME_MixerApplet.server libdata/bonobo/servers/GNOME_ModemLightsApplet.server libdata/bonobo/servers/GNOME_MultiLoadApplet_Factory.server libdata/bonobo/servers/GNOME_Panel_WirelessApplet.server +libdata/bonobo/servers/GNOME_StickyNotesApplet.server +libexec/accessx-status-applet %%BATTERY%%libexec/battstat-applet-2 libexec/cdplayer_applet2 libexec/charpick_applet2 @@ -55,10 +74,12 @@ libexec/gkb-applet-2 libexec/gnome-applets/mc-install-default-macros libexec/gtik2_applet2 libexec/gweather-applet-2 +libexec/mailcheck-applet libexec/mini_commander_applet libexec/mixer_applet2 libexec/modemlights_applet2 libexec/multiload-applet-2 +libexec/stickynotes_applet libexec/wireless-applet %%BATTERY%%share/gnome/battstat_applet/battstat_applet.glade share/gnome/gen_util/mini-commander.glade @@ -93,7 +114,7 @@ share/gnome/gkb/Belgian.keyprop share/gnome/gkb/BulgarianCyril.keyprop share/gnome/gkb/CA_English.keyprop share/gnome/gkb/CH_German_x.keyprop -share/gnome/gkb/CS_Czech.keyprop +share/gnome/gkb/CZ_Czech.keyprop share/gnome/gkb/CZ_Czech_Slovak.keyprop share/gnome/gkb/CZ_Czech_x.keyprop share/gnome/gkb/DE_German.keyprop @@ -115,10 +136,6 @@ share/gnome/gkb/FR_French_x.keyprop share/gnome/gkb/FrenchCanadian.keyprop share/gnome/gkb/FrenchCanadian2.keyprop share/gnome/gkb/FrenchSwiss.keyprop -share/gnome/gkb/GB-102.keyprop -share/gnome/gkb/GB.keyprop -share/gnome/gkb/GB_English.keyprop -share/gnome/gkb/GB_English_x.keyprop share/gnome/gkb/GE_Georgian_x.keyprop share/gnome/gkb/GR_Greek.keyprop share/gnome/gkb/GR_Greek_x.keyprop @@ -171,11 +188,16 @@ share/gnome/gkb/RU_Russian_x.keyprop share/gnome/gkb/RU_Russian_x_rev.keyprop share/gnome/gkb/RussianCyril.keyprop share/gnome/gkb/SE_Swedish.keyprop +share/gnome/gkb/SE_Swedish_x.keyprop share/gnome/gkb/SI_Slovenian.keyprop +share/gnome/gkb/SI_Slovenian_x.keyprop share/gnome/gkb/SR_Dutch.keyprop share/gnome/gkb/Slovak.keyprop +share/gnome/gkb/Slovene.keyprop share/gnome/gkb/Slovenian.keyprop share/gnome/gkb/Swedish.keyprop +share/gnome/gkb/Syriac.keyprop +share/gnome/gkb/Syriac_Phonetic.keyprop share/gnome/gkb/TH_Thai.keyprop share/gnome/gkb/TH_Thai_x.keyprop share/gnome/gkb/TR-f.keyprop @@ -185,8 +207,12 @@ share/gnome/gkb/TR_Turkish_x.keyprop share/gnome/gkb/Thai.keyprop share/gnome/gkb/Thai2.keyprop share/gnome/gkb/UA_Ukrainian.keyprop +share/gnome/gkb/UK-102.keyprop share/gnome/gkb/UK-x86.keyprop share/gnome/gkb/UK.keyprop +share/gnome/gkb/UK_English.keyprop +share/gnome/gkb/UK_English_x.keyprop +share/gnome/gkb/UK_United_Kingdom.keyprop share/gnome/gkb/US-101.keyprop share/gnome/gkb/US-101A-x86.keyprop share/gnome/gkb/US-84.keyprop @@ -201,9 +227,11 @@ share/gnome/gkb/US_English.keyprop share/gnome/gkb/US_international.keyprop share/gnome/gkb/VN_Vietnamese.keyprop share/gnome/gkb/YU_Serb_x.keyprop +share/gnome/gkb/YU_Serbo-Croatian_x.keyprop share/gnome/gkb/Yugoslav.keyprop share/gnome/gkb/presets.xml -%%BATTERY%%share/gnome/gnome-2.0/ui/GNOME_BattstatApplet.xml +share/gnome/gnome-2.0/ui/GNOME_AccessxApplet.xml +share/gnome/gnome-2.0/ui/GNOME_BattstatApplet.xml share/gnome/gnome-2.0/ui/GNOME_CDPlayerApplet.xml share/gnome/gnome-2.0/ui/GNOME_CharpickerApplet.xml share/gnome/gnome-2.0/ui/GNOME_DriveMountApplet.xml @@ -211,18 +239,22 @@ share/gnome/gnome-2.0/ui/GNOME_GWeatherApplet.xml share/gnome/gnome-2.0/ui/GNOME_GeyesApplet.xml share/gnome/gnome-2.0/ui/GNOME_GtikApplet.xml share/gnome/gnome-2.0/ui/GNOME_KeyboardApplet.xml +share/gnome/gnome-2.0/ui/GNOME_MailCheckApplet.xml share/gnome/gnome-2.0/ui/GNOME_MiniCommanderApplet.xml share/gnome/gnome-2.0/ui/GNOME_MixerApplet.xml share/gnome/gnome-2.0/ui/GNOME_ModemlightsApplet.xml share/gnome/gnome-2.0/ui/GNOME_MultiloadApplet.xml +share/gnome/gnome-2.0/ui/GNOME_StickyNotesApplet.xml share/gnome/gnome-2.0/ui/GNOME_WirelessApplet.xml share/gnome/gweather/Locations +share/gnome/help/accessx-status/C/accessx-status.xml +share/gnome/help/accessx-status/C/figures/accessx-status-applet.png +share/gnome/help/accessx-status/C/legal.xml %%BATTERY%%share/gnome/help/battstat/C/battstat.xml %%BATTERY%%share/gnome/help/battstat/C/figures/battstat-apperance.png %%BATTERY%%share/gnome/help/battstat/C/figures/battstat-applet.png %%BATTERY%%share/gnome/help/battstat/C/figures/battstat-general.png %%BATTERY%%share/gnome/help/battstat/C/legal.xml -%%BATTERY%%share/gnome/help/battstat/C/topic.dat %%BATTERY%%share/gnome/help/battstat/ja/battstat.xml %%BATTERY%%share/gnome/help/battstat/ja/figures/battstat-apperance.png %%BATTERY%%share/gnome/help/battstat/ja/figures/battstat-applet.png @@ -232,12 +264,14 @@ share/gnome/help/cdplayer/C/cdplayer.xml share/gnome/help/cdplayer/C/figures/cdplayer_applet.png share/gnome/help/cdplayer/C/figures/cdplayer_applet_eject.png share/gnome/help/cdplayer/C/figures/cdplayer_applet_nexttrack.png +share/gnome/help/cdplayer/C/figures/cdplayer_applet_pause.png +share/gnome/help/cdplayer/C/figures/cdplayer_applet_play.png +share/gnome/help/cdplayer/C/figures/cdplayer_applet_playafterpause.png share/gnome/help/cdplayer/C/figures/cdplayer_applet_playing.png share/gnome/help/cdplayer/C/figures/cdplayer_applet_playpause.png share/gnome/help/cdplayer/C/figures/cdplayer_applet_prevtrack.png share/gnome/help/cdplayer/C/figures/cdplayer_applet_stop.png share/gnome/help/cdplayer/C/legal.xml -share/gnome/help/cdplayer/C/topic.dat share/gnome/help/cdplayer/de/cdplayer.xml share/gnome/help/cdplayer/de/figures/cdplayer_applet.png share/gnome/help/cdplayer/de/figures/cdplayer_applet_eject.png @@ -256,7 +290,6 @@ share/gnome/help/cdplayer/es/figures/cdplayer_applet_playpause.png share/gnome/help/cdplayer/es/figures/cdplayer_applet_prevtrack.png share/gnome/help/cdplayer/es/figures/cdplayer_applet_stop.png share/gnome/help/cdplayer/es/legal.xml -share/gnome/help/cdplayer/es/topic.dat share/gnome/help/cdplayer/fr/cdplayer.xml share/gnome/help/cdplayer/fr/figures/cdplayer_applet.png share/gnome/help/cdplayer/fr/figures/cdplayer_applet_eject.png @@ -279,12 +312,14 @@ share/gnome/help/cdplayer/ja/cdplayer.xml share/gnome/help/cdplayer/ja/figures/cdplayer_applet.png share/gnome/help/cdplayer/ja/figures/cdplayer_applet_eject.png share/gnome/help/cdplayer/ja/figures/cdplayer_applet_nexttrack.png +share/gnome/help/cdplayer/ja/figures/cdplayer_applet_pause.png +share/gnome/help/cdplayer/ja/figures/cdplayer_applet_play.png +share/gnome/help/cdplayer/ja/figures/cdplayer_applet_playafterpause.png share/gnome/help/cdplayer/ja/figures/cdplayer_applet_playing.png share/gnome/help/cdplayer/ja/figures/cdplayer_applet_playpause.png share/gnome/help/cdplayer/ja/figures/cdplayer_applet_prevtrack.png share/gnome/help/cdplayer/ja/figures/cdplayer_applet_stop.png share/gnome/help/cdplayer/ja/legal.xml -share/gnome/help/cdplayer/ja/topic.dat share/gnome/help/cdplayer/ko/cdplayer.xml share/gnome/help/cdplayer/ko/figures/cdplayer_applet.png share/gnome/help/cdplayer/ko/figures/cdplayer_applet_eject.png @@ -322,51 +357,69 @@ share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_prevtrack.png share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_stop.png share/gnome/help/cdplayer/zh_TW/legal.xml share/gnome/help/char-palette/C/char-palette.xml -share/gnome/help/char-palette/C/figures/charpick_applet.png +share/gnome/help/char-palette/C/figures/charpalette_applet.png +share/gnome/help/char-palette/C/figures/charpalette_chargroup.png share/gnome/help/char-palette/C/figures/charpick_characters.png -share/gnome/help/char-palette/C/figures/charpick_chargroup.png share/gnome/help/char-palette/C/legal.xml share/gnome/help/char-palette/de/char-palette.xml +share/gnome/help/char-palette/de/figures/charpalette_applet.png +share/gnome/help/char-palette/de/figures/charpalette_chargroup.png share/gnome/help/char-palette/de/figures/charpick_applet.png share/gnome/help/char-palette/de/figures/charpick_characters.png share/gnome/help/char-palette/de/figures/charpick_chargroup.png share/gnome/help/char-palette/de/legal.xml share/gnome/help/char-palette/es/char-palette.xml +share/gnome/help/char-palette/es/figures/charpalette_applet.png +share/gnome/help/char-palette/es/figures/charpalette_chargroup.png share/gnome/help/char-palette/es/figures/charpick_applet.png share/gnome/help/char-palette/es/figures/charpick_characters.png share/gnome/help/char-palette/es/figures/charpick_chargroup.png share/gnome/help/char-palette/es/legal.xml share/gnome/help/char-palette/fr/char-palette.xml +share/gnome/help/char-palette/fr/figures/charpalette_applet.png +share/gnome/help/char-palette/fr/figures/charpalette_chargroup.png share/gnome/help/char-palette/fr/figures/charpick_applet.png share/gnome/help/char-palette/fr/figures/charpick_characters.png share/gnome/help/char-palette/fr/figures/charpick_chargroup.png share/gnome/help/char-palette/fr/legal.xml share/gnome/help/char-palette/it/char-palette.xml +share/gnome/help/char-palette/it/figures/charpalette_applet.png +share/gnome/help/char-palette/it/figures/charpalette_chargroup.png share/gnome/help/char-palette/it/figures/charpick_applet.png share/gnome/help/char-palette/it/figures/charpick_characters.png share/gnome/help/char-palette/it/figures/charpick_chargroup.png share/gnome/help/char-palette/it/legal.xml share/gnome/help/char-palette/ja/char-palette.xml +share/gnome/help/char-palette/ja/figures/charpalette_applet.png +share/gnome/help/char-palette/ja/figures/charpalette_chargroup.png share/gnome/help/char-palette/ja/figures/charpick_applet.png share/gnome/help/char-palette/ja/figures/charpick_characters.png share/gnome/help/char-palette/ja/figures/charpick_chargroup.png share/gnome/help/char-palette/ja/legal.xml share/gnome/help/char-palette/ko/char-palette.xml +share/gnome/help/char-palette/ko/figures/charpalette_applet.png +share/gnome/help/char-palette/ko/figures/charpalette_chargroup.png share/gnome/help/char-palette/ko/figures/charpick_applet.png share/gnome/help/char-palette/ko/figures/charpick_characters.png share/gnome/help/char-palette/ko/figures/charpick_chargroup.png share/gnome/help/char-palette/ko/legal.xml share/gnome/help/char-palette/sv/char-palette.xml +share/gnome/help/char-palette/sv/figures/charpalette_applet.png +share/gnome/help/char-palette/sv/figures/charpalette_chargroup.png share/gnome/help/char-palette/sv/figures/charpick_applet.png share/gnome/help/char-palette/sv/figures/charpick_characters.png share/gnome/help/char-palette/sv/figures/charpick_chargroup.png share/gnome/help/char-palette/sv/legal.xml share/gnome/help/char-palette/zh_CN/char-palette.xml +share/gnome/help/char-palette/zh_CN/figures/charpalette_applet.png +share/gnome/help/char-palette/zh_CN/figures/charpalette_chargroup.png share/gnome/help/char-palette/zh_CN/figures/charpick_applet.png share/gnome/help/char-palette/zh_CN/figures/charpick_characters.png share/gnome/help/char-palette/zh_CN/figures/charpick_chargroup.png share/gnome/help/char-palette/zh_CN/legal.xml share/gnome/help/char-palette/zh_TW/char-palette.xml +share/gnome/help/char-palette/zh_TW/figures/charpalette_applet.png +share/gnome/help/char-palette/zh_TW/figures/charpalette_chargroup.png share/gnome/help/char-palette/zh_TW/figures/charpick_applet.png share/gnome/help/char-palette/zh_TW/figures/charpick_characters.png share/gnome/help/char-palette/zh_TW/figures/charpick_chargroup.png @@ -410,34 +463,40 @@ share/gnome/help/drivemount/C/legal.xml share/gnome/help/geyes/C/figures/geyes_applet.png share/gnome/help/geyes/C/geyes.xml share/gnome/help/geyes/C/legal.xml -share/gnome/help/geyes/C/topic.dat share/gnome/help/geyes/de/figures/geyes_applet.png +share/gnome/help/geyes/de/figures/geyes_settings.png share/gnome/help/geyes/de/geyes.xml share/gnome/help/geyes/de/legal.xml share/gnome/help/geyes/es/figures/geyes_applet.png +share/gnome/help/geyes/es/figures/geyes_settings.png share/gnome/help/geyes/es/geyes.xml share/gnome/help/geyes/es/legal.xml -share/gnome/help/geyes/es/topic.dat share/gnome/help/geyes/fr/figures/geyes_applet.png +share/gnome/help/geyes/fr/figures/geyes_settings.png share/gnome/help/geyes/fr/geyes.xml share/gnome/help/geyes/fr/legal.xml share/gnome/help/geyes/it/figures/geyes_applet.png +share/gnome/help/geyes/it/figures/geyes_settings.png share/gnome/help/geyes/it/geyes.xml share/gnome/help/geyes/it/legal.xml -share/gnome/help/geyes/it/topic.dat share/gnome/help/geyes/ja/figures/geyes_applet.png +share/gnome/help/geyes/ja/figures/geyes_settings.png share/gnome/help/geyes/ja/geyes.xml share/gnome/help/geyes/ja/legal.xml share/gnome/help/geyes/ko/figures/geyes_applet.png +share/gnome/help/geyes/ko/figures/geyes_settings.png share/gnome/help/geyes/ko/geyes.xml share/gnome/help/geyes/ko/legal.xml share/gnome/help/geyes/sv/figures/geyes_applet.png +share/gnome/help/geyes/sv/figures/geyes_settings.png share/gnome/help/geyes/sv/geyes.xml share/gnome/help/geyes/sv/legal.xml share/gnome/help/geyes/zh_CN/figures/geyes_applet.png +share/gnome/help/geyes/zh_CN/figures/geyes_settings.png share/gnome/help/geyes/zh_CN/geyes.xml share/gnome/help/geyes/zh_CN/legal.xml share/gnome/help/geyes/zh_TW/figures/geyes_applet.png +share/gnome/help/geyes/zh_TW/figures/geyes_settings.png share/gnome/help/geyes/zh_TW/geyes.xml share/gnome/help/geyes/zh_TW/legal.xml share/gnome/help/gkb/C/figures/gkb_applet.png @@ -501,80 +560,172 @@ share/gnome/help/gtik2_applet2/zh_TW/figures/gtik_applet.png share/gnome/help/gtik2_applet2/zh_TW/gtik2_applet2.xml share/gnome/help/gtik2_applet2/zh_TW/legal.xml share/gnome/help/gweather/C/figures/gweather_applet.png +share/gnome/help/gweather/C/figures/gweather_settings.png +share/gnome/help/gweather/C/figures/gweather_weather.png share/gnome/help/gweather/C/gweather.xml share/gnome/help/gweather/C/legal.xml -share/gnome/help/gweather/C/topic.dat share/gnome/help/gweather/de/figures/gweather_applet.png +share/gnome/help/gweather/de/figures/gweather_settings.png +share/gnome/help/gweather/de/figures/gweather_weather.png share/gnome/help/gweather/de/gweather.xml share/gnome/help/gweather/de/legal.xml share/gnome/help/gweather/es/figures/gweather_applet.png +share/gnome/help/gweather/es/figures/gweather_settings.png +share/gnome/help/gweather/es/figures/gweather_weather.png share/gnome/help/gweather/es/gweather.xml share/gnome/help/gweather/es/legal.xml share/gnome/help/gweather/fr/figures/gweather_applet.png +share/gnome/help/gweather/fr/figures/gweather_settings.png +share/gnome/help/gweather/fr/figures/gweather_weather.png share/gnome/help/gweather/fr/gweather.xml share/gnome/help/gweather/fr/legal.xml +share/gnome/help/gweather/it/figures/gweather_applet.png +share/gnome/help/gweather/it/figures/gweather_settings.png +share/gnome/help/gweather/it/figures/gweather_weather.png +share/gnome/help/gweather/it/gweather.xml +share/gnome/help/gweather/it/legal.xml share/gnome/help/gweather/ja/figures/gweather_applet.png +share/gnome/help/gweather/ja/figures/gweather_settings.png +share/gnome/help/gweather/ja/figures/gweather_weather.png share/gnome/help/gweather/ja/gweather.xml share/gnome/help/gweather/ja/legal.xml share/gnome/help/gweather/ko/figures/gweather_applet.png +share/gnome/help/gweather/ko/figures/gweather_settings.png +share/gnome/help/gweather/ko/figures/gweather_weather.png share/gnome/help/gweather/ko/gweather.xml share/gnome/help/gweather/ko/legal.xml share/gnome/help/gweather/sv/figures/gweather_applet.png +share/gnome/help/gweather/sv/figures/gweather_settings.png +share/gnome/help/gweather/sv/figures/gweather_weather.png share/gnome/help/gweather/sv/gweather.xml share/gnome/help/gweather/sv/legal.xml share/gnome/help/gweather/zh_CN/figures/gweather_applet.png +share/gnome/help/gweather/zh_CN/figures/gweather_settings.png +share/gnome/help/gweather/zh_CN/figures/gweather_weather.png share/gnome/help/gweather/zh_CN/gweather.xml share/gnome/help/gweather/zh_CN/legal.xml share/gnome/help/gweather/zh_TW/figures/gweather_applet.png +share/gnome/help/gweather/zh_TW/figures/gweather_settings.png +share/gnome/help/gweather/zh_TW/figures/gweather_weather.png share/gnome/help/gweather/zh_TW/gweather.xml share/gnome/help/gweather/zh_TW/legal.xml -share/gnome/help/gweather_applet/it/figures/gweather_applet.png -share/gnome/help/gweather_applet/it/figures/gweather_settings.png -share/gnome/help/gweather_applet/it/figures/gweather_weather.png -share/gnome/help/gweather_applet/it/gweather.sgml -share/gnome/help/gweather_applet/it/gweather_applet.sgml -share/gnome/help/gweather_applet/it/ln10.html -share/gnome/help/gweather_applet/it/t1.html -share/gnome/help/gweather_applet/it/topic.dat -share/gnome/help/mixer_applet/it/figures/mixer_applet.png -share/gnome/help/mixer_applet/it/ln10.html -share/gnome/help/mixer_applet/it/mixer.sgml -share/gnome/help/mixer_applet/it/mixer_applet.sgml -share/gnome/help/mixer_applet/it/t1.html -share/gnome/help/mixer_applet/it/topic.dat +share/gnome/help/mailcheck/C/figures/mailcheck_applet.png +share/gnome/help/mailcheck/C/legal.xml +share/gnome/help/mailcheck/C/mailcheck.xml +share/gnome/help/mailcheck/de/figures/mailcheck-applet.png +share/gnome/help/mailcheck/de/figures/mailcheck-properties-mailbox.png +share/gnome/help/mailcheck/de/figures/mailcheck-properties-mailcheck.png +share/gnome/help/mailcheck/de/figures/mailcheck_applet.png +share/gnome/help/mailcheck/de/legal.xml +share/gnome/help/mailcheck/de/mailcheck.xml +share/gnome/help/mailcheck/es/figures/mailcheck-applet.png +share/gnome/help/mailcheck/es/figures/mailcheck-properties-mailbox.png +share/gnome/help/mailcheck/es/figures/mailcheck-properties-mailcheck.png +share/gnome/help/mailcheck/es/figures/mailcheck_applet.png +share/gnome/help/mailcheck/es/legal.xml +share/gnome/help/mailcheck/es/mailcheck.xml +share/gnome/help/mailcheck/fr/figures/mailcheck-applet.png +share/gnome/help/mailcheck/fr/figures/mailcheck-properties-mailbox.png +share/gnome/help/mailcheck/fr/figures/mailcheck-properties-mailcheck.png +share/gnome/help/mailcheck/fr/figures/mailcheck_applet.png +share/gnome/help/mailcheck/fr/legal.xml +share/gnome/help/mailcheck/fr/mailcheck.xml +share/gnome/help/mailcheck/it/figures/mailcheck-applet.png +share/gnome/help/mailcheck/it/figures/mailcheck-properties-mailbox.png +share/gnome/help/mailcheck/it/figures/mailcheck-properties-mailcheck.png +share/gnome/help/mailcheck/it/figures/mailcheck_applet.png +share/gnome/help/mailcheck/it/legal.xml +share/gnome/help/mailcheck/it/mailcheck.xml +share/gnome/help/mailcheck/ja/figures/mailcheck_applet.png +share/gnome/help/mailcheck/ja/legal.xml +share/gnome/help/mailcheck/ja/mailcheck.xml +share/gnome/help/mailcheck/ko/figures/mailcheck-applet.png +share/gnome/help/mailcheck/ko/figures/mailcheck-properties-mailbox.png +share/gnome/help/mailcheck/ko/figures/mailcheck-properties-mailcheck.png +share/gnome/help/mailcheck/ko/figures/mailcheck_applet.png +share/gnome/help/mailcheck/ko/legal.xml +share/gnome/help/mailcheck/ko/mailcheck.xml +share/gnome/help/mailcheck/sv/figures/mailcheck-applet.png +share/gnome/help/mailcheck/sv/figures/mailcheck-properties-mailbox.png +share/gnome/help/mailcheck/sv/figures/mailcheck-properties-mailcheck.png +share/gnome/help/mailcheck/sv/figures/mailcheck_applet.png +share/gnome/help/mailcheck/sv/legal.xml +share/gnome/help/mailcheck/sv/mailcheck.xml +share/gnome/help/mailcheck/zh_CN/figures/mailcheck-applet.png +share/gnome/help/mailcheck/zh_CN/figures/mailcheck-properties-mailbox.png +share/gnome/help/mailcheck/zh_CN/figures/mailcheck-properties-mailcheck.png +share/gnome/help/mailcheck/zh_CN/figures/mailcheck_applet.png +share/gnome/help/mailcheck/zh_CN/legal.xml +share/gnome/help/mailcheck/zh_CN/mailcheck.xml +share/gnome/help/mailcheck/zh_TW/figures/mailcheck-applet.png +share/gnome/help/mailcheck/zh_TW/figures/mailcheck-properties-mailbox.png +share/gnome/help/mailcheck/zh_TW/figures/mailcheck-properties-mailcheck.png +share/gnome/help/mailcheck/zh_TW/figures/mailcheck_applet.png +share/gnome/help/mailcheck/zh_TW/legal.xml +share/gnome/help/mailcheck/zh_TW/mailcheck.xml share/gnome/help/mixer_applet2/C/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/C/legal.xml share/gnome/help/mixer_applet2/C/mixer_applet2.xml -share/gnome/help/mixer_applet2/C/topic.dat +share/gnome/help/mixer_applet2/de/figures/mixer_applet.png share/gnome/help/mixer_applet2/de/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/de/legal.xml share/gnome/help/mixer_applet2/de/mixer_applet2.xml +share/gnome/help/mixer_applet2/es/figures/mixer_applet.png share/gnome/help/mixer_applet2/es/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/es/legal.xml share/gnome/help/mixer_applet2/es/mixer_applet2.xml -share/gnome/help/mixer_applet2/es/topic.dat +share/gnome/help/mixer_applet2/fr/figures/mixer_applet.png share/gnome/help/mixer_applet2/fr/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/fr/legal.xml share/gnome/help/mixer_applet2/fr/mixer_applet2.xml +share/gnome/help/mixer_applet2/ja/figures/mixer_applet.png share/gnome/help/mixer_applet2/ja/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/ja/legal.xml share/gnome/help/mixer_applet2/ja/mixer_applet2.xml +share/gnome/help/mixer_applet2/ko/figures/mixer_applet.png share/gnome/help/mixer_applet2/ko/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/ko/legal.xml share/gnome/help/mixer_applet2/ko/mixer_applet2.xml +share/gnome/help/mixer_applet2/sv/figures/mixer_applet.png share/gnome/help/mixer_applet2/sv/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/sv/legal.xml share/gnome/help/mixer_applet2/sv/mixer_applet2.xml +share/gnome/help/mixer_applet2/zh_CN/figures/mixer_applet.png share/gnome/help/mixer_applet2/zh_CN/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/zh_CN/legal.xml share/gnome/help/mixer_applet2/zh_CN/mixer_applet2.xml +share/gnome/help/mixer_applet2/zh_TW/figures/mixer_applet.png share/gnome/help/mixer_applet2/zh_TW/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/zh_TW/legal.xml share/gnome/help/mixer_applet2/zh_TW/mixer_applet2.xml +share/gnome/help/modemlights/C/figures/modemlights-advanced.png +share/gnome/help/modemlights/C/figures/modemlights-advpref.png +share/gnome/help/modemlights/C/figures/modemlights-color.png +share/gnome/help/modemlights/C/figures/modemlights-general.png +share/gnome/help/modemlights/C/figures/modemlights-prefs.png +share/gnome/help/modemlights/C/figures/modemlights.png +share/gnome/help/modemlights/C/figures/modemlights_applet.png +share/gnome/help/modemlights/C/figures/modemlights_applet_advanced.png +share/gnome/help/modemlights/C/figures/modemlights_applet_awaiting.png +share/gnome/help/modemlights/C/figures/modemlights_applet_button.png +share/gnome/help/modemlights/C/figures/modemlights_applet_button_2.png +share/gnome/help/modemlights/C/figures/modemlights_applet_colors.png +share/gnome/help/modemlights/C/figures/modemlights_applet_connected.png +share/gnome/help/modemlights/C/figures/modemlights_applet_general.png +share/gnome/help/modemlights/C/figures/modemlights_applet_if_connect.png +share/gnome/help/modemlights/C/figures/modemlights_applet_not_connected.png +share/gnome/help/modemlights/C/figures/modemlights_applet_prefs_connecting.png +share/gnome/help/modemlights/C/figures/modemlights_applet_prefs_display.png +share/gnome/help/modemlights/C/legal.xml +share/gnome/help/modemlights/C/modemlights.xml +share/gnome/help/stickynotes_applet/C/legal.xml +share/gnome/help/stickynotes_applet/C/stickynotes_applet.xml +share/gnome/omf/gnome-applets/accessx-status-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/accessx-status-C.omf 2>/dev/null || /usr/bin/true %%BATTERY%%share/gnome/omf/gnome-applets/battstat-C.omf -@exec scrollkeeper-install -q %D/%%BATTERY%%share/gnome/omf/gnome-applets/battstat-C.omf 2>/dev/null || /usr/bin/true +%%BATTERY%%@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/battstat-C.omf 2>/dev/null || /usr/bin/true %%BATTERY%%share/gnome/omf/gnome-applets/battstat-ja.omf -@exec scrollkeeper-install -q %D/%%BATTERY%%share/gnome/omf/gnome-applets/battstat-ja.omf 2>/dev/null || /usr/bin/true +%%BATTERY%%@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/battstat-ja.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/cdplayer-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/cdplayer-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/cdplayer-de.omf @@ -717,8 +868,26 @@ share/gnome/omf/gnome-applets/gweather-zh_TW.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gweather-zh_TW.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/gweather_applet-it.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gweather_applet-it.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-applets/mixer_applet-it.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mixer_applet-it.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/mailcheck-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mailcheck-C.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/mailcheck-de.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mailcheck-de.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/mailcheck-es.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mailcheck-es.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/mailcheck-fr.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mailcheck-fr.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/mailcheck-it.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mailcheck-it.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/mailcheck-ja.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mailcheck-ja.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/mailcheck-ko.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mailcheck-ko.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/mailcheck-sv.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mailcheck-sv.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/mailcheck-zh_CN.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mailcheck-zh_CN.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/mailcheck-zh_TW.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mailcheck-zh_TW.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/mixer_applet2-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mixer_applet2-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/mixer_applet2-de.omf @@ -737,6 +906,46 @@ share/gnome/omf/gnome-applets/mixer_applet2-zh_CN.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mixer_applet2-zh_CN.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/mixer_applet2-zh_TW.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mixer_applet2-zh_TW.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/modemlights-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/modemlights-C.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/stickynotes_applet-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-C.omf 2>/dev/null || /usr/bin/true +share/gnome/pixmaps/accessx-status-applet/ax-applet.png +share/gnome/pixmaps/accessx-status-applet/ax-bouncekeys.png +share/gnome/pixmaps/accessx-status-applet/ax-key-base.png +share/gnome/pixmaps/accessx-status-applet/ax-key-inverse.png +share/gnome/pixmaps/accessx-status-applet/ax-key-no.png +share/gnome/pixmaps/accessx-status-applet/ax-key-none.png +share/gnome/pixmaps/accessx-status-applet/ax-key-yes.png +share/gnome/pixmaps/accessx-status-applet/ax-slowkeys-no.png +share/gnome/pixmaps/accessx-status-applet/ax-slowkeys-pending.png +share/gnome/pixmaps/accessx-status-applet/ax-slowkeys-yes.png +share/gnome/pixmaps/accessx-status-applet/ax-slowkeys.png +share/gnome/pixmaps/accessx-status-applet/mousekeys-base.png +share/gnome/pixmaps/accessx-status-applet/mousekeys-default-left.png +share/gnome/pixmaps/accessx-status-applet/mousekeys-default-middle.png +share/gnome/pixmaps/accessx-status-applet/mousekeys-default-right.png +share/gnome/pixmaps/accessx-status-applet/mousekeys-pressed-left.png +share/gnome/pixmaps/accessx-status-applet/mousekeys-pressed-middle.png +share/gnome/pixmaps/accessx-status-applet/mousekeys-pressed-right.png +share/gnome/pixmaps/accessx-status-applet/sticky-alt-latched.png +share/gnome/pixmaps/accessx-status-applet/sticky-alt-locked.png +share/gnome/pixmaps/accessx-status-applet/sticky-alt-none.png +share/gnome/pixmaps/accessx-status-applet/sticky-ctrl-latched.png +share/gnome/pixmaps/accessx-status-applet/sticky-ctrl-locked.png +share/gnome/pixmaps/accessx-status-applet/sticky-ctrl-none.png +share/gnome/pixmaps/accessx-status-applet/sticky-hyper-latched.png +share/gnome/pixmaps/accessx-status-applet/sticky-hyper-locked.png +share/gnome/pixmaps/accessx-status-applet/sticky-hyper-none.png +share/gnome/pixmaps/accessx-status-applet/sticky-meta-latched.png +share/gnome/pixmaps/accessx-status-applet/sticky-meta-locked.png +share/gnome/pixmaps/accessx-status-applet/sticky-meta-none.png +share/gnome/pixmaps/accessx-status-applet/sticky-shift-latched.png +share/gnome/pixmaps/accessx-status-applet/sticky-shift-locked.png +share/gnome/pixmaps/accessx-status-applet/sticky-shift-none.png +share/gnome/pixmaps/accessx-status-applet/sticky-super-latched.png +share/gnome/pixmaps/accessx-status-applet/sticky-super-locked.png +share/gnome/pixmaps/accessx-status-applet/sticky-super-none.png %%BATTERY%%share/gnome/pixmaps/battstat.png share/gnome/pixmaps/charpick.png share/gnome/pixmaps/drivemount-applet.png @@ -754,7 +963,6 @@ share/gnome/pixmaps/gkb/br.png share/gnome/pixmaps/gkb/by.png share/gnome/pixmaps/gkb/ca.png share/gnome/pixmaps/gkb/ch.png -share/gnome/pixmaps/gkb/cs.png share/gnome/pixmaps/gkb/cu.png share/gnome/pixmaps/gkb/cz.png share/gnome/pixmaps/gkb/de.png @@ -767,7 +975,6 @@ share/gnome/pixmaps/gkb/es.png share/gnome/pixmaps/gkb/eu.png share/gnome/pixmaps/gkb/fi.png share/gnome/pixmaps/gkb/fr.png -share/gnome/pixmaps/gkb/gb.png share/gnome/pixmaps/gkb/ge.png share/gnome/pixmaps/gkb/gkb.png share/gnome/pixmaps/gkb/gr.png @@ -802,13 +1009,12 @@ share/gnome/pixmaps/gkb/qc.png share/gnome/pixmaps/gkb/ro.png share/gnome/pixmaps/gkb/ru.png share/gnome/pixmaps/gkb/sa.png +share/gnome/pixmaps/gkb/sd.png share/gnome/pixmaps/gkb/se.png share/gnome/pixmaps/gkb/si.png share/gnome/pixmaps/gkb/sk.png share/gnome/pixmaps/gkb/so.png share/gnome/pixmaps/gkb/sr.png -share/gnome/pixmaps/gkb/su.png -share/gnome/pixmaps/gkb/sv.png share/gnome/pixmaps/gkb/sy.png share/gnome/pixmaps/gkb/th.png share/gnome/pixmaps/gkb/tn.png @@ -826,6 +1032,12 @@ share/gnome/pixmaps/gnome-cpu.png share/gnome/pixmaps/gnome-eyes.png share/gnome/pixmaps/gnome-mini-commander.png share/gnome/pixmaps/gweather/tstorm.xpm +share/gnome/pixmaps/mailcheck/eclouds.png +share/gnome/pixmaps/mailcheck/email-e.png +share/gnome/pixmaps/mailcheck/email-eclouds.png +share/gnome/pixmaps/mailcheck/email-tiny.png +share/gnome/pixmaps/mailcheck/email.png +share/gnome/pixmaps/mailcheck/tux-anim.png share/gnome/pixmaps/mini-commander/browser-mini.xpm share/gnome/pixmaps/mini-commander/history-mini.xpm share/gnome/pixmaps/mixer/gnome-mixer-applet.png @@ -834,6 +1046,13 @@ share/gnome/pixmaps/mixer/volume-medium.png share/gnome/pixmaps/mixer/volume-min.png share/gnome/pixmaps/mixer/volume-mute.png share/gnome/pixmaps/mixer/volume-zero.png +share/gnome/pixmaps/stickynotes/close.png +share/gnome/pixmaps/stickynotes/locked.png +share/gnome/pixmaps/stickynotes/resize_se.png +share/gnome/pixmaps/stickynotes/resize_sw.png +share/gnome/pixmaps/stickynotes/stickynotes.png +share/gnome/pixmaps/stickynotes/stickynotes_prelight.png +share/gnome/pixmaps/stickynotes/unlocked.png share/gnome/pixmaps/wireless-applet/broken-0.png share/gnome/pixmaps/wireless-applet/no-link-0.png share/gnome/pixmaps/wireless-applet/signal-1-40.png @@ -841,6 +1060,7 @@ share/gnome/pixmaps/wireless-applet/signal-41-60.png share/gnome/pixmaps/wireless-applet/signal-61-80.png share/gnome/pixmaps/wireless-applet/signal-81-100.png share/gnome/pixmaps/wireless-applet/wireless-applet.png +share/gnome/stickynotes/stickynotes.glade share/gnome/wireless-applet/wireless-applet.glade share/gnome/xmodmap/xmodmap.am share/gnome/xmodmap/xmodmap.ar @@ -889,9 +1109,9 @@ share/gnome/xmodmap/xmodmap.lt_b share/gnome/xmodmap/xmodmap.lt_p share/gnome/xmodmap/xmodmap.mk share/gnome/xmodmap/xmodmap.mn +share/gnome/xmodmap/xmodmap.mn-phonet share/gnome/xmodmap/xmodmap.mn-rev share/gnome/xmodmap/xmodmap.mn-uni -share/gnome/xmodmap/xmodmap.mn-yawerty share/gnome/xmodmap/xmodmap.nl share/gnome/xmodmap/xmodmap.no share/gnome/xmodmap/xmodmap.pl @@ -932,8 +1152,10 @@ share/locale/ar/LC_MESSAGES/gnome-applets-2.0.mo share/locale/az/LC_MESSAGES/gnome-applets-2.0.mo share/locale/be/LC_MESSAGES/gnome-applets-2.0.mo share/locale/bg/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/bn/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ca/LC_MESSAGES/gnome-applets-2.0.mo share/locale/cs/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/cy/LC_MESSAGES/gnome-applets-2.0.mo share/locale/da/LC_MESSAGES/gnome-applets-2.0.mo share/locale/de/LC_MESSAGES/gnome-applets-2.0.mo share/locale/el/LC_MESSAGES/gnome-applets-2.0.mo @@ -949,6 +1171,7 @@ share/locale/gl/LC_MESSAGES/gnome-applets-2.0.mo share/locale/he/LC_MESSAGES/gnome-applets-2.0.mo share/locale/hi/LC_MESSAGES/gnome-applets-2.0.mo share/locale/hu/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/is/LC_MESSAGES/gnome-applets-2.0.mo share/locale/it/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ja/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ko/LC_MESSAGES/gnome-applets-2.0.mo @@ -979,8 +1202,16 @@ share/locale/wa/LC_MESSAGES/gnome-applets-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-applets-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/wireless-applet +@dirrm share/gnome/stickynotes @dirrm share/gnome/pixmaps/wireless-applet +@dirrm share/gnome/pixmaps/stickynotes @dirrm share/gnome/pixmaps/mixer +@dirrm share/gnome/pixmaps/accessx-status-applet +@dirrm share/gnome/help/stickynotes_applet/C +@dirrm share/gnome/help/stickynotes_applet +@dirrm share/gnome/help/modemlights/C/figures +@dirrm share/gnome/help/modemlights/C +@dirrm share/gnome/help/modemlights @dirrm share/gnome/help/mixer_applet2/zh_TW/figures @dirrm share/gnome/help/mixer_applet2/zh_TW @dirrm share/gnome/help/mixer_applet2/zh_CN/figures @@ -1000,14 +1231,27 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/mixer_applet2/C/figures @dirrm share/gnome/help/mixer_applet2/C @dirrm share/gnome/help/mixer_applet2 -@dirrm share/gnome/help/mixer_applet/it/stylesheet-images -@dirrm share/gnome/help/mixer_applet/it/figures -@dirrm share/gnome/help/mixer_applet/it -@dirrm share/gnome/help/mixer_applet -@dirrm share/gnome/help/gweather_applet/it/stylesheet-images -@dirrm share/gnome/help/gweather_applet/it/figures -@dirrm share/gnome/help/gweather_applet/it -@dirrm share/gnome/help/gweather_applet +@dirrm share/gnome/help/mailcheck/zh_TW/figures +@dirrm share/gnome/help/mailcheck/zh_TW +@dirrm share/gnome/help/mailcheck/zh_CN/figures +@dirrm share/gnome/help/mailcheck/zh_CN +@dirrm share/gnome/help/mailcheck/sv/figures +@dirrm share/gnome/help/mailcheck/sv +@dirrm share/gnome/help/mailcheck/ko/figures +@dirrm share/gnome/help/mailcheck/ko +@dirrm share/gnome/help/mailcheck/ja/figures +@dirrm share/gnome/help/mailcheck/ja +@dirrm share/gnome/help/mailcheck/it/figures +@dirrm share/gnome/help/mailcheck/it +@dirrm share/gnome/help/mailcheck/fr/figures +@dirrm share/gnome/help/mailcheck/fr +@dirrm share/gnome/help/mailcheck/es/figures +@dirrm share/gnome/help/mailcheck/es +@dirrm share/gnome/help/mailcheck/de/figures +@dirrm share/gnome/help/mailcheck/de +@dirrm share/gnome/help/mailcheck/C/figures +@dirrm share/gnome/help/mailcheck/C +@dirrm share/gnome/help/mailcheck @dirrm share/gnome/help/gweather/zh_TW/figures @dirrm share/gnome/help/gweather/zh_TW @dirrm share/gnome/help/gweather/zh_CN/figures @@ -1018,6 +1262,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/gweather/ko @dirrm share/gnome/help/gweather/ja/figures @dirrm share/gnome/help/gweather/ja +@dirrm share/gnome/help/gweather/it/figures +@dirrm share/gnome/help/gweather/it @dirrm share/gnome/help/gweather/fr/figures @dirrm share/gnome/help/gweather/fr @dirrm share/gnome/help/gweather/es/figures @@ -1161,14 +1407,24 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo %%BATTERY%%@dirrm share/gnome/help/battstat/C/figures %%BATTERY%%@dirrm share/gnome/help/battstat/C %%BATTERY%%@dirrm share/gnome/help/battstat +@dirrm share/gnome/help/accessx-status/C/figures +@dirrm share/gnome/help/accessx-status/C +@dirrm share/gnome/help/accessx-status %%BATTERY%%@dirrm share/gnome/battstat_applet @dirrm libexec/gnome-applets +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/stickynotes_applet/settings +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/stickynotes_applet/defaults +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/stickynotes_applet @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/multiload/prefs @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/multiload @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/modemlights/prefs @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/modemlights +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mixer_applet/prefs +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mixer_applet @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mini-commander/prefs @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mini-commander +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/prefs +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gweather/prefs @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gweather @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gtik/prefs @@ -1185,8 +1441,12 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/cdplayer-applet %%BATTERY%%@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/battstat-applet/prefs %%BATTERY%%@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/battstat-applet -@unexec scrollkeeper-uninstall -q %D/%%BATTERY%%share/gnome/omf/gnome-applets/battstat-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/%%BATTERY%%share/gnome/omf/gnome-applets/battstat-ja.omf 2>/dev/null || /usr/bin/true +@dirrm etc/gconf/gconf.xml.defaults/apps/stickynotes_applet/settings +@dirrm etc/gconf/gconf.xml.defaults/apps/stickynotes_applet/defaults +@dirrm etc/gconf/gconf.xml.defaults/apps/stickynotes_applet +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/accessx-status-C.omf 2>/dev/null || /usr/bin/true +%%BATTERY%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/battstat-C.omf 2>/dev/null || /usr/bin/true +%%BATTERY%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/battstat-ja.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/cdplayer-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/cdplayer-de.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/cdplayer-es.omf 2>/dev/null || /usr/bin/true @@ -1258,7 +1518,16 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gweather-zh_CN.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gweather-zh_TW.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gweather_applet-it.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet-it.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-de.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-es.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-fr.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-it.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-ja.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-ko.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-sv.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-zh_CN.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-zh_TW.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-de.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-es.omf 2>/dev/null || /usr/bin/true @@ -1268,3 +1537,5 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-sv.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-zh_CN.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-zh_TW.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/modemlights-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-C.omf 2>/dev/null || /usr/bin/true diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile index 8ae160c83395..e25f33c070e9 100644 --- a/x11/gnome-desktop/Makefile +++ b/x11/gnome-desktop/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gnomedesktop -PORTVERSION= 2.2.2 +PORTVERSION= 2.4.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-desktop/2.2 +MASTER_SITE_SUBDIR= sources/gnome-desktop/2.4 DISTNAME= gnome-desktop-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -26,12 +26,10 @@ USE_GMAKE= yes USE_BISON= yes INSTALLS_SHLIB= yes USE_LIBTOOL= yes +CONFIGURE_ARGS= --with-gnome-distributor="FreeBSD GNOME Project" CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" MAN1= gnome-about.1 -post-patch: - @${REINPLACE_CMD} -E -e 's|GNOME_VENDOR=.*$$|GNOME_VENDOR="FreeBSD GNOME Project"|' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo index 1ef3d1c22b0e..9c50bf9f39fb 100644 --- a/x11/gnome-desktop/distinfo +++ b/x11/gnome-desktop/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-desktop-2.2.2.tar.bz2) = 335e6109abc5a04e69ab574464af1900 +MD5 (gnome2/gnome-desktop-2.4.0.tar.bz2) = 183c14d192bdd41bd34578e8e7dc55f1 diff --git a/x11/gnome-desktop/files/patch-configure b/x11/gnome-desktop/files/patch-configure index 943558a25604..caf5b493a9eb 100644 --- a/x11/gnome-desktop/files/patch-configure +++ b/x11/gnome-desktop/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Mon Mar 10 16:54:58 2003 -+++ configure Sun Apr 6 16:11:00 2003 -@@ -7987,6 +7987,7 @@ +--- configure.orig Sun May 4 06:56:20 2003 ++++ configure Sun May 4 19:20:27 2003 +@@ -8374,6 +8374,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist index 2cd64cb14824..ac57d75634de 100644 --- a/x11/gnome-desktop/pkg-plist +++ b/x11/gnome-desktop/pkg-plist @@ -6,61 +6,46 @@ lib/libgnome-desktop-2.a lib/libgnome-desktop-2.so lib/libgnome-desktop-2.so.3 libdata/pkgconfig/gnome-desktop-2.0.pc -share/gnome/gnome-about/contributors.dat +share/gnome/gnome-about/gnome-64.gif share/gnome/gnome-about/gnome-version.xml +share/gnome/gnome-about/headers/header-bg-ancient01a.png +share/gnome/gnome-about/headers/header-bg-city01.png +share/gnome/gnome-about/headers/header-bg-clouds01.png +share/gnome/gnome-about/headers/header-bg-clouds02.png +share/gnome/gnome-about/headers/header-bg-hills01.png +share/gnome/gnome-about/headers/header-bg-landscape01.png +share/gnome/gnome-about/headers/header-bg-mountains01.png +share/gnome/gnome-about/headers/header-bg-snow01.png +share/gnome/gnome-about/headers/header-bg-sunset01.png share/gnome/help/fdl/C/fdl.xml share/gnome/help/gnome-feedback/C/gnome-feedback.xml share/gnome/help/gpl/C/gpl.xml share/gnome/help/lgpl/C/lgpl.xml -share/gnome/vfolders/Accessories.directory -share/gnome/vfolders/Applications.directory -share/gnome/vfolders/Development.directory -share/gnome/vfolders/Games.directory -share/gnome/vfolders/Graphics.directory -share/gnome/vfolders/Internet.directory -share/gnome/vfolders/Multimedia.directory -share/gnome/vfolders/Office.directory -share/gnome/vfolders/Root.directory -share/gnome/vfolders/Settings.directory -share/gnome/vfolders/System.directory share/gnome/pixmaps/advanced-directory.png share/gnome/pixmaps/apple-green.png share/gnome/pixmaps/apple-red.png -share/gnome/pixmaps/cdeappmenu.png -share/gnome/pixmaps/gnome-amusements.png share/gnome/pixmaps/gnome-aorta.png share/gnome/pixmaps/gnome-applets.png share/gnome/pixmaps/gnome-applications.png -share/gnome/pixmaps/gnome-audio2.png +share/gnome/pixmaps/gnome-background-image.png +share/gnome/pixmaps/gnome-background-pattern.png share/gnome/pixmaps/gnome-background.png share/gnome/pixmaps/gnome-calc2.png share/gnome/pixmaps/gnome-calc3.png share/gnome/pixmaps/gnome-calendar.png -share/gnome/pixmaps/gnome-cardgame.png share/gnome/pixmaps/gnome-ccbackground.png share/gnome/pixmaps/gnome-ccdesktop.png share/gnome/pixmaps/gnome-ccdialog.png -share/gnome/pixmaps/gnome-cckeyboard-bell.png -share/gnome/pixmaps/gnome-cckeyboard.png share/gnome/pixmaps/gnome-ccmime.png share/gnome/pixmaps/gnome-ccperiph.png share/gnome/pixmaps/gnome-ccscreensaver.png -share/gnome/pixmaps/gnome-ccthemes.png share/gnome/pixmaps/gnome-ccwindowmanager.png -share/gnome/pixmaps/gnome-clock.png share/gnome/pixmaps/gnome-color-browser.png share/gnome/pixmaps/gnome-color-xterm.png share/gnome/pixmaps/gnome-computer.png share/gnome/pixmaps/gnome-cromagnon.png share/gnome/pixmaps/gnome-day.png share/gnome/pixmaps/gnome-debian.png -share/gnome/pixmaps/gnome-devel.png -share/gnome/pixmaps/gnome-die1.png -share/gnome/pixmaps/gnome-die2.png -share/gnome/pixmaps/gnome-die3.png -share/gnome/pixmaps/gnome-die4.png -share/gnome/pixmaps/gnome-die5.png -share/gnome/pixmaps/gnome-die6.png share/gnome/pixmaps/gnome-diskfree.png share/gnome/pixmaps/gnome-emacs.png share/gnome/pixmaps/gnome-eterm.png @@ -68,27 +53,17 @@ share/gnome/pixmaps/gnome-favorites.png share/gnome/pixmaps/gnome-file-c.png share/gnome/pixmaps/gnome-file-h.png share/gnome/pixmaps/gnome-folder.png -share/gnome/pixmaps/gnome-gegl.png -share/gnome/pixmaps/gnome-gegl2-2.png -share/gnome/pixmaps/gnome-gegl2.png share/gnome/pixmaps/gnome-gemvt.png share/gnome/pixmaps/gnome-gimp.png -share/gnome/pixmaps/gnome-globe.png share/gnome/pixmaps/gnome-gmenu.png share/gnome/pixmaps/gnome-gmush.png -share/gnome/pixmaps/gnome-gnomine.png share/gnome/pixmaps/gnome-gnomoku.png -share/gnome/pixmaps/gnome-graphics.png -share/gnome/pixmaps/gnome-gsame.png -share/gnome/pixmaps/gnome-help.png share/gnome/pixmaps/gnome-home.png share/gnome/pixmaps/gnome-html.png share/gnome/pixmaps/gnome-image-gif.png share/gnome/pixmaps/gnome-image-jpeg.png share/gnome/pixmaps/gnome-irc.png -share/gnome/pixmaps/gnome-joystick.png share/gnome/pixmaps/gnome-laptop.png -share/gnome/pixmaps/gnome-lockscreen.png share/gnome/pixmaps/gnome-log.png share/gnome/pixmaps/gnome-logo-icon-transparent.png share/gnome/pixmaps/gnome-logo-icon.png @@ -101,26 +76,15 @@ share/gnome/pixmaps/gnome-money.png share/gnome/pixmaps/gnome-monitor.png share/gnome/pixmaps/gnome-month.png share/gnome/pixmaps/gnome-mouse.png -share/gnome/pixmaps/gnome-multimedia.png share/gnome/pixmaps/gnome-networktool.png share/gnome/pixmaps/gnome-news.png share/gnome/pixmaps/gnome-note.png -share/gnome/pixmaps/gnome-panel-type-corner.png -share/gnome/pixmaps/gnome-panel-type-edge.png -share/gnome/pixmaps/gnome-panel-type-floating.png -share/gnome/pixmaps/gnome-panel-type-menu.png -share/gnome/pixmaps/gnome-panel-type-sliding.png -share/gnome/pixmaps/gnome-panel.png share/gnome/pixmaps/gnome-qeye.png -share/gnome/pixmaps/gnome-run.png -share/gnome/pixmaps/gnome-screenshot.png share/gnome/pixmaps/gnome-session.png share/gnome/pixmaps/gnome-set-time.png -share/gnome/pixmaps/gnome-settings.png share/gnome/pixmaps/gnome-spider.png share/gnome/pixmaps/gnome-squeak.png share/gnome/pixmaps/gnome-suse.png -share/gnome/pixmaps/gnome-system.png share/gnome/pixmaps/gnome-talk.png share/gnome/pixmaps/gnome-term-linux.png share/gnome/pixmaps/gnome-term-linux2.png @@ -129,7 +93,6 @@ share/gnome/pixmaps/gnome-term-tiger.png share/gnome/pixmaps/gnome-term.png share/gnome/pixmaps/gnome-tigert.png share/gnome/pixmaps/gnome-touristinfo.png -share/gnome/pixmaps/gnome-unknown.png share/gnome/pixmaps/gnome-user-interface.png share/gnome/pixmaps/gnome-util.png share/gnome/pixmaps/gnome-week.png @@ -141,17 +104,19 @@ share/gnome/pixmaps/gtkvim.png share/gnome/pixmaps/kterm.xpm share/gnome/pixmaps/launcher-program.png share/gnome/pixmaps/monitor.png -share/gnome/pixmaps/panel-arrow-down.png -share/gnome/pixmaps/panel-arrow-left.png -share/gnome/pixmaps/panel-arrow-right.png -share/gnome/pixmaps/panel-arrow-up.png -share/gnome/pixmaps/panel-corner-left.png -share/gnome/pixmaps/panel-corner-right.png -share/gnome/pixmaps/panel-drawer.png -share/gnome/pixmaps/panel-folder.png -share/gnome/pixmaps/panel-knob.png -share/gnome/pixmaps/panel-menu-main.png share/gnome/pixmaps/vnterm.xpm +share/gnome/vfolders/Accessories.directory +share/gnome/vfolders/Applications.directory +share/gnome/vfolders/Development.directory +share/gnome/vfolders/Games.directory +share/gnome/vfolders/Graphics.directory +share/gnome/vfolders/Internet.directory +share/gnome/vfolders/Multimedia.directory +share/gnome/vfolders/Office.directory +share/gnome/vfolders/Other.directory +share/gnome/vfolders/Root.directory +share/gnome/vfolders/Settings.directory +share/gnome/vfolders/System.directory share/locale/am/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ar/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/az/LC_MESSAGES/gnome-desktop-2.0.mo @@ -161,6 +126,7 @@ share/locale/bn/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/bs/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ca/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/cs/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/cy/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/da/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/de/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/el/LC_MESSAGES/gnome-desktop-2.0.mo @@ -183,12 +149,14 @@ share/locale/it/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ja/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/kn/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ko/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/li/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/lt/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/lv/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/mk/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ml/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/mn/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ms/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/ne/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/nl/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/nn/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/no/LC_MESSAGES/gnome-desktop-2.0.mo @@ -218,6 +186,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo @dirrm share/gnome/help/gnome-feedback/C @dirrm share/gnome/help/gnome-feedback @dirrm share/gnome/help/fdl/C/figures +@dirrm share/gnome/gnome-about/headers @dirrm include/gnome-desktop-2.0/libgnomeui @dirrm include/gnome-desktop-2.0/libgnome @dirrm include/gnome-desktop-2.0 diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index caa6e7f78e31..04ca2e79ad48 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomepanel -PORTVERSION= 2.2.2.2 -PORTREVISION= 1 +PORTVERSION= 2.4.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-panel/2.2 +MASTER_SITE_SUBDIR= sources/gnome-panel/2.4 DISTNAME= gnome-panel-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -21,7 +20,7 @@ USE_BZIP2= yes INSTALLS_SHLIB= yes USE_X_PREFIX= yes USE_REINPLACE= yes -USE_GNOME= gnomeprefix gnomehack gnomehier libwnck gnomedesktop +USE_GNOME= gnomeprefix gnomehack gnomehier gnomedesktop libwnck GNOME_DESKTOP_VERSION=2 USE_GMAKE= yes USE_LIBTOOL= yes diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo index a70a16998277..36e659c41882 100644 --- a/x11/gnome-panel/distinfo +++ b/x11/gnome-panel/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-panel-2.2.2.2.tar.bz2) = 0fffc658f22e367ba33997dcf180ef17 +MD5 (gnome2/gnome-panel-2.4.0.tar.bz2) = 9a81f7ebbb450611a28783900f5f2cbc diff --git a/x11/gnomepanel/files/patch-applets::gen_util::clock.c b/x11/gnome-panel/files/patch-applets_clock_clock.c index 96f5d3f44c48..976764570ff1 100644 --- a/x11/gnomepanel/files/patch-applets::gen_util::clock.c +++ b/x11/gnome-panel/files/patch-applets_clock_clock.c @@ -1,8 +1,8 @@ $FreeBSD$ ---- applets/gen_util/clock.c 2002/05/14 14:08:16 1.1 -+++ applets/gen_util/clock.c 2002/05/14 14:12:56 +--- applets/clock/clock.c 2002/05/14 14:08:16 1.1 ++++ applets/clock/clock.c 2002/05/14 14:12:56 @@ -14,7 +14,9 @@ #include <dirent.h> #include <string.h> diff --git a/x11/gnome-panel/files/patch-gnome-panel_panel.c b/x11/gnome-panel/files/patch-gnome-panel_panel.c deleted file mode 100644 index 4c51bc47f38c..000000000000 --- a/x11/gnome-panel/files/patch-gnome-panel_panel.c +++ /dev/null @@ -1,25 +0,0 @@ ---- gnome-panel/panel.c.orig Fri Aug 1 21:48:35 2003 -+++ gnome-panel/panel.c Fri Aug 1 21:48:37 2003 -@@ -569,18 +569,18 @@ - - if (pd->menu) - g_object_unref (pd->menu); -- pd->menu = NULL; -- -- pd->panel = NULL; - - if (pd->deactivate_idle != 0) - g_source_remove (pd->deactivate_idle); -- pd->deactivate_idle = 0; - - g_object_set_data (G_OBJECT (widget), "PanelData", NULL); - - panel_list = g_slist_remove (panel_list, pd); - g_free (pd); -+ -+ pd->menu = NULL; -+ pd->panel = NULL; -+ pd->deactivate_idle = 0; - } - - static void diff --git a/x11/gnome-panel/pkg-descr b/x11/gnome-panel/pkg-descr index 3abe6bcbf5fd..5e73398913a9 100644 --- a/x11/gnome-panel/pkg-descr +++ b/x11/gnome-panel/pkg-descr @@ -1,3 +1,3 @@ -Panel component for the GNOME 2.0 Desktop. +Panel component for the GNOME 2 Desktop. WWW: http://www.gnome.org/ diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist index d3632109b400..d6d24dc543ef 100644 --- a/x11/gnome-panel/pkg-plist +++ b/x11/gnome-panel/pkg-plist @@ -5,23 +5,30 @@ bin/gnome-panel-screenshot bin/panel-test-applets etc/gconf/gconf.xml.defaults/apps/gnome_panel_screenshot/%gconf.xml etc/gconf/gconf.xml.defaults/apps/panel/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/clock/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/mixer/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/show_desktop_button/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/window_list/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/window_menu/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/workspace_switcher/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/general/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects/menu_bar/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects/nautilus_launcher/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects/terminal_launcher/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/bottom_panel/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/top_panel/%gconf.xml etc/gconf/gconf.xml.defaults/apps/panel/global/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/prefs/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/prefs/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnome_panel_screenshot/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/prefs/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/pager_applet/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/pager_applet/prefs/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/panel/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large/general/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large/panels/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large/panels/00000001/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large/panels/00000002/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000001/%gconf.xml @@ -36,60 +43,67 @@ etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/objects/ etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/panels/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/panels/00000001/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/panels/00000002/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/small/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/small/general/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/small/panels/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/small/panels/00000001/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/panel/general/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/panel/global/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/tasklist_applet/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/tasklist_applet/prefs/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/panel/objects/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/panel/toplevels/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/panel/toplevels/background/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/window_list_applet/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/window_list_applet/prefs/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/workspace_switcher_applet/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/workspace_switcher_applet/prefs/%gconf.xml etc/gconf/schemas/clock.schemas etc/gconf/schemas/fish.schemas etc/gconf/schemas/gnome-panel-screenshot.schemas -etc/gconf/schemas/mailcheck.schemas -etc/gconf/schemas/pager.schemas -etc/gconf/schemas/panel-global-config.schemas -etc/gconf/schemas/panel-per-panel-config.schemas -etc/gconf/schemas/tasklist.schemas -etc/sound/events/mailcheck.soundlist +etc/gconf/schemas/panel-compatibility.schemas +etc/gconf/schemas/panel-default-setup.entries +etc/gconf/schemas/panel-general.schemas +etc/gconf/schemas/panel-global.schemas +etc/gconf/schemas/panel-object.schemas +etc/gconf/schemas/panel-toplevel.schemas +etc/gconf/schemas/window-list.schemas +etc/gconf/schemas/workspace-switcher.schemas include/panel-2.0/GNOME_Panel.h include/panel-2.0/panel-applet-gconf.h include/panel-2.0/panel-applet.h -lib/libgen_util_applet-2.so +lib/libclock-applet-2.so lib/libpanel-applet-2.a lib/libpanel-applet-2.so lib/libpanel-applet-2.so.0 +libdata/bonobo/servers/GNOME_ClockApplet_Factory.server libdata/bonobo/servers/GNOME_FishApplet_Factory.server -libdata/bonobo/servers/GNOME_GenUtilApplet_Factory.server libdata/bonobo/servers/GNOME_NotificationAreaApplet.server libdata/bonobo/servers/GNOME_Panel.server +libdata/bonobo/servers/GNOME_Wncklet_Factory.server libdata/pkgconfig/libpanelapplet-2.0.pc libexec/fish-applet-2 libexec/notification-area-applet +libexec/wnck-applet share/doc/panel-applet/applet-popups.html share/doc/panel-applet/applet-porting.html share/doc/panel-applet/applet-writing.html share/doc/panel-applet/index.sgml share/doc/panel-applet/libpanel-applet.html share/doc/panel-applet/multi-applets.html +share/doc/panel-applet/panel-applet-panel-applet-gconf-utilities.html share/doc/panel-applet/panel-applet.html share/doc/panel-applet/panel-signals.html share/doc/panel-applet/panelapplet.html share/doc/panel-applet/server-files.html share/doc/panel-applet/session-saving.html share/gnome/control-center-2.0/capplets/gnome-panel-preferences.desktop -share/gnome/fish/fish.glade -share/gnome/gen_util/pager.glade -share/gnome/gen_util/tasklist.glade share/gnome/gnome-2.0/ui/GNOME_ClockApplet.xml share/gnome/gnome-2.0/ui/GNOME_FishApplet.xml -share/gnome/gnome-2.0/ui/GNOME_MailCheckApplet.xml share/gnome/gnome-2.0/ui/GNOME_NotificationAreaApplet.xml -share/gnome/gnome-2.0/ui/GNOME_PagerApplet.xml share/gnome/gnome-2.0/ui/GNOME_Panel_Popup.xml share/gnome/gnome-2.0/ui/GNOME_ShowDesktopApplet.xml -share/gnome/gnome-2.0/ui/GNOME_TasklistApplet.xml +share/gnome/gnome-2.0/ui/GNOME_WindowListApplet.xml +share/gnome/gnome-2.0/ui/GNOME_WindowMenuApplet.xml +share/gnome/gnome-2.0/ui/GNOME_WorkspaceSwitcherApplet.xml +share/gnome/gnome-panel/glade/fish.glade share/gnome/gnome-panel/glade/panel-test-applets.glade +share/gnome/gnome-panel/glade/window-list.glade +share/gnome/gnome-panel/glade/workspace-switcher.glade share/gnome/gnome-panelrc share/gnome/help/clock/C/clock.xml share/gnome/help/clock/C/figures/clock_applet.png @@ -159,63 +173,6 @@ share/gnome/help/fish-applet-2/zh_TW/figures/fish_applet.png share/gnome/help/fish-applet-2/zh_TW/figures/fish_settings.png share/gnome/help/fish-applet-2/zh_TW/fish-applet-2.xml share/gnome/help/fish-applet-2/zh_TW/legal.xml -share/gnome/help/mailcheck/C/figures/mailcheck_applet.png -share/gnome/help/mailcheck/C/legal.xml -share/gnome/help/mailcheck/C/mailcheck.xml -share/gnome/help/mailcheck/de/figures/mailcheck-applet.png -share/gnome/help/mailcheck/de/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/de/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/de/figures/mailcheck_applet.png -share/gnome/help/mailcheck/de/legal.xml -share/gnome/help/mailcheck/de/mailcheck.xml -share/gnome/help/mailcheck/es/figures/mailcheck-applet.png -share/gnome/help/mailcheck/es/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/es/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/es/figures/mailcheck_applet.png -share/gnome/help/mailcheck/es/legal.xml -share/gnome/help/mailcheck/es/mailcheck.xml -share/gnome/help/mailcheck/fr/figures/mailcheck-applet.png -share/gnome/help/mailcheck/fr/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/fr/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/fr/figures/mailcheck_applet.png -share/gnome/help/mailcheck/fr/legal.xml -share/gnome/help/mailcheck/fr/mailcheck.xml -share/gnome/help/mailcheck/it/figures/mailcheck-applet.png -share/gnome/help/mailcheck/it/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/it/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/it/figures/mailcheck_applet.png -share/gnome/help/mailcheck/it/legal.xml -share/gnome/help/mailcheck/it/mailcheck.xml -share/gnome/help/mailcheck/ja/figures/mailcheck_applet.png -share/gnome/help/mailcheck/ja/legal.xml -share/gnome/help/mailcheck/ja/mailcheck.xml -share/gnome/help/mailcheck/ko/figures/mailcheck-applet.png -share/gnome/help/mailcheck/ko/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/ko/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/ko/figures/mailcheck_applet.png -share/gnome/help/mailcheck/ko/legal.xml -share/gnome/help/mailcheck/ko/mailcheck.xml -share/gnome/help/mailcheck/sv/figures/mailcheck-applet.png -share/gnome/help/mailcheck/sv/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/sv/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/sv/figures/mailcheck_applet.png -share/gnome/help/mailcheck/sv/legal.xml -share/gnome/help/mailcheck/sv/mailcheck.xml -share/gnome/help/mailcheck/zh_CN/figures/mailcheck-applet.png -share/gnome/help/mailcheck/zh_CN/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/zh_CN/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/zh_CN/figures/mailcheck_applet.png -share/gnome/help/mailcheck/zh_CN/legal.xml -share/gnome/help/mailcheck/zh_CN/mailcheck.xml -share/gnome/help/mailcheck/zh_TW/figures/mailcheck-applet.png -share/gnome/help/mailcheck/zh_TW/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/zh_TW/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/zh_TW/figures/mailcheck_applet.png -share/gnome/help/mailcheck/zh_TW/legal.xml -share/gnome/help/mailcheck/zh_TW/mailcheck.xml -share/gnome/help/notification-area/C/figures/notification-area.png -share/gnome/help/notification-area/C/legal.xml -share/gnome/help/notification-area/C/notification-area.xml share/gnome/help/window-list/C/figures/window_list_applet.png share/gnome/help/window-list/C/figures/window_list_group_applet.png share/gnome/help/window-list/C/legal.xml @@ -343,28 +300,6 @@ share/gnome/omf/gnome-panel/fish-applet-2-zh_CN.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-zh_CN.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-panel/fish-applet-2-zh_TW.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-zh_TW.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-panel/mailcheck-C.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-C.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-panel/mailcheck-de.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-de.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-panel/mailcheck-es.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-es.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-panel/mailcheck-fr.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-fr.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-panel/mailcheck-it.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-it.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-panel/mailcheck-ja.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-ja.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-panel/mailcheck-ko.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-ko.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-panel/mailcheck-sv.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-sv.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-panel/mailcheck-zh_CN.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-zh_CN.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-panel/mailcheck-zh_TW.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-zh_TW.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-panel/notification-area-C.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/notification-area-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-panel/window-list-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-panel/window-list-de.omf @@ -407,18 +342,31 @@ share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf 2>/dev/null || /usr/bin/true share/gnome/panel/gnome-panel-preferences.glade share/gnome/panel/gnome-panel-screenshot.glade +share/gnome/panel/panel-properties-dialog.glade +share/gnome/panel/panel-run-dialog.glade +share/gnome/pixmaps/cdeappmenu.png share/gnome/pixmaps/fish/fishanim.png share/gnome/pixmaps/fish/footguy.png share/gnome/pixmaps/fish/monkey.png share/gnome/pixmaps/fish/oldwanda.png +share/gnome/pixmaps/gnome-amusements.png +share/gnome/pixmaps/gnome-clock.png share/gnome/pixmaps/gnome-fish.png +share/gnome/pixmaps/gnome-gegl.png +share/gnome/pixmaps/gnome-gegl2-2.png +share/gnome/pixmaps/gnome-gegl2.png +share/gnome/pixmaps/gnome-main-menu.png +share/gnome/pixmaps/gnome-panel-type-corner.png +share/gnome/pixmaps/gnome-panel-type-edge.png +share/gnome/pixmaps/gnome-panel-type-floating.png +share/gnome/pixmaps/gnome-panel-type-menu.png +share/gnome/pixmaps/gnome-panel-type-sliding.png +share/gnome/pixmaps/gnome-panel.png +share/gnome/pixmaps/gnome-run.png +share/gnome/pixmaps/gnome-screenshot.png share/gnome/pixmaps/gnome-show-desktop.png -share/gnome/pixmaps/mailcheck/eclouds.png -share/gnome/pixmaps/mailcheck/email-e.png -share/gnome/pixmaps/mailcheck/email-eclouds.png -share/gnome/pixmaps/mailcheck/email-tiny.png -share/gnome/pixmaps/mailcheck/email.png -share/gnome/pixmaps/mailcheck/tux-anim.png +share/gnome/pixmaps/panel-drawer.png +share/gnome/pixmaps/panel-force-quit.png share/locale/am/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ar/LC_MESSAGES/gnome-panel-2.0.mo share/locale/az/LC_MESSAGES/gnome-panel-2.0.mo @@ -521,30 +469,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo @dirrm share/gnome/help/window-list/C/figures @dirrm share/gnome/help/window-list/C @dirrm share/gnome/help/window-list -@dirrm share/gnome/help/notification-area/C/figures -@dirrm share/gnome/help/notification-area/C -@dirrm share/gnome/help/notification-area -@dirrm share/gnome/help/mailcheck/zh_TW/figures -@dirrm share/gnome/help/mailcheck/zh_TW -@dirrm share/gnome/help/mailcheck/zh_CN/figures -@dirrm share/gnome/help/mailcheck/zh_CN -@dirrm share/gnome/help/mailcheck/sv/figures -@dirrm share/gnome/help/mailcheck/sv -@dirrm share/gnome/help/mailcheck/ko/figures -@dirrm share/gnome/help/mailcheck/ko -@dirrm share/gnome/help/mailcheck/ja/figures -@dirrm share/gnome/help/mailcheck/ja -@dirrm share/gnome/help/mailcheck/it/figures -@dirrm share/gnome/help/mailcheck/it -@dirrm share/gnome/help/mailcheck/fr/figures -@dirrm share/gnome/help/mailcheck/fr -@dirrm share/gnome/help/mailcheck/es/figures -@dirrm share/gnome/help/mailcheck/es -@dirrm share/gnome/help/mailcheck/de/figures -@dirrm share/gnome/help/mailcheck/de -@dirrm share/gnome/help/mailcheck/C/figures -@dirrm share/gnome/help/mailcheck/C -@dirrm share/gnome/help/mailcheck @dirrm share/gnome/help/fish-applet-2/zh_TW/figures @dirrm share/gnome/help/fish-applet-2/zh_TW @dirrm share/gnome/help/fish-applet-2/zh_CN/figures @@ -589,17 +513,17 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo @dirrm share/gnome/help/clock @dirrm share/gnome/gnome-panel/glade @dirrm share/gnome/gnome-panel -@dirrm share/gnome/gen_util -@dirrm share/gnome/fish @dirrm share/doc/panel-applet @dirrm include/panel-2.0 -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/tasklist_applet/prefs -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/tasklist_applet +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/workspace_switcher_applet/prefs +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/workspace_switcher_applet +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/window_list_applet/prefs +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/window_list_applet +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/toplevels/background +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/toplevels +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/objects @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/global -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/small/panels/00000001 -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/small/panels -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/small/general -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/small +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/general @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/panels/00000002 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/panels/00000001 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/panels @@ -614,23 +538,30 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000001 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large/panels/00000002 -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large/panels/00000001 -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large/panels -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large/general -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/pager_applet/prefs -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/pager_applet -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/prefs -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_panel_screenshot @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/prefs @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/prefs @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet @dirrm etc/gconf/gconf.xml.defaults/apps/panel/global +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/top_panel +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/bottom_panel +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects/terminal_launcher +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects/nautilus_launcher +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects/menu_bar +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/general +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/workspace_switcher +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/window_menu +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/window_list +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/show_desktop_button +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/mixer +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/clock +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup @dirrm etc/gconf/gconf.xml.defaults/apps/panel @dirrm etc/gconf/gconf.xml.defaults/apps/gnome_panel_screenshot @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-C.omf 2>/dev/null || /usr/bin/true @@ -653,17 +584,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-sv.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-zh_CN.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-zh_TW.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-de.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-es.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-fr.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-it.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-ja.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-ko.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-sv.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-zh_CN.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-zh_TW.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/notification-area-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-de.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-es.omf 2>/dev/null || /usr/bin/true diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile index 1c434ac65945..48f0b8e7bbb9 100644 --- a/x11/gnome-session/Makefile +++ b/x11/gnome-session/Makefile @@ -6,16 +6,11 @@ # PORTNAME= gnomesession -PORTVERSION= 2.2.2 -PORTREVISION= 1 +PORTVERSION= 2.4.0 CATEGORIES= x11 gnome -MASTER_SITES= ${MASTER_SITE_GNOME} \ - ${MASTER_SITE_LOCAL:S/$/:local/} -MASTER_SITE_SUBDIR= sources/gnome-session/2.2 \ - marcus/:local +MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITE_SUBDIR= sources/gnome-session/2.4 DISTNAME= gnome-session-${PORTVERSION} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - splash.png:local DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -27,18 +22,11 @@ USE_REINPLACE= yes USE_GNOME= gnomeprefix gnomehack gnomehier libgnomeui USE_GMAKE= yes USE_LIBTOOL= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" MAN1= gnome-session.1 gnome-smproxy.1 gnome-wm.1 session-properties.1 \ gnome-session-save.1 MAN5= default.session.5 -post-extract: - @${CP} ${DISTDIR}/${DIST_SUBDIR}/splash.png ${WRKDIR} - -post-install: - ${INSTALL_DATA} ${WRKDIR}/splash.png \ - ${PREFIX}/share/gnome/pixmaps/splash/gnome-splash.png - .include <bsd.port.mk> diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo index 81c567b465b0..93da50979a59 100644 --- a/x11/gnome-session/distinfo +++ b/x11/gnome-session/distinfo @@ -1,2 +1 @@ -MD5 (gnome2/gnome-session-2.2.2.tar.bz2) = 7dcfea0d925ddecb7c9700ddf597b17c -MD5 (gnome2/splash.png) = 244d7cadfb0f5e7ba624a1d4e749a312 +MD5 (gnome2/gnome-session-2.4.0.tar.bz2) = 6a7acf3429b927c69e18019f9ec6fa9f diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist index 75f1650b4f35..d4fc0ded7788 100644 --- a/x11/gnome-session/pkg-plist +++ b/x11/gnome-session/pkg-plist @@ -1,5 +1,6 @@ bin/gnome-session bin/gnome-session-properties +bin/gnome-session-remove bin/gnome-session-save bin/gnome-smproxy bin/gnome-wm @@ -16,15 +17,17 @@ share/locale/am/LC_MESSAGES/gnome-session-2.0.mo share/locale/ar/LC_MESSAGES/gnome-session-2.0.mo share/locale/az/LC_MESSAGES/gnome-session-2.0.mo share/locale/be/LC_MESSAGES/gnome-session-2.0.mo +share/locale/bn/LC_MESSAGES/gnome-session-2.0.mo share/locale/bs/LC_MESSAGES/gnome-session-2.0.mo share/locale/bg/LC_MESSAGES/gnome-session-2.0.mo -share/locale/bn/LC_MESSAGES/gnome-session-2.0.mo share/locale/ca/LC_MESSAGES/gnome-session-2.0.mo share/locale/cs/LC_MESSAGES/gnome-session-2.0.mo +share/locale/cy/LC_MESSAGES/gnome-session-2.0.mo share/locale/da/LC_MESSAGES/gnome-session-2.0.mo share/locale/de/LC_MESSAGES/gnome-session-2.0.mo share/locale/el/LC_MESSAGES/gnome-session-2.0.mo share/locale/en_GB/LC_MESSAGES/gnome-session-2.0.mo +share/locale/eo/LC_MESSAGES/gnome-session-2.0.mo share/locale/es/LC_MESSAGES/gnome-session-2.0.mo share/locale/et/LC_MESSAGES/gnome-session-2.0.mo share/locale/eu/LC_MESSAGES/gnome-session-2.0.mo @@ -37,6 +40,7 @@ share/locale/he/LC_MESSAGES/gnome-session-2.0.mo share/locale/hi/LC_MESSAGES/gnome-session-2.0.mo share/locale/hu/LC_MESSAGES/gnome-session-2.0.mo share/locale/id/LC_MESSAGES/gnome-session-2.0.mo +share/locale/is/LC_MESSAGES/gnome-session-2.0.mo share/locale/it/LC_MESSAGES/gnome-session-2.0.mo share/locale/ja/LC_MESSAGES/gnome-session-2.0.mo share/locale/kn/LC_MESSAGES/gnome-session-2.0.mo @@ -62,13 +66,13 @@ share/locale/sr/LC_MESSAGES/gnome-session-2.0.mo share/locale/sr@Latn/LC_MESSAGES/gnome-session-2.0.mo share/locale/sv/LC_MESSAGES/gnome-session-2.0.mo share/locale/ta/LC_MESSAGES/gnome-session-2.0.mo +share/locale/th/LC_MESSAGES/gnome-session-2.0.mo share/locale/tr/LC_MESSAGES/gnome-session-2.0.mo share/locale/uk/LC_MESSAGES/gnome-session-2.0.mo share/locale/vi/LC_MESSAGES/gnome-session-2.0.mo share/locale/wa/LC_MESSAGES/gnome-session-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-session-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-session-2.0.mo -@dirrm share/gnome/omf/gnome-core @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-session/options @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-session @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-session/options diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile index e6c8538e5c8f..edcdf8d713dd 100644 --- a/x11/gnome-terminal/Makefile +++ b/x11/gnome-terminal/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gnometerminal -PORTVERSION= 2.2.2 +PORTVERSION= 2.4.0.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-terminal/2.2 +MASTER_SITE_SUBDIR= sources/gnome-terminal/2.4 DISTNAME= gnome-terminal-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -20,17 +20,9 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_REINPLACE= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack gnomehier libgnomeui +USE_GNOME= gnomeprefix gnomehack gnomehier libgnomeui vte USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -.if defined(WITH_ZVT) -CONFIGURE_ARGS= --with-widget=zvt -USE_GNOME+= libzvt -.else -CONFIGURE_ARGS= --with-widget=vte -USE_GNOME+= vte -.endif - .include <bsd.port.mk> diff --git a/x11/gnome-terminal/distinfo b/x11/gnome-terminal/distinfo index a11d0bf0d30e..dafc5d297de9 100644 --- a/x11/gnome-terminal/distinfo +++ b/x11/gnome-terminal/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-terminal-2.2.2.tar.bz2) = 30140540966ba84597e257054a232e99 +MD5 (gnome2/gnome-terminal-2.4.0.1.tar.bz2) = 6d939e67c052e43686e2357e8083ad66 diff --git a/x11/gnome-terminal/files/patch-src_terminal-widget-zvt.c b/x11/gnome-terminal/files/patch-src_terminal-widget-zvt.c deleted file mode 100644 index 84c13e0aaed1..000000000000 --- a/x11/gnome-terminal/files/patch-src_terminal-widget-zvt.c +++ /dev/null @@ -1,13 +0,0 @@ ---- src/terminal-widget-zvt.c.orig Wed Feb 12 18:06:32 2003 -+++ src/terminal-widget-zvt.c Wed Feb 12 18:05:20 2003 -@@ -1132,8 +1132,8 @@ - terminal_widget_set_pango_font (GtkWidget *widget, - const PangoFontDescription *font_desc) - { -- g_return_if_fail (font_desc != NULL); -- zvt_term_set_pango_font (ZVT_TERM (widget), font_desc); -+ /*g_return_if_fail (font_desc != NULL); -+ zvt_term_set_pango_font (ZVT_TERM (widget), font_desc);*/ - } - - gboolean diff --git a/x11/gnome-terminal/pkg-plist b/x11/gnome-terminal/pkg-plist index 1ab44e46820f..b101373be612 100644 --- a/x11/gnome-terminal/pkg-plist +++ b/x11/gnome-terminal/pkg-plist @@ -11,6 +11,7 @@ etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles/Default/%gconf.xml etc/gconf/schemas/gnome-terminal.schemas libdata/bonobo/servers/gnome-terminal.server +share/gnome/application-registry/gnome-terminal.applications share/gnome/applications/gnome-terminal.desktop share/gnome/gnome-terminal/glade/gnome-terminal.glade2 share/gnome/help/gnome-terminal/C/figures/gnome-terminal-default.png @@ -96,8 +97,10 @@ share/locale/ar/LC_MESSAGES/gnome-terminal.mo share/locale/az/LC_MESSAGES/gnome-terminal.mo share/locale/be/LC_MESSAGES/gnome-terminal.mo share/locale/bg/LC_MESSAGES/gnome-terminal.mo +share/locale/bn/LC_MESSAGES/gnome-terminal.mo share/locale/ca/LC_MESSAGES/gnome-terminal.mo share/locale/cs/LC_MESSAGES/gnome-terminal.mo +share/locale/cy/LC_MESSAGES/gnome-terminal.mo share/locale/da/LC_MESSAGES/gnome-terminal.mo share/locale/de/LC_MESSAGES/gnome-terminal.mo share/locale/el/LC_MESSAGES/gnome-terminal.mo @@ -107,9 +110,12 @@ share/locale/et/LC_MESSAGES/gnome-terminal.mo share/locale/fa/LC_MESSAGES/gnome-terminal.mo share/locale/fi/LC_MESSAGES/gnome-terminal.mo share/locale/fr/LC_MESSAGES/gnome-terminal.mo +share/locale/ga/LC_MESSAGES/gnome-terminal.mo share/locale/gl/LC_MESSAGES/gnome-terminal.mo share/locale/he/LC_MESSAGES/gnome-terminal.mo +share/locale/hi/LC_MESSAGES/gnome-terminal.mo share/locale/hu/LC_MESSAGES/gnome-terminal.mo +share/locale/id/LC_MESSAGES/gnome-terminal.mo share/locale/it/LC_MESSAGES/gnome-terminal.mo share/locale/ja/LC_MESSAGES/gnome-terminal.mo share/locale/ko/LC_MESSAGES/gnome-terminal.mo @@ -132,14 +138,12 @@ share/locale/sq/LC_MESSAGES/gnome-terminal.mo share/locale/sr/LC_MESSAGES/gnome-terminal.mo share/locale/sr@Latn/LC_MESSAGES/gnome-terminal.mo share/locale/sv/LC_MESSAGES/gnome-terminal.mo -share/locale/ta/LC_MESSAGES/gnome-terminal.mo share/locale/tr/LC_MESSAGES/gnome-terminal.mo share/locale/uk/LC_MESSAGES/gnome-terminal.mo share/locale/vi/LC_MESSAGES/gnome-terminal.mo share/locale/wa/LC_MESSAGES/gnome-terminal.mo share/locale/zh_CN/LC_MESSAGES/gnome-terminal.mo share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo -@dirrm share/gnome/omf/gnome-terminal @dirrm share/gnome/help/gnome-terminal/zh_TW/figures @dirrm share/gnome/help/gnome-terminal/zh_TW @dirrm share/gnome/help/gnome-terminal/zh_CN/figures @@ -160,7 +164,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo @dirrm share/gnome/help/gnome-terminal/es @dirrm share/gnome/help/gnome-terminal/de/figures @dirrm share/gnome/help/gnome-terminal/de -@dirrm share/gnome/help/gnome-terminal/C/figures @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles/Default @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/keybindings diff --git a/x11/gnome2-fifth-toe/Makefile b/x11/gnome2-fifth-toe/Makefile index 6123bbef2171..f0c1a113d8fa 100644 --- a/x11/gnome2-fifth-toe/Makefile +++ b/x11/gnome2-fifth-toe/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gnome2-fifth-toe -PORTVERSION= 2.2.2 -PORTREVISION= 1 +PORTVERSION= 2.4.0 CATEGORIES= x11 gnome MASTER_SITES= # empty DISTFILES= # empty @@ -24,7 +23,6 @@ RUN_DEPENDS= gnumeric:${PORTSDIR}/math/gnumeric2 \ gimp-1.3:${PORTSDIR}/graphics/gimp-devel \ sodipodi:${PORTSDIR}/graphics/sodipodi \ gnomeicu:${PORTSDIR}/net/gnomeicu2 \ - gcalctool:${PORTSDIR}/math/gcalctool \ gthumb:${PORTSDIR}/graphics/gthumb2 \ mergeant:${PORTSDIR}/databases/mergeant \ ghex2:${PORTSDIR}/editors/ghex2 \ @@ -32,25 +30,18 @@ RUN_DEPENDS= gnumeric:${PORTSDIR}/math/gnumeric2 \ gob2:${PORTSDIR}/devel/gob2 \ gtetrinet:${PORTSDIR}/games/gtetrinet \ ${X11BASE}/lib/gaim/docklet.so:${PORTSDIR}/net/gaim \ - gnomemeeting:${PORTSDIR}/net/gnomemeeting \ - gnome-font-viewer:${PORTSDIR}/x11-fonts/fontilus \ - seahorse:${PORTSDIR}/security/seahorse \ - totem:${PORTSDIR}/multimedia/totem \ sawfish:${PORTSDIR}/x11-wm/sawfish2 \ dia:${PORTSDIR}/graphics/dia \ mrproject:${PORTSDIR}/deskutils/mrproject \ - ${X11BASE}/libexec/stickynotes_applet:${PORTSDIR}/misc/stickynotes_applet \ tsclient:${PORTSDIR}/net/tsclient \ - zenity:${PORTSDIR}/x11/zenity \ - gucharmap:${PORTSDIR}/deskutils/gucharmap \ regexxer:${PORTSDIR}/devel/regexxer \ - galeon:${PORTSDIR}/www/galeon2 \ streamtuner:${PORTSDIR}/audio/streamtuner \ - gok:${PORTSDIR}/sysutils/gok \ meld:${PORTSDIR}/textproc/meld \ gcompris:${PORTSDIR}/games/gcompris2 \ - gurlchecker:${PORTSDIR}/www/gurlchecker \ + galeon:${PORTSDIR}/www/galeon2 \ gswitchit-properties-capplet:${PORTSDIR}/x11/gswitchit \ + totem:${PORTSDIR}/multimedia/totem \ + seahorse:${PORTSDIR}/security/seahorse \ workrave:${PORTSDIR}/x11/workrave NO_BUILD= yes diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile index f95aaaf239a3..9f4b03562e1e 100644 --- a/x11/gnome2/Makefile +++ b/x11/gnome2/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gnome2 -PORTVERSION= 2.2.2 -PORTREVISION= 2 +PORTVERSION= 2.4.0 CATEGORIES= x11 gnome MASTER_SITES= # empty DISTFILES= # empty @@ -18,7 +17,7 @@ COMMENT= The "meta-port" for the GNOME 2 integrated X11 desktop RUN_DEPENDS= ${X11BASE}/libexec/cdplayer_applet2:${PORTSDIR}/x11/gnomeapplets2 \ gnome-cd:${PORTSDIR}/audio/gnomemedia2 \ - gnome-calculator:${PORTSDIR}/deskutils/gnomeutils2 \ + gnome-dictionary:${PORTSDIR}/deskutils/gnomeutils2 \ eog:${PORTSDIR}/graphics/eog2 \ gnome-control-center:${PORTSDIR}/sysutils/gnomecontrolcenter2 \ gconf-editor:${PORTSDIR}/sysutils/gconf-editor \ @@ -26,7 +25,6 @@ RUN_DEPENDS= ${X11BASE}/libexec/cdplayer_applet2:${PORTSDIR}/x11/gnomeapplets2 \ gedit:${PORTSDIR}/editors/gedit2 \ gnome-terminal:${PORTSDIR}/x11/gnometerminal \ gnome-session:${PORTSDIR}/x11/gnomesession \ - metacity:${PORTSDIR}/x11-wm/metacity \ bug-buddy:${PORTSDIR}/devel/bugbuddy2 \ gnome-system-monitor:${PORTSDIR}/sysutils/gnomesystemmonitor \ nautilus:${PORTSDIR}/x11-fm/nautilus2 \ @@ -36,21 +34,27 @@ RUN_DEPENDS= ${X11BASE}/libexec/cdplayer_applet2:${PORTSDIR}/x11/gnomeapplets2 \ ${X11BASE}/share/gnome/help/user-guide/C/user-guide.xml:${PORTSDIR}/misc/gnomeuserdocs2 \ ${X11BASE}/share/gnome/sounds/question.wav:${PORTSDIR}/audio/gnomeaudio2 \ ${X11BASE}/libdata/pkgconfig/libgail-gnome.pc:${PORTSDIR}/x11-toolkits/libgail-gnome \ - ${X11BASE}/libdata/pkgconfig/vte.pc:${PORTSDIR}/x11-toolkits/vte \ - ${X11BASE}/libdata/pkgconfig/libzvt-2.0.pc:${PORTSDIR}/x11-toolkits/libzvt \ file-roller:${PORTSDIR}/archivers/fileroller \ ${X11BASE}/share/themes/HighContrast/gtk-2.0/gtkrc:${PORTSDIR}/x11-toolkits/gnome-themes \ ggv:${PORTSDIR}/print/ggv2 \ - gnome-pkgview:${PORTSDIR}/sysutils/gnome-pkgview \ acme:${PORTSDIR}/multimedia/acme \ + gok:${PORTSDIR}/sysutils/gok \ + gpdf:${PORTSDIR}/graphics/gpdf \ + nautilus-cd-burner:${PORTSDIR}/sysutils/nautilus-cd-burner \ + gcalctool:${PORTSDIR}/math/gcalctool \ + gucharmap:${PORTSDIR}/deskutils/gucharmap \ + zenity:${PORTSDIR}/x11/zenity \ gst-thumbnail:${PORTSDIR}/multimedia/nautilus-media \ - ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera + ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \ + gnomemeeting:${PORTSDIR}/net/gnomemeeting \ + epiphany:${PORTSDIR}/www/epiphany \ + gnopernicus:${PORTSDIR}/x11/gnopernicus NO_BUILD= yes USE_PYTHON= yes -.if !defined(PACKAGE_BUILDING) +.if !defined(BATCH) && !defined(PACKAGE_BUILDING) pre-configure: @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL .endif diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile index 9bef6cc276b8..0a07d795a9cc 100644 --- a/x11/gnomeapplets2/Makefile +++ b/x11/gnomeapplets2/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomeapplets2 -PORTVERSION= 2.2.2 -PORTREVISION= 3 +PORTVERSION= 2.4.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-applets/2.2 +MASTER_SITE_SUBDIR= sources/gnome-applets/2.4 DISTNAME= gnome-applets-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/x11/gnomeapplets2/distinfo b/x11/gnomeapplets2/distinfo index e16c408d8425..52d4f73acccc 100644 --- a/x11/gnomeapplets2/distinfo +++ b/x11/gnomeapplets2/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-applets-2.2.2.tar.bz2) = d8a8fdbae66274bab4a309073d2072ab +MD5 (gnome2/gnome-applets-2.4.0.tar.bz2) = c17dba203ea379af5da056862672026c diff --git a/x11/gnomeapplets2/files/patch-aa b/x11/gnomeapplets2/files/patch-aa index ffe06143e3f0..7c9edcd6d43a 100644 --- a/x11/gnomeapplets2/files/patch-aa +++ b/x11/gnomeapplets2/files/patch-aa @@ -1,6 +1,6 @@ ---- configure.orig Mon Dec 16 17:15:36 2002 -+++ configure Thu Dec 19 13:43:27 2002 -@@ -7862,6 +7862,7 @@ +--- configure.orig Sun Jun 1 13:55:59 2003 ++++ configure Mon Jun 2 02:36:19 2003 +@@ -7863,6 +7863,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -8,7 +8,7 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -12328,6 +12329,7 @@ +@@ -11202,6 +11203,7 @@ *irix*) CDROM_HOST=irix; CDROM_LIBS="-lcdaudio -lmediad -lds";cd_device_path="/dev/cdrom";; *linux*) CDROM_HOST=linux;cd_device_path="/dev/cdrom";; *netbsd*) CDROM_HOST=netbsd;cd_device_path="/dev/rcd0";; @@ -16,28 +16,7 @@ *solaris*) CDROM_HOST=solaris;cd_device_path="/vol/dev/aliases/cdrom0";cdplayer_type_sun=true;; esac case "$host" in -@@ -12391,6 +12393,20 @@ - fi - - ;; -+ i386-*-freebsd*) -+ HAVE_LIBAPM=no -+if test "x$HAVE_LIBAPM" = "xyes"; then -+ HAVE_LIBAPM_TRUE= -+ HAVE_LIBAPM_FALSE='#' -+else -+ HAVE_LIBAPM_TRUE='#' -+ HAVE_LIBAPM_FALSE= -+fi -+ ;; -+ *-*-freebsd*) -+ build_battstat_applet=no -+ -+ ;; - *-*-linux*) - echo "$as_me:$LINENO: checking for apm_read in -lapm" >&5 - echo $ECHO_N "checking for apm_read in -lapm... $ECHO_C" >&6 -@@ -13688,14 +13704,14 @@ +@@ -12771,14 +12773,14 @@ ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" cat >>confdefs.h <<_ACEOF diff --git a/x11/gnomeapplets2/files/patch-battstat_Makefile.in b/x11/gnomeapplets2/files/patch-battstat_Makefile.in index f47e6bab6dae..1908749369cb 100644 --- a/x11/gnomeapplets2/files/patch-battstat_Makefile.in +++ b/x11/gnomeapplets2/files/patch-battstat_Makefile.in @@ -1,21 +1,21 @@ ---- battstat/Makefile.in.orig Thu Dec 19 13:50:27 2002 -+++ battstat/Makefile.in Thu Dec 19 13:51:02 2002 -@@ -148,11 +148,11 @@ +--- battstat/Makefile.in.orig Sun Jun 29 16:43:23 2003 ++++ battstat/Makefile.in Sun Jun 29 16:45:10 2003 +@@ -146,11 +146,11 @@ pixmapsdir = $(datadir)/pixmaps pixmaps_DATA = battstat.png - @HAVE_LIBAPM_TRUE@APMLIB = @HAVE_LIBAPM_TRUE@-lapm --@HAVE_LIBAPM_FALSE@APMLIB = @HAVE_LIBAPM_FALSE@apmlib/libapm.a -+@HAVE_LIBAPM_FALSE@APMLIB = + @HAVE_LIBAPM_TRUE@APMLIB = -lapm +-@HAVE_LIBAPM_FALSE@APMLIB = apmlib/libapm.a ++@HAVE_LIBAPM_FALSE@APMLIB = @HAVE_LIBAPM_TRUE@APMDIR = --@HAVE_LIBAPM_FALSE@APMDIR = @HAVE_LIBAPM_FALSE@apmlib -+@HAVE_LIBAPM_FALSE@APMDIR = +-@HAVE_LIBAPM_FALSE@APMDIR = apmlib ++@HAVE_LIBAPM_FALSE@APMDIR = @HAVE_LIBAPM_TRUE@APMINC = --@HAVE_LIBAPM_FALSE@APMINC = @HAVE_LIBAPM_FALSE@-Iapmlib/ -+@HAVE_LIBAPM_FALSE@APMINC = +-@HAVE_LIBAPM_FALSE@APMINC = -Iapmlib/ ++@HAVE_LIBAPM_FALSE@APMINC = SUBDIRS = docs sounds $(APMDIR) -@@ -223,8 +223,7 @@ +@@ -199,8 +199,7 @@ @HAVE_LIBAPM_TRUE@battstat_applet_2_DEPENDENCIES = \ @HAVE_LIBAPM_TRUE@$(top_builddir)/screen-exec/libscreen-exec.la @HAVE_LIBAPM_FALSE@battstat_applet_2_DEPENDENCIES = \ diff --git a/x11/gnomeapplets2/files/patch-charpick_charpick.c b/x11/gnomeapplets2/files/patch-charpick_charpick.c new file mode 100644 index 000000000000..7d0ee91eb476 --- /dev/null +++ b/x11/gnomeapplets2/files/patch-charpick_charpick.c @@ -0,0 +1,11 @@ +--- charpick/charpick.c.orig Wed Sep 10 13:33:00 2003 ++++ charpick/charpick.c Wed Sep 10 13:33:19 2003 +@@ -3,7 +3,7 @@ + */ + + #include <config.h> +-#ifndef sun ++#if !defined(sun) && !defined(__FreeBSD__) + #include <tgmath.h> + #endif + #include <panel-applet.h> diff --git a/x11/gnomeapplets2/files/patch-gweather::Locations b/x11/gnomeapplets2/files/patch-gweather::Locations deleted file mode 100644 index 3e14e26d8de3..000000000000 --- a/x11/gnomeapplets2/files/patch-gweather::Locations +++ /dev/null @@ -1,35 +0,0 @@ - -$FreeBSD$ - ---- gweather/Locations.orig Wed May 15 00:32:46 2002 -+++ gweather/Locations Tue May 21 19:00:43 2002 -@@ -1588,7 +1588,7 @@ - - [EU] - name=Europe --states=AB OS BE BA BG CZ HR CY DK EE FI FR MK DE GI GR HU IE IS IT LV LT LU MT MD NL NO PL PT RO RU SK SI SP SE CH TR UK YU -+states=AB OS BE BA BG CZ HR CY DK EE FI FR MK DE GI GR HU IE IS IT LV LT LU MT MD NL NO PL PT RO RU SK SI SP SE CH TR UA UK YU - - [EU_AB] - name=Albania -@@ -1857,6 +1857,20 @@ - loc50=Yakutsk UEEE ------ --- - loc51=Yekaterinburg USSS ------ --- - loc52=Yuzhno-Sakhalinsk UHSS ------ --- -+ -+[EU_UA] -+name=Ukraine -+loc0=Kiev UKBB ------ --- -+loc1=Donetsk UKCC ------ --- -+loc2=Dnepropetrovsk UKDD ------ --- -+loc3=Krivoy\\ Rog UKDR ------ --- -+loc4=Simferopol UKFF ------ --- -+loc5=Kharkov UKHH ------ --- -+loc6=Ivano-frankovsk UKLI ------ --- -+loc7=Lvov UKLL ------ --- -+loc8=Rovno UKLR ------ --- -+loc9=Uzhgorod UKLU ------ --- -+loc10=Odessa UKOO ------ --- - - [EU_SK] - name=Slovakia diff --git a/x11/gnomeapplets2/files/patch-stickynotes_Makefile.in b/x11/gnomeapplets2/files/patch-stickynotes_Makefile.in new file mode 100644 index 000000000000..973b7e342c3e --- /dev/null +++ b/x11/gnomeapplets2/files/patch-stickynotes_Makefile.in @@ -0,0 +1,11 @@ +--- stickynotes/Makefile.in.orig Thu Aug 28 01:00:09 2003 ++++ stickynotes/Makefile.in Thu Aug 28 01:00:26 2003 +@@ -142,7 +142,7 @@ + + SUBDIRS = pixmaps docs + +-CFLAGS = -Wall -g ++CFLAGS += -Wall -g + + INCLUDES = -I. -I$(srcdir) $(GNOME_APPLETS_CFLAGS) $(LIBGLADE_CFLAGS) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DSTICKYNOTES_GLADEDIR=\"$(gladedir)\" -DSTICKYNOTES_ICONDIR=\"$(icondir)\" + diff --git a/x11/gnomeapplets2/files/patch-wireless_wireless-applet.c b/x11/gnomeapplets2/files/patch-wireless_wireless-applet.c index 3b247a47b947..5c1e32e88b09 100644 --- a/x11/gnomeapplets2/files/patch-wireless_wireless-applet.c +++ b/x11/gnomeapplets2/files/patch-wireless_wireless-applet.c @@ -1,6 +1,6 @@ ---- wireless/wireless-applet.c.orig Mon May 19 00:50:43 2003 -+++ wireless/wireless-applet.c Wed Aug 20 12:12:05 2003 -@@ -30,12 +30,27 @@ +--- wireless/wireless-applet.c.orig Sat Aug 23 09:10:54 2003 ++++ wireless/wireless-applet.c Thu Aug 28 00:44:16 2003 +@@ -30,12 +30,25 @@ #include <math.h> #include <dirent.h> @@ -10,10 +10,8 @@ +#include <net/if.h> +#include <net/if_var.h> +#include <dev/an/if_aironet_ieee.h> -+#if __FreeBSD_version >= 460100 +#include <dev/wi/if_wavelan_ieee.h> +#endif -+#endif + #include <gnome.h> #include <panel-applet.h> @@ -28,32 +26,33 @@ #define CFG_UPDATE_INTERVAL 2 typedef enum { -@@ -93,6 +108,14 @@ +@@ -89,6 +102,12 @@ WirelessApplet *applet); static void wireless_applet_about_cb (BonoboUIComponent *uic, WirelessApplet *applet); +#ifdef __FreeBSD__ +static int an_getval(WirelessApplet *applet, char *device, struct an_req *areq); +static void get_an_data(WirelessApplet *applet, char *device, long int *level); -+#if __FreeBSD_version >= 460100 +static int wi_getval(WirelessApplet *applet, char *device, struct wi_req *areq); +static void get_wi_data(WirelessApplet *applet, char *device, long int *level); +#endif -+#endif static const BonoboUIVerb wireless_menu_verbs [] = { BONOBO_UI_UNSAFE_VERB ("WirelessProperties", -@@ -150,7 +173,9 @@ +@@ -143,9 +162,11 @@ g_free (tmp); /* Update the image */ +#ifndef __FreeBSD__ - percent = CLAMP (percent, 0, 100); + percent = CLAMP (percent, -1, 100); +#endif - if (applet->pixmaps[percent] != applet->current_pixmap) - { -@@ -234,6 +259,7 @@ +- if (percent < 0) ++ if (percent < 0 || percent > 100) + state = PIX_BROKEN; + else if (percent == 0) + state = PIX_NO_LINK; +@@ -176,6 +197,7 @@ int percent; /* Calculate the percentage based on the link quality */ @@ -61,7 +60,7 @@ if (level < 0) { percent = -1; } else { -@@ -244,8 +270,11 @@ +@@ -186,6 +208,9 @@ percent = CLAMP (percent, 0, 100); } } @@ -69,17 +68,13 @@ + percent = (int)level; +#endif -- if (percent < 0) { -+ if (percent < 0 || percent > 100) { - applet->state = BUSTED_LINK; - wireless_applet_animation_state (applet); - } else if (percent == 0) { -@@ -387,22 +416,182 @@ - applet->show_dialogs = show; + wireless_applet_draw (applet, percent); + } +@@ -228,22 +253,179 @@ + } } +#ifdef __FreeBSD__ -+#if __FreeBSD_version >= 460100 +static int +wi_getval(WirelessApplet *applet, char *device, struct wi_req *wreq) +{ @@ -135,7 +130,7 @@ + + return; +} -+#endif ++ +static int +an_getval(WirelessApplet *applet, char *device, struct an_req *areq) +{ @@ -244,7 +239,6 @@ + wireless_applet_update_state (applet, device, 0, level, 0); + } + } -+#if __FreeBSD_version >= 460100 + else + if (g_strncasecmp(device, "wi", 2)==0) { + applet->devices = g_list_prepend (applet->devices, g_strdup (device)); @@ -253,13 +247,12 @@ + wireless_applet_update_state (applet, device, 0, level, 0); + } + } -+#endif + ifs++; +#else char *ptr; fgets (line, 256, applet->file); -@@ -435,6 +624,7 @@ +@@ -276,6 +458,7 @@ wireless_applet_update_state (applet, device, link, level, noise); } } @@ -267,7 +260,7 @@ } while (1); if (g_list_length (applet->devices)==1) { -@@ -446,17 +636,23 @@ +@@ -287,17 +470,23 @@ } /* rewind the /proc/net/wireless file */ @@ -291,7 +284,7 @@ wireless_applet_read_device_state (applet); -@@ -522,6 +718,7 @@ +@@ -344,6 +533,7 @@ static void start_file_read (WirelessApplet *applet) { @@ -299,7 +292,7 @@ applet->file = fopen ("/proc/net/wireless", "rt"); if (applet->file == NULL) { gtk_tooltips_set_tip (applet->tips, -@@ -530,6 +727,7 @@ +@@ -352,6 +542,7 @@ NULL); show_error_dialog (_("There doesn't seem to be any wireless devices configured on your system.\nPlease verify your configuration if you think this is incorrect.")); } @@ -307,7 +300,7 @@ } static void -@@ -775,8 +973,10 @@ +@@ -577,8 +768,10 @@ applet->prefs = NULL; } @@ -317,4 +310,4 @@ +#endif } - static GtkWidget * + static void diff --git a/x11/gnomeapplets2/pkg-plist b/x11/gnomeapplets2/pkg-plist index afbdd9de3754..73b9b72d75d2 100644 --- a/x11/gnomeapplets2/pkg-plist +++ b/x11/gnomeapplets2/pkg-plist @@ -1,4 +1,8 @@ bin/gkb_xmmap +bin/gnome-keyboard-layout +etc/gconf/gconf.xml.defaults/apps/stickynotes_applet/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/stickynotes_applet/defaults/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/stickynotes_applet/settings/%gconf.xml %%BATTERY%%etc/gconf/gconf.xml.defaults/schemas/apps/battstat-applet/%gconf.xml %%BATTERY%%etc/gconf/gconf.xml.defaults/schemas/apps/battstat-applet/prefs/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/cdplayer-applet/%gconf.xml @@ -15,12 +19,19 @@ etc/gconf/gconf.xml.defaults/schemas/apps/gtik/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gtik/prefs/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gweather/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gweather/prefs/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/prefs/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/mini-commander/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/mini-commander/prefs/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/mixer_applet/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/mixer_applet/prefs/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/modemlights/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/modemlights/prefs/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/multiload/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/multiload/prefs/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/stickynotes_applet/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/stickynotes_applet/defaults/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/stickynotes_applet/settings/%gconf.xml %%BATTERY%%etc/gconf/schemas/battstat.schemas etc/gconf/schemas/cdplayer.schemas etc/gconf/schemas/charpick.schemas @@ -29,11 +40,16 @@ etc/gconf/schemas/geyes.schemas etc/gconf/schemas/gkb.schemas etc/gconf/schemas/gtik.schemas etc/gconf/schemas/gweather.schemas +etc/gconf/schemas/mailcheck.schemas etc/gconf/schemas/mini-commander.schemas +etc/gconf/schemas/mixer.schemas etc/gconf/schemas/modemlights.schemas etc/gconf/schemas/multiload.schemas +etc/gconf/schemas/stickynotes.schemas %%BATTERY%%etc/sound/events/battstat_applet.soundlist -%%BATTERY%%libdata/bonobo/servers/GNOME_BattstatApplet.server +etc/sound/events/mailcheck.soundlist +libdata/bonobo/servers/GNOME_AccessxStatusApplet.server +libdata/bonobo/servers/GNOME_BattstatApplet.server libdata/bonobo/servers/GNOME_CDPlayerApplet.server libdata/bonobo/servers/GNOME_CharpickerApplet.server libdata/bonobo/servers/GNOME_DriveMountApplet.server @@ -41,11 +57,14 @@ libdata/bonobo/servers/GNOME_GWeatherApplet_Factory.server libdata/bonobo/servers/GNOME_GeyesApplet.server libdata/bonobo/servers/GNOME_GtikApplet.server libdata/bonobo/servers/GNOME_KeyboardApplet_Factory.server +libdata/bonobo/servers/GNOME_MailcheckApplet_Factory.server libdata/bonobo/servers/GNOME_MiniCommanderApplet.server libdata/bonobo/servers/GNOME_MixerApplet.server libdata/bonobo/servers/GNOME_ModemLightsApplet.server libdata/bonobo/servers/GNOME_MultiLoadApplet_Factory.server libdata/bonobo/servers/GNOME_Panel_WirelessApplet.server +libdata/bonobo/servers/GNOME_StickyNotesApplet.server +libexec/accessx-status-applet %%BATTERY%%libexec/battstat-applet-2 libexec/cdplayer_applet2 libexec/charpick_applet2 @@ -55,10 +74,12 @@ libexec/gkb-applet-2 libexec/gnome-applets/mc-install-default-macros libexec/gtik2_applet2 libexec/gweather-applet-2 +libexec/mailcheck-applet libexec/mini_commander_applet libexec/mixer_applet2 libexec/modemlights_applet2 libexec/multiload-applet-2 +libexec/stickynotes_applet libexec/wireless-applet %%BATTERY%%share/gnome/battstat_applet/battstat_applet.glade share/gnome/gen_util/mini-commander.glade @@ -93,7 +114,7 @@ share/gnome/gkb/Belgian.keyprop share/gnome/gkb/BulgarianCyril.keyprop share/gnome/gkb/CA_English.keyprop share/gnome/gkb/CH_German_x.keyprop -share/gnome/gkb/CS_Czech.keyprop +share/gnome/gkb/CZ_Czech.keyprop share/gnome/gkb/CZ_Czech_Slovak.keyprop share/gnome/gkb/CZ_Czech_x.keyprop share/gnome/gkb/DE_German.keyprop @@ -115,10 +136,6 @@ share/gnome/gkb/FR_French_x.keyprop share/gnome/gkb/FrenchCanadian.keyprop share/gnome/gkb/FrenchCanadian2.keyprop share/gnome/gkb/FrenchSwiss.keyprop -share/gnome/gkb/GB-102.keyprop -share/gnome/gkb/GB.keyprop -share/gnome/gkb/GB_English.keyprop -share/gnome/gkb/GB_English_x.keyprop share/gnome/gkb/GE_Georgian_x.keyprop share/gnome/gkb/GR_Greek.keyprop share/gnome/gkb/GR_Greek_x.keyprop @@ -171,11 +188,16 @@ share/gnome/gkb/RU_Russian_x.keyprop share/gnome/gkb/RU_Russian_x_rev.keyprop share/gnome/gkb/RussianCyril.keyprop share/gnome/gkb/SE_Swedish.keyprop +share/gnome/gkb/SE_Swedish_x.keyprop share/gnome/gkb/SI_Slovenian.keyprop +share/gnome/gkb/SI_Slovenian_x.keyprop share/gnome/gkb/SR_Dutch.keyprop share/gnome/gkb/Slovak.keyprop +share/gnome/gkb/Slovene.keyprop share/gnome/gkb/Slovenian.keyprop share/gnome/gkb/Swedish.keyprop +share/gnome/gkb/Syriac.keyprop +share/gnome/gkb/Syriac_Phonetic.keyprop share/gnome/gkb/TH_Thai.keyprop share/gnome/gkb/TH_Thai_x.keyprop share/gnome/gkb/TR-f.keyprop @@ -185,8 +207,12 @@ share/gnome/gkb/TR_Turkish_x.keyprop share/gnome/gkb/Thai.keyprop share/gnome/gkb/Thai2.keyprop share/gnome/gkb/UA_Ukrainian.keyprop +share/gnome/gkb/UK-102.keyprop share/gnome/gkb/UK-x86.keyprop share/gnome/gkb/UK.keyprop +share/gnome/gkb/UK_English.keyprop +share/gnome/gkb/UK_English_x.keyprop +share/gnome/gkb/UK_United_Kingdom.keyprop share/gnome/gkb/US-101.keyprop share/gnome/gkb/US-101A-x86.keyprop share/gnome/gkb/US-84.keyprop @@ -201,9 +227,11 @@ share/gnome/gkb/US_English.keyprop share/gnome/gkb/US_international.keyprop share/gnome/gkb/VN_Vietnamese.keyprop share/gnome/gkb/YU_Serb_x.keyprop +share/gnome/gkb/YU_Serbo-Croatian_x.keyprop share/gnome/gkb/Yugoslav.keyprop share/gnome/gkb/presets.xml -%%BATTERY%%share/gnome/gnome-2.0/ui/GNOME_BattstatApplet.xml +share/gnome/gnome-2.0/ui/GNOME_AccessxApplet.xml +share/gnome/gnome-2.0/ui/GNOME_BattstatApplet.xml share/gnome/gnome-2.0/ui/GNOME_CDPlayerApplet.xml share/gnome/gnome-2.0/ui/GNOME_CharpickerApplet.xml share/gnome/gnome-2.0/ui/GNOME_DriveMountApplet.xml @@ -211,18 +239,22 @@ share/gnome/gnome-2.0/ui/GNOME_GWeatherApplet.xml share/gnome/gnome-2.0/ui/GNOME_GeyesApplet.xml share/gnome/gnome-2.0/ui/GNOME_GtikApplet.xml share/gnome/gnome-2.0/ui/GNOME_KeyboardApplet.xml +share/gnome/gnome-2.0/ui/GNOME_MailCheckApplet.xml share/gnome/gnome-2.0/ui/GNOME_MiniCommanderApplet.xml share/gnome/gnome-2.0/ui/GNOME_MixerApplet.xml share/gnome/gnome-2.0/ui/GNOME_ModemlightsApplet.xml share/gnome/gnome-2.0/ui/GNOME_MultiloadApplet.xml +share/gnome/gnome-2.0/ui/GNOME_StickyNotesApplet.xml share/gnome/gnome-2.0/ui/GNOME_WirelessApplet.xml share/gnome/gweather/Locations +share/gnome/help/accessx-status/C/accessx-status.xml +share/gnome/help/accessx-status/C/figures/accessx-status-applet.png +share/gnome/help/accessx-status/C/legal.xml %%BATTERY%%share/gnome/help/battstat/C/battstat.xml %%BATTERY%%share/gnome/help/battstat/C/figures/battstat-apperance.png %%BATTERY%%share/gnome/help/battstat/C/figures/battstat-applet.png %%BATTERY%%share/gnome/help/battstat/C/figures/battstat-general.png %%BATTERY%%share/gnome/help/battstat/C/legal.xml -%%BATTERY%%share/gnome/help/battstat/C/topic.dat %%BATTERY%%share/gnome/help/battstat/ja/battstat.xml %%BATTERY%%share/gnome/help/battstat/ja/figures/battstat-apperance.png %%BATTERY%%share/gnome/help/battstat/ja/figures/battstat-applet.png @@ -232,12 +264,14 @@ share/gnome/help/cdplayer/C/cdplayer.xml share/gnome/help/cdplayer/C/figures/cdplayer_applet.png share/gnome/help/cdplayer/C/figures/cdplayer_applet_eject.png share/gnome/help/cdplayer/C/figures/cdplayer_applet_nexttrack.png +share/gnome/help/cdplayer/C/figures/cdplayer_applet_pause.png +share/gnome/help/cdplayer/C/figures/cdplayer_applet_play.png +share/gnome/help/cdplayer/C/figures/cdplayer_applet_playafterpause.png share/gnome/help/cdplayer/C/figures/cdplayer_applet_playing.png share/gnome/help/cdplayer/C/figures/cdplayer_applet_playpause.png share/gnome/help/cdplayer/C/figures/cdplayer_applet_prevtrack.png share/gnome/help/cdplayer/C/figures/cdplayer_applet_stop.png share/gnome/help/cdplayer/C/legal.xml -share/gnome/help/cdplayer/C/topic.dat share/gnome/help/cdplayer/de/cdplayer.xml share/gnome/help/cdplayer/de/figures/cdplayer_applet.png share/gnome/help/cdplayer/de/figures/cdplayer_applet_eject.png @@ -256,7 +290,6 @@ share/gnome/help/cdplayer/es/figures/cdplayer_applet_playpause.png share/gnome/help/cdplayer/es/figures/cdplayer_applet_prevtrack.png share/gnome/help/cdplayer/es/figures/cdplayer_applet_stop.png share/gnome/help/cdplayer/es/legal.xml -share/gnome/help/cdplayer/es/topic.dat share/gnome/help/cdplayer/fr/cdplayer.xml share/gnome/help/cdplayer/fr/figures/cdplayer_applet.png share/gnome/help/cdplayer/fr/figures/cdplayer_applet_eject.png @@ -279,12 +312,14 @@ share/gnome/help/cdplayer/ja/cdplayer.xml share/gnome/help/cdplayer/ja/figures/cdplayer_applet.png share/gnome/help/cdplayer/ja/figures/cdplayer_applet_eject.png share/gnome/help/cdplayer/ja/figures/cdplayer_applet_nexttrack.png +share/gnome/help/cdplayer/ja/figures/cdplayer_applet_pause.png +share/gnome/help/cdplayer/ja/figures/cdplayer_applet_play.png +share/gnome/help/cdplayer/ja/figures/cdplayer_applet_playafterpause.png share/gnome/help/cdplayer/ja/figures/cdplayer_applet_playing.png share/gnome/help/cdplayer/ja/figures/cdplayer_applet_playpause.png share/gnome/help/cdplayer/ja/figures/cdplayer_applet_prevtrack.png share/gnome/help/cdplayer/ja/figures/cdplayer_applet_stop.png share/gnome/help/cdplayer/ja/legal.xml -share/gnome/help/cdplayer/ja/topic.dat share/gnome/help/cdplayer/ko/cdplayer.xml share/gnome/help/cdplayer/ko/figures/cdplayer_applet.png share/gnome/help/cdplayer/ko/figures/cdplayer_applet_eject.png @@ -322,51 +357,69 @@ share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_prevtrack.png share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_stop.png share/gnome/help/cdplayer/zh_TW/legal.xml share/gnome/help/char-palette/C/char-palette.xml -share/gnome/help/char-palette/C/figures/charpick_applet.png +share/gnome/help/char-palette/C/figures/charpalette_applet.png +share/gnome/help/char-palette/C/figures/charpalette_chargroup.png share/gnome/help/char-palette/C/figures/charpick_characters.png -share/gnome/help/char-palette/C/figures/charpick_chargroup.png share/gnome/help/char-palette/C/legal.xml share/gnome/help/char-palette/de/char-palette.xml +share/gnome/help/char-palette/de/figures/charpalette_applet.png +share/gnome/help/char-palette/de/figures/charpalette_chargroup.png share/gnome/help/char-palette/de/figures/charpick_applet.png share/gnome/help/char-palette/de/figures/charpick_characters.png share/gnome/help/char-palette/de/figures/charpick_chargroup.png share/gnome/help/char-palette/de/legal.xml share/gnome/help/char-palette/es/char-palette.xml +share/gnome/help/char-palette/es/figures/charpalette_applet.png +share/gnome/help/char-palette/es/figures/charpalette_chargroup.png share/gnome/help/char-palette/es/figures/charpick_applet.png share/gnome/help/char-palette/es/figures/charpick_characters.png share/gnome/help/char-palette/es/figures/charpick_chargroup.png share/gnome/help/char-palette/es/legal.xml share/gnome/help/char-palette/fr/char-palette.xml +share/gnome/help/char-palette/fr/figures/charpalette_applet.png +share/gnome/help/char-palette/fr/figures/charpalette_chargroup.png share/gnome/help/char-palette/fr/figures/charpick_applet.png share/gnome/help/char-palette/fr/figures/charpick_characters.png share/gnome/help/char-palette/fr/figures/charpick_chargroup.png share/gnome/help/char-palette/fr/legal.xml share/gnome/help/char-palette/it/char-palette.xml +share/gnome/help/char-palette/it/figures/charpalette_applet.png +share/gnome/help/char-palette/it/figures/charpalette_chargroup.png share/gnome/help/char-palette/it/figures/charpick_applet.png share/gnome/help/char-palette/it/figures/charpick_characters.png share/gnome/help/char-palette/it/figures/charpick_chargroup.png share/gnome/help/char-palette/it/legal.xml share/gnome/help/char-palette/ja/char-palette.xml +share/gnome/help/char-palette/ja/figures/charpalette_applet.png +share/gnome/help/char-palette/ja/figures/charpalette_chargroup.png share/gnome/help/char-palette/ja/figures/charpick_applet.png share/gnome/help/char-palette/ja/figures/charpick_characters.png share/gnome/help/char-palette/ja/figures/charpick_chargroup.png share/gnome/help/char-palette/ja/legal.xml share/gnome/help/char-palette/ko/char-palette.xml +share/gnome/help/char-palette/ko/figures/charpalette_applet.png +share/gnome/help/char-palette/ko/figures/charpalette_chargroup.png share/gnome/help/char-palette/ko/figures/charpick_applet.png share/gnome/help/char-palette/ko/figures/charpick_characters.png share/gnome/help/char-palette/ko/figures/charpick_chargroup.png share/gnome/help/char-palette/ko/legal.xml share/gnome/help/char-palette/sv/char-palette.xml +share/gnome/help/char-palette/sv/figures/charpalette_applet.png +share/gnome/help/char-palette/sv/figures/charpalette_chargroup.png share/gnome/help/char-palette/sv/figures/charpick_applet.png share/gnome/help/char-palette/sv/figures/charpick_characters.png share/gnome/help/char-palette/sv/figures/charpick_chargroup.png share/gnome/help/char-palette/sv/legal.xml share/gnome/help/char-palette/zh_CN/char-palette.xml +share/gnome/help/char-palette/zh_CN/figures/charpalette_applet.png +share/gnome/help/char-palette/zh_CN/figures/charpalette_chargroup.png share/gnome/help/char-palette/zh_CN/figures/charpick_applet.png share/gnome/help/char-palette/zh_CN/figures/charpick_characters.png share/gnome/help/char-palette/zh_CN/figures/charpick_chargroup.png share/gnome/help/char-palette/zh_CN/legal.xml share/gnome/help/char-palette/zh_TW/char-palette.xml +share/gnome/help/char-palette/zh_TW/figures/charpalette_applet.png +share/gnome/help/char-palette/zh_TW/figures/charpalette_chargroup.png share/gnome/help/char-palette/zh_TW/figures/charpick_applet.png share/gnome/help/char-palette/zh_TW/figures/charpick_characters.png share/gnome/help/char-palette/zh_TW/figures/charpick_chargroup.png @@ -410,34 +463,40 @@ share/gnome/help/drivemount/C/legal.xml share/gnome/help/geyes/C/figures/geyes_applet.png share/gnome/help/geyes/C/geyes.xml share/gnome/help/geyes/C/legal.xml -share/gnome/help/geyes/C/topic.dat share/gnome/help/geyes/de/figures/geyes_applet.png +share/gnome/help/geyes/de/figures/geyes_settings.png share/gnome/help/geyes/de/geyes.xml share/gnome/help/geyes/de/legal.xml share/gnome/help/geyes/es/figures/geyes_applet.png +share/gnome/help/geyes/es/figures/geyes_settings.png share/gnome/help/geyes/es/geyes.xml share/gnome/help/geyes/es/legal.xml -share/gnome/help/geyes/es/topic.dat share/gnome/help/geyes/fr/figures/geyes_applet.png +share/gnome/help/geyes/fr/figures/geyes_settings.png share/gnome/help/geyes/fr/geyes.xml share/gnome/help/geyes/fr/legal.xml share/gnome/help/geyes/it/figures/geyes_applet.png +share/gnome/help/geyes/it/figures/geyes_settings.png share/gnome/help/geyes/it/geyes.xml share/gnome/help/geyes/it/legal.xml -share/gnome/help/geyes/it/topic.dat share/gnome/help/geyes/ja/figures/geyes_applet.png +share/gnome/help/geyes/ja/figures/geyes_settings.png share/gnome/help/geyes/ja/geyes.xml share/gnome/help/geyes/ja/legal.xml share/gnome/help/geyes/ko/figures/geyes_applet.png +share/gnome/help/geyes/ko/figures/geyes_settings.png share/gnome/help/geyes/ko/geyes.xml share/gnome/help/geyes/ko/legal.xml share/gnome/help/geyes/sv/figures/geyes_applet.png +share/gnome/help/geyes/sv/figures/geyes_settings.png share/gnome/help/geyes/sv/geyes.xml share/gnome/help/geyes/sv/legal.xml share/gnome/help/geyes/zh_CN/figures/geyes_applet.png +share/gnome/help/geyes/zh_CN/figures/geyes_settings.png share/gnome/help/geyes/zh_CN/geyes.xml share/gnome/help/geyes/zh_CN/legal.xml share/gnome/help/geyes/zh_TW/figures/geyes_applet.png +share/gnome/help/geyes/zh_TW/figures/geyes_settings.png share/gnome/help/geyes/zh_TW/geyes.xml share/gnome/help/geyes/zh_TW/legal.xml share/gnome/help/gkb/C/figures/gkb_applet.png @@ -501,80 +560,172 @@ share/gnome/help/gtik2_applet2/zh_TW/figures/gtik_applet.png share/gnome/help/gtik2_applet2/zh_TW/gtik2_applet2.xml share/gnome/help/gtik2_applet2/zh_TW/legal.xml share/gnome/help/gweather/C/figures/gweather_applet.png +share/gnome/help/gweather/C/figures/gweather_settings.png +share/gnome/help/gweather/C/figures/gweather_weather.png share/gnome/help/gweather/C/gweather.xml share/gnome/help/gweather/C/legal.xml -share/gnome/help/gweather/C/topic.dat share/gnome/help/gweather/de/figures/gweather_applet.png +share/gnome/help/gweather/de/figures/gweather_settings.png +share/gnome/help/gweather/de/figures/gweather_weather.png share/gnome/help/gweather/de/gweather.xml share/gnome/help/gweather/de/legal.xml share/gnome/help/gweather/es/figures/gweather_applet.png +share/gnome/help/gweather/es/figures/gweather_settings.png +share/gnome/help/gweather/es/figures/gweather_weather.png share/gnome/help/gweather/es/gweather.xml share/gnome/help/gweather/es/legal.xml share/gnome/help/gweather/fr/figures/gweather_applet.png +share/gnome/help/gweather/fr/figures/gweather_settings.png +share/gnome/help/gweather/fr/figures/gweather_weather.png share/gnome/help/gweather/fr/gweather.xml share/gnome/help/gweather/fr/legal.xml +share/gnome/help/gweather/it/figures/gweather_applet.png +share/gnome/help/gweather/it/figures/gweather_settings.png +share/gnome/help/gweather/it/figures/gweather_weather.png +share/gnome/help/gweather/it/gweather.xml +share/gnome/help/gweather/it/legal.xml share/gnome/help/gweather/ja/figures/gweather_applet.png +share/gnome/help/gweather/ja/figures/gweather_settings.png +share/gnome/help/gweather/ja/figures/gweather_weather.png share/gnome/help/gweather/ja/gweather.xml share/gnome/help/gweather/ja/legal.xml share/gnome/help/gweather/ko/figures/gweather_applet.png +share/gnome/help/gweather/ko/figures/gweather_settings.png +share/gnome/help/gweather/ko/figures/gweather_weather.png share/gnome/help/gweather/ko/gweather.xml share/gnome/help/gweather/ko/legal.xml share/gnome/help/gweather/sv/figures/gweather_applet.png +share/gnome/help/gweather/sv/figures/gweather_settings.png +share/gnome/help/gweather/sv/figures/gweather_weather.png share/gnome/help/gweather/sv/gweather.xml share/gnome/help/gweather/sv/legal.xml share/gnome/help/gweather/zh_CN/figures/gweather_applet.png +share/gnome/help/gweather/zh_CN/figures/gweather_settings.png +share/gnome/help/gweather/zh_CN/figures/gweather_weather.png share/gnome/help/gweather/zh_CN/gweather.xml share/gnome/help/gweather/zh_CN/legal.xml share/gnome/help/gweather/zh_TW/figures/gweather_applet.png +share/gnome/help/gweather/zh_TW/figures/gweather_settings.png +share/gnome/help/gweather/zh_TW/figures/gweather_weather.png share/gnome/help/gweather/zh_TW/gweather.xml share/gnome/help/gweather/zh_TW/legal.xml -share/gnome/help/gweather_applet/it/figures/gweather_applet.png -share/gnome/help/gweather_applet/it/figures/gweather_settings.png -share/gnome/help/gweather_applet/it/figures/gweather_weather.png -share/gnome/help/gweather_applet/it/gweather.sgml -share/gnome/help/gweather_applet/it/gweather_applet.sgml -share/gnome/help/gweather_applet/it/ln10.html -share/gnome/help/gweather_applet/it/t1.html -share/gnome/help/gweather_applet/it/topic.dat -share/gnome/help/mixer_applet/it/figures/mixer_applet.png -share/gnome/help/mixer_applet/it/ln10.html -share/gnome/help/mixer_applet/it/mixer.sgml -share/gnome/help/mixer_applet/it/mixer_applet.sgml -share/gnome/help/mixer_applet/it/t1.html -share/gnome/help/mixer_applet/it/topic.dat +share/gnome/help/mailcheck/C/figures/mailcheck_applet.png +share/gnome/help/mailcheck/C/legal.xml +share/gnome/help/mailcheck/C/mailcheck.xml +share/gnome/help/mailcheck/de/figures/mailcheck-applet.png +share/gnome/help/mailcheck/de/figures/mailcheck-properties-mailbox.png +share/gnome/help/mailcheck/de/figures/mailcheck-properties-mailcheck.png +share/gnome/help/mailcheck/de/figures/mailcheck_applet.png +share/gnome/help/mailcheck/de/legal.xml +share/gnome/help/mailcheck/de/mailcheck.xml +share/gnome/help/mailcheck/es/figures/mailcheck-applet.png +share/gnome/help/mailcheck/es/figures/mailcheck-properties-mailbox.png +share/gnome/help/mailcheck/es/figures/mailcheck-properties-mailcheck.png +share/gnome/help/mailcheck/es/figures/mailcheck_applet.png +share/gnome/help/mailcheck/es/legal.xml +share/gnome/help/mailcheck/es/mailcheck.xml +share/gnome/help/mailcheck/fr/figures/mailcheck-applet.png +share/gnome/help/mailcheck/fr/figures/mailcheck-properties-mailbox.png +share/gnome/help/mailcheck/fr/figures/mailcheck-properties-mailcheck.png +share/gnome/help/mailcheck/fr/figures/mailcheck_applet.png +share/gnome/help/mailcheck/fr/legal.xml +share/gnome/help/mailcheck/fr/mailcheck.xml +share/gnome/help/mailcheck/it/figures/mailcheck-applet.png +share/gnome/help/mailcheck/it/figures/mailcheck-properties-mailbox.png +share/gnome/help/mailcheck/it/figures/mailcheck-properties-mailcheck.png +share/gnome/help/mailcheck/it/figures/mailcheck_applet.png +share/gnome/help/mailcheck/it/legal.xml +share/gnome/help/mailcheck/it/mailcheck.xml +share/gnome/help/mailcheck/ja/figures/mailcheck_applet.png +share/gnome/help/mailcheck/ja/legal.xml +share/gnome/help/mailcheck/ja/mailcheck.xml +share/gnome/help/mailcheck/ko/figures/mailcheck-applet.png +share/gnome/help/mailcheck/ko/figures/mailcheck-properties-mailbox.png +share/gnome/help/mailcheck/ko/figures/mailcheck-properties-mailcheck.png +share/gnome/help/mailcheck/ko/figures/mailcheck_applet.png +share/gnome/help/mailcheck/ko/legal.xml +share/gnome/help/mailcheck/ko/mailcheck.xml +share/gnome/help/mailcheck/sv/figures/mailcheck-applet.png +share/gnome/help/mailcheck/sv/figures/mailcheck-properties-mailbox.png +share/gnome/help/mailcheck/sv/figures/mailcheck-properties-mailcheck.png +share/gnome/help/mailcheck/sv/figures/mailcheck_applet.png +share/gnome/help/mailcheck/sv/legal.xml +share/gnome/help/mailcheck/sv/mailcheck.xml +share/gnome/help/mailcheck/zh_CN/figures/mailcheck-applet.png +share/gnome/help/mailcheck/zh_CN/figures/mailcheck-properties-mailbox.png +share/gnome/help/mailcheck/zh_CN/figures/mailcheck-properties-mailcheck.png +share/gnome/help/mailcheck/zh_CN/figures/mailcheck_applet.png +share/gnome/help/mailcheck/zh_CN/legal.xml +share/gnome/help/mailcheck/zh_CN/mailcheck.xml +share/gnome/help/mailcheck/zh_TW/figures/mailcheck-applet.png +share/gnome/help/mailcheck/zh_TW/figures/mailcheck-properties-mailbox.png +share/gnome/help/mailcheck/zh_TW/figures/mailcheck-properties-mailcheck.png +share/gnome/help/mailcheck/zh_TW/figures/mailcheck_applet.png +share/gnome/help/mailcheck/zh_TW/legal.xml +share/gnome/help/mailcheck/zh_TW/mailcheck.xml share/gnome/help/mixer_applet2/C/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/C/legal.xml share/gnome/help/mixer_applet2/C/mixer_applet2.xml -share/gnome/help/mixer_applet2/C/topic.dat +share/gnome/help/mixer_applet2/de/figures/mixer_applet.png share/gnome/help/mixer_applet2/de/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/de/legal.xml share/gnome/help/mixer_applet2/de/mixer_applet2.xml +share/gnome/help/mixer_applet2/es/figures/mixer_applet.png share/gnome/help/mixer_applet2/es/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/es/legal.xml share/gnome/help/mixer_applet2/es/mixer_applet2.xml -share/gnome/help/mixer_applet2/es/topic.dat +share/gnome/help/mixer_applet2/fr/figures/mixer_applet.png share/gnome/help/mixer_applet2/fr/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/fr/legal.xml share/gnome/help/mixer_applet2/fr/mixer_applet2.xml +share/gnome/help/mixer_applet2/ja/figures/mixer_applet.png share/gnome/help/mixer_applet2/ja/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/ja/legal.xml share/gnome/help/mixer_applet2/ja/mixer_applet2.xml +share/gnome/help/mixer_applet2/ko/figures/mixer_applet.png share/gnome/help/mixer_applet2/ko/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/ko/legal.xml share/gnome/help/mixer_applet2/ko/mixer_applet2.xml +share/gnome/help/mixer_applet2/sv/figures/mixer_applet.png share/gnome/help/mixer_applet2/sv/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/sv/legal.xml share/gnome/help/mixer_applet2/sv/mixer_applet2.xml +share/gnome/help/mixer_applet2/zh_CN/figures/mixer_applet.png share/gnome/help/mixer_applet2/zh_CN/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/zh_CN/legal.xml share/gnome/help/mixer_applet2/zh_CN/mixer_applet2.xml +share/gnome/help/mixer_applet2/zh_TW/figures/mixer_applet.png share/gnome/help/mixer_applet2/zh_TW/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/zh_TW/legal.xml share/gnome/help/mixer_applet2/zh_TW/mixer_applet2.xml +share/gnome/help/modemlights/C/figures/modemlights-advanced.png +share/gnome/help/modemlights/C/figures/modemlights-advpref.png +share/gnome/help/modemlights/C/figures/modemlights-color.png +share/gnome/help/modemlights/C/figures/modemlights-general.png +share/gnome/help/modemlights/C/figures/modemlights-prefs.png +share/gnome/help/modemlights/C/figures/modemlights.png +share/gnome/help/modemlights/C/figures/modemlights_applet.png +share/gnome/help/modemlights/C/figures/modemlights_applet_advanced.png +share/gnome/help/modemlights/C/figures/modemlights_applet_awaiting.png +share/gnome/help/modemlights/C/figures/modemlights_applet_button.png +share/gnome/help/modemlights/C/figures/modemlights_applet_button_2.png +share/gnome/help/modemlights/C/figures/modemlights_applet_colors.png +share/gnome/help/modemlights/C/figures/modemlights_applet_connected.png +share/gnome/help/modemlights/C/figures/modemlights_applet_general.png +share/gnome/help/modemlights/C/figures/modemlights_applet_if_connect.png +share/gnome/help/modemlights/C/figures/modemlights_applet_not_connected.png +share/gnome/help/modemlights/C/figures/modemlights_applet_prefs_connecting.png +share/gnome/help/modemlights/C/figures/modemlights_applet_prefs_display.png +share/gnome/help/modemlights/C/legal.xml +share/gnome/help/modemlights/C/modemlights.xml +share/gnome/help/stickynotes_applet/C/legal.xml +share/gnome/help/stickynotes_applet/C/stickynotes_applet.xml +share/gnome/omf/gnome-applets/accessx-status-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/accessx-status-C.omf 2>/dev/null || /usr/bin/true %%BATTERY%%share/gnome/omf/gnome-applets/battstat-C.omf -@exec scrollkeeper-install -q %D/%%BATTERY%%share/gnome/omf/gnome-applets/battstat-C.omf 2>/dev/null || /usr/bin/true +%%BATTERY%%@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/battstat-C.omf 2>/dev/null || /usr/bin/true %%BATTERY%%share/gnome/omf/gnome-applets/battstat-ja.omf -@exec scrollkeeper-install -q %D/%%BATTERY%%share/gnome/omf/gnome-applets/battstat-ja.omf 2>/dev/null || /usr/bin/true +%%BATTERY%%@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/battstat-ja.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/cdplayer-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/cdplayer-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/cdplayer-de.omf @@ -717,8 +868,26 @@ share/gnome/omf/gnome-applets/gweather-zh_TW.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gweather-zh_TW.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/gweather_applet-it.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gweather_applet-it.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-applets/mixer_applet-it.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mixer_applet-it.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/mailcheck-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mailcheck-C.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/mailcheck-de.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mailcheck-de.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/mailcheck-es.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mailcheck-es.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/mailcheck-fr.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mailcheck-fr.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/mailcheck-it.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mailcheck-it.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/mailcheck-ja.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mailcheck-ja.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/mailcheck-ko.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mailcheck-ko.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/mailcheck-sv.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mailcheck-sv.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/mailcheck-zh_CN.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mailcheck-zh_CN.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/mailcheck-zh_TW.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mailcheck-zh_TW.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/mixer_applet2-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mixer_applet2-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/mixer_applet2-de.omf @@ -737,6 +906,46 @@ share/gnome/omf/gnome-applets/mixer_applet2-zh_CN.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mixer_applet2-zh_CN.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/mixer_applet2-zh_TW.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mixer_applet2-zh_TW.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/modemlights-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/modemlights-C.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/stickynotes_applet-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-C.omf 2>/dev/null || /usr/bin/true +share/gnome/pixmaps/accessx-status-applet/ax-applet.png +share/gnome/pixmaps/accessx-status-applet/ax-bouncekeys.png +share/gnome/pixmaps/accessx-status-applet/ax-key-base.png +share/gnome/pixmaps/accessx-status-applet/ax-key-inverse.png +share/gnome/pixmaps/accessx-status-applet/ax-key-no.png +share/gnome/pixmaps/accessx-status-applet/ax-key-none.png +share/gnome/pixmaps/accessx-status-applet/ax-key-yes.png +share/gnome/pixmaps/accessx-status-applet/ax-slowkeys-no.png +share/gnome/pixmaps/accessx-status-applet/ax-slowkeys-pending.png +share/gnome/pixmaps/accessx-status-applet/ax-slowkeys-yes.png +share/gnome/pixmaps/accessx-status-applet/ax-slowkeys.png +share/gnome/pixmaps/accessx-status-applet/mousekeys-base.png +share/gnome/pixmaps/accessx-status-applet/mousekeys-default-left.png +share/gnome/pixmaps/accessx-status-applet/mousekeys-default-middle.png +share/gnome/pixmaps/accessx-status-applet/mousekeys-default-right.png +share/gnome/pixmaps/accessx-status-applet/mousekeys-pressed-left.png +share/gnome/pixmaps/accessx-status-applet/mousekeys-pressed-middle.png +share/gnome/pixmaps/accessx-status-applet/mousekeys-pressed-right.png +share/gnome/pixmaps/accessx-status-applet/sticky-alt-latched.png +share/gnome/pixmaps/accessx-status-applet/sticky-alt-locked.png +share/gnome/pixmaps/accessx-status-applet/sticky-alt-none.png +share/gnome/pixmaps/accessx-status-applet/sticky-ctrl-latched.png +share/gnome/pixmaps/accessx-status-applet/sticky-ctrl-locked.png +share/gnome/pixmaps/accessx-status-applet/sticky-ctrl-none.png +share/gnome/pixmaps/accessx-status-applet/sticky-hyper-latched.png +share/gnome/pixmaps/accessx-status-applet/sticky-hyper-locked.png +share/gnome/pixmaps/accessx-status-applet/sticky-hyper-none.png +share/gnome/pixmaps/accessx-status-applet/sticky-meta-latched.png +share/gnome/pixmaps/accessx-status-applet/sticky-meta-locked.png +share/gnome/pixmaps/accessx-status-applet/sticky-meta-none.png +share/gnome/pixmaps/accessx-status-applet/sticky-shift-latched.png +share/gnome/pixmaps/accessx-status-applet/sticky-shift-locked.png +share/gnome/pixmaps/accessx-status-applet/sticky-shift-none.png +share/gnome/pixmaps/accessx-status-applet/sticky-super-latched.png +share/gnome/pixmaps/accessx-status-applet/sticky-super-locked.png +share/gnome/pixmaps/accessx-status-applet/sticky-super-none.png %%BATTERY%%share/gnome/pixmaps/battstat.png share/gnome/pixmaps/charpick.png share/gnome/pixmaps/drivemount-applet.png @@ -754,7 +963,6 @@ share/gnome/pixmaps/gkb/br.png share/gnome/pixmaps/gkb/by.png share/gnome/pixmaps/gkb/ca.png share/gnome/pixmaps/gkb/ch.png -share/gnome/pixmaps/gkb/cs.png share/gnome/pixmaps/gkb/cu.png share/gnome/pixmaps/gkb/cz.png share/gnome/pixmaps/gkb/de.png @@ -767,7 +975,6 @@ share/gnome/pixmaps/gkb/es.png share/gnome/pixmaps/gkb/eu.png share/gnome/pixmaps/gkb/fi.png share/gnome/pixmaps/gkb/fr.png -share/gnome/pixmaps/gkb/gb.png share/gnome/pixmaps/gkb/ge.png share/gnome/pixmaps/gkb/gkb.png share/gnome/pixmaps/gkb/gr.png @@ -802,13 +1009,12 @@ share/gnome/pixmaps/gkb/qc.png share/gnome/pixmaps/gkb/ro.png share/gnome/pixmaps/gkb/ru.png share/gnome/pixmaps/gkb/sa.png +share/gnome/pixmaps/gkb/sd.png share/gnome/pixmaps/gkb/se.png share/gnome/pixmaps/gkb/si.png share/gnome/pixmaps/gkb/sk.png share/gnome/pixmaps/gkb/so.png share/gnome/pixmaps/gkb/sr.png -share/gnome/pixmaps/gkb/su.png -share/gnome/pixmaps/gkb/sv.png share/gnome/pixmaps/gkb/sy.png share/gnome/pixmaps/gkb/th.png share/gnome/pixmaps/gkb/tn.png @@ -826,6 +1032,12 @@ share/gnome/pixmaps/gnome-cpu.png share/gnome/pixmaps/gnome-eyes.png share/gnome/pixmaps/gnome-mini-commander.png share/gnome/pixmaps/gweather/tstorm.xpm +share/gnome/pixmaps/mailcheck/eclouds.png +share/gnome/pixmaps/mailcheck/email-e.png +share/gnome/pixmaps/mailcheck/email-eclouds.png +share/gnome/pixmaps/mailcheck/email-tiny.png +share/gnome/pixmaps/mailcheck/email.png +share/gnome/pixmaps/mailcheck/tux-anim.png share/gnome/pixmaps/mini-commander/browser-mini.xpm share/gnome/pixmaps/mini-commander/history-mini.xpm share/gnome/pixmaps/mixer/gnome-mixer-applet.png @@ -834,6 +1046,13 @@ share/gnome/pixmaps/mixer/volume-medium.png share/gnome/pixmaps/mixer/volume-min.png share/gnome/pixmaps/mixer/volume-mute.png share/gnome/pixmaps/mixer/volume-zero.png +share/gnome/pixmaps/stickynotes/close.png +share/gnome/pixmaps/stickynotes/locked.png +share/gnome/pixmaps/stickynotes/resize_se.png +share/gnome/pixmaps/stickynotes/resize_sw.png +share/gnome/pixmaps/stickynotes/stickynotes.png +share/gnome/pixmaps/stickynotes/stickynotes_prelight.png +share/gnome/pixmaps/stickynotes/unlocked.png share/gnome/pixmaps/wireless-applet/broken-0.png share/gnome/pixmaps/wireless-applet/no-link-0.png share/gnome/pixmaps/wireless-applet/signal-1-40.png @@ -841,6 +1060,7 @@ share/gnome/pixmaps/wireless-applet/signal-41-60.png share/gnome/pixmaps/wireless-applet/signal-61-80.png share/gnome/pixmaps/wireless-applet/signal-81-100.png share/gnome/pixmaps/wireless-applet/wireless-applet.png +share/gnome/stickynotes/stickynotes.glade share/gnome/wireless-applet/wireless-applet.glade share/gnome/xmodmap/xmodmap.am share/gnome/xmodmap/xmodmap.ar @@ -889,9 +1109,9 @@ share/gnome/xmodmap/xmodmap.lt_b share/gnome/xmodmap/xmodmap.lt_p share/gnome/xmodmap/xmodmap.mk share/gnome/xmodmap/xmodmap.mn +share/gnome/xmodmap/xmodmap.mn-phonet share/gnome/xmodmap/xmodmap.mn-rev share/gnome/xmodmap/xmodmap.mn-uni -share/gnome/xmodmap/xmodmap.mn-yawerty share/gnome/xmodmap/xmodmap.nl share/gnome/xmodmap/xmodmap.no share/gnome/xmodmap/xmodmap.pl @@ -932,8 +1152,10 @@ share/locale/ar/LC_MESSAGES/gnome-applets-2.0.mo share/locale/az/LC_MESSAGES/gnome-applets-2.0.mo share/locale/be/LC_MESSAGES/gnome-applets-2.0.mo share/locale/bg/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/bn/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ca/LC_MESSAGES/gnome-applets-2.0.mo share/locale/cs/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/cy/LC_MESSAGES/gnome-applets-2.0.mo share/locale/da/LC_MESSAGES/gnome-applets-2.0.mo share/locale/de/LC_MESSAGES/gnome-applets-2.0.mo share/locale/el/LC_MESSAGES/gnome-applets-2.0.mo @@ -949,6 +1171,7 @@ share/locale/gl/LC_MESSAGES/gnome-applets-2.0.mo share/locale/he/LC_MESSAGES/gnome-applets-2.0.mo share/locale/hi/LC_MESSAGES/gnome-applets-2.0.mo share/locale/hu/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/is/LC_MESSAGES/gnome-applets-2.0.mo share/locale/it/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ja/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ko/LC_MESSAGES/gnome-applets-2.0.mo @@ -979,8 +1202,16 @@ share/locale/wa/LC_MESSAGES/gnome-applets-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-applets-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/wireless-applet +@dirrm share/gnome/stickynotes @dirrm share/gnome/pixmaps/wireless-applet +@dirrm share/gnome/pixmaps/stickynotes @dirrm share/gnome/pixmaps/mixer +@dirrm share/gnome/pixmaps/accessx-status-applet +@dirrm share/gnome/help/stickynotes_applet/C +@dirrm share/gnome/help/stickynotes_applet +@dirrm share/gnome/help/modemlights/C/figures +@dirrm share/gnome/help/modemlights/C +@dirrm share/gnome/help/modemlights @dirrm share/gnome/help/mixer_applet2/zh_TW/figures @dirrm share/gnome/help/mixer_applet2/zh_TW @dirrm share/gnome/help/mixer_applet2/zh_CN/figures @@ -1000,14 +1231,27 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/mixer_applet2/C/figures @dirrm share/gnome/help/mixer_applet2/C @dirrm share/gnome/help/mixer_applet2 -@dirrm share/gnome/help/mixer_applet/it/stylesheet-images -@dirrm share/gnome/help/mixer_applet/it/figures -@dirrm share/gnome/help/mixer_applet/it -@dirrm share/gnome/help/mixer_applet -@dirrm share/gnome/help/gweather_applet/it/stylesheet-images -@dirrm share/gnome/help/gweather_applet/it/figures -@dirrm share/gnome/help/gweather_applet/it -@dirrm share/gnome/help/gweather_applet +@dirrm share/gnome/help/mailcheck/zh_TW/figures +@dirrm share/gnome/help/mailcheck/zh_TW +@dirrm share/gnome/help/mailcheck/zh_CN/figures +@dirrm share/gnome/help/mailcheck/zh_CN +@dirrm share/gnome/help/mailcheck/sv/figures +@dirrm share/gnome/help/mailcheck/sv +@dirrm share/gnome/help/mailcheck/ko/figures +@dirrm share/gnome/help/mailcheck/ko +@dirrm share/gnome/help/mailcheck/ja/figures +@dirrm share/gnome/help/mailcheck/ja +@dirrm share/gnome/help/mailcheck/it/figures +@dirrm share/gnome/help/mailcheck/it +@dirrm share/gnome/help/mailcheck/fr/figures +@dirrm share/gnome/help/mailcheck/fr +@dirrm share/gnome/help/mailcheck/es/figures +@dirrm share/gnome/help/mailcheck/es +@dirrm share/gnome/help/mailcheck/de/figures +@dirrm share/gnome/help/mailcheck/de +@dirrm share/gnome/help/mailcheck/C/figures +@dirrm share/gnome/help/mailcheck/C +@dirrm share/gnome/help/mailcheck @dirrm share/gnome/help/gweather/zh_TW/figures @dirrm share/gnome/help/gweather/zh_TW @dirrm share/gnome/help/gweather/zh_CN/figures @@ -1018,6 +1262,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/gweather/ko @dirrm share/gnome/help/gweather/ja/figures @dirrm share/gnome/help/gweather/ja +@dirrm share/gnome/help/gweather/it/figures +@dirrm share/gnome/help/gweather/it @dirrm share/gnome/help/gweather/fr/figures @dirrm share/gnome/help/gweather/fr @dirrm share/gnome/help/gweather/es/figures @@ -1161,14 +1407,24 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo %%BATTERY%%@dirrm share/gnome/help/battstat/C/figures %%BATTERY%%@dirrm share/gnome/help/battstat/C %%BATTERY%%@dirrm share/gnome/help/battstat +@dirrm share/gnome/help/accessx-status/C/figures +@dirrm share/gnome/help/accessx-status/C +@dirrm share/gnome/help/accessx-status %%BATTERY%%@dirrm share/gnome/battstat_applet @dirrm libexec/gnome-applets +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/stickynotes_applet/settings +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/stickynotes_applet/defaults +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/stickynotes_applet @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/multiload/prefs @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/multiload @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/modemlights/prefs @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/modemlights +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mixer_applet/prefs +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mixer_applet @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mini-commander/prefs @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mini-commander +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/prefs +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gweather/prefs @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gweather @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gtik/prefs @@ -1185,8 +1441,12 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/cdplayer-applet %%BATTERY%%@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/battstat-applet/prefs %%BATTERY%%@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/battstat-applet -@unexec scrollkeeper-uninstall -q %D/%%BATTERY%%share/gnome/omf/gnome-applets/battstat-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/%%BATTERY%%share/gnome/omf/gnome-applets/battstat-ja.omf 2>/dev/null || /usr/bin/true +@dirrm etc/gconf/gconf.xml.defaults/apps/stickynotes_applet/settings +@dirrm etc/gconf/gconf.xml.defaults/apps/stickynotes_applet/defaults +@dirrm etc/gconf/gconf.xml.defaults/apps/stickynotes_applet +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/accessx-status-C.omf 2>/dev/null || /usr/bin/true +%%BATTERY%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/battstat-C.omf 2>/dev/null || /usr/bin/true +%%BATTERY%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/battstat-ja.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/cdplayer-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/cdplayer-de.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/cdplayer-es.omf 2>/dev/null || /usr/bin/true @@ -1258,7 +1518,16 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gweather-zh_CN.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gweather-zh_TW.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gweather_applet-it.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet-it.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-de.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-es.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-fr.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-it.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-ja.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-ko.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-sv.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-zh_CN.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mailcheck-zh_TW.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-de.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-es.omf 2>/dev/null || /usr/bin/true @@ -1268,3 +1537,5 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-sv.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-zh_CN.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-zh_TW.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/modemlights-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-C.omf 2>/dev/null || /usr/bin/true diff --git a/x11/gnomedesktop/Makefile b/x11/gnomedesktop/Makefile index 8ae160c83395..e25f33c070e9 100644 --- a/x11/gnomedesktop/Makefile +++ b/x11/gnomedesktop/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gnomedesktop -PORTVERSION= 2.2.2 +PORTVERSION= 2.4.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-desktop/2.2 +MASTER_SITE_SUBDIR= sources/gnome-desktop/2.4 DISTNAME= gnome-desktop-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -26,12 +26,10 @@ USE_GMAKE= yes USE_BISON= yes INSTALLS_SHLIB= yes USE_LIBTOOL= yes +CONFIGURE_ARGS= --with-gnome-distributor="FreeBSD GNOME Project" CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" MAN1= gnome-about.1 -post-patch: - @${REINPLACE_CMD} -E -e 's|GNOME_VENDOR=.*$$|GNOME_VENDOR="FreeBSD GNOME Project"|' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/x11/gnomedesktop/distinfo b/x11/gnomedesktop/distinfo index 1ef3d1c22b0e..9c50bf9f39fb 100644 --- a/x11/gnomedesktop/distinfo +++ b/x11/gnomedesktop/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-desktop-2.2.2.tar.bz2) = 335e6109abc5a04e69ab574464af1900 +MD5 (gnome2/gnome-desktop-2.4.0.tar.bz2) = 183c14d192bdd41bd34578e8e7dc55f1 diff --git a/x11/gnomedesktop/files/patch-configure b/x11/gnomedesktop/files/patch-configure index 943558a25604..caf5b493a9eb 100644 --- a/x11/gnomedesktop/files/patch-configure +++ b/x11/gnomedesktop/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Mon Mar 10 16:54:58 2003 -+++ configure Sun Apr 6 16:11:00 2003 -@@ -7987,6 +7987,7 @@ +--- configure.orig Sun May 4 06:56:20 2003 ++++ configure Sun May 4 19:20:27 2003 +@@ -8374,6 +8374,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" diff --git a/x11/gnomedesktop/pkg-plist b/x11/gnomedesktop/pkg-plist index 2cd64cb14824..ac57d75634de 100644 --- a/x11/gnomedesktop/pkg-plist +++ b/x11/gnomedesktop/pkg-plist @@ -6,61 +6,46 @@ lib/libgnome-desktop-2.a lib/libgnome-desktop-2.so lib/libgnome-desktop-2.so.3 libdata/pkgconfig/gnome-desktop-2.0.pc -share/gnome/gnome-about/contributors.dat +share/gnome/gnome-about/gnome-64.gif share/gnome/gnome-about/gnome-version.xml +share/gnome/gnome-about/headers/header-bg-ancient01a.png +share/gnome/gnome-about/headers/header-bg-city01.png +share/gnome/gnome-about/headers/header-bg-clouds01.png +share/gnome/gnome-about/headers/header-bg-clouds02.png +share/gnome/gnome-about/headers/header-bg-hills01.png +share/gnome/gnome-about/headers/header-bg-landscape01.png +share/gnome/gnome-about/headers/header-bg-mountains01.png +share/gnome/gnome-about/headers/header-bg-snow01.png +share/gnome/gnome-about/headers/header-bg-sunset01.png share/gnome/help/fdl/C/fdl.xml share/gnome/help/gnome-feedback/C/gnome-feedback.xml share/gnome/help/gpl/C/gpl.xml share/gnome/help/lgpl/C/lgpl.xml -share/gnome/vfolders/Accessories.directory -share/gnome/vfolders/Applications.directory -share/gnome/vfolders/Development.directory -share/gnome/vfolders/Games.directory -share/gnome/vfolders/Graphics.directory -share/gnome/vfolders/Internet.directory -share/gnome/vfolders/Multimedia.directory -share/gnome/vfolders/Office.directory -share/gnome/vfolders/Root.directory -share/gnome/vfolders/Settings.directory -share/gnome/vfolders/System.directory share/gnome/pixmaps/advanced-directory.png share/gnome/pixmaps/apple-green.png share/gnome/pixmaps/apple-red.png -share/gnome/pixmaps/cdeappmenu.png -share/gnome/pixmaps/gnome-amusements.png share/gnome/pixmaps/gnome-aorta.png share/gnome/pixmaps/gnome-applets.png share/gnome/pixmaps/gnome-applications.png -share/gnome/pixmaps/gnome-audio2.png +share/gnome/pixmaps/gnome-background-image.png +share/gnome/pixmaps/gnome-background-pattern.png share/gnome/pixmaps/gnome-background.png share/gnome/pixmaps/gnome-calc2.png share/gnome/pixmaps/gnome-calc3.png share/gnome/pixmaps/gnome-calendar.png -share/gnome/pixmaps/gnome-cardgame.png share/gnome/pixmaps/gnome-ccbackground.png share/gnome/pixmaps/gnome-ccdesktop.png share/gnome/pixmaps/gnome-ccdialog.png -share/gnome/pixmaps/gnome-cckeyboard-bell.png -share/gnome/pixmaps/gnome-cckeyboard.png share/gnome/pixmaps/gnome-ccmime.png share/gnome/pixmaps/gnome-ccperiph.png share/gnome/pixmaps/gnome-ccscreensaver.png -share/gnome/pixmaps/gnome-ccthemes.png share/gnome/pixmaps/gnome-ccwindowmanager.png -share/gnome/pixmaps/gnome-clock.png share/gnome/pixmaps/gnome-color-browser.png share/gnome/pixmaps/gnome-color-xterm.png share/gnome/pixmaps/gnome-computer.png share/gnome/pixmaps/gnome-cromagnon.png share/gnome/pixmaps/gnome-day.png share/gnome/pixmaps/gnome-debian.png -share/gnome/pixmaps/gnome-devel.png -share/gnome/pixmaps/gnome-die1.png -share/gnome/pixmaps/gnome-die2.png -share/gnome/pixmaps/gnome-die3.png -share/gnome/pixmaps/gnome-die4.png -share/gnome/pixmaps/gnome-die5.png -share/gnome/pixmaps/gnome-die6.png share/gnome/pixmaps/gnome-diskfree.png share/gnome/pixmaps/gnome-emacs.png share/gnome/pixmaps/gnome-eterm.png @@ -68,27 +53,17 @@ share/gnome/pixmaps/gnome-favorites.png share/gnome/pixmaps/gnome-file-c.png share/gnome/pixmaps/gnome-file-h.png share/gnome/pixmaps/gnome-folder.png -share/gnome/pixmaps/gnome-gegl.png -share/gnome/pixmaps/gnome-gegl2-2.png -share/gnome/pixmaps/gnome-gegl2.png share/gnome/pixmaps/gnome-gemvt.png share/gnome/pixmaps/gnome-gimp.png -share/gnome/pixmaps/gnome-globe.png share/gnome/pixmaps/gnome-gmenu.png share/gnome/pixmaps/gnome-gmush.png -share/gnome/pixmaps/gnome-gnomine.png share/gnome/pixmaps/gnome-gnomoku.png -share/gnome/pixmaps/gnome-graphics.png -share/gnome/pixmaps/gnome-gsame.png -share/gnome/pixmaps/gnome-help.png share/gnome/pixmaps/gnome-home.png share/gnome/pixmaps/gnome-html.png share/gnome/pixmaps/gnome-image-gif.png share/gnome/pixmaps/gnome-image-jpeg.png share/gnome/pixmaps/gnome-irc.png -share/gnome/pixmaps/gnome-joystick.png share/gnome/pixmaps/gnome-laptop.png -share/gnome/pixmaps/gnome-lockscreen.png share/gnome/pixmaps/gnome-log.png share/gnome/pixmaps/gnome-logo-icon-transparent.png share/gnome/pixmaps/gnome-logo-icon.png @@ -101,26 +76,15 @@ share/gnome/pixmaps/gnome-money.png share/gnome/pixmaps/gnome-monitor.png share/gnome/pixmaps/gnome-month.png share/gnome/pixmaps/gnome-mouse.png -share/gnome/pixmaps/gnome-multimedia.png share/gnome/pixmaps/gnome-networktool.png share/gnome/pixmaps/gnome-news.png share/gnome/pixmaps/gnome-note.png -share/gnome/pixmaps/gnome-panel-type-corner.png -share/gnome/pixmaps/gnome-panel-type-edge.png -share/gnome/pixmaps/gnome-panel-type-floating.png -share/gnome/pixmaps/gnome-panel-type-menu.png -share/gnome/pixmaps/gnome-panel-type-sliding.png -share/gnome/pixmaps/gnome-panel.png share/gnome/pixmaps/gnome-qeye.png -share/gnome/pixmaps/gnome-run.png -share/gnome/pixmaps/gnome-screenshot.png share/gnome/pixmaps/gnome-session.png share/gnome/pixmaps/gnome-set-time.png -share/gnome/pixmaps/gnome-settings.png share/gnome/pixmaps/gnome-spider.png share/gnome/pixmaps/gnome-squeak.png share/gnome/pixmaps/gnome-suse.png -share/gnome/pixmaps/gnome-system.png share/gnome/pixmaps/gnome-talk.png share/gnome/pixmaps/gnome-term-linux.png share/gnome/pixmaps/gnome-term-linux2.png @@ -129,7 +93,6 @@ share/gnome/pixmaps/gnome-term-tiger.png share/gnome/pixmaps/gnome-term.png share/gnome/pixmaps/gnome-tigert.png share/gnome/pixmaps/gnome-touristinfo.png -share/gnome/pixmaps/gnome-unknown.png share/gnome/pixmaps/gnome-user-interface.png share/gnome/pixmaps/gnome-util.png share/gnome/pixmaps/gnome-week.png @@ -141,17 +104,19 @@ share/gnome/pixmaps/gtkvim.png share/gnome/pixmaps/kterm.xpm share/gnome/pixmaps/launcher-program.png share/gnome/pixmaps/monitor.png -share/gnome/pixmaps/panel-arrow-down.png -share/gnome/pixmaps/panel-arrow-left.png -share/gnome/pixmaps/panel-arrow-right.png -share/gnome/pixmaps/panel-arrow-up.png -share/gnome/pixmaps/panel-corner-left.png -share/gnome/pixmaps/panel-corner-right.png -share/gnome/pixmaps/panel-drawer.png -share/gnome/pixmaps/panel-folder.png -share/gnome/pixmaps/panel-knob.png -share/gnome/pixmaps/panel-menu-main.png share/gnome/pixmaps/vnterm.xpm +share/gnome/vfolders/Accessories.directory +share/gnome/vfolders/Applications.directory +share/gnome/vfolders/Development.directory +share/gnome/vfolders/Games.directory +share/gnome/vfolders/Graphics.directory +share/gnome/vfolders/Internet.directory +share/gnome/vfolders/Multimedia.directory +share/gnome/vfolders/Office.directory +share/gnome/vfolders/Other.directory +share/gnome/vfolders/Root.directory +share/gnome/vfolders/Settings.directory +share/gnome/vfolders/System.directory share/locale/am/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ar/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/az/LC_MESSAGES/gnome-desktop-2.0.mo @@ -161,6 +126,7 @@ share/locale/bn/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/bs/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ca/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/cs/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/cy/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/da/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/de/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/el/LC_MESSAGES/gnome-desktop-2.0.mo @@ -183,12 +149,14 @@ share/locale/it/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ja/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/kn/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ko/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/li/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/lt/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/lv/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/mk/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ml/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/mn/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ms/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/ne/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/nl/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/nn/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/no/LC_MESSAGES/gnome-desktop-2.0.mo @@ -218,6 +186,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo @dirrm share/gnome/help/gnome-feedback/C @dirrm share/gnome/help/gnome-feedback @dirrm share/gnome/help/fdl/C/figures +@dirrm share/gnome/gnome-about/headers @dirrm include/gnome-desktop-2.0/libgnomeui @dirrm include/gnome-desktop-2.0/libgnome @dirrm include/gnome-desktop-2.0 diff --git a/x11/gnomepanel/Makefile b/x11/gnomepanel/Makefile index caa6e7f78e31..04ca2e79ad48 100644 --- a/x11/gnomepanel/Makefile +++ b/x11/gnomepanel/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomepanel -PORTVERSION= 2.2.2.2 -PORTREVISION= 1 +PORTVERSION= 2.4.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-panel/2.2 +MASTER_SITE_SUBDIR= sources/gnome-panel/2.4 DISTNAME= gnome-panel-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -21,7 +20,7 @@ USE_BZIP2= yes INSTALLS_SHLIB= yes USE_X_PREFIX= yes USE_REINPLACE= yes -USE_GNOME= gnomeprefix gnomehack gnomehier libwnck gnomedesktop +USE_GNOME= gnomeprefix gnomehack gnomehier gnomedesktop libwnck GNOME_DESKTOP_VERSION=2 USE_GMAKE= yes USE_LIBTOOL= yes diff --git a/x11/gnomepanel/distinfo b/x11/gnomepanel/distinfo index a70a16998277..36e659c41882 100644 --- a/x11/gnomepanel/distinfo +++ b/x11/gnomepanel/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-panel-2.2.2.2.tar.bz2) = 0fffc658f22e367ba33997dcf180ef17 +MD5 (gnome2/gnome-panel-2.4.0.tar.bz2) = 9a81f7ebbb450611a28783900f5f2cbc diff --git a/x11/gnome-panel/files/patch-applets::gen_util::clock.c b/x11/gnomepanel/files/patch-applets_clock_clock.c index 96f5d3f44c48..976764570ff1 100644 --- a/x11/gnome-panel/files/patch-applets::gen_util::clock.c +++ b/x11/gnomepanel/files/patch-applets_clock_clock.c @@ -1,8 +1,8 @@ $FreeBSD$ ---- applets/gen_util/clock.c 2002/05/14 14:08:16 1.1 -+++ applets/gen_util/clock.c 2002/05/14 14:12:56 +--- applets/clock/clock.c 2002/05/14 14:08:16 1.1 ++++ applets/clock/clock.c 2002/05/14 14:12:56 @@ -14,7 +14,9 @@ #include <dirent.h> #include <string.h> diff --git a/x11/gnomepanel/files/patch-gnome-panel_panel.c b/x11/gnomepanel/files/patch-gnome-panel_panel.c deleted file mode 100644 index 4c51bc47f38c..000000000000 --- a/x11/gnomepanel/files/patch-gnome-panel_panel.c +++ /dev/null @@ -1,25 +0,0 @@ ---- gnome-panel/panel.c.orig Fri Aug 1 21:48:35 2003 -+++ gnome-panel/panel.c Fri Aug 1 21:48:37 2003 -@@ -569,18 +569,18 @@ - - if (pd->menu) - g_object_unref (pd->menu); -- pd->menu = NULL; -- -- pd->panel = NULL; - - if (pd->deactivate_idle != 0) - g_source_remove (pd->deactivate_idle); -- pd->deactivate_idle = 0; - - g_object_set_data (G_OBJECT (widget), "PanelData", NULL); - - panel_list = g_slist_remove (panel_list, pd); - g_free (pd); -+ -+ pd->menu = NULL; -+ pd->panel = NULL; -+ pd->deactivate_idle = 0; - } - - static void diff --git a/x11/gnomepanel/pkg-descr b/x11/gnomepanel/pkg-descr index 3abe6bcbf5fd..5e73398913a9 100644 --- a/x11/gnomepanel/pkg-descr +++ b/x11/gnomepanel/pkg-descr @@ -1,3 +1,3 @@ -Panel component for the GNOME 2.0 Desktop. +Panel component for the GNOME 2 Desktop. WWW: http://www.gnome.org/ diff --git a/x11/gnomepanel/pkg-plist b/x11/gnomepanel/pkg-plist index d3632109b400..d6d24dc543ef 100644 --- a/x11/gnomepanel/pkg-plist +++ b/x11/gnomepanel/pkg-plist @@ -5,23 +5,30 @@ bin/gnome-panel-screenshot bin/panel-test-applets etc/gconf/gconf.xml.defaults/apps/gnome_panel_screenshot/%gconf.xml etc/gconf/gconf.xml.defaults/apps/panel/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/clock/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/mixer/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/show_desktop_button/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/window_list/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/window_menu/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/workspace_switcher/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/general/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects/menu_bar/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects/nautilus_launcher/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects/terminal_launcher/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/bottom_panel/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/top_panel/%gconf.xml etc/gconf/gconf.xml.defaults/apps/panel/global/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/prefs/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/prefs/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnome_panel_screenshot/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/prefs/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/pager_applet/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/pager_applet/prefs/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/panel/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large/general/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large/panels/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large/panels/00000001/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large/panels/00000002/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000001/%gconf.xml @@ -36,60 +43,67 @@ etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/objects/ etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/panels/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/panels/00000001/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/panels/00000002/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/small/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/small/general/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/small/panels/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/small/panels/00000001/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/panel/general/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/panel/global/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/tasklist_applet/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/tasklist_applet/prefs/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/panel/objects/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/panel/toplevels/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/panel/toplevels/background/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/window_list_applet/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/window_list_applet/prefs/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/workspace_switcher_applet/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/workspace_switcher_applet/prefs/%gconf.xml etc/gconf/schemas/clock.schemas etc/gconf/schemas/fish.schemas etc/gconf/schemas/gnome-panel-screenshot.schemas -etc/gconf/schemas/mailcheck.schemas -etc/gconf/schemas/pager.schemas -etc/gconf/schemas/panel-global-config.schemas -etc/gconf/schemas/panel-per-panel-config.schemas -etc/gconf/schemas/tasklist.schemas -etc/sound/events/mailcheck.soundlist +etc/gconf/schemas/panel-compatibility.schemas +etc/gconf/schemas/panel-default-setup.entries +etc/gconf/schemas/panel-general.schemas +etc/gconf/schemas/panel-global.schemas +etc/gconf/schemas/panel-object.schemas +etc/gconf/schemas/panel-toplevel.schemas +etc/gconf/schemas/window-list.schemas +etc/gconf/schemas/workspace-switcher.schemas include/panel-2.0/GNOME_Panel.h include/panel-2.0/panel-applet-gconf.h include/panel-2.0/panel-applet.h -lib/libgen_util_applet-2.so +lib/libclock-applet-2.so lib/libpanel-applet-2.a lib/libpanel-applet-2.so lib/libpanel-applet-2.so.0 +libdata/bonobo/servers/GNOME_ClockApplet_Factory.server libdata/bonobo/servers/GNOME_FishApplet_Factory.server -libdata/bonobo/servers/GNOME_GenUtilApplet_Factory.server libdata/bonobo/servers/GNOME_NotificationAreaApplet.server libdata/bonobo/servers/GNOME_Panel.server +libdata/bonobo/servers/GNOME_Wncklet_Factory.server libdata/pkgconfig/libpanelapplet-2.0.pc libexec/fish-applet-2 libexec/notification-area-applet +libexec/wnck-applet share/doc/panel-applet/applet-popups.html share/doc/panel-applet/applet-porting.html share/doc/panel-applet/applet-writing.html share/doc/panel-applet/index.sgml share/doc/panel-applet/libpanel-applet.html share/doc/panel-applet/multi-applets.html +share/doc/panel-applet/panel-applet-panel-applet-gconf-utilities.html share/doc/panel-applet/panel-applet.html share/doc/panel-applet/panel-signals.html share/doc/panel-applet/panelapplet.html share/doc/panel-applet/server-files.html share/doc/panel-applet/session-saving.html share/gnome/control-center-2.0/capplets/gnome-panel-preferences.desktop -share/gnome/fish/fish.glade -share/gnome/gen_util/pager.glade -share/gnome/gen_util/tasklist.glade share/gnome/gnome-2.0/ui/GNOME_ClockApplet.xml share/gnome/gnome-2.0/ui/GNOME_FishApplet.xml -share/gnome/gnome-2.0/ui/GNOME_MailCheckApplet.xml share/gnome/gnome-2.0/ui/GNOME_NotificationAreaApplet.xml -share/gnome/gnome-2.0/ui/GNOME_PagerApplet.xml share/gnome/gnome-2.0/ui/GNOME_Panel_Popup.xml share/gnome/gnome-2.0/ui/GNOME_ShowDesktopApplet.xml -share/gnome/gnome-2.0/ui/GNOME_TasklistApplet.xml +share/gnome/gnome-2.0/ui/GNOME_WindowListApplet.xml +share/gnome/gnome-2.0/ui/GNOME_WindowMenuApplet.xml +share/gnome/gnome-2.0/ui/GNOME_WorkspaceSwitcherApplet.xml +share/gnome/gnome-panel/glade/fish.glade share/gnome/gnome-panel/glade/panel-test-applets.glade +share/gnome/gnome-panel/glade/window-list.glade +share/gnome/gnome-panel/glade/workspace-switcher.glade share/gnome/gnome-panelrc share/gnome/help/clock/C/clock.xml share/gnome/help/clock/C/figures/clock_applet.png @@ -159,63 +173,6 @@ share/gnome/help/fish-applet-2/zh_TW/figures/fish_applet.png share/gnome/help/fish-applet-2/zh_TW/figures/fish_settings.png share/gnome/help/fish-applet-2/zh_TW/fish-applet-2.xml share/gnome/help/fish-applet-2/zh_TW/legal.xml -share/gnome/help/mailcheck/C/figures/mailcheck_applet.png -share/gnome/help/mailcheck/C/legal.xml -share/gnome/help/mailcheck/C/mailcheck.xml -share/gnome/help/mailcheck/de/figures/mailcheck-applet.png -share/gnome/help/mailcheck/de/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/de/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/de/figures/mailcheck_applet.png -share/gnome/help/mailcheck/de/legal.xml -share/gnome/help/mailcheck/de/mailcheck.xml -share/gnome/help/mailcheck/es/figures/mailcheck-applet.png -share/gnome/help/mailcheck/es/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/es/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/es/figures/mailcheck_applet.png -share/gnome/help/mailcheck/es/legal.xml -share/gnome/help/mailcheck/es/mailcheck.xml -share/gnome/help/mailcheck/fr/figures/mailcheck-applet.png -share/gnome/help/mailcheck/fr/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/fr/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/fr/figures/mailcheck_applet.png -share/gnome/help/mailcheck/fr/legal.xml -share/gnome/help/mailcheck/fr/mailcheck.xml -share/gnome/help/mailcheck/it/figures/mailcheck-applet.png -share/gnome/help/mailcheck/it/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/it/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/it/figures/mailcheck_applet.png -share/gnome/help/mailcheck/it/legal.xml -share/gnome/help/mailcheck/it/mailcheck.xml -share/gnome/help/mailcheck/ja/figures/mailcheck_applet.png -share/gnome/help/mailcheck/ja/legal.xml -share/gnome/help/mailcheck/ja/mailcheck.xml -share/gnome/help/mailcheck/ko/figures/mailcheck-applet.png -share/gnome/help/mailcheck/ko/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/ko/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/ko/figures/mailcheck_applet.png -share/gnome/help/mailcheck/ko/legal.xml -share/gnome/help/mailcheck/ko/mailcheck.xml -share/gnome/help/mailcheck/sv/figures/mailcheck-applet.png -share/gnome/help/mailcheck/sv/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/sv/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/sv/figures/mailcheck_applet.png -share/gnome/help/mailcheck/sv/legal.xml -share/gnome/help/mailcheck/sv/mailcheck.xml -share/gnome/help/mailcheck/zh_CN/figures/mailcheck-applet.png -share/gnome/help/mailcheck/zh_CN/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/zh_CN/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/zh_CN/figures/mailcheck_applet.png -share/gnome/help/mailcheck/zh_CN/legal.xml -share/gnome/help/mailcheck/zh_CN/mailcheck.xml -share/gnome/help/mailcheck/zh_TW/figures/mailcheck-applet.png -share/gnome/help/mailcheck/zh_TW/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/zh_TW/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/zh_TW/figures/mailcheck_applet.png -share/gnome/help/mailcheck/zh_TW/legal.xml -share/gnome/help/mailcheck/zh_TW/mailcheck.xml -share/gnome/help/notification-area/C/figures/notification-area.png -share/gnome/help/notification-area/C/legal.xml -share/gnome/help/notification-area/C/notification-area.xml share/gnome/help/window-list/C/figures/window_list_applet.png share/gnome/help/window-list/C/figures/window_list_group_applet.png share/gnome/help/window-list/C/legal.xml @@ -343,28 +300,6 @@ share/gnome/omf/gnome-panel/fish-applet-2-zh_CN.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-zh_CN.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-panel/fish-applet-2-zh_TW.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-zh_TW.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-panel/mailcheck-C.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-C.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-panel/mailcheck-de.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-de.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-panel/mailcheck-es.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-es.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-panel/mailcheck-fr.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-fr.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-panel/mailcheck-it.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-it.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-panel/mailcheck-ja.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-ja.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-panel/mailcheck-ko.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-ko.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-panel/mailcheck-sv.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-sv.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-panel/mailcheck-zh_CN.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-zh_CN.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-panel/mailcheck-zh_TW.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-zh_TW.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-panel/notification-area-C.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/notification-area-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-panel/window-list-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-panel/window-list-de.omf @@ -407,18 +342,31 @@ share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf 2>/dev/null || /usr/bin/true share/gnome/panel/gnome-panel-preferences.glade share/gnome/panel/gnome-panel-screenshot.glade +share/gnome/panel/panel-properties-dialog.glade +share/gnome/panel/panel-run-dialog.glade +share/gnome/pixmaps/cdeappmenu.png share/gnome/pixmaps/fish/fishanim.png share/gnome/pixmaps/fish/footguy.png share/gnome/pixmaps/fish/monkey.png share/gnome/pixmaps/fish/oldwanda.png +share/gnome/pixmaps/gnome-amusements.png +share/gnome/pixmaps/gnome-clock.png share/gnome/pixmaps/gnome-fish.png +share/gnome/pixmaps/gnome-gegl.png +share/gnome/pixmaps/gnome-gegl2-2.png +share/gnome/pixmaps/gnome-gegl2.png +share/gnome/pixmaps/gnome-main-menu.png +share/gnome/pixmaps/gnome-panel-type-corner.png +share/gnome/pixmaps/gnome-panel-type-edge.png +share/gnome/pixmaps/gnome-panel-type-floating.png +share/gnome/pixmaps/gnome-panel-type-menu.png +share/gnome/pixmaps/gnome-panel-type-sliding.png +share/gnome/pixmaps/gnome-panel.png +share/gnome/pixmaps/gnome-run.png +share/gnome/pixmaps/gnome-screenshot.png share/gnome/pixmaps/gnome-show-desktop.png -share/gnome/pixmaps/mailcheck/eclouds.png -share/gnome/pixmaps/mailcheck/email-e.png -share/gnome/pixmaps/mailcheck/email-eclouds.png -share/gnome/pixmaps/mailcheck/email-tiny.png -share/gnome/pixmaps/mailcheck/email.png -share/gnome/pixmaps/mailcheck/tux-anim.png +share/gnome/pixmaps/panel-drawer.png +share/gnome/pixmaps/panel-force-quit.png share/locale/am/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ar/LC_MESSAGES/gnome-panel-2.0.mo share/locale/az/LC_MESSAGES/gnome-panel-2.0.mo @@ -521,30 +469,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo @dirrm share/gnome/help/window-list/C/figures @dirrm share/gnome/help/window-list/C @dirrm share/gnome/help/window-list -@dirrm share/gnome/help/notification-area/C/figures -@dirrm share/gnome/help/notification-area/C -@dirrm share/gnome/help/notification-area -@dirrm share/gnome/help/mailcheck/zh_TW/figures -@dirrm share/gnome/help/mailcheck/zh_TW -@dirrm share/gnome/help/mailcheck/zh_CN/figures -@dirrm share/gnome/help/mailcheck/zh_CN -@dirrm share/gnome/help/mailcheck/sv/figures -@dirrm share/gnome/help/mailcheck/sv -@dirrm share/gnome/help/mailcheck/ko/figures -@dirrm share/gnome/help/mailcheck/ko -@dirrm share/gnome/help/mailcheck/ja/figures -@dirrm share/gnome/help/mailcheck/ja -@dirrm share/gnome/help/mailcheck/it/figures -@dirrm share/gnome/help/mailcheck/it -@dirrm share/gnome/help/mailcheck/fr/figures -@dirrm share/gnome/help/mailcheck/fr -@dirrm share/gnome/help/mailcheck/es/figures -@dirrm share/gnome/help/mailcheck/es -@dirrm share/gnome/help/mailcheck/de/figures -@dirrm share/gnome/help/mailcheck/de -@dirrm share/gnome/help/mailcheck/C/figures -@dirrm share/gnome/help/mailcheck/C -@dirrm share/gnome/help/mailcheck @dirrm share/gnome/help/fish-applet-2/zh_TW/figures @dirrm share/gnome/help/fish-applet-2/zh_TW @dirrm share/gnome/help/fish-applet-2/zh_CN/figures @@ -589,17 +513,17 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo @dirrm share/gnome/help/clock @dirrm share/gnome/gnome-panel/glade @dirrm share/gnome/gnome-panel -@dirrm share/gnome/gen_util -@dirrm share/gnome/fish @dirrm share/doc/panel-applet @dirrm include/panel-2.0 -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/tasklist_applet/prefs -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/tasklist_applet +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/workspace_switcher_applet/prefs +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/workspace_switcher_applet +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/window_list_applet/prefs +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/window_list_applet +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/toplevels/background +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/toplevels +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/objects @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/global -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/small/panels/00000001 -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/small/panels -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/small/general -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/small +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/general @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/panels/00000002 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/panels/00000001 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/panels @@ -614,23 +538,30 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000001 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large/panels/00000002 -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large/panels/00000001 -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large/panels -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large/general -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/pager_applet/prefs -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/pager_applet -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/prefs -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_panel_screenshot @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/prefs @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/prefs @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet @dirrm etc/gconf/gconf.xml.defaults/apps/panel/global +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/top_panel +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/bottom_panel +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects/terminal_launcher +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects/nautilus_launcher +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects/menu_bar +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/general +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/workspace_switcher +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/window_menu +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/window_list +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/show_desktop_button +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/mixer +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/clock +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets +@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup @dirrm etc/gconf/gconf.xml.defaults/apps/panel @dirrm etc/gconf/gconf.xml.defaults/apps/gnome_panel_screenshot @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-C.omf 2>/dev/null || /usr/bin/true @@ -653,17 +584,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-sv.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-zh_CN.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-zh_TW.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-de.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-es.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-fr.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-it.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-ja.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-ko.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-sv.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-zh_CN.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-zh_TW.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/notification-area-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-de.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-es.omf 2>/dev/null || /usr/bin/true diff --git a/x11/gnomesession/Makefile b/x11/gnomesession/Makefile index 1c434ac65945..48f0b8e7bbb9 100644 --- a/x11/gnomesession/Makefile +++ b/x11/gnomesession/Makefile @@ -6,16 +6,11 @@ # PORTNAME= gnomesession -PORTVERSION= 2.2.2 -PORTREVISION= 1 +PORTVERSION= 2.4.0 CATEGORIES= x11 gnome -MASTER_SITES= ${MASTER_SITE_GNOME} \ - ${MASTER_SITE_LOCAL:S/$/:local/} -MASTER_SITE_SUBDIR= sources/gnome-session/2.2 \ - marcus/:local +MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITE_SUBDIR= sources/gnome-session/2.4 DISTNAME= gnome-session-${PORTVERSION} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - splash.png:local DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -27,18 +22,11 @@ USE_REINPLACE= yes USE_GNOME= gnomeprefix gnomehack gnomehier libgnomeui USE_GMAKE= yes USE_LIBTOOL= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" MAN1= gnome-session.1 gnome-smproxy.1 gnome-wm.1 session-properties.1 \ gnome-session-save.1 MAN5= default.session.5 -post-extract: - @${CP} ${DISTDIR}/${DIST_SUBDIR}/splash.png ${WRKDIR} - -post-install: - ${INSTALL_DATA} ${WRKDIR}/splash.png \ - ${PREFIX}/share/gnome/pixmaps/splash/gnome-splash.png - .include <bsd.port.mk> diff --git a/x11/gnomesession/distinfo b/x11/gnomesession/distinfo index 81c567b465b0..93da50979a59 100644 --- a/x11/gnomesession/distinfo +++ b/x11/gnomesession/distinfo @@ -1,2 +1 @@ -MD5 (gnome2/gnome-session-2.2.2.tar.bz2) = 7dcfea0d925ddecb7c9700ddf597b17c -MD5 (gnome2/splash.png) = 244d7cadfb0f5e7ba624a1d4e749a312 +MD5 (gnome2/gnome-session-2.4.0.tar.bz2) = 6a7acf3429b927c69e18019f9ec6fa9f diff --git a/x11/gnomesession/pkg-plist b/x11/gnomesession/pkg-plist index 75f1650b4f35..d4fc0ded7788 100644 --- a/x11/gnomesession/pkg-plist +++ b/x11/gnomesession/pkg-plist @@ -1,5 +1,6 @@ bin/gnome-session bin/gnome-session-properties +bin/gnome-session-remove bin/gnome-session-save bin/gnome-smproxy bin/gnome-wm @@ -16,15 +17,17 @@ share/locale/am/LC_MESSAGES/gnome-session-2.0.mo share/locale/ar/LC_MESSAGES/gnome-session-2.0.mo share/locale/az/LC_MESSAGES/gnome-session-2.0.mo share/locale/be/LC_MESSAGES/gnome-session-2.0.mo +share/locale/bn/LC_MESSAGES/gnome-session-2.0.mo share/locale/bs/LC_MESSAGES/gnome-session-2.0.mo share/locale/bg/LC_MESSAGES/gnome-session-2.0.mo -share/locale/bn/LC_MESSAGES/gnome-session-2.0.mo share/locale/ca/LC_MESSAGES/gnome-session-2.0.mo share/locale/cs/LC_MESSAGES/gnome-session-2.0.mo +share/locale/cy/LC_MESSAGES/gnome-session-2.0.mo share/locale/da/LC_MESSAGES/gnome-session-2.0.mo share/locale/de/LC_MESSAGES/gnome-session-2.0.mo share/locale/el/LC_MESSAGES/gnome-session-2.0.mo share/locale/en_GB/LC_MESSAGES/gnome-session-2.0.mo +share/locale/eo/LC_MESSAGES/gnome-session-2.0.mo share/locale/es/LC_MESSAGES/gnome-session-2.0.mo share/locale/et/LC_MESSAGES/gnome-session-2.0.mo share/locale/eu/LC_MESSAGES/gnome-session-2.0.mo @@ -37,6 +40,7 @@ share/locale/he/LC_MESSAGES/gnome-session-2.0.mo share/locale/hi/LC_MESSAGES/gnome-session-2.0.mo share/locale/hu/LC_MESSAGES/gnome-session-2.0.mo share/locale/id/LC_MESSAGES/gnome-session-2.0.mo +share/locale/is/LC_MESSAGES/gnome-session-2.0.mo share/locale/it/LC_MESSAGES/gnome-session-2.0.mo share/locale/ja/LC_MESSAGES/gnome-session-2.0.mo share/locale/kn/LC_MESSAGES/gnome-session-2.0.mo @@ -62,13 +66,13 @@ share/locale/sr/LC_MESSAGES/gnome-session-2.0.mo share/locale/sr@Latn/LC_MESSAGES/gnome-session-2.0.mo share/locale/sv/LC_MESSAGES/gnome-session-2.0.mo share/locale/ta/LC_MESSAGES/gnome-session-2.0.mo +share/locale/th/LC_MESSAGES/gnome-session-2.0.mo share/locale/tr/LC_MESSAGES/gnome-session-2.0.mo share/locale/uk/LC_MESSAGES/gnome-session-2.0.mo share/locale/vi/LC_MESSAGES/gnome-session-2.0.mo share/locale/wa/LC_MESSAGES/gnome-session-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-session-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-session-2.0.mo -@dirrm share/gnome/omf/gnome-core @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-session/options @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-session @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-session/options diff --git a/x11/gnometerminal/Makefile b/x11/gnometerminal/Makefile index e6c8538e5c8f..edcdf8d713dd 100644 --- a/x11/gnometerminal/Makefile +++ b/x11/gnometerminal/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gnometerminal -PORTVERSION= 2.2.2 +PORTVERSION= 2.4.0.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-terminal/2.2 +MASTER_SITE_SUBDIR= sources/gnome-terminal/2.4 DISTNAME= gnome-terminal-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -20,17 +20,9 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_REINPLACE= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack gnomehier libgnomeui +USE_GNOME= gnomeprefix gnomehack gnomehier libgnomeui vte USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -.if defined(WITH_ZVT) -CONFIGURE_ARGS= --with-widget=zvt -USE_GNOME+= libzvt -.else -CONFIGURE_ARGS= --with-widget=vte -USE_GNOME+= vte -.endif - .include <bsd.port.mk> diff --git a/x11/gnometerminal/distinfo b/x11/gnometerminal/distinfo index a11d0bf0d30e..dafc5d297de9 100644 --- a/x11/gnometerminal/distinfo +++ b/x11/gnometerminal/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-terminal-2.2.2.tar.bz2) = 30140540966ba84597e257054a232e99 +MD5 (gnome2/gnome-terminal-2.4.0.1.tar.bz2) = 6d939e67c052e43686e2357e8083ad66 diff --git a/x11/gnometerminal/files/patch-src_terminal-widget-zvt.c b/x11/gnometerminal/files/patch-src_terminal-widget-zvt.c deleted file mode 100644 index 84c13e0aaed1..000000000000 --- a/x11/gnometerminal/files/patch-src_terminal-widget-zvt.c +++ /dev/null @@ -1,13 +0,0 @@ ---- src/terminal-widget-zvt.c.orig Wed Feb 12 18:06:32 2003 -+++ src/terminal-widget-zvt.c Wed Feb 12 18:05:20 2003 -@@ -1132,8 +1132,8 @@ - terminal_widget_set_pango_font (GtkWidget *widget, - const PangoFontDescription *font_desc) - { -- g_return_if_fail (font_desc != NULL); -- zvt_term_set_pango_font (ZVT_TERM (widget), font_desc); -+ /*g_return_if_fail (font_desc != NULL); -+ zvt_term_set_pango_font (ZVT_TERM (widget), font_desc);*/ - } - - gboolean diff --git a/x11/gnometerminal/pkg-plist b/x11/gnometerminal/pkg-plist index 1ab44e46820f..b101373be612 100644 --- a/x11/gnometerminal/pkg-plist +++ b/x11/gnometerminal/pkg-plist @@ -11,6 +11,7 @@ etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles/Default/%gconf.xml etc/gconf/schemas/gnome-terminal.schemas libdata/bonobo/servers/gnome-terminal.server +share/gnome/application-registry/gnome-terminal.applications share/gnome/applications/gnome-terminal.desktop share/gnome/gnome-terminal/glade/gnome-terminal.glade2 share/gnome/help/gnome-terminal/C/figures/gnome-terminal-default.png @@ -96,8 +97,10 @@ share/locale/ar/LC_MESSAGES/gnome-terminal.mo share/locale/az/LC_MESSAGES/gnome-terminal.mo share/locale/be/LC_MESSAGES/gnome-terminal.mo share/locale/bg/LC_MESSAGES/gnome-terminal.mo +share/locale/bn/LC_MESSAGES/gnome-terminal.mo share/locale/ca/LC_MESSAGES/gnome-terminal.mo share/locale/cs/LC_MESSAGES/gnome-terminal.mo +share/locale/cy/LC_MESSAGES/gnome-terminal.mo share/locale/da/LC_MESSAGES/gnome-terminal.mo share/locale/de/LC_MESSAGES/gnome-terminal.mo share/locale/el/LC_MESSAGES/gnome-terminal.mo @@ -107,9 +110,12 @@ share/locale/et/LC_MESSAGES/gnome-terminal.mo share/locale/fa/LC_MESSAGES/gnome-terminal.mo share/locale/fi/LC_MESSAGES/gnome-terminal.mo share/locale/fr/LC_MESSAGES/gnome-terminal.mo +share/locale/ga/LC_MESSAGES/gnome-terminal.mo share/locale/gl/LC_MESSAGES/gnome-terminal.mo share/locale/he/LC_MESSAGES/gnome-terminal.mo +share/locale/hi/LC_MESSAGES/gnome-terminal.mo share/locale/hu/LC_MESSAGES/gnome-terminal.mo +share/locale/id/LC_MESSAGES/gnome-terminal.mo share/locale/it/LC_MESSAGES/gnome-terminal.mo share/locale/ja/LC_MESSAGES/gnome-terminal.mo share/locale/ko/LC_MESSAGES/gnome-terminal.mo @@ -132,14 +138,12 @@ share/locale/sq/LC_MESSAGES/gnome-terminal.mo share/locale/sr/LC_MESSAGES/gnome-terminal.mo share/locale/sr@Latn/LC_MESSAGES/gnome-terminal.mo share/locale/sv/LC_MESSAGES/gnome-terminal.mo -share/locale/ta/LC_MESSAGES/gnome-terminal.mo share/locale/tr/LC_MESSAGES/gnome-terminal.mo share/locale/uk/LC_MESSAGES/gnome-terminal.mo share/locale/vi/LC_MESSAGES/gnome-terminal.mo share/locale/wa/LC_MESSAGES/gnome-terminal.mo share/locale/zh_CN/LC_MESSAGES/gnome-terminal.mo share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo -@dirrm share/gnome/omf/gnome-terminal @dirrm share/gnome/help/gnome-terminal/zh_TW/figures @dirrm share/gnome/help/gnome-terminal/zh_TW @dirrm share/gnome/help/gnome-terminal/zh_CN/figures @@ -160,7 +164,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo @dirrm share/gnome/help/gnome-terminal/es @dirrm share/gnome/help/gnome-terminal/de/figures @dirrm share/gnome/help/gnome-terminal/de -@dirrm share/gnome/help/gnome-terminal/C/figures @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles/Default @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/keybindings diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile index 75d9b48355f0..650b22d2eba8 100644 --- a/x11/yelp/Makefile +++ b/x11/yelp/Makefile @@ -6,20 +6,20 @@ # PORTNAME= yelp -PORTVERSION= 2.2.3 +PORTVERSION= 2.4.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.4 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -COMMENT= A help browser for GNOME 2.0 desktop +COMMENT= A help browser for the GNOME 2 desktop USE_BZIP2= yes USE_X_PREFIX= yes +USE_GMAKE= yes USE_REINPLACE= yes USE_GNOME= gnomeprefix gnomehack libgnomeui libgtkhtml -USE_GMAKE= yes USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11/yelp/distinfo b/x11/yelp/distinfo index 99b002995697..c1e18360b234 100644 --- a/x11/yelp/distinfo +++ b/x11/yelp/distinfo @@ -1 +1 @@ -MD5 (gnome2/yelp-2.2.3.tar.bz2) = 46727cccf4e8d17ec5102e8274b5145c +MD5 (gnome2/yelp-2.4.0.tar.bz2) = 98529a608fd28b9db065d887039df16d diff --git a/x11/yelp/files/patch-configure b/x11/yelp/files/patch-configure index a6e8fbc286f0..20702046e4a8 100644 --- a/x11/yelp/files/patch-configure +++ b/x11/yelp/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Tue May 28 02:02:29 2002 -+++ configure Tue May 28 02:03:10 2002 -@@ -7381,6 +7381,7 @@ +--- configure.orig Tue Aug 12 03:36:10 2003 ++++ configure Tue Aug 12 10:30:37 2003 +@@ -18129,6 +18129,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -8,12 +8,18 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -9979,7 +9980,7 @@ +@@ -20408,12 +20409,12 @@ YELP_MODULES="gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0" -YELP_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0 bonobo-activation-2.0| sed -e 's/^/ /' -e 's/ \+$//' -e 's/ \+/ -I /g' -e 's/^ \+//'`" +YELP_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir libgtkhtml-2.0 gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0 bonobo-activation-2.0| xargs -n1 echo -n ' -I '`" - echo "$as_me:9984: checking for bzread in -lbz2" >&5 - echo $ECHO_N "checking for bzread in -lbz2... $ECHO_C" >&6 + + + case $host in +- *-linux-gnu | *-irix6*) ++ *-linux-gnu | *-irix6* | *-freebsd*) + cat >>confdefs.h <<\_ACEOF + #define HAVE_MAN_WHEREIS 1 + _ACEOF diff --git a/x11/yelp/files/patch-src_man2html_yelp-man2html.c b/x11/yelp/files/patch-src_man2html_yelp-man2html.c new file mode 100644 index 000000000000..e30c81ba0d7e --- /dev/null +++ b/x11/yelp/files/patch-src_man2html_yelp-man2html.c @@ -0,0 +1,55 @@ +--- src/man2html/yelp-man2html.c.orig Tue Jun 24 05:03:50 2003 ++++ src/man2html/yelp-man2html.c Thu Aug 14 15:47:14 2003 +@@ -129,6 +129,7 @@ + #include <string.h> + #include <sys/stat.h> + #include <dirent.h> ++#include <sys/param.h> + #include <sys/types.h> + #include <time.h> + #include <sys/time.h> +@@ -3727,6 +3728,9 @@ + main(int argc, char **argv) + { + char *t=NULL; ++#ifdef __FreeBSD__ ++ char *source=NULL; ++#endif + int i,len; + char *buf; + char *h = '\0'; +@@ -3845,6 +3849,24 @@ + * right. + */ + ++#ifdef __FreeBSD__ ++ if ((source = strstr(output, "source: ")) != NULL) ++ { ++ int j; ++ for(i = 8, j = 0; i < strlen(source); i++) ++ { ++ if (!g_ascii_isspace((unsigned char)source[i]) && source[i] != ')') ++ { ++ output[j++] = source[i]; ++ } ++ } ++ output[j] = '\0'; ++ } else { ++ i = strlen(output) - 1; ++ while (g_ascii_isspace((unsigned char)output[i])) ++ output[i--] = '\0'; ++ } ++#else + len = strlen(output); + for(i = 0; i < len; i++) + { +@@ -3855,8 +3877,7 @@ + i = strlen(output) - 1; + while (g_ascii_isspace((unsigned char)output[i])) + output[i--] = '\0'; +- +- ++#endif + if (output[0]) { + #ifdef HAVE_LIBBZ2 + if(strstr(output,".bz2")) diff --git a/x11/yelp/pkg-plist b/x11/yelp/pkg-plist index 4cfeb4c42f5f..8d2e137bebb1 100644 --- a/x11/yelp/pkg-plist +++ b/x11/yelp/pkg-plist @@ -1,9 +1,10 @@ -bin/gman bin/gnome-help bin/yelp bin/yelp-pregenerate libdata/bonobo/servers/GNOME_Yelp.server libexec/yelp-db2html +libexec/yelp-info2html +libexec/yelp-man2html share/gnome/applications/yelp.desktop share/gnome/images/yelp/bcg.png share/gnome/images/yelp/empty.png @@ -126,14 +127,19 @@ share/gnome/sgml/docbook/yelp/docbook/html/verbatim.xsl share/gnome/sgml/docbook/yelp/docbook/html/xref.xsl share/gnome/sgml/docbook/yelp/docbook/images/blank.png share/gnome/sgml/docbook/yelp/docbook/images/caution.png +share/gnome/sgml/docbook/yelp/docbook/images/home.png share/gnome/sgml/docbook/yelp/docbook/images/important.png +share/gnome/sgml/docbook/yelp/docbook/images/next.png share/gnome/sgml/docbook/yelp/docbook/images/note.png +share/gnome/sgml/docbook/yelp/docbook/images/prev.png share/gnome/sgml/docbook/yelp/docbook/images/tip.png +share/gnome/sgml/docbook/yelp/docbook/images/up.png share/gnome/sgml/docbook/yelp/docbook/images/warning.png share/gnome/sgml/docbook/yelp/docbook/lib/lib.xsl share/gnome/sgml/docbook/yelp/l10n.xml share/gnome/sgml/docbook/yelp/yelp-custom.xsl share/gnome/sgml/docbook/yelp/yelp-customization.xsl +share/gnome/sgml/docbook/yelp/yelp-functions.xsl share/gnome/yelp/catalog share/gnome/yelp/important_docs.xml share/gnome/yelp/ui/yelp.glade @@ -145,6 +151,7 @@ share/locale/bg/LC_MESSAGES/yelp.mo share/locale/bn/LC_MESSAGES/yelp.mo share/locale/ca/LC_MESSAGES/yelp.mo share/locale/cs/LC_MESSAGES/yelp.mo +share/locale/cy/LC_MESSAGES/yelp.mo share/locale/da/LC_MESSAGES/yelp.mo share/locale/de/LC_MESSAGES/yelp.mo share/locale/el/LC_MESSAGES/yelp.mo @@ -165,11 +172,13 @@ share/locale/it/LC_MESSAGES/yelp.mo share/locale/ja/LC_MESSAGES/yelp.mo share/locale/kn/LC_MESSAGES/yelp.mo share/locale/ko/LC_MESSAGES/yelp.mo +share/locale/li/LC_MESSAGES/yelp.mo share/locale/lv/LC_MESSAGES/yelp.mo share/locale/mk/LC_MESSAGES/yelp.mo share/locale/ml/LC_MESSAGES/yelp.mo share/locale/mn/LC_MESSAGES/yelp.mo share/locale/ms/LC_MESSAGES/yelp.mo +share/locale/ne/LC_MESSAGES/yelp.mo share/locale/nl/LC_MESSAGES/yelp.mo share/locale/nn/LC_MESSAGES/yelp.mo share/locale/no/LC_MESSAGES/yelp.mo @@ -180,9 +189,9 @@ share/locale/ro/LC_MESSAGES/yelp.mo share/locale/ru/LC_MESSAGES/yelp.mo share/locale/sk/LC_MESSAGES/yelp.mo share/locale/sl/LC_MESSAGES/yelp.mo +share/locale/sq/LC_MESSAGES/yelp.mo share/locale/sr/LC_MESSAGES/yelp.mo share/locale/sr@Latn/LC_MESSAGES/yelp.mo -share/locale/sq/LC_MESSAGES/yelp.mo share/locale/sv/LC_MESSAGES/yelp.mo share/locale/ta/LC_MESSAGES/yelp.mo share/locale/th/LC_MESSAGES/yelp.mo diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile index c68b229832ba..9007fff3da61 100644 --- a/x11/zenity/Makefile +++ b/x11/zenity/Makefile @@ -6,7 +6,7 @@ # PORTNAME= zenity -PORTVERSION= 1.4 +PORTVERSION= 1.6 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION} diff --git a/x11/zenity/distinfo b/x11/zenity/distinfo index e36aadb47e8a..9208b33d35ad 100644 --- a/x11/zenity/distinfo +++ b/x11/zenity/distinfo @@ -1 +1 @@ -MD5 (gnome2/zenity-1.4.tar.bz2) = 213bfc04d5ef0e9b685f948f78169850 +MD5 (gnome2/zenity-1.6.tar.bz2) = edba02f625368eb993fcce385149c09c diff --git a/x11/zenity/files/patch-src_Makefile.in b/x11/zenity/files/patch-src_Makefile.in deleted file mode 100644 index 04cc8c376391..000000000000 --- a/x11/zenity/files/patch-src_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- src/Makefile.in.orig Fri Jun 13 16:09:01 2003 -+++ src/Makefile.in Fri Jun 13 16:11:45 2003 -@@ -318,7 +318,7 @@ - check: check-am - installcheck-am: - installcheck: installcheck-am --install-exec-am: install-binPROGRAMS install-binSCRIPTS -+install-exec-am: install-binPROGRAMS - install-exec: install-exec-am - - install-data-am: install-gladeDATA diff --git a/x11/zenity/files/patch-src_main.c b/x11/zenity/files/patch-src_main.c new file mode 100644 index 000000000000..e382df057830 --- /dev/null +++ b/x11/zenity/files/patch-src_main.c @@ -0,0 +1,10 @@ +--- src/main.c.orig Mon Aug 25 02:53:00 2003 ++++ src/main.c Mon Aug 25 02:53:31 2003 +@@ -25,6 +25,7 @@ + #include "zenity.h" + #include <stdlib.h> + #include <popt.h> ++#include <locale.h> + #include <langinfo.h> + + typedef enum { diff --git a/x11/zenity/pkg-plist b/x11/zenity/pkg-plist index 195d5c972e69..b6d62fb390ac 100644 --- a/x11/zenity/pkg-plist +++ b/x11/zenity/pkg-plist @@ -1,3 +1,4 @@ +bin/gdialog bin/zenity share/gnome/omf/zenity/zenity-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/zenity/zenity-C.omf 2>/dev/null || /usr/bin/true |