diff options
| author | marcus <marcus@FreeBSD.org> | 2004-04-05 11:11:39 +0800 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2004-04-05 11:11:39 +0800 |
| commit | 6e5039e5d8ce567e36edb3ab0ea7a8cbaca5698c (patch) | |
| tree | 80dd01ef786490f07295a989b1efd8ed753a8fef | |
| parent | d49bf2116376af3147360d03cc88ffae85b3248d (diff) | |
| download | freebsd-ports-gnome-6e5039e5d8ce567e36edb3ab0ea7a8cbaca5698c.tar.gz freebsd-ports-gnome-6e5039e5d8ce567e36edb3ab0ea7a8cbaca5698c.tar.zst freebsd-ports-gnome-6e5039e5d8ce567e36edb3ab0ea7a8cbaca5698c.zip | |
Presenting GNOME 2.6.0. The FreeBSD GNOME Team feels this our best release
ever. It fixes many bugs, and adds some features missing in previous
FreeBSD ports. To help users upgrade from GNOME 2.4, we have constructed an
upgrade FAQ at:
http://www.freebsd.org/gnome/docs/faq26.html
Please read it carefully. GNOME 2.6 packages are also available for all
supported i386 versions of FreeBSD at:
http://www.marcuscom.com/tinderbox/
The FreeBSD GNOME Team would like the thank the following users for their
wonderful testing and patching efforts. We would especially like to thank
Franz Klammer <klammer@webonaut.com> for his wonderful new splash screen.
Without these people, our team, and our team alumni, GNOME on FreeBSD would
not be possible.
Jeremy Messenger <mezz7@cox.net>
Khairil Yusof <kaeru@pd.jaring.my>
Koop Mast <kwm@rainbow-runner.nl>
Simon Barner <barner@in.tum.de>
Tom McLaughlin <tmclaugh@sdf.lonestar.org>
Scott Dodson <sdodson@sdodson.com>
Vladimir Grebenschikov <vova@sw.ru>
548 files changed, 11332 insertions, 8429 deletions
diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile index 5339966c3a18..acd32a78133b 100644 --- a/accessibility/at-spi/Makefile +++ b/accessibility/at-spi/Makefile @@ -6,10 +6,10 @@ # PORTNAME= at-spi -PORTVERSION= 1.3.16 +PORTVERSION= 1.4.0 CATEGORIES= accessibility x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.3 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.4 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/accessibility/at-spi/distinfo b/accessibility/at-spi/distinfo index 8d9520e5712b..c57587f34331 100644 --- a/accessibility/at-spi/distinfo +++ b/accessibility/at-spi/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/at-spi-1.3.16.tar.bz2) = 7378514cefed4950cd7dfaf9f91f06db -SIZE (gnome2/at-spi-1.3.16.tar.bz2) = 458082 +MD5 (gnome2/at-spi-1.4.0.tar.bz2) = 4d2e4bb52153134e1ff94266fed03aeb +SIZE (gnome2/at-spi-1.4.0.tar.bz2) = 458273 diff --git a/accessibility/at-spi/pkg-descr b/accessibility/at-spi/pkg-descr index 9a558afb5307..c832f3ba9a68 100644 --- a/accessibility/at-spi/pkg-descr +++ b/accessibility/at-spi/pkg-descr @@ -1,4 +1,6 @@ -This is the Early Access Release of the Gnome Accessibility Project's -Assistive Technology Service Provider Interface. +This is the Gnome Accessibility Project's Assistive Technology +Service Provider Interface. It allows accessibility applications +and assistive technologies to announce their respective existence +to each other. -WWW: http://www.gnome.org/ +WWW: http://developer.gnome.org/projects/gap/ diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile index 4426c7907e80..266a66f7d8b3 100644 --- a/accessibility/atk/Makefile +++ b/accessibility/atk/Makefile @@ -6,12 +6,11 @@ # PORTNAME= atk -PORTVERSION= 1.4.1 -PORTREVISION= 2 +PORTVERSION= 1.6.0 CATEGORIES= accessibility devel MASTER_SITES= ${MASTER_SITE_GNOME} \ - ftp://ftp.gtk.org/pub/gtk/v2.2/ -MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.4 + ftp://ftp.gtk.org/pub/gtk/v2.3/ +MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.6 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -19,8 +18,8 @@ COMMENT= A GNOME accessibility toolkit (ATK) USE_BZIP2= yes INSTALLS_SHLIB= yes -USE_LIBTOOL_VER= 13 -USE_GNOME= gnomehack glib20 +USE_LIBTOOL_VER=13 +USE_GNOME= gnomehack lthack glib20 CONFIGURE_ARGS= --enable-static \ --disable-gtk-doc \ --with-html-dir=${PREFIX}/share/doc diff --git a/accessibility/atk/distinfo b/accessibility/atk/distinfo index c092bb6d069a..2df340b90f12 100644 --- a/accessibility/atk/distinfo +++ b/accessibility/atk/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/atk-1.4.1.tar.bz2) = d7830bdf1e05d8395794f75097d291be -SIZE (gnome2/atk-1.4.1.tar.bz2) = 444235 +MD5 (gnome2/atk-1.6.0.tar.bz2) = 5e699af22a934ea3c1c1ed3742da0500 +SIZE (gnome2/atk-1.6.0.tar.bz2) = 491876 diff --git a/accessibility/atk/files/patch-configure b/accessibility/atk/files/patch-configure deleted file mode 100644 index 13ee380f4f66..000000000000 --- a/accessibility/atk/files/patch-configure +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- configure 2002/04/26 06:33:48 1.1 -+++ configure 2002/04/26 06:33:59 -@@ -6885,6 +6885,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' diff --git a/accessibility/atk/pkg-descr b/accessibility/atk/pkg-descr index b28d3e537b26..ac3b71815e04 100644 --- a/accessibility/atk/pkg-descr +++ b/accessibility/atk/pkg-descr @@ -1,12 +1,5 @@ -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. +The GNOME Accessibility Toolkit (ATK) contains accessibility widgets, +just like GTK contains GUI element widgets. However, ATK's widgets +are platform-independent, so they can be used with Qt, Motif, etc. WWW: http://developer.gnome.org/projects/gap/ diff --git a/accessibility/atk/pkg-plist b/accessibility/atk/pkg-plist index 1af1ec8a674d..edfbb0df4600 100644 --- a/accessibility/atk/pkg-plist +++ b/accessibility/atk/pkg-plist @@ -26,7 +26,7 @@ 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.400 +lib/libatk-1.0.so.600 libdata/pkgconfig/atk.pc %%DOCSDIR%%/AtkAction.html %%DOCSDIR%%/AtkComponent.html @@ -59,6 +59,7 @@ libdata/pkgconfig/atk.pc %%DOCSDIR%%/left.png %%DOCSDIR%%/right.png %%DOCSDIR%%/up.png +share/locale/af/LC_MESSAGES/atk10.mo share/locale/am/LC_MESSAGES/atk10.mo share/locale/az/LC_MESSAGES/atk10.mo share/locale/be/LC_MESSAGES/atk10.mo @@ -70,15 +71,18 @@ 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 +share/locale/en_CA/LC_MESSAGES/atk10.mo share/locale/en_GB/LC_MESSAGES/atk10.mo share/locale/eo/LC_MESSAGES/atk10.mo share/locale/es/LC_MESSAGES/atk10.mo +share/locale/et/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/hr/LC_MESSAGES/atk10.mo share/locale/hu/LC_MESSAGES/atk10.mo share/locale/id/LC_MESSAGES/atk10.mo share/locale/is/LC_MESSAGES/atk10.mo @@ -107,6 +111,7 @@ share/locale/sl/LC_MESSAGES/atk10.mo share/locale/sq/LC_MESSAGES/atk10.mo share/locale/sr/LC_MESSAGES/atk10.mo share/locale/sr@Latn/LC_MESSAGES/atk10.mo +share/locale/sr@ije/LC_MESSAGES/atk10.mo share/locale/sv/LC_MESSAGES/atk10.mo share/locale/ta/LC_MESSAGES/atk10.mo share/locale/tr/LC_MESSAGES/atk10.mo diff --git a/accessibility/dasher/Makefile b/accessibility/dasher/Makefile index 99673de46d7c..f4b5c871b62e 100644 --- a/accessibility/dasher/Makefile +++ b/accessibility/dasher/Makefile @@ -6,8 +6,7 @@ # PORTNAME= dasher -PORTVERSION= 3.2.4 -PORTREVISION= 2 +PORTVERSION= 3.2.8 CATEGORIES= accessibility editors x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/3.2 @@ -23,7 +22,7 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack gnomehier gconf2 libglade2 -USE_LIBTOOL_VER= 13 +USE_LIBTOOL_VER=13 USE_REINPLACE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/accessibility/dasher/distinfo b/accessibility/dasher/distinfo index 0b1919e0cad9..ad3eb3513d62 100644 --- a/accessibility/dasher/distinfo +++ b/accessibility/dasher/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/dasher-3.2.4.tar.bz2) = aa851fab82fd79456fa019212a496c57 -SIZE (gnome2/dasher-3.2.4.tar.bz2) = 2266147 +MD5 (gnome2/dasher-3.2.8.tar.bz2) = 8cddd604fc690ad6089ab81143186d3c +SIZE (gnome2/dasher-3.2.8.tar.bz2) = 2339112 diff --git a/accessibility/dasher/pkg-descr b/accessibility/dasher/pkg-descr index 70df2911e94f..7ef3255f0bbe 100644 --- a/accessibility/dasher/pkg-descr +++ b/accessibility/dasher/pkg-descr @@ -9,6 +9,6 @@ system wherever a full-size keyboard cannot be used - for example, * when operating a computer with zero hands (i.e., by head-mouse or * by eyetracker). -Dasher is fast, efficient, easy to learn, and fun to use. +Dasher is fast, efficient, and easy to learn. WWW: http://www.inference.phy.cam.ac.uk/dasher/ diff --git a/accessibility/dasher/pkg-plist b/accessibility/dasher/pkg-plist index 134cdf9c004c..a1bf4a7e3f30 100644 --- a/accessibility/dasher/pkg-plist +++ b/accessibility/dasher/pkg-plist @@ -12,6 +12,7 @@ share/gnome/dasher/alphabet.hungarianLowerCase.xml share/gnome/dasher/alphabet.ipa.xml share/gnome/dasher/alphabet.italian.xml share/gnome/dasher/alphabet.korean.xml +share/gnome/dasher/alphabet.mongolian.xml share/gnome/dasher/alphabet.polish.xml share/gnome/dasher/alphabet.portuguese.xml share/gnome/dasher/alphabet.russian.xml @@ -28,6 +29,7 @@ share/gnome/dasher/training_german_DE.txt share/gnome/dasher/training_hiragana60_JP.txt share/gnome/dasher/training_hiragana83_JP.txt share/gnome/dasher/training_italian_IT.txt +share/gnome/dasher/training_mongolian_MN.txt share/gnome/dasher/training_portuguese_BR.txt share/gnome/dasher/training_russian_RU.txt share/gnome/help/dasher/C/dasher.xml @@ -44,8 +46,10 @@ share/gnome/omf/dasher/dasher-C.omf share/locale/ar/LC_MESSAGES/dasher.mo share/locale/az/LC_MESSAGES/dasher.mo share/locale/be/LC_MESSAGES/dasher.mo +share/locale/bn/LC_MESSAGES/dasher.mo share/locale/ca/LC_MESSAGES/dasher.mo share/locale/cs/LC_MESSAGES/dasher.mo +share/locale/cy/LC_MESSAGES/dasher.mo share/locale/da/LC_MESSAGES/dasher.mo share/locale/de/LC_MESSAGES/dasher.mo share/locale/el/LC_MESSAGES/dasher.mo @@ -68,11 +72,18 @@ share/locale/nl/LC_MESSAGES/dasher.mo share/locale/no/LC_MESSAGES/dasher.mo share/locale/pl/LC_MESSAGES/dasher.mo share/locale/pt/LC_MESSAGES/dasher.mo +share/locale/pt_BR/LC_MESSAGES/dasher.mo +share/locale/ro/LC_MESSAGES/dasher.mo +share/locale/ru/LC_MESSAGES/dasher.mo share/locale/sk/LC_MESSAGES/dasher.mo share/locale/sq/LC_MESSAGES/dasher.mo share/locale/sr/LC_MESSAGES/dasher.mo share/locale/sr@Latn/LC_MESSAGES/dasher.mo share/locale/sv/LC_MESSAGES/dasher.mo +share/locale/tr/LC_MESSAGES/dasher.mo +share/locale/uk/LC_MESSAGES/dasher.mo +share/locale/zh_CN/LC_MESSAGES/dasher.mo +share/locale/zh_TW/LC_MESSAGES/dasher.mo @dirrm share/gnome/omf/dasher @dirrm share/gnome/help/dasher/C/figures @dirrm share/gnome/help/dasher/C diff --git a/accessibility/gail/Makefile b/accessibility/gail/Makefile index bc7bad500548..ee36f1199ab2 100644 --- a/accessibility/gail/Makefile +++ b/accessibility/gail/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gail -PORTVERSION= 1.4.1 -PORTREVISION= 1 +PORTVERSION= 1.6.0 CATEGORIES= accessibility x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.4 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.6 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -20,7 +19,7 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes INSTALLS_SHLIB= yes -USE_LIBTOOL_VER= 13 +USE_LIBTOOL_VER=13 USE_GNOME= gnomehack libgnomecanvas CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/accessibility/gail/distinfo b/accessibility/gail/distinfo index 96608468e460..0c44ab6a9539 100644 --- a/accessibility/gail/distinfo +++ b/accessibility/gail/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gail-1.4.1.tar.bz2) = ea970bd1f6ce5da13e7d872ad9d27869 -SIZE (gnome2/gail-1.4.1.tar.bz2) = 397503 +MD5 (gnome2/gail-1.6.0.tar.bz2) = 55e6b01aa2f02d0729ec94f1460611be +SIZE (gnome2/gail-1.6.0.tar.bz2) = 497110 diff --git a/accessibility/gail/files/patch-docs_reference_libgail-util_Makefile.in b/accessibility/gail/files/patch-docs_reference_libgail-util_Makefile.in index c61bc365ad8f..6008612e13c6 100644 --- a/accessibility/gail/files/patch-docs_reference_libgail-util_Makefile.in +++ b/accessibility/gail/files/patch-docs_reference_libgail-util_Makefile.in @@ -1,11 +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); \ +--- docs/reference/libgail-util/Makefile.in.orig Wed Feb 25 13:45:04 2004 ++++ docs/reference/libgail-util/Makefile.in Wed Feb 25 13:55:28 2004 +@@ -476,8 +476,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) +- $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ + fi - # + uninstall-local: diff --git a/accessibility/gail/pkg-descr b/accessibility/gail/pkg-descr index e32431209a41..50541e527e27 100644 --- a/accessibility/gail/pkg-descr +++ b/accessibility/gail/pkg-descr @@ -1,4 +1,5 @@ -Gail, the Gnome Accessibility Implementation library, is implementation of the -ATK interfaces for GTK+ widgets. +Gail, the Gnome Accessibility Implementation library, contains +the bindings to integrate the platform-independent ATK accessibility +widgets into the Gtk structure. -WWW: http://www.gnome.org/ +WWW: http://developer.gnome.org/projects/gap/ diff --git a/accessibility/gail/pkg-plist b/accessibility/gail/pkg-plist index abe53cdd1fc2..ccdb3d3fb19c 100644 --- a/accessibility/gail/pkg-plist +++ b/accessibility/gail/pkg-plist @@ -7,10 +7,55 @@ lib/libgailutil.a lib/libgailutil.so lib/libgailutil.so.17 libdata/pkgconfig/gail.pc +share/doc/gail-libgail-util/gail-libgail-util.devhelp 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/home.png share/doc/gail-libgail-util/index.html +share/doc/gail-libgail-util/index.sgml +share/doc/gail-libgail-util/left.png share/doc/gail-libgail-util/libgail-util-main.html +share/doc/gail-libgail-util/right.png +share/doc/gail-libgail-util/up.png +share/locale/ar/LC_MESSAGES/gail.mo +share/locale/az/LC_MESSAGES/gail.mo +share/locale/be/LC_MESSAGES/gail.mo +share/locale/bn/LC_MESSAGES/gail.mo +share/locale/ca/LC_MESSAGES/gail.mo +share/locale/cs/LC_MESSAGES/gail.mo +share/locale/cy/LC_MESSAGES/gail.mo +share/locale/de/LC_MESSAGES/gail.mo +share/locale/el/LC_MESSAGES/gail.mo +share/locale/en_CA/LC_MESSAGES/gail.mo +share/locale/en_GB/LC_MESSAGES/gail.mo +share/locale/es/LC_MESSAGES/gail.mo +share/locale/fa/LC_MESSAGES/gail.mo +share/locale/fi/LC_MESSAGES/gail.mo +share/locale/fr/LC_MESSAGES/gail.mo +share/locale/ga/LC_MESSAGES/gail.mo +share/locale/hi/LC_MESSAGES/gail.mo +share/locale/hr/LC_MESSAGES/gail.mo +share/locale/id/LC_MESSAGES/gail.mo +share/locale/is/LC_MESSAGES/gail.mo +share/locale/it/LC_MESSAGES/gail.mo +share/locale/ja/LC_MESSAGES/gail.mo +share/locale/ko/LC_MESSAGES/gail.mo +share/locale/lt/LC_MESSAGES/gail.mo +share/locale/mn/LC_MESSAGES/gail.mo +share/locale/ms/LC_MESSAGES/gail.mo +share/locale/nl/LC_MESSAGES/gail.mo +share/locale/nn/LC_MESSAGES/gail.mo +share/locale/no/LC_MESSAGES/gail.mo +share/locale/pt/LC_MESSAGES/gail.mo +share/locale/pt_BR/LC_MESSAGES/gail.mo +share/locale/ro/LC_MESSAGES/gail.mo +share/locale/ru/LC_MESSAGES/gail.mo +share/locale/sq/LC_MESSAGES/gail.mo +share/locale/sr/LC_MESSAGES/gail.mo +share/locale/sr@Latn/LC_MESSAGES/gail.mo +share/locale/sv/LC_MESSAGES/gail.mo +share/locale/ta/LC_MESSAGES/gail.mo +share/locale/uk/LC_MESSAGES/gail.mo @dirrm share/doc/gail-libgail-util @dirrm lib/gtk-2.0/modules @dirrm include/gail-1.0/libgail-util diff --git a/accessibility/gnome-speech/Makefile b/accessibility/gnome-speech/Makefile index 51e6b5dbbda8..b7f210d4a339 100644 --- a/accessibility/gnome-speech/Makefile +++ b/accessibility/gnome-speech/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomespeech -PORTVERSION= 0.2.8 -PORTREVISION= 1 +PORTVERSION= 0.3.2 CATEGORIES= accessibility audio gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-speech/0.2 +MASTER_SITE_SUBDIR= sources/gnome-speech/0.3 DISTNAME= gnome-speech-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/accessibility/gnome-speech/distinfo b/accessibility/gnome-speech/distinfo index 56d46414ff7a..e57980bc98e9 100644 --- a/accessibility/gnome-speech/distinfo +++ b/accessibility/gnome-speech/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-speech-0.2.8.tar.bz2) = efa14757643f3e6ec7cdf1aef33914a6 -SIZE (gnome2/gnome-speech-0.2.8.tar.bz2) = 223063 +MD5 (gnome2/gnome-speech-0.3.2.tar.bz2) = d1c3ad83c3c6f42db0f8ad3cb61c4671 +SIZE (gnome2/gnome-speech-0.3.2.tar.bz2) = 224719 diff --git a/accessibility/gnome-speech/pkg-plist b/accessibility/gnome-speech/pkg-plist index 65ebac9bf8a3..1c66148480e8 100644 --- a/accessibility/gnome-speech/pkg-plist +++ b/accessibility/gnome-speech/pkg-plist @@ -5,7 +5,7 @@ include/gnome-speech-1.0/gnome-speech/gnome-speech.h include/gnome-speech-1.0/gnome-speech/speaker.h lib/libgnomespeech.a lib/libgnomespeech.so -lib/libgnomespeech.so.6 +lib/libgnomespeech.so.7 lib/orbit-2.0/GNOME_Speech_module.so libdata/bonobo/servers/GNOME_Speech_SynthesisDriver_Festival.server libdata/pkgconfig/gnome-speech-1.0.pc diff --git a/accessibility/gnomespeech/Makefile b/accessibility/gnomespeech/Makefile index 51e6b5dbbda8..b7f210d4a339 100644 --- a/accessibility/gnomespeech/Makefile +++ b/accessibility/gnomespeech/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomespeech -PORTVERSION= 0.2.8 -PORTREVISION= 1 +PORTVERSION= 0.3.2 CATEGORIES= accessibility audio gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-speech/0.2 +MASTER_SITE_SUBDIR= sources/gnome-speech/0.3 DISTNAME= gnome-speech-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/accessibility/gnomespeech/distinfo b/accessibility/gnomespeech/distinfo index 56d46414ff7a..e57980bc98e9 100644 --- a/accessibility/gnomespeech/distinfo +++ b/accessibility/gnomespeech/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-speech-0.2.8.tar.bz2) = efa14757643f3e6ec7cdf1aef33914a6 -SIZE (gnome2/gnome-speech-0.2.8.tar.bz2) = 223063 +MD5 (gnome2/gnome-speech-0.3.2.tar.bz2) = d1c3ad83c3c6f42db0f8ad3cb61c4671 +SIZE (gnome2/gnome-speech-0.3.2.tar.bz2) = 224719 diff --git a/accessibility/gnomespeech/pkg-plist b/accessibility/gnomespeech/pkg-plist index 65ebac9bf8a3..1c66148480e8 100644 --- a/accessibility/gnomespeech/pkg-plist +++ b/accessibility/gnomespeech/pkg-plist @@ -5,7 +5,7 @@ include/gnome-speech-1.0/gnome-speech/gnome-speech.h include/gnome-speech-1.0/gnome-speech/speaker.h lib/libgnomespeech.a lib/libgnomespeech.so -lib/libgnomespeech.so.6 +lib/libgnomespeech.so.7 lib/orbit-2.0/GNOME_Speech_module.so libdata/bonobo/servers/GNOME_Speech_SynthesisDriver_Festival.server libdata/pkgconfig/gnome-speech-1.0.pc diff --git a/accessibility/gnopernicus/Makefile b/accessibility/gnopernicus/Makefile index bca17a8ea898..cbc48d421592 100644 --- a/accessibility/gnopernicus/Makefile +++ b/accessibility/gnopernicus/Makefile @@ -6,25 +6,26 @@ # PORTNAME= gnopernicus -PORTVERSION= 0.7.1 +PORTVERSION= 0.8.1 PORTREVISION= 1 CATEGORIES= accessibility x11 gnome 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= Collection of accessibility apps for GNOME 2 LIB_DEPENDS= gnome-mag.1:${PORTSDIR}/accessibility/gnomemag \ - gnomespeech.6:${PORTSDIR}/accessibility/gnomespeech + gnomespeech.7:${PORTSDIR}/accessibility/gnomespeech USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack gnomehier libgnomeui atspi -USE_LIBTOOL_VER= 13 +USE_GNOME= gnomeprefix gnomehack intlhack lthack libgnomeui atspi +USE_LIBTOOL_VER=13 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +MAKE_ENV= SED="${SED}" .include <bsd.port.mk> diff --git a/accessibility/gnopernicus/distinfo b/accessibility/gnopernicus/distinfo index 808885246d7e..e00b340f229b 100644 --- a/accessibility/gnopernicus/distinfo +++ b/accessibility/gnopernicus/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnopernicus-0.7.1.tar.bz2) = 8a8bbeeffe1c9b315547e8b10f65c1bb -SIZE (gnome2/gnopernicus-0.7.1.tar.bz2) = 1069645 +MD5 (gnome2/gnopernicus-0.8.1.tar.bz2) = ede9ad4871b4f0ed9991855b74aa7782 +SIZE (gnome2/gnopernicus-0.8.1.tar.bz2) = 1456530 diff --git a/accessibility/gnopernicus/pkg-descr b/accessibility/gnopernicus/pkg-descr index d522adfa7501..1719c6588a08 100644 --- a/accessibility/gnopernicus/pkg-descr +++ b/accessibility/gnopernicus/pkg-descr @@ -1,4 +1,4 @@ -Gnopernicus provides Assistive Technologies (AT) for blind and visually +Gnopernicus provides Assistive Technologies (AT) for blind and visually impaired persons through modules for text-to-speech, braille, etc. WWW: http://www.baum.ro/gnopernicus.html diff --git a/accessibility/gnopernicus/pkg-plist b/accessibility/gnopernicus/pkg-plist index 532305da422d..5eb4fde5ac92 100644 --- a/accessibility/gnopernicus/pkg-plist +++ b/accessibility/gnopernicus/pkg-plist @@ -32,6 +32,8 @@ etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L00K13/%gconf etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L00K14/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L00K15/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L01K01/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L01K02/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L01K03/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L01K12/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L03K01/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L03K02/%gconf.xml @@ -85,6 +87,15 @@ etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L08K07/%gconf etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L08K08/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L08K09/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L08K10/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L08K13/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L09K01/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L09K03/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L09K04/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L09K06/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L10K01/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L10K02/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L10K03/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L10K04/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/user_key/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnopernicus/config/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnopernicus/config/brlmon/%gconf.xml @@ -130,6 +141,8 @@ etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L00K1 etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L00K14/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L00K15/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L01K01/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L01K02/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L01K03/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L01K12/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L03K01/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L03K02/%gconf.xml @@ -188,6 +201,10 @@ etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L09K0 etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L09K03/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L09K04/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L09K06/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L10K01/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L10K02/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L10K03/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L10K04/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/user_key/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/config/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/config/brlmon/%gconf.xml @@ -274,29 +291,48 @@ share/gnome/gnopernicus/glade/gnopi_files/gnopi.glade2 share/gnome/gnopernicus/glade/gnopi_files/keyboard.xpm share/gnome/gnopernicus/glade/gnopi_files/monitor.png share/gnome/gnopernicus/glade/gnopi_files/start_up.png +share/gnome/gnopernicus/presentation/default.xml +share/gnome/gnopernicus/presentation/verbose.xml share/gnome/help/brlmonitor/C/brlmonitor.xml share/gnome/help/brlmonitor/C/legal.xml share/gnome/help/gnopernicus/C/gnopernicus.xml share/gnome/help/gnopernicus/C/legal.xml +share/gnome/help/brlmonitor/es/brlmonitor.xml +share/gnome/help/brlmonitor/es/legal.xml +share/gnome/help/gnopernicus/es/gnopernicus.xml +share/gnome/help/gnopernicus/es/legal.xml share/gnome/omf/gnopernicus/brlmonitor-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnopernicus/brlmonitor-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnopernicus/gnopernicus-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnopernicus/gnopernicus-C.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnopernicus/brlmonitor-es.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnopernicus/brlmonitor-es.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnopernicus/gnopernicus-es.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnopernicus/gnopernicus-es.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/gnopernicus.png +share/locale/ar/LC_MESSAGES/gnopernicus.mo share/locale/az/LC_MESSAGES/gnopernicus.mo share/locale/be/LC_MESSAGES/gnopernicus.mo +share/locale/ca/LC_MESSAGES/gnopernicus.mo share/locale/cs/LC_MESSAGES/gnopernicus.mo share/locale/cy/LC_MESSAGES/gnopernicus.mo share/locale/da/LC_MESSAGES/gnopernicus.mo share/locale/de/LC_MESSAGES/gnopernicus.mo share/locale/el/LC_MESSAGES/gnopernicus.mo +share/locale/en_CA/LC_MESSAGES/gnopernicus.mo +share/locale/en_GB/LC_MESSAGES/gnopernicus.mo share/locale/es/LC_MESSAGES/gnopernicus.mo +share/locale/eu/LC_MESSAGES/gnopernicus.mo +share/locale/fi/LC_MESSAGES/gnopernicus.mo share/locale/fr/LC_MESSAGES/gnopernicus.mo share/locale/ga/LC_MESSAGES/gnopernicus.mo share/locale/hi/LC_MESSAGES/gnopernicus.mo +share/locale/hr/LC_MESSAGES/gnopernicus.mo share/locale/it/LC_MESSAGES/gnopernicus.mo share/locale/ja/LC_MESSAGES/gnopernicus.mo share/locale/ko/LC_MESSAGES/gnopernicus.mo +share/locale/lt/LC_MESSAGES/gnopernicus.mo +share/locale/mn/LC_MESSAGES/gnopernicus.mo share/locale/ms/LC_MESSAGES/gnopernicus.mo share/locale/nl/LC_MESSAGES/gnopernicus.mo share/locale/no/LC_MESSAGES/gnopernicus.mo @@ -308,12 +344,16 @@ share/locale/sq/LC_MESSAGES/gnopernicus.mo share/locale/sr/LC_MESSAGES/gnopernicus.mo share/locale/sr@Latn/LC_MESSAGES/gnopernicus.mo share/locale/sv/LC_MESSAGES/gnopernicus.mo +share/locale/uk/LC_MESSAGES/gnopernicus.mo share/locale/zh_CN/LC_MESSAGES/gnopernicus.mo @dirrm share/gnome/omf/gnopernicus +@dirrm share/gnome/help/gnopernicus/es @dirrm share/gnome/help/gnopernicus/C @dirrm share/gnome/help/gnopernicus +@dirrm share/gnome/help/brlmonitor/es @dirrm share/gnome/help/brlmonitor/C @dirrm share/gnome/help/brlmonitor +@dirrm share/gnome/gnopernicus/presentation @dirrm share/gnome/gnopernicus/glade/gnopi_files/User_Properties @dirrm share/gnome/gnopernicus/glade/gnopi_files/Speech_Settings @dirrm share/gnome/gnopernicus/glade/gnopi_files/Screen_Review @@ -355,6 +395,10 @@ share/locale/zh_CN/LC_MESSAGES/gnopernicus.mo @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/config/brlmon @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/config @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/user_key +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L10K04 +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L10K03 +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L10K02 +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L10K01 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L09K06 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L09K04 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L09K03 @@ -413,6 +457,8 @@ share/locale/zh_CN/LC_MESSAGES/gnopernicus.mo @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L03K02 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L03K01 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L01K12 +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L01K03 +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L01K02 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L01K01 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L00K15 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L00K14 @@ -458,6 +504,15 @@ share/locale/zh_CN/LC_MESSAGES/gnopernicus.mo @dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/config/brlmon @dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/config @dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/user_key +@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L10K04 +@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L10K03 +@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L10K02 +@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L10K01 +@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L09K06 +@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L09K04 +@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L09K03 +@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L09K01 +@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L08K13 @dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L08K10 @dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L08K09 @dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L08K08 @@ -511,6 +566,8 @@ share/locale/zh_CN/LC_MESSAGES/gnopernicus.mo @dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L03K02 @dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L03K01 @dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L01K12 +@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L01K03 +@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L01K02 @dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L01K01 @dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L00K15 @dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L00K14 @@ -544,3 +601,5 @@ share/locale/zh_CN/LC_MESSAGES/gnopernicus.mo @dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnopernicus/brlmonitor-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnopernicus/gnopernicus-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnopernicus/brlmonitor-es.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnopernicus/gnopernicus-es.omf 2>/dev/null || /usr/bin/true diff --git a/accessibility/gok/Makefile b/accessibility/gok/Makefile index ea3fce477a88..a527c8bd9c62 100644 --- a/accessibility/gok/Makefile +++ b/accessibility/gok/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gok -PORTVERSION= 0.8.4 -PORTREVISION= 1 +PORTVERSION= 0.10.0 CATEGORIES= accessibility sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.8 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.10 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -18,10 +17,10 @@ COMMENT= GNOME On-Screen Keyboard (GOK) USE_BZIP2= yes USE_X_PREFIX= yes -USE_GNOME= gnomehack gnomeprefix libgnomeui atspi libwnck +USE_GNOME= gnomehack gnomeprefix intlhack lthack libgnomeui atspi libwnck USE_REINPLACE= yes USE_GMAKE= yes -GNU_CONFIGURE= yes +USE_LIBTOOL_VER=13 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" diff --git a/accessibility/gok/distinfo b/accessibility/gok/distinfo index f825ed68482b..bc107dceca42 100644 --- a/accessibility/gok/distinfo +++ b/accessibility/gok/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gok-0.8.4.tar.bz2) = 6335c3e95b910c0f7c8baedcff4246b5 -SIZE (gnome2/gok-0.8.4.tar.bz2) = 867488 +MD5 (gnome2/gok-0.10.0.tar.bz2) = 02ae66889522cb3b3731f9a60ac86d9e +SIZE (gnome2/gok-0.10.0.tar.bz2) = 1081717 diff --git a/accessibility/gok/pkg-descr b/accessibility/gok/pkg-descr index 1eb9874537ea..1ef635d803c7 100644 --- a/accessibility/gok/pkg-descr +++ b/accessibility/gok/pkg-descr @@ -1,4 +1,4 @@ -The GNOME On-Screen Keyboard (GOK) is an accessability interface +The GNOME On-Screen Keyboard (GOK) is an accessibility interface that gives you control of your system without needing a keyboard. The GOK makes available a hierarchical button system that enables keyboardless entry of common accelerators, and contains a diff --git a/accessibility/gok/pkg-plist b/accessibility/gok/pkg-plist index 1c6824b89dbd..954ac5f93a21 100644 --- a/accessibility/gok/pkg-plist +++ b/accessibility/gok/pkg-plist @@ -42,58 +42,8 @@ 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/bonobo/servers/GNOME_Gok.server libdata/pkgconfig/gok-1.0.pc -%%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 @@ -104,36 +54,366 @@ 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/am/gok-controls.kbd +share/gnome/gok/am/hide.kbd +share/gnome/gok/am/launcher.kbd +share/gnome/gok/am/main.kbd +share/gnome/gok/am/mouse.kbd +share/gnome/gok/am/move-resize.kbd +share/gnome/gok/am/quit.kbd +share/gnome/gok/am/text-operations.kbd +share/gnome/gok/ar/gok-controls.kbd +share/gnome/gok/ar/hide.kbd +share/gnome/gok/ar/launcher.kbd +share/gnome/gok/ar/main.kbd +share/gnome/gok/ar/mouse.kbd +share/gnome/gok/ar/move-resize.kbd +share/gnome/gok/ar/quit.kbd +share/gnome/gok/ar/text-operations.kbd share/gnome/gok/automatic-scanning.xam +share/gnome/gok/az/gok-controls.kbd +share/gnome/gok/az/hide.kbd +share/gnome/gok/az/launcher.kbd +share/gnome/gok/az/main.kbd +share/gnome/gok/az/mouse.kbd +share/gnome/gok/az/move-resize.kbd +share/gnome/gok/az/quit.kbd +share/gnome/gok/az/text-operations.kbd +share/gnome/gok/be/gok-controls.kbd +share/gnome/gok/be/hide.kbd +share/gnome/gok/be/launcher.kbd +share/gnome/gok/be/main.kbd +share/gnome/gok/be/mouse.kbd +share/gnome/gok/be/move-resize.kbd +share/gnome/gok/be/quit.kbd +share/gnome/gok/be/text-operations.kbd +share/gnome/gok/ca/gok-controls.kbd +share/gnome/gok/ca/hide.kbd +share/gnome/gok/ca/launcher.kbd +share/gnome/gok/ca/main.kbd +share/gnome/gok/ca/mouse.kbd +share/gnome/gok/ca/move-resize.kbd +share/gnome/gok/ca/quit.kbd +share/gnome/gok/ca/text-operations.kbd +share/gnome/gok/cs/gok-controls.kbd +share/gnome/gok/cs/hide.kbd +share/gnome/gok/cs/launcher.kbd +share/gnome/gok/cs/main.kbd +share/gnome/gok/cs/mouse.kbd +share/gnome/gok/cs/move-resize.kbd +share/gnome/gok/cs/quit.kbd +share/gnome/gok/cs/text-operations.kbd +share/gnome/gok/cy/gok-controls.kbd +share/gnome/gok/cy/hide.kbd +share/gnome/gok/cy/launcher.kbd +share/gnome/gok/cy/main.kbd +share/gnome/gok/cy/mouse.kbd +share/gnome/gok/cy/move-resize.kbd +share/gnome/gok/cy/quit.kbd +share/gnome/gok/cy/text-operations.kbd +share/gnome/gok/da/gok-controls.kbd +share/gnome/gok/da/hide.kbd +share/gnome/gok/da/launcher.kbd +share/gnome/gok/da/main.kbd +share/gnome/gok/da/mouse.kbd +share/gnome/gok/da/move-resize.kbd +share/gnome/gok/da/quit.kbd +share/gnome/gok/da/text-operations.kbd +share/gnome/gok/de/gok-controls.kbd +share/gnome/gok/de/hide.kbd +share/gnome/gok/de/launcher.kbd +share/gnome/gok/de/main.kbd +share/gnome/gok/de/mouse.kbd +share/gnome/gok/de/move-resize.kbd +share/gnome/gok/de/quit.kbd +share/gnome/gok/de/text-operations.kbd share/gnome/gok/dictionary.txt share/gnome/gok/direct-selection.xam share/gnome/gok/dwell-selection.xam +share/gnome/gok/el/gok-controls.kbd +share/gnome/gok/el/hide.kbd +share/gnome/gok/el/launcher.kbd +share/gnome/gok/el/main.kbd +share/gnome/gok/el/mouse.kbd +share/gnome/gok/el/move-resize.kbd +share/gnome/gok/el/quit.kbd +share/gnome/gok/el/text-operations.kbd +share/gnome/gok/en_CA/gok-controls.kbd +share/gnome/gok/en_CA/hide.kbd +share/gnome/gok/en_CA/launcher.kbd +share/gnome/gok/en_CA/main.kbd +share/gnome/gok/en_CA/mouse.kbd +share/gnome/gok/en_CA/move-resize.kbd +share/gnome/gok/en_CA/quit.kbd +share/gnome/gok/en_CA/text-operations.kbd +share/gnome/gok/en_GB/gok-controls.kbd +share/gnome/gok/en_GB/hide.kbd +share/gnome/gok/en_GB/launcher.kbd +share/gnome/gok/en_GB/main.kbd +share/gnome/gok/en_GB/mouse.kbd +share/gnome/gok/en_GB/move-resize.kbd +share/gnome/gok/en_GB/quit.kbd +share/gnome/gok/en_GB/text-operations.kbd share/gnome/gok/empty.png +share/gnome/gok/es/gok-controls.kbd +share/gnome/gok/es/hide.kbd +share/gnome/gok/es/launcher.kbd +share/gnome/gok/es/main.kbd +share/gnome/gok/es/mouse.kbd +share/gnome/gok/es/move-resize.kbd +share/gnome/gok/es/quit.kbd +share/gnome/gok/es/text-operations.kbd +share/gnome/gok/fr/gok-controls.kbd +share/gnome/gok/fr/hide.kbd +share/gnome/gok/fr/launcher.kbd +share/gnome/gok/fr/main.kbd +share/gnome/gok/fr/mouse.kbd +share/gnome/gok/fr/move-resize.kbd +share/gnome/gok/fr/quit.kbd +share/gnome/gok/fr/text-operations.kbd +share/gnome/gok/ga/gok-controls.kbd +share/gnome/gok/ga/hide.kbd +share/gnome/gok/ga/launcher.kbd +share/gnome/gok/ga/main.kbd +share/gnome/gok/ga/mouse.kbd +share/gnome/gok/ga/move-resize.kbd +share/gnome/gok/ga/quit.kbd +share/gnome/gok/ga/text-operations.kbd share/gnome/gok/gok.png share/gnome/gok/gok.rc share/gnome/gok/gok-controls.kbd share/gnome/gok/goklogo.png share/gnome/gok/goksound1.wav share/gnome/gok/goksound2.wav -share/gnome/gok/inverse-scanning.xam +share/gnome/gok/hi/gok-controls.kbd +share/gnome/gok/hi/hide.kbd +share/gnome/gok/hi/launcher.kbd +share/gnome/gok/hi/main.kbd +share/gnome/gok/hi/mouse.kbd +share/gnome/gok/hi/move-resize.kbd +share/gnome/gok/hi/quit.kbd +share/gnome/gok/hi/text-operations.kbd share/gnome/gok/hide.kbd +share/gnome/gok/hr/gok-controls.kbd +share/gnome/gok/hr/hide.kbd +share/gnome/gok/hr/launcher.kbd +share/gnome/gok/hr/main.kbd +share/gnome/gok/hr/mouse.kbd +share/gnome/gok/hr/move-resize.kbd +share/gnome/gok/hr/quit.kbd +share/gnome/gok/hr/text-operations.kbd +share/gnome/gok/inverse-scanning.xam +share/gnome/gok/it/gok-controls.kbd +share/gnome/gok/it/hide.kbd +share/gnome/gok/it/launcher.kbd +share/gnome/gok/it/main.kbd +share/gnome/gok/it/mouse.kbd +share/gnome/gok/it/move-resize.kbd +share/gnome/gok/it/quit.kbd +share/gnome/gok/it/text-operations.kbd +share/gnome/gok/ja/gok-controls.kbd +share/gnome/gok/ja/hide.kbd +share/gnome/gok/ja/launcher.kbd +share/gnome/gok/ja/main.kbd +share/gnome/gok/ja/mouse.kbd +share/gnome/gok/ja/move-resize.kbd +share/gnome/gok/ja/quit.kbd +share/gnome/gok/ja/text-operations.kbd +share/gnome/gok/ko/gok-controls.kbd +share/gnome/gok/ko/hide.kbd +share/gnome/gok/ko/launcher.kbd +share/gnome/gok/ko/main.kbd +share/gnome/gok/ko/mouse.kbd +share/gnome/gok/ko/move-resize.kbd +share/gnome/gok/ko/quit.kbd +share/gnome/gok/ko/text-operations.kbd share/gnome/gok/latched.png share/gnome/gok/launcher.kbd share/gnome/gok/locked.png +share/gnome/gok/lt/gok-controls.kbd +share/gnome/gok/lt/hide.kbd +share/gnome/gok/lt/launcher.kbd +share/gnome/gok/lt/main.kbd +share/gnome/gok/lt/mouse.kbd +share/gnome/gok/lt/move-resize.kbd +share/gnome/gok/lt/quit.kbd +share/gnome/gok/lt/text-operations.kbd share/gnome/gok/main.kbd share/gnome/gok/manage.kbd +share/gnome/gok/mk/gok-controls.kbd +share/gnome/gok/mk/hide.kbd +share/gnome/gok/mk/launcher.kbd +share/gnome/gok/mk/main.kbd +share/gnome/gok/mk/mouse.kbd +share/gnome/gok/mk/move-resize.kbd +share/gnome/gok/mk/quit.kbd +share/gnome/gok/mk/text-operations.kbd +share/gnome/gok/ml/gok-controls.kbd +share/gnome/gok/ml/hide.kbd +share/gnome/gok/ml/launcher.kbd +share/gnome/gok/ml/main.kbd +share/gnome/gok/ml/mouse.kbd +share/gnome/gok/ml/move-resize.kbd +share/gnome/gok/ml/quit.kbd +share/gnome/gok/ml/text-operations.kbd +share/gnome/gok/mn/gok-controls.kbd +share/gnome/gok/mn/hide.kbd +share/gnome/gok/mn/launcher.kbd +share/gnome/gok/mn/main.kbd +share/gnome/gok/mn/mouse.kbd +share/gnome/gok/mn/move-resize.kbd +share/gnome/gok/mn/quit.kbd +share/gnome/gok/mn/text-operations.kbd share/gnome/gok/mouse.kbd share/gnome/gok/move-resize.kbd +share/gnome/gok/ms/gok-controls.kbd +share/gnome/gok/ms/hide.kbd +share/gnome/gok/ms/launcher.kbd +share/gnome/gok/ms/main.kbd +share/gnome/gok/ms/mouse.kbd +share/gnome/gok/ms/move-resize.kbd +share/gnome/gok/ms/quit.kbd +share/gnome/gok/ms/text-operations.kbd +share/gnome/gok/nl/gok-controls.kbd +share/gnome/gok/nl/hide.kbd +share/gnome/gok/nl/launcher.kbd +share/gnome/gok/nl/main.kbd +share/gnome/gok/nl/mouse.kbd +share/gnome/gok/nl/move-resize.kbd +share/gnome/gok/nl/quit.kbd +share/gnome/gok/nl/text-operations.kbd +share/gnome/gok/no/gok-controls.kbd +share/gnome/gok/no/hide.kbd +share/gnome/gok/no/launcher.kbd +share/gnome/gok/no/main.kbd +share/gnome/gok/no/mouse.kbd +share/gnome/gok/no/move-resize.kbd +share/gnome/gok/no/quit.kbd +share/gnome/gok/no/text-operations.kbd +share/gnome/gok/pa/gok-controls.kbd +share/gnome/gok/pa/hide.kbd +share/gnome/gok/pa/launcher.kbd +share/gnome/gok/pa/main.kbd +share/gnome/gok/pa/mouse.kbd +share/gnome/gok/pa/move-resize.kbd +share/gnome/gok/pa/quit.kbd +share/gnome/gok/pa/text-operations.kbd +share/gnome/gok/pl/gok-controls.kbd +share/gnome/gok/pl/hide.kbd +share/gnome/gok/pl/launcher.kbd +share/gnome/gok/pl/main.kbd +share/gnome/gok/pl/mouse.kbd +share/gnome/gok/pl/move-resize.kbd +share/gnome/gok/pl/quit.kbd +share/gnome/gok/pl/text-operations.kbd +share/gnome/gok/pt/gok-controls.kbd +share/gnome/gok/pt/hide.kbd +share/gnome/gok/pt/launcher.kbd +share/gnome/gok/pt/main.kbd +share/gnome/gok/pt/mouse.kbd +share/gnome/gok/pt/move-resize.kbd +share/gnome/gok/pt/quit.kbd +share/gnome/gok/pt/text-operations.kbd +share/gnome/gok/pt_BR/gok-controls.kbd +share/gnome/gok/pt_BR/hide.kbd +share/gnome/gok/pt_BR/launcher.kbd +share/gnome/gok/pt_BR/main.kbd +share/gnome/gok/pt_BR/mouse.kbd +share/gnome/gok/pt_BR/move-resize.kbd +share/gnome/gok/pt_BR/quit.kbd +share/gnome/gok/pt_BR/text-operations.kbd share/gnome/gok/quit.kbd share/gnome/gok/qwerty.kbd +share/gnome/gok/singlekey-automatic-scanning.xam +share/gnome/gok/singlekey-inverse-scanning.xam +share/gnome/gok/sl/gok-controls.kbd +share/gnome/gok/sl/hide.kbd +share/gnome/gok/sl/launcher.kbd +share/gnome/gok/sl/main.kbd +share/gnome/gok/sl/mouse.kbd +share/gnome/gok/sl/move-resize.kbd +share/gnome/gok/sl/quit.kbd +share/gnome/gok/sl/text-operations.kbd share/gnome/gok/small-empty.png +share/gnome/gok/sq/gok-controls.kbd +share/gnome/gok/sq/hide.kbd +share/gnome/gok/sq/launcher.kbd +share/gnome/gok/sq/main.kbd +share/gnome/gok/sq/mouse.kbd +share/gnome/gok/sq/move-resize.kbd +share/gnome/gok/sq/quit.kbd +share/gnome/gok/sq/text-operations.kbd +share/gnome/gok/sr/gok-controls.kbd +share/gnome/gok/sr/hide.kbd +share/gnome/gok/sr/launcher.kbd +share/gnome/gok/sr/main.kbd +share/gnome/gok/sr/mouse.kbd +share/gnome/gok/sr/move-resize.kbd +share/gnome/gok/sr/quit.kbd +share/gnome/gok/sr/text-operations.kbd +share/gnome/gok/sr@Latn/gok-controls.kbd +share/gnome/gok/sr@Latn/hide.kbd +share/gnome/gok/sr@Latn/launcher.kbd +share/gnome/gok/sr@Latn/main.kbd +share/gnome/gok/sr@Latn/mouse.kbd +share/gnome/gok/sr@Latn/move-resize.kbd +share/gnome/gok/sr@Latn/quit.kbd +share/gnome/gok/sr@Latn/text-operations.kbd +share/gnome/gok/sv/gok-controls.kbd +share/gnome/gok/sv/hide.kbd +share/gnome/gok/sv/launcher.kbd +share/gnome/gok/sv/main.kbd +share/gnome/gok/sv/mouse.kbd +share/gnome/gok/sv/move-resize.kbd +share/gnome/gok/sv/quit.kbd +share/gnome/gok/sv/text-operations.kbd +share/gnome/gok/ta/gok-controls.kbd +share/gnome/gok/ta/hide.kbd +share/gnome/gok/ta/launcher.kbd +share/gnome/gok/ta/main.kbd +share/gnome/gok/ta/mouse.kbd +share/gnome/gok/ta/move-resize.kbd +share/gnome/gok/ta/quit.kbd +share/gnome/gok/ta/text-operations.kbd share/gnome/gok/text-operations.kbd +share/gnome/gok/uk/gok-controls.kbd +share/gnome/gok/uk/hide.kbd +share/gnome/gok/uk/launcher.kbd +share/gnome/gok/uk/main.kbd +share/gnome/gok/uk/mouse.kbd +share/gnome/gok/uk/move-resize.kbd +share/gnome/gok/uk/quit.kbd +share/gnome/gok/uk/text-operations.kbd +share/gnome/gok/vi/gok-controls.kbd +share/gnome/gok/vi/hide.kbd +share/gnome/gok/vi/launcher.kbd +share/gnome/gok/vi/main.kbd +share/gnome/gok/vi/mouse.kbd +share/gnome/gok/vi/move-resize.kbd +share/gnome/gok/vi/quit.kbd +share/gnome/gok/vi/text-operations.kbd +share/gnome/gok/zh_CN/gok-controls.kbd +share/gnome/gok/zh_CN/hide.kbd +share/gnome/gok/zh_CN/launcher.kbd +share/gnome/gok/zh_CN/main.kbd +share/gnome/gok/zh_CN/mouse.kbd +share/gnome/gok/zh_CN/move-resize.kbd +share/gnome/gok/zh_CN/quit.kbd +share/gnome/gok/zh_CN/text-operations.kbd +share/gnome/gok/zh_TW/gok-controls.kbd +share/gnome/gok/zh_TW/hide.kbd +share/gnome/gok/zh_TW/launcher.kbd +share/gnome/gok/zh_TW/main.kbd +share/gnome/gok/zh_TW/mouse.kbd +share/gnome/gok/zh_TW/move-resize.kbd +share/gnome/gok/zh_TW/quit.kbd +share/gnome/gok/zh_TW/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 || /usr/bin/true share/gnome/pixmaps/gok.png share/locale/am/LC_MESSAGES/gok.mo +share/locale/ar/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 @@ -142,17 +422,24 @@ 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/en_CA/LC_MESSAGES/gok.mo +share/locale/en_GB/LC_MESSAGES/gok.mo share/locale/es/LC_MESSAGES/gok.mo share/locale/fr/LC_MESSAGES/gok.mo +share/locale/ga/LC_MESSAGES/gok.mo share/locale/hi/LC_MESSAGES/gok.mo +share/locale/hr/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/lt/LC_MESSAGES/gok.mo share/locale/mk/LC_MESSAGES/gok.mo share/locale/ml/LC_MESSAGES/gok.mo +share/locale/mn/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/pa/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 @@ -167,11 +454,50 @@ 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/zh_TW +@dirrm share/gnome/gok/zh_CN +@dirrm share/gnome/gok/vi +@dirrm share/gnome/gok/uk +@dirrm share/gnome/gok/ta +@dirrm share/gnome/gok/sv +@dirrm share/gnome/gok/sr@Latn +@dirrm share/gnome/gok/sr +@dirrm share/gnome/gok/sq +@dirrm share/gnome/gok/sl +@dirrm share/gnome/gok/pt_BR +@dirrm share/gnome/gok/pt +@dirrm share/gnome/gok/pl +@dirrm share/gnome/gok/pa +@dirrm share/gnome/gok/no +@dirrm share/gnome/gok/nl +@dirrm share/gnome/gok/ms +@dirrm share/gnome/gok/mn +@dirrm share/gnome/gok/ml +@dirrm share/gnome/gok/mk +@dirrm share/gnome/gok/lt +@dirrm share/gnome/gok/ko +@dirrm share/gnome/gok/ja +@dirrm share/gnome/gok/it +@dirrm share/gnome/gok/hr +@dirrm share/gnome/gok/hi +@dirrm share/gnome/gok/ga +@dirrm share/gnome/gok/fr +@dirrm share/gnome/gok/es +@dirrm share/gnome/gok/en_GB +@dirrm share/gnome/gok/en_CA +@dirrm share/gnome/gok/el +@dirrm share/gnome/gok/de +@dirrm share/gnome/gok/da +@dirrm share/gnome/gok/cy +@dirrm share/gnome/gok/cs +@dirrm share/gnome/gok/ca +@dirrm share/gnome/gok/be +@dirrm share/gnome/gok/az +@dirrm share/gnome/gok/ar +@dirrm share/gnome/gok/am @dirrm share/gnome/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 diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile index 0ef1b8968f96..d310eb698c7b 100644 --- a/archivers/file-roller/Makefile +++ b/archivers/file-roller/Makefile @@ -6,12 +6,11 @@ # PORTNAME= fileroller -PORTVERSION= 2.4.4 -PORTREVISION= 1 +PORTVERSION= 2.6.0 PORTEPOCH= 1 CATEGORIES= archivers gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/file-roller/2.4 +MASTER_SITE_SUBDIR= sources/file-roller/2.6 DISTNAME= file-roller-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -21,8 +20,8 @@ COMMENT= An archive manager for zip files, tar, etc USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack libgnomeui lthack -USE_LIBTOOL_VER= 13 +USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui +USE_LIBTOOL_VER=13 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/archivers/file-roller/distinfo b/archivers/file-roller/distinfo index e3f288dadb4d..992e44cd0fb8 100644 --- a/archivers/file-roller/distinfo +++ b/archivers/file-roller/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/file-roller-2.4.4.tar.bz2) = 47bc36dce2d64b2bc5eb058492562605 -SIZE (gnome2/file-roller-2.4.4.tar.bz2) = 947224 +MD5 (gnome2/file-roller-2.6.0.tar.bz2) = 8c858a7cc4ab0f2844fd2148a2cfd954 +SIZE (gnome2/file-roller-2.6.0.tar.bz2) = 1241766 diff --git a/graphics/gpdf/files/patch-configure b/archivers/file-roller/files/patch-configure index f195f07b43c6..53e3c887712a 100644 --- a/graphics/gpdf/files/patch-configure +++ b/archivers/file-roller/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Wed Dec 11 18:31:51 2002 -+++ configure Thu Dec 12 12:07:17 2002 -@@ -7414,6 +7414,7 @@ +--- configure.orig Tue Dec 10 23:18:40 2002 ++++ configure Tue Dec 10 23:18:59 2002 +@@ -6403,6 +6403,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" 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 9a0fb58a82ed..728ff0bce91f 100644 --- a/archivers/file-roller/files/patch-src_fr-command-tar.c +++ b/archivers/file-roller/files/patch-src_fr-command-tar.c @@ -1,35 +1,47 @@ ---- 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); +--- src/fr-command-tar.c.orig Mon Mar 8 18:20:07 2004 ++++ src/fr-command-tar.c Sun Mar 14 00:14:41 2004 +@@ -196,6 +196,11 @@ + return g_strndup (f_start + 1, f_end - f_start); } +static char *months[] = { -+ "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", -+ "Nov", "Dec" ++ "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", ++ "Nov", "Dec" +}; + static void process_line (char *line, -@@ -92,19 +97,34 @@ +@@ -204,28 +209,36 @@ + FileData *fdata; FRCommand *comm = FR_COMMAND (data); char **fields; - const char *name_field; +- int date_idx; +- char *field_date, *field_time, *field_size, *field_name; + int i; + struct tm tm = {0, }; + char **time_fields; ++ const char *field_name; g_return_if_fail (line != NULL); fdata = file_data_new (); -- fields = split_line (line, 5); +- date_idx = get_index_from_pattern (line, "%n%n%n%n-%n%n-%n%n %n%n:%n%n"); + fields = split_line (line, 7); - fdata->size = atol (fields[2]); -- fdata->modified = mktime_from_string (fields[3], fields[4]); + +- field_size = get_prev_field (line, date_idx, 1); +- fdata->size = atol (field_size); +- g_free (field_size); +- +- field_date = get_next_field (line, date_idx, 1); +- field_time = get_next_field (line, date_idx, 2); +- fdata->modified = mktime_from_string (field_date, field_time); +- g_free (field_date); +- g_free (field_time); ++ fdata->size = atol (fields[2]); + for (i = 0; i < 12; i++) { -+ if (!strncmp(fields[3], months[i], 3)) break; ++ if (!strncmp(fields[3], months[i], 3)) break; + } + tm.tm_mon = i; + tm.tm_year = atoi (fields[6]) - 1900; @@ -40,13 +52,21 @@ + tm.tm_sec = 0; + tm.tm_isdst = -1; + fdata->modified = mktime(&tm); - g_strfreev (fields); ++ g_strfreev (fields); + g_strfreev (time_fields); /* Full path */ -- name_field = get_last_field (line, 6); -+ name_field = get_last_field (line, 8); - fields = g_strsplit (name_field, " -> ", 2); +- field_name = get_next_field (line, date_idx, 3); ++ field_name = get_last_field (line, 8); + fields = g_strsplit (field_name, " -> ", 2); if (fields[1] == NULL) { +@@ -244,7 +257,6 @@ + if (fields[1] != NULL) + fdata->link = g_strdup (fields[1]); + g_strfreev (fields); +- g_free (field_name); + + fdata->name = g_strdup (file_name_from_path (fdata->full_path)); + fdata->path = remove_level_from_path (fdata->full_path); diff --git a/archivers/file-roller/pkg-descr b/archivers/file-roller/pkg-descr index 66b4bc9dd688..703a89829953 100644 --- a/archivers/file-roller/pkg-descr +++ b/archivers/file-roller/pkg-descr @@ -1,13 +1,10 @@ -File Roller is an archive manager for the GNOME environment. Archive manager -means that you can create and modify archives, view the content of an archive, -view a file contained in the archive, and extract files from the archive. - -File Roller is only a front-end (a graphical interface) to archiving programs -like tar and zip. The supported file types are : +File Roller is an archive manager for the GNOME environment. It is only a +front-end (a graphical interface) to archiving programs like tar and zip. +The supported file types are: * Tar archives uncompressed (.tar) or compressed with gzip (.tar.gz , .tgz), -bzip (.tar.bz , .tbz), bzip2 (.tar.bz2 , .tbz2), compress (.tar.Z , .taz), -lzop (.tar.lzo , .tzo) + bzip (.tar.bz , .tbz), bzip2 (.tar.bz2 , .tbz2), compress (.tar.Z , .taz), + lzop (.tar.lzo , .tzo) * Zip archives (.zip) * Jar archives (.jar , .ear , .war) * Lha archives (.lzh) @@ -15,9 +12,9 @@ lzop (.tar.lzo , .tzo) * Single files compressed with gzip, bzip, bzip2, compress, lzop File Roller also has a document viewer based on bonobo that lets you view files -of any type you have a viewer for. +of any type for which you have a viewer. -Former WinZip users may find this program useful. It serves the same purpose. +Former WinZip users may find this program useful. It serves the same purpose. WWW: http://fileroller.sourceforge.net/ diff --git a/archivers/file-roller/pkg-plist b/archivers/file-roller/pkg-plist index 210961829dde..465b7b057509 100644 --- a/archivers/file-roller/pkg-plist +++ b/archivers/file-roller/pkg-plist @@ -1,48 +1,96 @@ bin/file-roller etc/gconf/gconf.xml.defaults/apps/file-roller/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/file-roller/dialogs/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/file-roller/dialogs/batch-add/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/file-roller/dialogs/extract/%gconf.xml etc/gconf/gconf.xml.defaults/apps/file-roller/general/%gconf.xml etc/gconf/gconf.xml.defaults/apps/file-roller/listing/%gconf.xml etc/gconf/gconf.xml.defaults/apps/file-roller/ui/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/dialogs/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/dialogs/batch-add/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/dialogs/extract/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/general/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/listing/%gconf.xml 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%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/TODO +share/doc/fileroller/AUTHORS +share/doc/fileroller/NEWS +share/doc/fileroller/README +share/doc/fileroller/TODO share/gnome/application-registry/file-roller.applications share/gnome/applications/file-roller.desktop share/gnome/file-roller/glade/file_roller.glade share/gnome/file-roller/glade/file_roller_prop.glade +share/gnome/help/file-roller/C/figures/file-roller_home.png +share/gnome/help/file-roller/C/figures/file-roller_leftarrow.png share/gnome/help/file-roller/C/figures/file-roller_main_window.png +share/gnome/help/file-roller/C/figures/file-roller_rightarrow.png +share/gnome/help/file-roller/C/figures/file-roller_uparrow.png share/gnome/help/file-roller/C/file-roller.xml share/gnome/help/file-roller/C/legal.xml +share/gnome/help/file-roller/de/figures/file-roller_main_window.png +share/gnome/help/file-roller/de/file-roller.xml +share/gnome/help/file-roller/de/legal.xml +share/gnome/help/file-roller/es/figures/file-roller_main_window.png +share/gnome/help/file-roller/es/file-roller.xml +share/gnome/help/file-roller/es/legal.xml +share/gnome/help/file-roller/fr/figures/file-roller_main_window.png +share/gnome/help/file-roller/fr/file-roller.xml +share/gnome/help/file-roller/fr/legal.xml +share/gnome/help/file-roller/it/figures/file-roller_main_window.png +share/gnome/help/file-roller/it/file-roller.xml +share/gnome/help/file-roller/it/legal.xml +share/gnome/help/file-roller/ja/figures/file-roller_main_window.png +share/gnome/help/file-roller/ja/file-roller.xml +share/gnome/help/file-roller/ja/legal.xml +share/gnome/help/file-roller/ko/figures/file-roller_main_window.png +share/gnome/help/file-roller/ko/file-roller.xml +share/gnome/help/file-roller/ko/legal.xml share/gnome/help/file-roller/ru/figures/fr-add-dialog.png share/gnome/help/file-roller/ru/figures/fr-extract.png 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/sv/figures/file-roller_main_window.png +share/gnome/help/file-roller/sv/file-roller.xml +share/gnome/help/file-roller/sv/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/help/file-roller/zh_CN/figures/file-roller_main_window.png +share/gnome/help/file-roller/zh_CN/file-roller.xml +share/gnome/help/file-roller/zh_CN/legal.xml +share/gnome/help/file-roller/zh_HK/figures/file-roller_main_window.png +share/gnome/help/file-roller/zh_HK/file-roller.xml +share/gnome/help/file-roller/zh_HK/legal.xml +share/gnome/help/file-roller/zh_TW/figures/file-roller_main_window.png +share/gnome/help/file-roller/zh_TW/file-roller.xml +share/gnome/help/file-roller/zh_TW/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-de.omf +share/gnome/omf/file-roller/file-roller-es.omf +share/gnome/omf/file-roller/file-roller-fr.omf +share/gnome/omf/file-roller/file-roller-it.omf +share/gnome/omf/file-roller/file-roller-ja.omf +share/gnome/omf/file-roller/file-roller-ko.omf 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-sv.omf 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/omf/file-roller/file-roller-zh_CN.omf +share/gnome/omf/file-roller/file-roller-zh_HK.omf +share/gnome/omf/file-roller/file-roller-zh_TW.omf 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 @@ -53,6 +101,7 @@ 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 +share/locale/en_GB/LC_MESSAGES/file-roller.mo share/locale/es/LC_MESSAGES/file-roller.mo share/locale/et/LC_MESSAGES/file-roller.mo share/locale/eu/LC_MESSAGES/file-roller.mo @@ -62,6 +111,7 @@ share/locale/fr/LC_MESSAGES/file-roller.mo share/locale/ga/LC_MESSAGES/file-roller.mo share/locale/he/LC_MESSAGES/file-roller.mo share/locale/hi/LC_MESSAGES/file-roller.mo +share/locale/hr/LC_MESSAGES/file-roller.mo share/locale/hu/LC_MESSAGES/file-roller.mo share/locale/id/LC_MESSAGES/file-roller.mo share/locale/is/LC_MESSAGES/file-roller.mo @@ -78,6 +128,7 @@ share/locale/ms/LC_MESSAGES/file-roller.mo share/locale/nl/LC_MESSAGES/file-roller.mo share/locale/nn/LC_MESSAGES/file-roller.mo share/locale/no/LC_MESSAGES/file-roller.mo +share/locale/pa/LC_MESSAGES/file-roller.mo share/locale/pl/LC_MESSAGES/file-roller.mo share/locale/pt/LC_MESSAGES/file-roller.mo share/locale/pt_BR/LC_MESSAGES/file-roller.mo @@ -88,6 +139,7 @@ share/locale/sl/LC_MESSAGES/file-roller.mo 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/sr@ije/LC_MESSAGES/file-roller.mo share/locale/sv/LC_MESSAGES/file-roller.mo share/locale/ta/LC_MESSAGES/file-roller.mo share/locale/th/LC_MESSAGES/file-roller.mo @@ -97,24 +149,47 @@ 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/zh_TW/figures +@dirrm share/gnome/help/file-roller/zh_TW +@dirrm share/gnome/help/file-roller/zh_HK/figures +@dirrm share/gnome/help/file-roller/zh_HK +@dirrm share/gnome/help/file-roller/zh_CN/figures +@dirrm share/gnome/help/file-roller/zh_CN @dirrm share/gnome/help/file-roller/uk/figures @dirrm share/gnome/help/file-roller/uk +@dirrm share/gnome/help/file-roller/sv/figures +@dirrm share/gnome/help/file-roller/sv @dirrm share/gnome/help/file-roller/ru/figures @dirrm share/gnome/help/file-roller/ru +@dirrm share/gnome/help/file-roller/ko/figures +@dirrm share/gnome/help/file-roller/ko +@dirrm share/gnome/help/file-roller/ja/figures +@dirrm share/gnome/help/file-roller/ja +@dirrm share/gnome/help/file-roller/it/figures +@dirrm share/gnome/help/file-roller/it +@dirrm share/gnome/help/file-roller/fr/figures +@dirrm share/gnome/help/file-roller/fr +@dirrm share/gnome/help/file-roller/es/figures +@dirrm share/gnome/help/file-roller/es +@dirrm share/gnome/help/file-roller/de/figures +@dirrm share/gnome/help/file-roller/de @dirrm share/gnome/help/file-roller/C/figures @dirrm share/gnome/help/file-roller/C @dirrm share/gnome/help/file-roller @dirrm share/gnome/file-roller/glade @dirrm share/gnome/file-roller -%%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrm share/doc/fileroller @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 +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/dialogs/extract +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/dialogs/batch-add +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/dialogs @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/file-roller @dirrm etc/gconf/gconf.xml.defaults/apps/file-roller/ui @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/dialogs/extract +@dirrm etc/gconf/gconf.xml.defaults/apps/file-roller/dialogs/batch-add +@dirrm etc/gconf/gconf.xml.defaults/apps/file-roller/dialogs @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 0ef1b8968f96..d310eb698c7b 100644 --- a/archivers/fileroller/Makefile +++ b/archivers/fileroller/Makefile @@ -6,12 +6,11 @@ # PORTNAME= fileroller -PORTVERSION= 2.4.4 -PORTREVISION= 1 +PORTVERSION= 2.6.0 PORTEPOCH= 1 CATEGORIES= archivers gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/file-roller/2.4 +MASTER_SITE_SUBDIR= sources/file-roller/2.6 DISTNAME= file-roller-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -21,8 +20,8 @@ COMMENT= An archive manager for zip files, tar, etc USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack libgnomeui lthack -USE_LIBTOOL_VER= 13 +USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui +USE_LIBTOOL_VER=13 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/archivers/fileroller/distinfo b/archivers/fileroller/distinfo index e3f288dadb4d..992e44cd0fb8 100644 --- a/archivers/fileroller/distinfo +++ b/archivers/fileroller/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/file-roller-2.4.4.tar.bz2) = 47bc36dce2d64b2bc5eb058492562605 -SIZE (gnome2/file-roller-2.4.4.tar.bz2) = 947224 +MD5 (gnome2/file-roller-2.6.0.tar.bz2) = 8c858a7cc4ab0f2844fd2148a2cfd954 +SIZE (gnome2/file-roller-2.6.0.tar.bz2) = 1241766 diff --git a/accessibility/gnopernicus/files/patch-configure b/archivers/fileroller/files/patch-configure index 3926a24b0609..53e3c887712a 100644 --- a/accessibility/gnopernicus/files/patch-configure +++ b/archivers/fileroller/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Wed Aug 13 10:44:17 2003 -+++ configure Wed Aug 13 13:47:43 2003 -@@ -7555,6 +7555,7 @@ +--- configure.orig Tue Dec 10 23:18:40 2002 ++++ configure Tue Dec 10 23:18:59 2002 +@@ -6403,6 +6403,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" diff --git a/archivers/fileroller/files/patch-src_fr-command-tar.c b/archivers/fileroller/files/patch-src_fr-command-tar.c index 9a0fb58a82ed..728ff0bce91f 100644 --- a/archivers/fileroller/files/patch-src_fr-command-tar.c +++ b/archivers/fileroller/files/patch-src_fr-command-tar.c @@ -1,35 +1,47 @@ ---- 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); +--- src/fr-command-tar.c.orig Mon Mar 8 18:20:07 2004 ++++ src/fr-command-tar.c Sun Mar 14 00:14:41 2004 +@@ -196,6 +196,11 @@ + return g_strndup (f_start + 1, f_end - f_start); } +static char *months[] = { -+ "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", -+ "Nov", "Dec" ++ "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", ++ "Nov", "Dec" +}; + static void process_line (char *line, -@@ -92,19 +97,34 @@ +@@ -204,28 +209,36 @@ + FileData *fdata; FRCommand *comm = FR_COMMAND (data); char **fields; - const char *name_field; +- int date_idx; +- char *field_date, *field_time, *field_size, *field_name; + int i; + struct tm tm = {0, }; + char **time_fields; ++ const char *field_name; g_return_if_fail (line != NULL); fdata = file_data_new (); -- fields = split_line (line, 5); +- date_idx = get_index_from_pattern (line, "%n%n%n%n-%n%n-%n%n %n%n:%n%n"); + fields = split_line (line, 7); - fdata->size = atol (fields[2]); -- fdata->modified = mktime_from_string (fields[3], fields[4]); + +- field_size = get_prev_field (line, date_idx, 1); +- fdata->size = atol (field_size); +- g_free (field_size); +- +- field_date = get_next_field (line, date_idx, 1); +- field_time = get_next_field (line, date_idx, 2); +- fdata->modified = mktime_from_string (field_date, field_time); +- g_free (field_date); +- g_free (field_time); ++ fdata->size = atol (fields[2]); + for (i = 0; i < 12; i++) { -+ if (!strncmp(fields[3], months[i], 3)) break; ++ if (!strncmp(fields[3], months[i], 3)) break; + } + tm.tm_mon = i; + tm.tm_year = atoi (fields[6]) - 1900; @@ -40,13 +52,21 @@ + tm.tm_sec = 0; + tm.tm_isdst = -1; + fdata->modified = mktime(&tm); - g_strfreev (fields); ++ g_strfreev (fields); + g_strfreev (time_fields); /* Full path */ -- name_field = get_last_field (line, 6); -+ name_field = get_last_field (line, 8); - fields = g_strsplit (name_field, " -> ", 2); +- field_name = get_next_field (line, date_idx, 3); ++ field_name = get_last_field (line, 8); + fields = g_strsplit (field_name, " -> ", 2); if (fields[1] == NULL) { +@@ -244,7 +257,6 @@ + if (fields[1] != NULL) + fdata->link = g_strdup (fields[1]); + g_strfreev (fields); +- g_free (field_name); + + fdata->name = g_strdup (file_name_from_path (fdata->full_path)); + fdata->path = remove_level_from_path (fdata->full_path); diff --git a/archivers/fileroller/pkg-descr b/archivers/fileroller/pkg-descr index 66b4bc9dd688..703a89829953 100644 --- a/archivers/fileroller/pkg-descr +++ b/archivers/fileroller/pkg-descr @@ -1,13 +1,10 @@ -File Roller is an archive manager for the GNOME environment. Archive manager -means that you can create and modify archives, view the content of an archive, -view a file contained in the archive, and extract files from the archive. - -File Roller is only a front-end (a graphical interface) to archiving programs -like tar and zip. The supported file types are : +File Roller is an archive manager for the GNOME environment. It is only a +front-end (a graphical interface) to archiving programs like tar and zip. +The supported file types are: * Tar archives uncompressed (.tar) or compressed with gzip (.tar.gz , .tgz), -bzip (.tar.bz , .tbz), bzip2 (.tar.bz2 , .tbz2), compress (.tar.Z , .taz), -lzop (.tar.lzo , .tzo) + bzip (.tar.bz , .tbz), bzip2 (.tar.bz2 , .tbz2), compress (.tar.Z , .taz), + lzop (.tar.lzo , .tzo) * Zip archives (.zip) * Jar archives (.jar , .ear , .war) * Lha archives (.lzh) @@ -15,9 +12,9 @@ lzop (.tar.lzo , .tzo) * Single files compressed with gzip, bzip, bzip2, compress, lzop File Roller also has a document viewer based on bonobo that lets you view files -of any type you have a viewer for. +of any type for which you have a viewer. -Former WinZip users may find this program useful. It serves the same purpose. +Former WinZip users may find this program useful. It serves the same purpose. WWW: http://fileroller.sourceforge.net/ diff --git a/archivers/fileroller/pkg-plist b/archivers/fileroller/pkg-plist index 210961829dde..465b7b057509 100644 --- a/archivers/fileroller/pkg-plist +++ b/archivers/fileroller/pkg-plist @@ -1,48 +1,96 @@ bin/file-roller etc/gconf/gconf.xml.defaults/apps/file-roller/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/file-roller/dialogs/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/file-roller/dialogs/batch-add/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/file-roller/dialogs/extract/%gconf.xml etc/gconf/gconf.xml.defaults/apps/file-roller/general/%gconf.xml etc/gconf/gconf.xml.defaults/apps/file-roller/listing/%gconf.xml etc/gconf/gconf.xml.defaults/apps/file-roller/ui/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/dialogs/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/dialogs/batch-add/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/dialogs/extract/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/general/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/listing/%gconf.xml 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%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/TODO +share/doc/fileroller/AUTHORS +share/doc/fileroller/NEWS +share/doc/fileroller/README +share/doc/fileroller/TODO share/gnome/application-registry/file-roller.applications share/gnome/applications/file-roller.desktop share/gnome/file-roller/glade/file_roller.glade share/gnome/file-roller/glade/file_roller_prop.glade +share/gnome/help/file-roller/C/figures/file-roller_home.png +share/gnome/help/file-roller/C/figures/file-roller_leftarrow.png share/gnome/help/file-roller/C/figures/file-roller_main_window.png +share/gnome/help/file-roller/C/figures/file-roller_rightarrow.png +share/gnome/help/file-roller/C/figures/file-roller_uparrow.png share/gnome/help/file-roller/C/file-roller.xml share/gnome/help/file-roller/C/legal.xml +share/gnome/help/file-roller/de/figures/file-roller_main_window.png +share/gnome/help/file-roller/de/file-roller.xml +share/gnome/help/file-roller/de/legal.xml +share/gnome/help/file-roller/es/figures/file-roller_main_window.png +share/gnome/help/file-roller/es/file-roller.xml +share/gnome/help/file-roller/es/legal.xml +share/gnome/help/file-roller/fr/figures/file-roller_main_window.png +share/gnome/help/file-roller/fr/file-roller.xml +share/gnome/help/file-roller/fr/legal.xml +share/gnome/help/file-roller/it/figures/file-roller_main_window.png +share/gnome/help/file-roller/it/file-roller.xml +share/gnome/help/file-roller/it/legal.xml +share/gnome/help/file-roller/ja/figures/file-roller_main_window.png +share/gnome/help/file-roller/ja/file-roller.xml +share/gnome/help/file-roller/ja/legal.xml +share/gnome/help/file-roller/ko/figures/file-roller_main_window.png +share/gnome/help/file-roller/ko/file-roller.xml +share/gnome/help/file-roller/ko/legal.xml share/gnome/help/file-roller/ru/figures/fr-add-dialog.png share/gnome/help/file-roller/ru/figures/fr-extract.png 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/sv/figures/file-roller_main_window.png +share/gnome/help/file-roller/sv/file-roller.xml +share/gnome/help/file-roller/sv/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/help/file-roller/zh_CN/figures/file-roller_main_window.png +share/gnome/help/file-roller/zh_CN/file-roller.xml +share/gnome/help/file-roller/zh_CN/legal.xml +share/gnome/help/file-roller/zh_HK/figures/file-roller_main_window.png +share/gnome/help/file-roller/zh_HK/file-roller.xml +share/gnome/help/file-roller/zh_HK/legal.xml +share/gnome/help/file-roller/zh_TW/figures/file-roller_main_window.png +share/gnome/help/file-roller/zh_TW/file-roller.xml +share/gnome/help/file-roller/zh_TW/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-de.omf +share/gnome/omf/file-roller/file-roller-es.omf +share/gnome/omf/file-roller/file-roller-fr.omf +share/gnome/omf/file-roller/file-roller-it.omf +share/gnome/omf/file-roller/file-roller-ja.omf +share/gnome/omf/file-roller/file-roller-ko.omf 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-sv.omf 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/omf/file-roller/file-roller-zh_CN.omf +share/gnome/omf/file-roller/file-roller-zh_HK.omf +share/gnome/omf/file-roller/file-roller-zh_TW.omf 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 @@ -53,6 +101,7 @@ 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 +share/locale/en_GB/LC_MESSAGES/file-roller.mo share/locale/es/LC_MESSAGES/file-roller.mo share/locale/et/LC_MESSAGES/file-roller.mo share/locale/eu/LC_MESSAGES/file-roller.mo @@ -62,6 +111,7 @@ share/locale/fr/LC_MESSAGES/file-roller.mo share/locale/ga/LC_MESSAGES/file-roller.mo share/locale/he/LC_MESSAGES/file-roller.mo share/locale/hi/LC_MESSAGES/file-roller.mo +share/locale/hr/LC_MESSAGES/file-roller.mo share/locale/hu/LC_MESSAGES/file-roller.mo share/locale/id/LC_MESSAGES/file-roller.mo share/locale/is/LC_MESSAGES/file-roller.mo @@ -78,6 +128,7 @@ share/locale/ms/LC_MESSAGES/file-roller.mo share/locale/nl/LC_MESSAGES/file-roller.mo share/locale/nn/LC_MESSAGES/file-roller.mo share/locale/no/LC_MESSAGES/file-roller.mo +share/locale/pa/LC_MESSAGES/file-roller.mo share/locale/pl/LC_MESSAGES/file-roller.mo share/locale/pt/LC_MESSAGES/file-roller.mo share/locale/pt_BR/LC_MESSAGES/file-roller.mo @@ -88,6 +139,7 @@ share/locale/sl/LC_MESSAGES/file-roller.mo 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/sr@ije/LC_MESSAGES/file-roller.mo share/locale/sv/LC_MESSAGES/file-roller.mo share/locale/ta/LC_MESSAGES/file-roller.mo share/locale/th/LC_MESSAGES/file-roller.mo @@ -97,24 +149,47 @@ 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/zh_TW/figures +@dirrm share/gnome/help/file-roller/zh_TW +@dirrm share/gnome/help/file-roller/zh_HK/figures +@dirrm share/gnome/help/file-roller/zh_HK +@dirrm share/gnome/help/file-roller/zh_CN/figures +@dirrm share/gnome/help/file-roller/zh_CN @dirrm share/gnome/help/file-roller/uk/figures @dirrm share/gnome/help/file-roller/uk +@dirrm share/gnome/help/file-roller/sv/figures +@dirrm share/gnome/help/file-roller/sv @dirrm share/gnome/help/file-roller/ru/figures @dirrm share/gnome/help/file-roller/ru +@dirrm share/gnome/help/file-roller/ko/figures +@dirrm share/gnome/help/file-roller/ko +@dirrm share/gnome/help/file-roller/ja/figures +@dirrm share/gnome/help/file-roller/ja +@dirrm share/gnome/help/file-roller/it/figures +@dirrm share/gnome/help/file-roller/it +@dirrm share/gnome/help/file-roller/fr/figures +@dirrm share/gnome/help/file-roller/fr +@dirrm share/gnome/help/file-roller/es/figures +@dirrm share/gnome/help/file-roller/es +@dirrm share/gnome/help/file-roller/de/figures +@dirrm share/gnome/help/file-roller/de @dirrm share/gnome/help/file-roller/C/figures @dirrm share/gnome/help/file-roller/C @dirrm share/gnome/help/file-roller @dirrm share/gnome/file-roller/glade @dirrm share/gnome/file-roller -%%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrm share/doc/fileroller @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 +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/dialogs/extract +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/dialogs/batch-add +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/dialogs @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/file-roller @dirrm etc/gconf/gconf.xml.defaults/apps/file-roller/ui @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/dialogs/extract +@dirrm etc/gconf/gconf.xml.defaults/apps/file-roller/dialogs/batch-add +@dirrm etc/gconf/gconf.xml.defaults/apps/file-roller/dialogs @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 da9fdf9b7b71..269a01c60310 100644 --- a/audio/gnome-media/Makefile +++ b/audio/gnome-media/Makefile @@ -6,11 +6,11 @@ # PORTNAME= gnomemedia2 -PORTVERSION= 2.4.1.1 +PORTVERSION= 2.6.0 PORTREVISION= 1 CATEGORIES= audio gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-media/2.4 +MASTER_SITE_SUBDIR= sources/gnome-media/2.6 DISTNAME= gnome-media-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -18,21 +18,28 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Multimedia applications for the GNOME 2 desktop RUN_DEPENDS= sox:${PORTSDIR}/audio/sox -LIB_DEPENDS= gstplay-0.6.1:${PORTSDIR}/multimedia/gstreamer-plugins USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_LIBTOOL_VER= 13 +USE_LIBTOOL_VER=13 INSTALLS_SHLIB= yes USE_REINPLACE= yes GNOME_DESKTOP_VERSION=2 -USE_GNOME= gnomeprefix gnomehack gnomehier gnomedesktop gail +USE_GNOME= gnomeprefix gnomehack intlhack lthack gnomehier gnomedesktop \ + gail gstreamerplugins CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +.include <bsd.port.pre.mk> + post-patch: @${REINPLACE_CMD} -e 's|[$$][(]CDROM_HOST[)]|freebsd|g' \ ${WRKSRC}/gnome-cd/Makefile.in +.if ${OSVERSION} > 501107 + @${REINPLACE_CMD} -e 's|%%CDROM%%|acd0|' ${WRKSRC}/configure +.else + @${REINPLACE_CMD} -e 's|%%CDROM%%|acd0c|' ${WRKSRC}/configure +.endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/audio/gnome-media/distinfo b/audio/gnome-media/distinfo index a6fff81357db..567505c6ab54 100644 --- a/audio/gnome-media/distinfo +++ b/audio/gnome-media/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-media-2.4.1.1.tar.bz2) = dce73f3f0e5bddfd5a2bd412900e5abe -SIZE (gnome2/gnome-media-2.4.1.1.tar.bz2) = 2745842 +MD5 (gnome2/gnome-media-2.6.0.tar.bz2) = 51dd73a96cbdb8049fa9e7d2aa0af9b5 +SIZE (gnome2/gnome-media-2.6.0.tar.bz2) = 2943852 diff --git a/audio/gnome-media/files/patch-ad b/audio/gnome-media/files/patch-ad deleted file mode 100644 index f49a888a5a99..000000000000 --- a/audio/gnome-media/files/patch-ad +++ /dev/null @@ -1,31 +0,0 @@ ---- gmix/gmix.c.orig Tue Oct 8 19:40:43 2002 -+++ gmix/gmix.c Fri Oct 11 09:20:13 2002 -@@ -60,7 +60,7 @@ - #ifdef HAVE_LINUX_SOUNDCARD_H - #include <linux/soundcard.h> - #else --#include <machine/soundcard.h> -+#include <sys/soundcard.h> - #endif - #endif - -@@ -722,6 +722,7 @@ - - cnt = 0; - devices = NULL; -+ num_mixers = 0; - device_by_name = g_hash_table_new (g_str_hash, g_str_equal); - - do { -@@ -730,9 +731,8 @@ - devices = g_list_append (devices, new_device); - g_hash_table_insert (device_by_name, new_device->info.name, new_device); - } -- } while (new_device); -- -- num_mixers = cnt - 1; -+ } while ((errno == EACCES) || (errno == EINVAL) || (errno == ENXIO) \ -+ || new_device); - } - - device_info * diff --git a/audio/gnome-media/files/patch-configure b/audio/gnome-media/files/patch-configure index d5e0e924c1a7..2c6ea537ce3a 100644 --- a/audio/gnome-media/files/patch-configure +++ b/audio/gnome-media/files/patch-configure @@ -1,10 +1,11 @@ ---- configure.orig Thu Jan 23 17:55:03 2003 -+++ configure Tue Feb 4 20:31:01 2003 -@@ -8336,6 +8336,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' +--- configure.orig Wed Dec 31 00:49:17 2003 ++++ configure Wed Dec 31 00:49:57 2003 +@@ -23190,7 +23190,7 @@ + *FreeBSD*) + CDROM_HOST=freebsd + CDROM_HOST_FREEBSD=true +- default_cd_device="/dev/acd0c" ++ default_cd_device="/dev/%%CDROM%%" + ;; + *Linux*) + CDROM_HOST=linux diff --git a/audio/gnome-media/files/patch-gmix::prefs.c b/audio/gnome-media/files/patch-gmix::prefs.c deleted file mode 100644 index b25b42b9748e..000000000000 --- a/audio/gnome-media/files/patch-gmix::prefs.c +++ /dev/null @@ -1,11 +0,0 @@ ---- gmix/prefs.c.orig Tue May 7 00:52:42 2002 -+++ gmix/prefs.c Tue May 7 00:52:54 2002 -@@ -38,7 +38,7 @@ - #ifdef HAVE_LINUX_SOUNDCARD_H - #include <linux/soundcard.h> - #else --#include <machine/soundcard.h> -+#include <sys/soundcard.h> - #endif - #endif - diff --git a/audio/gnome-media/files/patch-gmix_gmix.h b/audio/gnome-media/files/patch-gmix_gmix.h deleted file mode 100644 index 600110df6a9f..000000000000 --- a/audio/gnome-media/files/patch-gmix_gmix.h +++ /dev/null @@ -1,11 +0,0 @@ ---- gmix/gmix.h.orig Sat Aug 16 15:13:57 2003 -+++ gmix/gmix.h Sat Aug 16 15:14:47 2003 -@@ -25,7 +25,7 @@ - */ - #define GMIX_VERSION 0x030000 - --#if defined(ALSA) || defined(__FreeBSD__) -+#if defined(ALSA) || (defined(__FreeBSD__) && !defined(SOUND_MIXER_INFO)) - /* stolen from OSS's soundcard.h */ - typedef struct mixer_info - { diff --git a/audio/gnome-media/pkg-plist b/audio/gnome-media/pkg-plist index 47d38d6ba3b2..67cf88304e5e 100644 --- a/audio/gnome-media/pkg-plist +++ b/audio/gnome-media/pkg-plist @@ -1,4 +1,5 @@ bin/cddb-slave2-properties +bin/gnome-audio-profiles-properties bin/gnome-cd bin/gnome-sound-recorder bin/gnome-volume-control @@ -8,32 +9,60 @@ etc/gconf/gconf.xml.defaults/apps/CDDB-Slave2/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnome-cd/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnome-sound-recorder/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnome-sound-recorder/system-state/%gconf.xml -etc/gconf/gconf.xml.defaults/apps/gnome-volume-control/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/CDDB-Slave2/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnome-cd/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnome-sound-recorder/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnome-sound-recorder/system-state/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/gnome-volume-control/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/global/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/profiles/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/profiles/cdlossless/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/profiles/cdlossy/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/profiles/voice/%gconf.xml +etc/gconf/gconf.xml.defaults/system/gstreamer/%gconf.xml +etc/gconf/gconf.xml.defaults/system/gstreamer/audio/%gconf.xml +etc/gconf/gconf.xml.defaults/system/gstreamer/audio/global/%gconf.xml +etc/gconf/gconf.xml.defaults/system/gstreamer/audio/profiles/%gconf.xml +etc/gconf/gconf.xml.defaults/system/gstreamer/audio/profiles/cdlossless/%gconf.xml +etc/gconf/gconf.xml.defaults/system/gstreamer/audio/profiles/cdlossy/%gconf.xml +etc/gconf/gconf.xml.defaults/system/gstreamer/audio/profiles/voice/%gconf.xml etc/gconf/schemas/CDDB-Slave2.schemas +etc/gconf/schemas/gnome-audio-profiles.schemas etc/gconf/schemas/gnome-cd.schemas etc/gconf/schemas/gnome-sound-recorder.schemas -etc/gconf/schemas/gnome-volume-control.schemas include/cddb-slave2/cddb-slave-client.h +include/gnome-media/profiles/audio-profile-choose.h +include/gnome-media/profiles/audio-profile-edit.h +include/gnome-media/profiles/audio-profile.h +include/gnome-media/profiles/audio-profiles-edit.h +include/gnome-media/profiles/gnome-media-profiles.h lib/libcddb-slave2.a lib/libcddb-slave2.so lib/libcddb-slave2.so.0 +lib/libglade/2.0/libgnome-media-profiles.so +lib/libgnome-media-profiles.a +lib/libgnome-media-profiles.so +lib/libgnome-media-profiles.so.0 libdata/bonobo/servers/GNOME_Media_CDDBSlave2.server +libdata/pkgconfig/gnome-media-profiles.pc libexec/CDDBSlave2 libexec/cddb-track-editor share/gnome/applications/gnome-cd.desktop share/gnome/applications/gnome-sound-recorder.desktop share/gnome/applications/gnome-volume-control.desktop +share/gnome/applications/gstreamer-properties.desktop share/gnome/applications/reclevel.desktop share/gnome/applications/vumeter.desktop share/gnome/control-center-2.0/capplets/cddb-slave.desktop -share/gnome/gnome-media-2.0/icons/gstreamer-properties.png -share/gnome/gnome-media-2.0/interfaces/gstreamer-properties.glade +share/gnome/gnome-media/glade/gnome-audio-profiles.glade2 +share/gnome/gnome-media/pixmaps/mixer.png +share/gnome/gnome-media/pixmaps/phone.png +share/gnome/gnome-media/pixmaps/tone.png +share/gnome/gnome-media/pixmaps/video.png share/gnome/gnome-sound-recorder/ui/gsr.xml +share/gnome/gstreamer-properties/glade/gstreamer-properties.glade +share/gnome/gstreamer-properties/icons/gstreamer-properties.png share/gnome/help/gnome-cd/C/figures/cdplayer_trackeditor_button.png share/gnome/help/gnome-cd/C/figures/cdplayer_trackeditor_window.png share/gnome/help/gnome-cd/C/figures/cdplayer_window.png @@ -48,8 +77,6 @@ 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 @@ -65,8 +92,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/es/legal.xml -share/gnome/help/gnome-cd/es/gnome-cd.xml +share/gnome/help/gnome-cd/de/gnome-cd.xml +share/gnome/help/gnome-cd/de/legal.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 @@ -82,8 +109,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/fr/legal.xml -share/gnome/help/gnome-cd/fr/gnome-cd.xml +share/gnome/help/gnome-cd/es/gnome-cd.xml +share/gnome/help/gnome-cd/es/legal.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 @@ -99,8 +126,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/it/legal.xml -share/gnome/help/gnome-cd/it/gnome-cd.xml +share/gnome/help/gnome-cd/fr/gnome-cd.xml +share/gnome/help/gnome-cd/fr/legal.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 @@ -116,25 +143,8 @@ 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/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/it/gnome-cd.xml +share/gnome/help/gnome-cd/it/legal.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 @@ -150,8 +160,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/ko/legal.xml -share/gnome/help/gnome-cd/ko/gnome-cd.xml +share/gnome/help/gnome-cd/ja/gnome-cd.xml +share/gnome/help/gnome-cd/ja/legal.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 @@ -167,8 +177,25 @@ 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/zh_CN/legal.xml -share/gnome/help/gnome-cd/zh_CN/gnome-cd.xml +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/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 @@ -184,8 +211,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_TW/legal.xml -share/gnome/help/gnome-cd/zh_TW/gnome-cd.xml +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/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 @@ -201,15 +228,16 @@ 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_window.png share/gnome/help/gnome-sound-recorder/C/gnome-sound-recorder.xml share/gnome/help/gnome-sound-recorder/C/legal.xml 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/figures/gnome-volume-control_window.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 @@ -217,8 +245,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/es/legal.xml -share/gnome/help/grecord/es/grecord.xml +share/gnome/help/grecord/de/grecord.xml +share/gnome/help/grecord/de/legal.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 @@ -226,8 +254,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/fr/legal.xml -share/gnome/help/grecord/fr/grecord.xml +share/gnome/help/grecord/es/grecord.xml +share/gnome/help/grecord/es/legal.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 @@ -235,8 +263,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/it/legal.xml -share/gnome/help/grecord/it/grecord.xml +share/gnome/help/grecord/fr/grecord.xml +share/gnome/help/grecord/fr/legal.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 @@ -244,17 +272,8 @@ 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/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/it/grecord.xml +share/gnome/help/grecord/it/legal.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 @@ -262,8 +281,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/ko/legal.xml -share/gnome/help/grecord/ko/grecord.xml +share/gnome/help/grecord/ja/grecord.xml +share/gnome/help/grecord/ja/legal.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 @@ -271,8 +290,17 @@ 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/zh_CN/legal.xml -share/gnome/help/grecord/zh_CN/grecord.xml +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/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 @@ -280,8 +308,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_TW/legal.xml -share/gnome/help/grecord/zh_TW/grecord.xml +share/gnome/help/grecord/zh_CN/grecord.xml +share/gnome/help/grecord/zh_CN/legal.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 @@ -289,6 +317,11 @@ 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/help/gstreamer-properties/C/figures/gstreamer_properties_window.png +share/gnome/help/gstreamer-properties/C/gstreamer-properties.xml +share/gnome/help/gstreamer-properties/C/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 @@ -300,12 +333,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 @@ -322,16 +355,18 @@ 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 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-zh_TW.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-media/gstreamer-properties-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gstreamer-properties-C.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/gnome-cd.png share/gnome/pixmaps/gnome-cd/cd.png share/gnome/pixmaps/gnome-cd/disc.png @@ -402,7 +437,7 @@ share/gnome/pixmaps/gnome-cd/themes/red-lcd/top.png share/gnome/pixmaps/gnome-cd/track.png share/gnome/pixmaps/gnome-grecord.png share/gnome/pixmaps/gnome-media/gnome-sound-recorder/media-play.png -share/gnome/pixmaps/gnome-media/gnome-sound-recorder/media-rec.png +share/gnome/pixmaps/gnome-media/gnome-sound-recorder/media-record.png share/gnome/pixmaps/gnome-media/gnome-sound-recorder/media-stop.png share/gnome/pixmaps/gnome-mixer.png share/gnome/pixmaps/gnome-reclevel.png @@ -420,6 +455,7 @@ share/locale/cy/LC_MESSAGES/gnome-media-2.0.mo share/locale/da/LC_MESSAGES/gnome-media-2.0.mo share/locale/de/LC_MESSAGES/gnome-media-2.0.mo share/locale/el/LC_MESSAGES/gnome-media-2.0.mo +share/locale/en_CA/LC_MESSAGES/gnome-media-2.0.mo share/locale/en_GB/LC_MESSAGES/gnome-media-2.0.mo share/locale/es/LC_MESSAGES/gnome-media-2.0.mo share/locale/et/LC_MESSAGES/gnome-media-2.0.mo @@ -431,6 +467,7 @@ share/locale/ga/LC_MESSAGES/gnome-media-2.0.mo share/locale/gl/LC_MESSAGES/gnome-media-2.0.mo share/locale/he/LC_MESSAGES/gnome-media-2.0.mo share/locale/hi/LC_MESSAGES/gnome-media-2.0.mo +share/locale/hr/LC_MESSAGES/gnome-media-2.0.mo share/locale/hu/LC_MESSAGES/gnome-media-2.0.mo share/locale/id/LC_MESSAGES/gnome-media-2.0.mo share/locale/it/LC_MESSAGES/gnome-media-2.0.mo @@ -445,6 +482,7 @@ share/locale/ms/LC_MESSAGES/gnome-media-2.0.mo share/locale/nl/LC_MESSAGES/gnome-media-2.0.mo share/locale/nn/LC_MESSAGES/gnome-media-2.0.mo share/locale/no/LC_MESSAGES/gnome-media-2.0.mo +share/locale/pa/LC_MESSAGES/gnome-media-2.0.mo share/locale/pl/LC_MESSAGES/gnome-media-2.0.mo share/locale/pt/LC_MESSAGES/gnome-media-2.0.mo share/locale/pt_BR/LC_MESSAGES/gnome-media-2.0.mo @@ -456,6 +494,8 @@ share/locale/sq/LC_MESSAGES/gnome-media-2.0.mo share/locale/sr/LC_MESSAGES/gnome-media-2.0.mo share/locale/sr@Latn/LC_MESSAGES/gnome-media-2.0.mo share/locale/sv/LC_MESSAGES/gnome-media-2.0.mo +share/locale/ta/LC_MESSAGES/gnome-media-2.0.mo +share/locale/th/LC_MESSAGES/gnome-media-2.0.mo share/locale/tr/LC_MESSAGES/gnome-media-2.0.mo share/locale/uk/LC_MESSAGES/gnome-media-2.0.mo share/locale/vi/LC_MESSAGES/gnome-media-2.0.mo @@ -470,11 +510,9 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo @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-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/gstreamer-properties/C/figures +@dirrm share/gnome/help/gstreamer-properties/C +@dirrm share/gnome/help/gstreamer-properties @dirrm share/gnome/help/grecord/zh_TW/figures @dirrm share/gnome/help/grecord/zh_TW @dirrm share/gnome/help/grecord/zh_CN/figures @@ -521,35 +559,56 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo @dirrm share/gnome/help/gnome-cd/C/figures @dirrm share/gnome/help/gnome-cd/C @dirrm share/gnome/help/gnome-cd +@dirrm share/gnome/gstreamer-properties/icons +@dirrm share/gnome/gstreamer-properties/glade +@dirrm share/gnome/gstreamer-properties +@dirrm share/gnome/gnome-sound-recorder/ui +@dirrm share/gnome/gnome-sound-recorder +@dirrm share/gnome/gnome-media/pixmaps +@dirrm share/gnome/gnome-media/glade +@dirrm share/gnome/gnome-media +@dirrm include/gnome-media/profiles +@dirrm include/gnome-media @dirrm include/cddb-slave2 -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-volume-control +@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer/audio/profiles/voice +@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer/audio/profiles/cdlossy +@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer/audio/profiles/cdlossless +@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer/audio/profiles +@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer/audio/global +@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer/audio +@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/profiles/voice +@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/profiles/cdlossy +@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/profiles/cdlossless +@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/profiles +@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/global +@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-sound-recorder/system-state @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-sound-recorder @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-cd @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/CDDB-Slave2 -@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-volume-control @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-sound-recorder/system-state @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-sound-recorder @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 -@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-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 @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 -@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 +@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 +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gstreamer-properties-C.omf 2>/dev/null || /usr/bin/true diff --git a/audio/gnomemedia2/Makefile b/audio/gnomemedia2/Makefile index da9fdf9b7b71..269a01c60310 100644 --- a/audio/gnomemedia2/Makefile +++ b/audio/gnomemedia2/Makefile @@ -6,11 +6,11 @@ # PORTNAME= gnomemedia2 -PORTVERSION= 2.4.1.1 +PORTVERSION= 2.6.0 PORTREVISION= 1 CATEGORIES= audio gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-media/2.4 +MASTER_SITE_SUBDIR= sources/gnome-media/2.6 DISTNAME= gnome-media-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -18,21 +18,28 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Multimedia applications for the GNOME 2 desktop RUN_DEPENDS= sox:${PORTSDIR}/audio/sox -LIB_DEPENDS= gstplay-0.6.1:${PORTSDIR}/multimedia/gstreamer-plugins USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_LIBTOOL_VER= 13 +USE_LIBTOOL_VER=13 INSTALLS_SHLIB= yes USE_REINPLACE= yes GNOME_DESKTOP_VERSION=2 -USE_GNOME= gnomeprefix gnomehack gnomehier gnomedesktop gail +USE_GNOME= gnomeprefix gnomehack intlhack lthack gnomehier gnomedesktop \ + gail gstreamerplugins CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +.include <bsd.port.pre.mk> + post-patch: @${REINPLACE_CMD} -e 's|[$$][(]CDROM_HOST[)]|freebsd|g' \ ${WRKSRC}/gnome-cd/Makefile.in +.if ${OSVERSION} > 501107 + @${REINPLACE_CMD} -e 's|%%CDROM%%|acd0|' ${WRKSRC}/configure +.else + @${REINPLACE_CMD} -e 's|%%CDROM%%|acd0c|' ${WRKSRC}/configure +.endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/audio/gnomemedia2/distinfo b/audio/gnomemedia2/distinfo index a6fff81357db..567505c6ab54 100644 --- a/audio/gnomemedia2/distinfo +++ b/audio/gnomemedia2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-media-2.4.1.1.tar.bz2) = dce73f3f0e5bddfd5a2bd412900e5abe -SIZE (gnome2/gnome-media-2.4.1.1.tar.bz2) = 2745842 +MD5 (gnome2/gnome-media-2.6.0.tar.bz2) = 51dd73a96cbdb8049fa9e7d2aa0af9b5 +SIZE (gnome2/gnome-media-2.6.0.tar.bz2) = 2943852 diff --git a/audio/gnomemedia2/files/patch-ad b/audio/gnomemedia2/files/patch-ad deleted file mode 100644 index f49a888a5a99..000000000000 --- a/audio/gnomemedia2/files/patch-ad +++ /dev/null @@ -1,31 +0,0 @@ ---- gmix/gmix.c.orig Tue Oct 8 19:40:43 2002 -+++ gmix/gmix.c Fri Oct 11 09:20:13 2002 -@@ -60,7 +60,7 @@ - #ifdef HAVE_LINUX_SOUNDCARD_H - #include <linux/soundcard.h> - #else --#include <machine/soundcard.h> -+#include <sys/soundcard.h> - #endif - #endif - -@@ -722,6 +722,7 @@ - - cnt = 0; - devices = NULL; -+ num_mixers = 0; - device_by_name = g_hash_table_new (g_str_hash, g_str_equal); - - do { -@@ -730,9 +731,8 @@ - devices = g_list_append (devices, new_device); - g_hash_table_insert (device_by_name, new_device->info.name, new_device); - } -- } while (new_device); -- -- num_mixers = cnt - 1; -+ } while ((errno == EACCES) || (errno == EINVAL) || (errno == ENXIO) \ -+ || new_device); - } - - device_info * diff --git a/audio/gnomemedia2/files/patch-configure b/audio/gnomemedia2/files/patch-configure index d5e0e924c1a7..2c6ea537ce3a 100644 --- a/audio/gnomemedia2/files/patch-configure +++ b/audio/gnomemedia2/files/patch-configure @@ -1,10 +1,11 @@ ---- configure.orig Thu Jan 23 17:55:03 2003 -+++ configure Tue Feb 4 20:31:01 2003 -@@ -8336,6 +8336,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' +--- configure.orig Wed Dec 31 00:49:17 2003 ++++ configure Wed Dec 31 00:49:57 2003 +@@ -23190,7 +23190,7 @@ + *FreeBSD*) + CDROM_HOST=freebsd + CDROM_HOST_FREEBSD=true +- default_cd_device="/dev/acd0c" ++ default_cd_device="/dev/%%CDROM%%" + ;; + *Linux*) + CDROM_HOST=linux diff --git a/audio/gnomemedia2/files/patch-gmix::prefs.c b/audio/gnomemedia2/files/patch-gmix::prefs.c deleted file mode 100644 index b25b42b9748e..000000000000 --- a/audio/gnomemedia2/files/patch-gmix::prefs.c +++ /dev/null @@ -1,11 +0,0 @@ ---- gmix/prefs.c.orig Tue May 7 00:52:42 2002 -+++ gmix/prefs.c Tue May 7 00:52:54 2002 -@@ -38,7 +38,7 @@ - #ifdef HAVE_LINUX_SOUNDCARD_H - #include <linux/soundcard.h> - #else --#include <machine/soundcard.h> -+#include <sys/soundcard.h> - #endif - #endif - diff --git a/audio/gnomemedia2/files/patch-gmix_gmix.h b/audio/gnomemedia2/files/patch-gmix_gmix.h deleted file mode 100644 index 600110df6a9f..000000000000 --- a/audio/gnomemedia2/files/patch-gmix_gmix.h +++ /dev/null @@ -1,11 +0,0 @@ ---- gmix/gmix.h.orig Sat Aug 16 15:13:57 2003 -+++ gmix/gmix.h Sat Aug 16 15:14:47 2003 -@@ -25,7 +25,7 @@ - */ - #define GMIX_VERSION 0x030000 - --#if defined(ALSA) || defined(__FreeBSD__) -+#if defined(ALSA) || (defined(__FreeBSD__) && !defined(SOUND_MIXER_INFO)) - /* stolen from OSS's soundcard.h */ - typedef struct mixer_info - { diff --git a/audio/gnomemedia2/pkg-plist b/audio/gnomemedia2/pkg-plist index 47d38d6ba3b2..67cf88304e5e 100644 --- a/audio/gnomemedia2/pkg-plist +++ b/audio/gnomemedia2/pkg-plist @@ -1,4 +1,5 @@ bin/cddb-slave2-properties +bin/gnome-audio-profiles-properties bin/gnome-cd bin/gnome-sound-recorder bin/gnome-volume-control @@ -8,32 +9,60 @@ etc/gconf/gconf.xml.defaults/apps/CDDB-Slave2/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnome-cd/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnome-sound-recorder/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnome-sound-recorder/system-state/%gconf.xml -etc/gconf/gconf.xml.defaults/apps/gnome-volume-control/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/CDDB-Slave2/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnome-cd/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnome-sound-recorder/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnome-sound-recorder/system-state/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/gnome-volume-control/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/global/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/profiles/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/profiles/cdlossless/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/profiles/cdlossy/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/profiles/voice/%gconf.xml +etc/gconf/gconf.xml.defaults/system/gstreamer/%gconf.xml +etc/gconf/gconf.xml.defaults/system/gstreamer/audio/%gconf.xml +etc/gconf/gconf.xml.defaults/system/gstreamer/audio/global/%gconf.xml +etc/gconf/gconf.xml.defaults/system/gstreamer/audio/profiles/%gconf.xml +etc/gconf/gconf.xml.defaults/system/gstreamer/audio/profiles/cdlossless/%gconf.xml +etc/gconf/gconf.xml.defaults/system/gstreamer/audio/profiles/cdlossy/%gconf.xml +etc/gconf/gconf.xml.defaults/system/gstreamer/audio/profiles/voice/%gconf.xml etc/gconf/schemas/CDDB-Slave2.schemas +etc/gconf/schemas/gnome-audio-profiles.schemas etc/gconf/schemas/gnome-cd.schemas etc/gconf/schemas/gnome-sound-recorder.schemas -etc/gconf/schemas/gnome-volume-control.schemas include/cddb-slave2/cddb-slave-client.h +include/gnome-media/profiles/audio-profile-choose.h +include/gnome-media/profiles/audio-profile-edit.h +include/gnome-media/profiles/audio-profile.h +include/gnome-media/profiles/audio-profiles-edit.h +include/gnome-media/profiles/gnome-media-profiles.h lib/libcddb-slave2.a lib/libcddb-slave2.so lib/libcddb-slave2.so.0 +lib/libglade/2.0/libgnome-media-profiles.so +lib/libgnome-media-profiles.a +lib/libgnome-media-profiles.so +lib/libgnome-media-profiles.so.0 libdata/bonobo/servers/GNOME_Media_CDDBSlave2.server +libdata/pkgconfig/gnome-media-profiles.pc libexec/CDDBSlave2 libexec/cddb-track-editor share/gnome/applications/gnome-cd.desktop share/gnome/applications/gnome-sound-recorder.desktop share/gnome/applications/gnome-volume-control.desktop +share/gnome/applications/gstreamer-properties.desktop share/gnome/applications/reclevel.desktop share/gnome/applications/vumeter.desktop share/gnome/control-center-2.0/capplets/cddb-slave.desktop -share/gnome/gnome-media-2.0/icons/gstreamer-properties.png -share/gnome/gnome-media-2.0/interfaces/gstreamer-properties.glade +share/gnome/gnome-media/glade/gnome-audio-profiles.glade2 +share/gnome/gnome-media/pixmaps/mixer.png +share/gnome/gnome-media/pixmaps/phone.png +share/gnome/gnome-media/pixmaps/tone.png +share/gnome/gnome-media/pixmaps/video.png share/gnome/gnome-sound-recorder/ui/gsr.xml +share/gnome/gstreamer-properties/glade/gstreamer-properties.glade +share/gnome/gstreamer-properties/icons/gstreamer-properties.png share/gnome/help/gnome-cd/C/figures/cdplayer_trackeditor_button.png share/gnome/help/gnome-cd/C/figures/cdplayer_trackeditor_window.png share/gnome/help/gnome-cd/C/figures/cdplayer_window.png @@ -48,8 +77,6 @@ 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 @@ -65,8 +92,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/es/legal.xml -share/gnome/help/gnome-cd/es/gnome-cd.xml +share/gnome/help/gnome-cd/de/gnome-cd.xml +share/gnome/help/gnome-cd/de/legal.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 @@ -82,8 +109,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/fr/legal.xml -share/gnome/help/gnome-cd/fr/gnome-cd.xml +share/gnome/help/gnome-cd/es/gnome-cd.xml +share/gnome/help/gnome-cd/es/legal.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 @@ -99,8 +126,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/it/legal.xml -share/gnome/help/gnome-cd/it/gnome-cd.xml +share/gnome/help/gnome-cd/fr/gnome-cd.xml +share/gnome/help/gnome-cd/fr/legal.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 @@ -116,25 +143,8 @@ 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/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/it/gnome-cd.xml +share/gnome/help/gnome-cd/it/legal.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 @@ -150,8 +160,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/ko/legal.xml -share/gnome/help/gnome-cd/ko/gnome-cd.xml +share/gnome/help/gnome-cd/ja/gnome-cd.xml +share/gnome/help/gnome-cd/ja/legal.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 @@ -167,8 +177,25 @@ 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/zh_CN/legal.xml -share/gnome/help/gnome-cd/zh_CN/gnome-cd.xml +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/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 @@ -184,8 +211,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_TW/legal.xml -share/gnome/help/gnome-cd/zh_TW/gnome-cd.xml +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/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 @@ -201,15 +228,16 @@ 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_window.png share/gnome/help/gnome-sound-recorder/C/gnome-sound-recorder.xml share/gnome/help/gnome-sound-recorder/C/legal.xml 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/figures/gnome-volume-control_window.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 @@ -217,8 +245,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/es/legal.xml -share/gnome/help/grecord/es/grecord.xml +share/gnome/help/grecord/de/grecord.xml +share/gnome/help/grecord/de/legal.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 @@ -226,8 +254,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/fr/legal.xml -share/gnome/help/grecord/fr/grecord.xml +share/gnome/help/grecord/es/grecord.xml +share/gnome/help/grecord/es/legal.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 @@ -235,8 +263,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/it/legal.xml -share/gnome/help/grecord/it/grecord.xml +share/gnome/help/grecord/fr/grecord.xml +share/gnome/help/grecord/fr/legal.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 @@ -244,17 +272,8 @@ 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/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/it/grecord.xml +share/gnome/help/grecord/it/legal.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 @@ -262,8 +281,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/ko/legal.xml -share/gnome/help/grecord/ko/grecord.xml +share/gnome/help/grecord/ja/grecord.xml +share/gnome/help/grecord/ja/legal.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 @@ -271,8 +290,17 @@ 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/zh_CN/legal.xml -share/gnome/help/grecord/zh_CN/grecord.xml +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/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 @@ -280,8 +308,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_TW/legal.xml -share/gnome/help/grecord/zh_TW/grecord.xml +share/gnome/help/grecord/zh_CN/grecord.xml +share/gnome/help/grecord/zh_CN/legal.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 @@ -289,6 +317,11 @@ 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/help/gstreamer-properties/C/figures/gstreamer_properties_window.png +share/gnome/help/gstreamer-properties/C/gstreamer-properties.xml +share/gnome/help/gstreamer-properties/C/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 @@ -300,12 +333,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 @@ -322,16 +355,18 @@ 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 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-zh_TW.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-media/gstreamer-properties-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gstreamer-properties-C.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/gnome-cd.png share/gnome/pixmaps/gnome-cd/cd.png share/gnome/pixmaps/gnome-cd/disc.png @@ -402,7 +437,7 @@ share/gnome/pixmaps/gnome-cd/themes/red-lcd/top.png share/gnome/pixmaps/gnome-cd/track.png share/gnome/pixmaps/gnome-grecord.png share/gnome/pixmaps/gnome-media/gnome-sound-recorder/media-play.png -share/gnome/pixmaps/gnome-media/gnome-sound-recorder/media-rec.png +share/gnome/pixmaps/gnome-media/gnome-sound-recorder/media-record.png share/gnome/pixmaps/gnome-media/gnome-sound-recorder/media-stop.png share/gnome/pixmaps/gnome-mixer.png share/gnome/pixmaps/gnome-reclevel.png @@ -420,6 +455,7 @@ share/locale/cy/LC_MESSAGES/gnome-media-2.0.mo share/locale/da/LC_MESSAGES/gnome-media-2.0.mo share/locale/de/LC_MESSAGES/gnome-media-2.0.mo share/locale/el/LC_MESSAGES/gnome-media-2.0.mo +share/locale/en_CA/LC_MESSAGES/gnome-media-2.0.mo share/locale/en_GB/LC_MESSAGES/gnome-media-2.0.mo share/locale/es/LC_MESSAGES/gnome-media-2.0.mo share/locale/et/LC_MESSAGES/gnome-media-2.0.mo @@ -431,6 +467,7 @@ share/locale/ga/LC_MESSAGES/gnome-media-2.0.mo share/locale/gl/LC_MESSAGES/gnome-media-2.0.mo share/locale/he/LC_MESSAGES/gnome-media-2.0.mo share/locale/hi/LC_MESSAGES/gnome-media-2.0.mo +share/locale/hr/LC_MESSAGES/gnome-media-2.0.mo share/locale/hu/LC_MESSAGES/gnome-media-2.0.mo share/locale/id/LC_MESSAGES/gnome-media-2.0.mo share/locale/it/LC_MESSAGES/gnome-media-2.0.mo @@ -445,6 +482,7 @@ share/locale/ms/LC_MESSAGES/gnome-media-2.0.mo share/locale/nl/LC_MESSAGES/gnome-media-2.0.mo share/locale/nn/LC_MESSAGES/gnome-media-2.0.mo share/locale/no/LC_MESSAGES/gnome-media-2.0.mo +share/locale/pa/LC_MESSAGES/gnome-media-2.0.mo share/locale/pl/LC_MESSAGES/gnome-media-2.0.mo share/locale/pt/LC_MESSAGES/gnome-media-2.0.mo share/locale/pt_BR/LC_MESSAGES/gnome-media-2.0.mo @@ -456,6 +494,8 @@ share/locale/sq/LC_MESSAGES/gnome-media-2.0.mo share/locale/sr/LC_MESSAGES/gnome-media-2.0.mo share/locale/sr@Latn/LC_MESSAGES/gnome-media-2.0.mo share/locale/sv/LC_MESSAGES/gnome-media-2.0.mo +share/locale/ta/LC_MESSAGES/gnome-media-2.0.mo +share/locale/th/LC_MESSAGES/gnome-media-2.0.mo share/locale/tr/LC_MESSAGES/gnome-media-2.0.mo share/locale/uk/LC_MESSAGES/gnome-media-2.0.mo share/locale/vi/LC_MESSAGES/gnome-media-2.0.mo @@ -470,11 +510,9 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo @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-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/gstreamer-properties/C/figures +@dirrm share/gnome/help/gstreamer-properties/C +@dirrm share/gnome/help/gstreamer-properties @dirrm share/gnome/help/grecord/zh_TW/figures @dirrm share/gnome/help/grecord/zh_TW @dirrm share/gnome/help/grecord/zh_CN/figures @@ -521,35 +559,56 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo @dirrm share/gnome/help/gnome-cd/C/figures @dirrm share/gnome/help/gnome-cd/C @dirrm share/gnome/help/gnome-cd +@dirrm share/gnome/gstreamer-properties/icons +@dirrm share/gnome/gstreamer-properties/glade +@dirrm share/gnome/gstreamer-properties +@dirrm share/gnome/gnome-sound-recorder/ui +@dirrm share/gnome/gnome-sound-recorder +@dirrm share/gnome/gnome-media/pixmaps +@dirrm share/gnome/gnome-media/glade +@dirrm share/gnome/gnome-media +@dirrm include/gnome-media/profiles +@dirrm include/gnome-media @dirrm include/cddb-slave2 -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-volume-control +@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer/audio/profiles/voice +@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer/audio/profiles/cdlossy +@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer/audio/profiles/cdlossless +@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer/audio/profiles +@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer/audio/global +@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer/audio +@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/profiles/voice +@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/profiles/cdlossy +@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/profiles/cdlossless +@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/profiles +@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/global +@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-sound-recorder/system-state @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-sound-recorder @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-cd @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/CDDB-Slave2 -@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-volume-control @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-sound-recorder/system-state @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-sound-recorder @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 -@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-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 @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 -@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 +@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 +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gstreamer-properties-C.omf 2>/dev/null || /usr/bin/true diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile index 193dddd7560a..fb7f7990ef69 100644 --- a/deskutils/gnome-utils/Makefile +++ b/deskutils/gnome-utils/Makefile @@ -6,12 +6,11 @@ # PORTNAME= gnomeutils2 -PORTVERSION= 2.4.1 -PORTREVISION= 1 +PORTVERSION= 2.6.0 PORTEPOCH= 1 CATEGORIES= deskutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-utils/2.4 +MASTER_SITE_SUBDIR= sources/gnome-utils/2.6 DISTNAME= gnome-utils-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -20,10 +19,11 @@ COMMENT= GNOME 2 support utilities USE_BZIP2= yes USE_X_PREFIX= yes +USE_REINPLACE= yes USE_GMAKE= yes GNOME_DESKTOP_VERSION=2 -USE_GNOME= gnomeprefix gnomehack gnomehier gnomepanel -USE_LIBTOOL_VER= 13 +USE_GNOME= gnomeprefix gnomehack lthack intlhack gnomehier gnomepanel +USE_LIBTOOL_VER=13 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/deskutils/gnome-utils/distinfo b/deskutils/gnome-utils/distinfo index ac383f616510..1eba91b4c139 100644 --- a/deskutils/gnome-utils/distinfo +++ b/deskutils/gnome-utils/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-utils-2.4.1.tar.bz2) = 8512eed7ce0d291d4d8a9ddabceaa23b -SIZE (gnome2/gnome-utils-2.4.1.tar.bz2) = 1628878 +MD5 (gnome2/gnome-utils-2.6.0.tar.bz2) = 358b2576fb07d62e5b1dc0a12eb32223 +SIZE (gnome2/gnome-utils-2.6.0.tar.bz2) = 1639773 diff --git a/deskutils/gnome-utils/pkg-descr b/deskutils/gnome-utils/pkg-descr index 3aaba4bf64ba..bfe154899986 100644 --- a/deskutils/gnome-utils/pkg-descr +++ b/deskutils/gnome-utils/pkg-descr @@ -1,3 +1,2 @@ -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. +GNOME 2.0 support utilities, including a dictionary looker-upper, +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 d4fbdac0ecbb..e8964ac4b6d1 100644 --- a/deskutils/gnome-utils/pkg-plist +++ b/deskutils/gnome-utils/pkg-plist @@ -53,6 +53,9 @@ share/gnome/help/gnome-search-tool/sv/legal.xml share/gnome/help/gnome-search-tool/zh_CN/figures/gnome-search-tool_window.png share/gnome/help/gnome-search-tool/zh_CN/gnome-search-tool.xml share/gnome/help/gnome-search-tool/zh_CN/legal.xml +share/gnome/help/gnome-search-tool/zh_HK/figures/gnome-search-tool_window.png +share/gnome/help/gnome-search-tool/zh_HK/gnome-search-tool.xml +share/gnome/help/gnome-search-tool/zh_HK/legal.xml share/gnome/help/gnome-search-tool/zh_TW/figures/gnome-search-tool_window.png share/gnome/help/gnome-search-tool/zh_TW/gnome-search-tool.xml share/gnome/help/gnome-search-tool/zh_TW/legal.xml @@ -106,6 +109,8 @@ share/gnome/omf/gnome-utils/gnome-search-tool-sv.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-sv.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-utils/gnome-search-tool-zh_CN.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-zh_CN.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-utils/gnome-search-tool-zh_HK.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-zh_HK.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-utils/gnome-search-tool-zh_TW.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-zh_TW.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-utils/gnome-system-log-C.omf @@ -128,9 +133,6 @@ share/gnome/omf/gnome-utils/gnome-system-log-zh_CN.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-system-log-zh_CN.omf 2>/dev/null || /usr/bin/true 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-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 @@ -154,6 +156,7 @@ share/locale/ga/LC_MESSAGES/gnome-utils-2.0.mo 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/hr/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 @@ -168,6 +171,7 @@ share/locale/ms/LC_MESSAGES/gnome-utils-2.0.mo share/locale/nl/LC_MESSAGES/gnome-utils-2.0.mo share/locale/nn/LC_MESSAGES/gnome-utils-2.0.mo share/locale/no/LC_MESSAGES/gnome-utils-2.0.mo +share/locale/pa/LC_MESSAGES/gnome-utils-2.0.mo share/locale/pl/LC_MESSAGES/gnome-utils-2.0.mo share/locale/pt/LC_MESSAGES/gnome-utils-2.0.mo share/locale/pt_BR/LC_MESSAGES/gnome-utils-2.0.mo @@ -180,13 +184,13 @@ 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 share/locale/ta/LC_MESSAGES/gnome-utils-2.0.mo +share/locale/th/LC_MESSAGES/gnome-utils-2.0.mo share/locale/tr/LC_MESSAGES/gnome-utils-2.0.mo share/locale/uk/LC_MESSAGES/gnome-utils-2.0.mo 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-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 @@ -210,6 +214,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo @dirrm share/gnome/help/gnome-system-log @dirrm share/gnome/help/gnome-search-tool/zh_TW/figures @dirrm share/gnome/help/gnome-search-tool/zh_TW +@dirrm share/gnome/help/gnome-search-tool/zh_HK/figures +@dirrm share/gnome/help/gnome-search-tool/zh_HK @dirrm share/gnome/help/gnome-search-tool/zh_CN/figures @dirrm share/gnome/help/gnome-search-tool/zh_CN @dirrm share/gnome/help/gnome-search-tool/sv/figures @@ -251,6 +257,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-ko.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-sv.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-zh_CN.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-zh_HK.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-zh_TW.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-system-log-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-system-log-de.omf 2>/dev/null || /usr/bin/true diff --git a/deskutils/gnomeutils2/Makefile b/deskutils/gnomeutils2/Makefile index 193dddd7560a..fb7f7990ef69 100644 --- a/deskutils/gnomeutils2/Makefile +++ b/deskutils/gnomeutils2/Makefile @@ -6,12 +6,11 @@ # PORTNAME= gnomeutils2 -PORTVERSION= 2.4.1 -PORTREVISION= 1 +PORTVERSION= 2.6.0 PORTEPOCH= 1 CATEGORIES= deskutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-utils/2.4 +MASTER_SITE_SUBDIR= sources/gnome-utils/2.6 DISTNAME= gnome-utils-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -20,10 +19,11 @@ COMMENT= GNOME 2 support utilities USE_BZIP2= yes USE_X_PREFIX= yes +USE_REINPLACE= yes USE_GMAKE= yes GNOME_DESKTOP_VERSION=2 -USE_GNOME= gnomeprefix gnomehack gnomehier gnomepanel -USE_LIBTOOL_VER= 13 +USE_GNOME= gnomeprefix gnomehack lthack intlhack gnomehier gnomepanel +USE_LIBTOOL_VER=13 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/deskutils/gnomeutils2/distinfo b/deskutils/gnomeutils2/distinfo index ac383f616510..1eba91b4c139 100644 --- a/deskutils/gnomeutils2/distinfo +++ b/deskutils/gnomeutils2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-utils-2.4.1.tar.bz2) = 8512eed7ce0d291d4d8a9ddabceaa23b -SIZE (gnome2/gnome-utils-2.4.1.tar.bz2) = 1628878 +MD5 (gnome2/gnome-utils-2.6.0.tar.bz2) = 358b2576fb07d62e5b1dc0a12eb32223 +SIZE (gnome2/gnome-utils-2.6.0.tar.bz2) = 1639773 diff --git a/deskutils/gnomeutils2/pkg-descr b/deskutils/gnomeutils2/pkg-descr index 3aaba4bf64ba..bfe154899986 100644 --- a/deskutils/gnomeutils2/pkg-descr +++ b/deskutils/gnomeutils2/pkg-descr @@ -1,3 +1,2 @@ -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. +GNOME 2.0 support utilities, including a dictionary looker-upper, +a frontend for find(1), a system log viewer, and more. diff --git a/deskutils/gnomeutils2/pkg-plist b/deskutils/gnomeutils2/pkg-plist index d4fbdac0ecbb..e8964ac4b6d1 100644 --- a/deskutils/gnomeutils2/pkg-plist +++ b/deskutils/gnomeutils2/pkg-plist @@ -53,6 +53,9 @@ share/gnome/help/gnome-search-tool/sv/legal.xml share/gnome/help/gnome-search-tool/zh_CN/figures/gnome-search-tool_window.png share/gnome/help/gnome-search-tool/zh_CN/gnome-search-tool.xml share/gnome/help/gnome-search-tool/zh_CN/legal.xml +share/gnome/help/gnome-search-tool/zh_HK/figures/gnome-search-tool_window.png +share/gnome/help/gnome-search-tool/zh_HK/gnome-search-tool.xml +share/gnome/help/gnome-search-tool/zh_HK/legal.xml share/gnome/help/gnome-search-tool/zh_TW/figures/gnome-search-tool_window.png share/gnome/help/gnome-search-tool/zh_TW/gnome-search-tool.xml share/gnome/help/gnome-search-tool/zh_TW/legal.xml @@ -106,6 +109,8 @@ share/gnome/omf/gnome-utils/gnome-search-tool-sv.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-sv.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-utils/gnome-search-tool-zh_CN.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-zh_CN.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-utils/gnome-search-tool-zh_HK.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-zh_HK.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-utils/gnome-search-tool-zh_TW.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-zh_TW.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-utils/gnome-system-log-C.omf @@ -128,9 +133,6 @@ share/gnome/omf/gnome-utils/gnome-system-log-zh_CN.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-system-log-zh_CN.omf 2>/dev/null || /usr/bin/true 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-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 @@ -154,6 +156,7 @@ share/locale/ga/LC_MESSAGES/gnome-utils-2.0.mo 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/hr/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 @@ -168,6 +171,7 @@ share/locale/ms/LC_MESSAGES/gnome-utils-2.0.mo share/locale/nl/LC_MESSAGES/gnome-utils-2.0.mo share/locale/nn/LC_MESSAGES/gnome-utils-2.0.mo share/locale/no/LC_MESSAGES/gnome-utils-2.0.mo +share/locale/pa/LC_MESSAGES/gnome-utils-2.0.mo share/locale/pl/LC_MESSAGES/gnome-utils-2.0.mo share/locale/pt/LC_MESSAGES/gnome-utils-2.0.mo share/locale/pt_BR/LC_MESSAGES/gnome-utils-2.0.mo @@ -180,13 +184,13 @@ 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 share/locale/ta/LC_MESSAGES/gnome-utils-2.0.mo +share/locale/th/LC_MESSAGES/gnome-utils-2.0.mo share/locale/tr/LC_MESSAGES/gnome-utils-2.0.mo share/locale/uk/LC_MESSAGES/gnome-utils-2.0.mo 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-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 @@ -210,6 +214,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo @dirrm share/gnome/help/gnome-system-log @dirrm share/gnome/help/gnome-search-tool/zh_TW/figures @dirrm share/gnome/help/gnome-search-tool/zh_TW +@dirrm share/gnome/help/gnome-search-tool/zh_HK/figures +@dirrm share/gnome/help/gnome-search-tool/zh_HK @dirrm share/gnome/help/gnome-search-tool/zh_CN/figures @dirrm share/gnome/help/gnome-search-tool/zh_CN @dirrm share/gnome/help/gnome-search-tool/sv/figures @@ -251,6 +257,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-ko.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-sv.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-zh_CN.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-zh_HK.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-zh_TW.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-system-log-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-system-log-de.omf 2>/dev/null || /usr/bin/true diff --git a/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile index 8c9ab7c6b713..14c5d581b30f 100644 --- a/deskutils/gucharmap/Makefile +++ b/deskutils/gucharmap/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gucharmap -PORTVERSION= 1.2.0 -PORTREVISION= 1 +PORTVERSION= 1.4.1 CATEGORIES= deskutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.2 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.4 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -23,9 +22,9 @@ RUN_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack gtk20 +USE_GNOME= gnomeprefix intlhack gnomehack gtk20 WANT_GNOME= yes -USE_LIBTOOL_VER= 13 +USE_LIBTOOL_VER=13 INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/deskutils/gucharmap/distinfo b/deskutils/gucharmap/distinfo index 73a67c2d6c24..411e9efedee4 100644 --- a/deskutils/gucharmap/distinfo +++ b/deskutils/gucharmap/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gucharmap-1.2.0.tar.bz2) = 70c94bdfb13f7f47b108653237177756 -SIZE (gnome2/gucharmap-1.2.0.tar.bz2) = 1176137 +MD5 (gnome2/gucharmap-1.4.1.tar.bz2) = 8838c3171b9c7110f5d3110af5594141 +SIZE (gnome2/gucharmap-1.4.1.tar.bz2) = 1482646 diff --git a/deskutils/gucharmap/files/patch-gucharmap::gucharmap-window.c b/deskutils/gucharmap/files/patch-gucharmap::gucharmap-window.c deleted file mode 100644 index be3377f48d34..000000000000 --- a/deskutils/gucharmap/files/patch-gucharmap::gucharmap-window.c +++ /dev/null @@ -1,12 +0,0 @@ ---- gucharmap/gucharmap-window.c.orig Thu Nov 20 21:26:42 2003 -+++ gucharmap/gucharmap-window.c Thu Nov 20 21:27:03 2003 -@@ -113,8 +113,8 @@ - { - const gchar *no_leading_space, *nptr; - char *endptr; -- g_assert (direction == -1 || direction == 1); - gunichar wc; -+ g_assert (direction == -1 || direction == 1); - - if (search_text[0] == '\0') - { diff --git a/deskutils/gucharmap/files/patch-gucharmap_gucharmap-window.c b/deskutils/gucharmap/files/patch-gucharmap_gucharmap-window.c new file mode 100644 index 000000000000..ce9879281483 --- /dev/null +++ b/deskutils/gucharmap/files/patch-gucharmap_gucharmap-window.c @@ -0,0 +1,39 @@ +--- gucharmap/gucharmap-window.c.orig Fri Feb 27 13:11:01 2004 ++++ gucharmap/gucharmap-window.c Wed Mar 3 22:45:21 2004 +@@ -417,8 +417,8 @@ + { + GucharmapWindowPrivate *priv = GUCHARMAP_WINDOW_GET_PRIVATE (guw); + gucharmap_charmap_set_chapters (guw->charmap, GUCHARMAP_CHAPTERS (gucharmap_script_chapters_new ())); +- gtk_label_set_text (GTK_LABEL (gtk_bin_get_child (GTK_BIN (priv->next_chapter_menu_item))), _("Next Script"));; +- gtk_label_set_text (GTK_LABEL (gtk_bin_get_child (GTK_BIN (priv->prev_chapter_menu_item))), _("Previous Script"));; ++ gtk_label_set_text (GTK_LABEL (gtk_bin_get_child (GTK_BIN (priv->next_chapter_menu_item))), _("Next Script")); ++ gtk_label_set_text (GTK_LABEL (gtk_bin_get_child (GTK_BIN (priv->prev_chapter_menu_item))), _("Previous Script")); + } + } + +@@ -430,8 +430,8 @@ + { + GucharmapWindowPrivate *priv = GUCHARMAP_WINDOW_GET_PRIVATE (guw); + gucharmap_charmap_set_chapters (guw->charmap, GUCHARMAP_CHAPTERS (gucharmap_block_chapters_new ())); +- gtk_label_set_text (GTK_LABEL (gtk_bin_get_child (GTK_BIN (priv->next_chapter_menu_item))), _("Next Block"));; +- gtk_label_set_text (GTK_LABEL (gtk_bin_get_child (GTK_BIN (priv->prev_chapter_menu_item))), _("Previous Block"));; ++ gtk_label_set_text (GTK_LABEL (gtk_bin_get_child (GTK_BIN (priv->next_chapter_menu_item))), _("Next Block")); ++ gtk_label_set_text (GTK_LABEL (gtk_bin_get_child (GTK_BIN (priv->prev_chapter_menu_item))), _("Previous Block")); + } + } + +@@ -834,12 +834,12 @@ + g_signal_connect (priv->status, "realize", G_CALLBACK (status_realize), guw); + + priv->progress = gtk_progress_bar_new (); +- gtk_box_pack_start (GTK_BOX (hbox), priv->progress, FALSE, FALSE, 0);; ++ gtk_box_pack_start (GTK_BOX (hbox), priv->progress, FALSE, FALSE, 0); + + #if 0 + grip = gtk_statusbar_new (); + gtk_statusbar_set_has_resize_grip (GTK_STATUSBAR (grip), TRUE); +- gtk_box_pack_start (GTK_BOX (hbox), grip, FALSE, FALSE, 0);; ++ gtk_box_pack_start (GTK_BOX (hbox), grip, FALSE, FALSE, 0); + #endif + gtk_widget_show_all (hbox); + diff --git a/deskutils/gucharmap/pkg-descr b/deskutils/gucharmap/pkg-descr index 20fe556a345f..e693616630e6 100644 --- a/deskutils/gucharmap/pkg-descr +++ b/deskutils/gucharmap/pkg-descr @@ -1,4 +1,4 @@ -gucharmap is a Unicode/ISO10646 character map and font viewer. It uses GTK+ -2. It supports anti-aliased, scalable fonts. +gucharmap is a Unicode/ISO10646 character map and font viewer. It uses +GTK+ 2, and supports anti-aliased, scalable fonts. WWW: http://gucharmap.sourceforge.net/ diff --git a/deskutils/gucharmap/pkg-plist b/deskutils/gucharmap/pkg-plist index 921ff692b216..835800a7479a 100644 --- a/deskutils/gucharmap/pkg-plist +++ b/deskutils/gucharmap/pkg-plist @@ -1,26 +1,78 @@ bin/charmap -@unexec if test -L %D/bin/gnome-character-map; then rm -f %D/bin/gnome-character-map; fi +bin/gnome-character-map bin/gucharmap +include/gucharmap/gucharmap-block-chapters.h +include/gucharmap/gucharmap-chapters.h include/gucharmap/gucharmap-charmap.h +include/gucharmap/gucharmap-codepoint-list.h include/gucharmap/gucharmap-mini-fontsel.h +include/gucharmap/gucharmap-script-chapters.h +include/gucharmap/gucharmap-script-codepoint-list.h +include/gucharmap/gucharmap-search-dialog.h include/gucharmap/gucharmap-table.h include/gucharmap/gucharmap-unicode-info.h include/gucharmap/gucharmap-window.h include/gucharmap/gucharmap.h -lib/gtk-2.0/2.2.0/immodules/im-gucharmap.so lib/libgucharmap.a lib/libgucharmap.so -lib/libgucharmap.so.3 +lib/libgucharmap.so.4 libdata/pkgconfig/gucharmap.pc share/gnome/applications/gucharmap.desktop share/gnome/help/gucharmap/C/figures/gucharmap_start_window.png +share/gnome/help/gucharmap/C/figures/gucharmap_window.png share/gnome/help/gucharmap/C/gucharmap.xml share/gnome/help/gucharmap/C/legal.xml +share/gnome/help/gucharmap/de/figures/gucharmap_window.png +share/gnome/help/gucharmap/de/gucharmap.xml +share/gnome/help/gucharmap/de/legal.xml +share/gnome/help/gucharmap/es/figures/gucharmap_window.png +share/gnome/help/gucharmap/es/gucharmap.xml +share/gnome/help/gucharmap/es/legal.xml +share/gnome/help/gucharmap/fr/figures/gucharmap_window.png +share/gnome/help/gucharmap/fr/gucharmap.xml +share/gnome/help/gucharmap/fr/legal.xml +share/gnome/help/gucharmap/it/figures/gucharmap_window.png +share/gnome/help/gucharmap/it/gucharmap.xml +share/gnome/help/gucharmap/it/legal.xml +share/gnome/help/gucharmap/ja/figures/gucharmap_window.png +share/gnome/help/gucharmap/ja/gucharmap.xml +share/gnome/help/gucharmap/ja/legal.xml +share/gnome/help/gucharmap/ko/figures/gucharmap_window.png +share/gnome/help/gucharmap/ko/gucharmap.xml +share/gnome/help/gucharmap/ko/legal.xml +share/gnome/help/gucharmap/sv/figures/gucharmap_window.png +share/gnome/help/gucharmap/sv/gucharmap.xml +share/gnome/help/gucharmap/sv/legal.xml +share/gnome/help/gucharmap/zh_CN/figures/gucharmap_window.png +share/gnome/help/gucharmap/zh_CN/gucharmap.xml +share/gnome/help/gucharmap/zh_CN/legal.xml +share/gnome/help/gucharmap/zh_TW/figures/gucharmap_window.png +share/gnome/help/gucharmap/zh_TW/gucharmap.xml +share/gnome/help/gucharmap/zh_TW/legal.xml share/gnome/omf/gucharmap/gucharmap-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gucharmap/gucharmap-C.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gucharmap/gucharmap-de.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gucharmap/gucharmap-de.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gucharmap/gucharmap-es.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gucharmap/gucharmap-es.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gucharmap/gucharmap-fr.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gucharmap/gucharmap-fr.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gucharmap/gucharmap-it.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gucharmap/gucharmap-it.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gucharmap/gucharmap-ja.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gucharmap/gucharmap-ja.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gucharmap/gucharmap-ko.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gucharmap/gucharmap-ko.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gucharmap/gucharmap-sv.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gucharmap/gucharmap-sv.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gucharmap/gucharmap-zh_CN.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gucharmap/gucharmap-zh_CN.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gucharmap/gucharmap-zh_TW.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gucharmap/gucharmap-zh_TW.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/gucharmap.png -share/locale/az/LC_MESSAGES/gucharmap.mo share/locale/am/LC_MESSAGES/gucharmap.mo +share/locale/ar/LC_MESSAGES/gucharmap.mo +share/locale/az/LC_MESSAGES/gucharmap.mo share/locale/be/LC_MESSAGES/gucharmap.mo share/locale/bn/LC_MESSAGES/gucharmap.mo share/locale/ca/LC_MESSAGES/gucharmap.mo @@ -29,6 +81,8 @@ share/locale/cy/LC_MESSAGES/gucharmap.mo share/locale/da/LC_MESSAGES/gucharmap.mo share/locale/de/LC_MESSAGES/gucharmap.mo share/locale/el/LC_MESSAGES/gucharmap.mo +share/locale/en_CA/LC_MESSAGES/gucharmap.mo +share/locale/en_GB/LC_MESSAGES/gucharmap.mo share/locale/eo/LC_MESSAGES/gucharmap.mo share/locale/es/LC_MESSAGES/gucharmap.mo share/locale/fa/LC_MESSAGES/gucharmap.mo @@ -36,15 +90,22 @@ share/locale/fi/LC_MESSAGES/gucharmap.mo share/locale/fr/LC_MESSAGES/gucharmap.mo share/locale/ga/LC_MESSAGES/gucharmap.mo share/locale/hi/LC_MESSAGES/gucharmap.mo +share/locale/hr/LC_MESSAGES/gucharmap.mo share/locale/hu/LC_MESSAGES/gucharmap.mo +share/locale/id/LC_MESSAGES/gucharmap.mo +share/locale/is/LC_MESSAGES/gucharmap.mo share/locale/it/LC_MESSAGES/gucharmap.mo share/locale/ja/LC_MESSAGES/gucharmap.mo share/locale/ko/LC_MESSAGES/gucharmap.mo +share/locale/lt/LC_MESSAGES/gucharmap.mo share/locale/mk/LC_MESSAGES/gucharmap.mo share/locale/ml/LC_MESSAGES/gucharmap.mo +share/locale/mn/LC_MESSAGES/gucharmap.mo share/locale/ms/LC_MESSAGES/gucharmap.mo share/locale/nl/LC_MESSAGES/gucharmap.mo +share/locale/nn/LC_MESSAGES/gucharmap.mo share/locale/no/LC_MESSAGES/gucharmap.mo +share/locale/pa/LC_MESSAGES/gucharmap.mo share/locale/pl/LC_MESSAGES/gucharmap.mo share/locale/pt/LC_MESSAGES/gucharmap.mo share/locale/pt_BR/LC_MESSAGES/gucharmap.mo @@ -55,16 +116,42 @@ share/locale/sr/LC_MESSAGES/gucharmap.mo share/locale/sr@Latn/LC_MESSAGES/gucharmap.mo share/locale/sv/LC_MESSAGES/gucharmap.mo share/locale/ta/LC_MESSAGES/gucharmap.mo +share/locale/th/LC_MESSAGES/gucharmap.mo share/locale/uk/LC_MESSAGES/gucharmap.mo share/locale/vi/LC_MESSAGES/gucharmap.mo share/locale/wa/LC_MESSAGES/gucharmap.mo share/locale/zh_CN/LC_MESSAGES/gucharmap.mo share/locale/zh_TW/LC_MESSAGES/gucharmap.mo @dirrm share/gnome/omf/gucharmap +@dirrm share/gnome/help/gucharmap/zh_TW/figures +@dirrm share/gnome/help/gucharmap/zh_TW +@dirrm share/gnome/help/gucharmap/zh_CN/figures +@dirrm share/gnome/help/gucharmap/zh_CN +@dirrm share/gnome/help/gucharmap/sv/figures +@dirrm share/gnome/help/gucharmap/sv +@dirrm share/gnome/help/gucharmap/ko/figures +@dirrm share/gnome/help/gucharmap/ko +@dirrm share/gnome/help/gucharmap/ja/figures +@dirrm share/gnome/help/gucharmap/ja +@dirrm share/gnome/help/gucharmap/it/figures +@dirrm share/gnome/help/gucharmap/it +@dirrm share/gnome/help/gucharmap/fr/figures +@dirrm share/gnome/help/gucharmap/fr +@dirrm share/gnome/help/gucharmap/es/figures +@dirrm share/gnome/help/gucharmap/es +@dirrm share/gnome/help/gucharmap/de/figures +@dirrm share/gnome/help/gucharmap/de @dirrm share/gnome/help/gucharmap/C/figures @dirrm share/gnome/help/gucharmap/C @dirrm share/gnome/help/gucharmap @dirrm include/gucharmap -@exec %D/bin/gtk-query-immodules-2.0 >/dev/null 2>&1 && %D/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules 2>/dev/null || /usr/bin/true -@unexec %D/bin/gtk-query-immodules-2.0 >/dev/null 2>&1 && %D/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gucharmap/gucharmap-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gucharmap/gucharmap-de.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gucharmap/gucharmap-es.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gucharmap/gucharmap-fr.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gucharmap/gucharmap-it.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gucharmap/gucharmap-ja.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gucharmap/gucharmap-ko.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gucharmap/gucharmap-sv.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gucharmap/gucharmap-zh_CN.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gucharmap/gucharmap-zh_TW.omf 2>/dev/null || /usr/bin/true diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile index 0fa37b24407d..c048a73e3e54 100644 --- a/devel/ORBit2/Makefile +++ b/devel/ORBit2/Makefile @@ -6,11 +6,10 @@ # PORTNAME= ORBit2 -PORTVERSION= 2.8.3 -PORTREVISION= 1 +PORTVERSION= 2.10.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.8 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -22,9 +21,9 @@ USE_BZIP2= yes USE_GMAKE= yes USE_REINPLACE= yes INSTALLS_SHLIB= yes -USE_LIBTOOL_VER= 13 -USE_GNOME= gnomehack libidl -CONFIGURE_ARGS= --disable-indent \ +USE_LIBTOOL_VER=13 +USE_GNOME= gnomehack lthack libidl +CONFIGURE_ARGS= --disable-indent \ --with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/devel/ORBit2/distinfo b/devel/ORBit2/distinfo index 610e0d208774..b32abca376d0 100644 --- a/devel/ORBit2/distinfo +++ b/devel/ORBit2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/ORBit2-2.8.3.tar.bz2) = c6c4b63de2f70310e33a52a37257ddaf -SIZE (gnome2/ORBit2-2.8.3.tar.bz2) = 633145 +MD5 (gnome2/ORBit2-2.10.0.tar.bz2) = fe86ec038fc51ee0e90e84169a8dda6c +SIZE (gnome2/ORBit2-2.10.0.tar.bz2) = 643687 diff --git a/devel/ORBit2/files/patch-ab b/devel/ORBit2/files/patch-ab index 57f1e2d4c301..281d27bbf89e 100644 --- a/devel/ORBit2/files/patch-ab +++ b/devel/ORBit2/files/patch-ab @@ -1,17 +1,17 @@ ---- Makefile.in.orig Sat Jun 14 01:50:29 2003 -+++ Makefile.in Sat Jun 14 01:51:03 2003 -@@ -35,7 +35,7 @@ - DESTDIR = - +--- Makefile.in.orig Fri Mar 5 23:34:38 2004 ++++ Makefile.in Fri Mar 5 23:35:59 2004 +@@ -34,7 +34,7 @@ + includedir = @includedir@ + oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ +pkglibdir = $(prefix)/libdata/pkgconfig pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = . -@@ -115,7 +115,7 @@ - AUTOMAKE_OPTIONS = 1.3 +@@ -125,7 +125,7 @@ + + DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc -SUBDIRS = linc2 src include test docs +SUBDIRS = linc2 src include docs diff --git a/devel/ORBit2/files/patch-configure b/devel/ORBit2/files/patch-configure deleted file mode 100644 index 3c4e6cd0faf9..000000000000 --- a/devel/ORBit2/files/patch-configure +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- configure 2002/04/26 07:38:33 1.1 -+++ configure 2002/04/26 07:38:42 -@@ -6201,6 +6201,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' diff --git a/devel/ORBit2/files/patch-src::orb::util::Makefile.in b/devel/ORBit2/files/patch-src::orb::util::Makefile.in index 0c2cb69a98bc..e048ca634226 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 Tue Jul 15 13:16:53 2003 -+++ src/orb/util/Makefile.in Tue Jul 15 13:17:32 2003 -@@ -189,7 +189,7 @@ +--- src/orb/util/Makefile.in.orig Fri Mar 5 23:39:16 2004 ++++ src/orb/util/Makefile.in Fri Mar 5 23:39:43 2004 +@@ -126,7 +126,7 @@ INCLUDES = \ -I$(top_srcdir)/include \ -I$(top_builddir)/include \ diff --git a/devel/ORBit2/files/patch-src_orb_orb-core_orbit-typelib.c b/devel/ORBit2/files/patch-src_orb_orb-core_orbit-typelib.c index 48972837628b..44dfb3fb0690 100644 --- a/devel/ORBit2/files/patch-src_orb_orb-core_orbit-typelib.c +++ b/devel/ORBit2/files/patch-src_orb_orb-core_orbit-typelib.c @@ -1,6 +1,6 @@ ---- src/orb/orb-core/orbit-typelib.c.orig Sun May 11 20:37:14 2003 -+++ src/orb/orb-core/orbit-typelib.c Sun May 11 20:40:42 2003 -@@ -215,6 +215,8 @@ +--- src/orb/orb-core/orbit-typelib.c.orig Fri Mar 5 23:42:33 2004 ++++ src/orb/orb-core/orbit-typelib.c Fri Mar 5 23:43:00 2004 +@@ -218,6 +218,8 @@ paths = g_ptr_array_sized_new (8); g_ptr_array_add (paths, g_strdup (ORBIT_TYPELIB_DIR)); diff --git a/devel/ORBit2/pkg-descr b/devel/ORBit2/pkg-descr index 8336574a1661..57ee9653d674 100644 --- a/devel/ORBit2/pkg-descr +++ b/devel/ORBit2/pkg-descr @@ -1,3 +1,3 @@ ORBit is a high-performance CORBA ORB with support for the C language. -It allows programs to send requests and receive replies from other -programs, regardless of the locations of the two programs. +It allows programs to comminucate with each other, regardless of their +physical and logical locations. diff --git a/devel/ORBit2/pkg-plist b/devel/ORBit2/pkg-plist index ea2dca5ab3ae..c18fe8f28e9c 100644 --- a/devel/ORBit2/pkg-plist +++ b/devel/ORBit2/pkg-plist @@ -64,19 +64,9 @@ 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 +@dirrm %%DOCSDIR%% @unexec /bin/rmdir %D/share/idl 2>/dev/null || /usr/bin/true @unexec /bin/rmdir %D/lib/orbit-2.0 2>/dev/null || /usr/bin/true @dirrm include/orbit-2.0/orbit/util diff --git a/devel/bugbuddy2/Makefile b/devel/bugbuddy2/Makefile index 7d7135716e49..cd7e13f7afde 100644 --- a/devel/bugbuddy2/Makefile +++ b/devel/bugbuddy2/Makefile @@ -6,11 +6,10 @@ # PORTNAME= bugbuddy2 -PORTVERSION= 2.4.2 -PORTREVISION= 1 +PORTVERSION= 2.6.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/bug-buddy/2.4 +MASTER_SITE_SUBDIR= sources/bug-buddy/2.6 DISTNAME= bug-buddy-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -19,9 +18,10 @@ COMMENT= A bug reporting tool for GNOME 2 USE_BZIP2= yes USE_X_PREFIX= yes +USE_REINPLACE= yes USE_GMAKE= yes -USE_LIBTOOL_VER= 13 -USE_GNOME= gnomeprefix gnomehack gnomedesktop intlhack +USE_LIBTOOL_VER=13 +USE_GNOME= gnomeprefix gnomehack intlhack lthack gnomedesktop GNOME_DESKTOP_VERSION=2 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/devel/bugbuddy2/distinfo b/devel/bugbuddy2/distinfo index 10a87afd3cf9..481abff6c22c 100644 --- a/devel/bugbuddy2/distinfo +++ b/devel/bugbuddy2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/bug-buddy-2.4.2.tar.bz2) = e30d5c84ab8279fee62376f8d422c699 -SIZE (gnome2/bug-buddy-2.4.2.tar.bz2) = 563631 +MD5 (gnome2/bug-buddy-2.6.0.tar.bz2) = 27e9dfa28e7639a15a42c31794f0c510 +SIZE (gnome2/bug-buddy-2.6.0.tar.bz2) = 833465 diff --git a/devel/bugbuddy2/pkg-descr b/devel/bugbuddy2/pkg-descr index 0a572e8ccc7f..7268130ab17d 100644 --- a/devel/bugbuddy2/pkg-descr +++ b/devel/bugbuddy2/pkg-descr @@ -1,5 +1,6 @@ -This is a graphical bug reporting tool. It can extract debugging -information from a core file or crashed application (via gnome_segv). +This is a bug reporting tool. It pops up automatically when a GNOME +app crashes under the GNOME desktop (via gnome_segv), and allows +the crash information to be sent to the app's developers. Jacob Berkman <jberkman@andrew.cmu.edu> diff --git a/devel/bugbuddy2/pkg-plist b/devel/bugbuddy2/pkg-plist index d9feab027dcc..a6f570ff02d6 100644 --- a/devel/bugbuddy2/pkg-plist +++ b/devel/bugbuddy2/pkg-plist @@ -1,4 +1,7 @@ bin/bug-buddy +etc/gconf/gconf.xml.defaults/apps/bug-buddy/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/bug-buddy/%gconf.xml +etc/gconf/schemas/bug-buddy.schemas share/gnome/application-registry/bug-buddy.applications share/gnome/applications/bug-buddy.desktop share/gnome/bug-buddy/bug-buddy.glade @@ -16,10 +19,59 @@ share/gnome/bug-buddy/gnome.png share/gnome/bug-buddy/ximian.png share/gnome/help/bug-buddy/C/bug-buddy.xml share/gnome/help/bug-buddy/C/legal.xml +share/gnome/help/bug-buddy/de/bug-buddy.xml +share/gnome/help/bug-buddy/de/figures/bug-buddy_window.png +share/gnome/help/bug-buddy/de/legal.xml +share/gnome/help/bug-buddy/es/bug-buddy.xml +share/gnome/help/bug-buddy/es/figures/bug-buddy_window.png +share/gnome/help/bug-buddy/es/legal.xml +share/gnome/help/bug-buddy/fr/bug-buddy.xml +share/gnome/help/bug-buddy/fr/figures/bug-buddy_window.png +share/gnome/help/bug-buddy/fr/legal.xml +share/gnome/help/bug-buddy/it/bug-buddy.xml +share/gnome/help/bug-buddy/it/figures/bug-buddy_window.png +share/gnome/help/bug-buddy/it/legal.xml +share/gnome/help/bug-buddy/ja/bug-buddy.xml +share/gnome/help/bug-buddy/ja/figures/bug-buddy_window.png +share/gnome/help/bug-buddy/ja/legal.xml +share/gnome/help/bug-buddy/ko/bug-buddy.xml +share/gnome/help/bug-buddy/ko/figures/bug-buddy_window.png +share/gnome/help/bug-buddy/ko/legal.xml +share/gnome/help/bug-buddy/sv/bug-buddy.xml +share/gnome/help/bug-buddy/sv/figures/bug-buddy_window.png +share/gnome/help/bug-buddy/sv/legal.xml +share/gnome/help/bug-buddy/zh_CN/bug-buddy.xml +share/gnome/help/bug-buddy/zh_CN/figures/bug-buddy_window.png +share/gnome/help/bug-buddy/zh_CN/legal.xml +share/gnome/help/bug-buddy/zh_HK/bug-buddy.xml +share/gnome/help/bug-buddy/zh_HK/figures/bug-buddy_window.png +share/gnome/help/bug-buddy/zh_HK/legal.xml +share/gnome/help/bug-buddy/zh_TW/bug-buddy.xml +share/gnome/help/bug-buddy/zh_TW/figures/bug-buddy_window.png +share/gnome/help/bug-buddy/zh_TW/legal.xml share/gnome/mime-info/bug-buddy.keys -share/gnome/mime-info/bug-buddy.mime share/gnome/omf/bug-buddy/bug-buddy-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/bug-buddy/bug-buddy-C.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/bug-buddy/bug-buddy-de.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/bug-buddy/bug-buddy-de.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/bug-buddy/bug-buddy-es.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/bug-buddy/bug-buddy-es.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/bug-buddy/bug-buddy-fr.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/bug-buddy/bug-buddy-fr.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/bug-buddy/bug-buddy-it.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/bug-buddy/bug-buddy-it.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/bug-buddy/bug-buddy-ja.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/bug-buddy/bug-buddy-ja.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/bug-buddy/bug-buddy-ko.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/bug-buddy/bug-buddy-ko.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/bug-buddy/bug-buddy-sv.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/bug-buddy/bug-buddy-sv.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/bug-buddy/bug-buddy-zh_CN.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/bug-buddy/bug-buddy-zh_CN.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/bug-buddy/bug-buddy-zh_HK.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/bug-buddy/bug-buddy-zh_HK.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/bug-buddy/bug-buddy-zh_TW.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/bug-buddy/bug-buddy-zh_TW.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/bug-buddy.png share/locale/am/LC_MESSAGES/bug-buddy.mo share/locale/ar/LC_MESSAGES/bug-buddy.mo @@ -33,6 +85,8 @@ 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 +share/locale/en_CA/LC_MESSAGES/bug-buddy.mo +share/locale/en_GB/LC_MESSAGES/bug-buddy.mo share/locale/es/LC_MESSAGES/bug-buddy.mo share/locale/et/LC_MESSAGES/bug-buddy.mo share/locale/eu/LC_MESSAGES/bug-buddy.mo @@ -43,6 +97,7 @@ 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/hr/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 @@ -57,6 +112,7 @@ share/locale/ms/LC_MESSAGES/bug-buddy.mo share/locale/nl/LC_MESSAGES/bug-buddy.mo share/locale/nn/LC_MESSAGES/bug-buddy.mo share/locale/no/LC_MESSAGES/bug-buddy.mo +share/locale/pa/LC_MESSAGES/bug-buddy.mo share/locale/pl/LC_MESSAGES/bug-buddy.mo share/locale/pt/LC_MESSAGES/bug-buddy.mo share/locale/pt_BR/LC_MESSAGES/bug-buddy.mo @@ -77,4 +133,42 @@ share/locale/wa/LC_MESSAGES/bug-buddy.mo share/locale/zh_CN/LC_MESSAGES/bug-buddy.mo share/locale/zh_TW/LC_MESSAGES/bug-buddy.mo @dirrm share/gnome/omf/bug-buddy +@dirrm share/gnome/help/bug-buddy/zh_TW/figures +@dirrm share/gnome/help/bug-buddy/zh_TW +@dirrm share/gnome/help/bug-buddy/zh_HK/figures +@dirrm share/gnome/help/bug-buddy/zh_HK +@dirrm share/gnome/help/bug-buddy/zh_CN/figures +@dirrm share/gnome/help/bug-buddy/zh_CN +@dirrm share/gnome/help/bug-buddy/sv/figures +@dirrm share/gnome/help/bug-buddy/sv +@dirrm share/gnome/help/bug-buddy/ko/figures +@dirrm share/gnome/help/bug-buddy/ko +@dirrm share/gnome/help/bug-buddy/ja/figures +@dirrm share/gnome/help/bug-buddy/ja +@dirrm share/gnome/help/bug-buddy/it/figures +@dirrm share/gnome/help/bug-buddy/it +@dirrm share/gnome/help/bug-buddy/fr/figures +@dirrm share/gnome/help/bug-buddy/fr +@dirrm share/gnome/help/bug-buddy/es/figures +@dirrm share/gnome/help/bug-buddy/es +@dirrm share/gnome/help/bug-buddy/de/figures +@dirrm share/gnome/help/bug-buddy/de +@dirrm share/gnome/help/bug-buddy/C +@dirrm share/gnome/help/bug-buddy +@dirrm share/gnome/bug-buddy/bugzilla/ximian +@dirrm share/gnome/bug-buddy/bugzilla/gnome +@dirrm share/gnome/bug-buddy/bugzilla +@dirrm share/gnome/bug-buddy +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/bug-buddy +@dirrm etc/gconf/gconf.xml.defaults/apps/bug-buddy @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/bug-buddy/bug-buddy-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/bug-buddy/bug-buddy-de.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/bug-buddy/bug-buddy-es.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/bug-buddy/bug-buddy-fr.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/bug-buddy/bug-buddy-it.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/bug-buddy/bug-buddy-ja.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/bug-buddy/bug-buddy-ko.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/bug-buddy/bug-buddy-sv.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/bug-buddy/bug-buddy-zh_CN.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/bug-buddy/bug-buddy-zh_HK.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/bug-buddy/bug-buddy-zh_TW.omf 2>/dev/null || /usr/bin/true diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile index 0683c72397e2..846df9bc8bc6 100644 --- a/devel/gconf2/Makefile +++ b/devel/gconf2/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gconf2 -PORTVERSION= 2.4.0.1 -PORTREVISION= 1 +PORTVERSION= 2.6.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/GConf/2.4 +MASTER_SITE_SUBDIR= sources/GConf/2.6 DISTNAME= GConf-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -20,17 +19,17 @@ COMMENT= A configuration database system for GNOME USE_BZIP2= yes USE_GMAKE= yes USE_X_PREFIX= yes -USE_GNOME= gnomehack gnomehier orbit2 gtk20 libxml2 linc +USE_GNOME= gnomehack lthack gnomehier orbit2 gtk20 libxml2 linc INSTALLS_SHLIB= yes -USE_LIBTOOL_VER= 13 +USE_LIBTOOL_VER=13 CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +MAN1= gconftool-2.1 + post-install: - @${MKDIR} ${PREFIX}/etc/gconf/gconf.xml.defaults/apps - @${MKDIR} ${PREFIX}/etc/gconf/gconf.xml.defaults/schemas/apps - @${MKDIR} ${PREFIX}/etc/gconf/schemas + @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff --git a/devel/gconf2/distinfo b/devel/gconf2/distinfo index bc16309ebbcc..a49004abc172 100644 --- a/devel/gconf2/distinfo +++ b/devel/gconf2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/GConf-2.4.0.1.tar.bz2) = 2f7548d0bad24d7c4beba54d0ec98a20 -SIZE (gnome2/GConf-2.4.0.1.tar.bz2) = 1288876 +MD5 (gnome2/GConf-2.6.0.tar.bz2) = 241ca25941e5bfa0f71725c30e17ab6e +SIZE (gnome2/GConf-2.6.0.tar.bz2) = 1428714 diff --git a/devel/gconf2/files/patch-configure b/devel/gconf2/files/patch-configure deleted file mode 100644 index b41b752d81f0..000000000000 --- a/devel/gconf2/files/patch-configure +++ /dev/null @@ -1,10 +0,0 @@ ---- 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" -+$ac_aux_dir/ltconfig $LIBTOOL_DEPS - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' diff --git a/devel/gconf2/pkg-descr b/devel/gconf2/pkg-descr index 0658ef70fa28..010cc810ef32 100644 --- a/devel/gconf2/pkg-descr +++ b/devel/gconf2/pkg-descr @@ -1,22 +1,18 @@ -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. +GConf extends the concept of a configuration registry. It provides +a simple way for applications and administrators to store data; +often GConf is used to store preferences for applications. -Here are some of the features of GConf: +Some of the features of GConf are: +GConf provides: - * Replaceable backend architecture. + * Documentation for each configuration key, so that administrators + can better modify the value. - * Configuration key documentation. Applications can install documentation - along with their configuration data, explaining the possible settings and - the effect of each configuration key. + * Notifications to interested applications when configuration data + is changed. The notification service works across networks, + affecting all login sessions for a single user. - * 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. + * Proper locking so that configuration data doesn't get corrupted + when accessed by multiple applications at the same time. WWW: http://www.gnome.org/projects/gconf/ diff --git a/devel/gconf2/pkg-install b/devel/gconf2/pkg-install new file mode 100644 index 000000000000..13898d569f3a --- /dev/null +++ b/devel/gconf2/pkg-install @@ -0,0 +1,16 @@ +#!/bin/sh + +PATH=/bin:/usr/bin:/usr/sbin + +case $2 in +POST-INSTALL) + dirs="etc/gconf/gconf.xml.defaults/apps \ + etc/gconf/gconf.xml.defaults/schemas/apps \ + etc/gconf/schemas" + for i in ${dirs}; do + mkdir -p ${PKG_PREFIX}/${i} + done + ;; +esac + +exit 0 diff --git a/devel/gconf2/pkg-plist b/devel/gconf2/pkg-plist index cc70f2842c6a..adf99d563086 100644 --- a/devel/gconf2/pkg-plist +++ b/devel/gconf2/pkg-plist @@ -1,3 +1,4 @@ +bin/gconf-merge-tree bin/gconftool-2 etc/gconf/2/path include/gconf/2/gconf/gconf-changeset.h @@ -9,6 +10,7 @@ include/gconf/2/gconf/gconf-listeners.h include/gconf/2/gconf/gconf-schema.h include/gconf/2/gconf/gconf-value.h include/gconf/2/gconf/gconf.h +lib/GConf/2/libgconfbackend-oldxml.so lib/GConf/2/libgconfbackend-xml.so lib/libgconf-2.a lib/libgconf-2.so @@ -17,6 +19,41 @@ libdata/pkgconfig/gconf-2.0.pc libexec/gconf-sanity-check-2 libexec/gconfd-2 share/aclocal/gconf-2.m4 +share/doc/gconf/GConfClient.html +share/doc/gconf/ch01.html +share/doc/gconf/ch01s02.html +share/doc/gconf/ch02.html +share/doc/gconf/ch02s02.html +share/doc/gconf/ch02s03.html +share/doc/gconf/ch02s04.html +share/doc/gconf/ch06.html +share/doc/gconf/ch06s02.html +share/doc/gconf/ch06s03.html +share/doc/gconf/ch07.html +share/doc/gconf/conventions.html +share/doc/gconf/gconf-client-reference.html +share/doc/gconf/gconf-client.html +share/doc/gconf/gconf-gconf-backend.html +share/doc/gconf/gconf-gconf-changeset.html +share/doc/gconf/gconf-gconf-engine.html +share/doc/gconf/gconf-gconf-error.html +share/doc/gconf/gconf-gconf-internals.html +share/doc/gconf/gconf-gconf-listeners.html +share/doc/gconf/gconf-gconf-locale.html +share/doc/gconf/gconf-gconf-schema.html +share/doc/gconf/gconf-gconf-sources.html +share/doc/gconf/gconf-gconf-value.html +share/doc/gconf/gconf-gconf.html +share/doc/gconf/gconf-internals-reference.html +share/doc/gconf/gconf-reference.html +share/doc/gconf/gconf.devhelp +share/doc/gconf/gconftool.html +share/doc/gconf/home.png +share/doc/gconf/index.html +share/doc/gconf/index.sgml +share/doc/gconf/left.png +share/doc/gconf/right.png +share/doc/gconf/up.png share/locale/am/LC_MESSAGES/GConf2.mo share/locale/ar/LC_MESSAGES/GConf2.mo share/locale/az/LC_MESSAGES/GConf2.mo @@ -29,6 +66,7 @@ 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 +share/locale/en_GB/LC_MESSAGES/GConf2.mo share/locale/es/LC_MESSAGES/GConf2.mo share/locale/eu/LC_MESSAGES/GConf2.mo share/locale/fa/LC_MESSAGES/GConf2.mo @@ -37,11 +75,13 @@ share/locale/fr/LC_MESSAGES/GConf2.mo share/locale/ga/LC_MESSAGES/GConf2.mo share/locale/gl/LC_MESSAGES/GConf2.mo share/locale/hi/LC_MESSAGES/GConf2.mo +share/locale/hr/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 +share/locale/lt/LC_MESSAGES/GConf2.mo share/locale/lv/LC_MESSAGES/GConf2.mo share/locale/mk/LC_MESSAGES/GConf2.mo share/locale/ml/LC_MESSAGES/GConf2.mo @@ -61,6 +101,7 @@ 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 +share/locale/ta/LC_MESSAGES/GConf2.mo share/locale/tr/LC_MESSAGES/GConf2.mo share/locale/uk/LC_MESSAGES/GConf2.mo share/locale/vi/LC_MESSAGES/GConf2.mo @@ -68,8 +109,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/doc/gconf @dirrm share/sgml/gconf +@dirrm share/doc/gconf @dirrm lib/GConf/2 @dirrm include/gconf/2/gconf @dirrm include/gconf/2 diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index 398371d2fb96..0806087eb929 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -6,11 +6,10 @@ # PORTNAME= glib -PORTVERSION= 2.2.3 -PORTREVISION= 1 +PORTVERSION= 2.4.0 CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/2.2,} \ - ftp://ftp.gtk.org/pub/gtk/v2.2/ \ +MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/2.4,} \ + ftp://ftp.gtk.org/pub/gtk/v2.3/ \ ftp://ftp.gimp.org/pub/%SUBDIR%/ \ ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \ http://www.ameth.org/gimp/%SUBDIR%/ \ @@ -25,17 +24,31 @@ NO_LATEST_LINK= yes USE_BZIP2= yes USE_GETTEXT= yes -USE_LIBTOOL_VER= 13 +USE_LIBTOOL_VER=13 +USE_REINPLACE= yes INSTALLS_SHLIB= yes USE_GNOME= gnomehack gnometarget pkgconfig USE_GMAKE= yes USE_PERL5= yes -CONFIGURE_ARGS= --enable-static --with-libiconv=gnu +CONFIGURE_ARGS= --enable-static --with-libiconv=gnu \ + --disable-gtk-doc --with-html-dir=${PREFIX}/share/doc \ + --disable-man --without-xml-catalog CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -lintl" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" -MAN1= glib-genmarshal.1 glib-mkenums.1 +pre-everything:: + @${ECHO_CMD} '******************************************' + @${ECHO_CMD} + @${ECHO_CMD} If you have not updated your GNOME ports in the manner outlined in + @${ECHO_CMD} http://www.FreeBSD.org/gnome/docs/develfaq.html + @${ECHO_CMD} then you should abort this build immediately and follow the directions + @${ECHO_CMD} outlined in that document. + @${ECHO_CMD} + @${ECHO_CMD} Failure to follow the above directions will result in everything + @${ECHO_CMD} GNOME-related breaking. + @${ECHO_CMD} + @${ECHO_CMD} '******************************************' .include <bsd.port.mk> diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo index dc973c4e09b1..9ee62b116c18 100644 --- a/devel/glib20/distinfo +++ b/devel/glib20/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/glib-2.2.3.tar.bz2) = aa214a10d873b68ddd67cd9de2ccae55 -SIZE (gnome2/glib-2.2.3.tar.bz2) = 1636987 +MD5 (gnome2/glib-2.4.0.tar.bz2) = 0f5f4896782ec7ab6ea8c7c1d9958114 +SIZE (gnome2/glib-2.4.0.tar.bz2) = 2034272 diff --git a/devel/glib20/files/patch-ah b/devel/glib20/files/patch-ah index afb4544d268b..c339b76e2477 100644 --- a/devel/glib20/files/patch-ah +++ b/devel/glib20/files/patch-ah @@ -1,11 +1,11 @@ ---- docs/reference/Makefile.in 2000/11/20 09:49:25 1.1 -+++ docs/reference/Makefile.in 2000/11/20 09:50:55 -@@ -106,7 +106,7 @@ - STRIP_END = @STRIP_END@ - VERSION = @VERSION@ - +--- docs/reference/Makefile.in.orig Fri Oct 24 18:05:32 2003 ++++ docs/reference/Makefile.in Fri Oct 24 18:06:00 2003 +@@ -226,7 +226,7 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ -SUBDIRS = glib gobject +SUBDIRS = #glib gobject + subdir = docs/reference mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../config.h - CONFIG_CLEAN_FILES = + CONFIG_HEADER = $(top_builddir)/config.h diff --git a/devel/glib20/files/patch-glib::libcharset::Makefile.in b/devel/glib20/files/patch-glib::libcharset::Makefile.in index 0ef01e926f44..2d0f82ab2263 100644 --- a/devel/glib20/files/patch-glib::libcharset::Makefile.in +++ b/devel/glib20/files/patch-glib::libcharset::Makefile.in @@ -1,18 +1,15 @@ - -$FreeBSD$ - ---- glib/libcharset/Makefile.in.orig Tue Jun 4 01:47:05 2002 -+++ glib/libcharset/Makefile.in Tue Jun 4 03:41:15 2002 -@@ -148,7 +148,7 @@ - ms_librarian = @ms_librarian@ +--- glib/libcharset/Makefile.in.orig Fri Oct 24 18:07:07 2003 ++++ glib/libcharset/Makefile.in Fri Oct 24 18:09:20 2003 +@@ -228,7 +228,7 @@ + target_alias = @target_alias@ INCLUDES = \ - -DLIBDIR=\"$(libdir)\" -+ -DLIBDIR=\"$(prefix)/libdata\" ++ -DLIBDIR=\"$(prefix)/libdata\" noinst_LTLIBRARIES = libcharset.la -@@ -171,8 +171,8 @@ +@@ -249,8 +249,8 @@ make-patch.sh @@ -23,12 +20,12 @@ $FreeBSD$ SUFFIXES = .sed .sin -@@ -326,7 +326,7 @@ - check: check-am - installcheck-am: - installcheck: installcheck-am +@@ -492,7 +492,7 @@ + + install-data-am: + -install-exec-am: install-exec-local +install-exec-am: # install-exec-local - install-exec: install-exec-am - install-data-am: + install-info: install-info-am + diff --git a/devel/glib20/pkg-descr b/devel/glib20/pkg-descr index d762ed2f440d..3b305903069d 100644 --- a/devel/glib20/pkg-descr +++ b/devel/glib20/pkg-descr @@ -1,13 +1,5 @@ -This is GLib version 2.0. GLib, is a library which includes support -routines for C such as lists, trees, hashes, memory allocation, and -many other things. +GLib provides a simple, abstract, and highly portable set of C support +routines such as lists, trees, hashes, memory allocation, and much, much +more. It is a foundation for writing portable applications. WWW: http://www.gtk.org/ -ftp://ftp.gtk.org/pub/gtk - -A mailing list is located at gtk-list@redhat.com for discussion. - -GLib-2.0 is a stable release that forms the basis of GTK+-2.0. - -- Vanilla -vanilla@FreeBSD.ORG diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist index 958f40c5aac4..fcaad2e8d4e3 100644 --- a/devel/glib20/pkg-plist +++ b/devel/glib20/pkg-plist @@ -7,6 +7,7 @@ include/glib-2.0/glib.h include/glib-2.0/glib/galloca.h include/glib-2.0/glib/garray.h include/glib-2.0/glib/gasyncqueue.h +include/glib-2.0/glib/gatomic.h include/glib-2.0/glib/gbacktrace.h include/glib-2.0/glib/gcache.h include/glib-2.0/glib/gcompletion.h @@ -18,6 +19,8 @@ include/glib-2.0/glib/gerror.h include/glib-2.0/glib/gfileutils.h include/glib-2.0/glib/ghash.h include/glib-2.0/glib/ghook.h +include/glib-2.0/glib/gi18n-lib.h +include/glib-2.0/glib/gi18n.h include/glib-2.0/glib/giochannel.h include/glib-2.0/glib/glist.h include/glib-2.0/glib/gmacros.h @@ -69,16 +72,16 @@ include/glib-2.0/gobject/gvaluecollector.h include/glib-2.0/gobject/gvaluetypes.h lib/libglib-2.0.a lib/libglib-2.0.so -lib/libglib-2.0.so.200 +lib/libglib-2.0.so.400 lib/libgmodule-2.0.a lib/libgmodule-2.0.so -lib/libgmodule-2.0.so.200 +lib/libgmodule-2.0.so.400 lib/libgobject-2.0.a lib/libgobject-2.0.so -lib/libgobject-2.0.so.200 +lib/libgobject-2.0.so.400 lib/libgthread-2.0.a lib/libgthread-2.0.so -lib/libgthread-2.0.so.200 +lib/libgthread-2.0.so.400 libdata/pkgconfig/glib-2.0.pc libdata/pkgconfig/gmodule-2.0.pc libdata/pkgconfig/gobject-2.0.pc @@ -87,6 +90,7 @@ share/aclocal/glib-2.0.m4 share/aclocal/glib-gettext.m4 share/glib-2.0/gettext/po/Makefile.in.in share/locale/am/LC_MESSAGES/glib20.mo +share/locale/ar/LC_MESSAGES/glib20.mo share/locale/az/LC_MESSAGES/glib20.mo share/locale/be/LC_MESSAGES/glib20.mo share/locale/bg/LC_MESSAGES/glib20.mo @@ -104,23 +108,25 @@ share/locale/eu/LC_MESSAGES/glib20.mo share/locale/fa/LC_MESSAGES/glib20.mo share/locale/fi/LC_MESSAGES/glib20.mo share/locale/fr/LC_MESSAGES/glib20.mo +share/locale/ga/LC_MESSAGES/glib20.mo share/locale/gl/LC_MESSAGES/glib20.mo share/locale/he/LC_MESSAGES/glib20.mo share/locale/hi/LC_MESSAGES/glib20.mo +share/locale/hr/LC_MESSAGES/glib20.mo share/locale/id/LC_MESSAGES/glib20.mo share/locale/is/LC_MESSAGES/glib20.mo share/locale/it/LC_MESSAGES/glib20.mo share/locale/ja/LC_MESSAGES/glib20.mo share/locale/ko/LC_MESSAGES/glib20.mo -share/locale/li/LC_MESSAGES/glib20.mo +share/locale/lt/LC_MESSAGES/glib20.mo share/locale/lv/LC_MESSAGES/glib20.mo share/locale/mk/LC_MESSAGES/glib20.mo -share/locale/ml/LC_MESSAGES/glib20.mo share/locale/mn/LC_MESSAGES/glib20.mo share/locale/ms/LC_MESSAGES/glib20.mo share/locale/nl/LC_MESSAGES/glib20.mo share/locale/nn/LC_MESSAGES/glib20.mo share/locale/no/LC_MESSAGES/glib20.mo +share/locale/pa/LC_MESSAGES/glib20.mo share/locale/pl/LC_MESSAGES/glib20.mo share/locale/pt/LC_MESSAGES/glib20.mo share/locale/pt_BR/LC_MESSAGES/glib20.mo @@ -131,6 +137,7 @@ share/locale/sl/LC_MESSAGES/glib20.mo share/locale/sq/LC_MESSAGES/glib20.mo share/locale/sr/LC_MESSAGES/glib20.mo share/locale/sr@Latn/LC_MESSAGES/glib20.mo +share/locale/sr@ije/LC_MESSAGES/glib20.mo share/locale/sv/LC_MESSAGES/glib20.mo share/locale/ta/LC_MESSAGES/glib20.mo share/locale/tr/LC_MESSAGES/glib20.mo diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile index 8d0347ede42d..bcaf1722a6b7 100644 --- a/devel/gnome-vfs/Makefile +++ b/devel/gnome-vfs/Makefile @@ -6,38 +6,58 @@ # PORTNAME= gnomevfs2 -PORTVERSION= 2.4.3 +PORTVERSION= 2.6.0 +PORTREVISION= 1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-vfs/2.4 +MASTER_SITE_SUBDIR= sources/gnome-vfs/2.6 DISTNAME= gnome-vfs-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME Virtual File System +RUN_DEPENDS= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info + USE_BZIP2= yes USE_GMAKE= yes USE_X_PREFIX= yes -USE_GNOME= gnomeprefix gnomehack intlhack gnomehier gnomemimedata gconf2 libbonobo +USE_GNOME= gnomeprefix gnomehack gnomehier intlhack gnomemimedata gconf2 \ + libbonobo USE_REINPLACE= yes -USE_LIBTOOL_VER= 13 +GNU_CONFIGURE= yes INSTALLS_SHLIB= yes +CONFIGURE_ARGS= --disable-openssl \ + --disable-gnutls \ + --with-gtk=no CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lintl" \ + LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ BSD_PTHREAD_LIBS=${PTHREAD_LIBS} +OPTIONS= KDE_MENUS "Integrated KDE menu picks" on + +.include <bsd.port.pre.mk> + +.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD) +.undef WITHOUT_CDPARANOIA +.undef WITHOUT_SAMBA +WITH_CDPARANOIA= yes +WITH_SAMBA= yes +.endif + .if !defined(WITHOUT_KDE_MENUS) EXTRA_PATCHES= ${FILESDIR}/modules_vfolder_applications-all-users.vfolder-info.in +PLIST_SUB+= KDEMENUS="" +.else +PLIST_SUB+= KDEMENUS="@comment " .endif -.include <bsd.port.pre.mk> - .if exists(${LOCALBASE}/lib/libcdda_paranoia.a) WITH_CDPARANOIA= yes .endif -.if exists(${LOCALBASE}/lib/libfam.a) -WITH_FAM= yes + +.if exists(${LOCALBASE}/lib/libsmbclient.so) +WITH_SAMBA= yes .endif .if defined(WITH_CDPARANOIA) @@ -46,16 +66,29 @@ PLIST_SUB+= CDPARANOIA="" .else PLIST_SUB+= CDPARANOIA="@comment " .endif -.if defined(WITH_FAM) + +.if exists(${LOCALBASE}/lib/libfam) || !defined(WITHOUT_FAM) LIB_DEPENDS+= fam.0:${PORTSDIR}/devel/fam .endif +.if defined(WITH_SAMBA) +LIB_DEPENDS+= smbclient.0:${PORTSDIR}/net/samba-libsmbclient +PLIST_SUB+= SAMBA="" +.else +PLIST_SUB+= SAMBA="@comment " +.endif + post-patch: @${FIND} ${WRKSRC} -name "*info.in" | ${XARGS} ${REINPLACE_CMD} -e \ 's|\@datadir\@/gnome|\@datadir\@|g' - @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/libgnomevfs/Makefile.in \ + ${WRKSRC}/libgnomevfs/xdgmime.c \ ${WRKSRC}/modules/vfolder/applications-all-users.vfolder-info.in +.if !defined(WITHOUT_KDE_MENUS) + @${SED} -e 's|/usr/local|${LOCALBASE}|g' \ + < ${FILESDIR}/KDE.directory > ${WRKSRC}/KDE.directory +.endif @${REINPLACE_CMD} -e "/^SUBDIRS =/s/test//" \ ${WRKSRC}/Makefile.in @@ -65,4 +98,10 @@ pre-configure: ${FALSE}; \ fi +post-install: + @${MKDIR} ${PREFIX}/share/gnome/vfolders +.if !defined(WITHOUT_KDE_MENUS) + @${INSTALL_DATA} ${WRKSRC}/KDE.directory ${PREFIX}/share/gnome/vfolders +.endif + .include <bsd.port.post.mk> diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo index 0c0b4d2460cf..31ff3374ec64 100644 --- a/devel/gnome-vfs/distinfo +++ b/devel/gnome-vfs/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-vfs-2.4.3.tar.bz2) = d217b3c241852ccb9e9147b63f8eb6d4 -SIZE (gnome2/gnome-vfs-2.4.3.tar.bz2) = 1072724 +MD5 (gnome2/gnome-vfs-2.6.0.tar.bz2) = 4d0323cf015dd006210fcacd4bfe7420 +SIZE (gnome2/gnome-vfs-2.6.0.tar.bz2) = 1431274 diff --git a/devel/gnome-vfs/files/KDE.directory b/devel/gnome-vfs/files/KDE.directory new file mode 100644 index 000000000000..032126bb99db --- /dev/null +++ b/devel/gnome-vfs/files/KDE.directory @@ -0,0 +1,5 @@ +[Desktop Entry] +Name=KDE +Comment=Some comment about KDE menu +Icon=/usr/local/share/icons/kdeclassic/48x48/apps/kmenu.png +Type=Directory diff --git a/devel/gnome-vfs/files/modules_vfolder_applications-all-users.vfolder-info.in b/devel/gnome-vfs/files/modules_vfolder_applications-all-users.vfolder-info.in index 13ce7838798d..120a8906411f 100644 --- a/devel/gnome-vfs/files/modules_vfolder_applications-all-users.vfolder-info.in +++ b/devel/gnome-vfs/files/modules_vfolder_applications-all-users.vfolder-info.in @@ -1,11 +1,285 @@ ---- modules/vfolder/applications-all-users.vfolder-info.in.orig Sat Oct 18 19:04:37 2003 -+++ modules/vfolder/applications-all-users.vfolder-info.in Sat Oct 18 19:05:18 2003 -@@ -19,7 +19,7 @@ +--- modules/vfolder/applications-all-users.vfolder-info.in.orig Fri Oct 17 10:11:22 2003 ++++ modules/vfolder/applications-all-users.vfolder-info.in Thu Feb 12 15:15:40 2004 +@@ -19,7 +19,14 @@ <MergeDir>/usr/share/gnome/apps/</MergeDir> <!-- Merge dirs optional --> - <MergeDir>/etc/X11/applnk/</MergeDir> -+ <MergeDir>%%LOCALBASE%%/share/applnk/</MergeDir> ++ <MergeDir>/usr/local/share/applnk/Toys/</MergeDir> ++ <MergeDir>/usr/local/share/applnk/Utilities/</MergeDir> ++ <MergeDir>/usr/local/share/applnk/Internet/</MergeDir> ++ <MergeDir>/usr/local/share/applnk/Office/</MergeDir> ++ <MergeDir>/usr/local/share/applnk/Applications/</MergeDir> ++ <MergeDir>/usr/local/share/applnk/Development/</MergeDir> ++ <MergeDir>/usr/local/share/applnk/Games/</MergeDir> ++ <MergeDir>/usr/local/share/applnk/Multimedia/</MergeDir> <!-- Root folder --> <Folder> +@@ -34,10 +41,12 @@ + <Query> + <And> + <Keyword>Core</Keyword> +- <!-- FIXME: Seth, why would this be wanted? --> +- <!--<Not> +- <Keyword>Merged</Keyword> +- </Not>--> ++ <Not> ++ <Or> ++ <Keyword>Qt</Keyword> ++ <Keyword>KDE</Keyword> ++ </Or> ++ </Not> + </And> + </Query> + +@@ -47,6 +56,12 @@ + <Desktop>Accessories.directory</Desktop> + <Query> + <And> ++ <Not> ++ <Or> ++ <Keyword>Qt</Keyword> ++ <Keyword>KDE</Keyword> ++ </Or> ++ </Not> + <Keyword>Application</Keyword> + <Keyword>Utility</Keyword> + <Not> +@@ -63,6 +78,12 @@ + <Desktop>Accessibility.directory</Desktop> + <Query> + <And> ++ <Not> ++ <Or> ++ <Keyword>Qt</Keyword> ++ <Keyword>KDE</Keyword> ++ </Or> ++ </Not> + <Keyword>Application</Keyword> + <Keyword>Accessibility</Keyword> + <Not> +@@ -80,6 +101,12 @@ + <OnlyUnallocated/> + <Query> + <And> ++ <Not> ++ <Or> ++ <Keyword>Qt</Keyword> ++ <Keyword>KDE</Keyword> ++ </Or> ++ </Not> + <Keyword>Application</Keyword> + <Not> + <Keyword>Settings</Keyword> +@@ -101,6 +128,12 @@ + <Desktop>Development.directory</Desktop> + <Query> + <And> ++ <Not> ++ <Or> ++ <Keyword>Qt</Keyword> ++ <Keyword>KDE</Keyword> ++ </Or> ++ </Not> + <Keyword>Application</Keyword> + <Keyword>Development</Keyword> + </And> +@@ -114,6 +147,12 @@ + <Desktop>Games.directory</Desktop> + <Query> + <And> ++ <Not> ++ <Or> ++ <Keyword>Qt</Keyword> ++ <Keyword>KDE</Keyword> ++ </Or> ++ </Not> + <Keyword>Application</Keyword> + <Keyword>Game</Keyword> + </And> +@@ -127,6 +166,12 @@ + <Desktop>Graphics.directory</Desktop> + <Query> + <And> ++ <Not> ++ <Or> ++ <Keyword>Qt</Keyword> ++ <Keyword>KDE</Keyword> ++ </Or> ++ </Not> + <Keyword>Application</Keyword> + <Keyword>Graphics</Keyword> + </And> +@@ -140,6 +185,12 @@ + <Desktop>Internet.directory</Desktop> + <Query> + <And> ++ <Not> ++ <Or> ++ <Keyword>Qt</Keyword> ++ <Keyword>KDE</Keyword> ++ </Or> ++ </Not> + <Keyword>Application</Keyword> + <Keyword>Network</Keyword> + </And> +@@ -153,6 +204,12 @@ + <Desktop>Multimedia.directory</Desktop> + <Query> + <And> ++ <Not> ++ <Or> ++ <Keyword>Qt</Keyword> ++ <Keyword>KDE</Keyword> ++ </Or> ++ </Not> + <Keyword>Application</Keyword> + <Keyword>AudioVideo</Keyword> + </And> +@@ -170,6 +227,12 @@ + <Desktop>Office.directory</Desktop> + <Query> + <And> ++ <Not> ++ <Or> ++ <Keyword>Qt</Keyword> ++ <Keyword>KDE</Keyword> ++ </Or> ++ </Not> + <Keyword>Application</Keyword> + <Or> + <Keyword>Office</Keyword> +@@ -195,6 +258,12 @@ + <Desktop>System.directory</Desktop> + <Query> + <And> ++ <Not> ++ <Or> ++ <Keyword>Qt</Keyword> ++ <Keyword>KDE</Keyword> ++ </Or> ++ </Not> + <Keyword>Application</Keyword> + <Not> + <Keyword>Settings</Keyword> +@@ -204,6 +273,118 @@ + </Query> + <DontShowIfEmpty/> + </Folder> +- ++ ++ <!-- KDE --> ++ <Folder> ++ <Name>KDE</Name> ++ <Desktop>KDE.directory</Desktop> ++ ++ <!-- KAccessories --> ++ <Folder> ++ <Name>Accessories</Name> ++ <Desktop>Accessories.directory</Desktop> ++ <Query> ++ <And> ++ <Or> ++ <Keyword>Qt</Keyword> ++ <Keyword>KDE</Keyword> ++ </Or> ++ <Keyword>Utility</Keyword> ++ </And> ++ </Query> ++ <DontShowIfEmpty/> ++ </Folder> ++ ++ <!-- KDevelopment Tools --> ++ <Folder> ++ <Name>Programming</Name> ++ <Desktop>Development.directory</Desktop> ++ <Query> ++ <And> ++ <Or> ++ <Keyword>Qt</Keyword> ++ <Keyword>KDE</Keyword> ++ </Or> ++ <Keyword>Development</Keyword> ++ </And> ++ </Query> ++ <DontShowIfEmpty/> ++ </Folder> ++ ++ <!-- KGraphics --> ++ <Folder> ++ <Name>Graphics</Name> ++ <Desktop>Graphics.directory</Desktop> ++ <Query> ++ <And> ++ <Or> ++ <Keyword>Qt</Keyword> ++ <Keyword>KDE</Keyword> ++ </Or> ++ <Keyword>Graphics</Keyword> ++ </And> ++ </Query> ++ <DontShowIfEmpty/> ++ </Folder> ++ ++ <!-- KInternet --> ++ <Folder> ++ <Name>Internet</Name> ++ <Desktop>Internet.directory</Desktop> ++ <Query> ++ <And> ++ <Or> ++ <Keyword>Qt</Keyword> ++ <Keyword>KDE</Keyword> ++ </Or> ++ <Keyword>Network</Keyword> ++ </And> ++ </Query> ++ ++ <Include>/usr/local/share/applnk/konqueror.desktop</Include> ++ ++ <DontShowIfEmpty/> ++ </Folder> ++ ++ <!-- KMultimedia --> ++ <Folder> ++ <Name>Multimedia</Name> ++ <Desktop>Multimedia.directory</Desktop> ++ <Query> ++ <And> ++ <Or> ++ <Keyword>Qt</Keyword> ++ <Keyword>KDE</Keyword> ++ </Or> ++ <Keyword>AudioVideo</Keyword> ++ </And> ++ </Query> ++ <DontShowIfEmpty/> ++ </Folder> ++ ++ <!-- KOffice --> ++ <Folder> ++ <Name>Office</Name> ++ <Desktop>Office.directory</Desktop> ++ <Query> ++ <And> ++ <Or> ++ <Keyword>Qt</Keyword> ++ <Keyword>KDE</Keyword> ++ </Or> ++ <Or> ++ <Keyword>Office</Keyword> ++ <Keyword>Spreadsheet</Keyword> ++ <Keyword>WordProcessor</Keyword> ++ <Keyword>Calendar</Keyword> ++ <Keyword>ProjectManagement</Keyword> ++ </Or> ++ </And> ++ </Query> ++ <DontShowIfEmpty/> ++ </Folder> ++ <DontShowIfEmpty/> ++ </Folder> <!-- KDE --> ++ + </Folder> + </VFolderInfo> diff --git a/devel/gnome-vfs/files/patch-aa b/devel/gnome-vfs/files/patch-aa index 303b8e8c5b40..8273ab3fee00 100644 --- a/devel/gnome-vfs/files/patch-aa +++ b/devel/gnome-vfs/files/patch-aa @@ -1,62 +1,31 @@ ---- configure.orig Tue Mar 9 14:55:35 2004 -+++ configure Tue Mar 9 16:41:53 2004 -@@ -19711,6 +19711,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' -@@ -24792,6 +24793,7 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -+#include <sys/param.h> - #ifdef HAVE_SYS_VFS_H - #include <sys/vfs.h> - #endif -@@ -24844,6 +24846,7 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -+#include <sys/param.h> - #ifdef HAVE_SYS_VFS_H - #include <sys/vfs.h> - #endif -@@ -24918,6 +24921,7 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -+#include <sys/param.h> - #ifdef HAVE_SYS_VFS_H - #include <sys/vfs.h> - #endif -@@ -24970,6 +24974,7 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -+#include <sys/param.h> - #ifdef HAVE_SYS_VFS_H - #include <sys/vfs.h> - #endif -@@ -25044,6 +25049,7 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -+#include <sys/param.h> - #include <unistd.h> - #ifdef HAVE_SYS_VFS_H - #include <sys/vfs.h> -@@ -25104,6 +25110,7 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - #include <unistd.h> -+#include <sys/param.h> - #ifdef HAVE_SYS_VFS_H - #include <sys/vfs.h> - #endif -@@ -26099,8 +26106,8 @@ +--- configure.orig Sun Feb 8 16:04:02 2004 ++++ configure Sun Feb 8 16:04:36 2004 +@@ -22816,6 +22816,8 @@ + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else ++ ac_check_lib_save_LIBS=$LIBS ++ LIBS="-lintl $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -22898,6 +22900,7 @@ + fi + rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +@@ -22905,6 +22908,7 @@ + cat >>confdefs.h <<_ACEOF + #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF ++ LIBS="-lintl $LIBS" + have_ngettext=yes + fi + done +@@ -26396,8 +26400,8 @@ done fi @@ -67,7 +36,7 @@ if test "${ac_cv_lib_bz2_bzCompressInit+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -26119,11 +26126,11 @@ +@@ -26416,11 +26420,11 @@ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ @@ -81,28 +50,16 @@ ; return 0; } -@@ -26917,7 +26924,7 @@ +@@ -27547,7 +27551,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else - LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl" -+ LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcryptofoo -ldl" ++ LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -26982,9 +26989,9 @@ - - msg_openssl="yes" - if test x$with_openssl_libs != x/usr/lib; then -- OPENSSL_LIBS="-L$with_openssl_libs -lssl -lcrypto" -+ OPENSSL_LIBS="-L$with_openssl_libs -lssl -lcryptofoo" - else -- OPENSSL_LIBS="-lssl -lcrypto" -+ OPENSSL_LIBS="-lssl -lcryptofoo" - fi - - -@@ -29285,6 +29292,7 @@ +@@ -30543,6 +30547,7 @@ s,@ORBIT_IDL@,$ORBIT_IDL,;t t s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t diff --git a/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in b/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in index 764a5a6f218a..063376961823 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 Mon Oct 13 10:31:12 2003 -+++ libgnomevfs/Makefile.in Mon Oct 13 10:31:37 2003 -@@ -234,7 +234,7 @@ +--- libgnomevfs/Makefile.in.orig Wed Oct 22 01:11:11 2003 ++++ libgnomevfs/Makefile.in Wed Oct 22 01:12:00 2003 +@@ -429,7 +429,7 @@ # CLEANFILES = $(BUILT_SOURCES) # Platform specific includes -libgnomevfsplatformincludedir = $(libdir)/gnome-vfs-2.0/include +libgnomevfsplatformincludedir = $(includedir)/gnome-vfs-2.0/include - 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-unix-mounts.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c new file mode 100644 index 000000000000..21912f46e0ec --- /dev/null +++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c @@ -0,0 +1,13 @@ +--- libgnomevfs/gnome-vfs-unix-mounts.c.orig Mon Mar 8 22:29:57 2004 ++++ libgnomevfs/gnome-vfs-unix-mounts.c Mon Mar 8 22:33:35 2004 +@@ -857,8 +857,9 @@ + + #ifdef HAVE_SYS_SYSCTL_H + if (usermnt != 0) { ++ uid_t uid = getuid (); + if (stat (fstab->fs_file, &sb) == 0) { +- if (sb.st_uid != 0) { ++ if (uid == 0 || sb.st_uid == uid) { + mount_entry->is_user_mountable = TRUE; + } + } 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 8f8f15be3918..ab74eb9324fd 100644 --- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c +++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c @@ -1,14 +1,26 @@ ---- 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> -+#include <sys/param.h> - #include <sys/stat.h> - #include <sys/types.h> - #include <unistd.h> -@@ -840,7 +841,7 @@ +--- libgnomevfs/gnome-vfs-utils.c.orig Sat Mar 13 18:57:02 2004 ++++ libgnomevfs/gnome-vfs-utils.c Sat Mar 13 18:51:21 2004 +@@ -797,8 +797,10 @@ + + #if HAVE_STATVFS + statfs_result = statvfs (unescaped_path, &statfs_buffer); ++#define statfs_bsize f_frsize + #else + statfs_result = statfs (unescaped_path, &statfs_buffer); ++#define statfs_bsize f_bsize + #endif + + if (statfs_result != 0) { +@@ -831,7 +833,7 @@ + } + } + +- block_size = statfs_buffer.f_bsize; ++ block_size = statfs_buffer.statfs_bsize; + free_blocks = statfs_buffer.f_bavail; + + *size = block_size * free_blocks; +@@ -859,7 +861,7 @@ paths = g_strsplit (gnome_var, ":", 0); for (temp_paths = paths; *temp_paths != NULL; temp_paths++) { diff --git a/devel/gnome-vfs/files/patch-ltmain.sh b/devel/gnome-vfs/files/patch-ltmain.sh new file mode 100644 index 000000000000..58384ee38d2e --- /dev/null +++ b/devel/gnome-vfs/files/patch-ltmain.sh @@ -0,0 +1,51 @@ +--- ltmain.sh.orig Sat Dec 6 14:47:45 2003 ++++ ltmain.sh Tue Dec 9 14:09:01 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/gnome-vfs/files/patch-modules_cdda-method.c b/devel/gnome-vfs/files/patch-modules_cdda-method.c deleted file mode 100644 index 97250842b916..000000000000 --- a/devel/gnome-vfs/files/patch-modules_cdda-method.c +++ /dev/null @@ -1,26 +0,0 @@ ---- modules/cdda-method.c.orig Tue Jan 27 06:19:01 2004 -+++ modules/cdda-method.c Wed Jan 28 00:21:01 2004 -@@ -623,7 +623,11 @@ - /* Check and see if we already have opened and stashed this drive */ - if (!use_base) { - if (global_context != NULL) { -+#ifdef Linux - if (strcmp (drive->cdda_device_name, global_context->drive->cdda_device_name) == 0) { -+#elif defined(__FreeBSD__) -+ if (strcmp (drive->dev->device_path, global_context->drive->dev->device_path) == 0) { -+#endif - use_cache = TRUE; - cdda_close (drive); - gnome_vfs_file_info_copy (file_info, global_context->file_info); -@@ -709,7 +713,11 @@ - if (!use_base) { - /* Check for cache */ - if (global_context != NULL) { -+#ifdef Linux - if (strcmp (drive->cdda_device_name, global_context->drive->cdda_device_name) != 0) { -+#elif defined(__FreeBSD__) -+ if (strcmp (drive->dev->device_path, global_context->drive->dev->device_path) != 0) { -+#endif - /* Clear old cache */ - cdda_context_free (global_context); - global_context = cdda_context_new (drive, uri); diff --git a/devel/gnome-vfs/files/patch-modules_pty-open.c b/devel/gnome-vfs/files/patch-modules_pty-open.c new file mode 100644 index 000000000000..2ee23b086f16 --- /dev/null +++ b/devel/gnome-vfs/files/patch-modules_pty-open.c @@ -0,0 +1,13 @@ +--- modules/pty-open.c.orig Sun Apr 4 12:58:08 2004 ++++ modules/pty-open.c Sun Apr 4 12:59:30 2004 +@@ -613,6 +613,10 @@ + if ((fd == -1) && (errno == ENOENT)) { + fd = open("/dev/ptc", O_RDWR | O_NOCTTY); /* AIX */ + } ++ ++ if ((fd == -1) && (errno == ENOENT)) { ++ fd = posix_openpt(O_RDWR); ++ } + #endif + /* Set it to blocking. */ + flags = fcntl(fd, F_GETFL); diff --git a/devel/gnome-vfs/files/patch-modules_sftp-method.c b/devel/gnome-vfs/files/patch-modules_sftp-method.c new file mode 100644 index 000000000000..bd08ae0b45f1 --- /dev/null +++ b/devel/gnome-vfs/files/patch-modules_sftp-method.c @@ -0,0 +1,26 @@ +--- modules/sftp-method.c.orig Mon Mar 8 13:52:39 2004 ++++ modules/sftp-method.c Sun Apr 4 13:50:21 2004 +@@ -175,6 +175,15 @@ + + typedef ssize_t (*read_write_fn) (int, void *, size_t); + ++#ifndef TEMP_FAILURE_RETRY ++#define TEMP_FAILURE_RETRY(expression) \ ++ (__extension__ \ ++ ({ long int __result; \ ++ do __result = (long int) (expression); \ ++ while (__result == -1L && errno == EINTR); \ ++ __result; })) ++#endif ++ + static gsize + atomic_io (read_write_fn f, gint fd, gpointer buffer_in, gsize size) + { +@@ -1072,6 +1081,7 @@ + if (io_status == G_IO_STATUS_NORMAL) { + buffer[len] = 0; + if (g_str_has_suffix (buffer, "password: ") || ++ g_str_has_suffix (buffer, "Password:") || + g_str_has_prefix (buffer, "Enter passphrase for key")) { + if (invoke_full_auth (uri, done_auth, buffer, &password) && password != NULL) { + g_io_channel_write_chars (tty_channel, password, -1, &len, NULL); diff --git a/devel/gnome-vfs/files/patch-modules_ssh-method.c b/devel/gnome-vfs/files/patch-modules_ssh-method.c deleted file mode 100644 index 14b2cf886863..000000000000 --- a/devel/gnome-vfs/files/patch-modules_ssh-method.c +++ /dev/null @@ -1,10 +0,0 @@ ---- modules/ssh-method.c.orig Mon Jun 10 13:28:42 2002 -+++ modules/ssh-method.c Mon Jun 10 13:28:51 2002 -@@ -34,6 +34,7 @@ - #include <string.h> - #include <sys/types.h> - #include <sys/wait.h> -+#include <signal.h> - #include <unistd.h> - - typedef struct { diff --git a/devel/gnome-vfs/pkg-descr b/devel/gnome-vfs/pkg-descr index 81cfcd5dd856..03cbc07f6699 100644 --- a/devel/gnome-vfs/pkg-descr +++ b/devel/gnome-vfs/pkg-descr @@ -1,14 +1,7 @@ -This is the GNOME Virtual File System. - -GnomeVFS is a filesystem abstraction library allowing applications -plugable transparent access to a variety of "real" filesystems, from -WebDAV to digital cameras, to the local filesystem. It also contains a -number of other convenient file utilities such as a comphrehensive MIME -database / Application registry, and a copy engine. Use of GnomeVFS -ensures that an application or component will be usable by Nautilus or -other GnomeVFS applications for handling the display of data from -various URIs, as well. - -This is the GnomeVFS for the GNOME 2 architecture. +The GNOME Virtual File System allows applications and users to treat +any number of file system concepts as a part of the local filesystem. +With GnomeVFS, filesystems across the internet, on connected devices, +and in multiple formats are as simple to access (and write code for) +as any directory on the local machine. WWW: http://www.gnome.org/ diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist index 0d945ad47a0b..03548442eea8 100644 --- a/devel/gnome-vfs/pkg-plist +++ b/devel/gnome-vfs/pkg-plist @@ -3,27 +3,52 @@ 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/desktop/gnome/url-handlers/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/callto/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/ghelp/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/h323/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/http/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/https/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/info/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/mailto/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/man/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/trash/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/%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/desktop/gnome/url-handlers/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/callto/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/ghelp/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/h323/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/http/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/https/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/info/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/mailto/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/man/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/trash/%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/schemas/system/proxy/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/system/smb/%gconf.xml etc/gconf/gconf.xml.defaults/system/%gconf.xml etc/gconf/gconf.xml.defaults/system/http_proxy/%gconf.xml etc/gconf/gconf.xml.defaults/system/proxy/%gconf.xml +etc/gconf/gconf.xml.defaults/system/smb/%gconf.xml etc/gconf/schemas/desktop_default_applications.schemas +etc/gconf/schemas/desktop_gnome_url_handlers.schemas etc/gconf/schemas/system_http_proxy.schemas +etc/gconf/schemas/system_smb.schemas %%CDPARANOIA%%etc/gnome-vfs-2.0/modules/cdda-module.conf etc/gnome-vfs-2.0/modules/default-modules.conf +%%SAMBA%%etc/gnome-vfs-2.0/modules/smb-module.conf etc/gnome-vfs-2.0/vfolders/applications-all-users.vfolder-info etc/gnome-vfs-2.0/vfolders/favorites.vfolder-info etc/gnome-vfs-2.0/vfolders/network.vfolder-info @@ -37,6 +62,8 @@ include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-async-ops.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-cancellation.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-context.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-directory.h +include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-drive.h +include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-enum-types.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-info.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-size.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-find-directory.h @@ -54,6 +81,8 @@ include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-standard-callbacks.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-types.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-uri.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-utils.h +include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-volume-monitor.h +include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-volume.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-xfer.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-cancellable-ops.h @@ -72,12 +101,16 @@ include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-transform.h lib/bonobo/monikers/libmoniker_gnome_vfs_std.so lib/gnome-vfs-2.0/modules/libbzip2.so %%CDPARANOIA%%lib/gnome-vfs-2.0/modules/libcdda.so +lib/gnome-vfs-2.0/modules/libcomputer.so lib/gnome-vfs-2.0/modules/libextfs.so lib/gnome-vfs-2.0/modules/libfile.so lib/gnome-vfs-2.0/modules/libftp.so lib/gnome-vfs-2.0/modules/libgzip.so lib/gnome-vfs-2.0/modules/libhttp.so +lib/gnome-vfs-2.0/modules/libnetwork.so lib/gnome-vfs-2.0/modules/libnntp.so +lib/gnome-vfs-2.0/modules/libsftp.so +%%SAMBA%%lib/gnome-vfs-2.0/modules/libsmb.so lib/gnome-vfs-2.0/modules/libssh.so lib/gnome-vfs-2.0/modules/libtar.so lib/gnome-vfs-2.0/modules/libvfolder-desktop.so @@ -86,7 +119,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.400 +lib/libgnomevfs-2.so.600 lib/vfs/2.0/extfs/README lib/vfs/2.0/extfs/a lib/vfs/2.0/extfs/ar @@ -104,13 +137,16 @@ lib/vfs/2.0/extfs/tar lib/vfs/2.0/extfs/trpm lib/vfs/2.0/extfs/zip lib/vfs/2.0/extfs/zoo +libdata/bonobo/servers/GNOME_VFS_Daemon.server libdata/bonobo/servers/GNOME_VFS_Moniker_std.server libdata/pkgconfig/gnome-vfs-2.0.pc libdata/pkgconfig/gnome-vfs-module-2.0.pc +libexec/gnome-vfs-daemon share/doc/gnome-vfs-2.0/about.html share/doc/gnome-vfs-2.0/advanced-operations.html share/doc/gnome-vfs-2.0/ch08.html share/doc/gnome-vfs-2.0/data-types.html +share/doc/gnome-vfs-2.0/gnome-vfs-2.0.devhelp 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 @@ -150,10 +186,16 @@ share/doc/gnome-vfs-2.0/gnome-vfs-directory-operations.html share/doc/gnome-vfs-2.0/gnome-vfs-file-operations.html share/doc/gnome-vfs-2.0/gnome-vfs-first-steps.html share/doc/gnome-vfs-2.0/gnome-vfs-writing-modules.html +share/doc/gnome-vfs-2.0/home.png share/doc/gnome-vfs-2.0/index.html share/doc/gnome-vfs-2.0/index.sgml +share/doc/gnome-vfs-2.0/left.png share/doc/gnome-vfs-2.0/mime-registry.html share/doc/gnome-vfs-2.0/modules.html +share/doc/gnome-vfs-2.0/right.png +share/doc/gnome-vfs-2.0/up.png +@exec mkdir -p %D/share/gnome/vfolders +%%KDEMENUS%%share/gnome/vfolders/KDE.directory 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 @@ -167,6 +209,7 @@ 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 +share/locale/en_GB/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/eo/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/es/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/et/LC_MESSAGES/gnome-vfs-2.0.mo @@ -178,6 +221,7 @@ share/locale/ga/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/gl/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/he/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/hi/LC_MESSAGES/gnome-vfs-2.0.mo +share/locale/hr/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/hu/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/id/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/is/LC_MESSAGES/gnome-vfs-2.0.mo @@ -196,6 +240,7 @@ 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 +share/locale/pa/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/pl/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/pt/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/pt_BR/LC_MESSAGES/gnome-vfs-2.0.mo @@ -206,8 +251,10 @@ share/locale/sl/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/sq/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/sr/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/sr@Latn/LC_MESSAGES/gnome-vfs-2.0.mo +share/locale/sr@ije/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/sv/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ta/LC_MESSAGES/gnome-vfs-2.0.mo +share/locale/th/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/tr/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/uk/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/vi/LC_MESSAGES/gnome-vfs-2.0.mo @@ -216,6 +263,7 @@ share/locale/yi/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo @dirrm share/doc/gnome-vfs-2.0 +@dirrm share/gnome/vfolders @dirrm lib/vfs/2.0/extfs @dirrm lib/vfs/2.0 @dirrm include/gnome-vfs-module-2.0/libgnomevfs @@ -224,17 +272,39 @@ share/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo @dirrm include/gnome-vfs-2.0/include @dirrm include/gnome-vfs-2.0 @dirrm etc/gnome-vfs-2.0/vfolders +@dirrm etc/gconf/gconf.xml.defaults/system/smb @dirrm etc/gconf/gconf.xml.defaults/system/proxy @dirrm etc/gconf/gconf.xml.defaults/system/http_proxy @dirrm etc/gconf/gconf.xml.defaults/system +@dirrm etc/gconf/gconf.xml.defaults/schemas/system/smb @dirrm etc/gconf/gconf.xml.defaults/schemas/system/proxy @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/url-handlers/trash +@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/man +@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/mailto +@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/info +@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/https +@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/http +@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/h323 +@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/ghelp +@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/callto +@unexec /bin/rmdir %D/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers 2>/dev/null || true @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/url-handlers/trash +@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/man +@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/mailto +@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/info +@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/https +@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/http +@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/h323 +@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/ghelp +@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/callto +@unexec /bin/rmdir %D/etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers 2>/dev/null || true @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 diff --git a/devel/gnome2-hacker-tools/Makefile b/devel/gnome2-hacker-tools/Makefile index be02a51bfec4..c4443bb97f2e 100644 --- a/devel/gnome2-hacker-tools/Makefile +++ b/devel/gnome2-hacker-tools/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gnome2-hacker-tools -PORTVERSION= 2.4.2 -PORTREVISION= 1 +PORTVERSION= 2.6.0 CATEGORIES= devel gnome MASTER_SITES= # empty DISTFILES= # empty @@ -21,14 +20,20 @@ RUN_DEPENDS= mlv:${PORTSDIR}/editors/mlview \ glade-2:${PORTSDIR}/devel/glade2 \ ghex2:${PORTSDIR}/editors/ghex2 \ gob2:${PORTSDIR}/devel/gob2 \ - regexxer:${PORTSDIR}/devel/regexxer \ conglomerate:${PORTSDIR}/editors/conglomerate \ - anjuta:${PORTSDIR}/devel/anjuta \ meld:${PORTSDIR}/textproc/meld \ gtranslator:${PORTSDIR}/devel/gtranslator +# not yet buildable under GNOME 2.5 +# regexxer:${PORTSDIR}/devel/regexxer + +.include <bsd.port.pre.mk> + +.if ${OSVERSION} < 500000 +RUN_DEPENDS+= anjuta:${PORTSDIR}/devel/anjuta +.endif NO_BUILD= yes do-install: # empty -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile index 8d0347ede42d..bcaf1722a6b7 100644 --- a/devel/gnomevfs2/Makefile +++ b/devel/gnomevfs2/Makefile @@ -6,38 +6,58 @@ # PORTNAME= gnomevfs2 -PORTVERSION= 2.4.3 +PORTVERSION= 2.6.0 +PORTREVISION= 1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-vfs/2.4 +MASTER_SITE_SUBDIR= sources/gnome-vfs/2.6 DISTNAME= gnome-vfs-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME Virtual File System +RUN_DEPENDS= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info + USE_BZIP2= yes USE_GMAKE= yes USE_X_PREFIX= yes -USE_GNOME= gnomeprefix gnomehack intlhack gnomehier gnomemimedata gconf2 libbonobo +USE_GNOME= gnomeprefix gnomehack gnomehier intlhack gnomemimedata gconf2 \ + libbonobo USE_REINPLACE= yes -USE_LIBTOOL_VER= 13 +GNU_CONFIGURE= yes INSTALLS_SHLIB= yes +CONFIGURE_ARGS= --disable-openssl \ + --disable-gnutls \ + --with-gtk=no CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lintl" \ + LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ BSD_PTHREAD_LIBS=${PTHREAD_LIBS} +OPTIONS= KDE_MENUS "Integrated KDE menu picks" on + +.include <bsd.port.pre.mk> + +.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD) +.undef WITHOUT_CDPARANOIA +.undef WITHOUT_SAMBA +WITH_CDPARANOIA= yes +WITH_SAMBA= yes +.endif + .if !defined(WITHOUT_KDE_MENUS) EXTRA_PATCHES= ${FILESDIR}/modules_vfolder_applications-all-users.vfolder-info.in +PLIST_SUB+= KDEMENUS="" +.else +PLIST_SUB+= KDEMENUS="@comment " .endif -.include <bsd.port.pre.mk> - .if exists(${LOCALBASE}/lib/libcdda_paranoia.a) WITH_CDPARANOIA= yes .endif -.if exists(${LOCALBASE}/lib/libfam.a) -WITH_FAM= yes + +.if exists(${LOCALBASE}/lib/libsmbclient.so) +WITH_SAMBA= yes .endif .if defined(WITH_CDPARANOIA) @@ -46,16 +66,29 @@ PLIST_SUB+= CDPARANOIA="" .else PLIST_SUB+= CDPARANOIA="@comment " .endif -.if defined(WITH_FAM) + +.if exists(${LOCALBASE}/lib/libfam) || !defined(WITHOUT_FAM) LIB_DEPENDS+= fam.0:${PORTSDIR}/devel/fam .endif +.if defined(WITH_SAMBA) +LIB_DEPENDS+= smbclient.0:${PORTSDIR}/net/samba-libsmbclient +PLIST_SUB+= SAMBA="" +.else +PLIST_SUB+= SAMBA="@comment " +.endif + post-patch: @${FIND} ${WRKSRC} -name "*info.in" | ${XARGS} ${REINPLACE_CMD} -e \ 's|\@datadir\@/gnome|\@datadir\@|g' - @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/libgnomevfs/Makefile.in \ + ${WRKSRC}/libgnomevfs/xdgmime.c \ ${WRKSRC}/modules/vfolder/applications-all-users.vfolder-info.in +.if !defined(WITHOUT_KDE_MENUS) + @${SED} -e 's|/usr/local|${LOCALBASE}|g' \ + < ${FILESDIR}/KDE.directory > ${WRKSRC}/KDE.directory +.endif @${REINPLACE_CMD} -e "/^SUBDIRS =/s/test//" \ ${WRKSRC}/Makefile.in @@ -65,4 +98,10 @@ pre-configure: ${FALSE}; \ fi +post-install: + @${MKDIR} ${PREFIX}/share/gnome/vfolders +.if !defined(WITHOUT_KDE_MENUS) + @${INSTALL_DATA} ${WRKSRC}/KDE.directory ${PREFIX}/share/gnome/vfolders +.endif + .include <bsd.port.post.mk> diff --git a/devel/gnomevfs2/distinfo b/devel/gnomevfs2/distinfo index 0c0b4d2460cf..31ff3374ec64 100644 --- a/devel/gnomevfs2/distinfo +++ b/devel/gnomevfs2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-vfs-2.4.3.tar.bz2) = d217b3c241852ccb9e9147b63f8eb6d4 -SIZE (gnome2/gnome-vfs-2.4.3.tar.bz2) = 1072724 +MD5 (gnome2/gnome-vfs-2.6.0.tar.bz2) = 4d0323cf015dd006210fcacd4bfe7420 +SIZE (gnome2/gnome-vfs-2.6.0.tar.bz2) = 1431274 diff --git a/devel/gnomevfs2/files/KDE.directory b/devel/gnomevfs2/files/KDE.directory new file mode 100644 index 000000000000..032126bb99db --- /dev/null +++ b/devel/gnomevfs2/files/KDE.directory @@ -0,0 +1,5 @@ +[Desktop Entry] +Name=KDE +Comment=Some comment about KDE menu +Icon=/usr/local/share/icons/kdeclassic/48x48/apps/kmenu.png +Type=Directory diff --git a/devel/gnomevfs2/files/modules_vfolder_applications-all-users.vfolder-info.in b/devel/gnomevfs2/files/modules_vfolder_applications-all-users.vfolder-info.in index 13ce7838798d..120a8906411f 100644 --- a/devel/gnomevfs2/files/modules_vfolder_applications-all-users.vfolder-info.in +++ b/devel/gnomevfs2/files/modules_vfolder_applications-all-users.vfolder-info.in @@ -1,11 +1,285 @@ ---- modules/vfolder/applications-all-users.vfolder-info.in.orig Sat Oct 18 19:04:37 2003 -+++ modules/vfolder/applications-all-users.vfolder-info.in Sat Oct 18 19:05:18 2003 -@@ -19,7 +19,7 @@ +--- modules/vfolder/applications-all-users.vfolder-info.in.orig Fri Oct 17 10:11:22 2003 ++++ modules/vfolder/applications-all-users.vfolder-info.in Thu Feb 12 15:15:40 2004 +@@ -19,7 +19,14 @@ <MergeDir>/usr/share/gnome/apps/</MergeDir> <!-- Merge dirs optional --> - <MergeDir>/etc/X11/applnk/</MergeDir> -+ <MergeDir>%%LOCALBASE%%/share/applnk/</MergeDir> ++ <MergeDir>/usr/local/share/applnk/Toys/</MergeDir> ++ <MergeDir>/usr/local/share/applnk/Utilities/</MergeDir> ++ <MergeDir>/usr/local/share/applnk/Internet/</MergeDir> ++ <MergeDir>/usr/local/share/applnk/Office/</MergeDir> ++ <MergeDir>/usr/local/share/applnk/Applications/</MergeDir> ++ <MergeDir>/usr/local/share/applnk/Development/</MergeDir> ++ <MergeDir>/usr/local/share/applnk/Games/</MergeDir> ++ <MergeDir>/usr/local/share/applnk/Multimedia/</MergeDir> <!-- Root folder --> <Folder> +@@ -34,10 +41,12 @@ + <Query> + <And> + <Keyword>Core</Keyword> +- <!-- FIXME: Seth, why would this be wanted? --> +- <!--<Not> +- <Keyword>Merged</Keyword> +- </Not>--> ++ <Not> ++ <Or> ++ <Keyword>Qt</Keyword> ++ <Keyword>KDE</Keyword> ++ </Or> ++ </Not> + </And> + </Query> + +@@ -47,6 +56,12 @@ + <Desktop>Accessories.directory</Desktop> + <Query> + <And> ++ <Not> ++ <Or> ++ <Keyword>Qt</Keyword> ++ <Keyword>KDE</Keyword> ++ </Or> ++ </Not> + <Keyword>Application</Keyword> + <Keyword>Utility</Keyword> + <Not> +@@ -63,6 +78,12 @@ + <Desktop>Accessibility.directory</Desktop> + <Query> + <And> ++ <Not> ++ <Or> ++ <Keyword>Qt</Keyword> ++ <Keyword>KDE</Keyword> ++ </Or> ++ </Not> + <Keyword>Application</Keyword> + <Keyword>Accessibility</Keyword> + <Not> +@@ -80,6 +101,12 @@ + <OnlyUnallocated/> + <Query> + <And> ++ <Not> ++ <Or> ++ <Keyword>Qt</Keyword> ++ <Keyword>KDE</Keyword> ++ </Or> ++ </Not> + <Keyword>Application</Keyword> + <Not> + <Keyword>Settings</Keyword> +@@ -101,6 +128,12 @@ + <Desktop>Development.directory</Desktop> + <Query> + <And> ++ <Not> ++ <Or> ++ <Keyword>Qt</Keyword> ++ <Keyword>KDE</Keyword> ++ </Or> ++ </Not> + <Keyword>Application</Keyword> + <Keyword>Development</Keyword> + </And> +@@ -114,6 +147,12 @@ + <Desktop>Games.directory</Desktop> + <Query> + <And> ++ <Not> ++ <Or> ++ <Keyword>Qt</Keyword> ++ <Keyword>KDE</Keyword> ++ </Or> ++ </Not> + <Keyword>Application</Keyword> + <Keyword>Game</Keyword> + </And> +@@ -127,6 +166,12 @@ + <Desktop>Graphics.directory</Desktop> + <Query> + <And> ++ <Not> ++ <Or> ++ <Keyword>Qt</Keyword> ++ <Keyword>KDE</Keyword> ++ </Or> ++ </Not> + <Keyword>Application</Keyword> + <Keyword>Graphics</Keyword> + </And> +@@ -140,6 +185,12 @@ + <Desktop>Internet.directory</Desktop> + <Query> + <And> ++ <Not> ++ <Or> ++ <Keyword>Qt</Keyword> ++ <Keyword>KDE</Keyword> ++ </Or> ++ </Not> + <Keyword>Application</Keyword> + <Keyword>Network</Keyword> + </And> +@@ -153,6 +204,12 @@ + <Desktop>Multimedia.directory</Desktop> + <Query> + <And> ++ <Not> ++ <Or> ++ <Keyword>Qt</Keyword> ++ <Keyword>KDE</Keyword> ++ </Or> ++ </Not> + <Keyword>Application</Keyword> + <Keyword>AudioVideo</Keyword> + </And> +@@ -170,6 +227,12 @@ + <Desktop>Office.directory</Desktop> + <Query> + <And> ++ <Not> ++ <Or> ++ <Keyword>Qt</Keyword> ++ <Keyword>KDE</Keyword> ++ </Or> ++ </Not> + <Keyword>Application</Keyword> + <Or> + <Keyword>Office</Keyword> +@@ -195,6 +258,12 @@ + <Desktop>System.directory</Desktop> + <Query> + <And> ++ <Not> ++ <Or> ++ <Keyword>Qt</Keyword> ++ <Keyword>KDE</Keyword> ++ </Or> ++ </Not> + <Keyword>Application</Keyword> + <Not> + <Keyword>Settings</Keyword> +@@ -204,6 +273,118 @@ + </Query> + <DontShowIfEmpty/> + </Folder> +- ++ ++ <!-- KDE --> ++ <Folder> ++ <Name>KDE</Name> ++ <Desktop>KDE.directory</Desktop> ++ ++ <!-- KAccessories --> ++ <Folder> ++ <Name>Accessories</Name> ++ <Desktop>Accessories.directory</Desktop> ++ <Query> ++ <And> ++ <Or> ++ <Keyword>Qt</Keyword> ++ <Keyword>KDE</Keyword> ++ </Or> ++ <Keyword>Utility</Keyword> ++ </And> ++ </Query> ++ <DontShowIfEmpty/> ++ </Folder> ++ ++ <!-- KDevelopment Tools --> ++ <Folder> ++ <Name>Programming</Name> ++ <Desktop>Development.directory</Desktop> ++ <Query> ++ <And> ++ <Or> ++ <Keyword>Qt</Keyword> ++ <Keyword>KDE</Keyword> ++ </Or> ++ <Keyword>Development</Keyword> ++ </And> ++ </Query> ++ <DontShowIfEmpty/> ++ </Folder> ++ ++ <!-- KGraphics --> ++ <Folder> ++ <Name>Graphics</Name> ++ <Desktop>Graphics.directory</Desktop> ++ <Query> ++ <And> ++ <Or> ++ <Keyword>Qt</Keyword> ++ <Keyword>KDE</Keyword> ++ </Or> ++ <Keyword>Graphics</Keyword> ++ </And> ++ </Query> ++ <DontShowIfEmpty/> ++ </Folder> ++ ++ <!-- KInternet --> ++ <Folder> ++ <Name>Internet</Name> ++ <Desktop>Internet.directory</Desktop> ++ <Query> ++ <And> ++ <Or> ++ <Keyword>Qt</Keyword> ++ <Keyword>KDE</Keyword> ++ </Or> ++ <Keyword>Network</Keyword> ++ </And> ++ </Query> ++ ++ <Include>/usr/local/share/applnk/konqueror.desktop</Include> ++ ++ <DontShowIfEmpty/> ++ </Folder> ++ ++ <!-- KMultimedia --> ++ <Folder> ++ <Name>Multimedia</Name> ++ <Desktop>Multimedia.directory</Desktop> ++ <Query> ++ <And> ++ <Or> ++ <Keyword>Qt</Keyword> ++ <Keyword>KDE</Keyword> ++ </Or> ++ <Keyword>AudioVideo</Keyword> ++ </And> ++ </Query> ++ <DontShowIfEmpty/> ++ </Folder> ++ ++ <!-- KOffice --> ++ <Folder> ++ <Name>Office</Name> ++ <Desktop>Office.directory</Desktop> ++ <Query> ++ <And> ++ <Or> ++ <Keyword>Qt</Keyword> ++ <Keyword>KDE</Keyword> ++ </Or> ++ <Or> ++ <Keyword>Office</Keyword> ++ <Keyword>Spreadsheet</Keyword> ++ <Keyword>WordProcessor</Keyword> ++ <Keyword>Calendar</Keyword> ++ <Keyword>ProjectManagement</Keyword> ++ </Or> ++ </And> ++ </Query> ++ <DontShowIfEmpty/> ++ </Folder> ++ <DontShowIfEmpty/> ++ </Folder> <!-- KDE --> ++ + </Folder> + </VFolderInfo> diff --git a/devel/gnomevfs2/files/patch-aa b/devel/gnomevfs2/files/patch-aa index 303b8e8c5b40..8273ab3fee00 100644 --- a/devel/gnomevfs2/files/patch-aa +++ b/devel/gnomevfs2/files/patch-aa @@ -1,62 +1,31 @@ ---- configure.orig Tue Mar 9 14:55:35 2004 -+++ configure Tue Mar 9 16:41:53 2004 -@@ -19711,6 +19711,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' -@@ -24792,6 +24793,7 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -+#include <sys/param.h> - #ifdef HAVE_SYS_VFS_H - #include <sys/vfs.h> - #endif -@@ -24844,6 +24846,7 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -+#include <sys/param.h> - #ifdef HAVE_SYS_VFS_H - #include <sys/vfs.h> - #endif -@@ -24918,6 +24921,7 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -+#include <sys/param.h> - #ifdef HAVE_SYS_VFS_H - #include <sys/vfs.h> - #endif -@@ -24970,6 +24974,7 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -+#include <sys/param.h> - #ifdef HAVE_SYS_VFS_H - #include <sys/vfs.h> - #endif -@@ -25044,6 +25049,7 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -+#include <sys/param.h> - #include <unistd.h> - #ifdef HAVE_SYS_VFS_H - #include <sys/vfs.h> -@@ -25104,6 +25110,7 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - #include <unistd.h> -+#include <sys/param.h> - #ifdef HAVE_SYS_VFS_H - #include <sys/vfs.h> - #endif -@@ -26099,8 +26106,8 @@ +--- configure.orig Sun Feb 8 16:04:02 2004 ++++ configure Sun Feb 8 16:04:36 2004 +@@ -22816,6 +22816,8 @@ + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else ++ ac_check_lib_save_LIBS=$LIBS ++ LIBS="-lintl $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -22898,6 +22900,7 @@ + fi + rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +@@ -22905,6 +22908,7 @@ + cat >>confdefs.h <<_ACEOF + #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF ++ LIBS="-lintl $LIBS" + have_ngettext=yes + fi + done +@@ -26396,8 +26400,8 @@ done fi @@ -67,7 +36,7 @@ if test "${ac_cv_lib_bz2_bzCompressInit+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -26119,11 +26126,11 @@ +@@ -26416,11 +26420,11 @@ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ @@ -81,28 +50,16 @@ ; return 0; } -@@ -26917,7 +26924,7 @@ +@@ -27547,7 +27551,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else - LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl" -+ LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcryptofoo -ldl" ++ LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -26982,9 +26989,9 @@ - - msg_openssl="yes" - if test x$with_openssl_libs != x/usr/lib; then -- OPENSSL_LIBS="-L$with_openssl_libs -lssl -lcrypto" -+ OPENSSL_LIBS="-L$with_openssl_libs -lssl -lcryptofoo" - else -- OPENSSL_LIBS="-lssl -lcrypto" -+ OPENSSL_LIBS="-lssl -lcryptofoo" - fi - - -@@ -29285,6 +29292,7 @@ +@@ -30543,6 +30547,7 @@ s,@ORBIT_IDL@,$ORBIT_IDL,;t t s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t diff --git a/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in b/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in index 764a5a6f218a..063376961823 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 Mon Oct 13 10:31:12 2003 -+++ libgnomevfs/Makefile.in Mon Oct 13 10:31:37 2003 -@@ -234,7 +234,7 @@ +--- libgnomevfs/Makefile.in.orig Wed Oct 22 01:11:11 2003 ++++ libgnomevfs/Makefile.in Wed Oct 22 01:12:00 2003 +@@ -429,7 +429,7 @@ # CLEANFILES = $(BUILT_SOURCES) # Platform specific includes -libgnomevfsplatformincludedir = $(libdir)/gnome-vfs-2.0/include +libgnomevfsplatformincludedir = $(includedir)/gnome-vfs-2.0/include - libgnomevfsplatforminclude_HEADERS = gnome-vfs-file-size.h - + libgnomevfsplatforminclude_HEADERS = \ + gnome-vfs-file-size.h diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c new file mode 100644 index 000000000000..21912f46e0ec --- /dev/null +++ b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c @@ -0,0 +1,13 @@ +--- libgnomevfs/gnome-vfs-unix-mounts.c.orig Mon Mar 8 22:29:57 2004 ++++ libgnomevfs/gnome-vfs-unix-mounts.c Mon Mar 8 22:33:35 2004 +@@ -857,8 +857,9 @@ + + #ifdef HAVE_SYS_SYSCTL_H + if (usermnt != 0) { ++ uid_t uid = getuid (); + if (stat (fstab->fs_file, &sb) == 0) { +- if (sb.st_uid != 0) { ++ if (uid == 0 || sb.st_uid == uid) { + mount_entry->is_user_mountable = TRUE; + } + } diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c index 8f8f15be3918..ab74eb9324fd 100644 --- a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c +++ b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c @@ -1,14 +1,26 @@ ---- 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> -+#include <sys/param.h> - #include <sys/stat.h> - #include <sys/types.h> - #include <unistd.h> -@@ -840,7 +841,7 @@ +--- libgnomevfs/gnome-vfs-utils.c.orig Sat Mar 13 18:57:02 2004 ++++ libgnomevfs/gnome-vfs-utils.c Sat Mar 13 18:51:21 2004 +@@ -797,8 +797,10 @@ + + #if HAVE_STATVFS + statfs_result = statvfs (unescaped_path, &statfs_buffer); ++#define statfs_bsize f_frsize + #else + statfs_result = statfs (unescaped_path, &statfs_buffer); ++#define statfs_bsize f_bsize + #endif + + if (statfs_result != 0) { +@@ -831,7 +833,7 @@ + } + } + +- block_size = statfs_buffer.f_bsize; ++ block_size = statfs_buffer.statfs_bsize; + free_blocks = statfs_buffer.f_bavail; + + *size = block_size * free_blocks; +@@ -859,7 +861,7 @@ paths = g_strsplit (gnome_var, ":", 0); for (temp_paths = paths; *temp_paths != NULL; temp_paths++) { diff --git a/devel/gnomevfs2/files/patch-ltmain.sh b/devel/gnomevfs2/files/patch-ltmain.sh new file mode 100644 index 000000000000..58384ee38d2e --- /dev/null +++ b/devel/gnomevfs2/files/patch-ltmain.sh @@ -0,0 +1,51 @@ +--- ltmain.sh.orig Sat Dec 6 14:47:45 2003 ++++ ltmain.sh Tue Dec 9 14:09:01 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/gnomevfs2/files/patch-modules_cdda-method.c b/devel/gnomevfs2/files/patch-modules_cdda-method.c deleted file mode 100644 index 97250842b916..000000000000 --- a/devel/gnomevfs2/files/patch-modules_cdda-method.c +++ /dev/null @@ -1,26 +0,0 @@ ---- modules/cdda-method.c.orig Tue Jan 27 06:19:01 2004 -+++ modules/cdda-method.c Wed Jan 28 00:21:01 2004 -@@ -623,7 +623,11 @@ - /* Check and see if we already have opened and stashed this drive */ - if (!use_base) { - if (global_context != NULL) { -+#ifdef Linux - if (strcmp (drive->cdda_device_name, global_context->drive->cdda_device_name) == 0) { -+#elif defined(__FreeBSD__) -+ if (strcmp (drive->dev->device_path, global_context->drive->dev->device_path) == 0) { -+#endif - use_cache = TRUE; - cdda_close (drive); - gnome_vfs_file_info_copy (file_info, global_context->file_info); -@@ -709,7 +713,11 @@ - if (!use_base) { - /* Check for cache */ - if (global_context != NULL) { -+#ifdef Linux - if (strcmp (drive->cdda_device_name, global_context->drive->cdda_device_name) != 0) { -+#elif defined(__FreeBSD__) -+ if (strcmp (drive->dev->device_path, global_context->drive->dev->device_path) != 0) { -+#endif - /* Clear old cache */ - cdda_context_free (global_context); - global_context = cdda_context_new (drive, uri); diff --git a/devel/gnomevfs2/files/patch-modules_pty-open.c b/devel/gnomevfs2/files/patch-modules_pty-open.c new file mode 100644 index 000000000000..2ee23b086f16 --- /dev/null +++ b/devel/gnomevfs2/files/patch-modules_pty-open.c @@ -0,0 +1,13 @@ +--- modules/pty-open.c.orig Sun Apr 4 12:58:08 2004 ++++ modules/pty-open.c Sun Apr 4 12:59:30 2004 +@@ -613,6 +613,10 @@ + if ((fd == -1) && (errno == ENOENT)) { + fd = open("/dev/ptc", O_RDWR | O_NOCTTY); /* AIX */ + } ++ ++ if ((fd == -1) && (errno == ENOENT)) { ++ fd = posix_openpt(O_RDWR); ++ } + #endif + /* Set it to blocking. */ + flags = fcntl(fd, F_GETFL); diff --git a/devel/gnomevfs2/files/patch-modules_sftp-method.c b/devel/gnomevfs2/files/patch-modules_sftp-method.c new file mode 100644 index 000000000000..bd08ae0b45f1 --- /dev/null +++ b/devel/gnomevfs2/files/patch-modules_sftp-method.c @@ -0,0 +1,26 @@ +--- modules/sftp-method.c.orig Mon Mar 8 13:52:39 2004 ++++ modules/sftp-method.c Sun Apr 4 13:50:21 2004 +@@ -175,6 +175,15 @@ + + typedef ssize_t (*read_write_fn) (int, void *, size_t); + ++#ifndef TEMP_FAILURE_RETRY ++#define TEMP_FAILURE_RETRY(expression) \ ++ (__extension__ \ ++ ({ long int __result; \ ++ do __result = (long int) (expression); \ ++ while (__result == -1L && errno == EINTR); \ ++ __result; })) ++#endif ++ + static gsize + atomic_io (read_write_fn f, gint fd, gpointer buffer_in, gsize size) + { +@@ -1072,6 +1081,7 @@ + if (io_status == G_IO_STATUS_NORMAL) { + buffer[len] = 0; + if (g_str_has_suffix (buffer, "password: ") || ++ g_str_has_suffix (buffer, "Password:") || + g_str_has_prefix (buffer, "Enter passphrase for key")) { + if (invoke_full_auth (uri, done_auth, buffer, &password) && password != NULL) { + g_io_channel_write_chars (tty_channel, password, -1, &len, NULL); diff --git a/devel/gnomevfs2/files/patch-modules_ssh-method.c b/devel/gnomevfs2/files/patch-modules_ssh-method.c deleted file mode 100644 index 14b2cf886863..000000000000 --- a/devel/gnomevfs2/files/patch-modules_ssh-method.c +++ /dev/null @@ -1,10 +0,0 @@ ---- modules/ssh-method.c.orig Mon Jun 10 13:28:42 2002 -+++ modules/ssh-method.c Mon Jun 10 13:28:51 2002 -@@ -34,6 +34,7 @@ - #include <string.h> - #include <sys/types.h> - #include <sys/wait.h> -+#include <signal.h> - #include <unistd.h> - - typedef struct { diff --git a/devel/gnomevfs2/pkg-descr b/devel/gnomevfs2/pkg-descr index 81cfcd5dd856..03cbc07f6699 100644 --- a/devel/gnomevfs2/pkg-descr +++ b/devel/gnomevfs2/pkg-descr @@ -1,14 +1,7 @@ -This is the GNOME Virtual File System. - -GnomeVFS is a filesystem abstraction library allowing applications -plugable transparent access to a variety of "real" filesystems, from -WebDAV to digital cameras, to the local filesystem. It also contains a -number of other convenient file utilities such as a comphrehensive MIME -database / Application registry, and a copy engine. Use of GnomeVFS -ensures that an application or component will be usable by Nautilus or -other GnomeVFS applications for handling the display of data from -various URIs, as well. - -This is the GnomeVFS for the GNOME 2 architecture. +The GNOME Virtual File System allows applications and users to treat +any number of file system concepts as a part of the local filesystem. +With GnomeVFS, filesystems across the internet, on connected devices, +and in multiple formats are as simple to access (and write code for) +as any directory on the local machine. WWW: http://www.gnome.org/ diff --git a/devel/gnomevfs2/pkg-plist b/devel/gnomevfs2/pkg-plist index 0d945ad47a0b..03548442eea8 100644 --- a/devel/gnomevfs2/pkg-plist +++ b/devel/gnomevfs2/pkg-plist @@ -3,27 +3,52 @@ 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/desktop/gnome/url-handlers/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/callto/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/ghelp/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/h323/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/http/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/https/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/info/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/mailto/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/man/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/trash/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/%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/desktop/gnome/url-handlers/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/callto/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/ghelp/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/h323/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/http/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/https/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/info/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/mailto/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/man/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/trash/%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/schemas/system/proxy/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/system/smb/%gconf.xml etc/gconf/gconf.xml.defaults/system/%gconf.xml etc/gconf/gconf.xml.defaults/system/http_proxy/%gconf.xml etc/gconf/gconf.xml.defaults/system/proxy/%gconf.xml +etc/gconf/gconf.xml.defaults/system/smb/%gconf.xml etc/gconf/schemas/desktop_default_applications.schemas +etc/gconf/schemas/desktop_gnome_url_handlers.schemas etc/gconf/schemas/system_http_proxy.schemas +etc/gconf/schemas/system_smb.schemas %%CDPARANOIA%%etc/gnome-vfs-2.0/modules/cdda-module.conf etc/gnome-vfs-2.0/modules/default-modules.conf +%%SAMBA%%etc/gnome-vfs-2.0/modules/smb-module.conf etc/gnome-vfs-2.0/vfolders/applications-all-users.vfolder-info etc/gnome-vfs-2.0/vfolders/favorites.vfolder-info etc/gnome-vfs-2.0/vfolders/network.vfolder-info @@ -37,6 +62,8 @@ include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-async-ops.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-cancellation.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-context.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-directory.h +include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-drive.h +include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-enum-types.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-info.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-size.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-find-directory.h @@ -54,6 +81,8 @@ include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-standard-callbacks.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-types.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-uri.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-utils.h +include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-volume-monitor.h +include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-volume.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-xfer.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-cancellable-ops.h @@ -72,12 +101,16 @@ include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-transform.h lib/bonobo/monikers/libmoniker_gnome_vfs_std.so lib/gnome-vfs-2.0/modules/libbzip2.so %%CDPARANOIA%%lib/gnome-vfs-2.0/modules/libcdda.so +lib/gnome-vfs-2.0/modules/libcomputer.so lib/gnome-vfs-2.0/modules/libextfs.so lib/gnome-vfs-2.0/modules/libfile.so lib/gnome-vfs-2.0/modules/libftp.so lib/gnome-vfs-2.0/modules/libgzip.so lib/gnome-vfs-2.0/modules/libhttp.so +lib/gnome-vfs-2.0/modules/libnetwork.so lib/gnome-vfs-2.0/modules/libnntp.so +lib/gnome-vfs-2.0/modules/libsftp.so +%%SAMBA%%lib/gnome-vfs-2.0/modules/libsmb.so lib/gnome-vfs-2.0/modules/libssh.so lib/gnome-vfs-2.0/modules/libtar.so lib/gnome-vfs-2.0/modules/libvfolder-desktop.so @@ -86,7 +119,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.400 +lib/libgnomevfs-2.so.600 lib/vfs/2.0/extfs/README lib/vfs/2.0/extfs/a lib/vfs/2.0/extfs/ar @@ -104,13 +137,16 @@ lib/vfs/2.0/extfs/tar lib/vfs/2.0/extfs/trpm lib/vfs/2.0/extfs/zip lib/vfs/2.0/extfs/zoo +libdata/bonobo/servers/GNOME_VFS_Daemon.server libdata/bonobo/servers/GNOME_VFS_Moniker_std.server libdata/pkgconfig/gnome-vfs-2.0.pc libdata/pkgconfig/gnome-vfs-module-2.0.pc +libexec/gnome-vfs-daemon share/doc/gnome-vfs-2.0/about.html share/doc/gnome-vfs-2.0/advanced-operations.html share/doc/gnome-vfs-2.0/ch08.html share/doc/gnome-vfs-2.0/data-types.html +share/doc/gnome-vfs-2.0/gnome-vfs-2.0.devhelp 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 @@ -150,10 +186,16 @@ share/doc/gnome-vfs-2.0/gnome-vfs-directory-operations.html share/doc/gnome-vfs-2.0/gnome-vfs-file-operations.html share/doc/gnome-vfs-2.0/gnome-vfs-first-steps.html share/doc/gnome-vfs-2.0/gnome-vfs-writing-modules.html +share/doc/gnome-vfs-2.0/home.png share/doc/gnome-vfs-2.0/index.html share/doc/gnome-vfs-2.0/index.sgml +share/doc/gnome-vfs-2.0/left.png share/doc/gnome-vfs-2.0/mime-registry.html share/doc/gnome-vfs-2.0/modules.html +share/doc/gnome-vfs-2.0/right.png +share/doc/gnome-vfs-2.0/up.png +@exec mkdir -p %D/share/gnome/vfolders +%%KDEMENUS%%share/gnome/vfolders/KDE.directory 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 @@ -167,6 +209,7 @@ 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 +share/locale/en_GB/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/eo/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/es/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/et/LC_MESSAGES/gnome-vfs-2.0.mo @@ -178,6 +221,7 @@ share/locale/ga/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/gl/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/he/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/hi/LC_MESSAGES/gnome-vfs-2.0.mo +share/locale/hr/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/hu/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/id/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/is/LC_MESSAGES/gnome-vfs-2.0.mo @@ -196,6 +240,7 @@ 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 +share/locale/pa/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/pl/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/pt/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/pt_BR/LC_MESSAGES/gnome-vfs-2.0.mo @@ -206,8 +251,10 @@ share/locale/sl/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/sq/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/sr/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/sr@Latn/LC_MESSAGES/gnome-vfs-2.0.mo +share/locale/sr@ije/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/sv/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ta/LC_MESSAGES/gnome-vfs-2.0.mo +share/locale/th/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/tr/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/uk/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/vi/LC_MESSAGES/gnome-vfs-2.0.mo @@ -216,6 +263,7 @@ share/locale/yi/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo @dirrm share/doc/gnome-vfs-2.0 +@dirrm share/gnome/vfolders @dirrm lib/vfs/2.0/extfs @dirrm lib/vfs/2.0 @dirrm include/gnome-vfs-module-2.0/libgnomevfs @@ -224,17 +272,39 @@ share/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo @dirrm include/gnome-vfs-2.0/include @dirrm include/gnome-vfs-2.0 @dirrm etc/gnome-vfs-2.0/vfolders +@dirrm etc/gconf/gconf.xml.defaults/system/smb @dirrm etc/gconf/gconf.xml.defaults/system/proxy @dirrm etc/gconf/gconf.xml.defaults/system/http_proxy @dirrm etc/gconf/gconf.xml.defaults/system +@dirrm etc/gconf/gconf.xml.defaults/schemas/system/smb @dirrm etc/gconf/gconf.xml.defaults/schemas/system/proxy @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/url-handlers/trash +@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/man +@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/mailto +@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/info +@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/https +@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/http +@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/h323 +@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/ghelp +@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/callto +@unexec /bin/rmdir %D/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers 2>/dev/null || true @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/url-handlers/trash +@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/man +@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/mailto +@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/info +@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/https +@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/http +@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/h323 +@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/ghelp +@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/callto +@unexec /bin/rmdir %D/etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers 2>/dev/null || true @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 diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile index 48afbfed39e7..8e7dbae1c125 100644 --- a/devel/libbonobo/Makefile +++ b/devel/libbonobo/Makefile @@ -6,11 +6,10 @@ # PORTNAME= libbonobo -PORTVERSION= 2.4.3 -PORTREVISION= 1 +PORTVERSION= 2.6.0 CATEGORIES= devel 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 @@ -22,7 +21,7 @@ USE_BISON= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes USE_PERL5= yes -USE_GNOME= gnomehack libxml2 orbit2 +USE_GNOME= gnomehack intlhack libxml2 orbit2 CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/devel/libbonobo/distinfo b/devel/libbonobo/distinfo index 5297ec4a9796..63bb6c5afbed 100644 --- a/devel/libbonobo/distinfo +++ b/devel/libbonobo/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libbonobo-2.4.3.tar.bz2) = 420148e96773e6f27a49f1bbebb28fdd -SIZE (gnome2/libbonobo-2.4.3.tar.bz2) = 1381949 +MD5 (gnome2/libbonobo-2.6.0.tar.bz2) = 078942cb9c6a1a31f93958e993353f45 +SIZE (gnome2/libbonobo-2.6.0.tar.bz2) = 1059444 diff --git a/devel/libbonobo/pkg-descr b/devel/libbonobo/pkg-descr index 19f9323f3690..c555fab9ae5c 100644 --- a/devel/libbonobo/pkg-descr +++ b/devel/libbonobo/pkg-descr @@ -1,5 +1,5 @@ -Bonobo is a set of language and system independant CORBA interfaces -for creating reusable components, controls and creating compound -documents. +Bonobo is a set of language- and system-independant CORBA interfaces +for creating reusable components and controls, and for creating +compound documents. WWW: http://www.gnome.org/ diff --git a/devel/libbonobo/pkg-plist b/devel/libbonobo/pkg-plist index bf4ee86824d7..dbaabad55b86 100644 --- a/devel/libbonobo/pkg-plist +++ b/devel/libbonobo/pkg-plist @@ -15,6 +15,8 @@ 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-app-client.h +include/libbonobo-2.0/bonobo/bonobo-application.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 @@ -62,92 +64,8 @@ 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/home.png -share/doc/bonobo-activation/index.html -share/doc/bonobo-activation/index.sgml -share/doc/bonobo-activation/left.png -share/doc/bonobo-activation/lgpl.html -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/terms.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_Application.idl share/idl/bonobo-2.0/Bonobo_Canvas.idl share/idl/bonobo-2.0/Bonobo_Clipboard.idl share/idl/bonobo-2.0/Bonobo_Context.idl @@ -191,6 +109,7 @@ 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/hr/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 diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile index e2fc89e81c56..5fe9635d584f 100644 --- a/devel/libglade2/Makefile +++ b/devel/libglade2/Makefile @@ -6,11 +6,10 @@ # PORTNAME= libglade2 -PORTVERSION= 2.0.1 -PORTREVISION= 2 +PORTVERSION= 2.3.6 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.0 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.3 DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -18,16 +17,23 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME glade library BUILD_DEPENDS= ${PYEXPAT} -RUN_DEPENDS= ${PYEXPAT} +RUN_DEPENDS= ${PYEXPAT} \ + xmlcatmgr:${PORTSDIR}/textproc/xmlcatmgr USE_BZIP2= yes USE_X_PREFIX= yes +USE_REINPLACE= yes USE_GMAKE= yes USE_PYTHON= yes -USE_LIBTOOL_VER= 13 +USE_LIBTOOL_VER=13 USE_GNOME= gnomehack libxml2 gtk20 INSTALLS_SHLIB= yes +CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ + --disable-gtk-doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" + LDFLAGS="-L${LOCALBASE}/lib" + +PLIST_SUB= XMLCATALOG="${LOCALBASE}/bin/xmlcatalog" \ + CATALOG_PORTS_XML="${LOCALBASE}/share/xml/catalog.ports" .include <bsd.port.mk> diff --git a/devel/libglade2/distinfo b/devel/libglade2/distinfo index ea59e843802f..1ac601a8efbc 100644 --- a/devel/libglade2/distinfo +++ b/devel/libglade2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libglade-2.0.1.tar.bz2) = 4d93f6b01510013ae429e91af432cfe2 -SIZE (gnome2/libglade-2.0.1.tar.bz2) = 264646 +MD5 (gnome2/libglade-2.3.6.tar.bz2) = f579c881b95e6dee0f55f82940eb2004 +SIZE (gnome2/libglade-2.3.6.tar.bz2) = 343224 diff --git a/devel/libglade2/files/patch-ab b/devel/libglade2/files/patch-ab index a7875449633e..a09056d333f5 100644 --- a/devel/libglade2/files/patch-ab +++ b/devel/libglade2/files/patch-ab @@ -1,20 +1,29 @@ ---- Makefile.in.orig Wed Apr 3 01:58:07 2002 -+++ Makefile.in Wed Apr 3 01:59:13 2002 -@@ -34,7 +34,7 @@ - includedir = @includedir@ - oldincludedir = /usr/include +--- Makefile.in.orig Wed Jan 14 17:20:11 2004 ++++ Makefile.in Wed Jan 14 17:23:52 2004 +@@ -18,7 +18,7 @@ + top_srcdir = @top_srcdir@ + VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ +pkglibdir = $(prefix)/libdata/pkgconfig pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = . -@@ -104,7 +104,7 @@ - am__include = @am__include@ - am__quote = @am__quote@ - install_sh = @install_sh@ +@@ -169,7 +169,7 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ -SUBDIRS = glade doc tests +SUBDIRS = glade doc INCLUDES = $(LIBGLADE_CFLAGS) +@@ -188,7 +188,7 @@ + + + # handling of the XML catalog +-XMLCATALOG = /etc/xml/catalog ++XMLCATALOG = $(LOCALBASE)/share/xml/catalog.ports + + xmldir = $(datadir)/xml/libglade + xml_DATA = glade-2.0.dtd diff --git a/devel/libglade2/files/patch-doc::Makefile.in b/devel/libglade2/files/patch-doc::Makefile.in deleted file mode 100644 index 4a5b4b671943..000000000000 --- a/devel/libglade2/files/patch-doc::Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- doc/Makefile.in 2002/02/14 10:10:45 1.1 -+++ doc/Makefile.in 2002/02/14 10:11:18 -@@ -110,7 +110,7 @@ - # The directory containing the source code (if it contains documentation). - DOC_SOURCE_DIR = ../glade - --HTML_DIR = $(datadir)/gtk-doc/html -+HTML_DIR = $(datadir)/doc - - TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) - diff --git a/devel/libglade2/pkg-descr b/devel/libglade2/pkg-descr index dd6a386e94cd..7335dd1ea972 100644 --- a/devel/libglade2/pkg-descr +++ b/devel/libglade2/pkg-descr @@ -1,5 +1,3 @@ -A library that allows you to load GLADE interfaces at runtime (you don't -have to generate stubs with GLADE before hand). This way you can change -the look of your application without recompiling. This way you can write -the logic behind the interface separately from the code to build the -interface, so changing the interface is not so much of a problem. +LibGlade allows GLADE interfaces to be handled at runtime, freeing +GUI development from code development. This allows an interface to +be changed without requiring a re-compilation. diff --git a/devel/libglade2/pkg-plist b/devel/libglade2/pkg-plist index 9581dd4b3a3a..f1b4720d65ef 100644 --- a/devel/libglade2/pkg-plist +++ b/devel/libglade2/pkg-plist @@ -8,20 +8,28 @@ lib/libglade-2.0.a lib/libglade-2.0.so lib/libglade-2.0.so.0 libdata/pkgconfig/libglade-2.0.pc -share/doc/libglade/gladexml.html +share/doc/libglade/GladeXML.html +share/doc/libglade/home.png +share/doc/libglade/index.html +share/doc/libglade/index.sgml +share/doc/libglade/left.png +share/doc/libglade/libglade-Libglade-Build.html +share/doc/libglade/libglade-Libglade-Initialisation.html +share/doc/libglade/libglade-Libglade-SAX-Parser.html share/doc/libglade/libglade-dtd.html share/doc/libglade/libglade-dtd-exceptions.html share/doc/libglade/libglade-embedding.html share/doc/libglade/libglade-extending.html share/doc/libglade/libglade-i18n.html share/doc/libglade/libglade-lib.html -share/doc/libglade/libglade-libglade-build.html -share/doc/libglade/libglade-libglade-initialisation.html -share/doc/libglade/libglade-libglade-sax-parser.html share/doc/libglade/libglade-modules.html share/doc/libglade/libglade-notes.html -share/doc/libglade/libglade.html +share/doc/libglade/libglade.devhelp +share/doc/libglade/right.png +share/doc/libglade/up.png share/xml/libglade/glade-2.0.dtd +@unexec %%XMLCATALOG%% --noout --del %D/share/xml/libglade/glade-2.0.dtd %%CATALOG_PORTS_XML%% || /usr/bin/true +@exec %%XMLCATALOG%% --noout --add "system" "http://glade.gnome.org/glade-2.0.dtd" %D/share/xml/libglade/glade-2.0.dtd %%CATALOG_PORTS_XML%% || /usr/bin/true @dirrm share/xml/libglade @dirrm share/doc/libglade @dirrm include/libglade-2.0/glade diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile index bb4066490d7c..6bb388973510 100644 --- a/devel/libgtop2/Makefile +++ b/devel/libgtop2/Makefile @@ -6,11 +6,10 @@ # PORTNAME= libgtop2 -PORTVERSION= 2.0.8 -PORTREVISION= 1 +PORTVERSION= 2.5.2 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.0 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.5 DISTNAME= libgtop-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -21,11 +20,12 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt USE_BZIP2= yes USE_PERL5= yes +USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gnomehack glib20 +USE_REINPLACE= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --without-x CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/devel/libgtop2/distinfo b/devel/libgtop2/distinfo index 410d31fa3170..7614d6251656 100644 --- a/devel/libgtop2/distinfo +++ b/devel/libgtop2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libgtop-2.0.8.tar.bz2) = 9e5b728a8639fd7c7f86ddf2cb726435 -SIZE (gnome2/libgtop-2.0.8.tar.bz2) = 916084 +MD5 (gnome2/libgtop-2.5.2.tar.bz2) = 92b9665293df3b54a00ddfda40c9d04e +SIZE (gnome2/libgtop-2.5.2.tar.bz2) = 935545 diff --git a/devel/libgtop2/files/patch-ab b/devel/libgtop2/files/patch-ab deleted file mode 100644 index 9c88c62bc771..000000000000 --- a/devel/libgtop2/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig Mon Apr 29 12:00:07 2002 -+++ Makefile.in Mon Apr 29 12:00:24 2002 -@@ -503,7 +503,7 @@ - $(top_srcdir)/aclocal.m4: libgtop-sysdeps.m4 LIBGTOP-VERSION - - libgtopConf.sh: libgtopConf.sh.in Makefile -- sed -e 's#\@LIBGTOP_LIBDIR\@#$(libdir)#g' \ -+ sed -e 's#\@LIBGTOP_LIBDIR\@#$(sysconfdir)#g' \ - -e 's#\@LIBGTOP_INCLUDEDIR\@#$(includedir)/libgtop-2.0#g' \ - -e 's#\@LIBGTOP_DATADIR\@#$(datadir)#g' \ - -e 's#\@LIBGTOP_EXTRA_LIBS\@#$(LIBGTOP_EXTRA_LIBS)#g' \ diff --git a/devel/libgtop2/files/patch-ah b/devel/libgtop2/files/patch-ah index c01ec4e1826b..bbffe4a0c430 100644 --- a/devel/libgtop2/files/patch-ah +++ b/devel/libgtop2/files/patch-ah @@ -1,67 +1,27 @@ ---- sysdeps/freebsd/procmap.c.orig Fri May 28 03:56:48 1999 -+++ sysdeps/freebsd/procmap.c Tue Sep 9 11:38:18 2003 -@@ -33,7 +33,11 @@ - #include <sys/proc.h> - #include <sys/resource.h> - #include <vm/vm_object.h> -+#if (__FreeBSD_version >= 400011) -+#include <vm/vm.h> -+#else - #include <vm/vm_prot.h> -+#endif - #include <vm/vm_map.h> - - #include <sys/vnode.h> -@@ -91,8 +95,9 @@ +--- sysdeps/freebsd/procmap.c.orig Wed Mar 10 21:23:52 2004 ++++ sysdeps/freebsd/procmap.c Thu Mar 11 21:45:33 2004 +@@ -104,7 +104,7 @@ glibtop_map_entry *maps; #if defined __FreeBSD__ struct vnode vnode; +-#if __FreeBSD_version >= 500039 +#if __FreeBSD_version < 500039 struct inode inode; -- struct mount mount; -+#endif #endif - int count, i = 0; - int update = 0; -@@ -108,13 +113,19 @@ + #endif +@@ -122,8 +122,10 @@ /* Get the process data */ pinfo = kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, &count); - if ((pinfo == NULL) || (count < 1)) -- glibtop_error_io_r (server, "kvm_getprocs (%d)", pid); + if ((pinfo == NULL) || (count < 1)) { -+ glibtop_warn_io_r (server, "kvm_getprocs (%d)", pid); + glibtop_error_io_r (server, "kvm_getprocs (%d)", pid); + return NULL; + } /* Now we get the memory maps. */ - if (kvm_read (server->machine.kd, -+#if (__FreeBSD_version >= 500013) -+ (unsigned long) pinfo [0].ki_vmspace, -+#else - (unsigned long) pinfo [0].kp_proc.p_vmspace, -+#endif - (char *) &vmspace, sizeof (vmspace)) != sizeof (vmspace)) - glibtop_error_io_r (server, "kvm_read (vmspace)"); - -@@ -244,6 +255,15 @@ - &vnode, sizeof (vnode)) != sizeof (vnode)) - glibtop_error_io_r (server, "kvm_read (vnode)"); - -+#if __FreeBSD_version >= 500039 -+ switch (vnode.v_type) { -+ case VREG: -+ maps [i-1].inode = vnode.v_cachedid; -+ maps [i-1].device = vnode.v_cachedfs; -+ default: -+ continue; -+ } -+#else - if ((vnode.v_type != VREG) || (vnode.v_tag != VT_UFS) || - !vnode.v_data) continue; - -@@ -252,13 +272,9 @@ +@@ -280,13 +282,9 @@ &inode, sizeof (inode)) != sizeof (inode)) glibtop_error_io_r (server, "kvm_read (inode)"); @@ -69,7 +29,7 @@ - (unsigned long) vnode.v_mount, - &mount, sizeof (mount)) != sizeof (mount)) - glibtop_error_io_r (server, "kvm_read (mount)"); -- +-#endif maps [i-1].inode = inode.i_number; maps [i-1].device = inode.i_dev; +#endif diff --git a/devel/libgtop2/files/patch-aj b/devel/libgtop2/files/patch-aj deleted file mode 100644 index b7ea24ebab8e..000000000000 --- a/devel/libgtop2/files/patch-aj +++ /dev/null @@ -1,243 +0,0 @@ ---- sysdeps/freebsd/proclist.c.orig Thu May 27 23:04:05 1999 -+++ sysdeps/freebsd/proclist.c Sun Sep 7 20:37:30 2003 -@@ -86,13 +86,24 @@ - pids = glibtop_realloc_r (server, pids, count * sizeof (unsigned)); - /* Copy the pids over to this chain */ - for (i=j=0; i < count; i++) { -+#if __FreeBSD_version >= 500013 -+#define XXX_P_STAT ki_stat -+#define XXX_P_RUID ki_ruid -+#define XXX_P_PID ki_pid -+ -+#else -+#define XXX_P_STAT kp_proc.p_stat -+#define XXX_P_RUID kp_eproc.e_pcred.p_ruid -+#define XXX_P_PID kp_proc.p_pid -+ -+#endif - if ((real_which & GLIBTOP_EXCLUDE_IDLE) && -- (pinfo[i].kp_proc.p_stat != SRUN)) -+ (pinfo[i].XXX_P_STAT != SRUN)) - continue; - else if ((real_which & GLIBTOP_EXCLUDE_SYSTEM) && -- (pinfo[i].kp_eproc.e_pcred.p_ruid == 0)) -+ (pinfo[i].XXX_P_RUID == 0)) - continue; -- pids [j++] = (unsigned) pinfo[i].kp_proc.p_pid; -+ pids [j++] = (unsigned) pinfo[i].XXX_P_PID; - } /* end for */ - /* Set the fields in buf */ - buf->number = j; ---- sysdeps/freebsd/procstate.c.orig Sun Oct 17 03:01:39 1999 -+++ sysdeps/freebsd/procstate.c Sun Sep 7 20:37:30 2003 -@@ -28,7 +28,7 @@ - #include <glibtop_suid.h> - - #if !defined(__OpenBSD__) --//&& (!defined __bsdi__) -+/*&& (!defined __bsdi__)*/ - #include <sys/user.h> - #endif - -@@ -37,11 +37,7 @@ - (1L << GLIBTOP_PROC_STATE_GID); - - static const unsigned long _glibtop_sysdeps_proc_state_new = --#if LIBGTOP_VERSION_CODE >= 1001000 --(1L << GLIBTOP_PROC_STATE_RUID) + (1L << GLIBTOP_PROC_STATE_RGID); --#else - 0; --#endif - - /* Init function. */ - -@@ -76,43 +72,35 @@ - return; - } - -- strncpy (buf->cmd, pinfo [0].kp_proc.p_comm, sizeof (buf->cmd)-1); -- buf->cmd [sizeof (buf->cmd)-1] = 0; -+#if __FreeBSD_version >= 500013 -+#define XXX_P_COMM ki_comm -+#define XXX_P_SVUID ki_svuid -+#define XXX_P_SVGID ki_svgid -+#define XXX_P_RUID ki_ruid -+#define XXX_P_RGID ki_rgid -+#define XXX_P_STAT ki_stat - -- buf->uid = pinfo [0].kp_eproc.e_pcred.p_svuid; -- buf->gid = pinfo [0].kp_eproc.e_pcred.p_svgid; -+#else -+#define XXX_P_COMM kp_proc.p_comm -+#define XXX_P_SVUID kp_eproc.e_pcred.p_svuid -+#define XXX_P_SVGID kp_eproc.e_pcred.p_svgid -+#define XXX_P_RUID kp_eproc.e_pcred.p_ruid -+#define XXX_P_RGID kp_eproc.e_pcred.p_rgid -+#define XXX_P_STAT kp_proc.p_stat - --#if LIBGTOP_VERSION_CODE >= 1001000 -- buf->ruid = pinfo [0].kp_eproc.e_pcred.p_ruid; -- buf->rgid = pinfo [0].kp_eproc.e_pcred.p_rgid; - #endif - -+ strncpy (buf->cmd, pinfo [0].XXX_P_COMM, sizeof (buf->cmd)-1); -+ buf->cmd [sizeof (buf->cmd)-1] = 0; -+ -+ buf->uid = pinfo [0].XXX_P_SVUID; -+ buf->gid = pinfo [0].XXX_P_SVGID; -+ - /* Set the flags for the data we're about to return*/ - buf->flags = _glibtop_sysdeps_proc_state | - _glibtop_sysdeps_proc_state_new; - --#if LIBGTOP_VERSION_CODE >= 1001000 -- switch (pinfo [0].kp_proc.p_stat) { -- case SIDL: -- buf->state = 0; -- break; -- case SRUN: -- buf->state = GLIBTOP_PROCESS_RUNNING; -- break; -- case SSLEEP: -- buf->state = GLIBTOP_PROCESS_INTERRUPTIBLE; -- break; -- case SSTOP: -- buf->state = GLIBTOP_PROCESS_STOPPED; -- break; -- case SZOMB: -- buf->state = GLIBTOP_PROCESS_ZOMBIE; -- break; -- default: -- return; -- } --#else -- switch (pinfo [0].kp_proc.p_stat) { -+ switch (pinfo [0].XXX_P_STAT) { - case SIDL: - buf->state = 'S'; - break; -@@ -131,7 +119,6 @@ - default: - return; - } --#endif - - buf->flags |= (1L << GLIBTOP_PROC_STATE_STATE); - } ---- sysdeps/freebsd/procuid.c.orig Fri Sep 17 06:08:07 1999 -+++ sysdeps/freebsd/procuid.c Sun Sep 7 20:37:30 2003 -@@ -84,17 +84,46 @@ - return; - } - -- buf->uid = pinfo [0].kp_eproc.e_pcred.p_ruid; -- buf->euid = pinfo [0].kp_eproc.e_pcred.p_svuid; -- buf->gid = pinfo [0].kp_eproc.e_pcred.p_rgid; -- buf->egid = pinfo [0].kp_eproc.e_pcred.p_svgid; -- -- buf->ppid = pinfo [0].kp_eproc.e_ppid; -- buf->pgrp = pinfo [0].kp_eproc.e_pgid; -- buf->tpgid = pinfo [0].kp_eproc.e_tpgid; -+#if __FreeBSD_version >= 500013 - -- buf->nice = pinfo [0].kp_proc.p_nice; -- buf->priority = pinfo [0].kp_proc.p_priority; -+#define XXX_P_RUID ki_ruid -+#define XXX_P_SVUID ki_svuid -+#define XXX_P_RGID ki_rgid -+#define XXX_P_SVGID ki_svgid -+#define XXX_E_PPID ki_ppid -+#define XXX_E_PGID ki_pgid -+#define XXX_E_TPGID ki_tpgid -+#define XXX_P_NICE ki_nice -+#if __FreeBSD_version >= 500013 -+#define XXX_P_PRIORITY ki_pri.pri_user -+#else -+#define XXX_P_PRIORITY ki_priority -+#endif -+#else -+ -+#define XXX_P_RUID kp_eproc.e_pcred.p_ruid -+#define XXX_P_SVUID kp_eproc.e_pcred.p_svuid -+#define XXX_P_RGID kp_eproc.e_pcred.p_rgid -+#define XXX_P_SVGID kp_eproc.e_pcred.p_svgid -+#define XXX_E_PPID kp_eproc.e_ppid -+#define XXX_E_PGID kp_eproc.e_pgid -+#define XXX_E_TPGID kp_eproc.e_tpgid -+#define XXX_P_NICE kp_proc.p_nice -+#define XXX_P_PRIORITY kp_proc.p_priority -+ -+#endif -+ -+ buf->uid = pinfo [0].XXX_P_RUID; -+ buf->euid = pinfo [0].XXX_P_SVUID; -+ buf->gid = pinfo [0].XXX_P_RGID; -+ buf->egid = pinfo [0].XXX_P_SVGID; -+ -+ buf->ppid = pinfo [0].XXX_E_PPID; -+ buf->pgrp = pinfo [0].XXX_E_PGID; -+ buf->tpgid = pinfo [0].XXX_E_TPGID; -+ -+ buf->nice = pinfo [0].XXX_P_NICE; -+ buf->priority = pinfo [0].XXX_P_PRIORITY; - - /* Set the flags for the data we're about to return*/ - buf->flags = _glibtop_sysdeps_proc_uid; ---- sysdeps/freebsd/procsignal.c.orig Mon Feb 14 06:31:39 2000 -+++ sysdeps/freebsd/procsignal.c Sun Sep 7 20:37:30 2003 -@@ -67,11 +67,27 @@ - return; - } - -+#if __FreeBSD_version >= 500013 -+ -+#define XXX_P_SIGLIST ki_siglist -+#define XXX_P_SIGMASK ki_sigmask -+#define XXX_P_SIGIGNORE ki_sigignore -+#define XXX_P_SIGCATCH ki_sigcatch -+ -+#else -+ -+#define XXX_P_SIGLIST kp_proc.p_siglist -+#define XXX_P_SIGMASK kp_proc.p_sigmask -+#define XXX_P_SIGIGNORE kp_proc.p_sigignore -+#define XXX_P_SIGCATCH kp_proc.p_sigcatch -+ -+#endif -+ - /* signal: mask of pending signals. - * pinfo [0].kp_proc.p_siglist - */ - #if (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011) -- buf->signal [0] = pinfo [0].kp_proc.p_siglist.__bits[0]; -+ buf->signal [0] = pinfo [0].XXX_P_SIGLIST.__bits[0]; - #else - buf->signal [0] = pinfo [0].kp_proc.p_siglist; - #endif -@@ -80,7 +96,7 @@ - * pinfo [0].kp_proc.p_sigmask - */ - #if (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011) -- buf->blocked [0] = pinfo [0].kp_proc.p_sigmask.__bits[0]; -+ buf->blocked [0] = pinfo [0].XXX_P_SIGMASK.__bits[0]; - #else - buf->blocked [0] = pinfo [0].kp_proc.p_sigmask; - #endif -@@ -89,7 +105,7 @@ - * pinfo [0].kp_proc.p_sigignore - */ - #if (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011) -- buf->sigignore [0] = pinfo [0].kp_proc.p_sigignore.__bits[0]; -+ buf->sigignore [0] = pinfo [0].XXX_P_SIGIGNORE.__bits[0]; - #else - buf->sigignore [0] = pinfo [0].kp_proc.p_sigignore; - #endif -@@ -98,7 +114,7 @@ - * pinfo [0].kp_proc.p_sigcatch - */ - #if (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011) -- buf->sigcatch [0] = pinfo [0].kp_proc.p_sigcatch.__bits[0]; -+ buf->sigcatch [0] = pinfo [0].XXX_P_SIGCATCH.__bits[0]; - #else - buf->sigcatch [0] = pinfo [0].kp_proc.p_sigcatch; - #endif diff --git a/devel/libgtop2/files/patch-configure b/devel/libgtop2/files/patch-configure index e451557e7674..662f75ac3671 100644 --- a/devel/libgtop2/files/patch-configure +++ b/devel/libgtop2/files/patch-configure @@ -1,69 +1,15 @@ ---- configure.orig Tue Nov 4 14:55:15 2003 -+++ configure Tue Nov 4 15:10:15 2003 -@@ -1580,10 +1580,10 @@ - - # The aliases save the names the user supplied, while $host etc. - # will get canonicalized. --test -n "$target_alias" && -- test "$program_prefix$program_suffix$program_transform_name" = \ -- NONENONEs,x,x, && -- program_prefix=${target_alias}- -+#test -n "$target_alias" && -+# test "$program_prefix$program_suffix$program_transform_name" = \ -+# NONENONEs,x,x, && -+# program_prefix=${target_alias}- - # Making releases: - # LIBGTOP_MICRO_VERSION += 1; - # LIBGTOP_INTERFACE_AGE += 1; -@@ -1886,9 +1886,9 @@ +--- configure.orig Thu Mar 11 15:38:00 2004 ++++ configure Thu Mar 11 15:38:00 2004 +@@ -1917,9 +1917,9 @@ # libtool versioning LT_RELEASE=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION --LT_CURRENT=`expr $LIBGTOP_MICRO_VERSION - $LIBGTOP_INTERFACE_AGE` --LT_REVISION=$LIBGTOP_INTERFACE_AGE --LT_AGE=`expr $LIBGTOP_BINARY_AGE - $LIBGTOP_INTERFACE_AGE` +-LT_CURRENT=$LIBGTOP_CURRENT +-LT_REVISION=$LIBGTOP_REVISION +-LT_AGE=$LIBGTOP_AGE +LT_CURRENT=2 +LT_REVISION=0 +LT_AGE=0 - LT_VERSION_INFO='-version-info ${LT_CURRENT}:${LT_REVISION}:${LT_AGE}' - - -@@ -20821,7 +20821,7 @@ - - - # this should go away soon -- need_gnome_support=yes -+ need_gnome_support=no - - - for ac_func in getopt_long -@@ -30052,13 +30052,13 @@ - - fi; - --if test "x$gnome_found" = xyes ; then -- LIBSUPPORT="$GNOME_LIBDIR -lgnomesupport" -- SUPPORTINCS="$GNOME_INCLUDEDIR" --else -- LIBSUPPORT='$(top_builddir)/support/libgnomesupport-2.0.la' -- SUPPORTINCS='-DNEED_GNOMESUPPORT_H -I$(top_builddir)/support -I$(top_srcdir)/support' --fi -+#if test "x$gnome_found" = xyes ; then -+# LIBSUPPORT="$GNOME_LIBDIR -lgnomesupport" -+# SUPPORTINCS="$GNOME_INCLUDEDIR" -+#else -+# LIBSUPPORT='$(top_builddir)/support/libgnomesupport-2.0.la' -+# SUPPORTINCS='-DNEED_GNOMESUPPORT_H -I$(top_builddir)/support -I$(top_srcdir)/support' -+#fi - - case "$GNOME_LIBS" in - '*-lgnomesupport*' ) -@@ -30160,7 +30160,7 @@ + LT_VERSION_INFO="-version-info ${LT_CURRENT}:${LT_REVISION}:${LT_AGE}" - if test x$libgtop_need_server = xyes ; then -- sysdeps_suid_lib="\$(top_builddir)/sysdeps/\$(sysdeps_dir)/libgtop_sysdeps_suid-2.0.la" -+ sysdeps_suid_lib="\$(top_builddir)/sysdeps/\$(sysdeps_dir)/libgtop_sysdeps_suid-2.0.la \$(top_builddir)/sysdeps/common/libgtop_suid_common-2.0.la" - server_programs='libgtop_server2' - else - sysdeps_suid_lib= diff --git a/devel/libgtop2/files/patch-lib::read.c b/devel/libgtop2/files/patch-lib::read.c index 0190c885d713..38583f8766a9 100644 --- a/devel/libgtop2/files/patch-lib::read.c +++ b/devel/libgtop2/files/patch-lib::read.c @@ -1,14 +1,14 @@ ---- lib/read.c.orig Fri May 7 07:09:24 1999 -+++ lib/read.c Tue Sep 9 10:02:54 2003 -@@ -21,6 +21,7 @@ - Boston, MA 02111-1307, USA. +--- lib/read.c.orig Mon Oct 20 11:19:41 2003 ++++ lib/read.c Fri Nov 14 14:37:00 2003 +@@ -22,6 +22,7 @@ */ + #include <config.h> +#include <errno.h> #include <glibtop/read.h> + #include <libgnome/gnome-i18n.h> - /* Reads some data from server. */ -@@ -65,12 +66,16 @@ +@@ -68,12 +69,16 @@ fprintf (stderr, "LIBRARY: really reading %d bytes.\n", size); #endif diff --git a/devel/libgtop2/files/patch-src::daemon::gnuserv.c b/devel/libgtop2/files/patch-src::daemon::gnuserv.c deleted file mode 100644 index a398b2aca70d..000000000000 --- a/devel/libgtop2/files/patch-src::daemon::gnuserv.c +++ /dev/null @@ -1,24 +0,0 @@ ---- src/daemon/gnuserv.c.orig Mon Oct 20 01:54:32 2003 -+++ src/daemon/gnuserv.c Tue Nov 4 15:22:38 2003 -@@ -42,7 +42,7 @@ - #include <glibtop/gnuserv.h> - - #include <errno.h> --#include <popt-gnome.h> -+#include <popt.h> - - #include "daemon.h" - -@@ -202,6 +202,12 @@ - - if (auth_data_len < 1 || auth_data_len > sizeof(buf)) { - syslog_message(LOG_WARNING, "Invalid data length supplied by client"); -+ return FALSE; -+ } -+ -+ if (auth_data_len < 1 || auth_data_len > sizeof(buf)) { -+ syslog_message(LOG_WARNING, -+ "Invalid data length supplied by client"); - return FALSE; - } - diff --git a/devel/libgtop2/files/patch-src::daemon::io.c b/devel/libgtop2/files/patch-src::daemon::io.c index b4079dec132d..0a11649ced4d 100644 --- a/devel/libgtop2/files/patch-src::daemon::io.c +++ b/devel/libgtop2/files/patch-src::daemon::io.c @@ -1,5 +1,5 @@ ---- src/daemon/io.c.orig Tue Sep 9 09:51:15 2003 -+++ src/daemon/io.c Tue Sep 9 10:07:10 2003 +--- src/daemon/io.c.orig Sun Oct 19 12:54:32 2003 ++++ src/daemon/io.c Mon Dec 1 13:50:25 2003 @@ -21,6 +21,7 @@ Boston, MA 02111-1307, USA. */ diff --git a/devel/libgtop2/files/patch-src_daemon_Makefile.in b/devel/libgtop2/files/patch-src_daemon_Makefile.in deleted file mode 100644 index 04aa141eb588..000000000000 --- a/devel/libgtop2/files/patch-src_daemon_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- src/daemon/Makefile.in.orig Mon Apr 29 12:05:45 2002 -+++ src/daemon/Makefile.in Mon Apr 29 12:12:14 2002 -@@ -92,7 +92,7 @@ - LIBGTOP_GUILE_NAMES_LIBS = @LIBGTOP_GUILE_NAMES_LIBS@ - LIBGTOP_INCS = @LIBGTOP_INCS@ - LIBGTOP_INTERFACE_AGE = @LIBGTOP_INTERFACE_AGE@ --LIBGTOP_LIBS = @LIBGTOP_LIBS@ -+LIBGTOP_LIBS = - LIBGTOP_MAJOR_VERSION = @LIBGTOP_MAJOR_VERSION@ - LIBGTOP_MICRO_VERSION = @LIBGTOP_MICRO_VERSION@ - LIBGTOP_MINOR_VERSION = @LIBGTOP_MINOR_VERSION@ diff --git a/devel/libgtop2/files/patch-support_Makefile.in b/devel/libgtop2/files/patch-support_Makefile.in deleted file mode 100644 index e7cf9ec0ab23..000000000000 --- a/devel/libgtop2/files/patch-support_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- support/Makefile.in.orig Mon Apr 29 13:02:18 2002 -+++ support/Makefile.in Mon Apr 29 13:03:33 2002 -@@ -146,7 +146,7 @@ - sysdeps_dir = @sysdeps_dir@ - sysdeps_suid_lib = @sysdeps_suid_lib@ - --supportexecincludedir = $(includedir)/gnome/$(GNOME_INTERFACE_VERSION) -+supportexecincludedir = $(includedir)/libgtop-2.0 - - INCLUDES = -D_GNU_SOURCE - diff --git a/devel/libgtop2/files/patch-sysdeps::freebsd::prockernel.c b/devel/libgtop2/files/patch-sysdeps::freebsd::prockernel.c deleted file mode 100644 index 396ae9c8d7b6..000000000000 --- a/devel/libgtop2/files/patch-sysdeps::freebsd::prockernel.c +++ /dev/null @@ -1,145 +0,0 @@ ---- sysdeps/freebsd/prockernel.c.orig Sun Oct 17 03:31:43 1999 -+++ sysdeps/freebsd/prockernel.c Tue Sep 9 11:36:35 2003 -@@ -34,12 +34,6 @@ - #if (!defined __OpenBSD__) && (!defined __bsdi__) - #include <sys/user.h> - #endif --#if !defined(__bsdi__) && !(defined(__FreeBSD__) && defined(__alpha__)) --#include <machine/pcb.h> --#endif --#if defined(__FreeBSD__) && !defined(__alpha__) --#include <machine/tss.h> --#endif - - #include <unistd.h> - #include <fcntl.h> -@@ -78,14 +72,8 @@ - pid_t pid) - { - struct kinfo_proc *pinfo; -- struct user *u_addr = (struct user *)USRSTACK; -- struct pstats pstats; -- struct pcb pcb; - int count; - -- char filename [BUFSIZ]; -- struct stat statb; -- - glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_PROC_KERNEL), 0); - - memset (buf, 0, sizeof (glibtop_proc_kernel)); -@@ -98,14 +86,30 @@ - - /* Get the process information */ - pinfo = kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, &count); -- if ((pinfo == NULL) || (count != 1)) -- glibtop_error_io_r (server, "kvm_getprocs (%d)", pid); -+ if ((pinfo == NULL) || (count != 1)) { -+ glibtop_warn_io_r (server, "kvm_getprocs (%d)", pid); -+ return; -+ } -+ -+#if __FreeBSD_version >= 500013 -+ -+#define XXX_P_WCHAN ki_wchan -+#define XXX_P_WMESG ki_wmesg -+#define XXX_E_WMESG ki_wmesg - -- buf->nwchan = (unsigned long) pinfo [0].kp_proc.p_wchan &~ KERNBASE; -+#else -+ -+#define XXX_P_WCHAN kp_proc.p_wchan -+#define XXX_P_WMESG kp_proc.p_wmesg -+#define XXX_E_WMESG kp_eproc.e_wmesg -+ -+#endif -+ -+ buf->nwchan = (unsigned long) pinfo [0].XXX_P_WCHAN &~ KERNBASE; - buf->flags |= (1L << GLIBTOP_PROC_KERNEL_NWCHAN); - -- if (pinfo [0].kp_proc.p_wchan && pinfo [0].kp_proc.p_wmesg) { -- strncpy (buf->wchan, pinfo [0].kp_eproc.e_wmesg, -+ if (pinfo [0].XXX_P_WCHAN && pinfo [0].XXX_P_WMESG) { -+ strncpy (buf->wchan, pinfo [0].XXX_E_WMESG, - sizeof (buf->wchan) - 1); - buf->wchan [sizeof (buf->wchan) - 1] = 0; - buf->flags |= (1L << GLIBTOP_PROC_KERNEL_WCHAN); -@@ -113,72 +117,10 @@ - buf->wchan [0] = 0; - } - -- /* Taken from `saveuser ()' in `/usr/src/bin/ps/ps.c'. */ -- -- /* [FIXME]: /usr/include/sys/user.h tells me that the user area -- * may or may not be at the same kernel address in all -- * processes, but I don't see any way to get that address. -- * Since `ps' simply uses its own address, I think it's -- * safe to do this here, too. */ -- -- /* NOTE: You need to mount the /proc filesystem to make -- * `kvm_uread' work. */ -- -- sprintf (filename, "/proc/%d/mem", (int) pid); -- if (stat (filename, &statb)) return; -- -- glibtop_suid_enter (server); -- -- if ((pinfo [0].kp_proc.p_flag & P_INMEM) && -- kvm_uread (server->machine.kd, &(pinfo [0]).kp_proc, -- (unsigned long) &u_addr->u_stats, -- (char *) &pstats, sizeof (pstats)) == sizeof (pstats)) -- { -- /* -- * The u-area might be swapped out, and we can't get -- * at it because we have a crashdump and no swap. -- * If it's here fill in these fields, otherwise, just -- * leave them 0. -- */ -- -- buf->min_flt = (u_int64_t) pstats.p_ru.ru_minflt; -- buf->maj_flt = (u_int64_t) pstats.p_ru.ru_majflt; -- buf->cmin_flt = (u_int64_t) pstats.p_cru.ru_minflt; -- buf->cmaj_flt = (u_int64_t) pstats.p_cru.ru_majflt; -- -- buf->flags |= _glibtop_sysdeps_proc_kernel_pstats; -- } -- -- if ((pinfo [0].kp_proc.p_flag & P_INMEM) && -- kvm_uread (server->machine.kd, &(pinfo [0]).kp_proc, -- (unsigned long) &u_addr->u_pcb, -- (char *) &pcb, sizeof (pcb)) == sizeof (pcb)) -- { --#ifdef __FreeBSD__ --#ifndef __alpha__ --#if (__FreeBSD_version >= 300003) -- buf->kstk_esp = (u_int64_t) pcb.pcb_esp; -- buf->kstk_eip = (u_int64_t) pcb.pcb_eip; --#else -- buf->kstk_esp = (u_int64_t) pcb.pcb_ksp; -- buf->kstk_eip = (u_int64_t) pcb.pcb_pc; --#endif --#else -- /*xxx FreeBSD/Alpha? */ --#endif --#else -- buf->kstk_esp = (u_int64_t) pcb.pcb_tss.tss_esp0; --#ifdef __bsdi__ -- buf->kstk_eip = (u_int64_t) pcb.pcb_tss.tss_eip; --#else -- buf->kstk_eip = (u_int64_t) pcb.pcb_tss.__tss_eip; --#endif -- -- buf->flags |= _glibtop_sysdeps_proc_kernel_pcb; --#endif -- } -- -- /* Taken from `wchan ()' in `/usr/src/bin/ps/print.c'. */ -- -- glibtop_suid_leave (server); -+ /* XXX: the code here was, quite frankly, junk, and almost -+ * certainly wrong - remove it all, leave these fields -+ * unpopulated, and give up until such time as the right -+ * code is produced for both FreeBSD 4.x and 5.x -+ */ -+ return; - } diff --git a/devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c b/devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c index 83e5080548ab..e61274b13864 100644 --- a/devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c +++ b/devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c @@ -1,6 +1,6 @@ ---- sysdeps/freebsd/procmem.c.orig Sun Oct 19 12:55:32 2003 -+++ sysdeps/freebsd/procmem.c Sat Feb 7 22:48:12 2004 -@@ -117,7 +117,7 @@ +--- sysdeps/freebsd/procmem.c.orig Wed Mar 10 21:23:52 2004 ++++ sysdeps/freebsd/procmem.c Thu Mar 11 15:46:05 2004 +@@ -125,7 +125,7 @@ #else struct vm_object object; #endif @@ -9,53 +9,22 @@ int count; glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_PROC_MEM), 0); -@@ -137,15 +137,29 @@ - return; - } +@@ -160,15 +160,12 @@ + + #define PROC_VMSPACE kp_proc.p_vmspace - if (kvm_read (server->machine.kd, -- (unsigned long) pinfo [0].kp_proc.p_limit, +- (unsigned long) pinfo [0].PROC_VMSPACE, - (char *) &plimit, sizeof (plimit)) != sizeof (plimit)) { - glibtop_warn_io_r (server, "kvm_read (plimit)"); -+#if __FreeBSD_version >= 500013 -+ -+#define XXX_P_VMSPACE ki_vmspace -+ -+ buf->rss_rlim = pinfo [0].ki_rssize; -+ -+ buf->vsize = (u_int64_t) pinfo [0].ki_size; -+ buf->size = (u_int64_t) pagetok -+ (pinfo [0].ki_tsize + pinfo [0].ki_dsize + pinfo[0].ki_ssize) -+ << LOG1024; -+ buf->resident = buf->rss = (u_int64_t) pagetok -+ (pinfo [0].ki_rssize) << LOG1024; -+ -+#else -+ -+#define XXX_P_VMSPACE kp_proc.p_vmspace -+ + if (getrlimit (RLIMIT_RSS, &rlimit) < 0) { -+ glibtop_warn_io_r (server, "getrlimit"); ++ glibtop_warn_io_r (server, "getrlimit"); return; } -- buf->rss_rlim = (u_int64_t) +- buf->rss_rlim = (guint64) - (plimit.pl_rlimit [RLIMIT_RSS].rlim_cur); + buf->rss_rlim = (u_int64_t) (rlimit.rlim_cur); vms = &pinfo [0].kp_eproc.e_vm; -@@ -154,11 +168,12 @@ - - buf->resident = buf->rss = (u_int64_t) pagetok - (vms->vm_rssize) << LOG1024; -+#endif - - /* Now we get the shared memory. */ - - if (kvm_read (server->machine.kd, -- (unsigned long) pinfo [0].kp_proc.p_vmspace, -+ (unsigned long) pinfo [0].XXX_P_VMSPACE, - (char *) &vmspace, sizeof (vmspace)) != sizeof (vmspace)) { - glibtop_warn_io_r (server, "kvm_read (vmspace)"); - return; diff --git a/devel/libgtop2/files/patch-sysdeps::freebsd::proctime.c b/devel/libgtop2/files/patch-sysdeps::freebsd::proctime.c index 8905fd21ba83..37b5b56df49a 100644 --- a/devel/libgtop2/files/patch-sysdeps::freebsd::proctime.c +++ b/devel/libgtop2/files/patch-sysdeps::freebsd::proctime.c @@ -1,30 +1,20 @@ ---- sysdeps/freebsd/proctime.c.orig Thu Feb 15 06:36:42 2001 -+++ sysdeps/freebsd/proctime.c Tue Sep 9 11:17:56 2003 -@@ -57,6 +57,7 @@ - * system, and interrupt time usage. - */ +--- sysdeps/freebsd/proctime.c.orig Wed Mar 10 21:23:52 2004 ++++ sysdeps/freebsd/proctime.c Thu Mar 11 15:47:35 2004 +@@ -59,6 +59,7 @@ + + #ifndef __FreeBSD__ +#ifndef __FreeBSD__ static void calcru(p, up, sp, ip) struct proc *p; -@@ -66,9 +67,6 @@ - { - quad_t totusec; - u_quad_t u, st, ut, it, tot; --#if (__FreeBSD_version < 300003) -- long sec, usec; --#endif - struct timeval tv; - - st = p->p_sticks; -@@ -81,19 +79,10 @@ +@@ -81,19 +82,10 @@ tot = 1; } -#if (defined __FreeBSD__) && (__FreeBSD_version >= 300003) - -- /* This was changed from a `struct timeval' into a `u_int64_t' +- /* This was changed from a `struct timeval' into a `guint64' - * on FreeBSD 3.0 and renamed p_rtime -> p_runtime. - */ - @@ -38,116 +28,21 @@ if (totusec < 0) { /* XXX no %qd in kernel. Truncate. */ -@@ -116,6 +105,7 @@ +@@ -116,6 +108,7 @@ ip->tv_usec = it % 1000000; } } +#endif - /* Provides detailed information about a process. */ + #endif /* !__FreeBSD__ */ -@@ -132,9 +122,6 @@ +@@ -133,9 +126,6 @@ + #endif struct pstats pstats; int count; - +- - char filename [BUFSIZ]; - struct stat statb; -- + glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_PROC_TIME), 0); - memset (buf, 0, sizeof (glibtop_proc_time)); -@@ -142,25 +129,23 @@ - /* It does not work for the swapper task. */ - if (pid == 0) return; - --#if !(defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)) -+#if (defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)) - if (server->sysdeps.proc_time == 0) - return; - --#ifndef __bsdi__ -- sprintf (filename, "/proc/%d/mem", (int) pid); -- if (stat (filename, &statb)) return; --#endif - #endif - - /* Get the process information */ - pinfo = kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, &count); -- if ((pinfo == NULL) || (count != 1)) -- glibtop_error_io_r (server, "kvm_getprocs (%d)", pid); -+ if ((pinfo == NULL) || (count != 1)) { -+ glibtop_warn_io_r (server, "kvm_getprocs (%d)", pid); -+ return; -+ } - --#if (defined __FreeBSD__) && (__FreeBSD_version >= 300003) -- buf->rtime = pinfo [0].kp_proc.p_runtime; -+#if (defined __FreeBSD__) && (__FreeBSD_version >= 500013) -+ buf->rtime = pinfo [0].ki_runtime; - #else -- buf->rtime = tv2sec (pinfo [0].kp_proc.p_rtime); -+ buf->rtime = pinfo [0].kp_proc.p_runtime; - #endif - - buf->frequency = 1000000; -@@ -192,6 +177,21 @@ - - buf->flags |= _glibtop_sysdeps_proc_time_user; - #else -+#if __FreeBSD_version >= 500013 -+#if __FreeBSD_version >= 500016 -+ if ((pinfo [0].ki_sflag & PS_INMEM)) { -+#else -+ if ((pinfo [0].ki_flag & P_INMEM)) { -+#endif -+ buf->utime = pinfo [0].ki_runtime; -+ buf->stime = 0; /* XXX */ -+ buf->cutime = tv2sec (pinfo [0].ki_childtime); -+ buf->cstime = 0; /* XXX */ -+ buf->start_time = tv2sec (pinfo [0].ki_start); -+ buf->flags |= _glibtop_sysdeps_proc_time_user; -+ } -+ -+#else - glibtop_suid_enter (server); - - if ((pinfo [0].kp_proc.p_flag & P_INMEM) && -@@ -199,31 +199,17 @@ - (unsigned long) &u_addr->u_stats, - (char *) &pstats, sizeof (pstats)) == sizeof (pstats)) - { -- /* This is taken form the kernel source code of -- * FreeBSD 2.2.6. */ -- -- /* Well, we just do the same getrusage () does ... */ -- -- register struct rusage *rup; - -+ buf->utime = tv2sec (pinfo[0].kp_eproc.e_stats.p_ru.ru_utime); -+ buf->stime = tv2sec (pinfo[0].kp_eproc.e_stats.p_ru.ru_stime); -+ buf->cutime = tv2sec (pinfo[0].kp_eproc.e_stats.p_cru.ru_utime); -+ buf->cstime = tv2sec (pinfo[0].kp_eproc.e_stats.p_cru.ru_stime); -+ buf->start_time = tv2sec (pinfo[0].kp_eproc.e_stats.p_start); -+ buf->flags |= _glibtop_sysdeps_proc_time_user; - glibtop_suid_leave (server); -- -- rup = &pstats.p_ru; -- calcru(&(pinfo [0]).kp_proc, -- &rup->ru_utime, &rup->ru_stime, NULL); -- -- buf->utime = tv2sec (pstats.p_ru.ru_utime); -- buf->stime = tv2sec (pstats.p_ru.ru_stime); -- -- buf->cutime = tv2sec (pstats.p_cru.ru_utime); -- buf->cstime = tv2sec (pstats.p_cru.ru_stime); -- -- buf->start_time = tv2sec (pstats.p_start); -- -- buf->flags = _glibtop_sysdeps_proc_time_user; - } -- - glibtop_suid_leave (server); -+#endif - #endif - } - diff --git a/devel/libgtop2/files/patch-sysdeps_common_fsusage.c b/devel/libgtop2/files/patch-sysdeps_common_fsusage.c new file mode 100644 index 000000000000..b64ec49863bf --- /dev/null +++ b/devel/libgtop2/files/patch-sysdeps_common_fsusage.c @@ -0,0 +1,29 @@ +--- sysdeps/common/fsusage.c.orig Thu Mar 11 15:53:36 2004 ++++ sysdeps/common/fsusage.c Thu Mar 11 15:56:37 2004 +@@ -28,7 +28,7 @@ + # endif + #endif + #ifndef UINTMAX_MAX +-# define UINTMAX_MAX ((uintmax_t) -1) ++# define UINTMAX_MAX ((uint64_t) -1) + #endif + + #include <sys/types.h> +@@ -84,7 +84,7 @@ + a uintmax_t value that is all 1 bits if X is all 1 bits, even if X + is unsigned and narrower than uintmax_t. */ + #define PROPAGATE_ALL_ONES(x) \ +- ((sizeof (x) < sizeof (uintmax_t) \ ++ ((sizeof (x) < sizeof (uint64_t) \ + && (~ (x) == (sizeof (x) < sizeof (int) \ + ? - (1 << (sizeof (x) * CHAR_BIT)) \ + : 0))) \ +@@ -92,7 +92,7 @@ + + /* Extract the top bit of X as an uintmax_t value. */ + #define EXTRACT_TOP_BIT(x) ((x) \ +- & ((uintmax_t) 1 << (sizeof (x) * CHAR_BIT - 1))) ++ & ((uint64_t) 1 << (sizeof (x) * CHAR_BIT - 1))) + + /* If a value is negative, many space usage primitives store it into an + integer variable by assignment, even if the variable's type is unsigned. diff --git a/devel/libgtop2/files/patch-sysdeps_common_fsusage.h b/devel/libgtop2/files/patch-sysdeps_common_fsusage.h new file mode 100644 index 000000000000..bca23d9aea9d --- /dev/null +++ b/devel/libgtop2/files/patch-sysdeps_common_fsusage.h @@ -0,0 +1,25 @@ +--- sysdeps/common/fsusage.h.orig Thu Mar 11 15:54:03 2004 ++++ sysdeps/common/fsusage.h Thu Mar 11 15:56:12 2004 +@@ -20,15 +20,17 @@ + #if !defined FSUSAGE_H_ + # define FSUSAGE_H_ + ++#include <sys/types.h> ++ + struct fs_usage + { + int fsu_blocksize; /* Size of a block. */ +- uintmax_t fsu_blocks; /* Total blocks. */ +- uintmax_t fsu_bfree; /* Free blocks available to superuser. */ +- uintmax_t fsu_bavail; /* Free blocks available to non-superuser. */ ++ uint64_t fsu_blocks; /* Total blocks. */ ++ uint64_t fsu_bfree; /* Free blocks available to superuser. */ ++ uint64_t fsu_bavail; /* Free blocks available to non-superuser. */ + int fsu_bavail_top_bit_set; /* 1 if fsu_bavail represents a value < 0. */ +- uintmax_t fsu_files; /* Total file nodes. */ +- uintmax_t fsu_ffree; /* Free file nodes. */ ++ uint64_t fsu_files; /* Total file nodes. */ ++ uint64_t fsu_ffree; /* Free file nodes. */ + }; + + # ifndef PARAMS diff --git a/devel/libgtop2/files/patch-sysdeps_common_mountlist.c b/devel/libgtop2/files/patch-sysdeps_common_mountlist.c index 31b0d3288347..62269380b46b 100644 --- a/devel/libgtop2/files/patch-sysdeps_common_mountlist.c +++ b/devel/libgtop2/files/patch-sysdeps_common_mountlist.c @@ -1,6 +1,6 @@ ---- sysdeps/common/mountlist.c.orig Fri Dec 19 12:23:02 2003 -+++ sysdeps/common/mountlist.c Fri Dec 19 12:23:41 2003 -@@ -136,7 +136,7 @@ +--- sysdeps/common/mountlist.c.orig Mon Dec 1 13:59:28 2003 ++++ sysdeps/common/mountlist.c Mon Dec 1 16:13:15 2003 +@@ -127,7 +127,7 @@ } #endif /* MOUNTED_GETMNTENT1. */ @@ -9,12 +9,12 @@ static char * fstype_to_string (t) short t; -@@ -354,7 +354,7 @@ - me = (struct mount_entry *) xmalloc (sizeof (struct mount_entry)); - me->me_devname = xstrdup (fsp->f_mntfromname); - me->me_mountdir = xstrdup (fsp->f_mntonname); +@@ -345,7 +345,7 @@ + me = (struct mount_entry *) g_malloc (sizeof (struct mount_entry)); + me->me_devname = g_strdup (fsp->f_mntfromname); + me->me_mountdir = g_strdup (fsp->f_mntonname); -#if defined(__NetBSD__) || defined(__OpenBSD__) +#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) - me->me_type = xstrdup (fsp->f_fstypename); + me->me_type = g_strdup (fsp->f_fstypename); #else - me->me_type = xstrdup (fstype_to_string (fsp->f_type)); + me->me_type = g_strdup (fstype_to_string (fsp->f_type)); diff --git a/devel/libgtop2/files/patch-sysdeps_freebsd_Makefile.in b/devel/libgtop2/files/patch-sysdeps_freebsd_Makefile.in new file mode 100644 index 000000000000..16bcbb055472 --- /dev/null +++ b/devel/libgtop2/files/patch-sysdeps_freebsd_Makefile.in @@ -0,0 +1,20 @@ +--- sysdeps/freebsd/Makefile.in.orig Sun Feb 15 16:13:22 2004 ++++ sysdeps/freebsd/Makefile.in Sun Feb 15 16:16:05 2004 +@@ -138,7 +138,7 @@ + + noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la + +-libgtop_sysdeps_2_0_la_SOURCES = nosuid.c siglist.c ++libgtop_sysdeps_2_0_la_SOURCES = nosuid.c + + libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO) + +@@ -172,7 +172,7 @@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ + libgtop_sysdeps_2_0_la_LIBADD = +-libgtop_sysdeps_2_0_la_OBJECTS = nosuid.lo siglist.lo ++libgtop_sysdeps_2_0_la_OBJECTS = nosuid.lo + libgtop_sysdeps_suid_2_0_la_LIBADD = + libgtop_sysdeps_suid_2_0_la_OBJECTS = open.lo close.lo siglist.lo \ + cpu.lo mem.lo swap.lo uptime.lo loadavg.lo shm_limits.lo msg_limits.lo \ diff --git a/devel/libgtop2/files/patch-sysdeps_freebsd_mem.c b/devel/libgtop2/files/patch-sysdeps_freebsd_mem.c deleted file mode 100644 index 2aa4b753479f..000000000000 --- a/devel/libgtop2/files/patch-sysdeps_freebsd_mem.c +++ /dev/null @@ -1,11 +0,0 @@ ---- sysdeps/freebsd/mem.c.orig Tue Jan 14 17:22:18 2003 -+++ sysdeps/freebsd/mem.c Tue Jan 14 17:22:28 2003 -@@ -75,7 +75,7 @@ - - /* MIB array for sysctl */ - static int mib_length=2; --#ifdef __bsdi__ -+#ifndef VM_METER - static int mib [] = { CTL_VM, VM_TOTAL }; - #else - static int mib [] = { CTL_VM, VM_METER }; diff --git a/devel/libgtop2/files/patch-sysdeps_freebsd_netload.c b/devel/libgtop2/files/patch-sysdeps_freebsd_netload.c deleted file mode 100644 index 0e72ddb7853c..000000000000 --- a/devel/libgtop2/files/patch-sysdeps_freebsd_netload.c +++ /dev/null @@ -1,81 +0,0 @@ ---- sysdeps/freebsd/netload.c.orig Mon Oct 20 01:55:32 2003 -+++ sysdeps/freebsd/netload.c Fri Nov 14 23:09:15 2003 -@@ -83,6 +83,7 @@ - u_long ifnetaddr, ifnetfound, ifaddraddr; - struct sockaddr *sa; - char tname [16]; -+ char temp [16]; - - union { - struct ifaddr ifa; -@@ -109,10 +110,13 @@ - sizeof (ifnet)) != sizeof (ifnet)) - glibtop_error_io_r (server, "kvm_read (ifnetaddr)"); - --#if defined(__FreeBSD__) || defined(__bsdi__) -+#if (defined(__FreeBSD__) && (__FreeBSD_version < 501113)) || defined(__bsdi__) - if (kvm_read (server->machine.kd, (u_long) ifnet.if_name, - tname, 16) != 16) - glibtop_error_io_r (server, "kvm_read (if_name)"); -+ snprintf(temp, (15 - strlen(tname)), "%d", ifnet.if_unit); -+ strcat(tname, temp); -+ tname [15] = 0; - #else - strncpy (tname, ifnet.if_xname, 16); - tname [15] = 0; -@@ -140,39 +144,39 @@ - sin = (struct sockaddr_in *)sa; - - if (ifnet.if_flags & IFF_UP) -- buf->if_flags |= GLIBTOP_IF_FLAGS_UP; -+ buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_UP); - if (ifnet.if_flags & IFF_BROADCAST) -- buf->if_flags |= GLIBTOP_IF_FLAGS_BROADCAST; -+ buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_BROADCAST); - if (ifnet.if_flags & IFF_DEBUG) -- buf->if_flags |= GLIBTOP_IF_FLAGS_DEBUG; -+ buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_DEBUG); - if (ifnet.if_flags & IFF_LOOPBACK) -- buf->if_flags |= GLIBTOP_IF_FLAGS_LOOPBACK; -+ buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LOOPBACK); - if (ifnet.if_flags & IFF_POINTOPOINT) -- buf->if_flags |= GLIBTOP_IF_FLAGS_POINTOPOINT; -+ buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_POINTOPOINT); - if (ifnet.if_flags & IFF_RUNNING) -- buf->if_flags |= GLIBTOP_IF_FLAGS_RUNNING; -+ buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_RUNNING); - if (ifnet.if_flags & IFF_NOARP) -- buf->if_flags |= GLIBTOP_IF_FLAGS_NOARP; -+ buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_NOARP); - if (ifnet.if_flags & IFF_PROMISC) -- buf->if_flags |= GLIBTOP_IF_FLAGS_PROMISC; -+ buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_PROMISC); - if (ifnet.if_flags & IFF_ALLMULTI) -- buf->if_flags |= GLIBTOP_IF_FLAGS_ALLMULTI; -+ buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_ALLMULTI); - if (ifnet.if_flags & IFF_OACTIVE) -- buf->if_flags |= GLIBTOP_IF_FLAGS_OACTIVE; -+ buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_OACTIVE); - if (ifnet.if_flags & IFF_SIMPLEX) -- buf->if_flags |= GLIBTOP_IF_FLAGS_SIMPLEX; -+ buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_SIMPLEX); - if (ifnet.if_flags & IFF_LINK0) -- buf->if_flags |= GLIBTOP_IF_FLAGS_LINK0; -+ buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LINK0); - if (ifnet.if_flags & IFF_LINK1) -- buf->if_flags |= GLIBTOP_IF_FLAGS_LINK1; -+ buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LINK1); - if (ifnet.if_flags & IFF_LINK2) -- buf->if_flags |= GLIBTOP_IF_FLAGS_LINK2; -+ buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LINK2); - #ifdef __FreeBSD__ - if (ifnet.if_flags & IFF_ALTPHYS) -- buf->if_flags |= GLIBTOP_IF_FLAGS_ALTPHYS; -+ buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_ALTPHYS); - #endif - if (ifnet.if_flags & IFF_MULTICAST) -- buf->if_flags |= GLIBTOP_IF_FLAGS_MULTICAST; -+ buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_MULTICAST); - - #if !defined(__bsdi__) - /* Commenting out to "fix" #13345. */ diff --git a/devel/libgtop2/files/patch-sysdeps_freebsd_uptime.c b/devel/libgtop2/files/patch-sysdeps_freebsd_uptime.c new file mode 100644 index 000000000000..7dbba8c37ab1 --- /dev/null +++ b/devel/libgtop2/files/patch-sysdeps_freebsd_uptime.c @@ -0,0 +1,13 @@ +--- sysdeps/freebsd/uptime.c.orig Thu Mar 11 15:59:16 2004 ++++ sysdeps/freebsd/uptime.c Thu Mar 11 15:59:38 2004 +@@ -68,9 +68,8 @@ + buf->flags = _glibtop_sysdeps_uptime; + } + #else +- buf->flags = _glibtop_sysdeps_uptime; +- + glibtop_cpu cpu; ++ buf->flags = _glibtop_sysdeps_uptime; + + glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_UPTIME), 0); + diff --git a/devel/libgtop2/pkg-descr b/devel/libgtop2/pkg-descr index be81b3b48135..f263f1127244 100644 --- a/devel/libgtop2/pkg-descr +++ b/devel/libgtop2/pkg-descr @@ -1,3 +1,3 @@ -This is library for the gtop2, the GNOME 2.0 version of top command. -The top command is a tool to display and update information about the -top cpu processes. +This library provides the backend for gtop2, a GNOME 2.0 version +of top(1) that allows display and manipulation of running +processes. diff --git a/devel/libgtop2/pkg-plist b/devel/libgtop2/pkg-plist index bb6b1079e8c4..e7d4a4b74b93 100644 --- a/devel/libgtop2/pkg-plist +++ b/devel/libgtop2/pkg-plist @@ -40,28 +40,12 @@ include/libgtop-2.0/glibtop/union.h include/libgtop-2.0/glibtop/uptime.h include/libgtop-2.0/glibtop/version.h include/libgtop-2.0/glibtop/write.h -include/libgtop-2.0/glibtop/xmalloc.h include/libgtop-2.0/glibtop_machine.h include/libgtop-2.0/glibtop_server.h include/libgtop-2.0/glibtop_suid.h lib/libgtop-2.0.a lib/libgtop-2.0.so lib/libgtop-2.0.so.2 -lib/libgtop_common-2.0.a -lib/libgtop_common-2.0.so -lib/libgtop_common-2.0.so.2 -lib/libgtop_names-2.0.a -lib/libgtop_names-2.0.so -lib/libgtop_names-2.0.so.2 -lib/libgtop_suid_common-2.0.a -lib/libgtop_suid_common-2.0.so -lib/libgtop_suid_common-2.0.so.2 -lib/libgtop_sysdeps-2.0.a -lib/libgtop_sysdeps-2.0.so -lib/libgtop_sysdeps-2.0.so.2 -lib/libgtop_sysdeps_suid-2.0.a -lib/libgtop_sysdeps_suid-2.0.so -lib/libgtop_sysdeps_suid-2.0.so.2 libdata/pkgconfig/libgtop-2.0.pc share/locale/am/LC_MESSAGES/libgtop-2.0.mo share/locale/ar/LC_MESSAGES/libgtop-2.0.mo @@ -84,6 +68,7 @@ share/locale/ga/LC_MESSAGES/libgtop-2.0.mo share/locale/gl/LC_MESSAGES/libgtop-2.0.mo share/locale/he/LC_MESSAGES/libgtop-2.0.mo share/locale/hi/LC_MESSAGES/libgtop-2.0.mo +share/locale/hr/LC_MESSAGES/libgtop-2.0.mo share/locale/hu/LC_MESSAGES/libgtop-2.0.mo share/locale/id/LC_MESSAGES/libgtop-2.0.mo share/locale/it/LC_MESSAGES/libgtop-2.0.mo diff --git a/editors/gedit2/Makefile b/editors/gedit2/Makefile index d9331404264b..c62463a22acb 100644 --- a/editors/gedit2/Makefile +++ b/editors/gedit2/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gedit2 -PORTVERSION= 2.4.1 -PORTREVISION= 1 +PORTVERSION= 2.6.0 CATEGORIES= editors gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.4 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.6 DISTNAME= gedit-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -24,11 +23,11 @@ USE_X_PREFIX= yes INSTALLS_SHLIB= yes USE_GMAKE= yes USE_LIBTOOL_VER=13 -USE_GNOME= gnomeprefix gnomehack gnomehier libgnomeprintui libgnomeui \ - eel2 gtksourceview +USE_GNOME= gnomeprefix gnomehack intlhack lthack gnomehier \ + libgnomeprintui libgnomeui eel2 gtksourceview CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -PLIST_SUB= VERSION="2.4" +PLIST_SUB= VERSION="2.6" MAN1= gedit.1 diff --git a/editors/gedit2/distinfo b/editors/gedit2/distinfo index a45d19fed636..368949140262 100644 --- a/editors/gedit2/distinfo +++ b/editors/gedit2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gedit-2.4.1.tar.bz2) = ebc37dbf48451dcacb04313bcdf2e3a6 -SIZE (gnome2/gedit-2.4.1.tar.bz2) = 1860967 +MD5 (gnome2/gedit-2.6.0.tar.bz2) = 1c023363f917b99a57ee866da67dd66b +SIZE (gnome2/gedit-2.6.0.tar.bz2) = 2261888 diff --git a/editors/gedit2/files/patch-configure b/editors/gedit2/files/patch-configure index 843cf5e98068..91c1e9a657d0 100644 --- a/editors/gedit2/files/patch-configure +++ b/editors/gedit2/files/patch-configure @@ -1,14 +1,22 @@ ---- configure.orig Tue Dec 17 05:27:57 2002 -+++ configure Sun Dec 22 17:31:25 2002 -@@ -7270,6 +7270,7 @@ - - # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+$ac_aux_dir/ltconfig $LIBTOOL_DEPS +--- configure.orig Wed Feb 25 02:26:37 2004 ++++ configure Wed Feb 25 02:27:22 2004 +@@ -22282,6 +22282,7 @@ + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else ++ LIBS="-lintl $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -22371,6 +22372,7 @@ + cat >>confdefs.h <<_ACEOF + #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF ++LIBS="-lintl $LIBS" - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -10758,17 +10759,17 @@ + else + { { echo "$as_me:$LINENO: error: ngettext function is required to build gedit." >&5 +@@ -22405,17 +22407,17 @@ if test "x${prefix}" = "xNONE"; then cat >>confdefs.h <<_ACEOF diff --git a/editors/gedit2/files/patch-gedit::gedit-print.c b/editors/gedit2/files/patch-gedit::gedit-print.c deleted file mode 100644 index cd4684269e9c..000000000000 --- a/editors/gedit2/files/patch-gedit::gedit-print.c +++ /dev/null @@ -1,32 +0,0 @@ ---- gedit/gedit-print.c.orig Thu Oct 16 22:22:09 2003 -+++ gedit/gedit-print.c Thu Oct 16 22:29:04 2003 -@@ -388,6 +388,8 @@ - - g_object_unref (gjob); - -+ gtk_widget_destroy (pji->dialog); -+ - if (pji->preview == PREVIEW) - gedit_print_job_info_destroy (pji, FALSE); - else -@@ -395,8 +397,6 @@ - g_signal_handlers_disconnect_by_func (pji->pjob, (GCallback) page_cb, pji); - g_signal_handlers_disconnect_by_func (pji->pjob, (GCallback) preview_finished_cb, pji); - } -- -- gtk_widget_destroy (pji->dialog); - - gtk_widget_show (preview); - } -@@ -412,9 +412,9 @@ - - g_object_unref (gjob); - -- gedit_print_job_info_destroy (pji, TRUE); -- - gtk_widget_destroy (pji->dialog); -+ -+ gedit_print_job_info_destroy (pji, TRUE); - } - - void diff --git a/editors/gedit2/pkg-descr b/editors/gedit2/pkg-descr index 3ccfe39b038f..85018482c6ed 100644 --- a/editors/gedit2/pkg-descr +++ b/editors/gedit2/pkg-descr @@ -1,21 +1,11 @@ -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). +gEdit is a Gtk+-2 text editor. Its features include: -gEdit is quite a neat text editor. It contains the following -features: - * 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 + * Global Search and Replace + * Dynamically loaded 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 ca311d5789dd..215d8075c632 100644 --- a/editors/gedit2/pkg-plist +++ b/editors/gedit2/pkg-plist @@ -7,6 +7,7 @@ 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/right_margin/%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 @@ -15,6 +16,7 @@ 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 +etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/syntax_highlighting/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/ui/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/ui/recents/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/ui/statusbar/%gconf.xml @@ -26,6 +28,7 @@ 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/right_margin/%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 @@ -34,6 +37,7 @@ etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/encodings/%gconf.x 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 +etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/syntax_highlighting/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/ui/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/ui/recents/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/ui/statusbar/%gconf.xml @@ -105,29 +109,55 @@ 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_format_bold.png +share/gnome/help/gedit/C/figures/gedit_format_italic.png +share/gnome/help/gedit/C/figures/gedit_format_strikethrough.png +share/gnome/help/gedit/C/figures/gedit_format_underline.png 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/figures/gedit_recent_files_menu_icon.png +share/gnome/help/gedit/de/figures/gedit_window.png share/gnome/help/gedit/de/gedit.xml share/gnome/help/gedit/de/legal.xml +share/gnome/help/gedit/es/figures/gedit_recent_files_menu_icon.png +share/gnome/help/gedit/es/figures/gedit_window.png share/gnome/help/gedit/es/gedit.xml share/gnome/help/gedit/es/legal.xml +share/gnome/help/gedit/fr/figures/gedit_recent_files_menu_icon.png +share/gnome/help/gedit/fr/figures/gedit_window.png share/gnome/help/gedit/fr/gedit.xml share/gnome/help/gedit/fr/legal.xml +share/gnome/help/gedit/it/figures/gedit_recent_files_menu_icon.png +share/gnome/help/gedit/it/figures/gedit_window.png share/gnome/help/gedit/it/gedit.xml share/gnome/help/gedit/it/legal.xml +share/gnome/help/gedit/ja/figures/gedit_recent_files_menu_icon.png +share/gnome/help/gedit/ja/figures/gedit_window.png share/gnome/help/gedit/ja/gedit.xml share/gnome/help/gedit/ja/legal.xml +share/gnome/help/gedit/ko/figures/gedit_recent_files_menu_icon.png +share/gnome/help/gedit/ko/figures/gedit_window.png 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/sv/figures/gedit_recent_files_menu_icon.png +share/gnome/help/gedit/sv/figures/gedit_window.png share/gnome/help/gedit/sv/gedit.xml share/gnome/help/gedit/sv/legal.xml +share/gnome/help/gedit/zh_CN/figures/gedit_recent_files_menu_icon.png +share/gnome/help/gedit/zh_CN/figures/gedit_window.png share/gnome/help/gedit/zh_CN/gedit.xml share/gnome/help/gedit/zh_CN/legal.xml +share/gnome/help/gedit/zh_HK/figures/gedit_recent_files_menu_icon.png +share/gnome/help/gedit/zh_HK/figures/gedit_window.png +share/gnome/help/gedit/zh_HK/gedit.xml +share/gnome/help/gedit/zh_HK/legal.xml +share/gnome/help/gedit/zh_TW/figures/gedit_recent_files_menu_icon.png +share/gnome/help/gedit/zh_TW/figures/gedit_window.png share/gnome/help/gedit/zh_TW/gedit.xml share/gnome/help/gedit/zh_TW/legal.xml share/gnome/idl/GNOME_Gedit.idl @@ -152,6 +182,8 @@ 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_HK.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-zh_HK.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 @@ -169,6 +201,8 @@ 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/en_CA/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/en_GB/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 @@ -179,6 +213,7 @@ 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/hr/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 @@ -186,14 +221,17 @@ 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/mi/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/mr/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/pa/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 @@ -214,16 +252,27 @@ 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/figures @dirrm share/gnome/help/gedit/zh_TW +@dirrm share/gnome/help/gedit/zh_HK/figures +@dirrm share/gnome/help/gedit/zh_HK +@dirrm share/gnome/help/gedit/zh_CN/figures @dirrm share/gnome/help/gedit/zh_CN +@dirrm share/gnome/help/gedit/sv/figures @dirrm share/gnome/help/gedit/sv @dirrm share/gnome/help/gedit/ro/figures @dirrm share/gnome/help/gedit/ro +@dirrm share/gnome/help/gedit/ko/figures @dirrm share/gnome/help/gedit/ko +@dirrm share/gnome/help/gedit/ja/figures @dirrm share/gnome/help/gedit/ja +@dirrm share/gnome/help/gedit/it/figures @dirrm share/gnome/help/gedit/it +@dirrm share/gnome/help/gedit/fr/figures @dirrm share/gnome/help/gedit/fr +@dirrm share/gnome/help/gedit/es/figures @dirrm share/gnome/help/gedit/es +@dirrm share/gnome/help/gedit/de/figures @dirrm share/gnome/help/gedit/de @dirrm share/gnome/help/gedit/C/figures @dirrm share/gnome/gedit-2/ui @@ -239,6 +288,7 @@ share/locale/zh_TW/LC_MESSAGES/gedit-%%VERSION%%.mo @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 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/ui +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/syntax_highlighting @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 @@ -247,6 +297,7 @@ share/locale/zh_TW/LC_MESSAGES/gedit-%%VERSION%%.mo @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/right_margin @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/font @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/colors @@ -258,6 +309,7 @@ share/locale/zh_TW/LC_MESSAGES/gedit-%%VERSION%%.mo @dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/ui/statusbar @dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/ui/recents @dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/ui +@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/syntax_highlighting @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 @@ -266,6 +318,7 @@ share/locale/zh_TW/LC_MESSAGES/gedit-%%VERSION%%.mo @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/right_margin @dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/line_numbers @dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/font @dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/colors @@ -283,4 +336,5 @@ share/locale/zh_TW/LC_MESSAGES/gedit-%%VERSION%%.mo @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-sv.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_HK.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/gnome2-office/Makefile b/editors/gnome2-office/Makefile index 7d64fa8f07fb..3b1efac93c5e 100644 --- a/editors/gnome2-office/Makefile +++ b/editors/gnome2-office/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnome2-office -PORTVERSION= 2.4.2 +PORTVERSION= 2.6.0 CATEGORIES= editors gnome MASTER_SITES= # empty DISTFILES= # empty @@ -19,17 +19,12 @@ RUN_DEPENDS= gnumeric:${PORTSDIR}/math/gnumeric2 \ planner:${PORTSDIR}/deskutils/planner \ dia:${PORTSDIR}/graphics/dia \ glabels:${PORTSDIR}/deskutils/glabels \ - evolution:${PORTSDIR}/mail/evolution \ + evolution-1.5:${PORTSDIR}/mail/evolution \ + AbiWord-2.2:${PORTSDIR}/editors/AbiWord2 \ mergeant:${PORTSDIR}/databases/mergeant NO_BUILD= yes -.include <bsd.port.pre.mk> - -.if ${ARCH} == "i386" -RUN_DEPENDS+= AbiWord-2.0:${PORTSDIR}/editors/AbiWord2 -.endif - do-install: # empty -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/editors/gnome2-office/pkg-descr b/editors/gnome2-office/pkg-descr index a2e41bd469b1..8d27e0ef0597 100644 --- a/editors/gnome2-office/pkg-descr +++ b/editors/gnome2-office/pkg-descr @@ -1,6 +1,6 @@ GNOME 2 Office -The Office is a collection of applications one would expect in an +The GNOME Office is a collection of applications one would expect in an office/productivity suite for the GNOME 2 Desktop. This includes a spreadsheet application, a word processor, project management application, database access application, groupware suite, and diagramming application. diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile index 165fccabcf77..8841e0989068 100644 --- a/games/gnome-games/Makefile +++ b/games/gnome-games/Makefile @@ -6,10 +6,11 @@ # PORTNAME= gnomegames2 -PORTVERSION= 2.4.3 +PORTVERSION= 2.6.0.1 +PORTREVISION= 1 CATEGORIES= games gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-games/2.4 +MASTER_SITE_SUBDIR= sources/gnome-games/2.6 DISTNAME= gnome-games-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -22,7 +23,8 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes USE_REINPLACE= yes -USE_GNOME= gnomeprefix intlhack gnomehack gnomehier libgnomeui +USE_GNOME= gnomeprefix gnomehack gnomehier intlhack lthack libgnomeui \ + librsvg2 USE_LIBTOOL_VER=13 INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/games/gnome-games/distinfo b/games/gnome-games/distinfo index 87fa56b6ac64..360ab3998e9b 100644 --- a/games/gnome-games/distinfo +++ b/games/gnome-games/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-games-2.4.3.tar.bz2) = 022658008198efc410240dfe6c21190d -SIZE (gnome2/gnome-games-2.4.3.tar.bz2) = 7434368 +MD5 (gnome2/gnome-games-2.6.0.1.tar.bz2) = 569e9d02fdc0cbd3294349cf30adccd1 +SIZE (gnome2/gnome-games-2.6.0.1.tar.bz2) = 8215595 diff --git a/games/gnome-games/files/patch-ac b/games/gnome-games/files/patch-ac index 4f62486fb3b2..2605cefdfe3f 100644 --- a/games/gnome-games/files/patch-ac +++ b/games/gnome-games/files/patch-ac @@ -1,11 +1,11 @@ ---- 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 +--- gdk-card-image/Makefile.in.orig Wed Dec 10 11:44:58 2003 ++++ gdk-card-image/Makefile.in Wed Dec 10 11:45:48 2003 +@@ -243,7 +243,7 @@ + libgdkcardimage_la_SOURCES = gdk-card-image.c card-style-file.c libgdkcardimageincludedir = $(includedir)/gdkcardimage - libgdkcardimageinclude_HEADERS = gdk-card-image.h + libgdkcardimageinclude_HEADERS = gdk-card-image.h card-style-file.h -libgdkcardimage_la_LDFLAGS = -version-info 0:0:0 +libgdkcardimage_la_LDFLAGS = -version-info 1:0:0 libgdkcardimage_la_LIBADD = $(GNOME_GAMES_LIBS) @UCB_LDFLAGS@ - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../config.h + subdir = gdk-card-image + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 diff --git a/games/gnome-games/files/patch-aisleriot::sol.c b/games/gnome-games/files/patch-aisleriot::sol.c index 24b42528682d..7a281c20a24e 100644 --- a/games/gnome-games/files/patch-aisleriot::sol.c +++ b/games/gnome-games/files/patch-aisleriot::sol.c @@ -1,5 +1,5 @@ ---- aisleriot/sol.c.orig Tue Nov 25 15:31:30 2003 -+++ aisleriot/sol.c Tue Nov 25 15:57:59 2003 +--- aisleriot/sol.c.orig Wed Oct 1 20:19:36 2003 ++++ aisleriot/sol.c Tue Nov 25 16:30:44 2003 @@ -83,6 +83,15 @@ #define DEFAULT_VARIATION "klondike.scm" #define GNOME_SESSION_BUG @@ -16,7 +16,7 @@ gchar* game_file_to_name (const gchar* file) { char* p, *buf = g_path_get_basename(file); -@@ -540,14 +549,14 @@ +@@ -545,14 +554,14 @@ n_games = 0; for (i = 0; i < n_games; i++) { diff --git a/games/gnome-games/files/patch-configure b/games/gnome-games/files/patch-configure index b633cbcce281..f8413ef3cff4 100644 --- a/games/gnome-games/files/patch-configure +++ b/games/gnome-games/files/patch-configure @@ -1,19 +1,11 @@ ---- configure.orig Sun Apr 21 13:50:05 2002 -+++ configure Wed May 8 15:34:41 2002 -@@ -7864,6 +7864,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' -@@ -12411,7 +12412,7 @@ - +--- configure.orig Wed Dec 17 11:58:34 2003 ++++ configure Wed Dec 17 11:58:35 2003 +@@ -22452,7 +22452,7 @@ + else cat >>confdefs.h <<_ACEOF -#define GNOME_ICONDIR "${prefix}/share/pixmaps" +#define GNOME_ICONDIR "${datadir}/pixmaps" _ACEOF - + fi diff --git a/games/gnome-games/pkg-descr b/games/gnome-games/pkg-descr index 9d0fcb54b72d..547a44c3af82 100644 --- a/games/gnome-games/pkg-descr +++ b/games/gnome-games/pkg-descr @@ -1,7 +1,7 @@ -The GNOME Desktop Environment's games application package, which includes +The GNOME Desktop Environment's games application package includes card games (including a solitaire package which knows 69 distinct solitaire -variations), knockoffs of Minesweeper, Tetris, mahjongg, Nibbles, action -games, puzzle games, and more card games. +variations); knockoffs of Minesweeper, Tetris, mahjongg, and Nibbles; action +games; puzzle games; and even more card games. This package uses the GNOME 2 libraries. diff --git a/games/gnome-games/pkg-install b/games/gnome-games/pkg-install index 039d300d69a5..053f48f5885e 100644 --- a/games/gnome-games/pkg-install +++ b/games/gnome-games/pkg-install @@ -1,17 +1,17 @@ #!/bin/sh -if [ -n "${PACKAGE_BUILDING}" ]; then - exit 0 -fi +PATH=/bin:/usr/bin:/usr/sbin -if [ "$2" = "POST-INSTALL" ]; then +case $2 in +POST-INSTALL) 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" + 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.bridges.scores mahjongg.cloud.scores mahjongg.confounding.scores mahjongg.difficult.scores mahjongg.dragon.scores mahjongg.easy.scores mahjongg.pyramid.scores mahjongg.tictactoe.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} chown games:games ${PKG_PREFIX}/share/gnome/games/${i} - chmod 664 ${PKG_PREFIX}/share/gnome/games/${i} + chmod 0664 ${PKG_PREFIX}/share/gnome/games/${i} fi done -fi + ;; +esac diff --git a/games/gnome-games/pkg-plist b/games/gnome-games/pkg-plist index d33a41246d3b..a49429811d90 100644 --- a/games/gnome-games/pkg-plist +++ b/games/gnome-games/pkg-plist @@ -94,6 +94,7 @@ etc/sound/events/gnect.soundlist etc/sound/events/gnibbles.soundlist etc/sound/events/gnobots2.soundlist etc/sound/events/iagno.soundlist +include/gdkcardimage/card-style-file.h include/gdkcardimage/gdk-card-image.h lib/libgdkcardimage.a lib/libgdkcardimage.so @@ -119,7 +120,6 @@ 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 @@ -182,25 +182,15 @@ share/gnome/blackjack/Vegas_Strip.rules.dat @unexec [ -s %D/share/gnome/games/iagno.w1.scores ] || rm -f %D/share/gnome/games/iagno.w1.scores @unexec [ -s %D/share/gnome/games/iagno.w2.scores ] || rm -f %D/share/gnome/games/iagno.w2.scores @unexec [ -s %D/share/gnome/games/iagno.w3.scores ] || rm -f %D/share/gnome/games/iagno.w3.scores +@unexec [ -s %D/share/gnome/games/mahjongg.bridges.scores ] || rm -f %D/share/gnome/games/mahjongg.bridges.scores +@unexec [ -s %D/share/gnome/games/mahjongg.cloud.scores ] || rm -f %D/share/gnome/games/mahjongg.cloud.scores +@unexec [ -s %D/share/gnome/games/mahjongg.confounding.scores ] || rm -f %D/share/gnome/games/mahjongg.confounding.scores @unexec [ -s %D/share/gnome/games/mahjongg.difficult.scores ] || rm -f %D/share/gnome/games/mahjongg.difficult.scores +@unexec [ -s %D/share/gnome/games/mahjongg.dragon.scores ] || rm -f %D/share/gnome/games/mahjongg.dragon.scores @unexec [ -s %D/share/gnome/games/mahjongg.easy.scores ] || rm -f %D/share/gnome/games/mahjongg.easy.scores +@unexec [ -s %D/share/gnome/games/mahjongg.pyramid.scores ] || rm -f %D/share/gnome/games/mahjongg.pyramid.scores +@unexec [ -s %D/share/gnome/games/mahjongg.tictactoe.scores ] || rm -f %D/share/gnome/games/mahjongg.tictactoe.scores @unexec [ -s %D/share/gnome/games/same-gnome.scores ] || rm -f %D/share/gnome/games/same-gnome.scores -share/gnome/gnect/catseyes_40x40.gnect -share/gnome/gnect/classic_40x40.gnect -share/gnome/gnect/classic_50x50.gnect -share/gnome/gnect/clean_40x40.gnect -share/gnome/gnect/clean_40x40_nightfall.gnect -share/gnome/gnect/clean_50x50.gnect -share/gnome/gnect/clean_50x50_nightfall.gnect -share/gnome/gnect/default.gnect -share/gnome/gnect/emulator_48x32.gnect -share/gnome/gnect/glassy_40x40.gnect -share/gnome/gnect/glassy_40x40_grotty.gnect -share/gnome/gnect/glassy_50x50.gnect -share/gnome/gnect/glassy_50x50_grotty.gnect -share/gnome/gnect/safari_45x45.gnect -share/gnome/gnect/square_40x40.gnect -share/gnome/gnect/square_50x50.gnect share/gnome/gnect/white_ob.cn4 share/gnome/gnibbles/level001.gnl share/gnome/gnibbles/level002.gnl @@ -344,18 +334,20 @@ share/gnome/help/gnibbles/C/legal.xml share/gnome/help/gnobots2/C/figures/gnobots2-main.png share/gnome/help/gnobots2/C/gnobots2.xml share/gnome/help/gnobots2/C/legal.xml -share/gnome/help/gnobots2/da/index.html -share/gnome/help/gnobots2/da/topic.dat -share/gnome/help/gnobots2/es/index.html -share/gnome/help/gnobots2/es/topic.dat -share/gnome/help/gnobots2/it/index.html -share/gnome/help/gnobots2/it/topic.dat +share/gnome/help/gnobots2/da/gnobots2.xml +share/gnome/help/gnobots2/da/legal.xml +share/gnome/help/gnobots2/es/gnobots2.xml +share/gnome/help/gnobots2/es/legal.xml +share/gnome/help/gnobots2/it/gnobots2.xml +share/gnome/help/gnobots2/it/legal.xml share/gnome/help/gnome-stones/C/figures/main-game.png share/gnome/help/gnome-stones/C/figures/main-start.png share/gnome/help/gnome-stones/C/figures/preferences-joystick.png share/gnome/help/gnome-stones/C/figures/preferences-main.png share/gnome/help/gnome-stones/C/gnome-stones.xml share/gnome/help/gnome-stones/C/legal.xml +share/gnome/help/gnometris/C/gnometris.xml +share/gnome/help/gnometris/C/legal.xml share/gnome/help/gnomine/C/figures/advanced_121_a.png share/gnome/help/gnomine/C/figures/advanced_121_b.png share/gnome/help/gnomine/C/figures/advanced_121_c.png @@ -381,8 +373,8 @@ share/gnome/help/gtali/C/figures/mainwindow.png share/gnome/help/gtali/C/figures/preferences.png share/gnome/help/gtali/C/gtali.xml share/gnome/help/gtali/C/legal.xml -share/gnome/help/gtali/da/index.html -share/gnome/help/gtali/da/topic.dat +share/gnome/help/gtali/da/gtali.xml +share/gnome/help/gtali/da/legal.xml share/gnome/help/iagno/C/figures/ANIMATION.png share/gnome/help/iagno/C/figures/BLOCK.png share/gnome/help/iagno/C/figures/FIRST.png @@ -420,8 +412,16 @@ share/gnome/omf/gnome-games/gnibbles-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnibbles-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-games/gnobots2-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnobots2-C.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-games/gnobots2-da.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnobots2-da.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-games/gnobots2-es.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnobots2-es.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-games/gnobots2-it.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnobots2-it.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-games/gnome-stones-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnome-stones-C.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-games/gnometris-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnometris-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-games/gnomine-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnomine-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-games/gnotravex-C.omf @@ -430,6 +430,8 @@ share/gnome/omf/gnome-games/gnotski-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnotski-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-games/gtali-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gtali-C.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-games/gtali-da.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gtali-da.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-games/iagno-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/iagno-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-games/mahjongg-C.omf @@ -450,6 +452,7 @@ 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/card-styles.xml share/gnome/pixmaps/cards/honors/bonded.png share/gnome/pixmaps/cards/honors/dondorf.png share/gnome/pixmaps/cards/honors/xpat.png @@ -459,7 +462,6 @@ 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 share/gnome/pixmaps/cards/suits_large/knuth-18x21.png @@ -480,25 +482,20 @@ 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/glines.png -share/gnome/pixmaps/glines/ball.png +share/gnome/pixmaps/glines/balls.svg share/gnome/pixmaps/glines/classic.png share/gnome/pixmaps/glines/dots.png share/gnome/pixmaps/glines/gumball.png share/gnome/pixmaps/glines/pulse.png +share/gnome/pixmaps/glines/shapes.svg share/gnome/pixmaps/gnect-icon.png share/gnome/pixmaps/gnect/bg_grotty.jpg share/gnome/pixmaps/gnect/bg_nightfall.jpg -share/gnome/pixmaps/gnect/tileset_40x40_catseyes.png -share/gnome/pixmaps/gnect/tileset_40x40_classic.png -share/gnome/pixmaps/gnect/tileset_40x40_clean.png -share/gnome/pixmaps/gnect/tileset_40x40_glassy.png -share/gnome/pixmaps/gnect/tileset_40x40_square.png -share/gnome/pixmaps/gnect/tileset_45x45_safari.png -share/gnome/pixmaps/gnect/tileset_48x32_emulator.png +share/gnome/pixmaps/gnect/bg_toplight.png share/gnome/pixmaps/gnect/tileset_50x50_catseyes.png share/gnome/pixmaps/gnect/tileset_50x50_classic.png -share/gnome/pixmaps/gnect/tileset_50x50_clean.png share/gnome/pixmaps/gnect/tileset_50x50_glassy.png +share/gnome/pixmaps/gnect/tileset_50x50_hcontrast.png share/gnome/pixmaps/gnect/tileset_50x50_square.png share/gnome/pixmaps/gnibbles/gnibbles-logo.png share/gnome/pixmaps/gnibbles/gnibbles.png @@ -550,6 +547,7 @@ share/gnome/pixmaps/gnome-stones/wall.png share/gnome/pixmaps/gnometris/5blocks-tig.png share/gnome/pixmaps/gnometris/5blocks-tim.png share/gnome/pixmaps/gnometris/5blocks.png +share/gnome/pixmaps/gnometris/7blocks-gw.png share/gnome/pixmaps/gnometris/7blocks-tig.png share/gnome/pixmaps/gnometris/7blocks.png share/gnome/pixmaps/gnometris/7stones-gn.png @@ -558,6 +556,7 @@ 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/gnome2-foot.png share/gnome/pixmaps/gnometris/bg/gnometris-bg.jpg share/gnome/pixmaps/gnometris/bg/greyprint-bg.jpg share/gnome/pixmaps/gnometris/bg/leaves-bg.jpg @@ -573,9 +572,9 @@ 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/gnomine/flag-question.png -share/gnome/pixmaps/gnomine/flag.png -share/gnome/pixmaps/gnomine/mine.png +share/gnome/pixmaps/gnomine/flag-question.svg +share/gnome/pixmaps/gnomine/flag.svg +share/gnome/pixmaps/gnomine/mine.svg share/gnome/pixmaps/gnotski-icon.png share/gnome/pixmaps/gnotski.png share/gnome/pixmaps/iagno.png @@ -587,18 +586,17 @@ share/gnome/pixmaps/iagno/metal2.png share/gnome/pixmaps/iagno/shrink.png share/gnome/pixmaps/iagno/sunmoon.png share/gnome/pixmaps/iagno/woodtrim.png -share/gnome/pixmaps/mahjongg/bg/bg1.png -share/gnome/pixmaps/mahjongg/bg/bg2.png -share/gnome/pixmaps/mahjongg/bg/bg3.png -share/gnome/pixmaps/mahjongg/bg/bg4.png share/gnome/pixmaps/mahjongg/default.png -share/gnome/pixmaps/mahjongg/seta.png +share/gnome/pixmaps/mahjongg/postmodern.svg +share/gnome/pixmaps/mahjongg/maya.png +share/gnome/pixmaps/mahjongg/smooth.png share/gnome/pixmaps/same-gnome/blink-sync.png share/gnome/pixmaps/same-gnome/glass.png share/gnome/pixmaps/same-gnome/marbles.png share/gnome/pixmaps/same-gnome/planets.png share/gnome/pixmaps/same-gnome/rotate.png share/gnome/pixmaps/same-gnome/stones.png +share/gnome/sol-games/glade/statistics.glade share/gnome/sol-games/agnes.scm share/gnome/sol-games/auld_lang_syne.scm share/gnome/sol-games/bakers_dozen.scm @@ -707,6 +705,7 @@ 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 +share/locale/en_CA/LC_MESSAGES/gnome-games.mo share/locale/en_GB/LC_MESSAGES/gnome-games.mo share/locale/es/LC_MESSAGES/gnome-games.mo share/locale/et/LC_MESSAGES/gnome-games.mo @@ -718,6 +717,7 @@ 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/hr/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 @@ -732,6 +732,7 @@ share/locale/ms/LC_MESSAGES/gnome-games.mo share/locale/nl/LC_MESSAGES/gnome-games.mo share/locale/nn/LC_MESSAGES/gnome-games.mo share/locale/no/LC_MESSAGES/gnome-games.mo +share/locale/pa/LC_MESSAGES/gnome-games.mo share/locale/pl/LC_MESSAGES/gnome-games.mo share/locale/pt/LC_MESSAGES/gnome-games.mo share/locale/pt_BR/LC_MESSAGES/gnome-games.mo @@ -754,9 +755,9 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo @dirrm share/gnome/sounds/gnobots2 @dirrm share/gnome/sounds/gnibbles @dirrm share/gnome/sounds/gataxx +@dirrm share/gnome/sol-games/glade @dirrm share/gnome/sol-games @dirrm share/gnome/pixmaps/same-gnome -@dirrm share/gnome/pixmaps/mahjongg/bg @dirrm share/gnome/pixmaps/mahjongg @dirrm share/gnome/pixmaps/iagno @dirrm share/gnome/pixmaps/gnomine @@ -799,6 +800,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo @dirrm share/gnome/help/gnomine/C/figures @dirrm share/gnome/help/gnomine/C @dirrm share/gnome/help/gnomine +@dirrm share/gnome/help/gnometris/C +@dirrm share/gnome/help/gnometris @dirrm share/gnome/help/gnome-stones/C/figures @dirrm share/gnome/help/gnome-stones/C @dirrm share/gnome/help/gnome-stones @@ -882,10 +885,10 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo @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/gnect @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/gataxx @dirrm etc/gconf/gconf.xml.defaults/apps/blackjack/settings @dirrm etc/gconf/gconf.xml.defaults/apps/blackjack/global @@ -899,11 +902,16 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnect-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnibbles-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnobots2-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnobots2-da.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnobots2-es.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnobots2-it.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnome-stones-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnometris-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnomine-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnotravex-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnotski-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gtali-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gtali-da.omf 2>/dev/null || /usr/bin/true @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 diff --git a/games/gnomegames2/Makefile b/games/gnomegames2/Makefile index 165fccabcf77..8841e0989068 100644 --- a/games/gnomegames2/Makefile +++ b/games/gnomegames2/Makefile @@ -6,10 +6,11 @@ # PORTNAME= gnomegames2 -PORTVERSION= 2.4.3 +PORTVERSION= 2.6.0.1 +PORTREVISION= 1 CATEGORIES= games gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-games/2.4 +MASTER_SITE_SUBDIR= sources/gnome-games/2.6 DISTNAME= gnome-games-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -22,7 +23,8 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes USE_REINPLACE= yes -USE_GNOME= gnomeprefix intlhack gnomehack gnomehier libgnomeui +USE_GNOME= gnomeprefix gnomehack gnomehier intlhack lthack libgnomeui \ + librsvg2 USE_LIBTOOL_VER=13 INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/games/gnomegames2/distinfo b/games/gnomegames2/distinfo index 87fa56b6ac64..360ab3998e9b 100644 --- a/games/gnomegames2/distinfo +++ b/games/gnomegames2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-games-2.4.3.tar.bz2) = 022658008198efc410240dfe6c21190d -SIZE (gnome2/gnome-games-2.4.3.tar.bz2) = 7434368 +MD5 (gnome2/gnome-games-2.6.0.1.tar.bz2) = 569e9d02fdc0cbd3294349cf30adccd1 +SIZE (gnome2/gnome-games-2.6.0.1.tar.bz2) = 8215595 diff --git a/games/gnomegames2/files/patch-ac b/games/gnomegames2/files/patch-ac index 4f62486fb3b2..2605cefdfe3f 100644 --- a/games/gnomegames2/files/patch-ac +++ b/games/gnomegames2/files/patch-ac @@ -1,11 +1,11 @@ ---- 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 +--- gdk-card-image/Makefile.in.orig Wed Dec 10 11:44:58 2003 ++++ gdk-card-image/Makefile.in Wed Dec 10 11:45:48 2003 +@@ -243,7 +243,7 @@ + libgdkcardimage_la_SOURCES = gdk-card-image.c card-style-file.c libgdkcardimageincludedir = $(includedir)/gdkcardimage - libgdkcardimageinclude_HEADERS = gdk-card-image.h + libgdkcardimageinclude_HEADERS = gdk-card-image.h card-style-file.h -libgdkcardimage_la_LDFLAGS = -version-info 0:0:0 +libgdkcardimage_la_LDFLAGS = -version-info 1:0:0 libgdkcardimage_la_LIBADD = $(GNOME_GAMES_LIBS) @UCB_LDFLAGS@ - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../config.h + subdir = gdk-card-image + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 diff --git a/games/gnomegames2/files/patch-aisleriot::sol.c b/games/gnomegames2/files/patch-aisleriot::sol.c index 24b42528682d..7a281c20a24e 100644 --- a/games/gnomegames2/files/patch-aisleriot::sol.c +++ b/games/gnomegames2/files/patch-aisleriot::sol.c @@ -1,5 +1,5 @@ ---- aisleriot/sol.c.orig Tue Nov 25 15:31:30 2003 -+++ aisleriot/sol.c Tue Nov 25 15:57:59 2003 +--- aisleriot/sol.c.orig Wed Oct 1 20:19:36 2003 ++++ aisleriot/sol.c Tue Nov 25 16:30:44 2003 @@ -83,6 +83,15 @@ #define DEFAULT_VARIATION "klondike.scm" #define GNOME_SESSION_BUG @@ -16,7 +16,7 @@ gchar* game_file_to_name (const gchar* file) { char* p, *buf = g_path_get_basename(file); -@@ -540,14 +549,14 @@ +@@ -545,14 +554,14 @@ n_games = 0; for (i = 0; i < n_games; i++) { diff --git a/games/gnomegames2/files/patch-configure b/games/gnomegames2/files/patch-configure index b633cbcce281..f8413ef3cff4 100644 --- a/games/gnomegames2/files/patch-configure +++ b/games/gnomegames2/files/patch-configure @@ -1,19 +1,11 @@ ---- configure.orig Sun Apr 21 13:50:05 2002 -+++ configure Wed May 8 15:34:41 2002 -@@ -7864,6 +7864,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' -@@ -12411,7 +12412,7 @@ - +--- configure.orig Wed Dec 17 11:58:34 2003 ++++ configure Wed Dec 17 11:58:35 2003 +@@ -22452,7 +22452,7 @@ + else cat >>confdefs.h <<_ACEOF -#define GNOME_ICONDIR "${prefix}/share/pixmaps" +#define GNOME_ICONDIR "${datadir}/pixmaps" _ACEOF - + fi diff --git a/games/gnomegames2/pkg-descr b/games/gnomegames2/pkg-descr index 9d0fcb54b72d..547a44c3af82 100644 --- a/games/gnomegames2/pkg-descr +++ b/games/gnomegames2/pkg-descr @@ -1,7 +1,7 @@ -The GNOME Desktop Environment's games application package, which includes +The GNOME Desktop Environment's games application package includes card games (including a solitaire package which knows 69 distinct solitaire -variations), knockoffs of Minesweeper, Tetris, mahjongg, Nibbles, action -games, puzzle games, and more card games. +variations); knockoffs of Minesweeper, Tetris, mahjongg, and Nibbles; action +games; puzzle games; and even more card games. This package uses the GNOME 2 libraries. diff --git a/games/gnomegames2/pkg-install b/games/gnomegames2/pkg-install index 039d300d69a5..053f48f5885e 100644 --- a/games/gnomegames2/pkg-install +++ b/games/gnomegames2/pkg-install @@ -1,17 +1,17 @@ #!/bin/sh -if [ -n "${PACKAGE_BUILDING}" ]; then - exit 0 -fi +PATH=/bin:/usr/bin:/usr/sbin -if [ "$2" = "POST-INSTALL" ]; then +case $2 in +POST-INSTALL) 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" + 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.bridges.scores mahjongg.cloud.scores mahjongg.confounding.scores mahjongg.difficult.scores mahjongg.dragon.scores mahjongg.easy.scores mahjongg.pyramid.scores mahjongg.tictactoe.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} chown games:games ${PKG_PREFIX}/share/gnome/games/${i} - chmod 664 ${PKG_PREFIX}/share/gnome/games/${i} + chmod 0664 ${PKG_PREFIX}/share/gnome/games/${i} fi done -fi + ;; +esac diff --git a/games/gnomegames2/pkg-plist b/games/gnomegames2/pkg-plist index d33a41246d3b..a49429811d90 100644 --- a/games/gnomegames2/pkg-plist +++ b/games/gnomegames2/pkg-plist @@ -94,6 +94,7 @@ etc/sound/events/gnect.soundlist etc/sound/events/gnibbles.soundlist etc/sound/events/gnobots2.soundlist etc/sound/events/iagno.soundlist +include/gdkcardimage/card-style-file.h include/gdkcardimage/gdk-card-image.h lib/libgdkcardimage.a lib/libgdkcardimage.so @@ -119,7 +120,6 @@ 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 @@ -182,25 +182,15 @@ share/gnome/blackjack/Vegas_Strip.rules.dat @unexec [ -s %D/share/gnome/games/iagno.w1.scores ] || rm -f %D/share/gnome/games/iagno.w1.scores @unexec [ -s %D/share/gnome/games/iagno.w2.scores ] || rm -f %D/share/gnome/games/iagno.w2.scores @unexec [ -s %D/share/gnome/games/iagno.w3.scores ] || rm -f %D/share/gnome/games/iagno.w3.scores +@unexec [ -s %D/share/gnome/games/mahjongg.bridges.scores ] || rm -f %D/share/gnome/games/mahjongg.bridges.scores +@unexec [ -s %D/share/gnome/games/mahjongg.cloud.scores ] || rm -f %D/share/gnome/games/mahjongg.cloud.scores +@unexec [ -s %D/share/gnome/games/mahjongg.confounding.scores ] || rm -f %D/share/gnome/games/mahjongg.confounding.scores @unexec [ -s %D/share/gnome/games/mahjongg.difficult.scores ] || rm -f %D/share/gnome/games/mahjongg.difficult.scores +@unexec [ -s %D/share/gnome/games/mahjongg.dragon.scores ] || rm -f %D/share/gnome/games/mahjongg.dragon.scores @unexec [ -s %D/share/gnome/games/mahjongg.easy.scores ] || rm -f %D/share/gnome/games/mahjongg.easy.scores +@unexec [ -s %D/share/gnome/games/mahjongg.pyramid.scores ] || rm -f %D/share/gnome/games/mahjongg.pyramid.scores +@unexec [ -s %D/share/gnome/games/mahjongg.tictactoe.scores ] || rm -f %D/share/gnome/games/mahjongg.tictactoe.scores @unexec [ -s %D/share/gnome/games/same-gnome.scores ] || rm -f %D/share/gnome/games/same-gnome.scores -share/gnome/gnect/catseyes_40x40.gnect -share/gnome/gnect/classic_40x40.gnect -share/gnome/gnect/classic_50x50.gnect -share/gnome/gnect/clean_40x40.gnect -share/gnome/gnect/clean_40x40_nightfall.gnect -share/gnome/gnect/clean_50x50.gnect -share/gnome/gnect/clean_50x50_nightfall.gnect -share/gnome/gnect/default.gnect -share/gnome/gnect/emulator_48x32.gnect -share/gnome/gnect/glassy_40x40.gnect -share/gnome/gnect/glassy_40x40_grotty.gnect -share/gnome/gnect/glassy_50x50.gnect -share/gnome/gnect/glassy_50x50_grotty.gnect -share/gnome/gnect/safari_45x45.gnect -share/gnome/gnect/square_40x40.gnect -share/gnome/gnect/square_50x50.gnect share/gnome/gnect/white_ob.cn4 share/gnome/gnibbles/level001.gnl share/gnome/gnibbles/level002.gnl @@ -344,18 +334,20 @@ share/gnome/help/gnibbles/C/legal.xml share/gnome/help/gnobots2/C/figures/gnobots2-main.png share/gnome/help/gnobots2/C/gnobots2.xml share/gnome/help/gnobots2/C/legal.xml -share/gnome/help/gnobots2/da/index.html -share/gnome/help/gnobots2/da/topic.dat -share/gnome/help/gnobots2/es/index.html -share/gnome/help/gnobots2/es/topic.dat -share/gnome/help/gnobots2/it/index.html -share/gnome/help/gnobots2/it/topic.dat +share/gnome/help/gnobots2/da/gnobots2.xml +share/gnome/help/gnobots2/da/legal.xml +share/gnome/help/gnobots2/es/gnobots2.xml +share/gnome/help/gnobots2/es/legal.xml +share/gnome/help/gnobots2/it/gnobots2.xml +share/gnome/help/gnobots2/it/legal.xml share/gnome/help/gnome-stones/C/figures/main-game.png share/gnome/help/gnome-stones/C/figures/main-start.png share/gnome/help/gnome-stones/C/figures/preferences-joystick.png share/gnome/help/gnome-stones/C/figures/preferences-main.png share/gnome/help/gnome-stones/C/gnome-stones.xml share/gnome/help/gnome-stones/C/legal.xml +share/gnome/help/gnometris/C/gnometris.xml +share/gnome/help/gnometris/C/legal.xml share/gnome/help/gnomine/C/figures/advanced_121_a.png share/gnome/help/gnomine/C/figures/advanced_121_b.png share/gnome/help/gnomine/C/figures/advanced_121_c.png @@ -381,8 +373,8 @@ share/gnome/help/gtali/C/figures/mainwindow.png share/gnome/help/gtali/C/figures/preferences.png share/gnome/help/gtali/C/gtali.xml share/gnome/help/gtali/C/legal.xml -share/gnome/help/gtali/da/index.html -share/gnome/help/gtali/da/topic.dat +share/gnome/help/gtali/da/gtali.xml +share/gnome/help/gtali/da/legal.xml share/gnome/help/iagno/C/figures/ANIMATION.png share/gnome/help/iagno/C/figures/BLOCK.png share/gnome/help/iagno/C/figures/FIRST.png @@ -420,8 +412,16 @@ share/gnome/omf/gnome-games/gnibbles-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnibbles-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-games/gnobots2-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnobots2-C.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-games/gnobots2-da.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnobots2-da.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-games/gnobots2-es.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnobots2-es.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-games/gnobots2-it.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnobots2-it.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-games/gnome-stones-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnome-stones-C.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-games/gnometris-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnometris-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-games/gnomine-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnomine-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-games/gnotravex-C.omf @@ -430,6 +430,8 @@ share/gnome/omf/gnome-games/gnotski-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnotski-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-games/gtali-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gtali-C.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-games/gtali-da.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gtali-da.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-games/iagno-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/iagno-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-games/mahjongg-C.omf @@ -450,6 +452,7 @@ 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/card-styles.xml share/gnome/pixmaps/cards/honors/bonded.png share/gnome/pixmaps/cards/honors/dondorf.png share/gnome/pixmaps/cards/honors/xpat.png @@ -459,7 +462,6 @@ 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 share/gnome/pixmaps/cards/suits_large/knuth-18x21.png @@ -480,25 +482,20 @@ 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/glines.png -share/gnome/pixmaps/glines/ball.png +share/gnome/pixmaps/glines/balls.svg share/gnome/pixmaps/glines/classic.png share/gnome/pixmaps/glines/dots.png share/gnome/pixmaps/glines/gumball.png share/gnome/pixmaps/glines/pulse.png +share/gnome/pixmaps/glines/shapes.svg share/gnome/pixmaps/gnect-icon.png share/gnome/pixmaps/gnect/bg_grotty.jpg share/gnome/pixmaps/gnect/bg_nightfall.jpg -share/gnome/pixmaps/gnect/tileset_40x40_catseyes.png -share/gnome/pixmaps/gnect/tileset_40x40_classic.png -share/gnome/pixmaps/gnect/tileset_40x40_clean.png -share/gnome/pixmaps/gnect/tileset_40x40_glassy.png -share/gnome/pixmaps/gnect/tileset_40x40_square.png -share/gnome/pixmaps/gnect/tileset_45x45_safari.png -share/gnome/pixmaps/gnect/tileset_48x32_emulator.png +share/gnome/pixmaps/gnect/bg_toplight.png share/gnome/pixmaps/gnect/tileset_50x50_catseyes.png share/gnome/pixmaps/gnect/tileset_50x50_classic.png -share/gnome/pixmaps/gnect/tileset_50x50_clean.png share/gnome/pixmaps/gnect/tileset_50x50_glassy.png +share/gnome/pixmaps/gnect/tileset_50x50_hcontrast.png share/gnome/pixmaps/gnect/tileset_50x50_square.png share/gnome/pixmaps/gnibbles/gnibbles-logo.png share/gnome/pixmaps/gnibbles/gnibbles.png @@ -550,6 +547,7 @@ share/gnome/pixmaps/gnome-stones/wall.png share/gnome/pixmaps/gnometris/5blocks-tig.png share/gnome/pixmaps/gnometris/5blocks-tim.png share/gnome/pixmaps/gnometris/5blocks.png +share/gnome/pixmaps/gnometris/7blocks-gw.png share/gnome/pixmaps/gnometris/7blocks-tig.png share/gnome/pixmaps/gnometris/7blocks.png share/gnome/pixmaps/gnometris/7stones-gn.png @@ -558,6 +556,7 @@ 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/gnome2-foot.png share/gnome/pixmaps/gnometris/bg/gnometris-bg.jpg share/gnome/pixmaps/gnometris/bg/greyprint-bg.jpg share/gnome/pixmaps/gnometris/bg/leaves-bg.jpg @@ -573,9 +572,9 @@ 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/gnomine/flag-question.png -share/gnome/pixmaps/gnomine/flag.png -share/gnome/pixmaps/gnomine/mine.png +share/gnome/pixmaps/gnomine/flag-question.svg +share/gnome/pixmaps/gnomine/flag.svg +share/gnome/pixmaps/gnomine/mine.svg share/gnome/pixmaps/gnotski-icon.png share/gnome/pixmaps/gnotski.png share/gnome/pixmaps/iagno.png @@ -587,18 +586,17 @@ share/gnome/pixmaps/iagno/metal2.png share/gnome/pixmaps/iagno/shrink.png share/gnome/pixmaps/iagno/sunmoon.png share/gnome/pixmaps/iagno/woodtrim.png -share/gnome/pixmaps/mahjongg/bg/bg1.png -share/gnome/pixmaps/mahjongg/bg/bg2.png -share/gnome/pixmaps/mahjongg/bg/bg3.png -share/gnome/pixmaps/mahjongg/bg/bg4.png share/gnome/pixmaps/mahjongg/default.png -share/gnome/pixmaps/mahjongg/seta.png +share/gnome/pixmaps/mahjongg/postmodern.svg +share/gnome/pixmaps/mahjongg/maya.png +share/gnome/pixmaps/mahjongg/smooth.png share/gnome/pixmaps/same-gnome/blink-sync.png share/gnome/pixmaps/same-gnome/glass.png share/gnome/pixmaps/same-gnome/marbles.png share/gnome/pixmaps/same-gnome/planets.png share/gnome/pixmaps/same-gnome/rotate.png share/gnome/pixmaps/same-gnome/stones.png +share/gnome/sol-games/glade/statistics.glade share/gnome/sol-games/agnes.scm share/gnome/sol-games/auld_lang_syne.scm share/gnome/sol-games/bakers_dozen.scm @@ -707,6 +705,7 @@ 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 +share/locale/en_CA/LC_MESSAGES/gnome-games.mo share/locale/en_GB/LC_MESSAGES/gnome-games.mo share/locale/es/LC_MESSAGES/gnome-games.mo share/locale/et/LC_MESSAGES/gnome-games.mo @@ -718,6 +717,7 @@ 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/hr/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 @@ -732,6 +732,7 @@ share/locale/ms/LC_MESSAGES/gnome-games.mo share/locale/nl/LC_MESSAGES/gnome-games.mo share/locale/nn/LC_MESSAGES/gnome-games.mo share/locale/no/LC_MESSAGES/gnome-games.mo +share/locale/pa/LC_MESSAGES/gnome-games.mo share/locale/pl/LC_MESSAGES/gnome-games.mo share/locale/pt/LC_MESSAGES/gnome-games.mo share/locale/pt_BR/LC_MESSAGES/gnome-games.mo @@ -754,9 +755,9 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo @dirrm share/gnome/sounds/gnobots2 @dirrm share/gnome/sounds/gnibbles @dirrm share/gnome/sounds/gataxx +@dirrm share/gnome/sol-games/glade @dirrm share/gnome/sol-games @dirrm share/gnome/pixmaps/same-gnome -@dirrm share/gnome/pixmaps/mahjongg/bg @dirrm share/gnome/pixmaps/mahjongg @dirrm share/gnome/pixmaps/iagno @dirrm share/gnome/pixmaps/gnomine @@ -799,6 +800,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo @dirrm share/gnome/help/gnomine/C/figures @dirrm share/gnome/help/gnomine/C @dirrm share/gnome/help/gnomine +@dirrm share/gnome/help/gnometris/C +@dirrm share/gnome/help/gnometris @dirrm share/gnome/help/gnome-stones/C/figures @dirrm share/gnome/help/gnome-stones/C @dirrm share/gnome/help/gnome-stones @@ -882,10 +885,10 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo @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/gnect @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/gataxx @dirrm etc/gconf/gconf.xml.defaults/apps/blackjack/settings @dirrm etc/gconf/gconf.xml.defaults/apps/blackjack/global @@ -899,11 +902,16 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnect-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnibbles-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnobots2-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnobots2-da.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnobots2-es.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnobots2-it.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnome-stones-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnometris-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnomine-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnotravex-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnotski-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gtali-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gtali-da.omf 2>/dev/null || /usr/bin/true @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 diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile index a1e05f9db003..3de65c4f619b 100644 --- a/graphics/eog2/Makefile +++ b/graphics/eog2/Makefile @@ -6,11 +6,10 @@ # PORTNAME= eog2 -PORTVERSION= 2.4.1 -PORTREVISION= 1 +PORTVERSION= 2.6.0 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.4 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.6 DISTNAME= eog-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -19,11 +18,13 @@ COMMENT= The Eye Of Gnome image viewer USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack gnomehier eel2 libgnomeprintui librsvg2 +USE_REINPLACE= yes +USE_GNOME= gnomeprefix gnomehack gnomehier intlhack eel2 libgnomeprintui \ + librsvg2 USE_X_PREFIX= yes USE_LIBTOOL_VER=13 -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" .include <bsd.port.pre.mk> diff --git a/graphics/eog2/distinfo b/graphics/eog2/distinfo index 1f3b73663e4e..73bb603c4a08 100644 --- a/graphics/eog2/distinfo +++ b/graphics/eog2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/eog-2.4.1.tar.bz2) = a7098a85d0f36591521660cc778ed819 -SIZE (gnome2/eog-2.4.1.tar.bz2) = 696930 +MD5 (gnome2/eog-2.6.0.tar.bz2) = 7570aa11e8bfbf707b3cc6c3774e11af +SIZE (gnome2/eog-2.6.0.tar.bz2) = 809205 diff --git a/graphics/eog2/pkg-descr b/graphics/eog2/pkg-descr index 958b6353bdb1..fa7565d4c743 100644 --- a/graphics/eog2/pkg-descr +++ b/graphics/eog2/pkg-descr @@ -1,7 +1,5 @@ -This is the Eye of Gnome, an image viewer program. It is meant to be -a fast and functional image viewer as well as an image cataloging -program. - -This package requires the GNOME 2.0 development API. +This is the Eye of Gnome, a GNOME 2 image viewer and cataloging +application. It provides inline image viewing support for +nautilus. WWW: http://www.gnome.org/ diff --git a/graphics/eog2/pkg-plist b/graphics/eog2/pkg-plist index d1f786ac6ba2..f64463611c9a 100644 --- a/graphics/eog2/pkg-plist +++ b/graphics/eog2/pkg-plist @@ -1,8 +1,12 @@ 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/ui/%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/ui/%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 @@ -69,6 +73,7 @@ share/gnome/omf/eog/eog-zh_CN.omf 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/loading.png share/gnome/pixmaps/eog/orient-horizontal.png share/gnome/pixmaps/eog/orient-vertical.png share/gnome/pixmaps/eog/right-down.png @@ -88,6 +93,8 @@ 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 +share/locale/en_CA/LC_MESSAGES/eog.mo +share/locale/en_GB/LC_MESSAGES/eog.mo share/locale/es/LC_MESSAGES/eog.mo share/locale/et/LC_MESSAGES/eog.mo share/locale/fa/LC_MESSAGES/eog.mo @@ -97,6 +104,7 @@ 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/hr/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 @@ -113,6 +121,7 @@ share/locale/ms/LC_MESSAGES/eog.mo share/locale/nl/LC_MESSAGES/eog.mo share/locale/nn/LC_MESSAGES/eog.mo share/locale/no/LC_MESSAGES/eog.mo +share/locale/pa/LC_MESSAGES/eog.mo share/locale/pl/LC_MESSAGES/eog.mo share/locale/pt/LC_MESSAGES/eog.mo share/locale/pt_BR/LC_MESSAGES/eog.mo @@ -154,6 +163,8 @@ share/locale/zh_TW/LC_MESSAGES/eog.mo @dirrm share/gnome/help/eog/C/figures @dirrm share/gnome/eog/glade @dirrm share/gnome/eog +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/eog/ui +@dirrm etc/gconf/gconf.xml.defaults/apps/eog/ui @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 diff --git a/graphics/gpdf/Makefile b/graphics/gpdf/Makefile index 42bcf7c518cf..39c60932a447 100644 --- a/graphics/gpdf/Makefile +++ b/graphics/gpdf/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gpdf -PORTVERSION= 0.112.1 +PORTVERSION= 0.131 CATEGORIES= graphics print gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.112 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -17,7 +17,7 @@ COMMENT= GNOME version of xpdf USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui libgnomeprintui +USE_GNOME= gnomeprefix gnomehack intlhack lthack libgnomeui libgnomeprintui USE_X_PREFIX= yes USE_LIBTOOL_VER=13 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/graphics/gpdf/distinfo b/graphics/gpdf/distinfo index 72d883063770..d29f76dc6d0f 100644 --- a/graphics/gpdf/distinfo +++ b/graphics/gpdf/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gpdf-0.112.1.tar.bz2) = 67cad1ac559b4403cbc0c5a3fb1b327f -SIZE (gnome2/gpdf-0.112.1.tar.bz2) = 839517 +MD5 (gnome2/gpdf-0.131.tar.bz2) = 95eeb0a33d37fbb5c56cf9260656d86d +SIZE (gnome2/gpdf-0.131.tar.bz2) = 1101285 diff --git a/graphics/gpdf/files/patch-xpdf_gpdf-thumbnails-view.cc b/graphics/gpdf/files/patch-xpdf_gpdf-thumbnails-view.cc new file mode 100644 index 000000000000..78e0b8155d02 --- /dev/null +++ b/graphics/gpdf/files/patch-xpdf_gpdf-thumbnails-view.cc @@ -0,0 +1,10 @@ +--- xpdf/gpdf-thumbnails-view.cc.orig Wed Jan 14 00:09:05 2004 ++++ xpdf/gpdf-thumbnails-view.cc Wed Jan 14 00:09:34 2004 +@@ -21,6 +21,7 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. + */ + ++#include <sys/types.h> + #include <gpdf-g-switch.h> + # include <glib.h> + # include <glib/ghash.h> diff --git a/graphics/gpdf/pkg-descr b/graphics/gpdf/pkg-descr index 4d967a66f364..d1735f2c2c76 100644 --- a/graphics/gpdf/pkg-descr +++ b/graphics/gpdf/pkg-descr @@ -1,6 +1,6 @@ The GNOME PDF Viewer is an open source viewer for Portable Document -Format (PDF) files. (These are also sometimes called "Acrobat" files, -from the name of Adobe's PDF software.) The GNOME PDF viewer is based -upon xpdf (ports/graphics/xpdf). +Format (PDF) files, often called "Acrobat" files, from the name of +Adobe's PDF software. The GNOME PDF viewer is based upon xpdf, and +integrates directly into the GNOME 2 desktop. WWW: http://www.gnome.org diff --git a/graphics/gpdf/pkg-plist b/graphics/gpdf/pkg-plist index 94812e1b38e7..77cdfd5d65a3 100644 --- a/graphics/gpdf/pkg-plist +++ b/graphics/gpdf/pkg-plist @@ -1,16 +1,45 @@ bin/gpdf +etc/gconf/gconf.xml.defaults/apps/gpdf/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gpdf/UI/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gpdf/UI/Windows/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gpdf/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gpdf/UI/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gpdf/UI/Windows/%gconf.xml +etc/gconf/schemas/gpdf.schemas libdata/bonobo/servers/GNOME_PDF.server libexec/gnome-pdf-viewer -share/gnome/gpdf/glade/gpdf-print-progress-dialog.glade -share/gnome/gpdf/glade/gpdf-properties-dialog.glade -share/gnome/pixmaps/gpdf/fitwidth.png -share/gnome/pixmaps/gnome-pdf.png +share/gnome/application-registry/gpdf.applications +share/gnome/applications/gpdf.desktop share/gnome/gnome-2.0/ui/gpdf-control-ui.xml share/gnome/gnome-2.0/ui/gpdf-window-ui.xml -share/gnome/applications/gpdf.desktop +share/gnome/gpdf/glade/gpdf-print-progress-dialog.glade +share/gnome/gpdf/glade/gpdf-properties-dialog.glade +share/gnome/help/gpdf/C/figures/gpdf_start_window.png +share/gnome/help/gpdf/C/figures/gpdf_window.png +share/gnome/help/gpdf/C/gpdf.xml +share/gnome/help/gpdf/C/legal.xml +share/gnome/help/gpdf/de/figures/gpdf_window.png +share/gnome/help/gpdf/de/gpdf.xml +share/gnome/help/gpdf/de/legal.xml +share/gnome/help/gpdf/es/figures/gpdf_start_window.png +share/gnome/help/gpdf/es/gpdf.xml +share/gnome/help/gpdf/es/legal.xml share/gnome/mime-info/gpdf.keys -share/gnome/application-registry/gpdf.applications +share/gnome/omf/gpdf/gpdf-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gpdf/gpdf-C.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gpdf/gpdf-de.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gpdf/gpdf-de.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gpdf/gpdf-es.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gpdf/gpdf-es.omf 2>/dev/null || /usr/bin/true +share/gnome/pixmaps/gnome-pdf.png +share/gnome/pixmaps/gpdf/fitwidth.png +share/gnome/pixmaps/gpdf/stock_book-closed-mark.png +share/gnome/pixmaps/gpdf/stock_book-closed.png +share/gnome/pixmaps/gpdf/stock_book-opened-mark.png +share/gnome/pixmaps/gpdf/stock_book-opened.png +share/gnome/pixmaps/gpdf/stock_bookmarks.png share/locale/am/LC_MESSAGES/gpdf.mo +share/locale/ar/LC_MESSAGES/gpdf.mo share/locale/az/LC_MESSAGES/gpdf.mo share/locale/be/LC_MESSAGES/gpdf.mo share/locale/bn/LC_MESSAGES/gpdf.mo @@ -20,15 +49,19 @@ share/locale/cy/LC_MESSAGES/gpdf.mo share/locale/da/LC_MESSAGES/gpdf.mo share/locale/de/LC_MESSAGES/gpdf.mo share/locale/el/LC_MESSAGES/gpdf.mo +share/locale/en_CA/LC_MESSAGES/gpdf.mo +share/locale/en_GB/LC_MESSAGES/gpdf.mo share/locale/eo/LC_MESSAGES/gpdf.mo share/locale/es/LC_MESSAGES/gpdf.mo share/locale/eu/LC_MESSAGES/gpdf.mo +share/locale/fa/LC_MESSAGES/gpdf.mo share/locale/fi/LC_MESSAGES/gpdf.mo share/locale/fr/LC_MESSAGES/gpdf.mo share/locale/ga/LC_MESSAGES/gpdf.mo share/locale/gl/LC_MESSAGES/gpdf.mo share/locale/he/LC_MESSAGES/gpdf.mo share/locale/hi/LC_MESSAGES/gpdf.mo +share/locale/hr/LC_MESSAGES/gpdf.mo share/locale/hu/LC_MESSAGES/gpdf.mo share/locale/id/LC_MESSAGES/gpdf.mo share/locale/is/LC_MESSAGES/gpdf.mo @@ -45,12 +78,14 @@ share/locale/ms/LC_MESSAGES/gpdf.mo share/locale/nl/LC_MESSAGES/gpdf.mo share/locale/nn/LC_MESSAGES/gpdf.mo share/locale/no/LC_MESSAGES/gpdf.mo +share/locale/pa/LC_MESSAGES/gpdf.mo share/locale/pl/LC_MESSAGES/gpdf.mo share/locale/pt/LC_MESSAGES/gpdf.mo share/locale/pt_BR/LC_MESSAGES/gpdf.mo share/locale/ro/LC_MESSAGES/gpdf.mo share/locale/ru/LC_MESSAGES/gpdf.mo share/locale/sk/LC_MESSAGES/gpdf.mo +share/locale/sl/LC_MESSAGES/gpdf.mo share/locale/sq/LC_MESSAGES/gpdf.mo share/locale/sr/LC_MESSAGES/gpdf.mo share/locale/sr@Latn/LC_MESSAGES/gpdf.mo @@ -64,5 +99,22 @@ share/locale/wa/LC_MESSAGES/gpdf.mo share/locale/zh_CN/LC_MESSAGES/gpdf.mo share/locale/zh_TW/LC_MESSAGES/gpdf.mo @dirrm share/gnome/pixmaps/gpdf +@dirrm share/gnome/omf/gpdf +@dirrm share/gnome/help/gpdf/es/figures +@dirrm share/gnome/help/gpdf/es +@dirrm share/gnome/help/gpdf/de/figures +@dirrm share/gnome/help/gpdf/de +@dirrm share/gnome/help/gpdf/C/figures +@dirrm share/gnome/help/gpdf/C +@dirrm share/gnome/help/gpdf @dirrm share/gnome/gpdf/glade @dirrm share/gnome/gpdf +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gpdf/UI/Windows +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gpdf/UI +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gpdf +@dirrm etc/gconf/gconf.xml.defaults/apps/gpdf/UI/Windows +@dirrm etc/gconf/gconf.xml.defaults/apps/gpdf/UI +@dirrm etc/gconf/gconf.xml.defaults/apps/gpdf +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gpdf/gpdf-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gpdf/gpdf-de.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gpdf/gpdf-es.omf 2>/dev/null || /usr/bin/true diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile index 0b251b03ac0d..a62fd2a08e7f 100644 --- a/graphics/libgnomecanvas/Makefile +++ b/graphics/libgnomecanvas/Makefile @@ -6,11 +6,10 @@ # PORTNAME= libgnomecanvas -PORTVERSION= 2.4.0 -PORTREVISION= 1 +PORTVERSION= 2.6.0 CATEGORIES= graphics gnome 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 @@ -21,8 +20,7 @@ USE_GMAKE= yes USE_X_PREFIX= yes INSTALLS_SHLIB= yes USE_LIBTOOL_VER=13 -USE_GNOMENG= yes -USE_GNOME= gnomehack libglade2 libartlgpl2 +USE_GNOME= gnomehack lthack libglade2 libartlgpl2 CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/graphics/libgnomecanvas/distinfo b/graphics/libgnomecanvas/distinfo index fb320bbdc46a..ba48aa4d6e38 100644 --- a/graphics/libgnomecanvas/distinfo +++ b/graphics/libgnomecanvas/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libgnomecanvas-2.4.0.tar.bz2) = c212a7cac06b7f9e68ed2de38df6e54d -SIZE (gnome2/libgnomecanvas-2.4.0.tar.bz2) = 535399 +MD5 (gnome2/libgnomecanvas-2.6.0.tar.bz2) = a670348ceecaa85b35940dcbd9f8c20e +SIZE (gnome2/libgnomecanvas-2.6.0.tar.bz2) = 512743 diff --git a/graphics/libgnomecanvas/files/patch-configure b/graphics/libgnomecanvas/files/patch-configure deleted file mode 100644 index a00b21e828d1..000000000000 --- a/graphics/libgnomecanvas/files/patch-configure +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- configure 2002/04/26 10:26:12 1.1 -+++ configure 2002/04/26 10:26:32 -@@ -7092,6 +7092,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' diff --git a/graphics/libgnomecanvas/pkg-descr b/graphics/libgnomecanvas/pkg-descr index 8900db783bf3..a3d2ae327b86 100644 --- a/graphics/libgnomecanvas/pkg-descr +++ b/graphics/libgnomecanvas/pkg-descr @@ -1,6 +1,2 @@ -The GNOMECanvas library provides a number of features: - - - Image loading facilities. - - Rendering of a GdkPixBuf into various formats: - drawables (windows, pixmaps), GdkRGB buffers. - - A cache interface +The GNOMECanvas library allows images to be used directly within +GUIs. diff --git a/graphics/libgnomecanvas/pkg-plist b/graphics/libgnomecanvas/pkg-plist index a20514a4aaa6..303dcc19ef74 100644 --- a/graphics/libgnomecanvas/pkg-plist +++ b/graphics/libgnomecanvas/pkg-plist @@ -15,33 +15,8 @@ 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.400 +lib/libgnomecanvas-2.so.600 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 -share/doc/libgnomecanvas/gnomecanvasellipse.html -share/doc/libgnomecanvas/gnomecanvasgroup.html -share/doc/libgnomecanvas/gnomecanvasitem.html -share/doc/libgnomecanvas/gnomecanvasline.html -share/doc/libgnomecanvas/gnomecanvaspixbuf.html -share/doc/libgnomecanvas/gnomecanvaspolygon.html -share/doc/libgnomecanvas/gnomecanvasre.html -share/doc/libgnomecanvas/gnomecanvasrect.html -share/doc/libgnomecanvas/gnomecanvasrichtext.html -share/doc/libgnomecanvas/gnomecanvasshape.html -share/doc/libgnomecanvas/gnomecanvastext.html -share/doc/libgnomecanvas/gnomecanvaswidget.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/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 @@ -54,8 +29,10 @@ 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/en_CA/LC_MESSAGES/libgnomecanvas-2.0.mo +share/locale/en_GB/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/eo/LC_MESSAGES/libgnomecanvas-2.0.mo +share/locale/es/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 @@ -63,14 +40,16 @@ share/locale/fr/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/ga/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/he/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/hi/LC_MESSAGES/libgnomecanvas-2.0.mo +share/locale/hr/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/ko/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/li/LC_MESSAGES/libgnomecanvas-2.0.mo +share/locale/lt/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 @@ -80,6 +59,7 @@ 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 +share/locale/pa/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/pl/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/pt/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/pt_BR/LC_MESSAGES/libgnomecanvas-2.0.mo @@ -89,6 +69,7 @@ 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@ije/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 share/locale/ta/LC_MESSAGES/libgnomecanvas-2.0.mo diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile index 0310715b0204..a0fe5f7fe535 100644 --- a/graphics/librsvg2/Makefile +++ b/graphics/librsvg2/Makefile @@ -6,11 +6,10 @@ # PORTNAME= librsvg2 -PORTVERSION= 2.4.0 -PORTREVISION= 2 +PORTVERSION= 2.6.4 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.4 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.6 DISTNAME= librsvg-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -20,21 +19,23 @@ 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 \ - gsf-1.9:${PORTSDIR}/devel/libgsf -RUN_DEPENDS= ${X11BASE}/lib/gtk-2.0/2.2.0/engines/libmetal.so:${PORTSDIR}/x11-toolkits/gtk-engines2 + gsf-1.9:${PORTSDIR}/devel/libgsf \ + croco.2:${PORTSDIR}/textproc/libcroco +RUN_DEPENDS= ${X11BASE}/lib/gtk-2.0/2.4.0/engines/libmetal.so:${PORTSDIR}/x11-toolkits/gtk-engines2 USE_BZIP2= yes USE_GMAKE= yes USE_X_PREFIX= yes INSTALLS_SHLIB= yes USE_LIBTOOL_VER=13 -USE_GNOME= gnomehack gtk20 libartlgpl2 libxml2 +USE_GNOME= gnomehack lthack gtk20 libartlgpl2 libxml2 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --with-svgz \ --disable-gtk-doc \ - --without-gimp -PLIST_SUB= GTK_VERSION="2.2.0" + --without-gimp \ + --with-croco +PLIST_SUB= GTK_VERSION="2.4.0" MAN1= rsvg.1 diff --git a/graphics/librsvg2/distinfo b/graphics/librsvg2/distinfo index d4484f25efab..342d69174741 100644 --- a/graphics/librsvg2/distinfo +++ b/graphics/librsvg2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/librsvg-2.4.0.tar.bz2) = 1a073864e5f6e9793cf23e38dc723803 -SIZE (gnome2/librsvg-2.4.0.tar.bz2) = 233627 +MD5 (gnome2/librsvg-2.6.4.tar.bz2) = 976b1e2d21ef094698f6eebb7ef9fe94 +SIZE (gnome2/librsvg-2.6.4.tar.bz2) = 221910 diff --git a/graphics/librsvg2/files/patch-configure b/graphics/librsvg2/files/patch-configure deleted file mode 100644 index 444b8335e4d7..000000000000 --- a/graphics/librsvg2/files/patch-configure +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- configure 2002/04/25 19:16:30 1.1 -+++ configure 2002/04/25 19:16:42 -@@ -5397,6 +5397,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' diff --git a/graphics/librsvg2/files/patch-gimp-plugin_Makefile.in b/graphics/librsvg2/files/patch-gimp-plugin_Makefile.in deleted file mode 100644 index b8d240267194..000000000000 --- a/graphics/librsvg2/files/patch-gimp-plugin_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- gimp-plugin/Makefile.in.orig Sun Mar 23 19:17:25 2003 -+++ gimp-plugin/Makefile.in Sun Mar 23 19:17:41 2003 -@@ -103,7 +103,7 @@ - VERSION = @VERSION@ - VERSION_INFO = @VERSION_INFO@ - --gimpdir = $(libdir)/gimp/1.3/plug-ins -+gimpdir = $(libexecdir)/gimp/1.3/plug-ins - - INCLUDES = \ - $(LIBRSVG_CFLAGS) \ diff --git a/graphics/librsvg2/files/patch-rsvg-paint-server.c b/graphics/librsvg2/files/patch-rsvg-paint-server.c new file mode 100644 index 000000000000..72f7b8d1fa0b --- /dev/null +++ b/graphics/librsvg2/files/patch-rsvg-paint-server.c @@ -0,0 +1,22 @@ +--- rsvg-paint-server.c.orig Tue Mar 30 13:48:53 2004 ++++ rsvg-paint-server.c Tue Mar 30 13:49:10 2004 +@@ -150,6 +150,9 @@ + double dx, dy, scale; + double affine[6]; + int i; ++ float xchange, ychange, pointlen,unitlen; ++ float nx2, ny2; ++ float x0, y0; + + agl = z->agl; + if (agl == NULL) +@@ -180,9 +183,6 @@ + + art_affine_multiply(affine, rlg->affine, affine); + +- float xchange, ychange, pointlen,unitlen; +- float nx2, ny2; +- float x0, y0; + + xchange = rlg->x2 - rlg->x1; + ychange = rlg->y2 - rlg->y1; diff --git a/graphics/librsvg2/files/patch-rsvg-styles.c b/graphics/librsvg2/files/patch-rsvg-styles.c new file mode 100644 index 000000000000..6e7eee133489 --- /dev/null +++ b/graphics/librsvg2/files/patch-rsvg-styles.c @@ -0,0 +1,21 @@ +--- rsvg-styles.c.orig Tue Mar 23 23:04:27 2004 ++++ rsvg-styles.c Tue Mar 23 23:04:36 2004 +@@ -553,16 +553,16 @@ + if (status != CR_OK) + { + g_warning ("Error setting CSS SAC handler\n"); +- cr_parser_destroy (parser); + cr_doc_handler_destroy (css_handler); ++ cr_parser_destroy (parser); + return; + } + + status = cr_parser_set_use_core_grammar (parser, FALSE); + status = cr_parser_parse (parser); + +- cr_parser_destroy (parser); + cr_doc_handler_destroy (css_handler); ++ cr_parser_destroy (parser); + } + + #else /* !HAVE_LIBCROCO */ diff --git a/graphics/librsvg2/pkg-descr b/graphics/librsvg2/pkg-descr index b3f050b65a28..3f521eda245a 100644 --- a/graphics/librsvg2/pkg-descr +++ b/graphics/librsvg2/pkg-descr @@ -1,7 +1,7 @@ The librsvg library is a lightweight library for parsing and rendering -vector-graphic files in SVG format (like the ones made by sodipodi). It also +vector-graphic files in SVG format (like the ones made by sodipodi). It also includes functions that render anti-aliased fonts using freetype, including -caching of glyphs. It's used by Nautilus for drawing vector icons and -anti-aliased type. +caching of glyphs. It is used by Nautilus for drawing vector icons and +anti-aliased text. WWW: http://www.gnome.org/ diff --git a/graphics/librsvg2/pkg-plist b/graphics/librsvg2/pkg-plist index 094cff6f4b45..906759e2e185 100644 --- a/graphics/librsvg2/pkg-plist +++ b/graphics/librsvg2/pkg-plist @@ -6,22 +6,8 @@ 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.6 +lib/librsvg-2.so.8 libdata/pkgconfig/librsvg-2.0.pc -share/doc/librsvg/html/home.png -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/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 -share/doc/librsvg/html/rsvg-creating-a-svgz-reader.html -share/doc/librsvg/html/rsvg.html -share/doc/librsvg/html/up.png @dirrm share/doc/librsvg/html @dirrm share/doc/librsvg @dirrm include/librsvg-2/librsvg diff --git a/misc/gnome-icon-theme/Makefile b/misc/gnome-icon-theme/Makefile index 192ffba9510d..5746b13b958a 100644 --- a/misc/gnome-icon-theme/Makefile +++ b/misc/gnome-icon-theme/Makefile @@ -6,22 +6,29 @@ # PORTNAME= gnome-icon-theme -PORTVERSION= 1.0.9 -PORTREVISION= 1 +PORTVERSION= 1.2.0 CATEGORIES= misc gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.2 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= A collection of icons for the GNOME 2 desktop +BUILD_DEPENDS= ${X11BASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme +RUN_DEPENDS= ${X11BASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme + USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes GNU_CONFIGURE= yes -USE_GNOME= gnomehack gnometarget +USE_REINPLACE= yes +USE_GNOME= gnomehack intlhack gnometarget CONFIGURE_ARGS= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +post-patch: + @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' \ + ${WRKSRC}/Makefile.in + .include <bsd.port.mk> diff --git a/misc/gnome-icon-theme/distinfo b/misc/gnome-icon-theme/distinfo index fc87e0161f99..764ee9e0e19b 100644 --- a/misc/gnome-icon-theme/distinfo +++ b/misc/gnome-icon-theme/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-icon-theme-1.0.9.tar.bz2) = f11da9541223537fc8f65a42a09fa49d -SIZE (gnome2/gnome-icon-theme-1.0.9.tar.bz2) = 2022979 +MD5 (gnome2/gnome-icon-theme-1.2.0.tar.bz2) = 9f1fa89cfae54213347a8e3fb05a1686 +SIZE (gnome2/gnome-icon-theme-1.2.0.tar.bz2) = 2717721 diff --git a/misc/gnome-icon-theme/pkg-descr b/misc/gnome-icon-theme/pkg-descr index e22da77ba185..426526f6d498 100644 --- a/misc/gnome-icon-theme/pkg-descr +++ b/misc/gnome-icon-theme/pkg-descr @@ -1 +1,3 @@ -gnome-icon-theme is a collection of icons and emblems for the GNOME 2 desktop. +gnome-icon-theme is a collection of icons and emblems for the +GNOME 2 desktop. Included are the images used in toolbars, +dialog boxes, etc. diff --git a/misc/gnome-icon-theme/pkg-plist b/misc/gnome-icon-theme/pkg-plist index a78529c33022..803d95afe0c6 100644 --- a/misc/gnome-icon-theme/pkg-plist +++ b/misc/gnome-icon-theme/pkg-plist @@ -1,1511 +1,134 @@ +libdata/pkgconfig/gnome-icon-theme.pc share/icons/gnome/12x12/emblems/emblem-symbolic-link.png share/icons/gnome/12x12/filesystems/gnome-fs-directory-accept.png +share/icons/gnome/12x12/filesystems/gnome-fs-directory-visiting.png share/icons/gnome/12x12/filesystems/gnome-fs-directory.png -share/icons/gnome/16x16/apps/panel-notification-area.png -share/icons/gnome/16x16/stock/chart/stock_chart-autoformat.png -share/icons/gnome/16x16/stock/chart/stock_chart-data-in-columns.png -share/icons/gnome/16x16/stock/chart/stock_chart-data-in-rows.png -share/icons/gnome/16x16/stock/chart/stock_chart-edit-type.png -share/icons/gnome/16x16/stock/chart/stock_chart-reorganize.png -share/icons/gnome/16x16/stock/chart/stock_chart-toggle-axes-title.png -share/icons/gnome/16x16/stock/chart/stock_chart-toggle-axes.png -share/icons/gnome/16x16/stock/chart/stock_chart-toggle-hgrid.png -share/icons/gnome/16x16/stock/chart/stock_chart-toggle-legend.png -share/icons/gnome/16x16/stock/chart/stock_chart-toggle-title.png -share/icons/gnome/16x16/stock/chart/stock_chart-toggle-vgrid.png -share/icons/gnome/16x16/stock/chart/stock_glue.png -share/icons/gnome/16x16/stock/chart/stock_gluepoint-down.png -share/icons/gnome/16x16/stock/chart/stock_gluepoint-horizontal-center.png -share/icons/gnome/16x16/stock/chart/stock_gluepoint-horizontal-left.png -share/icons/gnome/16x16/stock/chart/stock_gluepoint-horizontal-right.png -share/icons/gnome/16x16/stock/chart/stock_gluepoint-left.png -share/icons/gnome/16x16/stock/chart/stock_gluepoint-relative.png -share/icons/gnome/16x16/stock/chart/stock_gluepoint-right.png -share/icons/gnome/16x16/stock/chart/stock_gluepoint-up.png -share/icons/gnome/16x16/stock/chart/stock_gluepoint-vertical-bottom.png -share/icons/gnome/16x16/stock/chart/stock_gluepoint-vertical-center.png -share/icons/gnome/16x16/stock/chart/stock_gluepoint-vertical-top.png -share/icons/gnome/16x16/stock/chart/stock_insert-chart.png -share/icons/gnome/16x16/stock/code/stock_compile.png -share/icons/gnome/16x16/stock/code/stock_error-next.png -share/icons/gnome/16x16/stock/code/stock_error-previous.png -share/icons/gnome/16x16/stock/code/stock_macro-check-brackets.png -share/icons/gnome/16x16/stock/code/stock_macro-insert-breakpoint.png -share/icons/gnome/16x16/stock/code/stock_macro-insert.png -share/icons/gnome/16x16/stock/code/stock_macro-jump-back.png -share/icons/gnome/16x16/stock/code/stock_macro-objects.png -share/icons/gnome/16x16/stock/code/stock_macro-organizer.png -share/icons/gnome/16x16/stock/code/stock_macro-stop-after-command.png -share/icons/gnome/16x16/stock/code/stock_macro-stop-after-procedure.png -share/icons/gnome/16x16/stock/code/stock_macro-stop-watching.png -share/icons/gnome/16x16/stock/code/stock_macro-watch-variable.png -share/icons/gnome/16x16/stock/code/stock_record-macro.png -share/icons/gnome/16x16/stock/code/stock_run-macro.png -share/icons/gnome/16x16/stock/code/stock_tools-macro.png -share/icons/gnome/16x16/stock/data/stock_add-decimal-place.png -share/icons/gnome/16x16/stock/data/stock_advanced-filter.png -share/icons/gnome/16x16/stock/data/stock_autofilter.png -share/icons/gnome/16x16/stock/data/stock_data-delete-link.png -share/icons/gnome/16x16/stock/data/stock_data-delete-query.png -share/icons/gnome/16x16/stock/data/stock_data-delete-record.png -share/icons/gnome/16x16/stock/data/stock_data-delete-sql-query.png -share/icons/gnome/16x16/stock/data/stock_data-delete-table.png -share/icons/gnome/16x16/stock/data/stock_data-edit-link.png -share/icons/gnome/16x16/stock/data/stock_data-edit-query.png -share/icons/gnome/16x16/stock/data/stock_data-edit-sql-query.png -share/icons/gnome/16x16/stock/data/stock_data-edit-table.png -share/icons/gnome/16x16/stock/data/stock_data-explorer.png -share/icons/gnome/16x16/stock/data/stock_data-first.png -share/icons/gnome/16x16/stock/data/stock_data-last.png -share/icons/gnome/16x16/stock/data/stock_data-link.png -share/icons/gnome/16x16/stock/data/stock_data-linked-table.png -share/icons/gnome/16x16/stock/data/stock_data-links.png -share/icons/gnome/16x16/stock/data/stock_data-new-link.png -share/icons/gnome/16x16/stock/data/stock_data-new-query.png -share/icons/gnome/16x16/stock/data/stock_data-new-record.png -share/icons/gnome/16x16/stock/data/stock_data-new-sql-query.png -share/icons/gnome/16x16/stock/data/stock_data-new-table.png -share/icons/gnome/16x16/stock/data/stock_data-next.png -share/icons/gnome/16x16/stock/data/stock_data-previous.png -share/icons/gnome/16x16/stock/data/stock_data-queries.png -share/icons/gnome/16x16/stock/data/stock_data-query-rename.png -share/icons/gnome/16x16/stock/data/stock_data-query.png -share/icons/gnome/16x16/stock/data/stock_data-save.png -share/icons/gnome/16x16/stock/data/stock_data-sources-delete.png -share/icons/gnome/16x16/stock/data/stock_data-sources-hand.png -share/icons/gnome/16x16/stock/data/stock_data-sources-modified.png -share/icons/gnome/16x16/stock/data/stock_data-sources-new.png -share/icons/gnome/16x16/stock/data/stock_data-sources.png -share/icons/gnome/16x16/stock/data/stock_data-table.png -share/icons/gnome/16x16/stock/data/stock_data-tables.png -share/icons/gnome/16x16/stock/data/stock_data-undo.png -share/icons/gnome/16x16/stock/data/stock_delete-autofilter.png -share/icons/gnome/16x16/stock/data/stock_delete-decimal-place.png -share/icons/gnome/16x16/stock/data/stock_filter-data-by-criteria.png -share/icons/gnome/16x16/stock/data/stock_filter-navigator.png -share/icons/gnome/16x16/stock/data/stock_filters.png -share/icons/gnome/16x16/stock/data/stock_format-default.png -share/icons/gnome/16x16/stock/data/stock_format-percent.png -share/icons/gnome/16x16/stock/data/stock_format-scientific.png -share/icons/gnome/16x16/stock/data/stock_function-autopilot.png -share/icons/gnome/16x16/stock/data/stock_goal-seek.png -share/icons/gnome/16x16/stock/data/stock_insert-fields.png -share/icons/gnome/16x16/stock/data/stock_sort-ascending.png -share/icons/gnome/16x16/stock/data/stock_sort-column-ascending.png -share/icons/gnome/16x16/stock/data/stock_sort-criteria.png -share/icons/gnome/16x16/stock/data/stock_sort-descending.png -share/icons/gnome/16x16/stock/data/stock_sort-row-ascending.png -share/icons/gnome/16x16/stock/data/stock_standard-filter.png -share/icons/gnome/16x16/stock/data/stock_sum.png -share/icons/gnome/16x16/stock/data/stock_update-data.png -share/icons/gnome/16x16/stock/document/stock_attach.png -share/icons/gnome/16x16/stock/document/stock_new-drawing.png -share/icons/gnome/16x16/stock/document/stock_new-formula.png -share/icons/gnome/16x16/stock/document/stock_new-html.png -share/icons/gnome/16x16/stock/document/stock_new-labels.png -share/icons/gnome/16x16/stock/document/stock_new-master-document.png -share/icons/gnome/16x16/stock/document/stock_new-presentation.png -share/icons/gnome/16x16/stock/document/stock_new-spreadsheet.png -share/icons/gnome/16x16/stock/document/stock_new-template.png -share/icons/gnome/16x16/stock/document/stock_new-text.png -share/icons/gnome/16x16/stock/document/stock_new.png -share/icons/gnome/16x16/stock/document/stock_preview-four-pages.png -share/icons/gnome/16x16/stock/document/stock_preview-two-pages.png -share/icons/gnome/16x16/stock/document/stock_print-layout.png -share/icons/gnome/16x16/stock/document/stock_print-options.png -share/icons/gnome/16x16/stock/document/stock_script.png -share/icons/gnome/16x16/stock/document/stock_scripts.png -share/icons/gnome/16x16/stock/document/stock_todo.png -share/icons/gnome/16x16/stock/document/stock_view-html-source.png -share/icons/gnome/16x16/stock/form/stock_form-activation-order.png -share/icons/gnome/16x16/stock/form/stock_form-add-field.png -share/icons/gnome/16x16/stock/form/stock_form-automatic-control-focus.png -share/icons/gnome/16x16/stock/form/stock_form-autopilots.png -share/icons/gnome/16x16/stock/form/stock_form-button.png -share/icons/gnome/16x16/stock/form/stock_form-checkbox.png -share/icons/gnome/16x16/stock/form/stock_form-combobox.png -share/icons/gnome/16x16/stock/form/stock_form-control-properties.png -share/icons/gnome/16x16/stock/form/stock_form-currency-field.png -share/icons/gnome/16x16/stock/form/stock_form-date-field.png -share/icons/gnome/16x16/stock/form/stock_form-design-mode.png -share/icons/gnome/16x16/stock/form/stock_form-file-selection.png -share/icons/gnome/16x16/stock/form/stock_form-formatted-field.png -share/icons/gnome/16x16/stock/form/stock_form-frame.png -share/icons/gnome/16x16/stock/form/stock_form-image-button.png -share/icons/gnome/16x16/stock/form/stock_form-image-control.png -share/icons/gnome/16x16/stock/form/stock_form-label.png -share/icons/gnome/16x16/stock/form/stock_form-letter-dialog.png -share/icons/gnome/16x16/stock/form/stock_form-listbox.png -share/icons/gnome/16x16/stock/form/stock_form-navigator.png -share/icons/gnome/16x16/stock/form/stock_form-numerical-field.png -share/icons/gnome/16x16/stock/form/stock_form-open-in-design-mode.png -share/icons/gnome/16x16/stock/form/stock_form-pattern-field.png -share/icons/gnome/16x16/stock/form/stock_form-properties.png -share/icons/gnome/16x16/stock/form/stock_form-radio.png -share/icons/gnome/16x16/stock/form/stock_form-table-control.png -share/icons/gnome/16x16/stock/form/stock_form-text-box.png -share/icons/gnome/16x16/stock/form/stock_form-time-field.png -share/icons/gnome/16x16/stock/form/stock_insert-form.png -share/icons/gnome/16x16/stock/form/stock_macro-controls.png -share/icons/gnome/16x16/stock/form/stock_show-form-dialog.png -share/icons/gnome/16x16/stock/form/stock_show-hidden-controls.png -share/icons/gnome/16x16/stock/form/stock_view-fields.png -share/icons/gnome/16x16/stock/generic/stock_3d-favourites.png -share/icons/gnome/16x16/stock/generic/stock_about.png -share/icons/gnome/16x16/stock/generic/stock_allow-effects.png -share/icons/gnome/16x16/stock/generic/stock_anchor.png -share/icons/gnome/16x16/stock/generic/stock_animation.png -share/icons/gnome/16x16/stock/generic/stock_autopilot.png -share/icons/gnome/16x16/stock/generic/stock_book_blue.png -share/icons/gnome/16x16/stock/generic/stock_book_green.png -share/icons/gnome/16x16/stock/generic/stock_book_open.png -share/icons/gnome/16x16/stock/generic/stock_book_red.png -share/icons/gnome/16x16/stock/generic/stock_book_yellow.png -share/icons/gnome/16x16/stock/generic/stock_calc-accept.png -share/icons/gnome/16x16/stock/generic/stock_calc-cancel.png -share/icons/gnome/16x16/stock/generic/stock_calendar.png -share/icons/gnome/16x16/stock/generic/stock_cell-phone.png -share/icons/gnome/16x16/stock/generic/stock_close.png -share/icons/gnome/16x16/stock/generic/stock_copy.png -share/icons/gnome/16x16/stock/generic/stock_cut.png -share/icons/gnome/16x16/stock/generic/stock_default-folder.png -share/icons/gnome/16x16/stock/generic/stock_delete.png -share/icons/gnome/16x16/stock/generic/stock_drag-mode.png -share/icons/gnome/16x16/stock/generic/stock_edit.png -share/icons/gnome/16x16/stock/generic/stock_equals.png -share/icons/gnome/16x16/stock/generic/stock_exit.png -share/icons/gnome/16x16/stock/generic/stock_extended-help.png -share/icons/gnome/16x16/stock/generic/stock_file-properties.png -share/icons/gnome/16x16/stock/generic/stock_flip-horizontally.png -share/icons/gnome/16x16/stock/generic/stock_flip-vertically.png -share/icons/gnome/16x16/stock/generic/stock_folder.png -share/icons/gnome/16x16/stock/generic/stock_format-page.png -share/icons/gnome/16x16/stock/generic/stock_fullscreen.png -share/icons/gnome/16x16/stock/generic/stock_help-add-bookmark.png -share/icons/gnome/16x16/stock/generic/stock_help-agent.png -share/icons/gnome/16x16/stock/generic/stock_help-book-open.png -share/icons/gnome/16x16/stock/generic/stock_help-book.png -share/icons/gnome/16x16/stock/generic/stock_help-chat.png -share/icons/gnome/16x16/stock/generic/stock_help-document.png -share/icons/gnome/16x16/stock/generic/stock_help-pane-off.png -share/icons/gnome/16x16/stock/generic/stock_help-pane-on.png -share/icons/gnome/16x16/stock/generic/stock_help.png -share/icons/gnome/16x16/stock/generic/stock_home.png -share/icons/gnome/16x16/stock/generic/stock_id.png -share/icons/gnome/16x16/stock/generic/stock_new-dir.png -share/icons/gnome/16x16/stock/generic/stock_notes.png -share/icons/gnome/16x16/stock/generic/stock_openoffice.png -share/icons/gnome/16x16/stock/generic/stock_paste.png -share/icons/gnome/16x16/stock/generic/stock_presentation-box.png -share/icons/gnome/16x16/stock/generic/stock_presentation-styles.png -share/icons/gnome/16x16/stock/generic/stock_print-preview-print.png -share/icons/gnome/16x16/stock/generic/stock_print-preview.png -share/icons/gnome/16x16/stock/generic/stock_print-setup.png -share/icons/gnome/16x16/stock/generic/stock_print.png -share/icons/gnome/16x16/stock/generic/stock_redo.png -share/icons/gnome/16x16/stock/generic/stock_refresh.png -share/icons/gnome/16x16/stock/generic/stock_search.png -share/icons/gnome/16x16/stock/generic/stock_send-fax.png -share/icons/gnome/16x16/stock/generic/stock_stop.png -share/icons/gnome/16x16/stock/generic/stock_styles.png -share/icons/gnome/16x16/stock/generic/stock_summary.png -share/icons/gnome/16x16/stock/generic/stock_timer.png -share/icons/gnome/16x16/stock/generic/stock_timer_stopped.png -share/icons/gnome/16x16/stock/generic/stock_toggle-info.png -share/icons/gnome/16x16/stock/generic/stock_toggle-preview.png -share/icons/gnome/16x16/stock/generic/stock_trash_full.png -share/icons/gnome/16x16/stock/generic/stock_undo.png -share/icons/gnome/16x16/stock/generic/stock_view-details.png -share/icons/gnome/16x16/stock/generic/stock_web-support.png -share/icons/gnome/16x16/stock/image/stock_3d-color-picker.png -share/icons/gnome/16x16/stock/image/stock_3d-colors.png -share/icons/gnome/16x16/stock/image/stock_3d-custom-color.png -share/icons/gnome/16x16/stock/image/stock_3d-effects.png -share/icons/gnome/16x16/stock/image/stock_arrowstyle.png -share/icons/gnome/16x16/stock/image/stock_brightness.png -share/icons/gnome/16x16/stock/image/stock_bucketfill.png -share/icons/gnome/16x16/stock/image/stock_channel-blue.png -share/icons/gnome/16x16/stock/image/stock_channel-green.png -share/icons/gnome/16x16/stock/image/stock_channel-red.png -share/icons/gnome/16x16/stock/image/stock_contrast.png -share/icons/gnome/16x16/stock/image/stock_crop.png -share/icons/gnome/16x16/stock/image/stock_display-grid.png -share/icons/gnome/16x16/stock/image/stock_display-guides.png -share/icons/gnome/16x16/stock/image/stock_distort.png -share/icons/gnome/16x16/stock/image/stock_draw-arc.png -share/icons/gnome/16x16/stock/image/stock_draw-callouts.png -share/icons/gnome/16x16/stock/image/stock_draw-circle-arc.png -share/icons/gnome/16x16/stock/image/stock_draw-circle-pie-unfilled.png -share/icons/gnome/16x16/stock/image/stock_draw-circle-pie.png -share/icons/gnome/16x16/stock/image/stock_draw-circle-segment-unfilled.png -share/icons/gnome/16x16/stock/image/stock_draw-circle-segment.png -share/icons/gnome/16x16/stock/image/stock_draw-circle-unfilled.png -share/icons/gnome/16x16/stock/image/stock_draw-circle.png -share/icons/gnome/16x16/stock/image/stock_draw-cone.png -share/icons/gnome/16x16/stock/image/stock_draw-connector-ends-with-arrow.png -share/icons/gnome/16x16/stock/image/stock_draw-connector-ends-with-circle.png -share/icons/gnome/16x16/stock/image/stock_draw-connector-starts-with-arrow.png -share/icons/gnome/16x16/stock/image/stock_draw-connector-starts-with-circle.png -share/icons/gnome/16x16/stock/image/stock_draw-connector-with-arrows.png -share/icons/gnome/16x16/stock/image/stock_draw-connector-with-circles.png -share/icons/gnome/16x16/stock/image/stock_draw-connector.png -share/icons/gnome/16x16/stock/image/stock_draw-cube.png -share/icons/gnome/16x16/stock/image/stock_draw-curve-filled.png -share/icons/gnome/16x16/stock/image/stock_draw-curve.png -share/icons/gnome/16x16/stock/image/stock_draw-curved-connector-ends-with-arrow.png -share/icons/gnome/16x16/stock/image/stock_draw-curved-connector-ends-with-circle.png -share/icons/gnome/16x16/stock/image/stock_draw-curved-connector-starts-with-arrow.png -share/icons/gnome/16x16/stock/image/stock_draw-curved-connector-starts-with-circle.png -share/icons/gnome/16x16/stock/image/stock_draw-curved-connector-with-arrows.png -share/icons/gnome/16x16/stock/image/stock_draw-curved-connector-with-circles.png -share/icons/gnome/16x16/stock/image/stock_draw-curved-connector.png -share/icons/gnome/16x16/stock/image/stock_draw-cylinder.png -share/icons/gnome/16x16/stock/image/stock_draw-dimension-line.png -share/icons/gnome/16x16/stock/image/stock_draw-ellipse-pie-unfilled.png -share/icons/gnome/16x16/stock/image/stock_draw-ellipse-pie.png -share/icons/gnome/16x16/stock/image/stock_draw-ellipse-segment-unfilled.png -share/icons/gnome/16x16/stock/image/stock_draw-ellipse-segment.png -share/icons/gnome/16x16/stock/image/stock_draw-ellipse-unfilled.png -share/icons/gnome/16x16/stock/image/stock_draw-ellipse.png -share/icons/gnome/16x16/stock/image/stock_draw-freeform-line-filled.png -share/icons/gnome/16x16/stock/image/stock_draw-freeform-line.png -share/icons/gnome/16x16/stock/image/stock_draw-half-sphere.png -share/icons/gnome/16x16/stock/image/stock_draw-line-45.png -share/icons/gnome/16x16/stock/image/stock_draw-line-connector-ends-with-arrow.png -share/icons/gnome/16x16/stock/image/stock_draw-line-connector-ends-with-circle.png -share/icons/gnome/16x16/stock/image/stock_draw-line-connector-starts-with-arrow.png -share/icons/gnome/16x16/stock/image/stock_draw-line-connector-starts-with-circle.png -share/icons/gnome/16x16/stock/image/stock_draw-line-connector-with-arrows.png -share/icons/gnome/16x16/stock/image/stock_draw-line-connector-with-circles.png -share/icons/gnome/16x16/stock/image/stock_draw-line-connector.png -share/icons/gnome/16x16/stock/image/stock_draw-line-ends-with-arrow.png -share/icons/gnome/16x16/stock/image/stock_draw-line-starts-with-arrow.png -share/icons/gnome/16x16/stock/image/stock_draw-line-with-arrow-circle.png -share/icons/gnome/16x16/stock/image/stock_draw-line-with-arrow-square.png -share/icons/gnome/16x16/stock/image/stock_draw-line-with-arrows.png -share/icons/gnome/16x16/stock/image/stock_draw-line-with-circle-arrow.png -share/icons/gnome/16x16/stock/image/stock_draw-line-with-square-arrow.png -share/icons/gnome/16x16/stock/image/stock_draw-line.png -share/icons/gnome/16x16/stock/image/stock_draw-polygon-45-filled.png -share/icons/gnome/16x16/stock/image/stock_draw-polygon-45.png -share/icons/gnome/16x16/stock/image/stock_draw-polygon-filled.png -share/icons/gnome/16x16/stock/image/stock_draw-polygon.png -share/icons/gnome/16x16/stock/image/stock_draw-pyramid.png -share/icons/gnome/16x16/stock/image/stock_draw-rectangle-unfilled.png -share/icons/gnome/16x16/stock/image/stock_draw-rectangle.png -share/icons/gnome/16x16/stock/image/stock_draw-rounded-rectangle-unfilled.png -share/icons/gnome/16x16/stock/image/stock_draw-rounded-rectangle.png -share/icons/gnome/16x16/stock/image/stock_draw-rounded-square-unfilled.png -share/icons/gnome/16x16/stock/image/stock_draw-rounded-square.png -share/icons/gnome/16x16/stock/image/stock_draw-selection.png -share/icons/gnome/16x16/stock/image/stock_draw-shell.png -share/icons/gnome/16x16/stock/image/stock_draw-sphere.png -share/icons/gnome/16x16/stock/image/stock_draw-square-unfilled.png -share/icons/gnome/16x16/stock/image/stock_draw-square.png -share/icons/gnome/16x16/stock/image/stock_draw-straight-connector-ends-with-arrow.png -share/icons/gnome/16x16/stock/image/stock_draw-straight-connector-ends-with-circle.png -share/icons/gnome/16x16/stock/image/stock_draw-straight-connector-starts-with-arrow.png -share/icons/gnome/16x16/stock/image/stock_draw-straight-connector-starts-with-circle.png -share/icons/gnome/16x16/stock/image/stock_draw-straight-connector-with-arrows.png -share/icons/gnome/16x16/stock/image/stock_draw-straight-connector-with-circles.png -share/icons/gnome/16x16/stock/image/stock_draw-straight-connector.png -share/icons/gnome/16x16/stock/image/stock_draw-torus.png -share/icons/gnome/16x16/stock/image/stock_draw-vertical-callouts.png -share/icons/gnome/16x16/stock/image/stock_edit-points.png -share/icons/gnome/16x16/stock/image/stock_filters-aging.png -share/icons/gnome/16x16/stock/image/stock_filters-charcoal.png -share/icons/gnome/16x16/stock/image/stock_filters-invert.png -share/icons/gnome/16x16/stock/image/stock_filters-pixelize.png -share/icons/gnome/16x16/stock/image/stock_filters-pop-art.png -share/icons/gnome/16x16/stock/image/stock_filters-posterize.png -share/icons/gnome/16x16/stock/image/stock_filters-relief.png -share/icons/gnome/16x16/stock/image/stock_filters-remove-noise.png -share/icons/gnome/16x16/stock/image/stock_filters-sharpen.png -share/icons/gnome/16x16/stock/image/stock_filters-smooth.png -share/icons/gnome/16x16/stock/image/stock_filters-solarize.png -share/icons/gnome/16x16/stock/image/stock_flip.png -share/icons/gnome/16x16/stock/image/stock_gamma.png -share/icons/gnome/16x16/stock/image/stock_gradient.png -share/icons/gnome/16x16/stock/image/stock_graphic-styles.png -share/icons/gnome/16x16/stock/image/stock_graphics-align-bottom.png -share/icons/gnome/16x16/stock/image/stock_graphics-align-center.png -share/icons/gnome/16x16/stock/image/stock_graphics-align-centered.png -share/icons/gnome/16x16/stock/image/stock_graphics-align-left.png -share/icons/gnome/16x16/stock/image/stock_graphics-align-right.png -share/icons/gnome/16x16/stock/image/stock_graphics-align-top.png -share/icons/gnome/16x16/stock/image/stock_guides.png -share/icons/gnome/16x16/stock/image/stock_imagemap-editor.png -share/icons/gnome/16x16/stock/image/stock_insert_image.png -share/icons/gnome/16x16/stock/image/stock_linepen.png -share/icons/gnome/16x16/stock/image/stock_modify-layout.png -share/icons/gnome/16x16/stock/image/stock_node-add.png -share/icons/gnome/16x16/stock/image/stock_node-close-path.png -share/icons/gnome/16x16/stock/image/stock_node-convert.png -share/icons/gnome/16x16/stock/image/stock_node-corner-to-smooth.png -share/icons/gnome/16x16/stock/image/stock_node-corner.png -share/icons/gnome/16x16/stock/image/stock_node-curve-split.png -share/icons/gnome/16x16/stock/image/stock_node-delete.png -share/icons/gnome/16x16/stock/image/stock_node-mark-for-deletion.png -share/icons/gnome/16x16/stock/image/stock_node-move.png -share/icons/gnome/16x16/stock/image/stock_node-smooth-to-symmetrical.png -share/icons/gnome/16x16/stock/image/stock_placeholder-graphic.png -share/icons/gnome/16x16/stock/image/stock_placeholder-line-contour.png -share/icons/gnome/16x16/stock/image/stock_placeholder-picture.png -share/icons/gnome/16x16/stock/image/stock_placeholder-text.png -share/icons/gnome/16x16/stock/image/stock_quickmask.png -share/icons/gnome/16x16/stock/image/stock_rotate-3d.png -share/icons/gnome/16x16/stock/image/stock_rotate.png -share/icons/gnome/16x16/stock/image/stock_rotation-mode.png -share/icons/gnome/16x16/stock/image/stock_shadow.png -share/icons/gnome/16x16/stock/image/stock_show-draw-functions.png -share/icons/gnome/16x16/stock/image/stock_toggle-graphics.png -share/icons/gnome/16x16/stock/image/stock_transform-circle-perspective.png -share/icons/gnome/16x16/stock/image/stock_transform-circle-slant.png -share/icons/gnome/16x16/stock/image/stock_transparency.png -share/icons/gnome/16x16/stock/io/stock_export.png -share/icons/gnome/16x16/stock/io/stock_insert-file.png -share/icons/gnome/16x16/stock/io/stock_open-read-only.png -share/icons/gnome/16x16/stock/io/stock_open.png -share/icons/gnome/16x16/stock/io/stock_reload.png -share/icons/gnome/16x16/stock/io/stock_save-pdf.png -share/icons/gnome/16x16/stock/io/stock_save-template.png -share/icons/gnome/16x16/stock/io/stock_save.png -share/icons/gnome/16x16/stock/io/stock_save_as.png -share/icons/gnome/16x16/stock/io/stock_up-one-dir.png -share/icons/gnome/16x16/stock/media/stock_effects-sound.png -share/icons/gnome/16x16/stock/media/stock_insert-video-plugin.png -share/icons/gnome/16x16/stock/media/stock_line_in.png -share/icons/gnome/16x16/stock/media/stock_mic.png -share/icons/gnome/16x16/stock/media/stock_midi.png -share/icons/gnome/16x16/stock/media/stock_repeat.png -share/icons/gnome/16x16/stock/media/stock_volume.png -share/icons/gnome/16x16/stock/navigation/stock_bottom.png -share/icons/gnome/16x16/stock/navigation/stock_down-with-subpoints.png -share/icons/gnome/16x16/stock/navigation/stock_down.png -share/icons/gnome/16x16/stock/navigation/stock_first-page.png -share/icons/gnome/16x16/stock/navigation/stock_first.png -share/icons/gnome/16x16/stock/navigation/stock_last-page.png -share/icons/gnome/16x16/stock/navigation/stock_last.png -share/icons/gnome/16x16/stock/navigation/stock_left-with-subpoints.png -share/icons/gnome/16x16/stock/navigation/stock_left.png -share/icons/gnome/16x16/stock/navigation/stock_live-mode.png -share/icons/gnome/16x16/stock/navigation/stock_navigate-next.png -share/icons/gnome/16x16/stock/navigation/stock_navigate-prev.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-all-or-sel-toggle.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-database-ranges.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-drag-mode.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-edit-entry.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-foonote-body-toggle.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-footer-body-toggle.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-header-body-toggle.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-headings.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-indexes.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-insert-as-copy.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-insert-as-link.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-insert-index.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-insert-linked.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-levels.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-list-box-toggle.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-master-toggle.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-next-object.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-open-toolbar.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-previous-object.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-range-names.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-references.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-reminder.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-scenarios.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-sections.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-shift-down.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-shift-left.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-shift-right.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-shift-up.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-table-formula.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-text.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-update-entry.png -share/icons/gnome/16x16/stock/navigation/stock_navigator-wrong-table-formula.png -share/icons/gnome/16x16/stock/navigation/stock_navigator.png -share/icons/gnome/16x16/stock/navigation/stock_next-page.png -share/icons/gnome/16x16/stock/navigation/stock_next.png -share/icons/gnome/16x16/stock/navigation/stock_previous-page.png -share/icons/gnome/16x16/stock/navigation/stock_previous.png -share/icons/gnome/16x16/stock/navigation/stock_right-with-subpoints.png -share/icons/gnome/16x16/stock/navigation/stock_right.png -share/icons/gnome/16x16/stock/navigation/stock_top.png -share/icons/gnome/16x16/stock/navigation/stock_up-with-subpoints.png -share/icons/gnome/16x16/stock/navigation/stock_up.png -share/icons/gnome/16x16/stock/navigation/stock_zoom-1.png -share/icons/gnome/16x16/stock/navigation/stock_zoom-in.png -share/icons/gnome/16x16/stock/navigation/stock_zoom-next.png -share/icons/gnome/16x16/stock/navigation/stock_zoom-object.png -share/icons/gnome/16x16/stock/navigation/stock_zoom-optimal.png -share/icons/gnome/16x16/stock/navigation/stock_zoom-out.png -share/icons/gnome/16x16/stock/navigation/stock_zoom-page-width.png -share/icons/gnome/16x16/stock/navigation/stock_zoom-page.png -share/icons/gnome/16x16/stock/navigation/stock_zoom-previous.png -share/icons/gnome/16x16/stock/navigation/stock_zoom-shift.png -share/icons/gnome/16x16/stock/navigation/stock_zoom.png -share/icons/gnome/16x16/stock/net/stock_addressbook.png -share/icons/gnome/16x16/stock/net/stock_appointment-reminder-excl.png -share/icons/gnome/16x16/stock/net/stock_appointment-reminder.png -share/icons/gnome/16x16/stock/net/stock_hyperlink-internet-search.png -share/icons/gnome/16x16/stock/net/stock_hyperlink-target.png -share/icons/gnome/16x16/stock/net/stock_hyperlink-toolbar.png -share/icons/gnome/16x16/stock/net/stock_hyperlink.png -share/icons/gnome/16x16/stock/net/stock_inbox.png -share/icons/gnome/16x16/stock/net/stock_insert_url.png -share/icons/gnome/16x16/stock/net/stock_internet.png -share/icons/gnome/16x16/stock/net/stock_link.png -share/icons/gnome/16x16/stock/net/stock_mail-compose.png -share/icons/gnome/16x16/stock/net/stock_mail-merge.png -share/icons/gnome/16x16/stock/net/stock_mail.png -share/icons/gnome/16x16/stock/net/stock_mail_forward.png -share/icons/gnome/16x16/stock/net/stock_mail_open.png -share/icons/gnome/16x16/stock/net/stock_mail_receive.png -share/icons/gnome/16x16/stock/net/stock_mail_reply.png -share/icons/gnome/16x16/stock/net/stock_mail_send.png -share/icons/gnome/16x16/stock/net/stock_online-layout.png -share/icons/gnome/16x16/stock/net/stock_outbox.png -share/icons/gnome/16x16/stock/net/stock_sent-mail.png -share/icons/gnome/16x16/stock/object/stock_3d-3d-attributes-only.png -share/icons/gnome/16x16/stock/object/stock_3d-all-attributes.png -share/icons/gnome/16x16/stock/object/stock_3d-geometry.png -share/icons/gnome/16x16/stock/object/stock_3d-light-off.png -share/icons/gnome/16x16/stock/object/stock_3d-light-on.png -share/icons/gnome/16x16/stock/object/stock_3d-light.png -share/icons/gnome/16x16/stock/object/stock_3d-material.png -share/icons/gnome/16x16/stock/object/stock_3d-normals-double-sided-closed-body.png -share/icons/gnome/16x16/stock/object/stock_3d-normals-double-sided.png -share/icons/gnome/16x16/stock/object/stock_3d-normals-flat.png -share/icons/gnome/16x16/stock/object/stock_3d-normals-flip-illumination.png -share/icons/gnome/16x16/stock/object/stock_3d-normals-object-specific.png -share/icons/gnome/16x16/stock/object/stock_3d-normals-spherical.png -share/icons/gnome/16x16/stock/object/stock_3d-perspective.png -share/icons/gnome/16x16/stock/object/stock_3d-shading.png -share/icons/gnome/16x16/stock/object/stock_3d-texture-and-shading.png -share/icons/gnome/16x16/stock/object/stock_3d-texture-object-specific.png -share/icons/gnome/16x16/stock/object/stock_3d-texture-only.png -share/icons/gnome/16x16/stock/object/stock_3d-texture-parallel.png -share/icons/gnome/16x16/stock/object/stock_3d-texture-spherical.png -share/icons/gnome/16x16/stock/object/stock_3d-texture.png -share/icons/gnome/16x16/stock/object/stock_auto-contour.png -share/icons/gnome/16x16/stock/object/stock_bring-backward.png -share/icons/gnome/16x16/stock/object/stock_bring-forward.png -share/icons/gnome/16x16/stock/object/stock_create-with-attributes.png -share/icons/gnome/16x16/stock/object/stock_effects-more-options.png -share/icons/gnome/16x16/stock/object/stock_effects-object-colorize.png -share/icons/gnome/16x16/stock/object/stock_effects-object-hide.png -share/icons/gnome/16x16/stock/object/stock_effects-object.png -share/icons/gnome/16x16/stock/object/stock_effects-play-in-full.png -share/icons/gnome/16x16/stock/object/stock_effects-preview.png -share/icons/gnome/16x16/stock/object/stock_effects.png -share/icons/gnome/16x16/stock/object/stock_enter-group.png -share/icons/gnome/16x16/stock/object/stock_exit-group.png -share/icons/gnome/16x16/stock/object/stock_file-with-objects.png -share/icons/gnome/16x16/stock/object/stock_format-object.png -share/icons/gnome/16x16/stock/object/stock_formula-cursor.png -share/icons/gnome/16x16/stock/object/stock_frame.png -share/icons/gnome/16x16/stock/object/stock_group.png -share/icons/gnome/16x16/stock/object/stock_handles-big.png -share/icons/gnome/16x16/stock/object/stock_handles-simple.png -share/icons/gnome/16x16/stock/object/stock_insert-applet.png -share/icons/gnome/16x16/stock/object/stock_insert-floating-frame.png -share/icons/gnome/16x16/stock/object/stock_insert-gluepoint.png -share/icons/gnome/16x16/stock/object/stock_insert-math-object.png -share/icons/gnome/16x16/stock/object/stock_insert-note.png -share/icons/gnome/16x16/stock/object/stock_insert-ole-object.png -share/icons/gnome/16x16/stock/object/stock_insert-plugin.png -share/icons/gnome/16x16/stock/object/stock_insert-single-column-text-frame.png -share/icons/gnome/16x16/stock/object/stock_insert-slide.png -share/icons/gnome/16x16/stock/object/stock_insert-sound-plugin.png -share/icons/gnome/16x16/stock/object/stock_insert-text-frame.png -share/icons/gnome/16x16/stock/object/stock_insert_bookmark.png -share/icons/gnome/16x16/stock/object/stock_insert_graphic.png -share/icons/gnome/16x16/stock/object/stock_insert_special_character.png -share/icons/gnome/16x16/stock/object/stock_interaction.png -share/icons/gnome/16x16/stock/object/stock_new-bcard.png -share/icons/gnome/16x16/stock/object/stock_object-behind.png -share/icons/gnome/16x16/stock/object/stock_object-infront.png -share/icons/gnome/16x16/stock/object/stock_position-size.png -share/icons/gnome/16x16/stock/object/stock_reverse-order.png -share/icons/gnome/16x16/stock/object/stock_slide-design.png -share/icons/gnome/16x16/stock/object/stock_slide-duplicate.png -share/icons/gnome/16x16/stock/object/stock_slide-expand.png -share/icons/gnome/16x16/stock/object/stock_slide-reherse-timings.png -share/icons/gnome/16x16/stock/object/stock_slide-show.png -share/icons/gnome/16x16/stock/object/stock_slide-showhide.png -share/icons/gnome/16x16/stock/object/stock_snap-grid.png -share/icons/gnome/16x16/stock/object/stock_snap-guides.png -share/icons/gnome/16x16/stock/object/stock_snap-margins.png -share/icons/gnome/16x16/stock/object/stock_snap-object-points.png -share/icons/gnome/16x16/stock/object/stock_snap-object.png -share/icons/gnome/16x16/stock/object/stock_symbol-selection.png -share/icons/gnome/16x16/stock/object/stock_to-3d-rotation-object.png -share/icons/gnome/16x16/stock/object/stock_to-3d.png -share/icons/gnome/16x16/stock/object/stock_to-bottom.png -share/icons/gnome/16x16/stock/object/stock_to-curve.png -share/icons/gnome/16x16/stock/object/stock_to-polygon.png -share/icons/gnome/16x16/stock/object/stock_to-top.png -share/icons/gnome/16x16/stock/object/stock_ungroup.png -share/icons/gnome/16x16/stock/object/stock_unlink.png -share/icons/gnome/16x16/stock/object/stock_view-function-selection.png -share/icons/gnome/16x16/stock/table/stock_alignment-bottom.png -share/icons/gnome/16x16/stock/table/stock_alignment-centered-vertically.png -share/icons/gnome/16x16/stock/table/stock_alignment-centered.png -share/icons/gnome/16x16/stock/table/stock_alignment-left.png -share/icons/gnome/16x16/stock/table/stock_alignment-right.png -share/icons/gnome/16x16/stock/table/stock_alignment-top.png -share/icons/gnome/16x16/stock/table/stock_alignment.png -share/icons/gnome/16x16/stock/table/stock_cell-align-bottom.png -share/icons/gnome/16x16/stock/table/stock_cell-align-center.png -share/icons/gnome/16x16/stock/table/stock_cell-align-top.png -share/icons/gnome/16x16/stock/table/stock_choose-themes.png -share/icons/gnome/16x16/stock/table/stock_datapilot.png -share/icons/gnome/16x16/stock/table/stock_delete-column.png -share/icons/gnome/16x16/stock/table/stock_delete-row.png -share/icons/gnome/16x16/stock/table/stock_exchange-columns.png -share/icons/gnome/16x16/stock/table/stock_exchange-rows.png -share/icons/gnome/16x16/stock/table/stock_group-cells.png -share/icons/gnome/16x16/stock/table/stock_insert-cells-down.png -share/icons/gnome/16x16/stock/table/stock_insert-cells-right.png -share/icons/gnome/16x16/stock/table/stock_insert-cells.png -share/icons/gnome/16x16/stock/table/stock_insert-columns.png -share/icons/gnome/16x16/stock/table/stock_insert-names-define.png -share/icons/gnome/16x16/stock/table/stock_insert-rows.png -share/icons/gnome/16x16/stock/table/stock_select-column.png -share/icons/gnome/16x16/stock/table/stock_select-row.png -share/icons/gnome/16x16/stock/table/stock_select-table.png -share/icons/gnome/16x16/stock/table/stock_sort-table-column-ascending.png -share/icons/gnome/16x16/stock/table/stock_sort-table-row-ascending.png -share/icons/gnome/16x16/stock/table/stock_table-align-bottom.png -share/icons/gnome/16x16/stock/table/stock_table-align-center.png -share/icons/gnome/16x16/stock/table/stock_table-align-top.png -share/icons/gnome/16x16/stock/table/stock_table-borders.png -share/icons/gnome/16x16/stock/table/stock_table-combine.png -share/icons/gnome/16x16/stock/table/stock_table-fit-height.png -share/icons/gnome/16x16/stock/table/stock_table-fit-width.png -share/icons/gnome/16x16/stock/table/stock_table-fixed-proportional.png -share/icons/gnome/16x16/stock/table/stock_table-fixed.png -share/icons/gnome/16x16/stock/table/stock_table-line-color.png -share/icons/gnome/16x16/stock/table/stock_table-line-style.png -share/icons/gnome/16x16/stock/table/stock_table-optimize.png -share/icons/gnome/16x16/stock/table/stock_table-same-height.png -share/icons/gnome/16x16/stock/table/stock_table-same-width.png -share/icons/gnome/16x16/stock/table/stock_table-split.png -share/icons/gnome/16x16/stock/table/stock_table-variable.png -share/icons/gnome/16x16/stock/table/stock_table_borders.png -share/icons/gnome/16x16/stock/table/stock_table_fill.png -share/icons/gnome/16x16/stock/table/stock_ungroup-cells.png -share/icons/gnome/16x16/stock/text/stock_autoformat.png -share/icons/gnome/16x16/stock/text/stock_autospellcheck.png -share/icons/gnome/16x16/stock/text/stock_autotext.png -share/icons/gnome/16x16/stock/text/stock_chart-scale-text.png -share/icons/gnome/16x16/stock/text/stock_decrease-font.png -share/icons/gnome/16x16/stock/text/stock_directcursor.png -share/icons/gnome/16x16/stock/text/stock_draw-text-animation.png -share/icons/gnome/16x16/stock/text/stock_draw-text-frame.png -share/icons/gnome/16x16/stock/text/stock_draw-text.png -share/icons/gnome/16x16/stock/text/stock_draw-vertical-text-frame.png -share/icons/gnome/16x16/stock/text/stock_draw-vertical-text.png -share/icons/gnome/16x16/stock/text/stock_edit-contour.png -share/icons/gnome/16x16/stock/text/stock_edit-headers-and-footers.png -share/icons/gnome/16x16/stock/text/stock_effects-text.png -share/icons/gnome/16x16/stock/text/stock_euro.png -share/icons/gnome/16x16/stock/text/stock_font-formatting-toggle.png -share/icons/gnome/16x16/stock/text/stock_font-size.png -share/icons/gnome/16x16/stock/text/stock_font.png -share/icons/gnome/16x16/stock/text/stock_fontwork-2dshadow.png -share/icons/gnome/16x16/stock/text/stock_fontwork-3dshadow.png -share/icons/gnome/16x16/stock/text/stock_fontwork-adaptation-off.png -share/icons/gnome/16x16/stock/text/stock_fontwork-adaptation-rotate.png -share/icons/gnome/16x16/stock/text/stock_fontwork-adaptation-slant-h.png -share/icons/gnome/16x16/stock/text/stock_fontwork-adaptation-slant-v.png -share/icons/gnome/16x16/stock/text/stock_fontwork-adaptation-straight.png -share/icons/gnome/16x16/stock/text/stock_fontwork-align-fill.png -share/icons/gnome/16x16/stock/text/stock_fontwork-noshadow.png -share/icons/gnome/16x16/stock/text/stock_fontwork-preview-spline.png -share/icons/gnome/16x16/stock/text/stock_fontwork-reverse-text-flow.png -share/icons/gnome/16x16/stock/text/stock_fontwork-shadow-angle.png -share/icons/gnome/16x16/stock/text/stock_fontwork-shadow-length.png -share/icons/gnome/16x16/stock/text/stock_fontwork-shadow-x-offset.png -share/icons/gnome/16x16/stock/text/stock_fontwork-shadow-y-offset.png -share/icons/gnome/16x16/stock/text/stock_fontwork-spline-distance.png -share/icons/gnome/16x16/stock/text/stock_fontwork-spline-indent.png -share/icons/gnome/16x16/stock/text/stock_fontwork-text-border.png -share/icons/gnome/16x16/stock/text/stock_fontwork.png -share/icons/gnome/16x16/stock/text/stock_format-character.png -share/icons/gnome/16x16/stock/text/stock_format-numbering-bullets.png -share/icons/gnome/16x16/stock/text/stock_format-paragraph.png -share/icons/gnome/16x16/stock/text/stock_increase-font.png -share/icons/gnome/16x16/stock/text/stock_insert-caption.png -share/icons/gnome/16x16/stock/text/stock_insert-cross-reference.png -share/icons/gnome/16x16/stock/text/stock_insert-fields-author.png -share/icons/gnome/16x16/stock/text/stock_insert-fields-subject.png -share/icons/gnome/16x16/stock/text/stock_insert-fields-title.png -share/icons/gnome/16x16/stock/text/stock_insert-footer.png -share/icons/gnome/16x16/stock/text/stock_insert-header.png -share/icons/gnome/16x16/stock/text/stock_insert_endnote.png -share/icons/gnome/16x16/stock/text/stock_insert_footnote.png -share/icons/gnome/16x16/stock/text/stock_insert_index_marker.png -share/icons/gnome/16x16/stock/text/stock_insert_section.png -share/icons/gnome/16x16/stock/text/stock_line-spacing-1.5.png -share/icons/gnome/16x16/stock/text/stock_line-spacing-1.png -share/icons/gnome/16x16/stock/text/stock_line-spacing-2.png -share/icons/gnome/16x16/stock/text/stock_list-insert-unnumbered.png -share/icons/gnome/16x16/stock/text/stock_list_bullet.png -share/icons/gnome/16x16/stock/text/stock_list_enum-off.png -share/icons/gnome/16x16/stock/text/stock_list_enum-restart.png -share/icons/gnome/16x16/stock/text/stock_list_enum.png -share/icons/gnome/16x16/stock/text/stock_nonprinting-chars.png -share/icons/gnome/16x16/stock/text/stock_page-number.png -share/icons/gnome/16x16/stock/text/stock_page-total-number.png -share/icons/gnome/16x16/stock/text/stock_paragraph-spacing-decrease.png -share/icons/gnome/16x16/stock/text/stock_paragraph-spacing-increase.png -share/icons/gnome/16x16/stock/text/stock_select-all.png -share/icons/gnome/16x16/stock/text/stock_spellcheck.png -share/icons/gnome/16x16/stock/text/stock_styles-character-styles.png -share/icons/gnome/16x16/stock/text/stock_styles-fill-format-mode.png -share/icons/gnome/16x16/stock/text/stock_styles-frame-styles.png -share/icons/gnome/16x16/stock/text/stock_styles-new-style-from-selection.png -share/icons/gnome/16x16/stock/text/stock_styles-numbering-styles.png -share/icons/gnome/16x16/stock/text/stock_styles-page-styles.png -share/icons/gnome/16x16/stock/text/stock_styles-paragraph-styles.png -share/icons/gnome/16x16/stock/text/stock_styles-update-style.png -share/icons/gnome/16x16/stock/text/stock_subscript.png -share/icons/gnome/16x16/stock/text/stock_superscript.png -share/icons/gnome/16x16/stock/text/stock_text-direction-ltr.png -share/icons/gnome/16x16/stock/text/stock_text-direction-ttb.png -share/icons/gnome/16x16/stock/text/stock_text-double-click-to-edit.png -share/icons/gnome/16x16/stock/text/stock_text-outline.png -share/icons/gnome/16x16/stock/text/stock_text-quickedit.png -share/icons/gnome/16x16/stock/text/stock_text-select-text-only.png -share/icons/gnome/16x16/stock/text/stock_text-shadow.png -share/icons/gnome/16x16/stock/text/stock_text-spacing.png -share/icons/gnome/16x16/stock/text/stock_text-strikethrough.png -share/icons/gnome/16x16/stock/text/stock_text_bold.png -share/icons/gnome/16x16/stock/text/stock_text_center.png -share/icons/gnome/16x16/stock/text/stock_text_color_background.png -share/icons/gnome/16x16/stock/text/stock_text_color_foreground.png -share/icons/gnome/16x16/stock/text/stock_text_color_hilight.png -share/icons/gnome/16x16/stock/text/stock_text_indent.png -share/icons/gnome/16x16/stock/text/stock_text_italic.png -share/icons/gnome/16x16/stock/text/stock_text_justify.png -share/icons/gnome/16x16/stock/text/stock_text_left.png -share/icons/gnome/16x16/stock/text/stock_text_right.png -share/icons/gnome/16x16/stock/text/stock_text_underlined-double.png -share/icons/gnome/16x16/stock/text/stock_text_underlined.png -share/icons/gnome/16x16/stock/text/stock_text_unindent.png -share/icons/gnome/16x16/stock/text/stock_thesaurus.png -share/icons/gnome/16x16/stock/text/stock_to-background.png -share/icons/gnome/16x16/stock/text/stock_to-foreground.png -share/icons/gnome/16x16/stock/text/stock_tools-hyphenation.png -share/icons/gnome/16x16/stock/text/stock_update-fields.png -share/icons/gnome/16x16/stock/text/stock_view-field-shadings.png -share/icons/gnome/16x16/stock/text/stock_wrap-around.png -share/icons/gnome/16x16/stock/text/stock_wrap-behind.png -share/icons/gnome/16x16/stock/text/stock_wrap-contour.png -share/icons/gnome/16x16/stock/text/stock_wrap-interrupt.png -share/icons/gnome/16x16/stock/text/stock_wrap-left.png -share/icons/gnome/16x16/stock/text/stock_wrap-optimal.png -share/icons/gnome/16x16/stock/text/stock_wrap-right.png +share/icons/gnome/16x16/devices/gnome-dev-cdrom-audio.png +share/icons/gnome/16x16/devices/gnome-dev-cdrom.png +share/icons/gnome/16x16/devices/gnome-dev-dvd.png +share/icons/gnome/16x16/devices/gnome-dev-floppy.png +share/icons/gnome/16x16/devices/gnome-dev-harddisk.png +share/icons/gnome/16x16/devices/gnome-dev-memory.png +share/icons/gnome/16x16/devices/gnome-dev-mouse-ball.png +share/icons/gnome/16x16/devices/gnome-dev-printer.png +share/icons/gnome/16x16/devices/gnome-dev-removable.png +share/icons/gnome/16x16/filesystems/gnome-fs-bookmark-missing.png +share/icons/gnome/16x16/filesystems/gnome-fs-bookmark.png +share/icons/gnome/16x16/filesystems/gnome-fs-client.png +share/icons/gnome/16x16/filesystems/gnome-fs-network.png +share/icons/gnome/16x16/filesystems/gnome-fs-server.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-msword.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.ms-excel.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.ms-powerpoint.png +share/icons/gnome/16x16/mimetypes/gnome-mime-image-bmp.png +share/icons/gnome/16x16/mimetypes/gnome-mime-image-gif.png +share/icons/gnome/16x16/mimetypes/gnome-mime-image-jpeg.png +share/icons/gnome/16x16/mimetypes/gnome-mime-image-png.png +share/icons/gnome/16x16/mimetypes/gnome-mime-image-svg.png +share/icons/gnome/16x16/mimetypes/gnome-mime-image-tiff.png +share/icons/gnome/16x16/mimetypes/gnome-mime-image-wmf.png +share/icons/gnome/16x16/mimetypes/gnome-mime-x-directory-nfs-server.png +share/icons/gnome/16x16/mimetypes/gnome-mime-x-directory-smb-workgroup.png share/icons/gnome/192x192/devices/gnome-dev-cdrom.png +share/icons/gnome/192x192/filesystems/gnome-fs-regular.icon +share/icons/gnome/192x192/filesystems/gnome-fs-regular.png share/icons/gnome/192x192/filesystems/gnome-fs-trash-empty.png share/icons/gnome/192x192/filesystems/gnome-fs-trash-full.png -share/icons/gnome/24x24/apps/advanced-directory.png -share/icons/gnome/24x24/apps/applets-screenshooter.png -share/icons/gnome/24x24/apps/gnome-amusements.png -share/icons/gnome/24x24/apps/gnome-devel.png -share/icons/gnome/24x24/apps/gnome-favorites.png -share/icons/gnome/24x24/apps/gnome-globe.png -share/icons/gnome/24x24/apps/gnome-graphics.png -share/icons/gnome/24x24/apps/gnome-joystick.png -share/icons/gnome/24x24/apps/gnome-lockscreen.png -share/icons/gnome/24x24/apps/gnome-multimedia.png -share/icons/gnome/24x24/apps/gnome-searchtool.png -share/icons/gnome/24x24/apps/gnome-status.png -share/icons/gnome/24x24/apps/gnome-terminal.png -share/icons/gnome/24x24/apps/panel-notification-area.png +share/icons/gnome/24x24/devices/gnome-dev-battery.png +share/icons/gnome/24x24/devices/gnome-dev-cdrom-audio.png +share/icons/gnome/24x24/devices/gnome-dev-cdrom.png +share/icons/gnome/24x24/devices/gnome-dev-dvd.png +share/icons/gnome/24x24/devices/gnome-dev-floppy.png +share/icons/gnome/24x24/devices/gnome-dev-harddisk.png +share/icons/gnome/24x24/devices/gnome-dev-memory.png +share/icons/gnome/24x24/devices/gnome-dev-mouse-ball.png +share/icons/gnome/24x24/devices/gnome-dev-printer.png +share/icons/gnome/24x24/devices/gnome-dev-removable.png share/icons/gnome/24x24/emblems/emblem-symbolic-link.png share/icons/gnome/24x24/filesystems/gnome-fs-bookmark-missing.png share/icons/gnome/24x24/filesystems/gnome-fs-bookmark.png +share/icons/gnome/24x24/filesystems/gnome-fs-client.png share/icons/gnome/24x24/filesystems/gnome-fs-directory-accept.icon share/icons/gnome/24x24/filesystems/gnome-fs-directory-accept.png +share/icons/gnome/24x24/filesystems/gnome-fs-directory-visiting.icon +share/icons/gnome/24x24/filesystems/gnome-fs-directory-visiting.png share/icons/gnome/24x24/filesystems/gnome-fs-directory.icon share/icons/gnome/24x24/filesystems/gnome-fs-directory.png -share/icons/gnome/24x24/stock/chart/stock_chart-autoformat.png -share/icons/gnome/24x24/stock/chart/stock_chart-data-in-columns.png -share/icons/gnome/24x24/stock/chart/stock_chart-data-in-rows.png -share/icons/gnome/24x24/stock/chart/stock_chart-edit-type.png -share/icons/gnome/24x24/stock/chart/stock_chart-reorganize.png -share/icons/gnome/24x24/stock/chart/stock_chart-toggle-axes-title.png -share/icons/gnome/24x24/stock/chart/stock_chart-toggle-axes.png -share/icons/gnome/24x24/stock/chart/stock_chart-toggle-hgrid.png -share/icons/gnome/24x24/stock/chart/stock_chart-toggle-legend.png -share/icons/gnome/24x24/stock/chart/stock_chart-toggle-title.png -share/icons/gnome/24x24/stock/chart/stock_chart-toggle-vgrid.png -share/icons/gnome/24x24/stock/chart/stock_glue.png -share/icons/gnome/24x24/stock/chart/stock_gluepoint-down.png -share/icons/gnome/24x24/stock/chart/stock_gluepoint-horizontal-center.png -share/icons/gnome/24x24/stock/chart/stock_gluepoint-horizontal-left.png -share/icons/gnome/24x24/stock/chart/stock_gluepoint-horizontal-right.png -share/icons/gnome/24x24/stock/chart/stock_gluepoint-left.png -share/icons/gnome/24x24/stock/chart/stock_gluepoint-relative.png -share/icons/gnome/24x24/stock/chart/stock_gluepoint-right.png -share/icons/gnome/24x24/stock/chart/stock_gluepoint-up.png -share/icons/gnome/24x24/stock/chart/stock_gluepoint-vertical-bottom.png -share/icons/gnome/24x24/stock/chart/stock_gluepoint-vertical-center.png -share/icons/gnome/24x24/stock/chart/stock_gluepoint-vertical-top.png -share/icons/gnome/24x24/stock/chart/stock_insert-chart.png -share/icons/gnome/24x24/stock/code/stock_compile.png -share/icons/gnome/24x24/stock/code/stock_error-next-16.png -share/icons/gnome/24x24/stock/code/stock_error-previous-16.png -share/icons/gnome/24x24/stock/code/stock_macro-check-brackets.png -share/icons/gnome/24x24/stock/code/stock_macro-insert-breakpoint.png -share/icons/gnome/24x24/stock/code/stock_macro-insert.png -share/icons/gnome/24x24/stock/code/stock_macro-jump-back.png -share/icons/gnome/24x24/stock/code/stock_macro-objects.png -share/icons/gnome/24x24/stock/code/stock_macro-organizer.png -share/icons/gnome/24x24/stock/code/stock_macro-stop-after-command.png -share/icons/gnome/24x24/stock/code/stock_macro-stop-after-procedure.png -share/icons/gnome/24x24/stock/code/stock_macro-stop-watching.png -share/icons/gnome/24x24/stock/code/stock_macro-watch-variable.png -share/icons/gnome/24x24/stock/code/stock_record-macro.png -share/icons/gnome/24x24/stock/code/stock_run-macro.png -share/icons/gnome/24x24/stock/code/stock_tools-macro.png -share/icons/gnome/24x24/stock/data/stock_add-decimal-place.png -share/icons/gnome/24x24/stock/data/stock_advanced-filter.png -share/icons/gnome/24x24/stock/data/stock_autofilter.png -share/icons/gnome/24x24/stock/data/stock_data-delete-record.png -share/icons/gnome/24x24/stock/data/stock_data-explorer.png -share/icons/gnome/24x24/stock/data/stock_data-first.png -share/icons/gnome/24x24/stock/data/stock_data-last.png -share/icons/gnome/24x24/stock/data/stock_data-linked-table.png -share/icons/gnome/24x24/stock/data/stock_data-new-record.png -share/icons/gnome/24x24/stock/data/stock_data-next.png -share/icons/gnome/24x24/stock/data/stock_data-previous.png -share/icons/gnome/24x24/stock/data/stock_data-save.png -share/icons/gnome/24x24/stock/data/stock_data-sources.png -share/icons/gnome/24x24/stock/data/stock_data-undo.png -share/icons/gnome/24x24/stock/data/stock_delete-autofilter.png -share/icons/gnome/24x24/stock/data/stock_delete-decimal-place.png -share/icons/gnome/24x24/stock/data/stock_filter-data-by-criteria.png -share/icons/gnome/24x24/stock/data/stock_filter-navigator.png -share/icons/gnome/24x24/stock/data/stock_filters.png -share/icons/gnome/24x24/stock/data/stock_format-default.png -share/icons/gnome/24x24/stock/data/stock_format-percent.png -share/icons/gnome/24x24/stock/data/stock_format-scientific.png -share/icons/gnome/24x24/stock/data/stock_function-autopilot.png -share/icons/gnome/24x24/stock/data/stock_goal-seek.png -share/icons/gnome/24x24/stock/data/stock_insert-fields.png -share/icons/gnome/24x24/stock/data/stock_sort-ascending.png -share/icons/gnome/24x24/stock/data/stock_sort-column-ascending.png -share/icons/gnome/24x24/stock/data/stock_sort-criteria.png -share/icons/gnome/24x24/stock/data/stock_sort-descending.png -share/icons/gnome/24x24/stock/data/stock_sort-row-ascending.png -share/icons/gnome/24x24/stock/data/stock_standard-filter.png -share/icons/gnome/24x24/stock/data/stock_sum.png -share/icons/gnome/24x24/stock/data/stock_update-data.png -share/icons/gnome/24x24/stock/document/stock_attach.png -share/icons/gnome/24x24/stock/document/stock_new-drawing.png -share/icons/gnome/24x24/stock/document/stock_new-formula.png -share/icons/gnome/24x24/stock/document/stock_new-html.png -share/icons/gnome/24x24/stock/document/stock_new-labels.png -share/icons/gnome/24x24/stock/document/stock_new-master-document.png -share/icons/gnome/24x24/stock/document/stock_new-presentation.png -share/icons/gnome/24x24/stock/document/stock_new-spreadsheet.png -share/icons/gnome/24x24/stock/document/stock_new-template.png -share/icons/gnome/24x24/stock/document/stock_new-text.png -share/icons/gnome/24x24/stock/document/stock_new.png -share/icons/gnome/24x24/stock/document/stock_preview-four-pages.png -share/icons/gnome/24x24/stock/document/stock_preview-two-pages.png -share/icons/gnome/24x24/stock/document/stock_print-layout.png -share/icons/gnome/24x24/stock/document/stock_print-options.png -share/icons/gnome/24x24/stock/document/stock_todo.png -share/icons/gnome/24x24/stock/document/stock_view-html-source.png -share/icons/gnome/24x24/stock/form/stock_form-activation-order.png -share/icons/gnome/24x24/stock/form/stock_form-add-field.png -share/icons/gnome/24x24/stock/form/stock_form-automatic-control-focus.png -share/icons/gnome/24x24/stock/form/stock_form-autopilots.png -share/icons/gnome/24x24/stock/form/stock_form-button.png -share/icons/gnome/24x24/stock/form/stock_form-checkbox.png -share/icons/gnome/24x24/stock/form/stock_form-combobox.png -share/icons/gnome/24x24/stock/form/stock_form-control-properties.png -share/icons/gnome/24x24/stock/form/stock_form-currency-field.png -share/icons/gnome/24x24/stock/form/stock_form-date-field.png -share/icons/gnome/24x24/stock/form/stock_form-design-mode.png -share/icons/gnome/24x24/stock/form/stock_form-file-selection.png -share/icons/gnome/24x24/stock/form/stock_form-formatted-field.png -share/icons/gnome/24x24/stock/form/stock_form-frame.png -share/icons/gnome/24x24/stock/form/stock_form-image-button.png -share/icons/gnome/24x24/stock/form/stock_form-image-control.png -share/icons/gnome/24x24/stock/form/stock_form-label.png -share/icons/gnome/24x24/stock/form/stock_form-letter-dialog.png -share/icons/gnome/24x24/stock/form/stock_form-listbox.png -share/icons/gnome/24x24/stock/form/stock_form-navigator.png -share/icons/gnome/24x24/stock/form/stock_form-numerical-field.png -share/icons/gnome/24x24/stock/form/stock_form-open-in-design-mode.png -share/icons/gnome/24x24/stock/form/stock_form-pattern-field.png -share/icons/gnome/24x24/stock/form/stock_form-properties.png -share/icons/gnome/24x24/stock/form/stock_form-radio.png -share/icons/gnome/24x24/stock/form/stock_form-table-control.png -share/icons/gnome/24x24/stock/form/stock_form-text-box.png -share/icons/gnome/24x24/stock/form/stock_form-time-field.png -share/icons/gnome/24x24/stock/form/stock_insert-form.png -share/icons/gnome/24x24/stock/form/stock_macro-controls.png -share/icons/gnome/24x24/stock/form/stock_show-form-dialog.png -share/icons/gnome/24x24/stock/form/stock_show-hidden-controls.png -share/icons/gnome/24x24/stock/form/stock_view-fields.png -share/icons/gnome/24x24/stock/generic/stock_about.png -share/icons/gnome/24x24/stock/generic/stock_allow-effects.png -share/icons/gnome/24x24/stock/generic/stock_anchor.png -share/icons/gnome/24x24/stock/generic/stock_animation.png -share/icons/gnome/24x24/stock/generic/stock_autopilot-24.png -share/icons/gnome/24x24/stock/generic/stock_book_blue.png -share/icons/gnome/24x24/stock/generic/stock_book_green.png -share/icons/gnome/24x24/stock/generic/stock_book_open.png -share/icons/gnome/24x24/stock/generic/stock_book_red.png -share/icons/gnome/24x24/stock/generic/stock_book_yellow.png -share/icons/gnome/24x24/stock/generic/stock_calc-accept.png -share/icons/gnome/24x24/stock/generic/stock_calc-cancel.png -share/icons/gnome/24x24/stock/generic/stock_calendar.png -share/icons/gnome/24x24/stock/generic/stock_cell-phone.png -share/icons/gnome/24x24/stock/generic/stock_close.png -share/icons/gnome/24x24/stock/generic/stock_copy.png -share/icons/gnome/24x24/stock/generic/stock_cut.png -share/icons/gnome/24x24/stock/generic/stock_delete.png -share/icons/gnome/24x24/stock/generic/stock_equals.png -share/icons/gnome/24x24/stock/generic/stock_exit.png -share/icons/gnome/24x24/stock/generic/stock_extended-help.png -share/icons/gnome/24x24/stock/generic/stock_file-properties.png -share/icons/gnome/24x24/stock/generic/stock_flip-horizontally.png -share/icons/gnome/24x24/stock/generic/stock_flip-vertically.png -share/icons/gnome/24x24/stock/generic/stock_format-page.png -share/icons/gnome/24x24/stock/generic/stock_fullscreen.png -share/icons/gnome/24x24/stock/generic/stock_help-agent.png -share/icons/gnome/24x24/stock/generic/stock_help-chat.png -share/icons/gnome/24x24/stock/generic/stock_help.png -share/icons/gnome/24x24/stock/generic/stock_id.png -share/icons/gnome/24x24/stock/generic/stock_not.png -share/icons/gnome/24x24/stock/generic/stock_notes.png -share/icons/gnome/24x24/stock/generic/stock_paste.png -share/icons/gnome/24x24/stock/generic/stock_presentation-box.png -share/icons/gnome/24x24/stock/generic/stock_print-preview-print.png -share/icons/gnome/24x24/stock/generic/stock_print-preview.png -share/icons/gnome/24x24/stock/generic/stock_print-setup.png -share/icons/gnome/24x24/stock/generic/stock_print.png -share/icons/gnome/24x24/stock/generic/stock_redo.png -share/icons/gnome/24x24/stock/generic/stock_refresh.png -share/icons/gnome/24x24/stock/generic/stock_scores.png -share/icons/gnome/24x24/stock/generic/stock_search.png -share/icons/gnome/24x24/stock/generic/stock_send-fax.png -share/icons/gnome/24x24/stock/generic/stock_stop.png -share/icons/gnome/24x24/stock/generic/stock_styles.png -share/icons/gnome/24x24/stock/generic/stock_summary.png -share/icons/gnome/24x24/stock/generic/stock_timer.png -share/icons/gnome/24x24/stock/generic/stock_timer_stopped.png -share/icons/gnome/24x24/stock/generic/stock_trash_full.png -share/icons/gnome/24x24/stock/generic/stock_undo.png -share/icons/gnome/24x24/stock/generic/stock_web-support.png -share/icons/gnome/24x24/stock/image/stock_3d-color-picker.png -share/icons/gnome/24x24/stock/image/stock_3d-effects.png -share/icons/gnome/24x24/stock/image/stock_arrowstyle.png -share/icons/gnome/24x24/stock/image/stock_brightness.png -share/icons/gnome/24x24/stock/image/stock_bucketfill.png -share/icons/gnome/24x24/stock/image/stock_channel-blue.png -share/icons/gnome/24x24/stock/image/stock_channel-green.png -share/icons/gnome/24x24/stock/image/stock_channel-red.png -share/icons/gnome/24x24/stock/image/stock_contrast.png -share/icons/gnome/24x24/stock/image/stock_crop.png -share/icons/gnome/24x24/stock/image/stock_display-grid.png -share/icons/gnome/24x24/stock/image/stock_distort.png -share/icons/gnome/24x24/stock/image/stock_draw-arc.png -share/icons/gnome/24x24/stock/image/stock_draw-callouts.png -share/icons/gnome/24x24/stock/image/stock_draw-circle-arc.png -share/icons/gnome/24x24/stock/image/stock_draw-circle-pie-unfilled.png -share/icons/gnome/24x24/stock/image/stock_draw-circle-pie.png -share/icons/gnome/24x24/stock/image/stock_draw-circle-segment-unfilled.png -share/icons/gnome/24x24/stock/image/stock_draw-circle-segment.png -share/icons/gnome/24x24/stock/image/stock_draw-circle-unfilled.png -share/icons/gnome/24x24/stock/image/stock_draw-circle.png -share/icons/gnome/24x24/stock/image/stock_draw-cone.png -share/icons/gnome/24x24/stock/image/stock_draw-connector-ends-with-arrow.png -share/icons/gnome/24x24/stock/image/stock_draw-connector-ends-with-circle.png -share/icons/gnome/24x24/stock/image/stock_draw-connector-starts-with-arrow.png -share/icons/gnome/24x24/stock/image/stock_draw-connector-starts-with-circle.png -share/icons/gnome/24x24/stock/image/stock_draw-connector-with-arrows.png -share/icons/gnome/24x24/stock/image/stock_draw-connector-with-circles.png -share/icons/gnome/24x24/stock/image/stock_draw-connector.png -share/icons/gnome/24x24/stock/image/stock_draw-cube.png -share/icons/gnome/24x24/stock/image/stock_draw-curve-filled.png -share/icons/gnome/24x24/stock/image/stock_draw-curve.png -share/icons/gnome/24x24/stock/image/stock_draw-curved-connector-ends-with-arrow.png -share/icons/gnome/24x24/stock/image/stock_draw-curved-connector-ends-with-circle.png -share/icons/gnome/24x24/stock/image/stock_draw-curved-connector-starts-with-arrow.png -share/icons/gnome/24x24/stock/image/stock_draw-curved-connector-starts-with-circle.png -share/icons/gnome/24x24/stock/image/stock_draw-curved-connector-with-arrows.png -share/icons/gnome/24x24/stock/image/stock_draw-curved-connector-with-circles.png -share/icons/gnome/24x24/stock/image/stock_draw-curved-connector.png -share/icons/gnome/24x24/stock/image/stock_draw-cylinder.png -share/icons/gnome/24x24/stock/image/stock_draw-dimension-line.png -share/icons/gnome/24x24/stock/image/stock_draw-ellipse-pie-unfilled.png -share/icons/gnome/24x24/stock/image/stock_draw-ellipse-pie.png -share/icons/gnome/24x24/stock/image/stock_draw-ellipse-segment-unfilled.png -share/icons/gnome/24x24/stock/image/stock_draw-ellipse-segment.png -share/icons/gnome/24x24/stock/image/stock_draw-ellipse-unfilled.png -share/icons/gnome/24x24/stock/image/stock_draw-ellipse.png -share/icons/gnome/24x24/stock/image/stock_draw-freeform-line-filled.png -share/icons/gnome/24x24/stock/image/stock_draw-freeform-line.png -share/icons/gnome/24x24/stock/image/stock_draw-half-sphere.png -share/icons/gnome/24x24/stock/image/stock_draw-line-45.png -share/icons/gnome/24x24/stock/image/stock_draw-line-connector-ends-with-arrow.png -share/icons/gnome/24x24/stock/image/stock_draw-line-connector-ends-with-circle.png -share/icons/gnome/24x24/stock/image/stock_draw-line-connector-starts-with-arrow.png -share/icons/gnome/24x24/stock/image/stock_draw-line-connector-starts-with-circle.png -share/icons/gnome/24x24/stock/image/stock_draw-line-connector-with-arrows.png -share/icons/gnome/24x24/stock/image/stock_draw-line-connector-with-circles.png -share/icons/gnome/24x24/stock/image/stock_draw-line-connector.png -share/icons/gnome/24x24/stock/image/stock_draw-line-ends-with-arrow.png -share/icons/gnome/24x24/stock/image/stock_draw-line-starts-with-arrow.png -share/icons/gnome/24x24/stock/image/stock_draw-line-with-arrow-circle.png -share/icons/gnome/24x24/stock/image/stock_draw-line-with-arrow-square.png -share/icons/gnome/24x24/stock/image/stock_draw-line-with-arrows.png -share/icons/gnome/24x24/stock/image/stock_draw-line-with-circle-arrow.png -share/icons/gnome/24x24/stock/image/stock_draw-line-with-square-arrow.png -share/icons/gnome/24x24/stock/image/stock_draw-line.png -share/icons/gnome/24x24/stock/image/stock_draw-polygon-45-filled.png -share/icons/gnome/24x24/stock/image/stock_draw-polygon-45.png -share/icons/gnome/24x24/stock/image/stock_draw-polygon-filled.png -share/icons/gnome/24x24/stock/image/stock_draw-polygon.png -share/icons/gnome/24x24/stock/image/stock_draw-pyramid.png -share/icons/gnome/24x24/stock/image/stock_draw-rectangle-unfilled.png -share/icons/gnome/24x24/stock/image/stock_draw-rectangle.png -share/icons/gnome/24x24/stock/image/stock_draw-rounded-rectangle-unfilled.png -share/icons/gnome/24x24/stock/image/stock_draw-rounded-rectangle.png -share/icons/gnome/24x24/stock/image/stock_draw-rounded-square-unfilled.png -share/icons/gnome/24x24/stock/image/stock_draw-rounded-square.png -share/icons/gnome/24x24/stock/image/stock_draw-selection.png -share/icons/gnome/24x24/stock/image/stock_draw-shell.png -share/icons/gnome/24x24/stock/image/stock_draw-sphere.png -share/icons/gnome/24x24/stock/image/stock_draw-square-unfilled.png -share/icons/gnome/24x24/stock/image/stock_draw-square.png -share/icons/gnome/24x24/stock/image/stock_draw-straight-connector-ends-with-arrow.png -share/icons/gnome/24x24/stock/image/stock_draw-straight-connector-ends-with-circle.png -share/icons/gnome/24x24/stock/image/stock_draw-straight-connector-starts-with-arrow.png -share/icons/gnome/24x24/stock/image/stock_draw-straight-connector-starts-with-circle.png -share/icons/gnome/24x24/stock/image/stock_draw-straight-connector-with-arrows.png -share/icons/gnome/24x24/stock/image/stock_draw-straight-connector-with-circles.png -share/icons/gnome/24x24/stock/image/stock_draw-straight-connector.png -share/icons/gnome/24x24/stock/image/stock_draw-torus.png -share/icons/gnome/24x24/stock/image/stock_draw-vertical-callouts.png -share/icons/gnome/24x24/stock/image/stock_edit-points.png -share/icons/gnome/24x24/stock/image/stock_filters-aging.png -share/icons/gnome/24x24/stock/image/stock_filters-charcoal.png -share/icons/gnome/24x24/stock/image/stock_filters-invert.png -share/icons/gnome/24x24/stock/image/stock_filters-pixelize.png -share/icons/gnome/24x24/stock/image/stock_filters-pop-art.png -share/icons/gnome/24x24/stock/image/stock_filters-posterize.png -share/icons/gnome/24x24/stock/image/stock_filters-relief.png -share/icons/gnome/24x24/stock/image/stock_filters-remove-noise.png -share/icons/gnome/24x24/stock/image/stock_filters-sharpen.png -share/icons/gnome/24x24/stock/image/stock_filters-smooth.png -share/icons/gnome/24x24/stock/image/stock_filters-solarize.png -share/icons/gnome/24x24/stock/image/stock_flip.png -share/icons/gnome/24x24/stock/image/stock_gamma.png -share/icons/gnome/24x24/stock/image/stock_gradient.png -share/icons/gnome/24x24/stock/image/stock_graphics-align-bottom.png -share/icons/gnome/24x24/stock/image/stock_graphics-align-center.png -share/icons/gnome/24x24/stock/image/stock_graphics-align-centered.png -share/icons/gnome/24x24/stock/image/stock_graphics-align-left.png -share/icons/gnome/24x24/stock/image/stock_graphics-align-right.png -share/icons/gnome/24x24/stock/image/stock_graphics-align-top.png -share/icons/gnome/24x24/stock/image/stock_guides.png -share/icons/gnome/24x24/stock/image/stock_imagemap-editor.png -share/icons/gnome/24x24/stock/image/stock_insert_image.png -share/icons/gnome/24x24/stock/image/stock_linepen.png -share/icons/gnome/24x24/stock/image/stock_modify-layout.png -share/icons/gnome/24x24/stock/image/stock_node-add.png -share/icons/gnome/24x24/stock/image/stock_node-close-path.png -share/icons/gnome/24x24/stock/image/stock_node-convert.png -share/icons/gnome/24x24/stock/image/stock_node-corner-to-smooth.png -share/icons/gnome/24x24/stock/image/stock_node-corner.png -share/icons/gnome/24x24/stock/image/stock_node-curve-split.png -share/icons/gnome/24x24/stock/image/stock_node-delete.png -share/icons/gnome/24x24/stock/image/stock_node-mark-for-deletion.png -share/icons/gnome/24x24/stock/image/stock_node-move.png -share/icons/gnome/24x24/stock/image/stock_node-smooth-to-symmetrical.png -share/icons/gnome/24x24/stock/image/stock_placeholder-graphic.png -share/icons/gnome/24x24/stock/image/stock_placeholder-line-contour.png -share/icons/gnome/24x24/stock/image/stock_placeholder-picture.png -share/icons/gnome/24x24/stock/image/stock_placeholder-text.png -share/icons/gnome/24x24/stock/image/stock_quickmask.png -share/icons/gnome/24x24/stock/image/stock_rotate-3d.png -share/icons/gnome/24x24/stock/image/stock_rotate.png -share/icons/gnome/24x24/stock/image/stock_rotation-mode.png -share/icons/gnome/24x24/stock/image/stock_shadow.png -share/icons/gnome/24x24/stock/image/stock_show-draw-functions.png -share/icons/gnome/24x24/stock/image/stock_toggle-graphics.png -share/icons/gnome/24x24/stock/io/stock_export.png -share/icons/gnome/24x24/stock/io/stock_insert-file.png -share/icons/gnome/24x24/stock/io/stock_open.png -share/icons/gnome/24x24/stock/io/stock_reload.png -share/icons/gnome/24x24/stock/io/stock_save-pdf.png -share/icons/gnome/24x24/stock/io/stock_save-template.png -share/icons/gnome/24x24/stock/io/stock_save.png -share/icons/gnome/24x24/stock/io/stock_save_as.png -share/icons/gnome/24x24/stock/media/stock_effects-sound.png -share/icons/gnome/24x24/stock/media/stock_insert-video-plugin.png -share/icons/gnome/24x24/stock/media/stock_line_in.png -share/icons/gnome/24x24/stock/media/stock_media-fwd.png -share/icons/gnome/24x24/stock/media/stock_media-next.png -share/icons/gnome/24x24/stock/media/stock_media-pause.png -share/icons/gnome/24x24/stock/media/stock_media-play.png -share/icons/gnome/24x24/stock/media/stock_media-prev.png -share/icons/gnome/24x24/stock/media/stock_media-rec.png -share/icons/gnome/24x24/stock/media/stock_media-rew.png -share/icons/gnome/24x24/stock/media/stock_media-shuffle.png -share/icons/gnome/24x24/stock/media/stock_media-stop.png -share/icons/gnome/24x24/stock/media/stock_mic.png -share/icons/gnome/24x24/stock/media/stock_midi.png -share/icons/gnome/24x24/stock/media/stock_repeat.png -share/icons/gnome/24x24/stock/media/stock_volume.png -share/icons/gnome/24x24/stock/navigation/stock_bottom.png -share/icons/gnome/24x24/stock/navigation/stock_down-with-subpoints.png -share/icons/gnome/24x24/stock/navigation/stock_down.png -share/icons/gnome/24x24/stock/navigation/stock_first-page.png -share/icons/gnome/24x24/stock/navigation/stock_first.png -share/icons/gnome/24x24/stock/navigation/stock_last-page.png -share/icons/gnome/24x24/stock/navigation/stock_last.png -share/icons/gnome/24x24/stock/navigation/stock_left-with-subpoints.png -share/icons/gnome/24x24/stock/navigation/stock_left.png -share/icons/gnome/24x24/stock/navigation/stock_navigator.png -share/icons/gnome/24x24/stock/navigation/stock_next-page.png -share/icons/gnome/24x24/stock/navigation/stock_next.png -share/icons/gnome/24x24/stock/navigation/stock_previous-page.png -share/icons/gnome/24x24/stock/navigation/stock_previous.png -share/icons/gnome/24x24/stock/navigation/stock_right-with-subpoints.png -share/icons/gnome/24x24/stock/navigation/stock_right.png -share/icons/gnome/24x24/stock/navigation/stock_top.png -share/icons/gnome/24x24/stock/navigation/stock_up-with-subpoints.png -share/icons/gnome/24x24/stock/navigation/stock_up.png -share/icons/gnome/24x24/stock/navigation/stock_zoom-1.png -share/icons/gnome/24x24/stock/navigation/stock_zoom-in.png -share/icons/gnome/24x24/stock/navigation/stock_zoom-next.png -share/icons/gnome/24x24/stock/navigation/stock_zoom-object.png -share/icons/gnome/24x24/stock/navigation/stock_zoom-optimal.png -share/icons/gnome/24x24/stock/navigation/stock_zoom-out.png -share/icons/gnome/24x24/stock/navigation/stock_zoom-page-width.png -share/icons/gnome/24x24/stock/navigation/stock_zoom-page.png -share/icons/gnome/24x24/stock/navigation/stock_zoom-previous.png -share/icons/gnome/24x24/stock/navigation/stock_zoom-shift.png -share/icons/gnome/24x24/stock/navigation/stock_zoom.png -share/icons/gnome/24x24/stock/net/stock_addressbook.png -share/icons/gnome/24x24/stock/net/stock_appointment-reminder-excl.png -share/icons/gnome/24x24/stock/net/stock_appointment-reminder.png -share/icons/gnome/24x24/stock/net/stock_hyperlink-internet-search.png -share/icons/gnome/24x24/stock/net/stock_hyperlink-target.png -share/icons/gnome/24x24/stock/net/stock_hyperlink-toolbar.png -share/icons/gnome/24x24/stock/net/stock_hyperlink.png -share/icons/gnome/24x24/stock/net/stock_inbox.png -share/icons/gnome/24x24/stock/net/stock_insert_url.png -share/icons/gnome/24x24/stock/net/stock_internet.png -share/icons/gnome/24x24/stock/net/stock_link.png -share/icons/gnome/24x24/stock/net/stock_mail-compose.png -share/icons/gnome/24x24/stock/net/stock_mail-merge.png -share/icons/gnome/24x24/stock/net/stock_mail.png -share/icons/gnome/24x24/stock/net/stock_mail_forward.png -share/icons/gnome/24x24/stock/net/stock_mail_open.png -share/icons/gnome/24x24/stock/net/stock_mail_receive.png -share/icons/gnome/24x24/stock/net/stock_mail_reply.png -share/icons/gnome/24x24/stock/net/stock_mail_send.png -share/icons/gnome/24x24/stock/net/stock_online-layout.png -share/icons/gnome/24x24/stock/net/stock_outbox.png -share/icons/gnome/24x24/stock/net/stock_sent-mail.png -share/icons/gnome/24x24/stock/object/stock_bring-backward.png -share/icons/gnome/24x24/stock/object/stock_bring-forward.png -share/icons/gnome/24x24/stock/object/stock_create-with-attributes.png -share/icons/gnome/24x24/stock/object/stock_effects-more-options.png -share/icons/gnome/24x24/stock/object/stock_effects-object-colorize.png -share/icons/gnome/24x24/stock/object/stock_effects-object-hide.png -share/icons/gnome/24x24/stock/object/stock_effects-object.png -share/icons/gnome/24x24/stock/object/stock_effects-play-in-full.png -share/icons/gnome/24x24/stock/object/stock_effects-preview.png -share/icons/gnome/24x24/stock/object/stock_effects.png -share/icons/gnome/24x24/stock/object/stock_enter-group.png -share/icons/gnome/24x24/stock/object/stock_exit-group.png -share/icons/gnome/24x24/stock/object/stock_file-with-objects.png -share/icons/gnome/24x24/stock/object/stock_format-object.png -share/icons/gnome/24x24/stock/object/stock_formula-cursor.png -share/icons/gnome/24x24/stock/object/stock_frame.png -share/icons/gnome/24x24/stock/object/stock_group.png -share/icons/gnome/24x24/stock/object/stock_handles-simple.png -share/icons/gnome/24x24/stock/object/stock_insert-applet.png -share/icons/gnome/24x24/stock/object/stock_insert-floating-frame.png -share/icons/gnome/24x24/stock/object/stock_insert-gluepoint.png -share/icons/gnome/24x24/stock/object/stock_insert-math-object.png -share/icons/gnome/24x24/stock/object/stock_insert-note.png -share/icons/gnome/24x24/stock/object/stock_insert-ole-object.png -share/icons/gnome/24x24/stock/object/stock_insert-plugin.png -share/icons/gnome/24x24/stock/object/stock_insert-single-column-text-frame.png -share/icons/gnome/24x24/stock/object/stock_insert-slide.png -share/icons/gnome/24x24/stock/object/stock_insert-sound-plugin.png -share/icons/gnome/24x24/stock/object/stock_insert-text-frame.png -share/icons/gnome/24x24/stock/object/stock_insert_bookmark.png -share/icons/gnome/24x24/stock/object/stock_insert_graphic.png -share/icons/gnome/24x24/stock/object/stock_insert_special_character.png -share/icons/gnome/24x24/stock/object/stock_interaction.png -share/icons/gnome/24x24/stock/object/stock_new-bcard.png -share/icons/gnome/24x24/stock/object/stock_object-behind.png -share/icons/gnome/24x24/stock/object/stock_object-infront.png -share/icons/gnome/24x24/stock/object/stock_position-size.png -share/icons/gnome/24x24/stock/object/stock_reverse-order.png -share/icons/gnome/24x24/stock/object/stock_slide-design.png -share/icons/gnome/24x24/stock/object/stock_slide-duplicate.png -share/icons/gnome/24x24/stock/object/stock_slide-expand.png -share/icons/gnome/24x24/stock/object/stock_slide-reherse-timings.png -share/icons/gnome/24x24/stock/object/stock_slide-show.png -share/icons/gnome/24x24/stock/object/stock_slide-showhide.png -share/icons/gnome/24x24/stock/object/stock_snap-grid.png -share/icons/gnome/24x24/stock/object/stock_snap-guides.png -share/icons/gnome/24x24/stock/object/stock_snap-margins.png -share/icons/gnome/24x24/stock/object/stock_snap-object-points.png -share/icons/gnome/24x24/stock/object/stock_snap-object.png -share/icons/gnome/24x24/stock/object/stock_symbol-selection.png -share/icons/gnome/24x24/stock/object/stock_to-3d-rotation-object.png -share/icons/gnome/24x24/stock/object/stock_to-3d.png -share/icons/gnome/24x24/stock/object/stock_to-bottom.png -share/icons/gnome/24x24/stock/object/stock_to-curve.png -share/icons/gnome/24x24/stock/object/stock_to-polygon.png -share/icons/gnome/24x24/stock/object/stock_to-top.png -share/icons/gnome/24x24/stock/object/stock_ungroup.png -share/icons/gnome/24x24/stock/object/stock_unlink.png -share/icons/gnome/24x24/stock/object/stock_view-function-selection.png -share/icons/gnome/24x24/stock/table/stock_alignment-bottom.png -share/icons/gnome/24x24/stock/table/stock_alignment-centered-vertically.png -share/icons/gnome/24x24/stock/table/stock_alignment-centered.png -share/icons/gnome/24x24/stock/table/stock_alignment-left.png -share/icons/gnome/24x24/stock/table/stock_alignment-right.png -share/icons/gnome/24x24/stock/table/stock_alignment-top.png -share/icons/gnome/24x24/stock/table/stock_alignment.png -share/icons/gnome/24x24/stock/table/stock_cell-align-bottom.png -share/icons/gnome/24x24/stock/table/stock_cell-align-center.png -share/icons/gnome/24x24/stock/table/stock_cell-align-top.png -share/icons/gnome/24x24/stock/table/stock_choose-themes.png -share/icons/gnome/24x24/stock/table/stock_datapilot.png -share/icons/gnome/24x24/stock/table/stock_delete-column.png -share/icons/gnome/24x24/stock/table/stock_delete-row.png -share/icons/gnome/24x24/stock/table/stock_exchange-columns.png -share/icons/gnome/24x24/stock/table/stock_exchange-rows.png -share/icons/gnome/24x24/stock/table/stock_group-cells.png -share/icons/gnome/24x24/stock/table/stock_insert-cells-down.png -share/icons/gnome/24x24/stock/table/stock_insert-cells-right.png -share/icons/gnome/24x24/stock/table/stock_insert-cells.png -share/icons/gnome/24x24/stock/table/stock_insert-columns.png -share/icons/gnome/24x24/stock/table/stock_insert-names-define.png -share/icons/gnome/24x24/stock/table/stock_insert-rows.png -share/icons/gnome/24x24/stock/table/stock_select-column.png -share/icons/gnome/24x24/stock/table/stock_select-row.png -share/icons/gnome/24x24/stock/table/stock_select-table.png -share/icons/gnome/24x24/stock/table/stock_sort-table-column-ascending.png -share/icons/gnome/24x24/stock/table/stock_sort-table-row-ascending.png -share/icons/gnome/24x24/stock/table/stock_table-align-bottom.png -share/icons/gnome/24x24/stock/table/stock_table-align-center.png -share/icons/gnome/24x24/stock/table/stock_table-align-top.png -share/icons/gnome/24x24/stock/table/stock_table-borders.png -share/icons/gnome/24x24/stock/table/stock_table-combine.png -share/icons/gnome/24x24/stock/table/stock_table-fit-height.png -share/icons/gnome/24x24/stock/table/stock_table-fit-width.png -share/icons/gnome/24x24/stock/table/stock_table-fixed-proportional.png -share/icons/gnome/24x24/stock/table/stock_table-fixed.png -share/icons/gnome/24x24/stock/table/stock_table-line-color.png -share/icons/gnome/24x24/stock/table/stock_table-line-style.png -share/icons/gnome/24x24/stock/table/stock_table-optimize.png -share/icons/gnome/24x24/stock/table/stock_table-same-height.png -share/icons/gnome/24x24/stock/table/stock_table-same-width.png -share/icons/gnome/24x24/stock/table/stock_table-split.png -share/icons/gnome/24x24/stock/table/stock_table-variable.png -share/icons/gnome/24x24/stock/table/stock_table_borders.png -share/icons/gnome/24x24/stock/table/stock_table_fill.png -share/icons/gnome/24x24/stock/table/stock_ungroup-cells.png -share/icons/gnome/24x24/stock/text/stock_autoformat.png -share/icons/gnome/24x24/stock/text/stock_autospellcheck.png -share/icons/gnome/24x24/stock/text/stock_autotext.png -share/icons/gnome/24x24/stock/text/stock_chart-scale-text.png -share/icons/gnome/24x24/stock/text/stock_decrease-font.png -share/icons/gnome/24x24/stock/text/stock_directcursor.png -share/icons/gnome/24x24/stock/text/stock_draw-text-animation.png -share/icons/gnome/24x24/stock/text/stock_draw-text-frame.png -share/icons/gnome/24x24/stock/text/stock_draw-text.png -share/icons/gnome/24x24/stock/text/stock_draw-vertical-text-frame.png -share/icons/gnome/24x24/stock/text/stock_draw-vertical-text.png -share/icons/gnome/24x24/stock/text/stock_edit-contour.png -share/icons/gnome/24x24/stock/text/stock_edit-headers-and-footers.png -share/icons/gnome/24x24/stock/text/stock_effects-text.png -share/icons/gnome/24x24/stock/text/stock_euro.png -share/icons/gnome/24x24/stock/text/stock_font-formatting-toggle.png -share/icons/gnome/24x24/stock/text/stock_font-size.png -share/icons/gnome/24x24/stock/text/stock_font.png -share/icons/gnome/24x24/stock/text/stock_fontwork.png -share/icons/gnome/24x24/stock/text/stock_format-character.png -share/icons/gnome/24x24/stock/text/stock_format-numbering-bullets.png -share/icons/gnome/24x24/stock/text/stock_format-paragraph.png -share/icons/gnome/24x24/stock/text/stock_increase-font.png -share/icons/gnome/24x24/stock/text/stock_insert-caption.png -share/icons/gnome/24x24/stock/text/stock_insert-cross-reference.png -share/icons/gnome/24x24/stock/text/stock_insert-fields-author.png -share/icons/gnome/24x24/stock/text/stock_insert-fields-subject.png -share/icons/gnome/24x24/stock/text/stock_insert-fields-title.png -share/icons/gnome/24x24/stock/text/stock_insert-footer.png -share/icons/gnome/24x24/stock/text/stock_insert-header.png -share/icons/gnome/24x24/stock/text/stock_insert_endnote.png -share/icons/gnome/24x24/stock/text/stock_insert_footnote.png -share/icons/gnome/24x24/stock/text/stock_insert_index_marker.png -share/icons/gnome/24x24/stock/text/stock_insert_section.png -share/icons/gnome/24x24/stock/text/stock_line-spacing-1.5.png -share/icons/gnome/24x24/stock/text/stock_line-spacing-1.png -share/icons/gnome/24x24/stock/text/stock_line-spacing-2.png -share/icons/gnome/24x24/stock/text/stock_list-insert-unnumbered.png -share/icons/gnome/24x24/stock/text/stock_list_bullet.png -share/icons/gnome/24x24/stock/text/stock_list_enum-off.png -share/icons/gnome/24x24/stock/text/stock_list_enum-restart.png -share/icons/gnome/24x24/stock/text/stock_list_enum.png -share/icons/gnome/24x24/stock/text/stock_nonprinting-chars.png -share/icons/gnome/24x24/stock/text/stock_page-number.png -share/icons/gnome/24x24/stock/text/stock_page-total-number.png -share/icons/gnome/24x24/stock/text/stock_paragraph-spacing-decrease.png -share/icons/gnome/24x24/stock/text/stock_paragraph-spacing-increase.png -share/icons/gnome/24x24/stock/text/stock_select-all.png -share/icons/gnome/24x24/stock/text/stock_spellcheck.png -share/icons/gnome/24x24/stock/text/stock_styles-new-style-from-selection.png -share/icons/gnome/24x24/stock/text/stock_styles-update-style.png -share/icons/gnome/24x24/stock/text/stock_subscript.png -share/icons/gnome/24x24/stock/text/stock_superscript.png -share/icons/gnome/24x24/stock/text/stock_text-direction-ltr.png -share/icons/gnome/24x24/stock/text/stock_text-direction-ttb.png -share/icons/gnome/24x24/stock/text/stock_text-double-click-to-edit.png -share/icons/gnome/24x24/stock/text/stock_text-outline.png -share/icons/gnome/24x24/stock/text/stock_text-quickedit.png -share/icons/gnome/24x24/stock/text/stock_text-select-text-only.png -share/icons/gnome/24x24/stock/text/stock_text-shadow.png -share/icons/gnome/24x24/stock/text/stock_text-spacing.png -share/icons/gnome/24x24/stock/text/stock_text-strikethrough.png -share/icons/gnome/24x24/stock/text/stock_text_bold.png -share/icons/gnome/24x24/stock/text/stock_text_center.png -share/icons/gnome/24x24/stock/text/stock_text_color_background.png -share/icons/gnome/24x24/stock/text/stock_text_color_foreground.png -share/icons/gnome/24x24/stock/text/stock_text_color_hilight.png -share/icons/gnome/24x24/stock/text/stock_text_indent.png -share/icons/gnome/24x24/stock/text/stock_text_italic.png -share/icons/gnome/24x24/stock/text/stock_text_justify.png -share/icons/gnome/24x24/stock/text/stock_text_left.png -share/icons/gnome/24x24/stock/text/stock_text_right.png -share/icons/gnome/24x24/stock/text/stock_text_underlined-double.png -share/icons/gnome/24x24/stock/text/stock_text_underlined.png -share/icons/gnome/24x24/stock/text/stock_text_unindent.png -share/icons/gnome/24x24/stock/text/stock_thesaurus.png -share/icons/gnome/24x24/stock/text/stock_to-background.png -share/icons/gnome/24x24/stock/text/stock_to-foreground.png -share/icons/gnome/24x24/stock/text/stock_tools-hyphenation.png -share/icons/gnome/24x24/stock/text/stock_update-fields.png -share/icons/gnome/24x24/stock/text/stock_view-field-shadings.png -share/icons/gnome/24x24/stock/text/stock_wrap-around.png -share/icons/gnome/24x24/stock/text/stock_wrap-behind.png -share/icons/gnome/24x24/stock/text/stock_wrap-contour.png -share/icons/gnome/24x24/stock/text/stock_wrap-interrupt.png -share/icons/gnome/24x24/stock/text/stock_wrap-left.png -share/icons/gnome/24x24/stock/text/stock_wrap-optimal.png -share/icons/gnome/24x24/stock/text/stock_wrap-right.png -share/icons/gnome/32x32/apps/administration.png -share/icons/gnome/32x32/apps/apacheconf.png -share/icons/gnome/32x32/apps/applets-screenshooter.png -share/icons/gnome/32x32/apps/config-date.png -share/icons/gnome/32x32/apps/config-language.png -share/icons/gnome/32x32/apps/config-users.png -share/icons/gnome/32x32/apps/config-xfree.png -share/icons/gnome/32x32/apps/dia_gnome_icon.png -share/icons/gnome/32x32/apps/disks.png -share/icons/gnome/32x32/apps/file-manager.png -share/icons/gnome/32x32/apps/gdict.png -share/icons/gnome/32x32/apps/gdm.png -share/icons/gnome/32x32/apps/gnome-applications.png -share/icons/gnome/32x32/apps/gnome-cdplayer-icon.png -share/icons/gnome/32x32/apps/gnome-character-map.png -share/icons/gnome/32x32/apps/gnome-devel.png -share/icons/gnome/32x32/apps/gnome-finance.png -share/icons/gnome/32x32/apps/gnome-ftp.png -share/icons/gnome/32x32/apps/gnome-globe.png -share/icons/gnome/32x32/apps/gnome-gnomine.png -share/icons/gnome/32x32/apps/gnome-graphics.png -share/icons/gnome/32x32/apps/gnome-grecord.png -share/icons/gnome/32x32/apps/gnome-gsame.png -share/icons/gnome/32x32/apps/gnome-lockscreen.png -share/icons/gnome/32x32/apps/gnome-logout.png -share/icons/gnome/32x32/apps/gnome-media-player.png -share/icons/gnome/32x32/apps/gnome-multimedia.png -share/icons/gnome/32x32/apps/gnome-networktool.png -share/icons/gnome/32x32/apps/gnome-nibbles.png -share/icons/gnome/32x32/apps/gnome-pdf.png -share/icons/gnome/32x32/apps/gnome-printers-properties.png -share/icons/gnome/32x32/apps/gnome-terminal.png -share/icons/gnome/32x32/apps/gnome-util.png -share/icons/gnome/32x32/apps/hwbrowser.png -share/icons/gnome/32x32/apps/iagno.png -share/icons/gnome/32x32/apps/keyboard.png -share/icons/gnome/32x32/apps/logviewer.png -share/icons/gnome/32x32/apps/network-config.png -share/icons/gnome/32x32/apps/network.png -share/icons/gnome/32x32/apps/panel-notification-area.png -share/icons/gnome/32x32/apps/postscript-viewer.png -share/icons/gnome/32x32/apps/serviceconf.png -share/icons/gnome/32x32/apps/system-floppy.png -share/icons/gnome/32x32/apps/tsclient.png -share/icons/gnome/32x32/apps/web-browser.png -share/icons/gnome/32x32/apps/xcdroast.png -share/icons/gnome/32x32/apps/xchat.png -share/icons/gnome/32x32/stock/chart/stock_chart.png -share/icons/gnome/32x32/stock/data/stock_data-sources-hand.png -share/icons/gnome/32x32/stock/data/stock_data-sources.png -share/icons/gnome/32x32/stock/document/stock_new-drawing.png -share/icons/gnome/32x32/stock/document/stock_new-formula.png -share/icons/gnome/32x32/stock/document/stock_new-html.png -share/icons/gnome/32x32/stock/document/stock_new-labels.png -share/icons/gnome/32x32/stock/document/stock_new-master-document.png -share/icons/gnome/32x32/stock/document/stock_new-presentation.png -share/icons/gnome/32x32/stock/document/stock_new-spreadsheet.png -share/icons/gnome/32x32/stock/document/stock_new-template.png -share/icons/gnome/32x32/stock/document/stock_new-text.png -share/icons/gnome/32x32/stock/document/stock_new.png -share/icons/gnome/32x32/stock/document/stock_todo.png -share/icons/gnome/32x32/stock/generic/stock_autopilot.png -share/icons/gnome/32x32/stock/generic/stock_calendar.png -share/icons/gnome/32x32/stock/generic/stock_cell-phone.png -share/icons/gnome/32x32/stock/generic/stock_dialog-info.png -share/icons/gnome/32x32/stock/generic/stock_dialog-question.png -share/icons/gnome/32x32/stock/generic/stock_dialog-warning.png -share/icons/gnome/32x32/stock/generic/stock_folder.png -share/icons/gnome/32x32/stock/generic/stock_id.png -share/icons/gnome/32x32/stock/generic/stock_language.png -share/icons/gnome/32x32/stock/generic/stock_notes.png -share/icons/gnome/32x32/stock/generic/stock_openoffice.png -share/icons/gnome/32x32/stock/generic/stock_summary.png -share/icons/gnome/32x32/stock/io/stock_opensave.png -share/icons/gnome/32x32/stock/media/stock_sound.png -share/icons/gnome/32x32/stock/net/stock_addressbook.png -share/icons/gnome/32x32/stock/net/stock_appointment-reminder-excl.png -share/icons/gnome/32x32/stock/net/stock_appointment-reminder.png -share/icons/gnome/32x32/stock/net/stock_inbox.png -share/icons/gnome/32x32/stock/net/stock_internet.png -share/icons/gnome/32x32/stock/net/stock_mail.png -share/icons/gnome/32x32/stock/net/stock_mail_open.png -share/icons/gnome/32x32/stock/net/stock_outbox.png -share/icons/gnome/32x32/stock/net/stock_sent-mail.png -share/icons/gnome/36x36/apps/gnome-spinner-rest.png -share/icons/gnome/36x36/apps/gnome-spinner.png +share/icons/gnome/24x24/filesystems/gnome-fs-network.png +share/icons/gnome/24x24/filesystems/gnome-fs-server.png +share/icons/gnome/24x24/mimetypes/gnome-mime-x-directory-nfs-server.png +share/icons/gnome/32x32/filesystems/gnome-fs-bookmark-missing.png +share/icons/gnome/32x32/filesystems/gnome-fs-bookmark.png +share/icons/gnome/32x32/filesystems/gnome-fs-client.png +share/icons/gnome/32x32/filesystems/gnome-fs-network.png +share/icons/gnome/32x32/filesystems/gnome-fs-server.png +share/icons/gnome/32x32/mimetypes/gnome-mime-application-msword.png +share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.ms-excel.png +share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.ms-powerpoint.png +share/icons/gnome/32x32/mimetypes/gnome-mime-image-bmp.png +share/icons/gnome/32x32/mimetypes/gnome-mime-image-gif.png +share/icons/gnome/32x32/mimetypes/gnome-mime-image-jpeg.png +share/icons/gnome/32x32/mimetypes/gnome-mime-image-png.png +share/icons/gnome/32x32/mimetypes/gnome-mime-image-svg.png +share/icons/gnome/32x32/mimetypes/gnome-mime-image-tiff.png +share/icons/gnome/32x32/mimetypes/gnome-mime-image-wmf.png share/icons/gnome/36x36/emblems/emblem-symbolic-link.png share/icons/gnome/36x36/filesystems/gnome-fs-directory-accept.icon share/icons/gnome/36x36/filesystems/gnome-fs-directory-accept.png +share/icons/gnome/36x36/filesystems/gnome-fs-directory-visiting.icon +share/icons/gnome/36x36/filesystems/gnome-fs-directory-visiting.png share/icons/gnome/36x36/filesystems/gnome-fs-directory.icon share/icons/gnome/36x36/filesystems/gnome-fs-directory.png -share/icons/gnome/36x36/stock/document/stock_my-documents.png -share/icons/gnome/36x36/stock/document/stock_new-drawing.png -share/icons/gnome/36x36/stock/document/stock_new-formula.png -share/icons/gnome/36x36/stock/document/stock_new-html.png -share/icons/gnome/36x36/stock/document/stock_new-labels.png -share/icons/gnome/36x36/stock/document/stock_new-master-document.png -share/icons/gnome/36x36/stock/document/stock_new-presentation.png -share/icons/gnome/36x36/stock/document/stock_new-spreadsheet.png -share/icons/gnome/36x36/stock/document/stock_new-template.png -share/icons/gnome/36x36/stock/document/stock_new-text.png -share/icons/gnome/36x36/stock/document/stock_samples.png -share/icons/gnome/36x36/stock/generic/stock_autopilot.png -share/icons/gnome/36x36/stock/generic/stock_new.png -share/icons/gnome/48x48/apps/administration.png -share/icons/gnome/48x48/apps/advanced-directory.png -share/icons/gnome/48x48/apps/apacheconf.png -share/icons/gnome/48x48/apps/applets-screenshooter.png -share/icons/gnome/48x48/apps/config-date.png -share/icons/gnome/48x48/apps/config-language.png -share/icons/gnome/48x48/apps/config-users.png -share/icons/gnome/48x48/apps/config-xfree.png -share/icons/gnome/48x48/apps/dia_gnome_icon.png -share/icons/gnome/48x48/apps/disks.png -share/icons/gnome/48x48/apps/file-manager.png -share/icons/gnome/48x48/apps/gdict.png -share/icons/gnome/48x48/apps/gdm.png -share/icons/gnome/48x48/apps/gnome-amusements.png -share/icons/gnome/48x48/apps/gnome-audio.png -share/icons/gnome/48x48/apps/gnome-cdplayer-icon.png -share/icons/gnome/48x48/apps/gnome-desktop-config.png -share/icons/gnome/48x48/apps/gnome-devel.png -share/icons/gnome/48x48/apps/gnome-favorites.png -share/icons/gnome/48x48/apps/gnome-finance.png -share/icons/gnome/48x48/apps/gnome-ftp.png -share/icons/gnome/48x48/apps/gnome-globe.png -share/icons/gnome/48x48/apps/gnome-gnomine.png -share/icons/gnome/48x48/apps/gnome-graphics.png -share/icons/gnome/48x48/apps/gnome-grecord.png -share/icons/gnome/48x48/apps/gnome-gsame.png -share/icons/gnome/48x48/apps/gnome-help.png -share/icons/gnome/48x48/apps/gnome-joystick.png -share/icons/gnome/48x48/apps/gnome-lockscreen.png -share/icons/gnome/48x48/apps/gnome-logout.png -share/icons/gnome/48x48/apps/gnome-media-player.png -share/icons/gnome/48x48/apps/gnome-monitor.png -share/icons/gnome/48x48/apps/gnome-multimedia.png -share/icons/gnome/48x48/apps/gnome-networktool.png -share/icons/gnome/48x48/apps/gnome-nibbles.png -share/icons/gnome/48x48/apps/gnome-other.png -share/icons/gnome/48x48/apps/gnome-pdf.png -share/icons/gnome/48x48/apps/gnome-printers-properties.png -share/icons/gnome/48x48/apps/gnome-reboot.png -share/icons/gnome/48x48/apps/gnome-searchtool.png -share/icons/gnome/48x48/apps/gnome-server-config.png -share/icons/gnome/48x48/apps/gnome-settings.png -share/icons/gnome/48x48/apps/gnome-shutdown.png -share/icons/gnome/48x48/apps/gnome-starthere.png -share/icons/gnome/48x48/apps/gnome-system-config.png -share/icons/gnome/48x48/apps/gnome-system.png -share/icons/gnome/48x48/apps/gnome-terminal.png -share/icons/gnome/48x48/apps/gnome-unknown.png -share/icons/gnome/48x48/apps/gnome-util.png -share/icons/gnome/48x48/apps/hwbrowser.png -share/icons/gnome/48x48/apps/iagno.png -share/icons/gnome/48x48/apps/keyboard.png -share/icons/gnome/48x48/apps/logviewer.png -share/icons/gnome/48x48/apps/network-config.png -share/icons/gnome/48x48/apps/network.png -share/icons/gnome/48x48/apps/postscript-viewer.png -share/icons/gnome/48x48/apps/serviceconf.png -share/icons/gnome/48x48/apps/sodipodi.png -share/icons/gnome/48x48/apps/tsclient.png -share/icons/gnome/48x48/apps/web-browser.png -share/icons/gnome/48x48/apps/xcdroast.png -share/icons/gnome/48x48/apps/xchat.png -share/icons/gnome/48x48/apps/xsane.png +share/icons/gnome/48x48/devices/gnome-dev-battery.png share/icons/gnome/48x48/devices/gnome-dev-cdrom-audio.png share/icons/gnome/48x48/devices/gnome-dev-cdrom.png share/icons/gnome/48x48/devices/gnome-dev-dvd.png share/icons/gnome/48x48/devices/gnome-dev-floppy.png share/icons/gnome/48x48/devices/gnome-dev-harddisk.png share/icons/gnome/48x48/devices/gnome-dev-jazdisk.png +share/icons/gnome/48x48/devices/gnome-dev-keyboard.png share/icons/gnome/48x48/devices/gnome-dev-memory.png +share/icons/gnome/48x48/devices/gnome-dev-mouse-ball.png +share/icons/gnome/48x48/devices/gnome-dev-mouse-optical.png +share/icons/gnome/48x48/devices/gnome-dev-pcmcia.png share/icons/gnome/48x48/devices/gnome-dev-printer.png +share/icons/gnome/48x48/devices/gnome-dev-removable.png +share/icons/gnome/48x48/devices/gnome-dev-symlink.png share/icons/gnome/48x48/devices/gnome-dev-zipdisk.png +share/icons/gnome/48x48/emblems/emblem-OK.icon +share/icons/gnome/48x48/emblems/emblem-OK.png share/icons/gnome/48x48/emblems/emblem-art.icon share/icons/gnome/48x48/emblems/emblem-art.png share/icons/gnome/48x48/emblems/emblem-bin.icon share/icons/gnome/48x48/emblems/emblem-bin.png share/icons/gnome/48x48/emblems/emblem-camera.icon share/icons/gnome/48x48/emblems/emblem-camera.png +share/icons/gnome/48x48/emblems/emblem-certified.icon +share/icons/gnome/48x48/emblems/emblem-certified.png share/icons/gnome/48x48/emblems/emblem-cool.icon share/icons/gnome/48x48/emblems/emblem-cool.png +share/icons/gnome/48x48/emblems/emblem-cvs-added.png +share/icons/gnome/48x48/emblems/emblem-cvs-conflict.png +share/icons/gnome/48x48/emblems/emblem-cvs-controlled.png +share/icons/gnome/48x48/emblems/emblem-cvs-modified.png +share/icons/gnome/48x48/emblems/emblem-cvs-new-file.png +share/icons/gnome/48x48/emblems/emblem-cvs-removed.png +share/icons/gnome/48x48/emblems/emblem-cvs-sticky-tag.png share/icons/gnome/48x48/emblems/emblem-danger.icon share/icons/gnome/48x48/emblems/emblem-danger.png share/icons/gnome/48x48/emblems/emblem-desktop.png share/icons/gnome/48x48/emblems/emblem-documents.icon share/icons/gnome/48x48/emblems/emblem-documents.png +share/icons/gnome/48x48/emblems/emblem-draft.icon +share/icons/gnome/48x48/emblems/emblem-draft.png share/icons/gnome/48x48/emblems/emblem-favorite.icon share/icons/gnome/48x48/emblems/emblem-favorite.png +share/icons/gnome/48x48/emblems/emblem-generic.icon +share/icons/gnome/48x48/emblems/emblem-generic.png share/icons/gnome/48x48/emblems/emblem-handshake.icon share/icons/gnome/48x48/emblems/emblem-handshake.png +share/icons/gnome/48x48/emblems/emblem-important.icon +share/icons/gnome/48x48/emblems/emblem-important.png share/icons/gnome/48x48/emblems/emblem-mail.icon share/icons/gnome/48x48/emblems/emblem-mail.png share/icons/gnome/48x48/emblems/emblem-marketing.icon @@ -1514,14 +137,19 @@ share/icons/gnome/48x48/emblems/emblem-money.icon share/icons/gnome/48x48/emblems/emblem-money.png share/icons/gnome/48x48/emblems/emblem-multimedia.icon share/icons/gnome/48x48/emblems/emblem-multimedia.png +share/icons/gnome/48x48/emblems/emblem-new.icon +share/icons/gnome/48x48/emblems/emblem-new.png share/icons/gnome/48x48/emblems/emblem-noread.png share/icons/gnome/48x48/emblems/emblem-note.png +share/icons/gnome/48x48/emblems/emblem-nowrite.png share/icons/gnome/48x48/emblems/emblem-ohno.icon share/icons/gnome/48x48/emblems/emblem-ohno.png share/icons/gnome/48x48/emblems/emblem-package.icon share/icons/gnome/48x48/emblems/emblem-package.png share/icons/gnome/48x48/emblems/emblem-people.icon share/icons/gnome/48x48/emblems/emblem-people.png +share/icons/gnome/48x48/emblems/emblem-personal.icon +share/icons/gnome/48x48/emblems/emblem-personal.png share/icons/gnome/48x48/emblems/emblem-pictures.icon share/icons/gnome/48x48/emblems/emblem-pictures.png share/icons/gnome/48x48/emblems/emblem-plan.icon @@ -1532,17 +160,24 @@ share/icons/gnome/48x48/emblems/emblem-sales.icon share/icons/gnome/48x48/emblems/emblem-sales.png share/icons/gnome/48x48/emblems/emblem-sound.icon share/icons/gnome/48x48/emblems/emblem-sound.png +share/icons/gnome/48x48/emblems/emblem-special.icon +share/icons/gnome/48x48/emblems/emblem-special.png share/icons/gnome/48x48/emblems/emblem-symbolic-link.png share/icons/gnome/48x48/emblems/emblem-trash.png +share/icons/gnome/48x48/emblems/emblem-urgent.icon +share/icons/gnome/48x48/emblems/emblem-urgent.png share/icons/gnome/48x48/emblems/emblem-web.icon share/icons/gnome/48x48/emblems/emblem-web.png share/icons/gnome/48x48/filesystems/gnome-fs-blockdev.png share/icons/gnome/48x48/filesystems/gnome-fs-bookmark-missing.png share/icons/gnome/48x48/filesystems/gnome-fs-bookmark.png share/icons/gnome/48x48/filesystems/gnome-fs-chardev.png +share/icons/gnome/48x48/filesystems/gnome-fs-client.png share/icons/gnome/48x48/filesystems/gnome-fs-desktop.png share/icons/gnome/48x48/filesystems/gnome-fs-directory-accept.icon share/icons/gnome/48x48/filesystems/gnome-fs-directory-accept.png +share/icons/gnome/48x48/filesystems/gnome-fs-directory-visiting.icon +share/icons/gnome/48x48/filesystems/gnome-fs-directory-visiting.png share/icons/gnome/48x48/filesystems/gnome-fs-directory.icon share/icons/gnome/48x48/filesystems/gnome-fs-directory.png share/icons/gnome/48x48/filesystems/gnome-fs-executable.png @@ -1565,6 +200,7 @@ share/icons/gnome/48x48/filesystems/gnome-fs-web.png share/icons/gnome/48x48/mimetypes/gnome-library.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-magicpoint.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-msword.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-ogg.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-pdf.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-pgp-encrypted.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-pgp-keys.png @@ -1574,6 +210,7 @@ share/icons/gnome/48x48/mimetypes/gnome-mime-application-qif.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-rhythmbox-effect.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-rhythmbox-playlist.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-rtf.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-smil.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.lotus-1-2-3.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.ms-excel.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.ms-powerpoint.png @@ -1592,11 +229,16 @@ share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-backup.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-blender.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-bzip-compressed-tar.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-bzip.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-class-file.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-compress.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-compressed-tar.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-core-file.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-core.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-cpio-compressed.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-cpio.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-dc-rom.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-deb.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-desktop.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-dia-diagram.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-dvi.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-e-theme.png @@ -1608,29 +250,36 @@ share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-font-sunos-news.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-font-ttf.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-gameboy-rom.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-genesis-rom.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-glade.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-gnome-app-info.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-gnucash.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-gnumeric.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-gtktalog.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-gzip.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-ipod-firmware.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-jar.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-java-byte-code.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-kde-app-info.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-killustrator.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-kpresenter.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-kspread.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-kword.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-lha.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-lhz.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-mrproject.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-msx-rom.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-n64-rom.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-nes-rom.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-object-file.png -share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-ogg.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-object.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-php.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-python-bytecode.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-qw.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-rar.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-reject.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-rpm.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-sharedlib.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-shellscript.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-shockwave-flash.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-smil.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-sms-rom.png @@ -1638,10 +287,12 @@ share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-sql.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-stuffit.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-tar.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-tex.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-trash.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-zip.png share/icons/gnome/48x48/mimetypes/gnome-mime-application.png share/icons/gnome/48x48/mimetypes/gnome-mime-audio-ac3.png share/icons/gnome/48x48/mimetypes/gnome-mime-audio-basic.png +share/icons/gnome/48x48/mimetypes/gnome-mime-audio-midi.png share/icons/gnome/48x48/mimetypes/gnome-mime-audio-x-aiff.png share/icons/gnome/48x48/mimetypes/gnome-mime-audio-x-it.png share/icons/gnome/48x48/mimetypes/gnome-mime-audio-x-midi.png @@ -1661,6 +312,7 @@ share/icons/gnome/48x48/mimetypes/gnome-mime-image-gif.png share/icons/gnome/48x48/mimetypes/gnome-mime-image-ief.png share/icons/gnome/48x48/mimetypes/gnome-mime-image-jpeg.png share/icons/gnome/48x48/mimetypes/gnome-mime-image-png.png +share/icons/gnome/48x48/mimetypes/gnome-mime-image-svg+xml.png share/icons/gnome/48x48/mimetypes/gnome-mime-image-svg.png share/icons/gnome/48x48/mimetypes/gnome-mime-image-tiff.png share/icons/gnome/48x48/mimetypes/gnome-mime-image-x-3ds.png @@ -1685,11 +337,15 @@ share/icons/gnome/48x48/mimetypes/gnome-mime-text-css.png share/icons/gnome/48x48/mimetypes/gnome-mime-text-html.png share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-authors.png share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-c++.png +share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-c++src.png share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-c-header.png share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-c.png +share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-chdr.png share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-copying.png share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-credits.png share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-csh.png +share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-csharp.png +share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-csrc.png share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-haskell.png share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-install.png share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-java.png @@ -1705,6 +361,7 @@ share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-sh.png share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-sql.png share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-tex.png share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-troff-man.png +share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-vcard.png share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-zsh.png share/icons/gnome/48x48/mimetypes/gnome-mime-text-xml.png share/icons/gnome/48x48/mimetypes/gnome-mime-text.png @@ -1720,67 +377,1939 @@ share/icons/gnome/48x48/mimetypes/gnome-mime-x-directory-smb-share.png share/icons/gnome/48x48/mimetypes/gnome-mime-x-directory-smb-workgroup.png share/icons/gnome/48x48/mimetypes/gnome-mime-x-font-afm.png share/icons/gnome/48x48/mimetypes/gnome-package.png -share/icons/gnome/48x48/stock/document/stock_new-drawing.png -share/icons/gnome/48x48/stock/document/stock_new-formula.png -share/icons/gnome/48x48/stock/document/stock_new-html.png -share/icons/gnome/48x48/stock/document/stock_new-labels.png -share/icons/gnome/48x48/stock/document/stock_new-master-document.png -share/icons/gnome/48x48/stock/document/stock_new-presentation.png -share/icons/gnome/48x48/stock/document/stock_new-spreadsheet.png -share/icons/gnome/48x48/stock/document/stock_new-template.png -share/icons/gnome/48x48/stock/document/stock_new-text.png -share/icons/gnome/48x48/stock/document/stock_todo.png -share/icons/gnome/48x48/stock/generic/stock_autopilot.png -share/icons/gnome/48x48/stock/generic/stock_calendar.png -share/icons/gnome/48x48/stock/generic/stock_cell-phone.png -share/icons/gnome/48x48/stock/generic/stock_id.png -share/icons/gnome/48x48/stock/generic/stock_notes.png -share/icons/gnome/48x48/stock/generic/stock_summary.png -share/icons/gnome/48x48/stock/net/stock_addressbook.png -share/icons/gnome/48x48/stock/net/stock_appointment-reminder-excl.png -share/icons/gnome/48x48/stock/net/stock_appointment-reminder.png -share/icons/gnome/48x48/stock/net/stock_inbox.png -share/icons/gnome/48x48/stock/net/stock_mail.png -share/icons/gnome/48x48/stock/net/stock_mail_open.png -share/icons/gnome/48x48/stock/net/stock_outbox.png -share/icons/gnome/48x48/stock/net/stock_sent-mail.png -share/icons/gnome/72x72/devices/gnome-dev-harddisk.png share/icons/gnome/72x72/filesystems/gnome-fs-directory-accept.icon share/icons/gnome/72x72/filesystems/gnome-fs-directory-accept.png +share/icons/gnome/72x72/filesystems/gnome-fs-directory-visiting.icon +share/icons/gnome/72x72/filesystems/gnome-fs-directory-visiting.png share/icons/gnome/72x72/filesystems/gnome-fs-directory.icon share/icons/gnome/72x72/filesystems/gnome-fs-directory.png share/icons/gnome/72x72/filesystems/gnome-fs-regular.icon share/icons/gnome/72x72/filesystems/gnome-fs-regular.png -share/icons/gnome/96x96/apps/gnome-starthere.png share/icons/gnome/96x96/filesystems/gnome-fs-directory-accept.icon share/icons/gnome/96x96/filesystems/gnome-fs-directory-accept.png +share/icons/gnome/96x96/filesystems/gnome-fs-directory-visiting.icon +share/icons/gnome/96x96/filesystems/gnome-fs-directory-visiting.png share/icons/gnome/96x96/filesystems/gnome-fs-directory.icon share/icons/gnome/96x96/filesystems/gnome-fs-directory.png share/icons/gnome/96x96/filesystems/gnome-fs-regular.icon share/icons/gnome/96x96/filesystems/gnome-fs-regular.png share/icons/gnome/index.theme -share/icons/gnome/scalable/emblems/emblem-OK.icon -share/icons/gnome/scalable/emblems/emblem-OK.svg -share/icons/gnome/scalable/emblems/emblem-certified.icon -share/icons/gnome/scalable/emblems/emblem-certified.svg -share/icons/gnome/scalable/emblems/emblem-distinguished.icon -share/icons/gnome/scalable/emblems/emblem-distinguished.svg -share/icons/gnome/scalable/emblems/emblem-draft.icon -share/icons/gnome/scalable/emblems/emblem-draft.svg -share/icons/gnome/scalable/emblems/emblem-generic.icon -share/icons/gnome/scalable/emblems/emblem-generic.svg -share/icons/gnome/scalable/emblems/emblem-important.icon -share/icons/gnome/scalable/emblems/emblem-important.svg -share/icons/gnome/scalable/emblems/emblem-new.icon -share/icons/gnome/scalable/emblems/emblem-new.svg -share/icons/gnome/scalable/emblems/emblem-noread.svg -share/icons/gnome/scalable/emblems/emblem-nowrite.svg -share/icons/gnome/scalable/emblems/emblem-personal.icon -share/icons/gnome/scalable/emblems/emblem-personal.svg -share/icons/gnome/scalable/emblems/emblem-special.icon -share/icons/gnome/scalable/emblems/emblem-special.svg -share/icons/gnome/scalable/emblems/emblem-urgent.icon -share/icons/gnome/scalable/emblems/emblem-urgent.svg +share/icons/hicolor/16x16/apps/blender.png +share/icons/hicolor/16x16/apps/config-language.png +share/icons/hicolor/16x16/apps/gnome-devel.png +share/icons/hicolor/16x16/apps/gnome-globe.png +share/icons/hicolor/16x16/apps/gnome-settings.png +share/icons/hicolor/16x16/apps/im-aim.png +share/icons/hicolor/16x16/apps/im-icq.png +share/icons/hicolor/16x16/apps/im-jabber.png +share/icons/hicolor/16x16/apps/im-msn.png +share/icons/hicolor/16x16/apps/im-yahoo.png +share/icons/hicolor/16x16/apps/panel-notification-area.png +share/icons/hicolor/16x16/apps/panel-window-list.png +share/icons/hicolor/16x16/apps/panel-window-menu.png +share/icons/hicolor/16x16/stock/chart/stock_chart-autoformat.png +share/icons/hicolor/16x16/stock/chart/stock_chart-data-in-columns.png +share/icons/hicolor/16x16/stock/chart/stock_chart-data-in-rows.png +share/icons/hicolor/16x16/stock/chart/stock_chart-edit-type.png +share/icons/hicolor/16x16/stock/chart/stock_chart-reorganize.png +share/icons/hicolor/16x16/stock/chart/stock_chart-toggle-axes-title.png +share/icons/hicolor/16x16/stock/chart/stock_chart-toggle-axes.png +share/icons/hicolor/16x16/stock/chart/stock_chart-toggle-hgrid.png +share/icons/hicolor/16x16/stock/chart/stock_chart-toggle-legend.png +share/icons/hicolor/16x16/stock/chart/stock_chart-toggle-title.png +share/icons/hicolor/16x16/stock/chart/stock_chart-toggle-vgrid.png +share/icons/hicolor/16x16/stock/chart/stock_glue.png +share/icons/hicolor/16x16/stock/chart/stock_gluepoint-down.png +share/icons/hicolor/16x16/stock/chart/stock_gluepoint-horizontal-center.png +share/icons/hicolor/16x16/stock/chart/stock_gluepoint-horizontal-left.png +share/icons/hicolor/16x16/stock/chart/stock_gluepoint-horizontal-right.png +share/icons/hicolor/16x16/stock/chart/stock_gluepoint-left.png +share/icons/hicolor/16x16/stock/chart/stock_gluepoint-relative.png +share/icons/hicolor/16x16/stock/chart/stock_gluepoint-right.png +share/icons/hicolor/16x16/stock/chart/stock_gluepoint-up.png +share/icons/hicolor/16x16/stock/chart/stock_gluepoint-vertical-bottom.png +share/icons/hicolor/16x16/stock/chart/stock_gluepoint-vertical-center.png +share/icons/hicolor/16x16/stock/chart/stock_gluepoint-vertical-top.png +share/icons/hicolor/16x16/stock/chart/stock_insert-chart.png +share/icons/hicolor/16x16/stock/code/stock_compile.png +share/icons/hicolor/16x16/stock/code/stock_error-next.png +share/icons/hicolor/16x16/stock/code/stock_error-previous.png +share/icons/hicolor/16x16/stock/code/stock_macro-check-brackets.png +share/icons/hicolor/16x16/stock/code/stock_macro-insert-breakpoint.png +share/icons/hicolor/16x16/stock/code/stock_macro-insert.png +share/icons/hicolor/16x16/stock/code/stock_macro-jump-back.png +share/icons/hicolor/16x16/stock/code/stock_macro-objects.png +share/icons/hicolor/16x16/stock/code/stock_macro-organizer.png +share/icons/hicolor/16x16/stock/code/stock_macro-stop-after-command.png +share/icons/hicolor/16x16/stock/code/stock_macro-stop-after-procedure.png +share/icons/hicolor/16x16/stock/code/stock_macro-stop-watching.png +share/icons/hicolor/16x16/stock/code/stock_macro-watch-variable.png +share/icons/hicolor/16x16/stock/code/stock_record-macro.png +share/icons/hicolor/16x16/stock/code/stock_run-macro.png +share/icons/hicolor/16x16/stock/code/stock_script.png +share/icons/hicolor/16x16/stock/code/stock_tools-macro.png +share/icons/hicolor/16x16/stock/data/stock_add-decimal-place.png +share/icons/hicolor/16x16/stock/data/stock_advanced-filter.png +share/icons/hicolor/16x16/stock/data/stock_autofilter.png +share/icons/hicolor/16x16/stock/data/stock_data-delete-link.png +share/icons/hicolor/16x16/stock/data/stock_data-delete-query.png +share/icons/hicolor/16x16/stock/data/stock_data-delete-record.png +share/icons/hicolor/16x16/stock/data/stock_data-delete-sql-query.png +share/icons/hicolor/16x16/stock/data/stock_data-delete-table.png +share/icons/hicolor/16x16/stock/data/stock_data-edit-link.png +share/icons/hicolor/16x16/stock/data/stock_data-edit-query.png +share/icons/hicolor/16x16/stock/data/stock_data-edit-sql-query.png +share/icons/hicolor/16x16/stock/data/stock_data-edit-table.png +share/icons/hicolor/16x16/stock/data/stock_data-explorer.png +share/icons/hicolor/16x16/stock/data/stock_data-first.png +share/icons/hicolor/16x16/stock/data/stock_data-last.png +share/icons/hicolor/16x16/stock/data/stock_data-link.png +share/icons/hicolor/16x16/stock/data/stock_data-linked-table.png +share/icons/hicolor/16x16/stock/data/stock_data-links.png +share/icons/hicolor/16x16/stock/data/stock_data-new-link.png +share/icons/hicolor/16x16/stock/data/stock_data-new-query.png +share/icons/hicolor/16x16/stock/data/stock_data-new-record.png +share/icons/hicolor/16x16/stock/data/stock_data-new-sql-query.png +share/icons/hicolor/16x16/stock/data/stock_data-new-table.png +share/icons/hicolor/16x16/stock/data/stock_data-next.png +share/icons/hicolor/16x16/stock/data/stock_data-previous.png +share/icons/hicolor/16x16/stock/data/stock_data-queries.png +share/icons/hicolor/16x16/stock/data/stock_data-query-rename.png +share/icons/hicolor/16x16/stock/data/stock_data-query.png +share/icons/hicolor/16x16/stock/data/stock_data-save.png +share/icons/hicolor/16x16/stock/data/stock_data-sources-delete.png +share/icons/hicolor/16x16/stock/data/stock_data-sources-hand.png +share/icons/hicolor/16x16/stock/data/stock_data-sources-modified.png +share/icons/hicolor/16x16/stock/data/stock_data-sources-new.png +share/icons/hicolor/16x16/stock/data/stock_data-sources.png +share/icons/hicolor/16x16/stock/data/stock_data-table.png +share/icons/hicolor/16x16/stock/data/stock_data-tables.png +share/icons/hicolor/16x16/stock/data/stock_data-undo.png +share/icons/hicolor/16x16/stock/data/stock_delete-autofilter.png +share/icons/hicolor/16x16/stock/data/stock_delete-decimal-place.png +share/icons/hicolor/16x16/stock/data/stock_filter-data-by-criteria.png +share/icons/hicolor/16x16/stock/data/stock_filter-navigator.png +share/icons/hicolor/16x16/stock/data/stock_filters.png +share/icons/hicolor/16x16/stock/data/stock_format-default.png +share/icons/hicolor/16x16/stock/data/stock_format-percent.png +share/icons/hicolor/16x16/stock/data/stock_format-scientific.png +share/icons/hicolor/16x16/stock/data/stock_function-autopilot.png +share/icons/hicolor/16x16/stock/data/stock_goal-seek.png +share/icons/hicolor/16x16/stock/data/stock_insert-fields.png +share/icons/hicolor/16x16/stock/data/stock_lock-broken.png +share/icons/hicolor/16x16/stock/data/stock_lock-ok.png +share/icons/hicolor/16x16/stock/data/stock_lock.png +share/icons/hicolor/16x16/stock/data/stock_record-number.png +share/icons/hicolor/16x16/stock/data/stock_signature-bad.png +share/icons/hicolor/16x16/stock/data/stock_signature-ok.png +share/icons/hicolor/16x16/stock/data/stock_signature.png +share/icons/hicolor/16x16/stock/data/stock_sort-ascending.png +share/icons/hicolor/16x16/stock/data/stock_sort-column-ascending.png +share/icons/hicolor/16x16/stock/data/stock_sort-criteria.png +share/icons/hicolor/16x16/stock/data/stock_sort-descending.png +share/icons/hicolor/16x16/stock/data/stock_sort-row-ascending.png +share/icons/hicolor/16x16/stock/data/stock_standard-filter.png +share/icons/hicolor/16x16/stock/data/stock_sum.png +share/icons/hicolor/16x16/stock/data/stock_update-data.png +share/icons/hicolor/16x16/stock/document/stock_attach.png +share/icons/hicolor/16x16/stock/document/stock_new-drawing.png +share/icons/hicolor/16x16/stock/document/stock_new-formula.png +share/icons/hicolor/16x16/stock/document/stock_new-html.png +share/icons/hicolor/16x16/stock/document/stock_new-labels.png +share/icons/hicolor/16x16/stock/document/stock_new-master-document.png +share/icons/hicolor/16x16/stock/document/stock_new-presentation.png +share/icons/hicolor/16x16/stock/document/stock_new-spreadsheet.png +share/icons/hicolor/16x16/stock/document/stock_new-template.png +share/icons/hicolor/16x16/stock/document/stock_new-text.png +share/icons/hicolor/16x16/stock/document/stock_new.png +share/icons/hicolor/16x16/stock/document/stock_preview-four-pages.png +share/icons/hicolor/16x16/stock/document/stock_preview-two-pages.png +share/icons/hicolor/16x16/stock/document/stock_print-layout.png +share/icons/hicolor/16x16/stock/document/stock_print-options.png +share/icons/hicolor/16x16/stock/document/stock_script.png +share/icons/hicolor/16x16/stock/document/stock_scripts.png +share/icons/hicolor/16x16/stock/document/stock_task-assigned-to.png +share/icons/hicolor/16x16/stock/document/stock_task-assigned.png +share/icons/hicolor/16x16/stock/document/stock_task-recurring.png +share/icons/hicolor/16x16/stock/document/stock_task.png +share/icons/hicolor/16x16/stock/document/stock_todo.png +share/icons/hicolor/16x16/stock/document/stock_view-html-source.png +share/icons/hicolor/16x16/stock/form/stock_form-activation-order.png +share/icons/hicolor/16x16/stock/form/stock_form-add-field.png +share/icons/hicolor/16x16/stock/form/stock_form-automatic-control-focus.png +share/icons/hicolor/16x16/stock/form/stock_form-autopilots.png +share/icons/hicolor/16x16/stock/form/stock_form-button.png +share/icons/hicolor/16x16/stock/form/stock_form-checkbox.png +share/icons/hicolor/16x16/stock/form/stock_form-combobox.png +share/icons/hicolor/16x16/stock/form/stock_form-control-properties.png +share/icons/hicolor/16x16/stock/form/stock_form-currency-field.png +share/icons/hicolor/16x16/stock/form/stock_form-date-field.png +share/icons/hicolor/16x16/stock/form/stock_form-design-mode.png +share/icons/hicolor/16x16/stock/form/stock_form-file-selection.png +share/icons/hicolor/16x16/stock/form/stock_form-formatted-field.png +share/icons/hicolor/16x16/stock/form/stock_form-frame.png +share/icons/hicolor/16x16/stock/form/stock_form-image-button.png +share/icons/hicolor/16x16/stock/form/stock_form-image-control.png +share/icons/hicolor/16x16/stock/form/stock_form-label.png +share/icons/hicolor/16x16/stock/form/stock_form-letter-dialog.png +share/icons/hicolor/16x16/stock/form/stock_form-listbox.png +share/icons/hicolor/16x16/stock/form/stock_form-navigator.png +share/icons/hicolor/16x16/stock/form/stock_form-numerical-field.png +share/icons/hicolor/16x16/stock/form/stock_form-open-in-design-mode.png +share/icons/hicolor/16x16/stock/form/stock_form-pattern-field.png +share/icons/hicolor/16x16/stock/form/stock_form-progressbar.png +share/icons/hicolor/16x16/stock/form/stock_form-properties.png +share/icons/hicolor/16x16/stock/form/stock_form-radio.png +share/icons/hicolor/16x16/stock/form/stock_form-table-control.png +share/icons/hicolor/16x16/stock/form/stock_form-text-box.png +share/icons/hicolor/16x16/stock/form/stock_form-time-field.png +share/icons/hicolor/16x16/stock/form/stock_insert-form.png +share/icons/hicolor/16x16/stock/form/stock_macro-controls.png +share/icons/hicolor/16x16/stock/form/stock_show-form-dialog.png +share/icons/hicolor/16x16/stock/form/stock_show-hidden-controls.png +share/icons/hicolor/16x16/stock/form/stock_view-fields.png +share/icons/hicolor/16x16/stock/generic/stock_3d-favourites.png +share/icons/hicolor/16x16/stock/generic/stock_about.png +share/icons/hicolor/16x16/stock/generic/stock_active.png +share/icons/hicolor/16x16/stock/generic/stock_allow-effects.png +share/icons/hicolor/16x16/stock/generic/stock_anchor.png +share/icons/hicolor/16x16/stock/generic/stock_animation.png +share/icons/hicolor/16x16/stock/generic/stock_autopilot.png +share/icons/hicolor/16x16/stock/generic/stock_bell.png +share/icons/hicolor/16x16/stock/generic/stock_book_blue.png +share/icons/hicolor/16x16/stock/generic/stock_book_green.png +share/icons/hicolor/16x16/stock/generic/stock_book_open.png +share/icons/hicolor/16x16/stock/generic/stock_book_red.png +share/icons/hicolor/16x16/stock/generic/stock_book_yellow.png +share/icons/hicolor/16x16/stock/generic/stock_briefcase.png +share/icons/hicolor/16x16/stock/generic/stock_calc-accept.png +share/icons/hicolor/16x16/stock/generic/stock_calc-cancel.png +share/icons/hicolor/16x16/stock/generic/stock_calendar.png +share/icons/hicolor/16x16/stock/generic/stock_cell-phone.png +share/icons/hicolor/16x16/stock/generic/stock_check-filled.png +share/icons/hicolor/16x16/stock/generic/stock_close.png +share/icons/hicolor/16x16/stock/generic/stock_copy.png +share/icons/hicolor/16x16/stock/generic/stock_cut.png +share/icons/hicolor/16x16/stock/generic/stock_default-folder.png +share/icons/hicolor/16x16/stock/generic/stock_delete.png +share/icons/hicolor/16x16/stock/generic/stock_dialog-error.png +share/icons/hicolor/16x16/stock/generic/stock_dialog-info.png +share/icons/hicolor/16x16/stock/generic/stock_dialog-warning.png +share/icons/hicolor/16x16/stock/generic/stock_drag-mode.png +share/icons/hicolor/16x16/stock/generic/stock_edit.png +share/icons/hicolor/16x16/stock/generic/stock_equals.png +share/icons/hicolor/16x16/stock/generic/stock_example.png +share/icons/hicolor/16x16/stock/generic/stock_exit.png +share/icons/hicolor/16x16/stock/generic/stock_extended-help.png +share/icons/hicolor/16x16/stock/generic/stock_file-properties.png +share/icons/hicolor/16x16/stock/generic/stock_flip-horizontally.png +share/icons/hicolor/16x16/stock/generic/stock_flip-vertically.png +share/icons/hicolor/16x16/stock/generic/stock_folder-copy.png +share/icons/hicolor/16x16/stock/generic/stock_folder-move.png +share/icons/hicolor/16x16/stock/generic/stock_folder-properties.png +share/icons/hicolor/16x16/stock/generic/stock_folder.png +share/icons/hicolor/16x16/stock/generic/stock_format-page.png +share/icons/hicolor/16x16/stock/generic/stock_fullscreen.png +share/icons/hicolor/16x16/stock/generic/stock_help-add-bookmark.png +share/icons/hicolor/16x16/stock/generic/stock_help-agent.png +share/icons/hicolor/16x16/stock/generic/stock_help-book-open.png +share/icons/hicolor/16x16/stock/generic/stock_help-book.png +share/icons/hicolor/16x16/stock/generic/stock_help-chat.png +share/icons/hicolor/16x16/stock/generic/stock_help-document.png +share/icons/hicolor/16x16/stock/generic/stock_help-pane-off.png +share/icons/hicolor/16x16/stock/generic/stock_help-pane-on.png +share/icons/hicolor/16x16/stock/generic/stock_help.png +share/icons/hicolor/16x16/stock/generic/stock_home.png +share/icons/hicolor/16x16/stock/generic/stock_id.png +share/icons/hicolor/16x16/stock/generic/stock_keyring.png +share/icons/hicolor/16x16/stock/generic/stock_landline-phone.png +share/icons/hicolor/16x16/stock/generic/stock_mark.png +share/icons/hicolor/16x16/stock/generic/stock_new-24h-appointment.png +share/icons/hicolor/16x16/stock/generic/stock_new-appointment.png +share/icons/hicolor/16x16/stock/generic/stock_new-dir.png +share/icons/hicolor/16x16/stock/generic/stock_new-meeting.png +share/icons/hicolor/16x16/stock/generic/stock_news.png +share/icons/hicolor/16x16/stock/generic/stock_notebook.png +share/icons/hicolor/16x16/stock/generic/stock_notes.png +share/icons/hicolor/16x16/stock/generic/stock_openoffice.png +share/icons/hicolor/16x16/stock/generic/stock_paste.png +share/icons/hicolor/16x16/stock/generic/stock_people.png +share/icons/hicolor/16x16/stock/generic/stock_person.png +share/icons/hicolor/16x16/stock/generic/stock_presentation-box.png +share/icons/hicolor/16x16/stock/generic/stock_presentation-styles.png +share/icons/hicolor/16x16/stock/generic/stock_properties.png +share/icons/hicolor/16x16/stock/generic/stock_redo.png +share/icons/hicolor/16x16/stock/generic/stock_refresh.png +share/icons/hicolor/16x16/stock/generic/stock_score-high.png +share/icons/hicolor/16x16/stock/generic/stock_score-higher.png +share/icons/hicolor/16x16/stock/generic/stock_score-highest.png +share/icons/hicolor/16x16/stock/generic/stock_score-low.png +share/icons/hicolor/16x16/stock/generic/stock_score-lower.png +share/icons/hicolor/16x16/stock/generic/stock_score-lowest.png +share/icons/hicolor/16x16/stock/generic/stock_score-normal.png +share/icons/hicolor/16x16/stock/generic/stock_search.png +share/icons/hicolor/16x16/stock/generic/stock_send-fax.png +share/icons/hicolor/16x16/stock/generic/stock_show-all.png +share/icons/hicolor/16x16/stock/generic/stock_stop.png +share/icons/hicolor/16x16/stock/generic/stock_styles.png +share/icons/hicolor/16x16/stock/generic/stock_summary.png +share/icons/hicolor/16x16/stock/generic/stock_test-mode.png +share/icons/hicolor/16x16/stock/generic/stock_timer.png +share/icons/hicolor/16x16/stock/generic/stock_timer_stopped.png +share/icons/hicolor/16x16/stock/generic/stock_timezone.png +share/icons/hicolor/16x16/stock/generic/stock_toggle-info.png +share/icons/hicolor/16x16/stock/generic/stock_toggle-preview.png +share/icons/hicolor/16x16/stock/generic/stock_toilet-paper.png +share/icons/hicolor/16x16/stock/generic/stock_trash_full.png +share/icons/hicolor/16x16/stock/generic/stock_undelete.png +share/icons/hicolor/16x16/stock/generic/stock_undo.png +share/icons/hicolor/16x16/stock/generic/stock_unknown.png +share/icons/hicolor/16x16/stock/generic/stock_view-details.png +share/icons/hicolor/16x16/stock/generic/stock_weather-cloudy.png +share/icons/hicolor/16x16/stock/generic/stock_weather-few-clouds.png +share/icons/hicolor/16x16/stock/generic/stock_weather-fog.png +share/icons/hicolor/16x16/stock/generic/stock_weather-showers.png +share/icons/hicolor/16x16/stock/generic/stock_weather-snow.png +share/icons/hicolor/16x16/stock/generic/stock_weather-storm.png +share/icons/hicolor/16x16/stock/generic/stock_weather-sunny.png +share/icons/hicolor/16x16/stock/generic/stock_web-calendar.png +share/icons/hicolor/16x16/stock/generic/stock_web-support.png +share/icons/hicolor/16x16/stock/image/stock_3d-color-picker.png +share/icons/hicolor/16x16/stock/image/stock_3d-colors.png +share/icons/hicolor/16x16/stock/image/stock_3d-custom-color.png +share/icons/hicolor/16x16/stock/image/stock_3d-effects.png +share/icons/hicolor/16x16/stock/image/stock_arrowstyle.png +share/icons/hicolor/16x16/stock/image/stock_brightness.png +share/icons/hicolor/16x16/stock/image/stock_bucketfill.png +share/icons/hicolor/16x16/stock/image/stock_channel-blue.png +share/icons/hicolor/16x16/stock/image/stock_channel-green.png +share/icons/hicolor/16x16/stock/image/stock_channel-red.png +share/icons/hicolor/16x16/stock/image/stock_contrast.png +share/icons/hicolor/16x16/stock/image/stock_crop.png +share/icons/hicolor/16x16/stock/image/stock_display-grid.png +share/icons/hicolor/16x16/stock/image/stock_display-guides.png +share/icons/hicolor/16x16/stock/image/stock_distort.png +share/icons/hicolor/16x16/stock/image/stock_draw-arc.png +share/icons/hicolor/16x16/stock/image/stock_draw-callouts.png +share/icons/hicolor/16x16/stock/image/stock_draw-circle-arc.png +share/icons/hicolor/16x16/stock/image/stock_draw-circle-pie-unfilled.png +share/icons/hicolor/16x16/stock/image/stock_draw-circle-pie.png +share/icons/hicolor/16x16/stock/image/stock_draw-circle-segment-unfilled.png +share/icons/hicolor/16x16/stock/image/stock_draw-circle-segment.png +share/icons/hicolor/16x16/stock/image/stock_draw-circle-unfilled.png +share/icons/hicolor/16x16/stock/image/stock_draw-circle.png +share/icons/hicolor/16x16/stock/image/stock_draw-cone.png +share/icons/hicolor/16x16/stock/image/stock_draw-connector-ends-with-arrow.png +share/icons/hicolor/16x16/stock/image/stock_draw-connector-ends-with-circle.png +share/icons/hicolor/16x16/stock/image/stock_draw-connector-starts-with-arrow.png +share/icons/hicolor/16x16/stock/image/stock_draw-connector-starts-with-circle.png +share/icons/hicolor/16x16/stock/image/stock_draw-connector-with-arrows.png +share/icons/hicolor/16x16/stock/image/stock_draw-connector-with-circles.png +share/icons/hicolor/16x16/stock/image/stock_draw-connector.png +share/icons/hicolor/16x16/stock/image/stock_draw-cube.png +share/icons/hicolor/16x16/stock/image/stock_draw-curve-filled.png +share/icons/hicolor/16x16/stock/image/stock_draw-curve.png +share/icons/hicolor/16x16/stock/image/stock_draw-curved-connector-ends-with-arrow.png +share/icons/hicolor/16x16/stock/image/stock_draw-curved-connector-ends-with-circle.png +share/icons/hicolor/16x16/stock/image/stock_draw-curved-connector-starts-with-arrow.png +share/icons/hicolor/16x16/stock/image/stock_draw-curved-connector-starts-with-circle.png +share/icons/hicolor/16x16/stock/image/stock_draw-curved-connector-with-arrows.png +share/icons/hicolor/16x16/stock/image/stock_draw-curved-connector-with-circles.png +share/icons/hicolor/16x16/stock/image/stock_draw-curved-connector.png +share/icons/hicolor/16x16/stock/image/stock_draw-cylinder.png +share/icons/hicolor/16x16/stock/image/stock_draw-dimension-line.png +share/icons/hicolor/16x16/stock/image/stock_draw-ellipse-pie-unfilled.png +share/icons/hicolor/16x16/stock/image/stock_draw-ellipse-pie.png +share/icons/hicolor/16x16/stock/image/stock_draw-ellipse-segment-unfilled.png +share/icons/hicolor/16x16/stock/image/stock_draw-ellipse-segment.png +share/icons/hicolor/16x16/stock/image/stock_draw-ellipse-unfilled.png +share/icons/hicolor/16x16/stock/image/stock_draw-ellipse.png +share/icons/hicolor/16x16/stock/image/stock_draw-freeform-line-filled.png +share/icons/hicolor/16x16/stock/image/stock_draw-freeform-line.png +share/icons/hicolor/16x16/stock/image/stock_draw-half-sphere.png +share/icons/hicolor/16x16/stock/image/stock_draw-line-45.png +share/icons/hicolor/16x16/stock/image/stock_draw-line-connector-ends-with-arrow.png +share/icons/hicolor/16x16/stock/image/stock_draw-line-connector-ends-with-circle.png +share/icons/hicolor/16x16/stock/image/stock_draw-line-connector-starts-with-arrow.png +share/icons/hicolor/16x16/stock/image/stock_draw-line-connector-starts-with-circle.png +share/icons/hicolor/16x16/stock/image/stock_draw-line-connector-with-arrows.png +share/icons/hicolor/16x16/stock/image/stock_draw-line-connector-with-circles.png +share/icons/hicolor/16x16/stock/image/stock_draw-line-connector.png +share/icons/hicolor/16x16/stock/image/stock_draw-line-ends-with-arrow.png +share/icons/hicolor/16x16/stock/image/stock_draw-line-starts-with-arrow.png +share/icons/hicolor/16x16/stock/image/stock_draw-line-with-arrow-circle.png +share/icons/hicolor/16x16/stock/image/stock_draw-line-with-arrow-square.png +share/icons/hicolor/16x16/stock/image/stock_draw-line-with-arrows.png +share/icons/hicolor/16x16/stock/image/stock_draw-line-with-circle-arrow.png +share/icons/hicolor/16x16/stock/image/stock_draw-line-with-square-arrow.png +share/icons/hicolor/16x16/stock/image/stock_draw-line.png +share/icons/hicolor/16x16/stock/image/stock_draw-polygon-45-filled.png +share/icons/hicolor/16x16/stock/image/stock_draw-polygon-45.png +share/icons/hicolor/16x16/stock/image/stock_draw-polygon-filled.png +share/icons/hicolor/16x16/stock/image/stock_draw-polygon.png +share/icons/hicolor/16x16/stock/image/stock_draw-pyramid.png +share/icons/hicolor/16x16/stock/image/stock_draw-rectangle-unfilled.png +share/icons/hicolor/16x16/stock/image/stock_draw-rectangle.png +share/icons/hicolor/16x16/stock/image/stock_draw-rounded-rectangle-unfilled.png +share/icons/hicolor/16x16/stock/image/stock_draw-rounded-rectangle.png +share/icons/hicolor/16x16/stock/image/stock_draw-rounded-square-unfilled.png +share/icons/hicolor/16x16/stock/image/stock_draw-rounded-square.png +share/icons/hicolor/16x16/stock/image/stock_draw-selection.png +share/icons/hicolor/16x16/stock/image/stock_draw-shell.png +share/icons/hicolor/16x16/stock/image/stock_draw-sphere.png +share/icons/hicolor/16x16/stock/image/stock_draw-square-unfilled.png +share/icons/hicolor/16x16/stock/image/stock_draw-square.png +share/icons/hicolor/16x16/stock/image/stock_draw-straight-connector-ends-with-arrow.png +share/icons/hicolor/16x16/stock/image/stock_draw-straight-connector-ends-with-circle.png +share/icons/hicolor/16x16/stock/image/stock_draw-straight-connector-starts-with-arrow.png +share/icons/hicolor/16x16/stock/image/stock_draw-straight-connector-starts-with-circle.png +share/icons/hicolor/16x16/stock/image/stock_draw-straight-connector-with-arrows.png +share/icons/hicolor/16x16/stock/image/stock_draw-straight-connector-with-circles.png +share/icons/hicolor/16x16/stock/image/stock_draw-straight-connector.png +share/icons/hicolor/16x16/stock/image/stock_draw-torus.png +share/icons/hicolor/16x16/stock/image/stock_draw-vertical-callouts.png +share/icons/hicolor/16x16/stock/image/stock_edit-points.png +share/icons/hicolor/16x16/stock/image/stock_filters-aging.png +share/icons/hicolor/16x16/stock/image/stock_filters-charcoal.png +share/icons/hicolor/16x16/stock/image/stock_filters-invert.png +share/icons/hicolor/16x16/stock/image/stock_filters-pixelize.png +share/icons/hicolor/16x16/stock/image/stock_filters-pop-art.png +share/icons/hicolor/16x16/stock/image/stock_filters-posterize.png +share/icons/hicolor/16x16/stock/image/stock_filters-relief.png +share/icons/hicolor/16x16/stock/image/stock_filters-remove-noise.png +share/icons/hicolor/16x16/stock/image/stock_filters-sharpen.png +share/icons/hicolor/16x16/stock/image/stock_filters-smooth.png +share/icons/hicolor/16x16/stock/image/stock_filters-solarize.png +share/icons/hicolor/16x16/stock/image/stock_flip.png +share/icons/hicolor/16x16/stock/image/stock_gamma.png +share/icons/hicolor/16x16/stock/image/stock_gradient.png +share/icons/hicolor/16x16/stock/image/stock_graphic-styles.png +share/icons/hicolor/16x16/stock/image/stock_graphics-align-bottom.png +share/icons/hicolor/16x16/stock/image/stock_graphics-align-center.png +share/icons/hicolor/16x16/stock/image/stock_graphics-align-centered.png +share/icons/hicolor/16x16/stock/image/stock_graphics-align-left.png +share/icons/hicolor/16x16/stock/image/stock_graphics-align-right.png +share/icons/hicolor/16x16/stock/image/stock_graphics-align-top.png +share/icons/hicolor/16x16/stock/image/stock_guides.png +share/icons/hicolor/16x16/stock/image/stock_imagemap-editor.png +share/icons/hicolor/16x16/stock/image/stock_insert_image.png +share/icons/hicolor/16x16/stock/image/stock_linepen.png +share/icons/hicolor/16x16/stock/image/stock_modify-layout.png +share/icons/hicolor/16x16/stock/image/stock_node-add.png +share/icons/hicolor/16x16/stock/image/stock_node-close-path.png +share/icons/hicolor/16x16/stock/image/stock_node-convert.png +share/icons/hicolor/16x16/stock/image/stock_node-corner-to-smooth.png +share/icons/hicolor/16x16/stock/image/stock_node-corner.png +share/icons/hicolor/16x16/stock/image/stock_node-curve-split.png +share/icons/hicolor/16x16/stock/image/stock_node-delete.png +share/icons/hicolor/16x16/stock/image/stock_node-mark-for-deletion.png +share/icons/hicolor/16x16/stock/image/stock_node-move.png +share/icons/hicolor/16x16/stock/image/stock_node-smooth-to-symmetrical.png +share/icons/hicolor/16x16/stock/image/stock_placeholder-graphic.png +share/icons/hicolor/16x16/stock/image/stock_placeholder-line-contour.png +share/icons/hicolor/16x16/stock/image/stock_placeholder-picture.png +share/icons/hicolor/16x16/stock/image/stock_placeholder-text.png +share/icons/hicolor/16x16/stock/image/stock_quickmask.png +share/icons/hicolor/16x16/stock/image/stock_rotate-3d.png +share/icons/hicolor/16x16/stock/image/stock_rotate.png +share/icons/hicolor/16x16/stock/image/stock_rotation-mode.png +share/icons/hicolor/16x16/stock/image/stock_shadow.png +share/icons/hicolor/16x16/stock/image/stock_show-draw-functions.png +share/icons/hicolor/16x16/stock/image/stock_toggle-graphics.png +share/icons/hicolor/16x16/stock/image/stock_transform-circle-perspective.png +share/icons/hicolor/16x16/stock/image/stock_transform-circle-slant.png +share/icons/hicolor/16x16/stock/image/stock_transparency.png +share/icons/hicolor/16x16/stock/image/stock_wallpaper-center.png +share/icons/hicolor/16x16/stock/image/stock_wallpaper-fill.png +share/icons/hicolor/16x16/stock/image/stock_wallpaper-scale.png +share/icons/hicolor/16x16/stock/image/stock_wallpaper-tile.png +share/icons/hicolor/16x16/stock/io/stock_bluetooth.png +share/icons/hicolor/16x16/stock/io/stock_export.png +share/icons/hicolor/16x16/stock/io/stock_insert-file.png +share/icons/hicolor/16x16/stock/io/stock_network-printer.png +share/icons/hicolor/16x16/stock/io/stock_open-read-only.png +share/icons/hicolor/16x16/stock/io/stock_open.png +share/icons/hicolor/16x16/stock/io/stock_print-driver.png +share/icons/hicolor/16x16/stock/io/stock_print-preview-print.png +share/icons/hicolor/16x16/stock/io/stock_print-preview.png +share/icons/hicolor/16x16/stock/io/stock_print-setup.png +share/icons/hicolor/16x16/stock/io/stock_print.png +share/icons/hicolor/16x16/stock/io/stock_printers.png +share/icons/hicolor/16x16/stock/io/stock_reload.png +share/icons/hicolor/16x16/stock/io/stock_save-pdf.png +share/icons/hicolor/16x16/stock/io/stock_save-template.png +share/icons/hicolor/16x16/stock/io/stock_save.png +share/icons/hicolor/16x16/stock/io/stock_save_as.png +share/icons/hicolor/16x16/stock/io/stock_up-one-dir.png +share/icons/hicolor/16x16/stock/media/stock_effects-sound.png +share/icons/hicolor/16x16/stock/media/stock_insert-video-plugin.png +share/icons/hicolor/16x16/stock/media/stock_line_in.png +share/icons/hicolor/16x16/stock/media/stock_media-fwd.png +share/icons/hicolor/16x16/stock/media/stock_media-next.png +share/icons/hicolor/16x16/stock/media/stock_media-pause.png +share/icons/hicolor/16x16/stock/media/stock_media-play.png +share/icons/hicolor/16x16/stock/media/stock_media-prev.png +share/icons/hicolor/16x16/stock/media/stock_media-rec.png +share/icons/hicolor/16x16/stock/media/stock_media-rew.png +share/icons/hicolor/16x16/stock/media/stock_media-stop.png +share/icons/hicolor/16x16/stock/media/stock_mic.png +share/icons/hicolor/16x16/stock/media/stock_midi.png +share/icons/hicolor/16x16/stock/media/stock_music-library.png +share/icons/hicolor/16x16/stock/media/stock_playlist.png +share/icons/hicolor/16x16/stock/media/stock_repeat.png +share/icons/hicolor/16x16/stock/media/stock_shuffle.png +share/icons/hicolor/16x16/stock/media/stock_smart-playlist.png +share/icons/hicolor/16x16/stock/media/stock_volume.png +share/icons/hicolor/16x16/stock/navigation/stock_bottom.png +share/icons/hicolor/16x16/stock/navigation/stock_down-with-subpoints.png +share/icons/hicolor/16x16/stock/navigation/stock_down.png +share/icons/hicolor/16x16/stock/navigation/stock_first-page.png +share/icons/hicolor/16x16/stock/navigation/stock_first.png +share/icons/hicolor/16x16/stock/navigation/stock_last-page.png +share/icons/hicolor/16x16/stock/navigation/stock_last.png +share/icons/hicolor/16x16/stock/navigation/stock_left-with-subpoints.png +share/icons/hicolor/16x16/stock/navigation/stock_left.png +share/icons/hicolor/16x16/stock/navigation/stock_live-mode.png +share/icons/hicolor/16x16/stock/navigation/stock_navigate-next.png +share/icons/hicolor/16x16/stock/navigation/stock_navigate-prev.png +share/icons/hicolor/16x16/stock/navigation/stock_navigator-all-or-sel-toggle.png +share/icons/hicolor/16x16/stock/navigation/stock_navigator-database-ranges.png +share/icons/hicolor/16x16/stock/navigation/stock_navigator-drag-mode.png +share/icons/hicolor/16x16/stock/navigation/stock_navigator-edit-entry.png +share/icons/hicolor/16x16/stock/navigation/stock_navigator-foonote-body-toggle.png +share/icons/hicolor/16x16/stock/navigation/stock_navigator-footer-body-toggle.png +share/icons/hicolor/16x16/stock/navigation/stock_navigator-header-body-toggle.png +share/icons/hicolor/16x16/stock/navigation/stock_navigator-headings.png +share/icons/hicolor/16x16/stock/navigation/stock_navigator-indexes.png +share/icons/hicolor/16x16/stock/navigation/stock_navigator-insert-as-copy.png +share/icons/hicolor/16x16/stock/navigation/stock_navigator-insert-as-link.png +share/icons/hicolor/16x16/stock/navigation/stock_navigator-insert-index.png +share/icons/hicolor/16x16/stock/navigation/stock_navigator-insert-linked.png +share/icons/hicolor/16x16/stock/navigation/stock_navigator-levels.png +share/icons/hicolor/16x16/stock/navigation/stock_navigator-list-box-toggle.png +share/icons/hicolor/16x16/stock/navigation/stock_navigator-master-toggle.png +share/icons/hicolor/16x16/stock/navigation/stock_navigator-next-object.png +share/icons/hicolor/16x16/stock/navigation/stock_navigator-open-toolbar.png +share/icons/hicolor/16x16/stock/navigation/stock_navigator-previous-object.png +share/icons/hicolor/16x16/stock/navigation/stock_navigator-range-names.png +share/icons/hicolor/16x16/stock/navigation/stock_navigator-references.png +share/icons/hicolor/16x16/stock/navigation/stock_navigator-reminder.png +share/icons/hicolor/16x16/stock/navigation/stock_navigator-scenarios.png +share/icons/hicolor/16x16/stock/navigation/stock_navigator-sections.png +share/icons/hicolor/16x16/stock/navigation/stock_navigator-shift-down.png +share/icons/hicolor/16x16/stock/navigation/stock_navigator-shift-left.png +share/icons/hicolor/16x16/stock/navigation/stock_navigator-shift-right.png +share/icons/hicolor/16x16/stock/navigation/stock_navigator-shift-up.png +share/icons/hicolor/16x16/stock/navigation/stock_navigator-table-formula.png +share/icons/hicolor/16x16/stock/navigation/stock_navigator-text.png +share/icons/hicolor/16x16/stock/navigation/stock_navigator-update-entry.png +share/icons/hicolor/16x16/stock/navigation/stock_navigator-wrong-table-formula.png +share/icons/hicolor/16x16/stock/navigation/stock_navigator.png +share/icons/hicolor/16x16/stock/navigation/stock_new-tab.png +share/icons/hicolor/16x16/stock/navigation/stock_next-page.png +share/icons/hicolor/16x16/stock/navigation/stock_next.png +share/icons/hicolor/16x16/stock/navigation/stock_previous-page.png +share/icons/hicolor/16x16/stock/navigation/stock_previous.png +share/icons/hicolor/16x16/stock/navigation/stock_right-with-subpoints.png +share/icons/hicolor/16x16/stock/navigation/stock_right.png +share/icons/hicolor/16x16/stock/navigation/stock_top.png +share/icons/hicolor/16x16/stock/navigation/stock_undo-history.png +share/icons/hicolor/16x16/stock/navigation/stock_up-with-subpoints.png +share/icons/hicolor/16x16/stock/navigation/stock_up.png +share/icons/hicolor/16x16/stock/navigation/stock_zoom-1.png +share/icons/hicolor/16x16/stock/navigation/stock_zoom-in.png +share/icons/hicolor/16x16/stock/navigation/stock_zoom-next.png +share/icons/hicolor/16x16/stock/navigation/stock_zoom-object.png +share/icons/hicolor/16x16/stock/navigation/stock_zoom-optimal.png +share/icons/hicolor/16x16/stock/navigation/stock_zoom-out.png +share/icons/hicolor/16x16/stock/navigation/stock_zoom-page-width.png +share/icons/hicolor/16x16/stock/navigation/stock_zoom-page.png +share/icons/hicolor/16x16/stock/navigation/stock_zoom-previous.png +share/icons/hicolor/16x16/stock/navigation/stock_zoom-shift.png +share/icons/hicolor/16x16/stock/navigation/stock_zoom.png +share/icons/hicolor/16x16/stock/net/stock_addressbook.png +share/icons/hicolor/16x16/stock/net/stock_appointment-reminder-excl.png +share/icons/hicolor/16x16/stock/net/stock_appointment-reminder.png +share/icons/hicolor/16x16/stock/net/stock_channel.png +share/icons/hicolor/16x16/stock/net/stock_connect-to-url.png +share/icons/hicolor/16x16/stock/net/stock_connect.png +share/icons/hicolor/16x16/stock/net/stock_contact-list.png +share/icons/hicolor/16x16/stock/net/stock_contact.png +share/icons/hicolor/16x16/stock/net/stock_directory-server.png +share/icons/hicolor/16x16/stock/net/stock_disconnect.png +share/icons/hicolor/16x16/stock/net/stock_exchange-connector.png +share/icons/hicolor/16x16/stock/net/stock_groupwise-connector.png +share/icons/hicolor/16x16/stock/net/stock_hyperlink-internet-search.png +share/icons/hicolor/16x16/stock/net/stock_hyperlink-target.png +share/icons/hicolor/16x16/stock/net/stock_hyperlink-toolbar.png +share/icons/hicolor/16x16/stock/net/stock_hyperlink.png +share/icons/hicolor/16x16/stock/net/stock_inbox.png +share/icons/hicolor/16x16/stock/net/stock_insert-url.png +share/icons/hicolor/16x16/stock/net/stock_internet.png +share/icons/hicolor/16x16/stock/net/stock_link.png +share/icons/hicolor/16x16/stock/net/stock_mail-compose.png +share/icons/hicolor/16x16/stock/net/stock_mail-copy.png +share/icons/hicolor/16x16/stock/net/stock_mail-filters-apply.png +share/icons/hicolor/16x16/stock/net/stock_mail-flag-for-followup-done.png +share/icons/hicolor/16x16/stock/net/stock_mail-flag-for-followup.png +share/icons/hicolor/16x16/stock/net/stock_mail-forward.png +share/icons/hicolor/16x16/stock/net/stock_mail-hide-deleted.png +share/icons/hicolor/16x16/stock/net/stock_mail-hide-read.png +share/icons/hicolor/16x16/stock/net/stock_mail-hide-selected.png +share/icons/hicolor/16x16/stock/net/stock_mail-import.png +share/icons/hicolor/16x16/stock/net/stock_mail-merge.png +share/icons/hicolor/16x16/stock/net/stock_mail-move.png +share/icons/hicolor/16x16/stock/net/stock_mail-open-multiple.png +share/icons/hicolor/16x16/stock/net/stock_mail-open.png +share/icons/hicolor/16x16/stock/net/stock_mail-priority-high.png +share/icons/hicolor/16x16/stock/net/stock_mail-receive.png +share/icons/hicolor/16x16/stock/net/stock_mail-replied.png +share/icons/hicolor/16x16/stock/net/stock_mail-reply-to-all.png +share/icons/hicolor/16x16/stock/net/stock_mail-reply.png +share/icons/hicolor/16x16/stock/net/stock_mail-send-receive.png +share/icons/hicolor/16x16/stock/net/stock_mail-send.png +share/icons/hicolor/16x16/stock/net/stock_mail-unread-multiple.png +share/icons/hicolor/16x16/stock/net/stock_mail-unread.png +share/icons/hicolor/16x16/stock/net/stock_mail.png +share/icons/hicolor/16x16/stock/net/stock_not-spam.png +share/icons/hicolor/16x16/stock/net/stock_online-layout.png +share/icons/hicolor/16x16/stock/net/stock_outbox.png +share/icons/hicolor/16x16/stock/net/stock_post-message.png +share/icons/hicolor/16x16/stock/net/stock_sent-mail.png +share/icons/hicolor/16x16/stock/net/stock_spam.png +share/icons/hicolor/16x16/stock/net/stock_video-conferencing.png +share/icons/hicolor/16x16/stock/object/stock_3d-3d-attributes-only.png +share/icons/hicolor/16x16/stock/object/stock_3d-all-attributes.png +share/icons/hicolor/16x16/stock/object/stock_3d-geometry.png +share/icons/hicolor/16x16/stock/object/stock_3d-light-off.png +share/icons/hicolor/16x16/stock/object/stock_3d-light-on.png +share/icons/hicolor/16x16/stock/object/stock_3d-light.png +share/icons/hicolor/16x16/stock/object/stock_3d-material.png +share/icons/hicolor/16x16/stock/object/stock_3d-normals-double-sided-closed-body.png +share/icons/hicolor/16x16/stock/object/stock_3d-normals-double-sided.png +share/icons/hicolor/16x16/stock/object/stock_3d-normals-flat.png +share/icons/hicolor/16x16/stock/object/stock_3d-normals-flip-illumination.png +share/icons/hicolor/16x16/stock/object/stock_3d-normals-object-specific.png +share/icons/hicolor/16x16/stock/object/stock_3d-normals-spherical.png +share/icons/hicolor/16x16/stock/object/stock_3d-perspective.png +share/icons/hicolor/16x16/stock/object/stock_3d-shading.png +share/icons/hicolor/16x16/stock/object/stock_3d-texture-and-shading.png +share/icons/hicolor/16x16/stock/object/stock_3d-texture-object-specific.png +share/icons/hicolor/16x16/stock/object/stock_3d-texture-only.png +share/icons/hicolor/16x16/stock/object/stock_3d-texture-parallel.png +share/icons/hicolor/16x16/stock/object/stock_3d-texture-spherical.png +share/icons/hicolor/16x16/stock/object/stock_3d-texture.png +share/icons/hicolor/16x16/stock/object/stock_add-bookmark.png +share/icons/hicolor/16x16/stock/object/stock_auto-contour.png +share/icons/hicolor/16x16/stock/object/stock_bookmark.png +share/icons/hicolor/16x16/stock/object/stock_bring-backward.png +share/icons/hicolor/16x16/stock/object/stock_bring-forward.png +share/icons/hicolor/16x16/stock/object/stock_create-with-attributes.png +share/icons/hicolor/16x16/stock/object/stock_delete-bookmark.png +share/icons/hicolor/16x16/stock/object/stock_edit-bookmark.png +share/icons/hicolor/16x16/stock/object/stock_effects-more-options.png +share/icons/hicolor/16x16/stock/object/stock_effects-object-colorize.png +share/icons/hicolor/16x16/stock/object/stock_effects-object-hide.png +share/icons/hicolor/16x16/stock/object/stock_effects-object.png +share/icons/hicolor/16x16/stock/object/stock_effects-play-in-full.png +share/icons/hicolor/16x16/stock/object/stock_effects-preview.png +share/icons/hicolor/16x16/stock/object/stock_effects.png +share/icons/hicolor/16x16/stock/object/stock_enter-group.png +share/icons/hicolor/16x16/stock/object/stock_exit-group.png +share/icons/hicolor/16x16/stock/object/stock_file-with-objects.png +share/icons/hicolor/16x16/stock/object/stock_format-object.png +share/icons/hicolor/16x16/stock/object/stock_formula-cursor.png +share/icons/hicolor/16x16/stock/object/stock_frame.png +share/icons/hicolor/16x16/stock/object/stock_group.png +share/icons/hicolor/16x16/stock/object/stock_handles-big.png +share/icons/hicolor/16x16/stock/object/stock_handles-simple.png +share/icons/hicolor/16x16/stock/object/stock_insert-applet.png +share/icons/hicolor/16x16/stock/object/stock_insert-floating-frame.png +share/icons/hicolor/16x16/stock/object/stock_insert-gluepoint.png +share/icons/hicolor/16x16/stock/object/stock_insert-math-object.png +share/icons/hicolor/16x16/stock/object/stock_insert-note.png +share/icons/hicolor/16x16/stock/object/stock_insert-ole-object.png +share/icons/hicolor/16x16/stock/object/stock_insert-plugin.png +share/icons/hicolor/16x16/stock/object/stock_insert-single-column-text-frame.png +share/icons/hicolor/16x16/stock/object/stock_insert-slide.png +share/icons/hicolor/16x16/stock/object/stock_insert-sound-plugin.png +share/icons/hicolor/16x16/stock/object/stock_insert-text-frame.png +share/icons/hicolor/16x16/stock/object/stock_insert_graphic.png +share/icons/hicolor/16x16/stock/object/stock_insert_special_character.png +share/icons/hicolor/16x16/stock/object/stock_interaction.png +share/icons/hicolor/16x16/stock/object/stock_new-bcard.png +share/icons/hicolor/16x16/stock/object/stock_object-behind.png +share/icons/hicolor/16x16/stock/object/stock_object-infront.png +share/icons/hicolor/16x16/stock/object/stock_pin.png +share/icons/hicolor/16x16/stock/object/stock_position-size.png +share/icons/hicolor/16x16/stock/object/stock_reverse-order.png +share/icons/hicolor/16x16/stock/object/stock_slide-design.png +share/icons/hicolor/16x16/stock/object/stock_slide-duplicate.png +share/icons/hicolor/16x16/stock/object/stock_slide-expand.png +share/icons/hicolor/16x16/stock/object/stock_slide-reherse-timings.png +share/icons/hicolor/16x16/stock/object/stock_slide-show.png +share/icons/hicolor/16x16/stock/object/stock_slide-showhide.png +share/icons/hicolor/16x16/stock/object/stock_snap-grid.png +share/icons/hicolor/16x16/stock/object/stock_snap-guides.png +share/icons/hicolor/16x16/stock/object/stock_snap-margins.png +share/icons/hicolor/16x16/stock/object/stock_snap-object-points.png +share/icons/hicolor/16x16/stock/object/stock_snap-object.png +share/icons/hicolor/16x16/stock/object/stock_symbol-selection.png +share/icons/hicolor/16x16/stock/object/stock_to-3d-rotation-object.png +share/icons/hicolor/16x16/stock/object/stock_to-3d.png +share/icons/hicolor/16x16/stock/object/stock_to-bottom.png +share/icons/hicolor/16x16/stock/object/stock_to-curve.png +share/icons/hicolor/16x16/stock/object/stock_to-polygon.png +share/icons/hicolor/16x16/stock/object/stock_to-top.png +share/icons/hicolor/16x16/stock/object/stock_ungroup.png +share/icons/hicolor/16x16/stock/object/stock_unlink.png +share/icons/hicolor/16x16/stock/object/stock_view-function-selection.png +share/icons/hicolor/16x16/stock/table/stock_alignment-bottom.png +share/icons/hicolor/16x16/stock/table/stock_alignment-centered-vertically.png +share/icons/hicolor/16x16/stock/table/stock_alignment-centered.png +share/icons/hicolor/16x16/stock/table/stock_alignment-left.png +share/icons/hicolor/16x16/stock/table/stock_alignment-right.png +share/icons/hicolor/16x16/stock/table/stock_alignment-top.png +share/icons/hicolor/16x16/stock/table/stock_alignment.png +share/icons/hicolor/16x16/stock/table/stock_cell-align-bottom.png +share/icons/hicolor/16x16/stock/table/stock_cell-align-center.png +share/icons/hicolor/16x16/stock/table/stock_cell-align-top.png +share/icons/hicolor/16x16/stock/table/stock_choose-themes.png +share/icons/hicolor/16x16/stock/table/stock_datapilot.png +share/icons/hicolor/16x16/stock/table/stock_delete-column.png +share/icons/hicolor/16x16/stock/table/stock_delete-row.png +share/icons/hicolor/16x16/stock/table/stock_exchange-columns.png +share/icons/hicolor/16x16/stock/table/stock_exchange-rows.png +share/icons/hicolor/16x16/stock/table/stock_group-cells.png +share/icons/hicolor/16x16/stock/table/stock_insert-cells-down.png +share/icons/hicolor/16x16/stock/table/stock_insert-cells-right.png +share/icons/hicolor/16x16/stock/table/stock_insert-cells.png +share/icons/hicolor/16x16/stock/table/stock_insert-columns.png +share/icons/hicolor/16x16/stock/table/stock_insert-names-define.png +share/icons/hicolor/16x16/stock/table/stock_insert-rows.png +share/icons/hicolor/16x16/stock/table/stock_select-column.png +share/icons/hicolor/16x16/stock/table/stock_select-row.png +share/icons/hicolor/16x16/stock/table/stock_select-table.png +share/icons/hicolor/16x16/stock/table/stock_sort-table-column-ascending.png +share/icons/hicolor/16x16/stock/table/stock_sort-table-row-ascending.png +share/icons/hicolor/16x16/stock/table/stock_table-align-bottom.png +share/icons/hicolor/16x16/stock/table/stock_table-align-center.png +share/icons/hicolor/16x16/stock/table/stock_table-align-top.png +share/icons/hicolor/16x16/stock/table/stock_table-borders.png +share/icons/hicolor/16x16/stock/table/stock_table-combine.png +share/icons/hicolor/16x16/stock/table/stock_table-fit-height.png +share/icons/hicolor/16x16/stock/table/stock_table-fit-width.png +share/icons/hicolor/16x16/stock/table/stock_table-fixed-proportional.png +share/icons/hicolor/16x16/stock/table/stock_table-fixed.png +share/icons/hicolor/16x16/stock/table/stock_table-line-color.png +share/icons/hicolor/16x16/stock/table/stock_table-line-style.png +share/icons/hicolor/16x16/stock/table/stock_table-optimize.png +share/icons/hicolor/16x16/stock/table/stock_table-same-height.png +share/icons/hicolor/16x16/stock/table/stock_table-same-width.png +share/icons/hicolor/16x16/stock/table/stock_table-split.png +share/icons/hicolor/16x16/stock/table/stock_table-variable.png +share/icons/hicolor/16x16/stock/table/stock_table_borders.png +share/icons/hicolor/16x16/stock/table/stock_table_fill.png +share/icons/hicolor/16x16/stock/table/stock_ungroup-cells.png +share/icons/hicolor/16x16/stock/text/stock_autoformat.png +share/icons/hicolor/16x16/stock/text/stock_autospellcheck.png +share/icons/hicolor/16x16/stock/text/stock_autotext.png +share/icons/hicolor/16x16/stock/text/stock_chart-scale-text.png +share/icons/hicolor/16x16/stock/text/stock_decrease-font.png +share/icons/hicolor/16x16/stock/text/stock_directcursor.png +share/icons/hicolor/16x16/stock/text/stock_draw-text-animation.png +share/icons/hicolor/16x16/stock/text/stock_draw-text-frame.png +share/icons/hicolor/16x16/stock/text/stock_draw-text.png +share/icons/hicolor/16x16/stock/text/stock_draw-vertical-text-frame.png +share/icons/hicolor/16x16/stock/text/stock_draw-vertical-text.png +share/icons/hicolor/16x16/stock/text/stock_edit-contour.png +share/icons/hicolor/16x16/stock/text/stock_edit-headers-and-footers.png +share/icons/hicolor/16x16/stock/text/stock_effects-text.png +share/icons/hicolor/16x16/stock/text/stock_euro.png +share/icons/hicolor/16x16/stock/text/stock_font-formatting-toggle.png +share/icons/hicolor/16x16/stock/text/stock_font-size.png +share/icons/hicolor/16x16/stock/text/stock_font.png +share/icons/hicolor/16x16/stock/text/stock_fontwork-2dshadow.png +share/icons/hicolor/16x16/stock/text/stock_fontwork-3dshadow.png +share/icons/hicolor/16x16/stock/text/stock_fontwork-adaptation-off.png +share/icons/hicolor/16x16/stock/text/stock_fontwork-adaptation-rotate.png +share/icons/hicolor/16x16/stock/text/stock_fontwork-adaptation-slant-h.png +share/icons/hicolor/16x16/stock/text/stock_fontwork-adaptation-slant-v.png +share/icons/hicolor/16x16/stock/text/stock_fontwork-adaptation-straight.png +share/icons/hicolor/16x16/stock/text/stock_fontwork-align-fill.png +share/icons/hicolor/16x16/stock/text/stock_fontwork-noshadow.png +share/icons/hicolor/16x16/stock/text/stock_fontwork-preview-spline.png +share/icons/hicolor/16x16/stock/text/stock_fontwork-reverse-text-flow.png +share/icons/hicolor/16x16/stock/text/stock_fontwork-shadow-angle.png +share/icons/hicolor/16x16/stock/text/stock_fontwork-shadow-length.png +share/icons/hicolor/16x16/stock/text/stock_fontwork-shadow-x-offset.png +share/icons/hicolor/16x16/stock/text/stock_fontwork-shadow-y-offset.png +share/icons/hicolor/16x16/stock/text/stock_fontwork-spline-distance.png +share/icons/hicolor/16x16/stock/text/stock_fontwork-spline-indent.png +share/icons/hicolor/16x16/stock/text/stock_fontwork-text-border.png +share/icons/hicolor/16x16/stock/text/stock_fontwork.png +share/icons/hicolor/16x16/stock/text/stock_format-character.png +share/icons/hicolor/16x16/stock/text/stock_format-numbering-bullets.png +share/icons/hicolor/16x16/stock/text/stock_format-paragraph.png +share/icons/hicolor/16x16/stock/text/stock_increase-font.png +share/icons/hicolor/16x16/stock/text/stock_insert-caption.png +share/icons/hicolor/16x16/stock/text/stock_insert-cross-reference.png +share/icons/hicolor/16x16/stock/text/stock_insert-fields-author.png +share/icons/hicolor/16x16/stock/text/stock_insert-fields-subject.png +share/icons/hicolor/16x16/stock/text/stock_insert-fields-title.png +share/icons/hicolor/16x16/stock/text/stock_insert-footer.png +share/icons/hicolor/16x16/stock/text/stock_insert-header.png +share/icons/hicolor/16x16/stock/text/stock_insert_endnote.png +share/icons/hicolor/16x16/stock/text/stock_insert_footnote.png +share/icons/hicolor/16x16/stock/text/stock_insert_index_marker.png +share/icons/hicolor/16x16/stock/text/stock_insert_section.png +share/icons/hicolor/16x16/stock/text/stock_line-spacing-1.5.png +share/icons/hicolor/16x16/stock/text/stock_line-spacing-1.png +share/icons/hicolor/16x16/stock/text/stock_line-spacing-2.png +share/icons/hicolor/16x16/stock/text/stock_list-insert-unnumbered.png +share/icons/hicolor/16x16/stock/text/stock_list_bullet.png +share/icons/hicolor/16x16/stock/text/stock_list_enum-off.png +share/icons/hicolor/16x16/stock/text/stock_list_enum-restart.png +share/icons/hicolor/16x16/stock/text/stock_list_enum.png +share/icons/hicolor/16x16/stock/text/stock_nonprinting-chars.png +share/icons/hicolor/16x16/stock/text/stock_page-number.png +share/icons/hicolor/16x16/stock/text/stock_page-total-number.png +share/icons/hicolor/16x16/stock/text/stock_paragraph-spacing-decrease.png +share/icons/hicolor/16x16/stock/text/stock_paragraph-spacing-increase.png +share/icons/hicolor/16x16/stock/text/stock_select-all.png +share/icons/hicolor/16x16/stock/text/stock_spellcheck.png +share/icons/hicolor/16x16/stock/text/stock_styles-character-styles.png +share/icons/hicolor/16x16/stock/text/stock_styles-fill-format-mode.png +share/icons/hicolor/16x16/stock/text/stock_styles-frame-styles.png +share/icons/hicolor/16x16/stock/text/stock_styles-new-style-from-selection.png +share/icons/hicolor/16x16/stock/text/stock_styles-numbering-styles.png +share/icons/hicolor/16x16/stock/text/stock_styles-page-styles.png +share/icons/hicolor/16x16/stock/text/stock_styles-paragraph-styles.png +share/icons/hicolor/16x16/stock/text/stock_styles-update-style.png +share/icons/hicolor/16x16/stock/text/stock_subscript.png +share/icons/hicolor/16x16/stock/text/stock_superscript.png +share/icons/hicolor/16x16/stock/text/stock_text-direction-ltr.png +share/icons/hicolor/16x16/stock/text/stock_text-direction-ttb.png +share/icons/hicolor/16x16/stock/text/stock_text-double-click-to-edit.png +share/icons/hicolor/16x16/stock/text/stock_text-outline.png +share/icons/hicolor/16x16/stock/text/stock_text-quickedit.png +share/icons/hicolor/16x16/stock/text/stock_text-select-text-only.png +share/icons/hicolor/16x16/stock/text/stock_text-shadow.png +share/icons/hicolor/16x16/stock/text/stock_text-spacing.png +share/icons/hicolor/16x16/stock/text/stock_text-strikethrough.png +share/icons/hicolor/16x16/stock/text/stock_text_bold.png +share/icons/hicolor/16x16/stock/text/stock_text_center.png +share/icons/hicolor/16x16/stock/text/stock_text_color_background.png +share/icons/hicolor/16x16/stock/text/stock_text_color_foreground.png +share/icons/hicolor/16x16/stock/text/stock_text_color_hilight.png +share/icons/hicolor/16x16/stock/text/stock_text_indent.png +share/icons/hicolor/16x16/stock/text/stock_text_italic.png +share/icons/hicolor/16x16/stock/text/stock_text_justify.png +share/icons/hicolor/16x16/stock/text/stock_text_left.png +share/icons/hicolor/16x16/stock/text/stock_text_right.png +share/icons/hicolor/16x16/stock/text/stock_text_underlined-double.png +share/icons/hicolor/16x16/stock/text/stock_text_underlined.png +share/icons/hicolor/16x16/stock/text/stock_text_unindent.png +share/icons/hicolor/16x16/stock/text/stock_thesaurus.png +share/icons/hicolor/16x16/stock/text/stock_to-background.png +share/icons/hicolor/16x16/stock/text/stock_to-foreground.png +share/icons/hicolor/16x16/stock/text/stock_tools-hyphenation.png +share/icons/hicolor/16x16/stock/text/stock_update-fields.png +share/icons/hicolor/16x16/stock/text/stock_view-field-shadings.png +share/icons/hicolor/16x16/stock/text/stock_wrap-around.png +share/icons/hicolor/16x16/stock/text/stock_wrap-behind.png +share/icons/hicolor/16x16/stock/text/stock_wrap-contour.png +share/icons/hicolor/16x16/stock/text/stock_wrap-interrupt.png +share/icons/hicolor/16x16/stock/text/stock_wrap-left.png +share/icons/hicolor/16x16/stock/text/stock_wrap-optimal.png +share/icons/hicolor/16x16/stock/text/stock_wrap-right.png +share/icons/hicolor/192x192/apps/gnome-globe.png +share/icons/hicolor/24x24/apps/advanced-directory.png +share/icons/hicolor/24x24/apps/applets-screenshooter.png +share/icons/hicolor/24x24/apps/blender.png +share/icons/hicolor/24x24/apps/config-language.png +share/icons/hicolor/24x24/apps/gnome-amusements.png +share/icons/hicolor/24x24/apps/gnome-devel.png +share/icons/hicolor/24x24/apps/gnome-favorites.png +share/icons/hicolor/24x24/apps/gnome-globe.png +share/icons/hicolor/24x24/apps/gnome-graphics.png +share/icons/hicolor/24x24/apps/gnome-joystick.png +share/icons/hicolor/24x24/apps/gnome-lockscreen.png +share/icons/hicolor/24x24/apps/gnome-multimedia.png +share/icons/hicolor/24x24/apps/gnome-searchtool.png +share/icons/hicolor/24x24/apps/gnome-settings.png +share/icons/hicolor/24x24/apps/gnome-status.png +share/icons/hicolor/24x24/apps/gnome-terminal.png +share/icons/hicolor/24x24/apps/panel-notification-area.png +share/icons/hicolor/24x24/apps/panel-window-list.png +share/icons/hicolor/24x24/apps/panel-window-menu.png +share/icons/hicolor/24x24/stock/chart/stock_chart-autoformat.png +share/icons/hicolor/24x24/stock/chart/stock_chart-data-in-columns.png +share/icons/hicolor/24x24/stock/chart/stock_chart-data-in-rows.png +share/icons/hicolor/24x24/stock/chart/stock_chart-edit-type.png +share/icons/hicolor/24x24/stock/chart/stock_chart-reorganize.png +share/icons/hicolor/24x24/stock/chart/stock_chart-toggle-axes-title.png +share/icons/hicolor/24x24/stock/chart/stock_chart-toggle-axes.png +share/icons/hicolor/24x24/stock/chart/stock_chart-toggle-hgrid.png +share/icons/hicolor/24x24/stock/chart/stock_chart-toggle-legend.png +share/icons/hicolor/24x24/stock/chart/stock_chart-toggle-title.png +share/icons/hicolor/24x24/stock/chart/stock_chart-toggle-vgrid.png +share/icons/hicolor/24x24/stock/chart/stock_glue.png +share/icons/hicolor/24x24/stock/chart/stock_gluepoint-down.png +share/icons/hicolor/24x24/stock/chart/stock_gluepoint-horizontal-center.png +share/icons/hicolor/24x24/stock/chart/stock_gluepoint-horizontal-left.png +share/icons/hicolor/24x24/stock/chart/stock_gluepoint-horizontal-right.png +share/icons/hicolor/24x24/stock/chart/stock_gluepoint-left.png +share/icons/hicolor/24x24/stock/chart/stock_gluepoint-relative.png +share/icons/hicolor/24x24/stock/chart/stock_gluepoint-right.png +share/icons/hicolor/24x24/stock/chart/stock_gluepoint-up.png +share/icons/hicolor/24x24/stock/chart/stock_gluepoint-vertical-bottom.png +share/icons/hicolor/24x24/stock/chart/stock_gluepoint-vertical-center.png +share/icons/hicolor/24x24/stock/chart/stock_gluepoint-vertical-top.png +share/icons/hicolor/24x24/stock/chart/stock_insert-chart.png +share/icons/hicolor/24x24/stock/code/stock_compile.png +share/icons/hicolor/24x24/stock/code/stock_error-next-16.png +share/icons/hicolor/24x24/stock/code/stock_error-previous-16.png +share/icons/hicolor/24x24/stock/code/stock_macro-check-brackets.png +share/icons/hicolor/24x24/stock/code/stock_macro-insert-breakpoint.png +share/icons/hicolor/24x24/stock/code/stock_macro-insert.png +share/icons/hicolor/24x24/stock/code/stock_macro-jump-back.png +share/icons/hicolor/24x24/stock/code/stock_macro-objects.png +share/icons/hicolor/24x24/stock/code/stock_macro-organizer.png +share/icons/hicolor/24x24/stock/code/stock_macro-stop-after-command.png +share/icons/hicolor/24x24/stock/code/stock_macro-stop-after-procedure.png +share/icons/hicolor/24x24/stock/code/stock_macro-stop-watching.png +share/icons/hicolor/24x24/stock/code/stock_macro-watch-variable.png +share/icons/hicolor/24x24/stock/code/stock_record-macro.png +share/icons/hicolor/24x24/stock/code/stock_run-macro.png +share/icons/hicolor/24x24/stock/code/stock_script.png +share/icons/hicolor/24x24/stock/code/stock_tools-macro.png +share/icons/hicolor/24x24/stock/data/stock_add-decimal-place.png +share/icons/hicolor/24x24/stock/data/stock_advanced-filter.png +share/icons/hicolor/24x24/stock/data/stock_autofilter.png +share/icons/hicolor/24x24/stock/data/stock_data-delete-record.png +share/icons/hicolor/24x24/stock/data/stock_data-explorer.png +share/icons/hicolor/24x24/stock/data/stock_data-first.png +share/icons/hicolor/24x24/stock/data/stock_data-last.png +share/icons/hicolor/24x24/stock/data/stock_data-linked-table.png +share/icons/hicolor/24x24/stock/data/stock_data-new-record.png +share/icons/hicolor/24x24/stock/data/stock_data-next.png +share/icons/hicolor/24x24/stock/data/stock_data-previous.png +share/icons/hicolor/24x24/stock/data/stock_data-save.png +share/icons/hicolor/24x24/stock/data/stock_data-sources.png +share/icons/hicolor/24x24/stock/data/stock_data-undo.png +share/icons/hicolor/24x24/stock/data/stock_delete-autofilter.png +share/icons/hicolor/24x24/stock/data/stock_delete-decimal-place.png +share/icons/hicolor/24x24/stock/data/stock_filter-data-by-criteria.png +share/icons/hicolor/24x24/stock/data/stock_filter-navigator.png +share/icons/hicolor/24x24/stock/data/stock_filters.png +share/icons/hicolor/24x24/stock/data/stock_format-default.png +share/icons/hicolor/24x24/stock/data/stock_format-percent.png +share/icons/hicolor/24x24/stock/data/stock_format-scientific.png +share/icons/hicolor/24x24/stock/data/stock_function-autopilot.png +share/icons/hicolor/24x24/stock/data/stock_goal-seek.png +share/icons/hicolor/24x24/stock/data/stock_insert-fields.png +share/icons/hicolor/24x24/stock/data/stock_lock-broken.png +share/icons/hicolor/24x24/stock/data/stock_lock-ok.png +share/icons/hicolor/24x24/stock/data/stock_lock.png +share/icons/hicolor/24x24/stock/data/stock_record-number.png +share/icons/hicolor/24x24/stock/data/stock_signature-bad.png +share/icons/hicolor/24x24/stock/data/stock_signature-ok.png +share/icons/hicolor/24x24/stock/data/stock_signature.png +share/icons/hicolor/24x24/stock/data/stock_sort-ascending.png +share/icons/hicolor/24x24/stock/data/stock_sort-column-ascending.png +share/icons/hicolor/24x24/stock/data/stock_sort-criteria.png +share/icons/hicolor/24x24/stock/data/stock_sort-descending.png +share/icons/hicolor/24x24/stock/data/stock_sort-row-ascending.png +share/icons/hicolor/24x24/stock/data/stock_standard-filter.png +share/icons/hicolor/24x24/stock/data/stock_sum.png +share/icons/hicolor/24x24/stock/data/stock_update-data.png +share/icons/hicolor/24x24/stock/document/stock_attach.png +share/icons/hicolor/24x24/stock/document/stock_new-drawing.png +share/icons/hicolor/24x24/stock/document/stock_new-formula.png +share/icons/hicolor/24x24/stock/document/stock_new-html.png +share/icons/hicolor/24x24/stock/document/stock_new-labels.png +share/icons/hicolor/24x24/stock/document/stock_new-master-document.png +share/icons/hicolor/24x24/stock/document/stock_new-presentation.png +share/icons/hicolor/24x24/stock/document/stock_new-spreadsheet.png +share/icons/hicolor/24x24/stock/document/stock_new-template.png +share/icons/hicolor/24x24/stock/document/stock_new-text.png +share/icons/hicolor/24x24/stock/document/stock_new.png +share/icons/hicolor/24x24/stock/document/stock_preview-four-pages.png +share/icons/hicolor/24x24/stock/document/stock_preview-two-pages.png +share/icons/hicolor/24x24/stock/document/stock_print-layout.png +share/icons/hicolor/24x24/stock/document/stock_print-options.png +share/icons/hicolor/24x24/stock/document/stock_task-assigned-to.png +share/icons/hicolor/24x24/stock/document/stock_task-assigned.png +share/icons/hicolor/24x24/stock/document/stock_task-recurring.png +share/icons/hicolor/24x24/stock/document/stock_task.png +share/icons/hicolor/24x24/stock/document/stock_todo.png +share/icons/hicolor/24x24/stock/document/stock_view-html-source.png +share/icons/hicolor/24x24/stock/form/stock_form-activation-order.png +share/icons/hicolor/24x24/stock/form/stock_form-add-field.png +share/icons/hicolor/24x24/stock/form/stock_form-automatic-control-focus.png +share/icons/hicolor/24x24/stock/form/stock_form-autopilots.png +share/icons/hicolor/24x24/stock/form/stock_form-button.png +share/icons/hicolor/24x24/stock/form/stock_form-checkbox.png +share/icons/hicolor/24x24/stock/form/stock_form-combobox.png +share/icons/hicolor/24x24/stock/form/stock_form-control-properties.png +share/icons/hicolor/24x24/stock/form/stock_form-currency-field.png +share/icons/hicolor/24x24/stock/form/stock_form-date-field.png +share/icons/hicolor/24x24/stock/form/stock_form-design-mode.png +share/icons/hicolor/24x24/stock/form/stock_form-file-selection.png +share/icons/hicolor/24x24/stock/form/stock_form-formatted-field.png +share/icons/hicolor/24x24/stock/form/stock_form-frame.png +share/icons/hicolor/24x24/stock/form/stock_form-image-button.png +share/icons/hicolor/24x24/stock/form/stock_form-image-control.png +share/icons/hicolor/24x24/stock/form/stock_form-label.png +share/icons/hicolor/24x24/stock/form/stock_form-letter-dialog.png +share/icons/hicolor/24x24/stock/form/stock_form-line-horizontal.png +share/icons/hicolor/24x24/stock/form/stock_form-line-vertical.png +share/icons/hicolor/24x24/stock/form/stock_form-listbox.png +share/icons/hicolor/24x24/stock/form/stock_form-navigator.png +share/icons/hicolor/24x24/stock/form/stock_form-numerical-field.png +share/icons/hicolor/24x24/stock/form/stock_form-open-in-design-mode.png +share/icons/hicolor/24x24/stock/form/stock_form-pattern-field.png +share/icons/hicolor/24x24/stock/form/stock_form-progressbar.png +share/icons/hicolor/24x24/stock/form/stock_form-properties.png +share/icons/hicolor/24x24/stock/form/stock_form-radio.png +share/icons/hicolor/24x24/stock/form/stock_form-table-control.png +share/icons/hicolor/24x24/stock/form/stock_form-text-box.png +share/icons/hicolor/24x24/stock/form/stock_form-time-field.png +share/icons/hicolor/24x24/stock/form/stock_insert-form.png +share/icons/hicolor/24x24/stock/form/stock_macro-controls.png +share/icons/hicolor/24x24/stock/form/stock_show-form-dialog.png +share/icons/hicolor/24x24/stock/form/stock_show-hidden-controls.png +share/icons/hicolor/24x24/stock/form/stock_view-fields.png +share/icons/hicolor/24x24/stock/generic/stock_about.png +share/icons/hicolor/24x24/stock/generic/stock_active.png +share/icons/hicolor/24x24/stock/generic/stock_allow-effects.png +share/icons/hicolor/24x24/stock/generic/stock_anchor.png +share/icons/hicolor/24x24/stock/generic/stock_animation.png +share/icons/hicolor/24x24/stock/generic/stock_autopilot-24.png +share/icons/hicolor/24x24/stock/generic/stock_book_blue.png +share/icons/hicolor/24x24/stock/generic/stock_book_green.png +share/icons/hicolor/24x24/stock/generic/stock_book_open.png +share/icons/hicolor/24x24/stock/generic/stock_book_red.png +share/icons/hicolor/24x24/stock/generic/stock_book_yellow.png +share/icons/hicolor/24x24/stock/generic/stock_briefcase.png +share/icons/hicolor/24x24/stock/generic/stock_calc-accept.png +share/icons/hicolor/24x24/stock/generic/stock_calc-cancel.png +share/icons/hicolor/24x24/stock/generic/stock_calendar-view-day.png +share/icons/hicolor/24x24/stock/generic/stock_calendar-view-list.png +share/icons/hicolor/24x24/stock/generic/stock_calendar-view-month.png +share/icons/hicolor/24x24/stock/generic/stock_calendar-view-week.png +share/icons/hicolor/24x24/stock/generic/stock_calendar-view-work-week.png +share/icons/hicolor/24x24/stock/generic/stock_calendar-view-year.png +share/icons/hicolor/24x24/stock/generic/stock_calendar.png +share/icons/hicolor/24x24/stock/generic/stock_cell-phone.png +share/icons/hicolor/24x24/stock/generic/stock_close.png +share/icons/hicolor/24x24/stock/generic/stock_copy.png +share/icons/hicolor/24x24/stock/generic/stock_cut.png +share/icons/hicolor/24x24/stock/generic/stock_delete.png +share/icons/hicolor/24x24/stock/generic/stock_dialog-error.png +share/icons/hicolor/24x24/stock/generic/stock_dialog-info.png +share/icons/hicolor/24x24/stock/generic/stock_dialog-warning.png +share/icons/hicolor/24x24/stock/generic/stock_edit.png +share/icons/hicolor/24x24/stock/generic/stock_equals.png +share/icons/hicolor/24x24/stock/generic/stock_example.png +share/icons/hicolor/24x24/stock/generic/stock_exit.png +share/icons/hicolor/24x24/stock/generic/stock_extended-help.png +share/icons/hicolor/24x24/stock/generic/stock_file-properties.png +share/icons/hicolor/24x24/stock/generic/stock_flip-horizontally.png +share/icons/hicolor/24x24/stock/generic/stock_flip-vertically.png +share/icons/hicolor/24x24/stock/generic/stock_folder-copy.png +share/icons/hicolor/24x24/stock/generic/stock_folder-move.png +share/icons/hicolor/24x24/stock/generic/stock_folder-properties.png +share/icons/hicolor/24x24/stock/generic/stock_folder.png +share/icons/hicolor/24x24/stock/generic/stock_format-page.png +share/icons/hicolor/24x24/stock/generic/stock_fullscreen.png +share/icons/hicolor/24x24/stock/generic/stock_help-agent.png +share/icons/hicolor/24x24/stock/generic/stock_help-chat.png +share/icons/hicolor/24x24/stock/generic/stock_help.png +share/icons/hicolor/24x24/stock/generic/stock_home.png +share/icons/hicolor/24x24/stock/generic/stock_id.png +share/icons/hicolor/24x24/stock/generic/stock_keyring.png +share/icons/hicolor/24x24/stock/generic/stock_landline-phone.png +share/icons/hicolor/24x24/stock/generic/stock_mark.png +share/icons/hicolor/24x24/stock/generic/stock_new-24h-appointment.png +share/icons/hicolor/24x24/stock/generic/stock_new-appointment.png +share/icons/hicolor/24x24/stock/generic/stock_new-meeting.png +share/icons/hicolor/24x24/stock/generic/stock_news.png +share/icons/hicolor/24x24/stock/generic/stock_not.png +share/icons/hicolor/24x24/stock/generic/stock_notebook.png +share/icons/hicolor/24x24/stock/generic/stock_notes.png +share/icons/hicolor/24x24/stock/generic/stock_paste.png +share/icons/hicolor/24x24/stock/generic/stock_people.png +share/icons/hicolor/24x24/stock/generic/stock_person.png +share/icons/hicolor/24x24/stock/generic/stock_presentation-box.png +share/icons/hicolor/24x24/stock/generic/stock_properties.png +share/icons/hicolor/24x24/stock/generic/stock_redo.png +share/icons/hicolor/24x24/stock/generic/stock_refresh.png +share/icons/hicolor/24x24/stock/generic/stock_scores.png +share/icons/hicolor/24x24/stock/generic/stock_search.png +share/icons/hicolor/24x24/stock/generic/stock_send-fax.png +share/icons/hicolor/24x24/stock/generic/stock_show-all.png +share/icons/hicolor/24x24/stock/generic/stock_stop.png +share/icons/hicolor/24x24/stock/generic/stock_styles.png +share/icons/hicolor/24x24/stock/generic/stock_summary.png +share/icons/hicolor/24x24/stock/generic/stock_test-mode.png +share/icons/hicolor/24x24/stock/generic/stock_timer.png +share/icons/hicolor/24x24/stock/generic/stock_timer_stopped.png +share/icons/hicolor/24x24/stock/generic/stock_timezone.png +share/icons/hicolor/24x24/stock/generic/stock_toilet-paper.png +share/icons/hicolor/24x24/stock/generic/stock_trash_full.png +share/icons/hicolor/24x24/stock/generic/stock_undelete.png +share/icons/hicolor/24x24/stock/generic/stock_undo.png +share/icons/hicolor/24x24/stock/generic/stock_unknown.png +share/icons/hicolor/24x24/stock/generic/stock_web-calendar.png +share/icons/hicolor/24x24/stock/generic/stock_web-support.png +share/icons/hicolor/24x24/stock/image/stock_3d-color-picker.png +share/icons/hicolor/24x24/stock/image/stock_3d-effects.png +share/icons/hicolor/24x24/stock/image/stock_arrowstyle.png +share/icons/hicolor/24x24/stock/image/stock_brightness.png +share/icons/hicolor/24x24/stock/image/stock_bucketfill.png +share/icons/hicolor/24x24/stock/image/stock_channel-blue.png +share/icons/hicolor/24x24/stock/image/stock_channel-green.png +share/icons/hicolor/24x24/stock/image/stock_channel-red.png +share/icons/hicolor/24x24/stock/image/stock_contrast.png +share/icons/hicolor/24x24/stock/image/stock_crop.png +share/icons/hicolor/24x24/stock/image/stock_display-grid.png +share/icons/hicolor/24x24/stock/image/stock_distort.png +share/icons/hicolor/24x24/stock/image/stock_draw-arc.png +share/icons/hicolor/24x24/stock/image/stock_draw-callouts.png +share/icons/hicolor/24x24/stock/image/stock_draw-circle-arc.png +share/icons/hicolor/24x24/stock/image/stock_draw-circle-pie-unfilled.png +share/icons/hicolor/24x24/stock/image/stock_draw-circle-pie.png +share/icons/hicolor/24x24/stock/image/stock_draw-circle-segment-unfilled.png +share/icons/hicolor/24x24/stock/image/stock_draw-circle-segment.png +share/icons/hicolor/24x24/stock/image/stock_draw-circle-unfilled.png +share/icons/hicolor/24x24/stock/image/stock_draw-circle.png +share/icons/hicolor/24x24/stock/image/stock_draw-cone.png +share/icons/hicolor/24x24/stock/image/stock_draw-connector-ends-with-arrow.png +share/icons/hicolor/24x24/stock/image/stock_draw-connector-ends-with-circle.png +share/icons/hicolor/24x24/stock/image/stock_draw-connector-starts-with-arrow.png +share/icons/hicolor/24x24/stock/image/stock_draw-connector-starts-with-circle.png +share/icons/hicolor/24x24/stock/image/stock_draw-connector-with-arrows.png +share/icons/hicolor/24x24/stock/image/stock_draw-connector-with-circles.png +share/icons/hicolor/24x24/stock/image/stock_draw-connector.png +share/icons/hicolor/24x24/stock/image/stock_draw-cube.png +share/icons/hicolor/24x24/stock/image/stock_draw-curve-filled.png +share/icons/hicolor/24x24/stock/image/stock_draw-curve.png +share/icons/hicolor/24x24/stock/image/stock_draw-curved-connector-ends-with-arrow.png +share/icons/hicolor/24x24/stock/image/stock_draw-curved-connector-ends-with-circle.png +share/icons/hicolor/24x24/stock/image/stock_draw-curved-connector-starts-with-arrow.png +share/icons/hicolor/24x24/stock/image/stock_draw-curved-connector-starts-with-circle.png +share/icons/hicolor/24x24/stock/image/stock_draw-curved-connector-with-arrows.png +share/icons/hicolor/24x24/stock/image/stock_draw-curved-connector-with-circles.png +share/icons/hicolor/24x24/stock/image/stock_draw-curved-connector.png +share/icons/hicolor/24x24/stock/image/stock_draw-cylinder.png +share/icons/hicolor/24x24/stock/image/stock_draw-dimension-line.png +share/icons/hicolor/24x24/stock/image/stock_draw-ellipse-pie-unfilled.png +share/icons/hicolor/24x24/stock/image/stock_draw-ellipse-pie.png +share/icons/hicolor/24x24/stock/image/stock_draw-ellipse-segment-unfilled.png +share/icons/hicolor/24x24/stock/image/stock_draw-ellipse-segment.png +share/icons/hicolor/24x24/stock/image/stock_draw-ellipse-unfilled.png +share/icons/hicolor/24x24/stock/image/stock_draw-ellipse.png +share/icons/hicolor/24x24/stock/image/stock_draw-freeform-line-filled.png +share/icons/hicolor/24x24/stock/image/stock_draw-freeform-line.png +share/icons/hicolor/24x24/stock/image/stock_draw-half-sphere.png +share/icons/hicolor/24x24/stock/image/stock_draw-line-45.png +share/icons/hicolor/24x24/stock/image/stock_draw-line-connector-ends-with-arrow.png +share/icons/hicolor/24x24/stock/image/stock_draw-line-connector-ends-with-circle.png +share/icons/hicolor/24x24/stock/image/stock_draw-line-connector-starts-with-arrow.png +share/icons/hicolor/24x24/stock/image/stock_draw-line-connector-starts-with-circle.png +share/icons/hicolor/24x24/stock/image/stock_draw-line-connector-with-arrows.png +share/icons/hicolor/24x24/stock/image/stock_draw-line-connector-with-circles.png +share/icons/hicolor/24x24/stock/image/stock_draw-line-connector.png +share/icons/hicolor/24x24/stock/image/stock_draw-line-ends-with-arrow.png +share/icons/hicolor/24x24/stock/image/stock_draw-line-starts-with-arrow.png +share/icons/hicolor/24x24/stock/image/stock_draw-line-with-arrow-circle.png +share/icons/hicolor/24x24/stock/image/stock_draw-line-with-arrow-square.png +share/icons/hicolor/24x24/stock/image/stock_draw-line-with-arrows.png +share/icons/hicolor/24x24/stock/image/stock_draw-line-with-circle-arrow.png +share/icons/hicolor/24x24/stock/image/stock_draw-line-with-square-arrow.png +share/icons/hicolor/24x24/stock/image/stock_draw-line.png +share/icons/hicolor/24x24/stock/image/stock_draw-polygon-45-filled.png +share/icons/hicolor/24x24/stock/image/stock_draw-polygon-45.png +share/icons/hicolor/24x24/stock/image/stock_draw-polygon-filled.png +share/icons/hicolor/24x24/stock/image/stock_draw-polygon.png +share/icons/hicolor/24x24/stock/image/stock_draw-pyramid.png +share/icons/hicolor/24x24/stock/image/stock_draw-rectangle-unfilled.png +share/icons/hicolor/24x24/stock/image/stock_draw-rectangle.png +share/icons/hicolor/24x24/stock/image/stock_draw-rounded-rectangle-unfilled.png +share/icons/hicolor/24x24/stock/image/stock_draw-rounded-rectangle.png +share/icons/hicolor/24x24/stock/image/stock_draw-rounded-square-unfilled.png +share/icons/hicolor/24x24/stock/image/stock_draw-rounded-square.png +share/icons/hicolor/24x24/stock/image/stock_draw-selection.png +share/icons/hicolor/24x24/stock/image/stock_draw-shell.png +share/icons/hicolor/24x24/stock/image/stock_draw-sphere.png +share/icons/hicolor/24x24/stock/image/stock_draw-square-unfilled.png +share/icons/hicolor/24x24/stock/image/stock_draw-square.png +share/icons/hicolor/24x24/stock/image/stock_draw-straight-connector-ends-with-arrow.png +share/icons/hicolor/24x24/stock/image/stock_draw-straight-connector-ends-with-circle.png +share/icons/hicolor/24x24/stock/image/stock_draw-straight-connector-starts-with-arrow.png +share/icons/hicolor/24x24/stock/image/stock_draw-straight-connector-starts-with-circle.png +share/icons/hicolor/24x24/stock/image/stock_draw-straight-connector-with-arrows.png +share/icons/hicolor/24x24/stock/image/stock_draw-straight-connector-with-circles.png +share/icons/hicolor/24x24/stock/image/stock_draw-straight-connector.png +share/icons/hicolor/24x24/stock/image/stock_draw-torus.png +share/icons/hicolor/24x24/stock/image/stock_draw-vertical-callouts.png +share/icons/hicolor/24x24/stock/image/stock_edit-points.png +share/icons/hicolor/24x24/stock/image/stock_filters-aging.png +share/icons/hicolor/24x24/stock/image/stock_filters-charcoal.png +share/icons/hicolor/24x24/stock/image/stock_filters-invert.png +share/icons/hicolor/24x24/stock/image/stock_filters-pixelize.png +share/icons/hicolor/24x24/stock/image/stock_filters-pop-art.png +share/icons/hicolor/24x24/stock/image/stock_filters-posterize.png +share/icons/hicolor/24x24/stock/image/stock_filters-relief.png +share/icons/hicolor/24x24/stock/image/stock_filters-remove-noise.png +share/icons/hicolor/24x24/stock/image/stock_filters-sharpen.png +share/icons/hicolor/24x24/stock/image/stock_filters-smooth.png +share/icons/hicolor/24x24/stock/image/stock_filters-solarize.png +share/icons/hicolor/24x24/stock/image/stock_flip.png +share/icons/hicolor/24x24/stock/image/stock_gamma.png +share/icons/hicolor/24x24/stock/image/stock_gradient.png +share/icons/hicolor/24x24/stock/image/stock_graphics-align-bottom.png +share/icons/hicolor/24x24/stock/image/stock_graphics-align-center.png +share/icons/hicolor/24x24/stock/image/stock_graphics-align-centered.png +share/icons/hicolor/24x24/stock/image/stock_graphics-align-left.png +share/icons/hicolor/24x24/stock/image/stock_graphics-align-right.png +share/icons/hicolor/24x24/stock/image/stock_graphics-align-top.png +share/icons/hicolor/24x24/stock/image/stock_guides.png +share/icons/hicolor/24x24/stock/image/stock_imagemap-editor.png +share/icons/hicolor/24x24/stock/image/stock_insert_image.png +share/icons/hicolor/24x24/stock/image/stock_linepen.png +share/icons/hicolor/24x24/stock/image/stock_modify-layout.png +share/icons/hicolor/24x24/stock/image/stock_node-add.png +share/icons/hicolor/24x24/stock/image/stock_node-close-path.png +share/icons/hicolor/24x24/stock/image/stock_node-convert.png +share/icons/hicolor/24x24/stock/image/stock_node-corner-to-smooth.png +share/icons/hicolor/24x24/stock/image/stock_node-corner.png +share/icons/hicolor/24x24/stock/image/stock_node-curve-split.png +share/icons/hicolor/24x24/stock/image/stock_node-delete.png +share/icons/hicolor/24x24/stock/image/stock_node-mark-for-deletion.png +share/icons/hicolor/24x24/stock/image/stock_node-move.png +share/icons/hicolor/24x24/stock/image/stock_node-smooth-to-symmetrical.png +share/icons/hicolor/24x24/stock/image/stock_placeholder-graphic.png +share/icons/hicolor/24x24/stock/image/stock_placeholder-line-contour.png +share/icons/hicolor/24x24/stock/image/stock_placeholder-picture.png +share/icons/hicolor/24x24/stock/image/stock_placeholder-text.png +share/icons/hicolor/24x24/stock/image/stock_quickmask.png +share/icons/hicolor/24x24/stock/image/stock_rotate-3d.png +share/icons/hicolor/24x24/stock/image/stock_rotate.png +share/icons/hicolor/24x24/stock/image/stock_rotation-mode.png +share/icons/hicolor/24x24/stock/image/stock_shadow.png +share/icons/hicolor/24x24/stock/image/stock_show-draw-functions.png +share/icons/hicolor/24x24/stock/image/stock_toggle-graphics.png +share/icons/hicolor/24x24/stock/io/stock_bluetooth.png +share/icons/hicolor/24x24/stock/io/stock_export.png +share/icons/hicolor/24x24/stock/io/stock_insert-file.png +share/icons/hicolor/24x24/stock/io/stock_network-printer.png +share/icons/hicolor/24x24/stock/io/stock_open.png +share/icons/hicolor/24x24/stock/io/stock_print-driver.png +share/icons/hicolor/24x24/stock/io/stock_print-preview-print.png +share/icons/hicolor/24x24/stock/io/stock_print-preview.png +share/icons/hicolor/24x24/stock/io/stock_print-setup.png +share/icons/hicolor/24x24/stock/io/stock_print.png +share/icons/hicolor/24x24/stock/io/stock_printers.png +share/icons/hicolor/24x24/stock/io/stock_reload.png +share/icons/hicolor/24x24/stock/io/stock_save-pdf.png +share/icons/hicolor/24x24/stock/io/stock_save-template.png +share/icons/hicolor/24x24/stock/io/stock_save.png +share/icons/hicolor/24x24/stock/io/stock_save_as.png +share/icons/hicolor/24x24/stock/media/stock_effects-sound.png +share/icons/hicolor/24x24/stock/media/stock_insert-video-plugin.png +share/icons/hicolor/24x24/stock/media/stock_line_in.png +share/icons/hicolor/24x24/stock/media/stock_media-fwd.png +share/icons/hicolor/24x24/stock/media/stock_media-next.png +share/icons/hicolor/24x24/stock/media/stock_media-pause.png +share/icons/hicolor/24x24/stock/media/stock_media-play.png +share/icons/hicolor/24x24/stock/media/stock_media-prev.png +share/icons/hicolor/24x24/stock/media/stock_media-rec.png +share/icons/hicolor/24x24/stock/media/stock_media-rew.png +share/icons/hicolor/24x24/stock/media/stock_media-shuffle.png +share/icons/hicolor/24x24/stock/media/stock_media-stop.png +share/icons/hicolor/24x24/stock/media/stock_mic.png +share/icons/hicolor/24x24/stock/media/stock_midi.png +share/icons/hicolor/24x24/stock/media/stock_music-library.png +share/icons/hicolor/24x24/stock/media/stock_playlist.png +share/icons/hicolor/24x24/stock/media/stock_repeat.png +share/icons/hicolor/24x24/stock/media/stock_smart-playlist.png +share/icons/hicolor/24x24/stock/media/stock_volume.png +share/icons/hicolor/24x24/stock/navigation/stock_bottom.png +share/icons/hicolor/24x24/stock/navigation/stock_down-with-subpoints.png +share/icons/hicolor/24x24/stock/navigation/stock_down.png +share/icons/hicolor/24x24/stock/navigation/stock_first-page.png +share/icons/hicolor/24x24/stock/navigation/stock_first.png +share/icons/hicolor/24x24/stock/navigation/stock_last-page.png +share/icons/hicolor/24x24/stock/navigation/stock_last.png +share/icons/hicolor/24x24/stock/navigation/stock_left-with-subpoints.png +share/icons/hicolor/24x24/stock/navigation/stock_left.png +share/icons/hicolor/24x24/stock/navigation/stock_navigator.png +share/icons/hicolor/24x24/stock/navigation/stock_new-tab.png +share/icons/hicolor/24x24/stock/navigation/stock_next-page.png +share/icons/hicolor/24x24/stock/navigation/stock_next.png +share/icons/hicolor/24x24/stock/navigation/stock_previous-page.png +share/icons/hicolor/24x24/stock/navigation/stock_previous.png +share/icons/hicolor/24x24/stock/navigation/stock_right-with-subpoints.png +share/icons/hicolor/24x24/stock/navigation/stock_right.png +share/icons/hicolor/24x24/stock/navigation/stock_top.png +share/icons/hicolor/24x24/stock/navigation/stock_undo-history.png +share/icons/hicolor/24x24/stock/navigation/stock_up-with-subpoints.png +share/icons/hicolor/24x24/stock/navigation/stock_up.png +share/icons/hicolor/24x24/stock/navigation/stock_zoom-1.png +share/icons/hicolor/24x24/stock/navigation/stock_zoom-in.png +share/icons/hicolor/24x24/stock/navigation/stock_zoom-next.png +share/icons/hicolor/24x24/stock/navigation/stock_zoom-object.png +share/icons/hicolor/24x24/stock/navigation/stock_zoom-optimal.png +share/icons/hicolor/24x24/stock/navigation/stock_zoom-out.png +share/icons/hicolor/24x24/stock/navigation/stock_zoom-page-width.png +share/icons/hicolor/24x24/stock/navigation/stock_zoom-page.png +share/icons/hicolor/24x24/stock/navigation/stock_zoom-previous.png +share/icons/hicolor/24x24/stock/navigation/stock_zoom-shift.png +share/icons/hicolor/24x24/stock/navigation/stock_zoom.png +share/icons/hicolor/24x24/stock/net/stock_addressbook.png +share/icons/hicolor/24x24/stock/net/stock_appointment-reminder-excl.png +share/icons/hicolor/24x24/stock/net/stock_appointment-reminder.png +share/icons/hicolor/24x24/stock/net/stock_channel.png +share/icons/hicolor/24x24/stock/net/stock_connect-to-url.png +share/icons/hicolor/24x24/stock/net/stock_connect.png +share/icons/hicolor/24x24/stock/net/stock_contact-list.png +share/icons/hicolor/24x24/stock/net/stock_contact.png +share/icons/hicolor/24x24/stock/net/stock_directory-server.png +share/icons/hicolor/24x24/stock/net/stock_disconnect.png +share/icons/hicolor/24x24/stock/net/stock_exchange-connector.png +share/icons/hicolor/24x24/stock/net/stock_groupwise-connector.png +share/icons/hicolor/24x24/stock/net/stock_hyperlink-internet-search.png +share/icons/hicolor/24x24/stock/net/stock_hyperlink-target.png +share/icons/hicolor/24x24/stock/net/stock_hyperlink-toolbar.png +share/icons/hicolor/24x24/stock/net/stock_hyperlink.png +share/icons/hicolor/24x24/stock/net/stock_inbox.png +share/icons/hicolor/24x24/stock/net/stock_insert-url.png +share/icons/hicolor/24x24/stock/net/stock_internet.png +share/icons/hicolor/24x24/stock/net/stock_link.png +share/icons/hicolor/24x24/stock/net/stock_mail-compose.png +share/icons/hicolor/24x24/stock/net/stock_mail-copy.png +share/icons/hicolor/24x24/stock/net/stock_mail-filters-apply.png +share/icons/hicolor/24x24/stock/net/stock_mail-forward.png +share/icons/hicolor/24x24/stock/net/stock_mail-import.png +share/icons/hicolor/24x24/stock/net/stock_mail-merge.png +share/icons/hicolor/24x24/stock/net/stock_mail-move.png +share/icons/hicolor/24x24/stock/net/stock_mail-open-multiple.png +share/icons/hicolor/24x24/stock/net/stock_mail-open.png +share/icons/hicolor/24x24/stock/net/stock_mail-receive.png +share/icons/hicolor/24x24/stock/net/stock_mail-replied.png +share/icons/hicolor/24x24/stock/net/stock_mail-reply-to-all.png +share/icons/hicolor/24x24/stock/net/stock_mail-reply.png +share/icons/hicolor/24x24/stock/net/stock_mail-send-receive.png +share/icons/hicolor/24x24/stock/net/stock_mail-send.png +share/icons/hicolor/24x24/stock/net/stock_mail-unread-multiple.png +share/icons/hicolor/24x24/stock/net/stock_mail-unread.png +share/icons/hicolor/24x24/stock/net/stock_mail.png +share/icons/hicolor/24x24/stock/net/stock_not-spam.png +share/icons/hicolor/24x24/stock/net/stock_online-layout.png +share/icons/hicolor/24x24/stock/net/stock_outbox.png +share/icons/hicolor/24x24/stock/net/stock_post-message.png +share/icons/hicolor/24x24/stock/net/stock_sent-mail.png +share/icons/hicolor/24x24/stock/net/stock_spam.png +share/icons/hicolor/24x24/stock/net/stock_video-conferencing.png +share/icons/hicolor/24x24/stock/object/stock_add-bookmark.png +share/icons/hicolor/24x24/stock/object/stock_bookmark.png +share/icons/hicolor/24x24/stock/object/stock_bring-backward.png +share/icons/hicolor/24x24/stock/object/stock_bring-forward.png +share/icons/hicolor/24x24/stock/object/stock_create-with-attributes.png +share/icons/hicolor/24x24/stock/object/stock_delete-bookmark.png +share/icons/hicolor/24x24/stock/object/stock_edit-bookmark.png +share/icons/hicolor/24x24/stock/object/stock_effects-more-options.png +share/icons/hicolor/24x24/stock/object/stock_effects-object-colorize.png +share/icons/hicolor/24x24/stock/object/stock_effects-object-hide.png +share/icons/hicolor/24x24/stock/object/stock_effects-object.png +share/icons/hicolor/24x24/stock/object/stock_effects-play-in-full.png +share/icons/hicolor/24x24/stock/object/stock_effects-preview.png +share/icons/hicolor/24x24/stock/object/stock_effects.png +share/icons/hicolor/24x24/stock/object/stock_enter-group.png +share/icons/hicolor/24x24/stock/object/stock_exit-group.png +share/icons/hicolor/24x24/stock/object/stock_file-with-objects.png +share/icons/hicolor/24x24/stock/object/stock_format-object.png +share/icons/hicolor/24x24/stock/object/stock_formula-cursor.png +share/icons/hicolor/24x24/stock/object/stock_frame.png +share/icons/hicolor/24x24/stock/object/stock_group.png +share/icons/hicolor/24x24/stock/object/stock_handles-simple.png +share/icons/hicolor/24x24/stock/object/stock_insert-applet.png +share/icons/hicolor/24x24/stock/object/stock_insert-floating-frame.png +share/icons/hicolor/24x24/stock/object/stock_insert-gluepoint.png +share/icons/hicolor/24x24/stock/object/stock_insert-math-object.png +share/icons/hicolor/24x24/stock/object/stock_insert-note.png +share/icons/hicolor/24x24/stock/object/stock_insert-ole-object.png +share/icons/hicolor/24x24/stock/object/stock_insert-plugin.png +share/icons/hicolor/24x24/stock/object/stock_insert-single-column-text-frame.png +share/icons/hicolor/24x24/stock/object/stock_insert-slide.png +share/icons/hicolor/24x24/stock/object/stock_insert-sound-plugin.png +share/icons/hicolor/24x24/stock/object/stock_insert-text-frame.png +share/icons/hicolor/24x24/stock/object/stock_insert_graphic.png +share/icons/hicolor/24x24/stock/object/stock_insert_special_character.png +share/icons/hicolor/24x24/stock/object/stock_interaction.png +share/icons/hicolor/24x24/stock/object/stock_new-bcard.png +share/icons/hicolor/24x24/stock/object/stock_object-behind.png +share/icons/hicolor/24x24/stock/object/stock_object-infront.png +share/icons/hicolor/24x24/stock/object/stock_pin.png +share/icons/hicolor/24x24/stock/object/stock_position-size.png +share/icons/hicolor/24x24/stock/object/stock_reverse-order.png +share/icons/hicolor/24x24/stock/object/stock_slide-design.png +share/icons/hicolor/24x24/stock/object/stock_slide-duplicate.png +share/icons/hicolor/24x24/stock/object/stock_slide-expand.png +share/icons/hicolor/24x24/stock/object/stock_slide-reherse-timings.png +share/icons/hicolor/24x24/stock/object/stock_slide-show.png +share/icons/hicolor/24x24/stock/object/stock_slide-showhide.png +share/icons/hicolor/24x24/stock/object/stock_snap-grid.png +share/icons/hicolor/24x24/stock/object/stock_snap-guides.png +share/icons/hicolor/24x24/stock/object/stock_snap-margins.png +share/icons/hicolor/24x24/stock/object/stock_snap-object-points.png +share/icons/hicolor/24x24/stock/object/stock_snap-object.png +share/icons/hicolor/24x24/stock/object/stock_symbol-selection.png +share/icons/hicolor/24x24/stock/object/stock_to-3d-rotation-object.png +share/icons/hicolor/24x24/stock/object/stock_to-3d.png +share/icons/hicolor/24x24/stock/object/stock_to-bottom.png +share/icons/hicolor/24x24/stock/object/stock_to-curve.png +share/icons/hicolor/24x24/stock/object/stock_to-polygon.png +share/icons/hicolor/24x24/stock/object/stock_to-top.png +share/icons/hicolor/24x24/stock/object/stock_ungroup.png +share/icons/hicolor/24x24/stock/object/stock_unlink.png +share/icons/hicolor/24x24/stock/object/stock_view-function-selection.png +share/icons/hicolor/24x24/stock/table/stock_alignment-bottom.png +share/icons/hicolor/24x24/stock/table/stock_alignment-centered-vertically.png +share/icons/hicolor/24x24/stock/table/stock_alignment-centered.png +share/icons/hicolor/24x24/stock/table/stock_alignment-left.png +share/icons/hicolor/24x24/stock/table/stock_alignment-right.png +share/icons/hicolor/24x24/stock/table/stock_alignment-top.png +share/icons/hicolor/24x24/stock/table/stock_alignment.png +share/icons/hicolor/24x24/stock/table/stock_cell-align-bottom.png +share/icons/hicolor/24x24/stock/table/stock_cell-align-center.png +share/icons/hicolor/24x24/stock/table/stock_cell-align-top.png +share/icons/hicolor/24x24/stock/table/stock_choose-themes.png +share/icons/hicolor/24x24/stock/table/stock_datapilot.png +share/icons/hicolor/24x24/stock/table/stock_delete-column.png +share/icons/hicolor/24x24/stock/table/stock_delete-row.png +share/icons/hicolor/24x24/stock/table/stock_exchange-columns.png +share/icons/hicolor/24x24/stock/table/stock_exchange-rows.png +share/icons/hicolor/24x24/stock/table/stock_group-cells.png +share/icons/hicolor/24x24/stock/table/stock_insert-cells-down.png +share/icons/hicolor/24x24/stock/table/stock_insert-cells-right.png +share/icons/hicolor/24x24/stock/table/stock_insert-cells.png +share/icons/hicolor/24x24/stock/table/stock_insert-columns.png +share/icons/hicolor/24x24/stock/table/stock_insert-names-define.png +share/icons/hicolor/24x24/stock/table/stock_insert-rows.png +share/icons/hicolor/24x24/stock/table/stock_select-column.png +share/icons/hicolor/24x24/stock/table/stock_select-row.png +share/icons/hicolor/24x24/stock/table/stock_select-table.png +share/icons/hicolor/24x24/stock/table/stock_sort-table-column-ascending.png +share/icons/hicolor/24x24/stock/table/stock_sort-table-row-ascending.png +share/icons/hicolor/24x24/stock/table/stock_table-align-bottom.png +share/icons/hicolor/24x24/stock/table/stock_table-align-center.png +share/icons/hicolor/24x24/stock/table/stock_table-align-top.png +share/icons/hicolor/24x24/stock/table/stock_table-borders.png +share/icons/hicolor/24x24/stock/table/stock_table-combine.png +share/icons/hicolor/24x24/stock/table/stock_table-fit-height.png +share/icons/hicolor/24x24/stock/table/stock_table-fit-width.png +share/icons/hicolor/24x24/stock/table/stock_table-fixed-proportional.png +share/icons/hicolor/24x24/stock/table/stock_table-fixed.png +share/icons/hicolor/24x24/stock/table/stock_table-line-color.png +share/icons/hicolor/24x24/stock/table/stock_table-line-style.png +share/icons/hicolor/24x24/stock/table/stock_table-optimize.png +share/icons/hicolor/24x24/stock/table/stock_table-same-height.png +share/icons/hicolor/24x24/stock/table/stock_table-same-width.png +share/icons/hicolor/24x24/stock/table/stock_table-split.png +share/icons/hicolor/24x24/stock/table/stock_table-variable.png +share/icons/hicolor/24x24/stock/table/stock_table_borders.png +share/icons/hicolor/24x24/stock/table/stock_table_fill.png +share/icons/hicolor/24x24/stock/table/stock_ungroup-cells.png +share/icons/hicolor/24x24/stock/text/stock_autoformat.png +share/icons/hicolor/24x24/stock/text/stock_autospellcheck.png +share/icons/hicolor/24x24/stock/text/stock_autotext.png +share/icons/hicolor/24x24/stock/text/stock_chart-scale-text.png +share/icons/hicolor/24x24/stock/text/stock_decrease-font.png +share/icons/hicolor/24x24/stock/text/stock_directcursor.png +share/icons/hicolor/24x24/stock/text/stock_draw-text-animation.png +share/icons/hicolor/24x24/stock/text/stock_draw-text-frame.png +share/icons/hicolor/24x24/stock/text/stock_draw-text.png +share/icons/hicolor/24x24/stock/text/stock_draw-vertical-text-frame.png +share/icons/hicolor/24x24/stock/text/stock_draw-vertical-text.png +share/icons/hicolor/24x24/stock/text/stock_edit-contour.png +share/icons/hicolor/24x24/stock/text/stock_edit-headers-and-footers.png +share/icons/hicolor/24x24/stock/text/stock_effects-text.png +share/icons/hicolor/24x24/stock/text/stock_euro.png +share/icons/hicolor/24x24/stock/text/stock_font-formatting-toggle.png +share/icons/hicolor/24x24/stock/text/stock_font-size.png +share/icons/hicolor/24x24/stock/text/stock_font.png +share/icons/hicolor/24x24/stock/text/stock_fontwork.png +share/icons/hicolor/24x24/stock/text/stock_format-character.png +share/icons/hicolor/24x24/stock/text/stock_format-numbering-bullets.png +share/icons/hicolor/24x24/stock/text/stock_format-paragraph.png +share/icons/hicolor/24x24/stock/text/stock_increase-font.png +share/icons/hicolor/24x24/stock/text/stock_insert-caption.png +share/icons/hicolor/24x24/stock/text/stock_insert-cross-reference.png +share/icons/hicolor/24x24/stock/text/stock_insert-fields-author.png +share/icons/hicolor/24x24/stock/text/stock_insert-fields-subject.png +share/icons/hicolor/24x24/stock/text/stock_insert-fields-title.png +share/icons/hicolor/24x24/stock/text/stock_insert-footer.png +share/icons/hicolor/24x24/stock/text/stock_insert-header.png +share/icons/hicolor/24x24/stock/text/stock_insert_endnote.png +share/icons/hicolor/24x24/stock/text/stock_insert_footnote.png +share/icons/hicolor/24x24/stock/text/stock_insert_index_marker.png +share/icons/hicolor/24x24/stock/text/stock_insert_section.png +share/icons/hicolor/24x24/stock/text/stock_line-spacing-1.5.png +share/icons/hicolor/24x24/stock/text/stock_line-spacing-1.png +share/icons/hicolor/24x24/stock/text/stock_line-spacing-2.png +share/icons/hicolor/24x24/stock/text/stock_list-insert-unnumbered.png +share/icons/hicolor/24x24/stock/text/stock_list_bullet.png +share/icons/hicolor/24x24/stock/text/stock_list_enum-off.png +share/icons/hicolor/24x24/stock/text/stock_list_enum-restart.png +share/icons/hicolor/24x24/stock/text/stock_list_enum.png +share/icons/hicolor/24x24/stock/text/stock_nonprinting-chars.png +share/icons/hicolor/24x24/stock/text/stock_page-number.png +share/icons/hicolor/24x24/stock/text/stock_page-total-number.png +share/icons/hicolor/24x24/stock/text/stock_paragraph-spacing-decrease.png +share/icons/hicolor/24x24/stock/text/stock_paragraph-spacing-increase.png +share/icons/hicolor/24x24/stock/text/stock_select-all.png +share/icons/hicolor/24x24/stock/text/stock_spellcheck.png +share/icons/hicolor/24x24/stock/text/stock_styles-new-style-from-selection.png +share/icons/hicolor/24x24/stock/text/stock_styles-update-style.png +share/icons/hicolor/24x24/stock/text/stock_subscript.png +share/icons/hicolor/24x24/stock/text/stock_superscript.png +share/icons/hicolor/24x24/stock/text/stock_text-direction-ltr.png +share/icons/hicolor/24x24/stock/text/stock_text-direction-ttb.png +share/icons/hicolor/24x24/stock/text/stock_text-double-click-to-edit.png +share/icons/hicolor/24x24/stock/text/stock_text-outline.png +share/icons/hicolor/24x24/stock/text/stock_text-quickedit.png +share/icons/hicolor/24x24/stock/text/stock_text-select-text-only.png +share/icons/hicolor/24x24/stock/text/stock_text-shadow.png +share/icons/hicolor/24x24/stock/text/stock_text-spacing.png +share/icons/hicolor/24x24/stock/text/stock_text-strikethrough.png +share/icons/hicolor/24x24/stock/text/stock_text_bold.png +share/icons/hicolor/24x24/stock/text/stock_text_center.png +share/icons/hicolor/24x24/stock/text/stock_text_color_background.png +share/icons/hicolor/24x24/stock/text/stock_text_color_foreground.png +share/icons/hicolor/24x24/stock/text/stock_text_color_hilight.png +share/icons/hicolor/24x24/stock/text/stock_text_indent.png +share/icons/hicolor/24x24/stock/text/stock_text_italic.png +share/icons/hicolor/24x24/stock/text/stock_text_justify.png +share/icons/hicolor/24x24/stock/text/stock_text_left.png +share/icons/hicolor/24x24/stock/text/stock_text_right.png +share/icons/hicolor/24x24/stock/text/stock_text_underlined-double.png +share/icons/hicolor/24x24/stock/text/stock_text_underlined.png +share/icons/hicolor/24x24/stock/text/stock_text_unindent.png +share/icons/hicolor/24x24/stock/text/stock_thesaurus.png +share/icons/hicolor/24x24/stock/text/stock_to-background.png +share/icons/hicolor/24x24/stock/text/stock_to-foreground.png +share/icons/hicolor/24x24/stock/text/stock_tools-hyphenation.png +share/icons/hicolor/24x24/stock/text/stock_update-fields.png +share/icons/hicolor/24x24/stock/text/stock_view-field-shadings.png +share/icons/hicolor/24x24/stock/text/stock_wrap-around.png +share/icons/hicolor/24x24/stock/text/stock_wrap-behind.png +share/icons/hicolor/24x24/stock/text/stock_wrap-contour.png +share/icons/hicolor/24x24/stock/text/stock_wrap-interrupt.png +share/icons/hicolor/24x24/stock/text/stock_wrap-left.png +share/icons/hicolor/24x24/stock/text/stock_wrap-optimal.png +share/icons/hicolor/24x24/stock/text/stock_wrap-right.png +share/icons/hicolor/32x32/apps/administration.png +share/icons/hicolor/32x32/apps/apacheconf.png +share/icons/hicolor/32x32/apps/applets-screenshooter.png +share/icons/hicolor/32x32/apps/blender.png +share/icons/hicolor/32x32/apps/config-date.png +share/icons/hicolor/32x32/apps/config-language.png +share/icons/hicolor/32x32/apps/config-users.png +share/icons/hicolor/32x32/apps/config-xfree.png +share/icons/hicolor/32x32/apps/dia_gnome_icon.png +share/icons/hicolor/32x32/apps/disks.png +share/icons/hicolor/32x32/apps/evolution.png +share/icons/hicolor/32x32/apps/file-manager.png +share/icons/hicolor/32x32/apps/gdict.png +share/icons/hicolor/32x32/apps/gdm.png +share/icons/hicolor/32x32/apps/gnome-applications.png +share/icons/hicolor/32x32/apps/gnome-calculator.png +share/icons/hicolor/32x32/apps/gnome-cdplayer-icon.png +share/icons/hicolor/32x32/apps/gnome-character-map.png +share/icons/hicolor/32x32/apps/gnome-devel.png +share/icons/hicolor/32x32/apps/gnome-finance.png +share/icons/hicolor/32x32/apps/gnome-ftp.png +share/icons/hicolor/32x32/apps/gnome-globe.png +share/icons/hicolor/32x32/apps/gnome-gnomine.png +share/icons/hicolor/32x32/apps/gnome-graphics.png +share/icons/hicolor/32x32/apps/gnome-grecord.png +share/icons/hicolor/32x32/apps/gnome-gsame.png +share/icons/hicolor/32x32/apps/gnome-lockscreen.png +share/icons/hicolor/32x32/apps/gnome-logout.png +share/icons/hicolor/32x32/apps/gnome-media-player.png +share/icons/hicolor/32x32/apps/gnome-multimedia.png +share/icons/hicolor/32x32/apps/gnome-networktool.png +share/icons/hicolor/32x32/apps/gnome-nibbles.png +share/icons/hicolor/32x32/apps/gnome-pdf.png +share/icons/hicolor/32x32/apps/gnome-terminal.png +share/icons/hicolor/32x32/apps/gnome-util.png +share/icons/hicolor/32x32/apps/hwbrowser.png +share/icons/hicolor/32x32/apps/iagno.png +share/icons/hicolor/32x32/apps/keyboard.png +share/icons/hicolor/32x32/apps/logviewer.png +share/icons/hicolor/32x32/apps/network-config.png +share/icons/hicolor/32x32/apps/panel-notification-area.png +share/icons/hicolor/32x32/apps/panel-window-list.png +share/icons/hicolor/32x32/apps/panel-window-menu.png +share/icons/hicolor/32x32/apps/postscript-viewer.png +share/icons/hicolor/32x32/apps/serviceconf.png +share/icons/hicolor/32x32/apps/system-floppy.png +share/icons/hicolor/32x32/apps/tsclient.png +share/icons/hicolor/32x32/apps/web-browser.png +share/icons/hicolor/32x32/apps/xcdroast.png +share/icons/hicolor/32x32/apps/xchat.png +share/icons/hicolor/32x32/stock/chart/stock_chart.png +share/icons/hicolor/32x32/stock/code/stock_script.png +share/icons/hicolor/32x32/stock/data/stock_data-sources-hand.png +share/icons/hicolor/32x32/stock/data/stock_data-sources.png +share/icons/hicolor/32x32/stock/data/stock_lock-broken.png +share/icons/hicolor/32x32/stock/data/stock_lock-ok.png +share/icons/hicolor/32x32/stock/data/stock_lock.png +share/icons/hicolor/32x32/stock/data/stock_signature-bad.png +share/icons/hicolor/32x32/stock/data/stock_signature-ok.png +share/icons/hicolor/32x32/stock/data/stock_signature.png +share/icons/hicolor/32x32/stock/document/stock_new-drawing.png +share/icons/hicolor/32x32/stock/document/stock_new-formula.png +share/icons/hicolor/32x32/stock/document/stock_new-html.png +share/icons/hicolor/32x32/stock/document/stock_new-labels.png +share/icons/hicolor/32x32/stock/document/stock_new-master-document.png +share/icons/hicolor/32x32/stock/document/stock_new-presentation.png +share/icons/hicolor/32x32/stock/document/stock_new-spreadsheet.png +share/icons/hicolor/32x32/stock/document/stock_new-template.png +share/icons/hicolor/32x32/stock/document/stock_new-text.png +share/icons/hicolor/32x32/stock/document/stock_new.png +share/icons/hicolor/32x32/stock/document/stock_todo.png +share/icons/hicolor/32x32/stock/generic/stock_alarm.png +share/icons/hicolor/32x32/stock/generic/stock_autopilot.png +share/icons/hicolor/32x32/stock/generic/stock_briefcase.png +share/icons/hicolor/32x32/stock/generic/stock_calendar.png +share/icons/hicolor/32x32/stock/generic/stock_cell-phone.png +share/icons/hicolor/32x32/stock/generic/stock_dialog-info.png +share/icons/hicolor/32x32/stock/generic/stock_dialog-question.png +share/icons/hicolor/32x32/stock/generic/stock_dialog-warning.png +share/icons/hicolor/32x32/stock/generic/stock_edit.png +share/icons/hicolor/32x32/stock/generic/stock_example.png +share/icons/hicolor/32x32/stock/generic/stock_folder.png +share/icons/hicolor/32x32/stock/generic/stock_id.png +share/icons/hicolor/32x32/stock/generic/stock_keyring.png +share/icons/hicolor/32x32/stock/generic/stock_landline-phone.png +share/icons/hicolor/32x32/stock/generic/stock_new-24h-appointment.png +share/icons/hicolor/32x32/stock/generic/stock_new-appointment.png +share/icons/hicolor/32x32/stock/generic/stock_new-meeting.png +share/icons/hicolor/32x32/stock/generic/stock_news.png +share/icons/hicolor/32x32/stock/generic/stock_notebook.png +share/icons/hicolor/32x32/stock/generic/stock_notes.png +share/icons/hicolor/32x32/stock/generic/stock_openoffice.png +share/icons/hicolor/32x32/stock/generic/stock_people.png +share/icons/hicolor/32x32/stock/generic/stock_person.png +share/icons/hicolor/32x32/stock/generic/stock_summary.png +share/icons/hicolor/32x32/stock/generic/stock_web-calendar.png +share/icons/hicolor/32x32/stock/io/stock_bluetooth.png +share/icons/hicolor/32x32/stock/io/stock_network-printer.png +share/icons/hicolor/32x32/stock/io/stock_opensave.png +share/icons/hicolor/32x32/stock/io/stock_print-driver.png +share/icons/hicolor/32x32/stock/io/stock_print-preview-print.png +share/icons/hicolor/32x32/stock/io/stock_print-preview.png +share/icons/hicolor/32x32/stock/io/stock_print-setup.png +share/icons/hicolor/32x32/stock/io/stock_print.png +share/icons/hicolor/32x32/stock/io/stock_printers.png +share/icons/hicolor/32x32/stock/media/stock_sound.png +share/icons/hicolor/32x32/stock/net/stock_addressbook.png +share/icons/hicolor/32x32/stock/net/stock_appointment-reminder-excl.png +share/icons/hicolor/32x32/stock/net/stock_appointment-reminder.png +share/icons/hicolor/32x32/stock/net/stock_channel.png +share/icons/hicolor/32x32/stock/net/stock_contact.png +share/icons/hicolor/32x32/stock/net/stock_directory-server.png +share/icons/hicolor/32x32/stock/net/stock_exchange-connector.png +share/icons/hicolor/32x32/stock/net/stock_groupwise-connector.png +share/icons/hicolor/32x32/stock/net/stock_inbox.png +share/icons/hicolor/32x32/stock/net/stock_internet.png +share/icons/hicolor/32x32/stock/net/stock_mail-import.png +share/icons/hicolor/32x32/stock/net/stock_mail-open.png +share/icons/hicolor/32x32/stock/net/stock_mail-receive.png +share/icons/hicolor/32x32/stock/net/stock_mail-send.png +share/icons/hicolor/32x32/stock/net/stock_mail.png +share/icons/hicolor/32x32/stock/net/stock_not-spam.png +share/icons/hicolor/32x32/stock/net/stock_outbox.png +share/icons/hicolor/32x32/stock/net/stock_post-message.png +share/icons/hicolor/32x32/stock/net/stock_sent-mail.png +share/icons/hicolor/32x32/stock/net/stock_spam.png +share/icons/hicolor/32x32/stock/object/stock_add-bookmark.png +share/icons/hicolor/32x32/stock/object/stock_bookmark.png +share/icons/hicolor/32x32/stock/object/stock_delete-bookmark.png +share/icons/hicolor/32x32/stock/object/stock_edit-bookmark.png +share/icons/hicolor/36x36/apps/gnome-spinner-rest.png +share/icons/hicolor/36x36/apps/gnome-spinner.png +share/icons/hicolor/36x36/stock/document/stock_my-documents.png +share/icons/hicolor/36x36/stock/document/stock_new-drawing.png +share/icons/hicolor/36x36/stock/document/stock_new-formula.png +share/icons/hicolor/36x36/stock/document/stock_new-html.png +share/icons/hicolor/36x36/stock/document/stock_new-labels.png +share/icons/hicolor/36x36/stock/document/stock_new-master-document.png +share/icons/hicolor/36x36/stock/document/stock_new-presentation.png +share/icons/hicolor/36x36/stock/document/stock_new-spreadsheet.png +share/icons/hicolor/36x36/stock/document/stock_new-template.png +share/icons/hicolor/36x36/stock/document/stock_new-text.png +share/icons/hicolor/36x36/stock/document/stock_samples.png +share/icons/hicolor/36x36/stock/generic/stock_autopilot.png +share/icons/hicolor/36x36/stock/generic/stock_new.png +share/icons/hicolor/48x48/apps/accessibility-directory.png +share/icons/hicolor/48x48/apps/administration.png +share/icons/hicolor/48x48/apps/advanced-directory.png +share/icons/hicolor/48x48/apps/apacheconf.png +share/icons/hicolor/48x48/apps/applets-screenshooter.png +share/icons/hicolor/48x48/apps/beast.png +share/icons/hicolor/48x48/apps/blender.png +share/icons/hicolor/48x48/apps/config-date.png +share/icons/hicolor/48x48/apps/config-language.png +share/icons/hicolor/48x48/apps/config-users.png +share/icons/hicolor/48x48/apps/config-xfree.png +share/icons/hicolor/48x48/apps/dia_gnome_icon.png +share/icons/hicolor/48x48/apps/disks.png +share/icons/hicolor/48x48/apps/evolution.png +share/icons/hicolor/48x48/apps/file-manager.png +share/icons/hicolor/48x48/apps/file-roller.png +share/icons/hicolor/48x48/apps/gdict.png +share/icons/hicolor/48x48/apps/gdm.png +share/icons/hicolor/48x48/apps/gnome-amusements.png +share/icons/hicolor/48x48/apps/gnome-applications.png +share/icons/hicolor/48x48/apps/gnome-audio.png +share/icons/hicolor/48x48/apps/gnome-calculator.png +share/icons/hicolor/48x48/apps/gnome-cdplayer-icon.png +share/icons/hicolor/48x48/apps/gnome-desktop-config.png +share/icons/hicolor/48x48/apps/gnome-devel.png +share/icons/hicolor/48x48/apps/gnome-favorites.png +share/icons/hicolor/48x48/apps/gnome-finance.png +share/icons/hicolor/48x48/apps/gnome-ftp.png +share/icons/hicolor/48x48/apps/gnome-globe.png +share/icons/hicolor/48x48/apps/gnome-gnomine.png +share/icons/hicolor/48x48/apps/gnome-graphics.png +share/icons/hicolor/48x48/apps/gnome-grecord.png +share/icons/hicolor/48x48/apps/gnome-gsame.png +share/icons/hicolor/48x48/apps/gnome-help.png +share/icons/hicolor/48x48/apps/gnome-joystick.png +share/icons/hicolor/48x48/apps/gnome-lockscreen.png +share/icons/hicolor/48x48/apps/gnome-logout.png +share/icons/hicolor/48x48/apps/gnome-media-player.png +share/icons/hicolor/48x48/apps/gnome-monitor.png +share/icons/hicolor/48x48/apps/gnome-multimedia.png +share/icons/hicolor/48x48/apps/gnome-networktool.png +share/icons/hicolor/48x48/apps/gnome-nibbles.png +share/icons/hicolor/48x48/apps/gnome-other.png +share/icons/hicolor/48x48/apps/gnome-panel.png +share/icons/hicolor/48x48/apps/gnome-pdf.png +share/icons/hicolor/48x48/apps/gnome-reboot.png +share/icons/hicolor/48x48/apps/gnome-searchtool-animation-rest.png +share/icons/hicolor/48x48/apps/gnome-searchtool-animation.png +share/icons/hicolor/48x48/apps/gnome-searchtool.png +share/icons/hicolor/48x48/apps/gnome-server-config.png +share/icons/hicolor/48x48/apps/gnome-session.png +share/icons/hicolor/48x48/apps/gnome-settings-accessibility-keyboard.png +share/icons/hicolor/48x48/apps/gnome-settings-accessibility-technologies.png +share/icons/hicolor/48x48/apps/gnome-settings-background.png +share/icons/hicolor/48x48/apps/gnome-settings-default-applications.png +share/icons/hicolor/48x48/apps/gnome-settings-font.png +share/icons/hicolor/48x48/apps/gnome-settings-keybindings.png +share/icons/hicolor/48x48/apps/gnome-settings-sound.png +share/icons/hicolor/48x48/apps/gnome-settings-theme.png +share/icons/hicolor/48x48/apps/gnome-settings-ui-behavior.png +share/icons/hicolor/48x48/apps/gnome-settings.png +share/icons/hicolor/48x48/apps/gnome-shutdown.png +share/icons/hicolor/48x48/apps/gnome-starthere.png +share/icons/hicolor/48x48/apps/gnome-system-config.png +share/icons/hicolor/48x48/apps/gnome-system.png +share/icons/hicolor/48x48/apps/gnome-terminal.png +share/icons/hicolor/48x48/apps/gnome-unknown.png +share/icons/hicolor/48x48/apps/gnome-util.png +share/icons/hicolor/48x48/apps/gnome-window-manager.png +share/icons/hicolor/48x48/apps/hint.png +share/icons/hicolor/48x48/apps/hwbrowser.png +share/icons/hicolor/48x48/apps/iagno.png +share/icons/hicolor/48x48/apps/im-aim.png +share/icons/hicolor/48x48/apps/im-icq.png +share/icons/hicolor/48x48/apps/im-jabber.png +share/icons/hicolor/48x48/apps/im-msn.png +share/icons/hicolor/48x48/apps/im-yahoo.png +share/icons/hicolor/48x48/apps/keyboard.png +share/icons/hicolor/48x48/apps/logviewer.png +share/icons/hicolor/48x48/apps/network-config.png +share/icons/hicolor/48x48/apps/palm-pilot.png +share/icons/hicolor/48x48/apps/panel-notification-area.png +share/icons/hicolor/48x48/apps/panel-window-list.png +share/icons/hicolor/48x48/apps/panel-window-menu.png +share/icons/hicolor/48x48/apps/postscript-viewer.png +share/icons/hicolor/48x48/apps/realplayer.png +share/icons/hicolor/48x48/apps/screensaver.png +share/icons/hicolor/48x48/apps/serviceconf.png +share/icons/hicolor/48x48/apps/sodipodi.png +share/icons/hicolor/48x48/apps/tsclient.png +share/icons/hicolor/48x48/apps/user-info.png +share/icons/hicolor/48x48/apps/visor.png +share/icons/hicolor/48x48/apps/wallpaper.png +share/icons/hicolor/48x48/apps/web-browser.png +share/icons/hicolor/48x48/apps/wine.png +share/icons/hicolor/48x48/apps/xcdroast.png +share/icons/hicolor/48x48/apps/xchat.png +share/icons/hicolor/48x48/apps/xsane.png +share/icons/hicolor/48x48/stock/code/stock_script.png +share/icons/hicolor/48x48/stock/data/stock_lock-broken.png +share/icons/hicolor/48x48/stock/data/stock_lock-ok.png +share/icons/hicolor/48x48/stock/data/stock_lock.png +share/icons/hicolor/48x48/stock/data/stock_signature-bad.png +share/icons/hicolor/48x48/stock/data/stock_signature-ok.png +share/icons/hicolor/48x48/stock/data/stock_signature.png +share/icons/hicolor/48x48/stock/document/stock_certificate.png +share/icons/hicolor/48x48/stock/document/stock_new-drawing.png +share/icons/hicolor/48x48/stock/document/stock_new-formula.png +share/icons/hicolor/48x48/stock/document/stock_new-html.png +share/icons/hicolor/48x48/stock/document/stock_new-labels.png +share/icons/hicolor/48x48/stock/document/stock_new-master-document.png +share/icons/hicolor/48x48/stock/document/stock_new-presentation.png +share/icons/hicolor/48x48/stock/document/stock_new-spreadsheet.png +share/icons/hicolor/48x48/stock/document/stock_new-template.png +share/icons/hicolor/48x48/stock/document/stock_new-text.png +share/icons/hicolor/48x48/stock/document/stock_todo.png +share/icons/hicolor/48x48/stock/generic/stock_alarm.png +share/icons/hicolor/48x48/stock/generic/stock_autopilot.png +share/icons/hicolor/48x48/stock/generic/stock_briefcase.png +share/icons/hicolor/48x48/stock/generic/stock_calendar-and-tasks.png +share/icons/hicolor/48x48/stock/generic/stock_calendar.png +share/icons/hicolor/48x48/stock/generic/stock_cell-phone.png +share/icons/hicolor/48x48/stock/generic/stock_creditcard.png +share/icons/hicolor/48x48/stock/generic/stock_dialog-error.png +share/icons/hicolor/48x48/stock/generic/stock_dialog-info.png +share/icons/hicolor/48x48/stock/generic/stock_dialog-warning.png +share/icons/hicolor/48x48/stock/generic/stock_edit.png +share/icons/hicolor/48x48/stock/generic/stock_example.png +share/icons/hicolor/48x48/stock/generic/stock_home.png +share/icons/hicolor/48x48/stock/generic/stock_id.png +share/icons/hicolor/48x48/stock/generic/stock_init.png +share/icons/hicolor/48x48/stock/generic/stock_keyring.png +share/icons/hicolor/48x48/stock/generic/stock_landline-phone.png +share/icons/hicolor/48x48/stock/generic/stock_new-24h-appointment.png +share/icons/hicolor/48x48/stock/generic/stock_new-appointment.png +share/icons/hicolor/48x48/stock/generic/stock_new-meeting.png +share/icons/hicolor/48x48/stock/generic/stock_news.png +share/icons/hicolor/48x48/stock/generic/stock_notebook.png +share/icons/hicolor/48x48/stock/generic/stock_notes.png +share/icons/hicolor/48x48/stock/generic/stock_people.png +share/icons/hicolor/48x48/stock/generic/stock_person.png +share/icons/hicolor/48x48/stock/generic/stock_summary.png +share/icons/hicolor/48x48/stock/generic/stock_timezone.png +share/icons/hicolor/48x48/stock/generic/stock_unknown.png +share/icons/hicolor/48x48/stock/generic/stock_weather-cloudy.png +share/icons/hicolor/48x48/stock/generic/stock_weather-few-clouds.png +share/icons/hicolor/48x48/stock/generic/stock_weather-fog.png +share/icons/hicolor/48x48/stock/generic/stock_weather-showers.png +share/icons/hicolor/48x48/stock/generic/stock_weather-snow.png +share/icons/hicolor/48x48/stock/generic/stock_weather-storm.png +share/icons/hicolor/48x48/stock/generic/stock_weather-sunny.png +share/icons/hicolor/48x48/stock/generic/stock_web-calendar.png +share/icons/hicolor/48x48/stock/io/stock_bluetooth.png +share/icons/hicolor/48x48/stock/io/stock_network-printer.png +share/icons/hicolor/48x48/stock/io/stock_print-driver.png +share/icons/hicolor/48x48/stock/io/stock_print-duplex-no-tumble.png +share/icons/hicolor/48x48/stock/io/stock_print-duplex-tumble.png +share/icons/hicolor/48x48/stock/io/stock_print-duplex.png +share/icons/hicolor/48x48/stock/io/stock_print-non-duplex.png +share/icons/hicolor/48x48/stock/io/stock_print-preview-print.png +share/icons/hicolor/48x48/stock/io/stock_print-preview.png +share/icons/hicolor/48x48/stock/io/stock_print-setup.png +share/icons/hicolor/48x48/stock/io/stock_print.png +share/icons/hicolor/48x48/stock/io/stock_printers.png +share/icons/hicolor/48x48/stock/net/stock_addressbook.png +share/icons/hicolor/48x48/stock/net/stock_appointment-reminder-excl.png +share/icons/hicolor/48x48/stock/net/stock_appointment-reminder.png +share/icons/hicolor/48x48/stock/net/stock_channel.png +share/icons/hicolor/48x48/stock/net/stock_contact.png +share/icons/hicolor/48x48/stock/net/stock_directory-server.png +share/icons/hicolor/48x48/stock/net/stock_exchange-connector.png +share/icons/hicolor/48x48/stock/net/stock_groupwise-connector.png +share/icons/hicolor/48x48/stock/net/stock_inbox.png +share/icons/hicolor/48x48/stock/net/stock_mail-compose.png +share/icons/hicolor/48x48/stock/net/stock_mail-druid-account.png +share/icons/hicolor/48x48/stock/net/stock_mail-druid.png +share/icons/hicolor/48x48/stock/net/stock_mail-flag-for-followup-done.png +share/icons/hicolor/48x48/stock/net/stock_mail-flag-for-followup.png +share/icons/hicolor/48x48/stock/net/stock_mail-import.png +share/icons/hicolor/48x48/stock/net/stock_mail-open.png +share/icons/hicolor/48x48/stock/net/stock_mail-receive.png +share/icons/hicolor/48x48/stock/net/stock_mail-send.png +share/icons/hicolor/48x48/stock/net/stock_mail.png +share/icons/hicolor/48x48/stock/net/stock_not-spam.png +share/icons/hicolor/48x48/stock/net/stock_outbox.png +share/icons/hicolor/48x48/stock/net/stock_post-message.png +share/icons/hicolor/48x48/stock/net/stock_proxy.png +share/icons/hicolor/48x48/stock/net/stock_sent-mail.png +share/icons/hicolor/48x48/stock/net/stock_spam.png +share/icons/hicolor/72x72/apps/gnome-globe.png +share/icons/hicolor/96x96/apps/gnome-globe.png +share/icons/hicolor/96x96/apps/gnome-starthere.png +@dirrm share/icons/hicolor/72x72/apps +@dirrm share/icons/hicolor/72x72 +@dirrm share/icons/hicolor/48x48/stock/net +@dirrm share/icons/hicolor/48x48/stock/io +@dirrm share/icons/hicolor/48x48/stock/generic +@dirrm share/icons/hicolor/48x48/stock/document +@dirrm share/icons/hicolor/48x48/stock/data +@dirrm share/icons/hicolor/48x48/stock/code +@dirrm share/icons/hicolor/48x48/stock +@dirrm share/icons/hicolor/48x48/apps +@dirrm share/icons/hicolor/36x36/stock/generic +@dirrm share/icons/hicolor/36x36/stock/document +@dirrm share/icons/hicolor/36x36/stock +@dirrm share/icons/hicolor/36x36/apps +@dirrm share/icons/hicolor/36x36 +@dirrm share/icons/hicolor/32x32/stock/object +@dirrm share/icons/hicolor/32x32/stock/net +@dirrm share/icons/hicolor/32x32/stock/media +@dirrm share/icons/hicolor/32x32/stock/io +@dirrm share/icons/hicolor/32x32/stock/generic +@dirrm share/icons/hicolor/32x32/stock/document +@dirrm share/icons/hicolor/32x32/stock/data +@dirrm share/icons/hicolor/32x32/stock/code +@dirrm share/icons/hicolor/32x32/stock/chart +@dirrm share/icons/hicolor/32x32/stock +@dirrm share/icons/hicolor/32x32/apps +@dirrm share/icons/hicolor/24x24/stock/text +@dirrm share/icons/hicolor/24x24/stock/table +@dirrm share/icons/hicolor/24x24/stock/object +@dirrm share/icons/hicolor/24x24/stock/net +@dirrm share/icons/hicolor/24x24/stock/navigation +@dirrm share/icons/hicolor/24x24/stock/media +@dirrm share/icons/hicolor/24x24/stock/io +@dirrm share/icons/hicolor/24x24/stock/image +@dirrm share/icons/hicolor/24x24/stock/generic +@dirrm share/icons/hicolor/24x24/stock/form +@dirrm share/icons/hicolor/24x24/stock/document +@dirrm share/icons/hicolor/24x24/stock/data +@dirrm share/icons/hicolor/24x24/stock/code +@dirrm share/icons/hicolor/24x24/stock/chart +@dirrm share/icons/hicolor/24x24/stock +@dirrm share/icons/hicolor/24x24/apps +@dirrm share/icons/hicolor/24x24 +@dirrm share/icons/hicolor/192x192/apps +@dirrm share/icons/hicolor/192x192 +@dirrm share/icons/hicolor/16x16/stock/text +@dirrm share/icons/hicolor/16x16/stock/table +@dirrm share/icons/hicolor/16x16/stock/object +@dirrm share/icons/hicolor/16x16/stock/net +@dirrm share/icons/hicolor/16x16/stock/navigation +@dirrm share/icons/hicolor/16x16/stock/media +@dirrm share/icons/hicolor/16x16/stock/io +@dirrm share/icons/hicolor/16x16/stock/image +@dirrm share/icons/hicolor/16x16/stock/generic +@dirrm share/icons/hicolor/16x16/stock/form +@dirrm share/icons/hicolor/16x16/stock/document +@dirrm share/icons/hicolor/16x16/stock/data +@dirrm share/icons/hicolor/16x16/stock/code +@dirrm share/icons/hicolor/16x16/stock/chart +@dirrm share/icons/hicolor/16x16/stock +@dirrm share/icons/hicolor/16x16/apps @dirrm share/icons/gnome/scalable/mimetypes @dirrm share/icons/gnome/scalable/filesystems @dirrm share/icons/gnome/scalable/emblems @@ -1790,84 +2319,39 @@ share/icons/gnome/scalable/emblems/emblem-urgent.svg @dirrm share/icons/gnome/96x96/filesystems @dirrm share/icons/gnome/96x96/emblems @dirrm share/icons/gnome/96x96/devices -@dirrm share/icons/gnome/96x96/apps @dirrm share/icons/gnome/96x96 @dirrm share/icons/gnome/72x72/mimetypes @dirrm share/icons/gnome/72x72/filesystems @dirrm share/icons/gnome/72x72/emblems @dirrm share/icons/gnome/72x72/devices @dirrm share/icons/gnome/72x72 -@dirrm share/icons/gnome/48x48/stock/net -@dirrm share/icons/gnome/48x48/stock/generic -@dirrm share/icons/gnome/48x48/stock/document -@dirrm share/icons/gnome/48x48/stock @dirrm share/icons/gnome/48x48/mimetypes @dirrm share/icons/gnome/48x48/filesystems @dirrm share/icons/gnome/48x48/emblems @dirrm share/icons/gnome/48x48/devices @dirrm share/icons/gnome/48x48/apps @dirrm share/icons/gnome/48x48 -@dirrm share/icons/gnome/36x36/stock/generic -@dirrm share/icons/gnome/36x36/stock/document -@dirrm share/icons/gnome/36x36/stock @dirrm share/icons/gnome/36x36/mimetypes @dirrm share/icons/gnome/36x36/filesystems @dirrm share/icons/gnome/36x36/emblems @dirrm share/icons/gnome/36x36/devices -@dirrm share/icons/gnome/36x36/apps @dirrm share/icons/gnome/36x36 -@dirrm share/icons/gnome/32x32/stock/net -@dirrm share/icons/gnome/32x32/stock/media -@dirrm share/icons/gnome/32x32/stock/io -@dirrm share/icons/gnome/32x32/stock/generic -@dirrm share/icons/gnome/32x32/stock/document -@dirrm share/icons/gnome/32x32/stock/data -@dirrm share/icons/gnome/32x32/stock/chart -@dirrm share/icons/gnome/32x32/stock -@dirrm share/icons/gnome/32x32/apps +@dirrm share/icons/gnome/32x32/mimetypes +@dirrm share/icons/gnome/32x32/filesystems @dirrm share/icons/gnome/32x32 -@dirrm share/icons/gnome/24x24/stock/text -@dirrm share/icons/gnome/24x24/stock/table -@dirrm share/icons/gnome/24x24/stock/object -@dirrm share/icons/gnome/24x24/stock/net -@dirrm share/icons/gnome/24x24/stock/navigation -@dirrm share/icons/gnome/24x24/stock/media -@dirrm share/icons/gnome/24x24/stock/io -@dirrm share/icons/gnome/24x24/stock/image -@dirrm share/icons/gnome/24x24/stock/generic -@dirrm share/icons/gnome/24x24/stock/form -@dirrm share/icons/gnome/24x24/stock/document -@dirrm share/icons/gnome/24x24/stock/data -@dirrm share/icons/gnome/24x24/stock/code -@dirrm share/icons/gnome/24x24/stock/chart -@dirrm share/icons/gnome/24x24/stock @dirrm share/icons/gnome/24x24/mimetypes @dirrm share/icons/gnome/24x24/filesystems @dirrm share/icons/gnome/24x24/emblems @dirrm share/icons/gnome/24x24/devices -@dirrm share/icons/gnome/24x24/apps @dirrm share/icons/gnome/24x24 @dirrm share/icons/gnome/192x192/mimetypes @dirrm share/icons/gnome/192x192/filesystems @dirrm share/icons/gnome/192x192/emblems @dirrm share/icons/gnome/192x192/devices @dirrm share/icons/gnome/192x192 -@dirrm share/icons/gnome/16x16/stock/text -@dirrm share/icons/gnome/16x16/stock/table -@dirrm share/icons/gnome/16x16/stock/object -@dirrm share/icons/gnome/16x16/stock/net -@dirrm share/icons/gnome/16x16/stock/navigation -@dirrm share/icons/gnome/16x16/stock/media -@dirrm share/icons/gnome/16x16/stock/io -@dirrm share/icons/gnome/16x16/stock/image -@dirrm share/icons/gnome/16x16/stock/generic -@dirrm share/icons/gnome/16x16/stock/form -@dirrm share/icons/gnome/16x16/stock/document -@dirrm share/icons/gnome/16x16/stock/data -@dirrm share/icons/gnome/16x16/stock/code -@dirrm share/icons/gnome/16x16/stock/chart -@dirrm share/icons/gnome/16x16/stock -@dirrm share/icons/gnome/16x16/apps +@dirrm share/icons/gnome/16x16/mimetypes +@dirrm share/icons/gnome/16x16/filesystems +@dirrm share/icons/gnome/16x16/devices @dirrm share/icons/gnome/16x16 @dirrm share/icons/gnome/12x12/mimetypes @dirrm share/icons/gnome/12x12/filesystems @@ -1875,4 +2359,3 @@ share/icons/gnome/scalable/emblems/emblem-urgent.svg @dirrm share/icons/gnome/12x12/devices @dirrm share/icons/gnome/12x12 @dirrm share/icons/gnome -@unexec /bin/rmdir %D/share/icons 2> /dev/null || /usr/bin/true diff --git a/misc/gnome-user-docs/Makefile b/misc/gnome-user-docs/Makefile index c0f3a7f0dd34..f5d417a837c5 100644 --- a/misc/gnome-user-docs/Makefile +++ b/misc/gnome-user-docs/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomeuserdocs2 -PORTVERSION= 2.4.1 -PORTREVISION= 1 +PORTVERSION= 2.6.0.1 CATEGORIES= misc gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome2-user-docs/2.4 +MASTER_SITE_SUBDIR= sources/gnome2-user-docs/2.6 DISTNAME= gnome2-user-docs-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/misc/gnome-user-docs/distinfo b/misc/gnome-user-docs/distinfo index e9b8d3d8d1ee..5f26a52d9d98 100644 --- a/misc/gnome-user-docs/distinfo +++ b/misc/gnome-user-docs/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome2-user-docs-2.4.1.tar.bz2) = 560d4fbb21d5f8ab5e0c79c856d60f8c -SIZE (gnome2/gnome2-user-docs-2.4.1.tar.bz2) = 1428178 +MD5 (gnome2/gnome2-user-docs-2.6.0.1.tar.bz2) = 8125558f7f515b681fdeb853adf06ebb +SIZE (gnome2/gnome2-user-docs-2.6.0.1.tar.bz2) = 1018591 diff --git a/misc/gnome-user-docs/pkg-descr b/misc/gnome-user-docs/pkg-descr index 0ba21f5fdd2a..0ed2fb1bc819 100644 --- a/misc/gnome-user-docs/pkg-descr +++ b/misc/gnome-user-docs/pkg-descr @@ -1 +1 @@ -GNOME 2 users guide. +User documentation for the GNOME 2 desktop. diff --git a/misc/gnome-user-docs/pkg-plist b/misc/gnome-user-docs/pkg-plist index 97ffcc354343..aa6f26f30a0e 100644 --- a/misc/gnome-user-docs/pkg-plist +++ b/misc/gnome-user-docs/pkg-plist @@ -22,20 +22,14 @@ share/gnome/help/gnome-access-guide/C/keynav.xml share/gnome/help/gnome-access-guide/C/legal.xml share/gnome/help/gnome-access-guide/C/preface.xml share/gnome/help/gnome-access-guide/C/themes.xml -share/gnome/help/introduction-to-gnome/C/figures/desktop.png -share/gnome/help/introduction-to-gnome/C/figures/microguiborder.png -share/gnome/help/introduction-to-gnome/C/figures/naut_iconview_window.png -share/gnome/help/introduction-to-gnome/C/figures/titlebar_anno_window.png -share/gnome/help/introduction-to-gnome/C/figures/typical_anno_desktop.png -share/gnome/help/introduction-to-gnome/C/introduction-to-gnome.xml -share/gnome/help/introduction-to-gnome/C/legal.xml share/gnome/help/system-admin-guide/C/appendixa.xml -share/gnome/help/system-admin-guide/C/figures/gconf_editor_anno_window.png +share/gnome/help/system-admin-guide/C/appendixb.xml +share/gnome/help/system-admin-guide/C/fontconfig.xml share/gnome/help/system-admin-guide/C/gconf.xml -share/gnome/help/system-admin-guide/C/gdm.xml share/gnome/help/system-admin-guide/C/glossary.xml share/gnome/help/system-admin-guide/C/help.xml share/gnome/help/system-admin-guide/C/legal.xml +share/gnome/help/system-admin-guide/C/lockdown.xml share/gnome/help/system-admin-guide/C/menustructure.xml share/gnome/help/system-admin-guide/C/mimetypes.xml share/gnome/help/system-admin-guide/C/performance.xml @@ -47,6 +41,7 @@ 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/column_resize_pointer.png +share/gnome/help/user-guide/C/figures/com_file_manager_menu.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/file_manager_menu.png @@ -67,6 +62,10 @@ 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_audioview_window.png +share/gnome/help/user-guide/C/figures/naut_browser_filesystem.png +share/gnome/help/user-guide/C/figures/naut_browser_window.png +share/gnome/help/user-guide/C/figures/naut_computer_contents.png +share/gnome/help/user-guide/C/figures/naut_computer_launcher.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 @@ -111,7 +110,6 @@ share/gnome/help/user-guide/C/figures/window_list_applet.png share/gnome/help/user-guide/C/figures/window_list_group_applet.png share/gnome/help/user-guide/C/figures/window_menu.png share/gnome/help/user-guide/C/figures/workspace_switcher_applet.png -share/gnome/help/user-guide/C/front.xml share/gnome/help/user-guide/C/glossary.xml share/gnome/help/user-guide/C/gosbasic.xml share/gnome/help/user-guide/C/goscustaccess.xml @@ -127,6 +125,7 @@ share/gnome/help/user-guide/C/gosstartsession.xml share/gnome/help/user-guide/C/legal.xml share/gnome/help/user-guide/C/part1.xml share/gnome/help/user-guide/C/part2.xml +share/gnome/help/user-guide/C/plaingnomestartpreftools.xml share/gnome/help/user-guide/C/user-guide.xml share/gnome/help/user-guide/C/wgosbasic.xml share/gnome/help/user-guide/C/wgoscustaccess.xml @@ -141,57 +140,20 @@ share/gnome/help/user-guide/C/wgospanel.xml share/gnome/help/user-guide/C/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 -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome2-user-docs/introduction-to-gnome-C.omf 2>/dev/null || /usr/bin/true 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/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/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/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/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/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/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/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/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/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/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/user-guide-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/user-guide-C.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/C/figures @dirrm share/gnome/help/user-guide/C @dirrm share/gnome/help/user-guide -@dirrm share/gnome/help/system-admin-guide/C/figures @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/goscustaccess-C.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/goscustlookandfeel-C.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/goseditmainmenu-C.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/gosnautilus-C.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/gospanel-C.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/user-guide-C.omf 2>/dev/null || /usr/bin/true diff --git a/misc/gnomeuserdocs2/Makefile b/misc/gnomeuserdocs2/Makefile index c0f3a7f0dd34..f5d417a837c5 100644 --- a/misc/gnomeuserdocs2/Makefile +++ b/misc/gnomeuserdocs2/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomeuserdocs2 -PORTVERSION= 2.4.1 -PORTREVISION= 1 +PORTVERSION= 2.6.0.1 CATEGORIES= misc gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome2-user-docs/2.4 +MASTER_SITE_SUBDIR= sources/gnome2-user-docs/2.6 DISTNAME= gnome2-user-docs-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/misc/gnomeuserdocs2/distinfo b/misc/gnomeuserdocs2/distinfo index e9b8d3d8d1ee..5f26a52d9d98 100644 --- a/misc/gnomeuserdocs2/distinfo +++ b/misc/gnomeuserdocs2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome2-user-docs-2.4.1.tar.bz2) = 560d4fbb21d5f8ab5e0c79c856d60f8c -SIZE (gnome2/gnome2-user-docs-2.4.1.tar.bz2) = 1428178 +MD5 (gnome2/gnome2-user-docs-2.6.0.1.tar.bz2) = 8125558f7f515b681fdeb853adf06ebb +SIZE (gnome2/gnome2-user-docs-2.6.0.1.tar.bz2) = 1018591 diff --git a/misc/gnomeuserdocs2/pkg-descr b/misc/gnomeuserdocs2/pkg-descr index 0ba21f5fdd2a..0ed2fb1bc819 100644 --- a/misc/gnomeuserdocs2/pkg-descr +++ b/misc/gnomeuserdocs2/pkg-descr @@ -1 +1 @@ -GNOME 2 users guide. +User documentation for the GNOME 2 desktop. diff --git a/misc/gnomeuserdocs2/pkg-plist b/misc/gnomeuserdocs2/pkg-plist index 97ffcc354343..aa6f26f30a0e 100644 --- a/misc/gnomeuserdocs2/pkg-plist +++ b/misc/gnomeuserdocs2/pkg-plist @@ -22,20 +22,14 @@ share/gnome/help/gnome-access-guide/C/keynav.xml share/gnome/help/gnome-access-guide/C/legal.xml share/gnome/help/gnome-access-guide/C/preface.xml share/gnome/help/gnome-access-guide/C/themes.xml -share/gnome/help/introduction-to-gnome/C/figures/desktop.png -share/gnome/help/introduction-to-gnome/C/figures/microguiborder.png -share/gnome/help/introduction-to-gnome/C/figures/naut_iconview_window.png -share/gnome/help/introduction-to-gnome/C/figures/titlebar_anno_window.png -share/gnome/help/introduction-to-gnome/C/figures/typical_anno_desktop.png -share/gnome/help/introduction-to-gnome/C/introduction-to-gnome.xml -share/gnome/help/introduction-to-gnome/C/legal.xml share/gnome/help/system-admin-guide/C/appendixa.xml -share/gnome/help/system-admin-guide/C/figures/gconf_editor_anno_window.png +share/gnome/help/system-admin-guide/C/appendixb.xml +share/gnome/help/system-admin-guide/C/fontconfig.xml share/gnome/help/system-admin-guide/C/gconf.xml -share/gnome/help/system-admin-guide/C/gdm.xml share/gnome/help/system-admin-guide/C/glossary.xml share/gnome/help/system-admin-guide/C/help.xml share/gnome/help/system-admin-guide/C/legal.xml +share/gnome/help/system-admin-guide/C/lockdown.xml share/gnome/help/system-admin-guide/C/menustructure.xml share/gnome/help/system-admin-guide/C/mimetypes.xml share/gnome/help/system-admin-guide/C/performance.xml @@ -47,6 +41,7 @@ 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/column_resize_pointer.png +share/gnome/help/user-guide/C/figures/com_file_manager_menu.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/file_manager_menu.png @@ -67,6 +62,10 @@ 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_audioview_window.png +share/gnome/help/user-guide/C/figures/naut_browser_filesystem.png +share/gnome/help/user-guide/C/figures/naut_browser_window.png +share/gnome/help/user-guide/C/figures/naut_computer_contents.png +share/gnome/help/user-guide/C/figures/naut_computer_launcher.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 @@ -111,7 +110,6 @@ share/gnome/help/user-guide/C/figures/window_list_applet.png share/gnome/help/user-guide/C/figures/window_list_group_applet.png share/gnome/help/user-guide/C/figures/window_menu.png share/gnome/help/user-guide/C/figures/workspace_switcher_applet.png -share/gnome/help/user-guide/C/front.xml share/gnome/help/user-guide/C/glossary.xml share/gnome/help/user-guide/C/gosbasic.xml share/gnome/help/user-guide/C/goscustaccess.xml @@ -127,6 +125,7 @@ share/gnome/help/user-guide/C/gosstartsession.xml share/gnome/help/user-guide/C/legal.xml share/gnome/help/user-guide/C/part1.xml share/gnome/help/user-guide/C/part2.xml +share/gnome/help/user-guide/C/plaingnomestartpreftools.xml share/gnome/help/user-guide/C/user-guide.xml share/gnome/help/user-guide/C/wgosbasic.xml share/gnome/help/user-guide/C/wgoscustaccess.xml @@ -141,57 +140,20 @@ share/gnome/help/user-guide/C/wgospanel.xml share/gnome/help/user-guide/C/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 -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome2-user-docs/introduction-to-gnome-C.omf 2>/dev/null || /usr/bin/true 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/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/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/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/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/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/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/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/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/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/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/user-guide-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/user-guide-C.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/C/figures @dirrm share/gnome/help/user-guide/C @dirrm share/gnome/help/user-guide -@dirrm share/gnome/help/system-admin-guide/C/figures @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/goscustaccess-C.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/goscustlookandfeel-C.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/goseditmainmenu-C.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/gosnautilus-C.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/gospanel-C.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/user-guide-C.omf 2>/dev/null || /usr/bin/true diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile index 3bd77295be8b..766898c4fe77 100644 --- a/multimedia/gstreamer-plugins/Makefile +++ b/multimedia/gstreamer-plugins/Makefile @@ -6,11 +6,11 @@ # PORTNAME= gstreamer -PORTVERSION= 0.6.4 -PORTREVISION= 3 +PORTVERSION= 0.8.0 CATEGORIES= multimedia audio -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gst-plugins/0.6 +MASTER_SITES= ${MASTER_SITE_GNOME} \ + http://gstreamer.freedesktop.org/src/gst-plugins/ +MASTER_SITE_SUBDIR= sources/gst-plugins/0.8 PKGNAMESUFFIX= -plugins DISTNAME= gst-plugins-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -18,7 +18,7 @@ DIST_SUBDIR= gnome2 MAINTAINER= lioux@FreeBSD.org COMMENT= GStreamer written collection of plugins handling several media types -LIB_DEPENDS= gstreamer-0.6.1:${PORTSDIR}/multimedia/gstreamer \ +LIB_DEPENDS= gstreamer-0.8.1:${PORTSDIR}/multimedia/gstreamer \ popt.0:${PORTSDIR}/devel/popt USE_X_PREFIX= yes @@ -29,38 +29,55 @@ USE_GNOME= gnomehack \ gnomeprefix \ pkgconfig \ gconf2 -USE_LIBTOOL_VER=13 USE_REINPLACE= yes -USE_SIZE= yes -WANT_SDL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-tests \ --disable-alsa \ - --disable-cdrom \ + --enable-cdrom \ --disable-mjpegtools \ + --disable-divx \ + --disable-dxr3 \ + --disable-http \ --disable-qcam \ + --disable-raw1394 \ --disable-v4l2 \ - --disable-v4l + --disable-v4l \ + --disable-vcd \ + --disable-dependency-tracking \ + --enable-xshm \ + --enable-static + +# list of plugins that need some work in one way or the other to work +# probable the lib needs to be ported, disable them for now. +CONFIGURE_ARGS+=--disable-mas \ + --disable-faac \ + --disable-tarkin \ + --disable-lcs \ + --disable-mplex \ + --disable-shout2 \ + --disable-librfb + CONFIGURE_ENV= PKG_CONFIG=${PKG_CONFIG} \ CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \ LDFLAGS="${LDFLAGS} -L${X11BASE}/lib -L${LOCALBASE}/lib" CONFIGURE_TARGET= PLIST_SUB= \ - VERSION="${PORTVERSION:C/..$//}" \ + VERSION="${GST_VERSION}" \ SHLIB_VERSION="${SHLIB_VERSION}" INSTALLS_SHLIB= yes -# for esound detection +# for various GNOME-related component detection WANT_GNOME= yes -MAN1= gst-launch-ext.1 gst-visualise.1 +MAN1= gst-launch-ext-${GST_VERSION}.1 gst-visualise-${GST_VERSION}.1 PKG_CONFIG?="${LOCALBASE}/bin/pkg-config" -XMMS_CONFIG?="${LOCALBASE}/bin/xmms-config" +SDL_CONFIG?="${LOCALBASE}/bin/sdl11-config" +GST_VERSION=${PORTVERSION:C/..$//} # library minor number -SHLIB_VERSION= 1 +SHLIB_VERSION= 1 post-patch: # as of this writing, FreeBSD does not support lrint* C99 math functions @@ -84,43 +101,26 @@ post-patch: # inttypes.h not stdint.h @${FIND} ${WRKSRC} -type f | \ ${XARGS} -n 10 ${REINPLACE_CMD} -e \ - 's|malloc.h|stdlib.h|; \ - s|stdint.h|inttypes.h|' -# use GMAKE, not MAKE - @${REINPLACE_CMD} -E -e \ - 's|make|${GMAKE}|' \ - ${WRKSRC}/gst-libs/ext/ffmpeg/Makefile.in + 's|malloc\.h|stdlib.h|; \ + s|stdint\.h|inttypes.h|' # force libaudiofile detection @${REINPLACE_CMD} -E -e \ 's|^.*afOpenVirtualFile[[:space:]]*\(\);|;|' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} -post-configure: -# CC safeness - @${ECHO_CMD} "CC=${CC}" >> \ - ${WRKSRC}/gst-libs/ext/ffmpeg/ffmpeg/config.mak - -.include <bsd.port.pre.mk> - post-install: -.if ${ARCH} == "ia64" || ${ARCH} == "amd64" # register plugins - @-${X11BASE}/bin/gst-register 2>/dev/null -.else - @${X11BASE}/bin/gst-register 2>/dev/null -.endif + -@${X11BASE}/bin/gst-register-${GST_VERSION} 2>/dev/null -# Fix build on ia64. This patch breaks other archs, so include it -# conditionally -.if ${ARCH} == "ia64" || ${ARCH} == "amd64" -EXTRA_PATCHES= ${FILESDIR}/ia64-patch-ffmpeg::configure -.endif +.include <bsd.port.pre.mk> # hermes is required for gstreamer-player to work # since it is currently the only colorspace plugin available WITH_HERMES= yes # gnomevfs is required for gstreamer-player to work WITH_GNOMEVFS= yes +# Add default MAD support. This is required for rhythmbox to work. +WITH_MAD= yes ## ## auto detect possible plugins @@ -131,16 +131,11 @@ WITH_GNOMEVFS= yes WITH_AALIB=yes .endif -# aRts +# arts .if exists(${LOCALBASE}/lib/libartsc.so.0) && !defined(WITHOUT_ARTS) WITH_ARTS=yes .endif -# avifile -.if exists(${LOCALBASE}/lib/libaviplay.a) -WITH_AVIFILE=yes -.endif - # cdparanoia .if exists(${LOCALBASE}/lib/libcdda_paranoia.a) WITH_CDPARANOIA=yes @@ -151,6 +146,11 @@ WITH_CDPARANOIA=yes WITH_ESOUND=yes .endif +# faad +.if exists(${LOCALBASE}/lib/libfaad.a) +WITH_FAAD=yes +.endif + # flac .if exists(${LOCALBASE}/lib/libFLAC.a) WITH_FLAC=yes @@ -161,6 +161,11 @@ WITH_FLAC=yes WITH_FREETYPE=yes .endif +# gdkpixbuf +.if ${HAVE_GNOME:Mgtk20}!="" +WITH_GDKPIXBUF=yes +.endif + # lame .if exists(${LOCALBASE}/lib/libmp3lame.a) WITH_LAME=yes @@ -171,6 +176,16 @@ WITH_LAME=yes WITH_GNOMEVFS=yes .endif +# jack +.if exists(${LOCALBASE}/lib/libjack.so.0) +WITH_JACK=YES +.endif + +# libcaca +.if exists(${LOCALBASE}/lib/libcaca.a) +WITH_LIBCACA=yes +.endif + # gsm .if exists(${LOCALBASE}/lib/libgsm.a) WITH_GSM=yes @@ -207,7 +222,6 @@ WITH_LIBDV=yes .endif # libdvdnav -# XXX libdvdnav needs to be updated to 0.1.9 or higher .if exists(${LOCALBASE}/lib/libdvdnav.so) WITH_LIBDVDNAV=yes .endif @@ -232,8 +246,13 @@ WITH_LIBMIKMOD=yes WITH_LIBMPEG2=yes .endif +# libmusicbrainz +.if exists(${LOCALBASE}/lib/libmusicbrainz.a) +WITH_LIBMUSICBRAINZ=yes +.endif + # libshout -.if exists(${LOCALBASE}/lib/libshout.a) +.if exists(${LOCALBASE}/lib/libshout.so.2) WITH_LIBSHOUT=yes .endif @@ -242,14 +261,34 @@ WITH_LIBSHOUT=yes WITH_LIBSIDPLAY=yes .endif +# libsndfile +.if exists(${LOCALBASE}/lib/libsndfile.a) +WITH_LIBSNDFILE=yes +.endif + +# libtheora +.if exists(${LOCALBASE}/lib/libtheora.a) +WITH_LIBTHEORA=yes +.endif + # mad .if exists(${LOCALBASE}/lib/libmad.a) WITH_MAD=yes .endif -# openquicktime -.if exists(${LOCALBASE}/lib/libopenquicktime.so) -WITH_OPENQUICKTIME=yes +# nas +.if exists(${X11BASE}/lib/libaudio.a) +WITH_NAS=YES +.endif + +# ogg +.if exists(${LOCALBASE}/lib/libogg.a) +WITH_OGG=yes +.endif + +# pango +.if exists(${X11BASE}/lib/libpangoft2-1.0.a) +WITH_PANGO=yes .endif # png @@ -258,10 +297,20 @@ WITH_PNG=yes .endif # sdl -.if ${HAVE_SDL:Msdl} +.if exists(${LOCALBASE}/lib/libSDL-1.1.a) WITH_SDL=yes .endif +# smoothwave +.if exists(${X11BASE}/lib/libgtk-x11-2.0.a) +WITH_SMOOTHWAVE=yes +.endif + +# speex +.if exists(${LOCALBASE}/lib/libspeex.a) +WITH_SPEEX=yes +.endif + # swfdec .if exists(${X11BASE}/lib/libswfdec.a) WITH_SWFDEC=yes @@ -272,9 +321,20 @@ WITH_SWFDEC=yes WITH_VORBIS=yes .endif -# xmms -.if exists(${X11BASE}/lib/libxmms.a) -#WITH_XMMS=yes +# vorbisidec +.if exists(${LOCALBASE}/lib/libvorbisidec.a) +WITH_VORBISIDEC=yes +.endif + +# xine +# this plugins is meant to support plugins that gstreamer doesn't have (yet) +.if exists(${X11BASE}/lib/libxine.so.9) +WITH_XINE=yes +.endif + +# xvid +.if exists(${LOCALBASE}/lib/libxvidcore.so.2) +WITH_XVID=yes .endif ## @@ -294,8 +354,8 @@ CONFIGURE_ARGS+= --with-aalib-prefix=${LOCALBASE} \ PLIST_SUB+= AALIB="" .endif -# aRts -.if (!defined(WITH_ARTS) || defined(WITHOUT_ARTS)) +# arts +.ifndef(WITH_ARTS) CONFIGURE_ARGS+= --disable-arts \ --disable-artsc \ --disable-artstest @@ -308,16 +368,6 @@ CONFIGURE_ARGS+= --with-arts-prefix=${LOCALBASE} \ PLIST_SUB+= ARTS="" .endif -# avifile -.ifndef(WITH_AVIFILE) -CONFIGURE_ARGS+= --disable-avifile -PLIST_SUB+= AVIFILE="@comment " -.else -LIB_DEPENDS+= aviplay.0:${PORTSDIR}/multimedia/avifile - -PLIST_SUB+= AVIFILE="" -.endif - # cdparanoia .ifndef(WITH_CDPARANOIA) CONFIGURE_ARGS+= --disable-cdparanoia @@ -340,6 +390,15 @@ CONFIGURE_ARGS+= --with-esd-prefix=${LOCALBASE} \ PLIST_SUB+= ESOUND="" .endif +# faad +.ifndef(WITH_FAAD) +CONFIGURE_ARGS+= --disable-faad +PLIST_SUB+= FAAD="@comment " +.else +LIB_DEPENDS+= faad.0:${PORTSDIR}/audio/faad +PLIST_SUB+= FAAD="" +.endif + # flac .ifndef(WITH_FLAC) CONFIGURE_ARGS+= --disable-flac @@ -362,6 +421,15 @@ CONFIGURE_ARGS+= --with-ft-prefix=${LOCALBASE} \ PLIST_SUB+= FREETYPE="" .endif +# gdkpixbuf +.ifndef(WITH_GDKPIXBUF) +CONFIGURE_ARGS+= --disable-gdk_pixbuf +PLIST_SUB+= GDKPIXBUF="@comment " +.else +USE_GNOME+= gtk20 +PLIST_SUB+= GDKPIXBUF="" +.endif + # gnomevfs .ifndef(WITH_GNOMEVFS) CONFIGURE_ARGS+= --disable-gnome_vfs @@ -381,6 +449,15 @@ LIB_DEPENDS+= gsm.1:${PORTSDIR}/audio/gsm PLIST_SUB+= GSM="" .endif +# jack +.ifndef(WITH_JACK) +CONFIGURE_ARGS+= --disable-jack +PLIST_SUB+= JACK="@comment " +.else +LIB_DEPENDS+= jack.0:${PORTSDIR}/audio/jack +PLIST_SUB+= JACK="" +.endif + # Hermes .ifndef(WITH_HERMES) CONFIGURE_ARGS+= --disable-hermes @@ -450,6 +527,15 @@ LIB_DEPENDS+= audiofile.0:${PORTSDIR}/audio/libaudiofile PLIST_SUB+= LIBAUDIOFILE="" .endif +# libcaca +.ifndef(WITH_LIBCACA) +CONFIGURE_ARGS+= --disable-libcaca +PLIST_SUB+= LIBCACA="@comment " +.else +BUILD_DEPENDS+= ${LOCALBASE}/lib/libcaca.a:${PORTSDIR}/graphics/libcaca +PLIST_SUB+= LIBCACA="" +.endif + # libdv .ifndef(WITH_LIBDV) CONFIGURE_ARGS+= --disable-libdv @@ -517,12 +603,21 @@ CONFIGURE_ARGS+= --with-mpeg2dec-prefix=${LOCALBASE} PLIST_SUB+= LIBMPEG2="" .endif +# libmusicbrainz +.ifndef(WITH_LIBMUSICBRAINZ) +CONFIGURE_ARGS+= --disable-musicbrainz +PLIST_SUB+= LIBMUSICBRAINZ="@comment " +.else +LIB_DEPENDS+= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz +PLIST_SUB+= LIBMUSICBRAINZ="" +.endif + # libshout .ifndef(WITH_LIBSHOUT) CONFIGURE_ARGS+= --disable-shout PLIST_SUB+= LIBSHOUT="@comment " .else -LIB_DEPENDS+= shout.3:${PORTSDIR}/audio/libshout2 +LIB_DEPENDS+= shout.3:${PORTSDIR}/audio/libshout PLIST_SUB+= LIBSHOUT="" .endif @@ -537,6 +632,24 @@ LIB_DEPENDS+= sidplay.1:${PORTSDIR}/audio/libsidplay PLIST_SUB+= LIBSIDPLAY="" .endif +# libsndfile +.ifndef(WITH_LIBSNDFILE) +CONFIGURE_ARGS+= --disable-sndfile +PLIST_SUB+= LIBSNDFILE="@comment " +.else +LIB_DEPENDS+= sndfile.1:${PORTSDIR}/audio/libsndfile +PLIST_SUB+= LIBSNDFILE="" +.endif + +# libtheora +.ifndef(WITH_LIBTHEORA) +CONFIGURE_ARGS+= --disable-theora +PLIST_SUB+= LIBTHEORA="@comment " +.else +LIB_DEPENDS+= theora.0:${PORTSDIR}/graphics/libtheora +PLIST_SUB+= LIBTHEORA="" +.endif + # mad .ifndef(WITH_MAD) CONFIGURE_ARGS+= --disable-mad @@ -548,14 +661,24 @@ LIB_DEPENDS+= mad.2:${PORTSDIR}/audio/libmad \ PLIST_SUB+= LIBMAD="" .endif -# openquicktime -.ifndef(WITH_OPENQUICKTIME) -CONFIGURE_ARGS+= --disable-openquicktime -PLIST_SUB+= OPENQUICKTIME="@comment " +# nas +.ifndef(WITH_NAS) +CONFIGURE_ARGS+= --disable-nas +PLIST_SUB+= NAS="@comment " .else -LIB_DEPENDS+= openquicktime.0:${PORTSDIR}/multimedia/openquicktime +LIB_DEPENDS+= audio.2:${PORTSDIR}/audio/nas -PLIST_SUB+= OPENQUICKTIME="" +PLIST_SUB+= NAS="" +.endif + +# ogg +.ifndef(WITH_OGG) +CONFIGURE_ARGS+= --disable-ogg \ + --disable-oggtest +PLIST_SUB+= OGG="@comment " +.else +LIB_DEPENDS+= ogg.5:${PORTSDIR}/audio/libogg +PLIST_SUB+= OGG="" .endif # oss @@ -566,6 +689,15 @@ PLIST_SUB+= OSS="@comment " PLIST_SUB+= OSS="" .endif +# pango +.ifndef(WITH_PANGO) +CONFIGURE_ARGS+= --disable-pango +PLIST_SUB+= PANGO="@comment " +.else +USE_GNOME+= pango +PLIST_SUB+= PANGO="" +.endif + # png .ifndef(WITH_PNG) CONFIGURE_ARGS+= --disable-libpng @@ -582,12 +714,32 @@ CONFIGURE_ARGS+= --disable-sdl \ --disable-sdltest PLIST_SUB+= SDL="@comment " .else -USE_SDL= sdl +LIB_DEPENDS+= SDL-1.1.7:${PORTSDIR}/devel/sdl12 + CONFIGURE_ARGS+= --with-sdl-prefix=${LOCALBASE} \ --with-sdl-exec-prefix=${LOCALBASE} +CONFIGURE_ENV+= SDL_CONFIG=${SDL_CONFIG} PLIST_SUB+= SDL="" .endif +# smoothwave +.ifndef(WITH_SMOOTHWAVE) +CONFIGURE_ARGS+= --disable-smoothwave +PLIST_SUB+= SMOOTHWAVE="@comment " +.else +USE_GNOME+= gtk20 +PLIST_SUB+= SMOOTHWAVE="" +.endif + +# speex +.ifndef(WITH_SPEEX) +CONFIGURE_ARGS+= --disable-speex +PLIST_SUB+= SPEEX="@comment " +.else +LIB_DEPENDS+= speex.2:${PORTSDIR}/audio/speex +PLIST_SUB+= SPEEX="" +.endif + # swfdec .ifndef(WITH_SWFDEC) CONFIGURE_ARGS+= --disable-swfdec @@ -613,17 +765,34 @@ CONFIGURE_ARGS+= --with-vorbis=${LOCALBASE} \ PLIST_SUB+= VORBIS="" .endif -# xmms -.ifndef(WITH_XMMS) -CONFIGURE_ARGS+= --disable-xmms -PLIST_SUB+= XMMS="@comment " +# vorbisidec +.ifndef(WITH_VORBISIDEC) +CONFIGURE_ARGS+= --disable-ivorbis +PLIST_SUB+= IVORBIS="@comment " +.else +LIB_DEPENDS+= vorbisidec.1:${PORTSDIR}/audio/libtremor +PLIST_SUB+= IVORBIS="" +.endif + +# xine +.ifndef(WITH_XINE) +CONFIGURE_ARGS+= --disable-xine +PLIST_SUB+= XINE="@comment " .else -LIB_DEPENDS+= xmms.4:${PORTSDIR}/multimedia/xmms +CONFIGURE_ARGS+= --enable-xine +LIB_DEPENDS+= xine.9:${PORTSDIR}/multimedia/libxine + +PLIST_SUB+= XINE="" +.endif -CONFIGURE_ARGS+= --with-xmms-prefix=${X11BASE} \ - --with-xmms-exec-prefix=${X11BASE} -CONFIGURE_ENV+= XMMS_CONFIG=${XMMS_CONFIG} -PLIST_SUB+= XMMS="" +# xvid +.ifndef(WITH_XVID) +CONFIGURE_ARGS+= --disable-xvid +PLIST_SUB+= XVID="@comment " +.undef WITH_XVID +#.else +#LIB_DEPENDS+= xvidcore.2:${PORTSDIR}/multimedia/xvid +#PLIST_SUB+= XVID="" .endif pre-everything:: @@ -638,10 +807,6 @@ pre-everything:: @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_ARTS to enable aRts Audio plugin' .endif -.ifndef(WITH_AVIFILE) - @${ECHO_MSG} '===>' - @${ECHO_MSG} '===> Define WITH_AVIFILE to enable avifile Video plugin' -.endif .ifndef(WITH_CDPARANOIA) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_CDPARANOIA to enable cdparanoia Audio plugin' @@ -650,6 +815,10 @@ pre-everything:: @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_ESOUND to enable esound Audio plugin' .endif +.ifndef(WITH_FAAD) + @${ECHO_MSG} '===>' + @${ECHO_MSG} '===> Define WITH_FAAD to enable faad Audio plugin' +.endif .ifndef(WITH_FLAC) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_FLAC to enable flac Audio plugin' @@ -658,6 +827,10 @@ pre-everything:: @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_FREETYPE to enable freetype support' .endif +.ifndef(WITH_GDKPIXBUF) + @${ECHO_MSG} '===>' + @${ECHO_MSG} '===> Define WITH_GDKPIXBUF to enable gdk-pixbuf plugin' +.endif .ifndef(WITH_GSM) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_GSM to enable gsm Audio plugin' @@ -666,6 +839,10 @@ pre-everything:: @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_GNOMEVFS to enable gnomevfs Network plugin' .endif +.ifndef(WITH_JACK) + @${ECHO_MSG} '===>' + @${ECHO_MSG} '===> Define WITH_JACK to enable jackd audio plugin' +.endif .ifndef(WITH_HERMES) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_HERMES to enable Hermes colorspace plugin' @@ -694,6 +871,10 @@ pre-everything:: @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_LIBAUDIOFILE to enable libaudiofile Audio plugin' .endif +.ifndef(WITH_LIBCACA) + @${ECHO_MSG} '===>' + @${ECHO_MSG} '===> Define WITH_LIBCACA to enable libcaca Video plugin' +.endif .ifndef(WITH_LIBDV) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_LIBDV to enable libdv Video plugin' @@ -718,6 +899,10 @@ pre-everything:: @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_LIBMPEG2 to enable libmpeg2 Video plugin' .endif +.ifndef(WITH_LIBMUSICBRAINZ) + @${ECHO_MSG} '===>' + @${ECHO_MSG} '===> Define WITH_LIBMUSICBRAINZ to enable libmusicbrainz Audio plugin' +.endif .ifndef(WITH_LIBSHOUT) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_LIBSHOUT to enable libshout Audio plugin' @@ -726,18 +911,30 @@ pre-everything:: @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_LIBSIDPLAY to enable libsidplay Audio plugin' .endif +.ifndef(WITH_LIBSNDFILE) + @${ECHO_MSG} '===>' + @${ECHO_MSG} '===> Define WITH_LIBSNDFILE to enable libsndfile Audio plugin' +.endif +.ifndef(WITH_LIBTHEORA) + @${ECHO_MSG} '===>' + @${ECHO_MSG} '===> Define WITH_LIBTHEORA to enable libtheora Video plugin' +.endif .ifndef(WITH_MAD) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_MAD to enable mad Audio plugin' .endif -.ifndef(WITH_OPENQUICKTIME) +.ifndef(WITH_NAS) @${ECHO_MSG} '===>' - @${ECHO_MSG} '===> Define WITH_OPENQUICKTIME to enable openquicktime Video plugin' + @${ECHO_MSG} '===> Define WITH_NAS to enable nas Audio plugin' .endif .ifndef(WITHOUT_OSS) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITHOUT_OSS to disable OSS Audio plugin' .endif +.ifndef(WITH_PANGO) + @${ECHO_MSG} '===>' + @${ECHO_MSG} '===> Define WITH_PANGO to enable pango textoverlay plugin' +.endif .ifndef(WITH_PNG) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_PNG to enable png Video plugin' @@ -746,6 +943,14 @@ pre-everything:: @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_SDL to enable SDL Video plugin' .endif +.ifndef(WITH_SMOOTHWAVE) + @${ECHO_MSG} '===>' + @${ECHO_MSG} '===> Define WITH_SMOOTHWAVE to enable Smoothwave Video plugin' +.endif +.ifndef(WITH_SPEEX) + @${ECHO_MSG} '===>' + @${ECHO_MSG} '===> Define WITH_SPEEX to enable Speex Video plugin' +.endif .ifndef(WITH_SWFDEC) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_SWFDEC to enable Flash Video plugin' @@ -754,9 +959,17 @@ pre-everything:: @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_VORBIS to enable vorbis Audio plugin' .endif -.ifndef(WITH_XMMS) +.ifndef(WITH_VORBISIDEC) + @${ECHO_MSG} '===>' + @${ECHO_MSG} '===> Define WITH_VORBISIDEC to enable vorbisidec Audio plugin' +.endif +.ifndef(WITH_XINE) + @${ECHO_MSG} '===>' + @${ECHO_MSG} '===> Define WITH_XINE to enable xine plugin' +.endif +.ifndef(WITH_XVID) @${ECHO_MSG} '===>' - @${ECHO_MSG} '===> Define WITH_XMMS to enable xmms Audio plugin' + @${ECHO_MSG} '===> Define WITH_XVID to enable xvid Video plugin' .endif .include <bsd.port.post.mk> diff --git a/multimedia/gstreamer-plugins/distinfo b/multimedia/gstreamer-plugins/distinfo index 403d20d1fbb3..75cdec26da1c 100644 --- a/multimedia/gstreamer-plugins/distinfo +++ b/multimedia/gstreamer-plugins/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gst-plugins-0.6.4.tar.bz2) = d62e6cd3750863b6395e4c1030223690 -SIZE (gnome2/gst-plugins-0.6.4.tar.bz2) = 1900957 +MD5 (gnome2/gst-plugins-0.8.0.tar.bz2) = 3735f701a25a37ed0b1ec6f3d861a658 +SIZE (gnome2/gst-plugins-0.8.0.tar.bz2) = 1751685 diff --git a/multimedia/gstreamer-plugins/files/ia64-patch-ffmpeg::configure b/multimedia/gstreamer-plugins/files/ia64-patch-ffmpeg::configure deleted file mode 100644 index f4c1cb8ae5f6..000000000000 --- a/multimedia/gstreamer-plugins/files/ia64-patch-ffmpeg::configure +++ /dev/null @@ -1,10 +0,0 @@ ---- gst-libs/ext/ffmpeg/ffmpeg/configure.bak Sat Sep 27 18:39:42 2003 -+++ gst-libs/ext/ffmpeg/ffmpeg/configure Sat Sep 27 19:53:52 2003 -@@ -119,6 +119,7 @@ - v4l="no" - audio_oss="yes" - make="gmake" -+CFLAGS="$CFLAGS -fPIC -DPIC" - LDFLAGS="$LDFLAGS -export-dynamic" - ;; - BSD/OS) diff --git a/multimedia/gstreamer-plugins/files/patch-configure b/multimedia/gstreamer-plugins/files/patch-configure index 001d56fd6e4f..e2987f9821af 100644 --- a/multimedia/gstreamer-plugins/files/patch-configure +++ b/multimedia/gstreamer-plugins/files/patch-configure @@ -1,10 +1,21 @@ ---- configure.orig Thu Jul 11 15:51:47 2002 -+++ configure Thu Jul 11 15:51:57 2002 -@@ -6731,6 +6731,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' +--- configure.orig Tue Mar 16 20:32:36 2004 ++++ configure Tue Mar 16 20:41:00 2004 +@@ -41192,7 +41192,8 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-laudio $X_LIBS $LIBS" ++#xxx fix the non x case is er niet... ++LIBS="-laudio -lm -lXt $X_LIBS $LIBS" + cat >conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" + /* confdefs.h. */ +@@ -44483,7 +44484,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-ltheora $LIBS" ++LIBS="-ltheora -logg $LIBS" + cat >conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" + /* confdefs.h. */ diff --git a/multimedia/gstreamer-plugins/files/patch-ext::ivorbis::vorbisenc.h b/multimedia/gstreamer-plugins/files/patch-ext::ivorbis::vorbisenc.h new file mode 100644 index 000000000000..90d39a1a29b2 --- /dev/null +++ b/multimedia/gstreamer-plugins/files/patch-ext::ivorbis::vorbisenc.h @@ -0,0 +1,103 @@ +--- /dev/null Thu Feb 12 22:22:00 2004 ++++ ext/ivorbis/vorbisenc.h Thu Feb 12 22:24:08 2004 +@@ -0,0 +1,100 @@ ++/* GStreamer ++ * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Library General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Library General Public License for more details. ++ * ++ * You should have received a copy of the GNU Library General Public ++ * License along with this library; if not, write to the ++ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, ++ * Boston, MA 02111-1307, USA. ++ */ ++ ++ ++#ifndef __VORBISENC_H__ ++#define __VORBISENC_H__ ++ ++ ++#include <gst/gst.h> ++ ++#include <tremor/ivorbiscodec.h> ++ ++#ifdef __cplusplus ++extern "C" { ++#endif /* __cplusplus */ ++ ++#define GST_TYPE_VORBISENC \ ++ (vorbisenc_get_type()) ++#define GST_VORBISENC(obj) \ ++ (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VORBISENC,VorbisEnc)) ++#define GST_VORBISENC_CLASS(klass) \ ++ (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VORBISENC,VorbisEncClass)) ++#define GST_IS_VORBISENC(obj) \ ++ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VORBISENC)) ++#define GST_IS_VORBISENC_CLASS(obj) \ ++ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VORBISENC)) ++ ++typedef struct _VorbisEnc VorbisEnc; ++typedef struct _VorbisEncClass VorbisEncClass; ++ ++struct _VorbisEnc { ++ GstElement element; ++ ++ GstPad *sinkpad, ++ *srcpad; ++ ++ ogg_stream_state os; /* take physical pages, weld into a logical ++ stream of packets */ ++ ogg_page og; /* one Ogg bitstream page. Vorbis packets are inside */ ++ ogg_packet op; /* one raw packet of data for decode */ ++ ++ vorbis_info vi; /* struct that stores all the static vorbis bitstream ++ settings */ ++ vorbis_comment vc; /* struct that stores all the user comments */ ++ ++ vorbis_dsp_state vd; /* central working state for the packet->PCM decoder */ ++ vorbis_block vb; /* local working space for packet->PCM decode */ ++ ++ gboolean eos; ++ ++ gboolean managed; ++ gint bitrate; ++ gint min_bitrate; ++ gint max_bitrate; ++ gfloat quality; ++ gboolean quality_set; ++ gint serial; ++ ++ gint channels; ++ gint frequency; ++ ++ guint64 samples_in; ++ guint64 bytes_out; ++ ++ GstCaps *metadata; ++ ++ gboolean setup; ++ gboolean flush_header; ++ gchar *last_message; ++}; ++ ++struct _VorbisEncClass { ++ GstElementClass parent_class; ++}; ++ ++GType vorbisenc_get_type(void); ++ ++ ++#ifdef __cplusplus ++} ++#endif /* __cplusplus */ ++ ++ ++#endif /* __VORBISENC_H__ */ diff --git a/multimedia/gstreamer-plugins/files/patch-ext_a52dec_gsta52dec.c b/multimedia/gstreamer-plugins/files/patch-ext_a52dec_gsta52dec.c deleted file mode 100644 index 05c0e53668b6..000000000000 --- a/multimedia/gstreamer-plugins/files/patch-ext_a52dec_gsta52dec.c +++ /dev/null @@ -1,11 +0,0 @@ ---- ext/a52dec/gsta52dec.c.orig Sun Apr 6 18:58:19 2003 -+++ ext/a52dec/gsta52dec.c Sun Apr 20 13:16:28 2003 -@@ -25,7 +25,7 @@ - - #include <stdlib.h> - --#ifdef HAVE_STDINT_H -+#if defined(HAVE_STDINT_H) || defined(__FreeBSD__) - #include <stdint.h> - #else - /* (Ronald) hacky... can't include stdint.h because it's not available diff --git a/multimedia/gstreamer-plugins/files/patch-ext_xvid_gstxvid.h b/multimedia/gstreamer-plugins/files/patch-ext_xvid_gstxvid.h new file mode 100644 index 000000000000..970e99fa1512 --- /dev/null +++ b/multimedia/gstreamer-plugins/files/patch-ext_xvid_gstxvid.h @@ -0,0 +1,39 @@ +--- /dev/null Sun Nov 16 22:55:00 2003 ++++ ext/xvid/gstxvid.h Sun Nov 16 22:32:25 2003 +@@ -0,0 +1,36 @@ ++/* GStreamer xvid decoder plugin ++ * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net> ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Library General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Library General Public License for more details. ++ * ++ * You should have received a copy of the GNU Library General Public ++ * License along with this library; if not, write to the ++ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, ++ * Boston, MA 02111-1307, USA. ++ */ ++ ++#ifndef __GST_XVID_H__ ++#define __GST_XVID_H__ ++ ++#include <gst/gst.h> ++ ++#ifdef __cplusplus ++extern "C" { ++#endif /* __cplusplus */ ++ ++extern gchar * gst_xvid_error (int errorcode); ++extern gboolean gst_xvid_init (void); ++ ++#ifdef __cplusplus ++} ++#endif /* __cplusplus */ ++ ++#endif /* __GST_XVID_H__ */ diff --git a/multimedia/gstreamer-plugins/files/patch-ffmpeg::simple_idct_alpha.c b/multimedia/gstreamer-plugins/files/patch-ffmpeg::simple_idct_alpha.c deleted file mode 100644 index 8149c39817cb..000000000000 --- a/multimedia/gstreamer-plugins/files/patch-ffmpeg::simple_idct_alpha.c +++ /dev/null @@ -1,17 +0,0 @@ ---- gst-libs/ext/ffmpeg/ffmpeg/libavcodec/alpha/simple_idct_alpha.c.orig Fri Apr 25 22:06:13 2003 -+++ gst-libs/ext/ffmpeg/ffmpeg/libavcodec/alpha/simple_idct_alpha.c Fri Apr 25 23:19:39 2003 -@@ -24,8 +24,14 @@ - * and Falk Hueffner <falk@debian.org> - */ - -+#include <sys/param.h> -+ - #include "asm.h" - #include "../dsputil.h" -+ -+#if defined(__FreeBSD__) && __FreeBSD_version < 500000 -+typedef __int32_t int_fast32_t; -+#endif - - extern void (*put_pixels_clamped_axp_p)(const DCTELEM *block, uint8_t *pixels, - int line_size); diff --git a/multimedia/gstreamer-plugins/files/patch-gst_level_filter.func b/multimedia/gstreamer-plugins/files/patch-gst_level_filter.func deleted file mode 100644 index 3b154eb4bdc1..000000000000 --- a/multimedia/gstreamer-plugins/files/patch-gst_level_filter.func +++ /dev/null @@ -1,14 +0,0 @@ ---- gst/level/filter.func.orig Mon Oct 13 22:32:12 2003 -+++ gst/level/filter.func Mon Oct 13 22:32:21 2003 -@@ -10,9 +10,9 @@ - register double square = 0.0; /* Square */ - register double PSS = 0.0; /* Peak Square Sample */ - -- *CS = 0.0; /* Cumulative Square for this block */ -- - gdouble normalizer = (double) (1 << resolution); -+ -+ *CS = 0.0; /* Cumulative Square for this block */ - - /* - * process data here diff --git a/multimedia/gstreamer-plugins/files/patch-ltmain.sh b/multimedia/gstreamer-plugins/files/patch-ltmain.sh new file mode 100644 index 000000000000..3d50310f61a4 --- /dev/null +++ b/multimedia/gstreamer-plugins/files/patch-ltmain.sh @@ -0,0 +1,51 @@ +--- ltmain.sh.orig Mon Oct 20 15:20:54 2003 ++++ ltmain.sh Fri Nov 14 18:06:07 2003 +@@ -1278,7 +1278,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 + ;; +@@ -1288,8 +1288,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 + ;; + +@@ -3008,6 +3016,9 @@ + # problems, so we reset it completely + verstring= + ;; ++ *-*-freebsd*) ++ # FreeBSD doesn't need this... ++ ;; + *) + verstring="0.0" + ;; +@@ -5457,10 +5468,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/multimedia/gstreamer-plugins/files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h b/multimedia/gstreamer-plugins/files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h new file mode 100644 index 000000000000..daaefac5eb5d --- /dev/null +++ b/multimedia/gstreamer-plugins/files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h @@ -0,0 +1,72 @@ +--- sys/cdrom/gstcdplayer_ioctl_bsd.h.orig Mon Mar 1 06:52:03 2004 ++++ sys/cdrom/gstcdplayer_ioctl_bsd.h Tue Mar 9 16:05:36 2004 +@@ -142,6 +142,7 @@ + { + struct ioc_toc_header toc_header; + struct ioc_read_toc_entry toc_entry; ++ struct cd_toc_entry toc_entry_data; + guint i; + + cd->fd = open(device,O_RDONLY | O_NONBLOCK); +@@ -151,7 +152,7 @@ + } + + /* get the toc header information */ +- if (ioctl(cd->fd,CDIOREADTOCHDR,&toc_header) != 0) { ++ if (ioctl(cd->fd,CDIOREADTOCHEADER,&toc_header) != 0) { + close(cd->fd); + cd->fd = -1; + return FALSE; +@@ -161,6 +162,8 @@ + for (i = 1; i <= toc_header.ending_track; i++) { + toc_entry.address_format = CD_MSF_FORMAT; + toc_entry.starting_track = i; ++ toc_entry.data = &toc_entry_data; ++ toc_entry.data_len = sizeof(toc_entry_data); + + if (ioctl(cd->fd,CDIOREADTOCENTRYS,&toc_entry) != 0) { + close(cd->fd); +@@ -168,9 +171,9 @@ + return FALSE; + } + +- cd->tracks[i].minute = toc_entry.entry.addr.msf.minute; +- cd->tracks[i].second = toc_entry.entry.addr.msf.second; +- cd->tracks[i].frame = toc_entry.entry.addr.msf.frame; ++ cd->tracks[i].minute = toc_entry.data->addr.msf.minute; ++ cd->tracks[i].second = toc_entry.data->addr.msf.second; ++ cd->tracks[i].frame = toc_entry.data->addr.msf.frame; + cd->tracks[i].data_track = (toc_entry.data->control & 4) == 4; + } + +@@ -186,9 +189,9 @@ + return FALSE; + } + +- cd->tracks[LEADOUT].minute = toc_entry.entry.addr.msf.minute; +- cd->tracks[LEADOUT].second = toc_entry.entry.addr.msf.second; +- cd->tracks[LEADOUT].frame = toc_entry.entry.addr.msf.frame; ++ cd->tracks[LEADOUT].minute = toc_entry.data->addr.msf.minute; ++ cd->tracks[LEADOUT].second = toc_entry.data->addr.msf.second; ++ cd->tracks[LEADOUT].frame = toc_entry.data->addr.msf.frame; + + cd->num_tracks = toc_header.ending_track; + +@@ -224,6 +227,8 @@ + return FALSE; + } + ++ /* lets return TRUE and lets see what happes (may not be correct)*/ ++ return TRUE; + } + + gboolean cd_pause(struct cd *cd) +@@ -321,7 +326,7 @@ + return -1; + } + +-#ifdef __NetBSD__ ++#if defined(__NetBSD__) || defined(__FreeBSD__) + return sub_channel.data->what.track_info.track_number; + #else + return sub_channel.data->track_number; diff --git a/multimedia/gstreamer-plugins/files/patch-sys_oss_gstosselement.h b/multimedia/gstreamer-plugins/files/patch-sys_oss_gstosselement.h new file mode 100644 index 000000000000..30258ba113c1 --- /dev/null +++ b/multimedia/gstreamer-plugins/files/patch-sys_oss_gstosselement.h @@ -0,0 +1,10 @@ +--- sys/oss/gstosselement.h.orig Tue Mar 9 16:46:05 2004 ++++ sys/oss/gstosselement.h Tue Mar 9 16:46:14 2004 +@@ -23,6 +23,7 @@ + #ifndef __GST_OSS_ELEMENT_H__ + #define __GST_OSS_ELEMENT_H__ + ++#include <sys/types.h> + #include <gst/gst.h> + + /* debugging category */ diff --git a/multimedia/gstreamer-plugins/files/patch-sys_ximage_ximagesink.h b/multimedia/gstreamer-plugins/files/patch-sys_ximage_ximagesink.h new file mode 100644 index 000000000000..07b125bfee89 --- /dev/null +++ b/multimedia/gstreamer-plugins/files/patch-sys_ximage_ximagesink.h @@ -0,0 +1,10 @@ +--- sys/ximage/ximagesink.h.orig Tue Mar 16 22:51:03 2004 ++++ sys/ximage/ximagesink.h Tue Mar 16 23:06:44 2004 +@@ -23,6 +23,7 @@ + #include <gst/video/videosink.h> + + #ifdef HAVE_XSHM ++#include <sys/types.h> + #include <sys/ipc.h> + #include <sys/shm.h> + #endif /* HAVE_XSHM */ diff --git a/multimedia/gstreamer-plugins/files/patch-sys_xvideo_gstxvimage.c b/multimedia/gstreamer-plugins/files/patch-sys_xvideo_gstxvimage.c deleted file mode 100644 index cb156ee6bf8d..000000000000 --- a/multimedia/gstreamer-plugins/files/patch-sys_xvideo_gstxvimage.c +++ /dev/null @@ -1,21 +0,0 @@ ---- sys/xvideo/gstxvimage.c.orig Sun Nov 23 20:17:00 2003 -+++ sys/xvideo/gstxvimage.c Sun Nov 23 20:25:19 2003 -@@ -20,6 +20,10 @@ - #include "config.h" - - #include <errno.h> -+#include <sys/types.h> -+#include <machine/param.h> -+#include <sys/types.h> -+#include <sys/ipc.h> - #include <sys/shm.h> /* for SHM symbols */ - #include <gst/gst.h> - /* gcc -ansi -pedantic on GNU/Linux causes warnings and errors -@@ -34,7 +38,6 @@ - - #include <stdio.h> - #include <stdlib.h> --#include <sys/types.h> - - #if defined (HAVE_IPC_H) && defined (HAVE_SHM_H) && defined (HAVE_XSHM_H) - #define USE_SHM diff --git a/multimedia/gstreamer-plugins/files/patch-sys_xvimage_xvimagesink.h b/multimedia/gstreamer-plugins/files/patch-sys_xvimage_xvimagesink.h new file mode 100644 index 000000000000..ddb0d1f00501 --- /dev/null +++ b/multimedia/gstreamer-plugins/files/patch-sys_xvimage_xvimagesink.h @@ -0,0 +1,10 @@ +--- sys/xvimage/xvimagesink.h.orig Tue Mar 16 22:51:04 2004 ++++ sys/xvimage/xvimagesink.h Tue Mar 16 23:07:39 2004 +@@ -23,6 +23,7 @@ + #include <gst/video/videosink.h> + + #ifdef HAVE_XSHM ++#include <sys/types.h> + #include <sys/ipc.h> + #include <sys/shm.h> + #endif /* HAVE_XSHM */ diff --git a/multimedia/gstreamer-plugins/pkg-plist b/multimedia/gstreamer-plugins/pkg-plist index 96e4b3b8a0fa..e35f5c93b0ad 100644 --- a/multimedia/gstreamer-plugins/pkg-plist +++ b/multimedia/gstreamer-plugins/pkg-plist @@ -1,32 +1,59 @@ -bin/gst-launch-ext -bin/gst-visualise +bin/gst-launch-ext-%%VERSION%% +bin/gst-visualise-%%VERSION%% etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/default/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/%%VERSION%%/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/%%VERSION%%/default/%gconf.xml etc/gconf/gconf.xml.defaults/system/gstreamer/%gconf.xml -etc/gconf/gconf.xml.defaults/system/gstreamer/default/%gconf.xml -etc/gconf/schemas/gstreamer.schemas +etc/gconf/gconf.xml.defaults/system/gstreamer/%%VERSION%%/%gconf.xml +etc/gconf/gconf.xml.defaults/system/gstreamer/%%VERSION%%/default/%gconf.xml +etc/gconf/schemas/gstreamer-%%VERSION%%.schemas +include/gstreamer-%%VERSION%%/gst/audio/gstaudiofilter.h +include/gstreamer-%%VERSION%%/gst/audio/audioclock.h include/gstreamer-%%VERSION%%/gst/audio/audio.h +include/gstreamer-%%VERSION%%/gst/colorbalance/colorbalance-enumtypes.h +include/gstreamer-%%VERSION%%/gst/colorbalance/colorbalance.h +include/gstreamer-%%VERSION%%/gst/colorbalance/colorbalancechannel.h include/gstreamer-%%VERSION%%/gst/floatcast/floatcast.h include/gstreamer-%%VERSION%%/gst/gconf/gconf.h include/gstreamer-%%VERSION%%/gst/idct/idct.h include/gstreamer-%%VERSION%%/gst/media-info/media-info.h +include/gstreamer-%%VERSION%%/gst/mixer/mixer-enumtypes.h +include/gstreamer-%%VERSION%%/gst/mixer/mixer.h +include/gstreamer-%%VERSION%%/gst/mixer/mixertrack.h +include/gstreamer-%%VERSION%%/gst/navigation/navigation.h +include/gstreamer-%%VERSION%%/gst/play/play-enumtypes.h include/gstreamer-%%VERSION%%/gst/play/play.h +include/gstreamer-%%VERSION%%/gst/propertyprobe/propertyprobe.h include/gstreamer-%%VERSION%%/gst/resample/resample.h -include/gstreamer-%%VERSION%%/gst/riff/riff.h +include/gstreamer-%%VERSION%%/gst/riff/riff-ids.h +include/gstreamer-%%VERSION%%/gst/riff/riff-media.h +include/gstreamer-%%VERSION%%/gst/riff/riff-read.h +include/gstreamer-%%VERSION%%/gst/tag/tag.h +include/gstreamer-%%VERSION%%/gst/tuner/tuner-enumtypes.h +include/gstreamer-%%VERSION%%/gst/tuner/tuner.h +include/gstreamer-%%VERSION%%/gst/tuner/tunerchannel.h +include/gstreamer-%%VERSION%%/gst/tuner/tunernorm.h include/gstreamer-%%VERSION%%/gst/video/video.h +include/gstreamer-%%VERSION%%/gst/video/videosink.h +include/gstreamer-%%VERSION%%/gst/xoverlay/xoverlay.h +include/gstreamer-%%VERSION%%/gst/xwindowlistener/xwindowlistener.h %%LIBA52%%lib/gstreamer-%%VERSION%%/libgsta52dec.so %%AALIB%%lib/gstreamer-%%VERSION%%/libgstaasink.so lib/gstreamer-%%VERSION%%/libgstac3parse.so lib/gstreamer-%%VERSION%%/libgstadder.so lib/gstreamer-%%VERSION%%/libgstalaw.so %%ARTS%%lib/gstreamer-%%VERSION%%/libgstartsdsink.so +lib/gstreamer-%%VERSION%%/libgstasf.so +lib/gstreamer-%%VERSION%%/libgstaudioconvert.so +lib/gstreamer-%%VERSION%%/libgstaudiofilter.so lib/gstreamer-%%VERSION%%/libgstaudio.so %%LIBAUDIOFILE%%lib/gstreamer-%%VERSION%%/libgstaudiofile.so lib/gstreamer-%%VERSION%%/libgstaudioscale.so lib/gstreamer-%%VERSION%%/libgstauparse.so -lib/gstreamer-%%VERSION%%/libgstavidemux.so -lib/gstreamer-%%VERSION%%/libgstavimux.so +lib/gstreamer-%%VERSION%%/libgstavi.so +%%LIBCACA%%lib/gstreamer-%%VERSION%%/libgstcacasink.so %%CDPARANOIA%%lib/gstreamer-%%VERSION%%/libgstcdparanoia.so +lib/gstreamer-%%VERSION%%/libgstcdplayer.so lib/gstreamer-%%VERSION%%/libgstcdxaparse.so lib/gstreamer-%%VERSION%%/libgstchart.so %%HERMES%%lib/gstreamer-%%VERSION%%/libgstcolorspace.so @@ -35,115 +62,151 @@ lib/gstreamer-%%VERSION%%/libgstdeinterlace.so %%LIBDV%%lib/gstreamer-%%VERSION%%/libgstdvdec.so %%LIBDVDNAV%%lib/gstreamer-%%VERSION%%/libgstdvdnavsrc.so %%LIBDVDREAD%%lib/gstreamer-%%VERSION%%/libgstdvdreadsrc.so +lib/gstreamer-%%VERSION%%/libgstefence.so lib/gstreamer-%%VERSION%%/libgsteffectv.so -%%ESOUND%%lib/gstreamer-%%VERSION%%/libgstesdmon.so -%%ESOUND%%lib/gstreamer-%%VERSION%%/libgstesdsink.so +%%ESOUND%%lib/gstreamer-%%VERSION%%/libgstesd.so +%%FAAD%%lib/gstreamer-%%VERSION%%/libgstfaad.so lib/gstreamer-%%VERSION%%/libgstfestival.so -lib/gstreamer-%%VERSION%%/libgstffmpeg.so -lib/gstreamer-%%VERSION%%/libgstffmpegall.so +lib/gstreamer-%%VERSION%%/libgstffmpegcolorspace.so lib/gstreamer-%%VERSION%%/libgstfilter.so %%FLAC%%lib/gstreamer-%%VERSION%%/libgstflac.so lib/gstreamer-%%VERSION%%/libgstflxdec.so -%%GNOMEVFS%%lib/gstreamer-%%VERSION%%/libgstgnomevfssink.so -%%GNOMEVFS%%lib/gstreamer-%%VERSION%%/libgstgnomevfssrc.so +lib/gstreamer-%%VERSION%%/libgstgamma.so +%%GDKPIXBUF%%lib/gstreamer-%%VERSION%%/libgstgdkpixbuf.so +%%GNOMEVFS%%lib/gstreamer-%%VERSION%%/libgstgnomevfs.so lib/gstreamer-%%VERSION%%/libgstgoom.so %%GSM%%lib/gstreamer-%%VERSION%%/libgstgsm.so +%%HERMES%%lib/gstreamer-%%VERSION%%/libgsthermescolorspace.so %%HTTP%%lib/gstreamer-%%VERSION%%/libgsthttpsrc.so lib/gstreamer-%%VERSION%%/libgstidct.so -lib/gstreamer-%%VERSION%%/libgstintfloat.so +lib/gstreamer-%%VERSION%%/libgstinterleave.so +%%IVORBIS%%lib/gstreamer-%%VERSION%%/libgstivorbis.so +%%JACK%%lib/gstreamer-%%VERSION%%/libgstjack.so %%JPEG%%lib/gstreamer-%%VERSION%%/libgstjpeg.so %%LADSPA%%lib/gstreamer-%%VERSION%%/libgstladspa.so %%LAME%%lib/gstreamer-%%VERSION%%/libgstlame.so lib/gstreamer-%%VERSION%%/libgstlevel.so %%LIBFAME%%lib/gstreamer-%%VERSION%%/libgstlibfame.so %%LIBMAD%%lib/gstreamer-%%VERSION%%/libgstmad.so +lib/gstreamer-%%VERSION%%/libgstmatroska.so lib/gstreamer-%%VERSION%%/libgstmedian.so %%LIBMIKMOD%%lib/gstreamer-%%VERSION%%/libgstmikmod.so +lib/gstreamer-%%VERSION%%/libgstmixmatrix.so +lib/gstreamer-%%VERSION%%/libgstmodplug.a lib/gstreamer-%%VERSION%%/libgstmodplug.so -lib/gstreamer-%%VERSION%%/libgstmono2stereo.so lib/gstreamer-%%VERSION%%/libgstmonoscope.so lib/gstreamer-%%VERSION%%/libgstmp1videoparse.so -lib/gstreamer-%%VERSION%%/libgstmp3types.so -lib/gstreamer-%%VERSION%%/libgstmpeg1encoder.so lib/gstreamer-%%VERSION%%/libgstmpeg1systemencode.so -lib/gstreamer-%%VERSION%%/libgstmpeg1types.so %%LIBMPEG2%%lib/gstreamer-%%VERSION%%/libgstmpeg2dec.so -lib/gstreamer-%%VERSION%%/libgstmpeg2enc.so lib/gstreamer-%%VERSION%%/libgstmpeg2subt.so -lib/gstreamer-%%VERSION%%/libgstmpeg2types.so lib/gstreamer-%%VERSION%%/libgstmpegaudio.so lib/gstreamer-%%VERSION%%/libgstmpegaudioparse.so lib/gstreamer-%%VERSION%%/libgstmpegstream.so lib/gstreamer-%%VERSION%%/libgstmulaw.so -lib/gstreamer-%%VERSION%%/libgstoneton.so -%%OPENQUICKTIME%%lib/gstreamer-%%VERSION%%/libgstopenquicktimedecoder.so -%%OPENQUICKTIME%%lib/gstreamer-%%VERSION%%/libgstopenquicktimedemux.so -%%OPENQUICKTIME%%lib/gstreamer-%%VERSION%%/libgstopenquicktimetypes.so +%%NAS%%lib/gstreamer-%%VERSION%%/libgstnassink.so +lib/gstreamer-%%VERSION%%/libgstnavigationtest.so +%%OGG%%lib/gstreamer-%%VERSION%%/libgstogg.so +lib/gstreamer-%%VERSION%%/libgstoverlay.so %%OSS%%lib/gstreamer-%%VERSION%%/libgstossaudio.so lib/gstreamer-%%VERSION%%/libgstpassthrough.so lib/gstreamer-%%VERSION%%/libgstplayondemand.so %%PNG%%lib/gstreamer-%%VERSION%%/libgstpng.so lib/gstreamer-%%VERSION%%/libgstqtdemux.so lib/gstreamer-%%VERSION%%/libgstresample.so +lib/gstreamer-%%VERSION%%/libgstrmdemux.so lib/gstreamer-%%VERSION%%/libgstriff.so lib/gstreamer-%%VERSION%%/libgstrtjpeg.so +lib/gstreamer-%%VERSION%%/libgstrtp.so %%SDL%%lib/gstreamer-%%VERSION%%/libgstsdlvideosink.so %%LIBSHOUT%%lib/gstreamer-%%VERSION%%/libgstshout.so +%%LIBSIDPLAY%%lib/gstreamer-%%VERSION%%/libgstsid.a %%LIBSIDPLAY%%lib/gstreamer-%%VERSION%%/libgstsid.so lib/gstreamer-%%VERSION%%/libgstsilence.so lib/gstreamer-%%VERSION%%/libgstsinesrc.so +%%SMOOTHWAVE%%lib/gstreamer-%%VERSION%%/libgstsmoothwave.so lib/gstreamer-%%VERSION%%/libgstsmooth.so lib/gstreamer-%%VERSION%%/libgstsmpte.so %%PNG%%lib/gstreamer-%%VERSION%%/libgstsnapshot.so +%%LIBSNDFILE%%lib/gstreamer-%%VERSION%%/libgstsndfile.so lib/gstreamer-%%VERSION%%/libgstspectrum.so lib/gstreamer-%%VERSION%%/libgstspeed.so +%%SPEEX%%lib/gstreamer-%%VERSION%%/libgstspeex.so lib/gstreamer-%%VERSION%%/libgststereo.so -lib/gstreamer-%%VERSION%%/libgststereo2mono.so -lib/gstreamer-%%VERSION%%/libgststereosplit.so %%SWFDEC%%lib/gstreamer-%%VERSION%%/libgstswfdec.so +lib/gstreamer-%%VERSION%%/libgstswitch.so lib/gstreamer-%%VERSION%%/libgstsynaesthesia.so +lib/gstreamer-%%VERSION%%/libgsttagedit.so +lib/gstreamer-%%VERSION%%/libgsttcp.so +lib/gstreamer-%%VERSION%%/libgsttextoverlay.so +%%LIBTHEORA%%lib/gstreamer-%%VERSION%%/libgsttheora.so +lib/gstreamer-%%VERSION%%/libgsttimeoverlay.so +%%LIBMUSICBRAINZ%%lib/gstreamer-%%VERSION%%/libgsttrm.so +lib/gstreamer-%%VERSION%%/libgsttypefindfunctions.so lib/gstreamer-%%VERSION%%/libgstudp.so lib/gstreamer-%%VERSION%%/libgstvbidec.so lib/gstreamer-%%VERSION%%/libgstvideo.so +lib/gstreamer-%%VERSION%%/libgstvideobalance.so lib/gstreamer-%%VERSION%%/libgstvideocrop.so +lib/gstreamer-%%VERSION%%/libgstvideodrop.so +lib/gstreamer-%%VERSION%%/libgstvideofilter.so +lib/gstreamer-%%VERSION%%/libgstvideoflip.so lib/gstreamer-%%VERSION%%/libgstvideoscale.so -lib/gstreamer-%%VERSION%%/libgstvideosink.so lib/gstreamer-%%VERSION%%/libgstvideotestsrc.so lib/gstreamer-%%VERSION%%/libgstvolenv.so lib/gstreamer-%%VERSION%%/libgstvolume.so %%VORBIS%%lib/gstreamer-%%VERSION%%/libgstvorbis.so -lib/gstreamer-%%VERSION%%/libgstvumeter.so lib/gstreamer-%%VERSION%%/libgstwavenc.so lib/gstreamer-%%VERSION%%/libgstwavparse.so -lib/gstreamer-%%VERSION%%/libgstxvideosink.so +lib/gstreamer-%%VERSION%%/libgstximagesink.so +%%XINE%%lib/gstreamer-%%VERSION%%/libgstxine.so +%%XVID%%lib/gstreamer-%%VERSION%%/libgstxvid.so +lib/gstreamer-%%VERSION%%/libgstxvimagesink.so +lib/gstreamer-%%VERSION%%/libgstxwindowlistener.so lib/gstreamer-%%VERSION%%/libgsty4menc.so -lib/gstreamer-%%VERSION%%/libmixmatrix.so lib/libgstgconf-%%VERSION%%.a lib/libgstgconf-%%VERSION%%.so lib/libgstgconf-%%VERSION%%.so.%%SHLIB_VERSION%% +lib/libgstinterfaces-%%VERSION%%.a +lib/libgstinterfaces-%%VERSION%%.so +lib/libgstinterfaces-%%VERSION%%.so.%%SHLIB_VERSION%% lib/libgstmedia-info-%%VERSION%%.a lib/libgstmedia-info-%%VERSION%%.so -lib/libgstmedia-info-%%VERSION%%.so.0 +lib/libgstmedia-info-%%VERSION%%.so.%%SHLIB_VERSION%% lib/libgstplay-%%VERSION%%.a lib/libgstplay-%%VERSION%%.so lib/libgstplay-%%VERSION%%.so.%%SHLIB_VERSION%% libdata/pkgconfig/gstreamer-gconf-%%VERSION%%.pc +libdata/pkgconfig/gstreamer-interfaces-%%VERSION%%.pc libdata/pkgconfig/gstreamer-libs-%%VERSION%%.pc +libdata/pkgconfig/gstreamer-media-info-%%VERSION%%.pc libdata/pkgconfig/gstreamer-play-%%VERSION%%.pc +libdata/pkgconfig/gstreamer-plugins-%%VERSION%%.pc +share/locale/nl/LC_MESSAGES/gst-plugins-%%VERSION%%.mo +share/locale/sr/LC_MESSAGES/gst-plugins-%%VERSION%%.mo @unexec rmdir %D/lib/gstreamer-%%VERSION%% 2>/dev/null || true +@dirrm include/gstreamer-%%VERSION%%/gst/xwindowlistener +@dirrm include/gstreamer-%%VERSION%%/gst/xoverlay @dirrm include/gstreamer-%%VERSION%%/gst/video +@dirrm include/gstreamer-%%VERSION%%/gst/tuner @dirrm include/gstreamer-%%VERSION%%/gst/riff @dirrm include/gstreamer-%%VERSION%%/gst/resample +@dirrm include/gstreamer-%%VERSION%%/gst/propertyprobe @dirrm include/gstreamer-%%VERSION%%/gst/play +@dirrm include/gstreamer-%%VERSION%%/gst/navigation +@dirrm include/gstreamer-%%VERSION%%/gst/mixer @dirrm include/gstreamer-%%VERSION%%/gst/media-info @dirrm include/gstreamer-%%VERSION%%/gst/idct @dirrm include/gstreamer-%%VERSION%%/gst/gconf @dirrm include/gstreamer-%%VERSION%%/gst/floatcast +@dirrm include/gstreamer-%%VERSION%%/gst/colorbalance @dirrm include/gstreamer-%%VERSION%%/gst/audio -@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer/default +@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer/%%VERSION%%/default +@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer/%%VERSION%% @dirrm etc/gconf/gconf.xml.defaults/system/gstreamer -@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/default +@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/%%VERSION%%/default +@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/%%VERSION%% @dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer +@unexec rmdir %D/include/gstreamer-%%VERSION%%/gst 2>/dev/null || true @unexec rmdir %D/include/gstreamer-%%VERSION%% 2>/dev/null || true -@exec %%X11BASE%%/bin/gst-register 2>/dev/null -@unexec %%X11BASE%%/bin/gst-register 2>/dev/null +@exec %%X11BASE%%/bin/gst-register-%%VERSION%% 2>/dev/null || true +@unexec %%X11BASE%%/bin/gst-register-%%VERSION%% 2>/dev/null || true diff --git a/multimedia/gstreamer-plugins80/Makefile b/multimedia/gstreamer-plugins80/Makefile index 3bd77295be8b..766898c4fe77 100644 --- a/multimedia/gstreamer-plugins80/Makefile +++ b/multimedia/gstreamer-plugins80/Makefile @@ -6,11 +6,11 @@ # PORTNAME= gstreamer -PORTVERSION= 0.6.4 -PORTREVISION= 3 +PORTVERSION= 0.8.0 CATEGORIES= multimedia audio -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gst-plugins/0.6 +MASTER_SITES= ${MASTER_SITE_GNOME} \ + http://gstreamer.freedesktop.org/src/gst-plugins/ +MASTER_SITE_SUBDIR= sources/gst-plugins/0.8 PKGNAMESUFFIX= -plugins DISTNAME= gst-plugins-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -18,7 +18,7 @@ DIST_SUBDIR= gnome2 MAINTAINER= lioux@FreeBSD.org COMMENT= GStreamer written collection of plugins handling several media types -LIB_DEPENDS= gstreamer-0.6.1:${PORTSDIR}/multimedia/gstreamer \ +LIB_DEPENDS= gstreamer-0.8.1:${PORTSDIR}/multimedia/gstreamer \ popt.0:${PORTSDIR}/devel/popt USE_X_PREFIX= yes @@ -29,38 +29,55 @@ USE_GNOME= gnomehack \ gnomeprefix \ pkgconfig \ gconf2 -USE_LIBTOOL_VER=13 USE_REINPLACE= yes -USE_SIZE= yes -WANT_SDL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-tests \ --disable-alsa \ - --disable-cdrom \ + --enable-cdrom \ --disable-mjpegtools \ + --disable-divx \ + --disable-dxr3 \ + --disable-http \ --disable-qcam \ + --disable-raw1394 \ --disable-v4l2 \ - --disable-v4l + --disable-v4l \ + --disable-vcd \ + --disable-dependency-tracking \ + --enable-xshm \ + --enable-static + +# list of plugins that need some work in one way or the other to work +# probable the lib needs to be ported, disable them for now. +CONFIGURE_ARGS+=--disable-mas \ + --disable-faac \ + --disable-tarkin \ + --disable-lcs \ + --disable-mplex \ + --disable-shout2 \ + --disable-librfb + CONFIGURE_ENV= PKG_CONFIG=${PKG_CONFIG} \ CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \ LDFLAGS="${LDFLAGS} -L${X11BASE}/lib -L${LOCALBASE}/lib" CONFIGURE_TARGET= PLIST_SUB= \ - VERSION="${PORTVERSION:C/..$//}" \ + VERSION="${GST_VERSION}" \ SHLIB_VERSION="${SHLIB_VERSION}" INSTALLS_SHLIB= yes -# for esound detection +# for various GNOME-related component detection WANT_GNOME= yes -MAN1= gst-launch-ext.1 gst-visualise.1 +MAN1= gst-launch-ext-${GST_VERSION}.1 gst-visualise-${GST_VERSION}.1 PKG_CONFIG?="${LOCALBASE}/bin/pkg-config" -XMMS_CONFIG?="${LOCALBASE}/bin/xmms-config" +SDL_CONFIG?="${LOCALBASE}/bin/sdl11-config" +GST_VERSION=${PORTVERSION:C/..$//} # library minor number -SHLIB_VERSION= 1 +SHLIB_VERSION= 1 post-patch: # as of this writing, FreeBSD does not support lrint* C99 math functions @@ -84,43 +101,26 @@ post-patch: # inttypes.h not stdint.h @${FIND} ${WRKSRC} -type f | \ ${XARGS} -n 10 ${REINPLACE_CMD} -e \ - 's|malloc.h|stdlib.h|; \ - s|stdint.h|inttypes.h|' -# use GMAKE, not MAKE - @${REINPLACE_CMD} -E -e \ - 's|make|${GMAKE}|' \ - ${WRKSRC}/gst-libs/ext/ffmpeg/Makefile.in + 's|malloc\.h|stdlib.h|; \ + s|stdint\.h|inttypes.h|' # force libaudiofile detection @${REINPLACE_CMD} -E -e \ 's|^.*afOpenVirtualFile[[:space:]]*\(\);|;|' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} -post-configure: -# CC safeness - @${ECHO_CMD} "CC=${CC}" >> \ - ${WRKSRC}/gst-libs/ext/ffmpeg/ffmpeg/config.mak - -.include <bsd.port.pre.mk> - post-install: -.if ${ARCH} == "ia64" || ${ARCH} == "amd64" # register plugins - @-${X11BASE}/bin/gst-register 2>/dev/null -.else - @${X11BASE}/bin/gst-register 2>/dev/null -.endif + -@${X11BASE}/bin/gst-register-${GST_VERSION} 2>/dev/null -# Fix build on ia64. This patch breaks other archs, so include it -# conditionally -.if ${ARCH} == "ia64" || ${ARCH} == "amd64" -EXTRA_PATCHES= ${FILESDIR}/ia64-patch-ffmpeg::configure -.endif +.include <bsd.port.pre.mk> # hermes is required for gstreamer-player to work # since it is currently the only colorspace plugin available WITH_HERMES= yes # gnomevfs is required for gstreamer-player to work WITH_GNOMEVFS= yes +# Add default MAD support. This is required for rhythmbox to work. +WITH_MAD= yes ## ## auto detect possible plugins @@ -131,16 +131,11 @@ WITH_GNOMEVFS= yes WITH_AALIB=yes .endif -# aRts +# arts .if exists(${LOCALBASE}/lib/libartsc.so.0) && !defined(WITHOUT_ARTS) WITH_ARTS=yes .endif -# avifile -.if exists(${LOCALBASE}/lib/libaviplay.a) -WITH_AVIFILE=yes -.endif - # cdparanoia .if exists(${LOCALBASE}/lib/libcdda_paranoia.a) WITH_CDPARANOIA=yes @@ -151,6 +146,11 @@ WITH_CDPARANOIA=yes WITH_ESOUND=yes .endif +# faad +.if exists(${LOCALBASE}/lib/libfaad.a) +WITH_FAAD=yes +.endif + # flac .if exists(${LOCALBASE}/lib/libFLAC.a) WITH_FLAC=yes @@ -161,6 +161,11 @@ WITH_FLAC=yes WITH_FREETYPE=yes .endif +# gdkpixbuf +.if ${HAVE_GNOME:Mgtk20}!="" +WITH_GDKPIXBUF=yes +.endif + # lame .if exists(${LOCALBASE}/lib/libmp3lame.a) WITH_LAME=yes @@ -171,6 +176,16 @@ WITH_LAME=yes WITH_GNOMEVFS=yes .endif +# jack +.if exists(${LOCALBASE}/lib/libjack.so.0) +WITH_JACK=YES +.endif + +# libcaca +.if exists(${LOCALBASE}/lib/libcaca.a) +WITH_LIBCACA=yes +.endif + # gsm .if exists(${LOCALBASE}/lib/libgsm.a) WITH_GSM=yes @@ -207,7 +222,6 @@ WITH_LIBDV=yes .endif # libdvdnav -# XXX libdvdnav needs to be updated to 0.1.9 or higher .if exists(${LOCALBASE}/lib/libdvdnav.so) WITH_LIBDVDNAV=yes .endif @@ -232,8 +246,13 @@ WITH_LIBMIKMOD=yes WITH_LIBMPEG2=yes .endif +# libmusicbrainz +.if exists(${LOCALBASE}/lib/libmusicbrainz.a) +WITH_LIBMUSICBRAINZ=yes +.endif + # libshout -.if exists(${LOCALBASE}/lib/libshout.a) +.if exists(${LOCALBASE}/lib/libshout.so.2) WITH_LIBSHOUT=yes .endif @@ -242,14 +261,34 @@ WITH_LIBSHOUT=yes WITH_LIBSIDPLAY=yes .endif +# libsndfile +.if exists(${LOCALBASE}/lib/libsndfile.a) +WITH_LIBSNDFILE=yes +.endif + +# libtheora +.if exists(${LOCALBASE}/lib/libtheora.a) +WITH_LIBTHEORA=yes +.endif + # mad .if exists(${LOCALBASE}/lib/libmad.a) WITH_MAD=yes .endif -# openquicktime -.if exists(${LOCALBASE}/lib/libopenquicktime.so) -WITH_OPENQUICKTIME=yes +# nas +.if exists(${X11BASE}/lib/libaudio.a) +WITH_NAS=YES +.endif + +# ogg +.if exists(${LOCALBASE}/lib/libogg.a) +WITH_OGG=yes +.endif + +# pango +.if exists(${X11BASE}/lib/libpangoft2-1.0.a) +WITH_PANGO=yes .endif # png @@ -258,10 +297,20 @@ WITH_PNG=yes .endif # sdl -.if ${HAVE_SDL:Msdl} +.if exists(${LOCALBASE}/lib/libSDL-1.1.a) WITH_SDL=yes .endif +# smoothwave +.if exists(${X11BASE}/lib/libgtk-x11-2.0.a) +WITH_SMOOTHWAVE=yes +.endif + +# speex +.if exists(${LOCALBASE}/lib/libspeex.a) +WITH_SPEEX=yes +.endif + # swfdec .if exists(${X11BASE}/lib/libswfdec.a) WITH_SWFDEC=yes @@ -272,9 +321,20 @@ WITH_SWFDEC=yes WITH_VORBIS=yes .endif -# xmms -.if exists(${X11BASE}/lib/libxmms.a) -#WITH_XMMS=yes +# vorbisidec +.if exists(${LOCALBASE}/lib/libvorbisidec.a) +WITH_VORBISIDEC=yes +.endif + +# xine +# this plugins is meant to support plugins that gstreamer doesn't have (yet) +.if exists(${X11BASE}/lib/libxine.so.9) +WITH_XINE=yes +.endif + +# xvid +.if exists(${LOCALBASE}/lib/libxvidcore.so.2) +WITH_XVID=yes .endif ## @@ -294,8 +354,8 @@ CONFIGURE_ARGS+= --with-aalib-prefix=${LOCALBASE} \ PLIST_SUB+= AALIB="" .endif -# aRts -.if (!defined(WITH_ARTS) || defined(WITHOUT_ARTS)) +# arts +.ifndef(WITH_ARTS) CONFIGURE_ARGS+= --disable-arts \ --disable-artsc \ --disable-artstest @@ -308,16 +368,6 @@ CONFIGURE_ARGS+= --with-arts-prefix=${LOCALBASE} \ PLIST_SUB+= ARTS="" .endif -# avifile -.ifndef(WITH_AVIFILE) -CONFIGURE_ARGS+= --disable-avifile -PLIST_SUB+= AVIFILE="@comment " -.else -LIB_DEPENDS+= aviplay.0:${PORTSDIR}/multimedia/avifile - -PLIST_SUB+= AVIFILE="" -.endif - # cdparanoia .ifndef(WITH_CDPARANOIA) CONFIGURE_ARGS+= --disable-cdparanoia @@ -340,6 +390,15 @@ CONFIGURE_ARGS+= --with-esd-prefix=${LOCALBASE} \ PLIST_SUB+= ESOUND="" .endif +# faad +.ifndef(WITH_FAAD) +CONFIGURE_ARGS+= --disable-faad +PLIST_SUB+= FAAD="@comment " +.else +LIB_DEPENDS+= faad.0:${PORTSDIR}/audio/faad +PLIST_SUB+= FAAD="" +.endif + # flac .ifndef(WITH_FLAC) CONFIGURE_ARGS+= --disable-flac @@ -362,6 +421,15 @@ CONFIGURE_ARGS+= --with-ft-prefix=${LOCALBASE} \ PLIST_SUB+= FREETYPE="" .endif +# gdkpixbuf +.ifndef(WITH_GDKPIXBUF) +CONFIGURE_ARGS+= --disable-gdk_pixbuf +PLIST_SUB+= GDKPIXBUF="@comment " +.else +USE_GNOME+= gtk20 +PLIST_SUB+= GDKPIXBUF="" +.endif + # gnomevfs .ifndef(WITH_GNOMEVFS) CONFIGURE_ARGS+= --disable-gnome_vfs @@ -381,6 +449,15 @@ LIB_DEPENDS+= gsm.1:${PORTSDIR}/audio/gsm PLIST_SUB+= GSM="" .endif +# jack +.ifndef(WITH_JACK) +CONFIGURE_ARGS+= --disable-jack +PLIST_SUB+= JACK="@comment " +.else +LIB_DEPENDS+= jack.0:${PORTSDIR}/audio/jack +PLIST_SUB+= JACK="" +.endif + # Hermes .ifndef(WITH_HERMES) CONFIGURE_ARGS+= --disable-hermes @@ -450,6 +527,15 @@ LIB_DEPENDS+= audiofile.0:${PORTSDIR}/audio/libaudiofile PLIST_SUB+= LIBAUDIOFILE="" .endif +# libcaca +.ifndef(WITH_LIBCACA) +CONFIGURE_ARGS+= --disable-libcaca +PLIST_SUB+= LIBCACA="@comment " +.else +BUILD_DEPENDS+= ${LOCALBASE}/lib/libcaca.a:${PORTSDIR}/graphics/libcaca +PLIST_SUB+= LIBCACA="" +.endif + # libdv .ifndef(WITH_LIBDV) CONFIGURE_ARGS+= --disable-libdv @@ -517,12 +603,21 @@ CONFIGURE_ARGS+= --with-mpeg2dec-prefix=${LOCALBASE} PLIST_SUB+= LIBMPEG2="" .endif +# libmusicbrainz +.ifndef(WITH_LIBMUSICBRAINZ) +CONFIGURE_ARGS+= --disable-musicbrainz +PLIST_SUB+= LIBMUSICBRAINZ="@comment " +.else +LIB_DEPENDS+= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz +PLIST_SUB+= LIBMUSICBRAINZ="" +.endif + # libshout .ifndef(WITH_LIBSHOUT) CONFIGURE_ARGS+= --disable-shout PLIST_SUB+= LIBSHOUT="@comment " .else -LIB_DEPENDS+= shout.3:${PORTSDIR}/audio/libshout2 +LIB_DEPENDS+= shout.3:${PORTSDIR}/audio/libshout PLIST_SUB+= LIBSHOUT="" .endif @@ -537,6 +632,24 @@ LIB_DEPENDS+= sidplay.1:${PORTSDIR}/audio/libsidplay PLIST_SUB+= LIBSIDPLAY="" .endif +# libsndfile +.ifndef(WITH_LIBSNDFILE) +CONFIGURE_ARGS+= --disable-sndfile +PLIST_SUB+= LIBSNDFILE="@comment " +.else +LIB_DEPENDS+= sndfile.1:${PORTSDIR}/audio/libsndfile +PLIST_SUB+= LIBSNDFILE="" +.endif + +# libtheora +.ifndef(WITH_LIBTHEORA) +CONFIGURE_ARGS+= --disable-theora +PLIST_SUB+= LIBTHEORA="@comment " +.else +LIB_DEPENDS+= theora.0:${PORTSDIR}/graphics/libtheora +PLIST_SUB+= LIBTHEORA="" +.endif + # mad .ifndef(WITH_MAD) CONFIGURE_ARGS+= --disable-mad @@ -548,14 +661,24 @@ LIB_DEPENDS+= mad.2:${PORTSDIR}/audio/libmad \ PLIST_SUB+= LIBMAD="" .endif -# openquicktime -.ifndef(WITH_OPENQUICKTIME) -CONFIGURE_ARGS+= --disable-openquicktime -PLIST_SUB+= OPENQUICKTIME="@comment " +# nas +.ifndef(WITH_NAS) +CONFIGURE_ARGS+= --disable-nas +PLIST_SUB+= NAS="@comment " .else -LIB_DEPENDS+= openquicktime.0:${PORTSDIR}/multimedia/openquicktime +LIB_DEPENDS+= audio.2:${PORTSDIR}/audio/nas -PLIST_SUB+= OPENQUICKTIME="" +PLIST_SUB+= NAS="" +.endif + +# ogg +.ifndef(WITH_OGG) +CONFIGURE_ARGS+= --disable-ogg \ + --disable-oggtest +PLIST_SUB+= OGG="@comment " +.else +LIB_DEPENDS+= ogg.5:${PORTSDIR}/audio/libogg +PLIST_SUB+= OGG="" .endif # oss @@ -566,6 +689,15 @@ PLIST_SUB+= OSS="@comment " PLIST_SUB+= OSS="" .endif +# pango +.ifndef(WITH_PANGO) +CONFIGURE_ARGS+= --disable-pango +PLIST_SUB+= PANGO="@comment " +.else +USE_GNOME+= pango +PLIST_SUB+= PANGO="" +.endif + # png .ifndef(WITH_PNG) CONFIGURE_ARGS+= --disable-libpng @@ -582,12 +714,32 @@ CONFIGURE_ARGS+= --disable-sdl \ --disable-sdltest PLIST_SUB+= SDL="@comment " .else -USE_SDL= sdl +LIB_DEPENDS+= SDL-1.1.7:${PORTSDIR}/devel/sdl12 + CONFIGURE_ARGS+= --with-sdl-prefix=${LOCALBASE} \ --with-sdl-exec-prefix=${LOCALBASE} +CONFIGURE_ENV+= SDL_CONFIG=${SDL_CONFIG} PLIST_SUB+= SDL="" .endif +# smoothwave +.ifndef(WITH_SMOOTHWAVE) +CONFIGURE_ARGS+= --disable-smoothwave +PLIST_SUB+= SMOOTHWAVE="@comment " +.else +USE_GNOME+= gtk20 +PLIST_SUB+= SMOOTHWAVE="" +.endif + +# speex +.ifndef(WITH_SPEEX) +CONFIGURE_ARGS+= --disable-speex +PLIST_SUB+= SPEEX="@comment " +.else +LIB_DEPENDS+= speex.2:${PORTSDIR}/audio/speex +PLIST_SUB+= SPEEX="" +.endif + # swfdec .ifndef(WITH_SWFDEC) CONFIGURE_ARGS+= --disable-swfdec @@ -613,17 +765,34 @@ CONFIGURE_ARGS+= --with-vorbis=${LOCALBASE} \ PLIST_SUB+= VORBIS="" .endif -# xmms -.ifndef(WITH_XMMS) -CONFIGURE_ARGS+= --disable-xmms -PLIST_SUB+= XMMS="@comment " +# vorbisidec +.ifndef(WITH_VORBISIDEC) +CONFIGURE_ARGS+= --disable-ivorbis +PLIST_SUB+= IVORBIS="@comment " +.else +LIB_DEPENDS+= vorbisidec.1:${PORTSDIR}/audio/libtremor +PLIST_SUB+= IVORBIS="" +.endif + +# xine +.ifndef(WITH_XINE) +CONFIGURE_ARGS+= --disable-xine +PLIST_SUB+= XINE="@comment " .else -LIB_DEPENDS+= xmms.4:${PORTSDIR}/multimedia/xmms +CONFIGURE_ARGS+= --enable-xine +LIB_DEPENDS+= xine.9:${PORTSDIR}/multimedia/libxine + +PLIST_SUB+= XINE="" +.endif -CONFIGURE_ARGS+= --with-xmms-prefix=${X11BASE} \ - --with-xmms-exec-prefix=${X11BASE} -CONFIGURE_ENV+= XMMS_CONFIG=${XMMS_CONFIG} -PLIST_SUB+= XMMS="" +# xvid +.ifndef(WITH_XVID) +CONFIGURE_ARGS+= --disable-xvid +PLIST_SUB+= XVID="@comment " +.undef WITH_XVID +#.else +#LIB_DEPENDS+= xvidcore.2:${PORTSDIR}/multimedia/xvid +#PLIST_SUB+= XVID="" .endif pre-everything:: @@ -638,10 +807,6 @@ pre-everything:: @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_ARTS to enable aRts Audio plugin' .endif -.ifndef(WITH_AVIFILE) - @${ECHO_MSG} '===>' - @${ECHO_MSG} '===> Define WITH_AVIFILE to enable avifile Video plugin' -.endif .ifndef(WITH_CDPARANOIA) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_CDPARANOIA to enable cdparanoia Audio plugin' @@ -650,6 +815,10 @@ pre-everything:: @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_ESOUND to enable esound Audio plugin' .endif +.ifndef(WITH_FAAD) + @${ECHO_MSG} '===>' + @${ECHO_MSG} '===> Define WITH_FAAD to enable faad Audio plugin' +.endif .ifndef(WITH_FLAC) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_FLAC to enable flac Audio plugin' @@ -658,6 +827,10 @@ pre-everything:: @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_FREETYPE to enable freetype support' .endif +.ifndef(WITH_GDKPIXBUF) + @${ECHO_MSG} '===>' + @${ECHO_MSG} '===> Define WITH_GDKPIXBUF to enable gdk-pixbuf plugin' +.endif .ifndef(WITH_GSM) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_GSM to enable gsm Audio plugin' @@ -666,6 +839,10 @@ pre-everything:: @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_GNOMEVFS to enable gnomevfs Network plugin' .endif +.ifndef(WITH_JACK) + @${ECHO_MSG} '===>' + @${ECHO_MSG} '===> Define WITH_JACK to enable jackd audio plugin' +.endif .ifndef(WITH_HERMES) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_HERMES to enable Hermes colorspace plugin' @@ -694,6 +871,10 @@ pre-everything:: @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_LIBAUDIOFILE to enable libaudiofile Audio plugin' .endif +.ifndef(WITH_LIBCACA) + @${ECHO_MSG} '===>' + @${ECHO_MSG} '===> Define WITH_LIBCACA to enable libcaca Video plugin' +.endif .ifndef(WITH_LIBDV) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_LIBDV to enable libdv Video plugin' @@ -718,6 +899,10 @@ pre-everything:: @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_LIBMPEG2 to enable libmpeg2 Video plugin' .endif +.ifndef(WITH_LIBMUSICBRAINZ) + @${ECHO_MSG} '===>' + @${ECHO_MSG} '===> Define WITH_LIBMUSICBRAINZ to enable libmusicbrainz Audio plugin' +.endif .ifndef(WITH_LIBSHOUT) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_LIBSHOUT to enable libshout Audio plugin' @@ -726,18 +911,30 @@ pre-everything:: @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_LIBSIDPLAY to enable libsidplay Audio plugin' .endif +.ifndef(WITH_LIBSNDFILE) + @${ECHO_MSG} '===>' + @${ECHO_MSG} '===> Define WITH_LIBSNDFILE to enable libsndfile Audio plugin' +.endif +.ifndef(WITH_LIBTHEORA) + @${ECHO_MSG} '===>' + @${ECHO_MSG} '===> Define WITH_LIBTHEORA to enable libtheora Video plugin' +.endif .ifndef(WITH_MAD) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_MAD to enable mad Audio plugin' .endif -.ifndef(WITH_OPENQUICKTIME) +.ifndef(WITH_NAS) @${ECHO_MSG} '===>' - @${ECHO_MSG} '===> Define WITH_OPENQUICKTIME to enable openquicktime Video plugin' + @${ECHO_MSG} '===> Define WITH_NAS to enable nas Audio plugin' .endif .ifndef(WITHOUT_OSS) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITHOUT_OSS to disable OSS Audio plugin' .endif +.ifndef(WITH_PANGO) + @${ECHO_MSG} '===>' + @${ECHO_MSG} '===> Define WITH_PANGO to enable pango textoverlay plugin' +.endif .ifndef(WITH_PNG) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_PNG to enable png Video plugin' @@ -746,6 +943,14 @@ pre-everything:: @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_SDL to enable SDL Video plugin' .endif +.ifndef(WITH_SMOOTHWAVE) + @${ECHO_MSG} '===>' + @${ECHO_MSG} '===> Define WITH_SMOOTHWAVE to enable Smoothwave Video plugin' +.endif +.ifndef(WITH_SPEEX) + @${ECHO_MSG} '===>' + @${ECHO_MSG} '===> Define WITH_SPEEX to enable Speex Video plugin' +.endif .ifndef(WITH_SWFDEC) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_SWFDEC to enable Flash Video plugin' @@ -754,9 +959,17 @@ pre-everything:: @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_VORBIS to enable vorbis Audio plugin' .endif -.ifndef(WITH_XMMS) +.ifndef(WITH_VORBISIDEC) + @${ECHO_MSG} '===>' + @${ECHO_MSG} '===> Define WITH_VORBISIDEC to enable vorbisidec Audio plugin' +.endif +.ifndef(WITH_XINE) + @${ECHO_MSG} '===>' + @${ECHO_MSG} '===> Define WITH_XINE to enable xine plugin' +.endif +.ifndef(WITH_XVID) @${ECHO_MSG} '===>' - @${ECHO_MSG} '===> Define WITH_XMMS to enable xmms Audio plugin' + @${ECHO_MSG} '===> Define WITH_XVID to enable xvid Video plugin' .endif .include <bsd.port.post.mk> diff --git a/multimedia/gstreamer-plugins80/distinfo b/multimedia/gstreamer-plugins80/distinfo index 403d20d1fbb3..75cdec26da1c 100644 --- a/multimedia/gstreamer-plugins80/distinfo +++ b/multimedia/gstreamer-plugins80/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gst-plugins-0.6.4.tar.bz2) = d62e6cd3750863b6395e4c1030223690 -SIZE (gnome2/gst-plugins-0.6.4.tar.bz2) = 1900957 +MD5 (gnome2/gst-plugins-0.8.0.tar.bz2) = 3735f701a25a37ed0b1ec6f3d861a658 +SIZE (gnome2/gst-plugins-0.8.0.tar.bz2) = 1751685 diff --git a/multimedia/gstreamer-plugins80/files/ia64-patch-ffmpeg::configure b/multimedia/gstreamer-plugins80/files/ia64-patch-ffmpeg::configure deleted file mode 100644 index f4c1cb8ae5f6..000000000000 --- a/multimedia/gstreamer-plugins80/files/ia64-patch-ffmpeg::configure +++ /dev/null @@ -1,10 +0,0 @@ ---- gst-libs/ext/ffmpeg/ffmpeg/configure.bak Sat Sep 27 18:39:42 2003 -+++ gst-libs/ext/ffmpeg/ffmpeg/configure Sat Sep 27 19:53:52 2003 -@@ -119,6 +119,7 @@ - v4l="no" - audio_oss="yes" - make="gmake" -+CFLAGS="$CFLAGS -fPIC -DPIC" - LDFLAGS="$LDFLAGS -export-dynamic" - ;; - BSD/OS) diff --git a/multimedia/gstreamer-plugins80/files/patch-configure b/multimedia/gstreamer-plugins80/files/patch-configure index 001d56fd6e4f..e2987f9821af 100644 --- a/multimedia/gstreamer-plugins80/files/patch-configure +++ b/multimedia/gstreamer-plugins80/files/patch-configure @@ -1,10 +1,21 @@ ---- configure.orig Thu Jul 11 15:51:47 2002 -+++ configure Thu Jul 11 15:51:57 2002 -@@ -6731,6 +6731,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' +--- configure.orig Tue Mar 16 20:32:36 2004 ++++ configure Tue Mar 16 20:41:00 2004 +@@ -41192,7 +41192,8 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-laudio $X_LIBS $LIBS" ++#xxx fix the non x case is er niet... ++LIBS="-laudio -lm -lXt $X_LIBS $LIBS" + cat >conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" + /* confdefs.h. */ +@@ -44483,7 +44484,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-ltheora $LIBS" ++LIBS="-ltheora -logg $LIBS" + cat >conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" + /* confdefs.h. */ diff --git a/multimedia/gstreamer-plugins80/files/patch-ext::ivorbis::vorbisenc.h b/multimedia/gstreamer-plugins80/files/patch-ext::ivorbis::vorbisenc.h new file mode 100644 index 000000000000..90d39a1a29b2 --- /dev/null +++ b/multimedia/gstreamer-plugins80/files/patch-ext::ivorbis::vorbisenc.h @@ -0,0 +1,103 @@ +--- /dev/null Thu Feb 12 22:22:00 2004 ++++ ext/ivorbis/vorbisenc.h Thu Feb 12 22:24:08 2004 +@@ -0,0 +1,100 @@ ++/* GStreamer ++ * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Library General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Library General Public License for more details. ++ * ++ * You should have received a copy of the GNU Library General Public ++ * License along with this library; if not, write to the ++ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, ++ * Boston, MA 02111-1307, USA. ++ */ ++ ++ ++#ifndef __VORBISENC_H__ ++#define __VORBISENC_H__ ++ ++ ++#include <gst/gst.h> ++ ++#include <tremor/ivorbiscodec.h> ++ ++#ifdef __cplusplus ++extern "C" { ++#endif /* __cplusplus */ ++ ++#define GST_TYPE_VORBISENC \ ++ (vorbisenc_get_type()) ++#define GST_VORBISENC(obj) \ ++ (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VORBISENC,VorbisEnc)) ++#define GST_VORBISENC_CLASS(klass) \ ++ (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VORBISENC,VorbisEncClass)) ++#define GST_IS_VORBISENC(obj) \ ++ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VORBISENC)) ++#define GST_IS_VORBISENC_CLASS(obj) \ ++ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VORBISENC)) ++ ++typedef struct _VorbisEnc VorbisEnc; ++typedef struct _VorbisEncClass VorbisEncClass; ++ ++struct _VorbisEnc { ++ GstElement element; ++ ++ GstPad *sinkpad, ++ *srcpad; ++ ++ ogg_stream_state os; /* take physical pages, weld into a logical ++ stream of packets */ ++ ogg_page og; /* one Ogg bitstream page. Vorbis packets are inside */ ++ ogg_packet op; /* one raw packet of data for decode */ ++ ++ vorbis_info vi; /* struct that stores all the static vorbis bitstream ++ settings */ ++ vorbis_comment vc; /* struct that stores all the user comments */ ++ ++ vorbis_dsp_state vd; /* central working state for the packet->PCM decoder */ ++ vorbis_block vb; /* local working space for packet->PCM decode */ ++ ++ gboolean eos; ++ ++ gboolean managed; ++ gint bitrate; ++ gint min_bitrate; ++ gint max_bitrate; ++ gfloat quality; ++ gboolean quality_set; ++ gint serial; ++ ++ gint channels; ++ gint frequency; ++ ++ guint64 samples_in; ++ guint64 bytes_out; ++ ++ GstCaps *metadata; ++ ++ gboolean setup; ++ gboolean flush_header; ++ gchar *last_message; ++}; ++ ++struct _VorbisEncClass { ++ GstElementClass parent_class; ++}; ++ ++GType vorbisenc_get_type(void); ++ ++ ++#ifdef __cplusplus ++} ++#endif /* __cplusplus */ ++ ++ ++#endif /* __VORBISENC_H__ */ diff --git a/multimedia/gstreamer-plugins80/files/patch-ext_a52dec_gsta52dec.c b/multimedia/gstreamer-plugins80/files/patch-ext_a52dec_gsta52dec.c deleted file mode 100644 index 05c0e53668b6..000000000000 --- a/multimedia/gstreamer-plugins80/files/patch-ext_a52dec_gsta52dec.c +++ /dev/null @@ -1,11 +0,0 @@ ---- ext/a52dec/gsta52dec.c.orig Sun Apr 6 18:58:19 2003 -+++ ext/a52dec/gsta52dec.c Sun Apr 20 13:16:28 2003 -@@ -25,7 +25,7 @@ - - #include <stdlib.h> - --#ifdef HAVE_STDINT_H -+#if defined(HAVE_STDINT_H) || defined(__FreeBSD__) - #include <stdint.h> - #else - /* (Ronald) hacky... can't include stdint.h because it's not available diff --git a/multimedia/gstreamer-plugins80/files/patch-ext_xvid_gstxvid.h b/multimedia/gstreamer-plugins80/files/patch-ext_xvid_gstxvid.h new file mode 100644 index 000000000000..970e99fa1512 --- /dev/null +++ b/multimedia/gstreamer-plugins80/files/patch-ext_xvid_gstxvid.h @@ -0,0 +1,39 @@ +--- /dev/null Sun Nov 16 22:55:00 2003 ++++ ext/xvid/gstxvid.h Sun Nov 16 22:32:25 2003 +@@ -0,0 +1,36 @@ ++/* GStreamer xvid decoder plugin ++ * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net> ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Library General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Library General Public License for more details. ++ * ++ * You should have received a copy of the GNU Library General Public ++ * License along with this library; if not, write to the ++ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, ++ * Boston, MA 02111-1307, USA. ++ */ ++ ++#ifndef __GST_XVID_H__ ++#define __GST_XVID_H__ ++ ++#include <gst/gst.h> ++ ++#ifdef __cplusplus ++extern "C" { ++#endif /* __cplusplus */ ++ ++extern gchar * gst_xvid_error (int errorcode); ++extern gboolean gst_xvid_init (void); ++ ++#ifdef __cplusplus ++} ++#endif /* __cplusplus */ ++ ++#endif /* __GST_XVID_H__ */ diff --git a/multimedia/gstreamer-plugins80/files/patch-ffmpeg::simple_idct_alpha.c b/multimedia/gstreamer-plugins80/files/patch-ffmpeg::simple_idct_alpha.c deleted file mode 100644 index 8149c39817cb..000000000000 --- a/multimedia/gstreamer-plugins80/files/patch-ffmpeg::simple_idct_alpha.c +++ /dev/null @@ -1,17 +0,0 @@ ---- gst-libs/ext/ffmpeg/ffmpeg/libavcodec/alpha/simple_idct_alpha.c.orig Fri Apr 25 22:06:13 2003 -+++ gst-libs/ext/ffmpeg/ffmpeg/libavcodec/alpha/simple_idct_alpha.c Fri Apr 25 23:19:39 2003 -@@ -24,8 +24,14 @@ - * and Falk Hueffner <falk@debian.org> - */ - -+#include <sys/param.h> -+ - #include "asm.h" - #include "../dsputil.h" -+ -+#if defined(__FreeBSD__) && __FreeBSD_version < 500000 -+typedef __int32_t int_fast32_t; -+#endif - - extern void (*put_pixels_clamped_axp_p)(const DCTELEM *block, uint8_t *pixels, - int line_size); diff --git a/multimedia/gstreamer-plugins80/files/patch-gst_level_filter.func b/multimedia/gstreamer-plugins80/files/patch-gst_level_filter.func deleted file mode 100644 index 3b154eb4bdc1..000000000000 --- a/multimedia/gstreamer-plugins80/files/patch-gst_level_filter.func +++ /dev/null @@ -1,14 +0,0 @@ ---- gst/level/filter.func.orig Mon Oct 13 22:32:12 2003 -+++ gst/level/filter.func Mon Oct 13 22:32:21 2003 -@@ -10,9 +10,9 @@ - register double square = 0.0; /* Square */ - register double PSS = 0.0; /* Peak Square Sample */ - -- *CS = 0.0; /* Cumulative Square for this block */ -- - gdouble normalizer = (double) (1 << resolution); -+ -+ *CS = 0.0; /* Cumulative Square for this block */ - - /* - * process data here diff --git a/multimedia/gstreamer-plugins80/files/patch-ltmain.sh b/multimedia/gstreamer-plugins80/files/patch-ltmain.sh new file mode 100644 index 000000000000..3d50310f61a4 --- /dev/null +++ b/multimedia/gstreamer-plugins80/files/patch-ltmain.sh @@ -0,0 +1,51 @@ +--- ltmain.sh.orig Mon Oct 20 15:20:54 2003 ++++ ltmain.sh Fri Nov 14 18:06:07 2003 +@@ -1278,7 +1278,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 + ;; +@@ -1288,8 +1288,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 + ;; + +@@ -3008,6 +3016,9 @@ + # problems, so we reset it completely + verstring= + ;; ++ *-*-freebsd*) ++ # FreeBSD doesn't need this... ++ ;; + *) + verstring="0.0" + ;; +@@ -5457,10 +5468,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/multimedia/gstreamer-plugins80/files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h b/multimedia/gstreamer-plugins80/files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h new file mode 100644 index 000000000000..daaefac5eb5d --- /dev/null +++ b/multimedia/gstreamer-plugins80/files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h @@ -0,0 +1,72 @@ +--- sys/cdrom/gstcdplayer_ioctl_bsd.h.orig Mon Mar 1 06:52:03 2004 ++++ sys/cdrom/gstcdplayer_ioctl_bsd.h Tue Mar 9 16:05:36 2004 +@@ -142,6 +142,7 @@ + { + struct ioc_toc_header toc_header; + struct ioc_read_toc_entry toc_entry; ++ struct cd_toc_entry toc_entry_data; + guint i; + + cd->fd = open(device,O_RDONLY | O_NONBLOCK); +@@ -151,7 +152,7 @@ + } + + /* get the toc header information */ +- if (ioctl(cd->fd,CDIOREADTOCHDR,&toc_header) != 0) { ++ if (ioctl(cd->fd,CDIOREADTOCHEADER,&toc_header) != 0) { + close(cd->fd); + cd->fd = -1; + return FALSE; +@@ -161,6 +162,8 @@ + for (i = 1; i <= toc_header.ending_track; i++) { + toc_entry.address_format = CD_MSF_FORMAT; + toc_entry.starting_track = i; ++ toc_entry.data = &toc_entry_data; ++ toc_entry.data_len = sizeof(toc_entry_data); + + if (ioctl(cd->fd,CDIOREADTOCENTRYS,&toc_entry) != 0) { + close(cd->fd); +@@ -168,9 +171,9 @@ + return FALSE; + } + +- cd->tracks[i].minute = toc_entry.entry.addr.msf.minute; +- cd->tracks[i].second = toc_entry.entry.addr.msf.second; +- cd->tracks[i].frame = toc_entry.entry.addr.msf.frame; ++ cd->tracks[i].minute = toc_entry.data->addr.msf.minute; ++ cd->tracks[i].second = toc_entry.data->addr.msf.second; ++ cd->tracks[i].frame = toc_entry.data->addr.msf.frame; + cd->tracks[i].data_track = (toc_entry.data->control & 4) == 4; + } + +@@ -186,9 +189,9 @@ + return FALSE; + } + +- cd->tracks[LEADOUT].minute = toc_entry.entry.addr.msf.minute; +- cd->tracks[LEADOUT].second = toc_entry.entry.addr.msf.second; +- cd->tracks[LEADOUT].frame = toc_entry.entry.addr.msf.frame; ++ cd->tracks[LEADOUT].minute = toc_entry.data->addr.msf.minute; ++ cd->tracks[LEADOUT].second = toc_entry.data->addr.msf.second; ++ cd->tracks[LEADOUT].frame = toc_entry.data->addr.msf.frame; + + cd->num_tracks = toc_header.ending_track; + +@@ -224,6 +227,8 @@ + return FALSE; + } + ++ /* lets return TRUE and lets see what happes (may not be correct)*/ ++ return TRUE; + } + + gboolean cd_pause(struct cd *cd) +@@ -321,7 +326,7 @@ + return -1; + } + +-#ifdef __NetBSD__ ++#if defined(__NetBSD__) || defined(__FreeBSD__) + return sub_channel.data->what.track_info.track_number; + #else + return sub_channel.data->track_number; diff --git a/multimedia/gstreamer-plugins80/files/patch-sys_oss_gstosselement.h b/multimedia/gstreamer-plugins80/files/patch-sys_oss_gstosselement.h new file mode 100644 index 000000000000..30258ba113c1 --- /dev/null +++ b/multimedia/gstreamer-plugins80/files/patch-sys_oss_gstosselement.h @@ -0,0 +1,10 @@ +--- sys/oss/gstosselement.h.orig Tue Mar 9 16:46:05 2004 ++++ sys/oss/gstosselement.h Tue Mar 9 16:46:14 2004 +@@ -23,6 +23,7 @@ + #ifndef __GST_OSS_ELEMENT_H__ + #define __GST_OSS_ELEMENT_H__ + ++#include <sys/types.h> + #include <gst/gst.h> + + /* debugging category */ diff --git a/multimedia/gstreamer-plugins80/files/patch-sys_ximage_ximagesink.h b/multimedia/gstreamer-plugins80/files/patch-sys_ximage_ximagesink.h new file mode 100644 index 000000000000..07b125bfee89 --- /dev/null +++ b/multimedia/gstreamer-plugins80/files/patch-sys_ximage_ximagesink.h @@ -0,0 +1,10 @@ +--- sys/ximage/ximagesink.h.orig Tue Mar 16 22:51:03 2004 ++++ sys/ximage/ximagesink.h Tue Mar 16 23:06:44 2004 +@@ -23,6 +23,7 @@ + #include <gst/video/videosink.h> + + #ifdef HAVE_XSHM ++#include <sys/types.h> + #include <sys/ipc.h> + #include <sys/shm.h> + #endif /* HAVE_XSHM */ diff --git a/multimedia/gstreamer-plugins80/files/patch-sys_xvideo_gstxvimage.c b/multimedia/gstreamer-plugins80/files/patch-sys_xvideo_gstxvimage.c deleted file mode 100644 index cb156ee6bf8d..000000000000 --- a/multimedia/gstreamer-plugins80/files/patch-sys_xvideo_gstxvimage.c +++ /dev/null @@ -1,21 +0,0 @@ ---- sys/xvideo/gstxvimage.c.orig Sun Nov 23 20:17:00 2003 -+++ sys/xvideo/gstxvimage.c Sun Nov 23 20:25:19 2003 -@@ -20,6 +20,10 @@ - #include "config.h" - - #include <errno.h> -+#include <sys/types.h> -+#include <machine/param.h> -+#include <sys/types.h> -+#include <sys/ipc.h> - #include <sys/shm.h> /* for SHM symbols */ - #include <gst/gst.h> - /* gcc -ansi -pedantic on GNU/Linux causes warnings and errors -@@ -34,7 +38,6 @@ - - #include <stdio.h> - #include <stdlib.h> --#include <sys/types.h> - - #if defined (HAVE_IPC_H) && defined (HAVE_SHM_H) && defined (HAVE_XSHM_H) - #define USE_SHM diff --git a/multimedia/gstreamer-plugins80/files/patch-sys_xvimage_xvimagesink.h b/multimedia/gstreamer-plugins80/files/patch-sys_xvimage_xvimagesink.h new file mode 100644 index 000000000000..ddb0d1f00501 --- /dev/null +++ b/multimedia/gstreamer-plugins80/files/patch-sys_xvimage_xvimagesink.h @@ -0,0 +1,10 @@ +--- sys/xvimage/xvimagesink.h.orig Tue Mar 16 22:51:04 2004 ++++ sys/xvimage/xvimagesink.h Tue Mar 16 23:07:39 2004 +@@ -23,6 +23,7 @@ + #include <gst/video/videosink.h> + + #ifdef HAVE_XSHM ++#include <sys/types.h> + #include <sys/ipc.h> + #include <sys/shm.h> + #endif /* HAVE_XSHM */ diff --git a/multimedia/gstreamer-plugins80/pkg-plist b/multimedia/gstreamer-plugins80/pkg-plist index 96e4b3b8a0fa..e35f5c93b0ad 100644 --- a/multimedia/gstreamer-plugins80/pkg-plist +++ b/multimedia/gstreamer-plugins80/pkg-plist @@ -1,32 +1,59 @@ -bin/gst-launch-ext -bin/gst-visualise +bin/gst-launch-ext-%%VERSION%% +bin/gst-visualise-%%VERSION%% etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/default/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/%%VERSION%%/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/%%VERSION%%/default/%gconf.xml etc/gconf/gconf.xml.defaults/system/gstreamer/%gconf.xml -etc/gconf/gconf.xml.defaults/system/gstreamer/default/%gconf.xml -etc/gconf/schemas/gstreamer.schemas +etc/gconf/gconf.xml.defaults/system/gstreamer/%%VERSION%%/%gconf.xml +etc/gconf/gconf.xml.defaults/system/gstreamer/%%VERSION%%/default/%gconf.xml +etc/gconf/schemas/gstreamer-%%VERSION%%.schemas +include/gstreamer-%%VERSION%%/gst/audio/gstaudiofilter.h +include/gstreamer-%%VERSION%%/gst/audio/audioclock.h include/gstreamer-%%VERSION%%/gst/audio/audio.h +include/gstreamer-%%VERSION%%/gst/colorbalance/colorbalance-enumtypes.h +include/gstreamer-%%VERSION%%/gst/colorbalance/colorbalance.h +include/gstreamer-%%VERSION%%/gst/colorbalance/colorbalancechannel.h include/gstreamer-%%VERSION%%/gst/floatcast/floatcast.h include/gstreamer-%%VERSION%%/gst/gconf/gconf.h include/gstreamer-%%VERSION%%/gst/idct/idct.h include/gstreamer-%%VERSION%%/gst/media-info/media-info.h +include/gstreamer-%%VERSION%%/gst/mixer/mixer-enumtypes.h +include/gstreamer-%%VERSION%%/gst/mixer/mixer.h +include/gstreamer-%%VERSION%%/gst/mixer/mixertrack.h +include/gstreamer-%%VERSION%%/gst/navigation/navigation.h +include/gstreamer-%%VERSION%%/gst/play/play-enumtypes.h include/gstreamer-%%VERSION%%/gst/play/play.h +include/gstreamer-%%VERSION%%/gst/propertyprobe/propertyprobe.h include/gstreamer-%%VERSION%%/gst/resample/resample.h -include/gstreamer-%%VERSION%%/gst/riff/riff.h +include/gstreamer-%%VERSION%%/gst/riff/riff-ids.h +include/gstreamer-%%VERSION%%/gst/riff/riff-media.h +include/gstreamer-%%VERSION%%/gst/riff/riff-read.h +include/gstreamer-%%VERSION%%/gst/tag/tag.h +include/gstreamer-%%VERSION%%/gst/tuner/tuner-enumtypes.h +include/gstreamer-%%VERSION%%/gst/tuner/tuner.h +include/gstreamer-%%VERSION%%/gst/tuner/tunerchannel.h +include/gstreamer-%%VERSION%%/gst/tuner/tunernorm.h include/gstreamer-%%VERSION%%/gst/video/video.h +include/gstreamer-%%VERSION%%/gst/video/videosink.h +include/gstreamer-%%VERSION%%/gst/xoverlay/xoverlay.h +include/gstreamer-%%VERSION%%/gst/xwindowlistener/xwindowlistener.h %%LIBA52%%lib/gstreamer-%%VERSION%%/libgsta52dec.so %%AALIB%%lib/gstreamer-%%VERSION%%/libgstaasink.so lib/gstreamer-%%VERSION%%/libgstac3parse.so lib/gstreamer-%%VERSION%%/libgstadder.so lib/gstreamer-%%VERSION%%/libgstalaw.so %%ARTS%%lib/gstreamer-%%VERSION%%/libgstartsdsink.so +lib/gstreamer-%%VERSION%%/libgstasf.so +lib/gstreamer-%%VERSION%%/libgstaudioconvert.so +lib/gstreamer-%%VERSION%%/libgstaudiofilter.so lib/gstreamer-%%VERSION%%/libgstaudio.so %%LIBAUDIOFILE%%lib/gstreamer-%%VERSION%%/libgstaudiofile.so lib/gstreamer-%%VERSION%%/libgstaudioscale.so lib/gstreamer-%%VERSION%%/libgstauparse.so -lib/gstreamer-%%VERSION%%/libgstavidemux.so -lib/gstreamer-%%VERSION%%/libgstavimux.so +lib/gstreamer-%%VERSION%%/libgstavi.so +%%LIBCACA%%lib/gstreamer-%%VERSION%%/libgstcacasink.so %%CDPARANOIA%%lib/gstreamer-%%VERSION%%/libgstcdparanoia.so +lib/gstreamer-%%VERSION%%/libgstcdplayer.so lib/gstreamer-%%VERSION%%/libgstcdxaparse.so lib/gstreamer-%%VERSION%%/libgstchart.so %%HERMES%%lib/gstreamer-%%VERSION%%/libgstcolorspace.so @@ -35,115 +62,151 @@ lib/gstreamer-%%VERSION%%/libgstdeinterlace.so %%LIBDV%%lib/gstreamer-%%VERSION%%/libgstdvdec.so %%LIBDVDNAV%%lib/gstreamer-%%VERSION%%/libgstdvdnavsrc.so %%LIBDVDREAD%%lib/gstreamer-%%VERSION%%/libgstdvdreadsrc.so +lib/gstreamer-%%VERSION%%/libgstefence.so lib/gstreamer-%%VERSION%%/libgsteffectv.so -%%ESOUND%%lib/gstreamer-%%VERSION%%/libgstesdmon.so -%%ESOUND%%lib/gstreamer-%%VERSION%%/libgstesdsink.so +%%ESOUND%%lib/gstreamer-%%VERSION%%/libgstesd.so +%%FAAD%%lib/gstreamer-%%VERSION%%/libgstfaad.so lib/gstreamer-%%VERSION%%/libgstfestival.so -lib/gstreamer-%%VERSION%%/libgstffmpeg.so -lib/gstreamer-%%VERSION%%/libgstffmpegall.so +lib/gstreamer-%%VERSION%%/libgstffmpegcolorspace.so lib/gstreamer-%%VERSION%%/libgstfilter.so %%FLAC%%lib/gstreamer-%%VERSION%%/libgstflac.so lib/gstreamer-%%VERSION%%/libgstflxdec.so -%%GNOMEVFS%%lib/gstreamer-%%VERSION%%/libgstgnomevfssink.so -%%GNOMEVFS%%lib/gstreamer-%%VERSION%%/libgstgnomevfssrc.so +lib/gstreamer-%%VERSION%%/libgstgamma.so +%%GDKPIXBUF%%lib/gstreamer-%%VERSION%%/libgstgdkpixbuf.so +%%GNOMEVFS%%lib/gstreamer-%%VERSION%%/libgstgnomevfs.so lib/gstreamer-%%VERSION%%/libgstgoom.so %%GSM%%lib/gstreamer-%%VERSION%%/libgstgsm.so +%%HERMES%%lib/gstreamer-%%VERSION%%/libgsthermescolorspace.so %%HTTP%%lib/gstreamer-%%VERSION%%/libgsthttpsrc.so lib/gstreamer-%%VERSION%%/libgstidct.so -lib/gstreamer-%%VERSION%%/libgstintfloat.so +lib/gstreamer-%%VERSION%%/libgstinterleave.so +%%IVORBIS%%lib/gstreamer-%%VERSION%%/libgstivorbis.so +%%JACK%%lib/gstreamer-%%VERSION%%/libgstjack.so %%JPEG%%lib/gstreamer-%%VERSION%%/libgstjpeg.so %%LADSPA%%lib/gstreamer-%%VERSION%%/libgstladspa.so %%LAME%%lib/gstreamer-%%VERSION%%/libgstlame.so lib/gstreamer-%%VERSION%%/libgstlevel.so %%LIBFAME%%lib/gstreamer-%%VERSION%%/libgstlibfame.so %%LIBMAD%%lib/gstreamer-%%VERSION%%/libgstmad.so +lib/gstreamer-%%VERSION%%/libgstmatroska.so lib/gstreamer-%%VERSION%%/libgstmedian.so %%LIBMIKMOD%%lib/gstreamer-%%VERSION%%/libgstmikmod.so +lib/gstreamer-%%VERSION%%/libgstmixmatrix.so +lib/gstreamer-%%VERSION%%/libgstmodplug.a lib/gstreamer-%%VERSION%%/libgstmodplug.so -lib/gstreamer-%%VERSION%%/libgstmono2stereo.so lib/gstreamer-%%VERSION%%/libgstmonoscope.so lib/gstreamer-%%VERSION%%/libgstmp1videoparse.so -lib/gstreamer-%%VERSION%%/libgstmp3types.so -lib/gstreamer-%%VERSION%%/libgstmpeg1encoder.so lib/gstreamer-%%VERSION%%/libgstmpeg1systemencode.so -lib/gstreamer-%%VERSION%%/libgstmpeg1types.so %%LIBMPEG2%%lib/gstreamer-%%VERSION%%/libgstmpeg2dec.so -lib/gstreamer-%%VERSION%%/libgstmpeg2enc.so lib/gstreamer-%%VERSION%%/libgstmpeg2subt.so -lib/gstreamer-%%VERSION%%/libgstmpeg2types.so lib/gstreamer-%%VERSION%%/libgstmpegaudio.so lib/gstreamer-%%VERSION%%/libgstmpegaudioparse.so lib/gstreamer-%%VERSION%%/libgstmpegstream.so lib/gstreamer-%%VERSION%%/libgstmulaw.so -lib/gstreamer-%%VERSION%%/libgstoneton.so -%%OPENQUICKTIME%%lib/gstreamer-%%VERSION%%/libgstopenquicktimedecoder.so -%%OPENQUICKTIME%%lib/gstreamer-%%VERSION%%/libgstopenquicktimedemux.so -%%OPENQUICKTIME%%lib/gstreamer-%%VERSION%%/libgstopenquicktimetypes.so +%%NAS%%lib/gstreamer-%%VERSION%%/libgstnassink.so +lib/gstreamer-%%VERSION%%/libgstnavigationtest.so +%%OGG%%lib/gstreamer-%%VERSION%%/libgstogg.so +lib/gstreamer-%%VERSION%%/libgstoverlay.so %%OSS%%lib/gstreamer-%%VERSION%%/libgstossaudio.so lib/gstreamer-%%VERSION%%/libgstpassthrough.so lib/gstreamer-%%VERSION%%/libgstplayondemand.so %%PNG%%lib/gstreamer-%%VERSION%%/libgstpng.so lib/gstreamer-%%VERSION%%/libgstqtdemux.so lib/gstreamer-%%VERSION%%/libgstresample.so +lib/gstreamer-%%VERSION%%/libgstrmdemux.so lib/gstreamer-%%VERSION%%/libgstriff.so lib/gstreamer-%%VERSION%%/libgstrtjpeg.so +lib/gstreamer-%%VERSION%%/libgstrtp.so %%SDL%%lib/gstreamer-%%VERSION%%/libgstsdlvideosink.so %%LIBSHOUT%%lib/gstreamer-%%VERSION%%/libgstshout.so +%%LIBSIDPLAY%%lib/gstreamer-%%VERSION%%/libgstsid.a %%LIBSIDPLAY%%lib/gstreamer-%%VERSION%%/libgstsid.so lib/gstreamer-%%VERSION%%/libgstsilence.so lib/gstreamer-%%VERSION%%/libgstsinesrc.so +%%SMOOTHWAVE%%lib/gstreamer-%%VERSION%%/libgstsmoothwave.so lib/gstreamer-%%VERSION%%/libgstsmooth.so lib/gstreamer-%%VERSION%%/libgstsmpte.so %%PNG%%lib/gstreamer-%%VERSION%%/libgstsnapshot.so +%%LIBSNDFILE%%lib/gstreamer-%%VERSION%%/libgstsndfile.so lib/gstreamer-%%VERSION%%/libgstspectrum.so lib/gstreamer-%%VERSION%%/libgstspeed.so +%%SPEEX%%lib/gstreamer-%%VERSION%%/libgstspeex.so lib/gstreamer-%%VERSION%%/libgststereo.so -lib/gstreamer-%%VERSION%%/libgststereo2mono.so -lib/gstreamer-%%VERSION%%/libgststereosplit.so %%SWFDEC%%lib/gstreamer-%%VERSION%%/libgstswfdec.so +lib/gstreamer-%%VERSION%%/libgstswitch.so lib/gstreamer-%%VERSION%%/libgstsynaesthesia.so +lib/gstreamer-%%VERSION%%/libgsttagedit.so +lib/gstreamer-%%VERSION%%/libgsttcp.so +lib/gstreamer-%%VERSION%%/libgsttextoverlay.so +%%LIBTHEORA%%lib/gstreamer-%%VERSION%%/libgsttheora.so +lib/gstreamer-%%VERSION%%/libgsttimeoverlay.so +%%LIBMUSICBRAINZ%%lib/gstreamer-%%VERSION%%/libgsttrm.so +lib/gstreamer-%%VERSION%%/libgsttypefindfunctions.so lib/gstreamer-%%VERSION%%/libgstudp.so lib/gstreamer-%%VERSION%%/libgstvbidec.so lib/gstreamer-%%VERSION%%/libgstvideo.so +lib/gstreamer-%%VERSION%%/libgstvideobalance.so lib/gstreamer-%%VERSION%%/libgstvideocrop.so +lib/gstreamer-%%VERSION%%/libgstvideodrop.so +lib/gstreamer-%%VERSION%%/libgstvideofilter.so +lib/gstreamer-%%VERSION%%/libgstvideoflip.so lib/gstreamer-%%VERSION%%/libgstvideoscale.so -lib/gstreamer-%%VERSION%%/libgstvideosink.so lib/gstreamer-%%VERSION%%/libgstvideotestsrc.so lib/gstreamer-%%VERSION%%/libgstvolenv.so lib/gstreamer-%%VERSION%%/libgstvolume.so %%VORBIS%%lib/gstreamer-%%VERSION%%/libgstvorbis.so -lib/gstreamer-%%VERSION%%/libgstvumeter.so lib/gstreamer-%%VERSION%%/libgstwavenc.so lib/gstreamer-%%VERSION%%/libgstwavparse.so -lib/gstreamer-%%VERSION%%/libgstxvideosink.so +lib/gstreamer-%%VERSION%%/libgstximagesink.so +%%XINE%%lib/gstreamer-%%VERSION%%/libgstxine.so +%%XVID%%lib/gstreamer-%%VERSION%%/libgstxvid.so +lib/gstreamer-%%VERSION%%/libgstxvimagesink.so +lib/gstreamer-%%VERSION%%/libgstxwindowlistener.so lib/gstreamer-%%VERSION%%/libgsty4menc.so -lib/gstreamer-%%VERSION%%/libmixmatrix.so lib/libgstgconf-%%VERSION%%.a lib/libgstgconf-%%VERSION%%.so lib/libgstgconf-%%VERSION%%.so.%%SHLIB_VERSION%% +lib/libgstinterfaces-%%VERSION%%.a +lib/libgstinterfaces-%%VERSION%%.so +lib/libgstinterfaces-%%VERSION%%.so.%%SHLIB_VERSION%% lib/libgstmedia-info-%%VERSION%%.a lib/libgstmedia-info-%%VERSION%%.so -lib/libgstmedia-info-%%VERSION%%.so.0 +lib/libgstmedia-info-%%VERSION%%.so.%%SHLIB_VERSION%% lib/libgstplay-%%VERSION%%.a lib/libgstplay-%%VERSION%%.so lib/libgstplay-%%VERSION%%.so.%%SHLIB_VERSION%% libdata/pkgconfig/gstreamer-gconf-%%VERSION%%.pc +libdata/pkgconfig/gstreamer-interfaces-%%VERSION%%.pc libdata/pkgconfig/gstreamer-libs-%%VERSION%%.pc +libdata/pkgconfig/gstreamer-media-info-%%VERSION%%.pc libdata/pkgconfig/gstreamer-play-%%VERSION%%.pc +libdata/pkgconfig/gstreamer-plugins-%%VERSION%%.pc +share/locale/nl/LC_MESSAGES/gst-plugins-%%VERSION%%.mo +share/locale/sr/LC_MESSAGES/gst-plugins-%%VERSION%%.mo @unexec rmdir %D/lib/gstreamer-%%VERSION%% 2>/dev/null || true +@dirrm include/gstreamer-%%VERSION%%/gst/xwindowlistener +@dirrm include/gstreamer-%%VERSION%%/gst/xoverlay @dirrm include/gstreamer-%%VERSION%%/gst/video +@dirrm include/gstreamer-%%VERSION%%/gst/tuner @dirrm include/gstreamer-%%VERSION%%/gst/riff @dirrm include/gstreamer-%%VERSION%%/gst/resample +@dirrm include/gstreamer-%%VERSION%%/gst/propertyprobe @dirrm include/gstreamer-%%VERSION%%/gst/play +@dirrm include/gstreamer-%%VERSION%%/gst/navigation +@dirrm include/gstreamer-%%VERSION%%/gst/mixer @dirrm include/gstreamer-%%VERSION%%/gst/media-info @dirrm include/gstreamer-%%VERSION%%/gst/idct @dirrm include/gstreamer-%%VERSION%%/gst/gconf @dirrm include/gstreamer-%%VERSION%%/gst/floatcast +@dirrm include/gstreamer-%%VERSION%%/gst/colorbalance @dirrm include/gstreamer-%%VERSION%%/gst/audio -@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer/default +@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer/%%VERSION%%/default +@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer/%%VERSION%% @dirrm etc/gconf/gconf.xml.defaults/system/gstreamer -@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/default +@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/%%VERSION%%/default +@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/%%VERSION%% @dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer +@unexec rmdir %D/include/gstreamer-%%VERSION%%/gst 2>/dev/null || true @unexec rmdir %D/include/gstreamer-%%VERSION%% 2>/dev/null || true -@exec %%X11BASE%%/bin/gst-register 2>/dev/null -@unexec %%X11BASE%%/bin/gst-register 2>/dev/null +@exec %%X11BASE%%/bin/gst-register-%%VERSION%% 2>/dev/null || true +@unexec %%X11BASE%%/bin/gst-register-%%VERSION%% 2>/dev/null || true diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile index 3f7a4303ae02..e523e02d7034 100644 --- a/multimedia/gstreamer/Makefile +++ b/multimedia/gstreamer/Makefile @@ -6,11 +6,12 @@ # PORTNAME= gstreamer -PORTVERSION= 0.6.4 -PORTREVISION= 2 +PORTVERSION= 0.8.0 +PORTREVISION= 1 CATEGORIES= multimedia -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.6 +MASTER_SITES= ${MASTER_SITE_GNOME} \ + http://gstreamer.freedesktop.org/src/gstreamer/ +MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.8 DIST_SUBDIR= gnome2 MAINTAINER= lioux@FreeBSD.org @@ -21,39 +22,41 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt USE_X_PREFIX= yes USE_BISON= yes USE_BZIP2= yes +USE_PYTHON= yes USE_GMAKE= yes +USE_REINPLACE= yes WANT_GNOME= yes USE_GNOME= gnomehack \ gnomeprefix \ glib20 \ pkgconfig \ libxml2 -USE_SIZE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-tests \ --disable-failing-tests CONFIGURE_ENV= PKG_CONFIG=${PKG_CONFIG} \ CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" -CONFIGURE_TARGET= PLIST_SUB= \ - VERSION="${PORTVERSION:C/..$//}" \ + VERSION="${GST_VERSION}" \ SHLIB_VERSION="${SHLIB_VERSION}" INSTALLS_SHLIB= yes -MAN1= gst-complete.1 gst-compprep.1 gst-inspect.1 gst-launch.1 \ - gst-feedback.1 gst-md5sum.1 \ - gst-typefind.1 \ - gst-register.1 gst-xmllaunch.1 +MAN1= gst-complete-${GST_VERSION}.1 gst-compprep-${GST_VERSION}.1 \ + gst-feedback-${GST_VERSION}.1 gst-inspect-${GST_VERSION}.1 \ + gst-launch-${GST_VERSION}.1 gst-md5sum-${GST_VERSION}.1 \ + gst-register-${GST_VERSION}.1 gst-typefind-${GST_VERSION}.1 \ + gst-xmllaunch-${GST_VERSION}.1 PKG_CONFIG?="${LOCALBASE}/bin/pkg-config" +GST_VERSION=${PORTVERSION:C/..$//} # library minor number SHLIB_VERSION= 1 post-install: # register plugins - @${PREFIX}/bin/gst-register 2>/dev/null + -@${PREFIX}/bin/gst-register-${GST_VERSION} 2>/dev/null .include <bsd.port.pre.mk> diff --git a/multimedia/gstreamer/distinfo b/multimedia/gstreamer/distinfo index 2fd78bcd5366..a0fd0e772b25 100644 --- a/multimedia/gstreamer/distinfo +++ b/multimedia/gstreamer/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gstreamer-0.6.4.tar.bz2) = d607f42d4a6de9e79d74ccaa6469ded6 -SIZE (gnome2/gstreamer-0.6.4.tar.bz2) = 1108361 +MD5 (gnome2/gstreamer-0.8.0.tar.bz2) = 275384c4001c6b934f159952f39e2f36 +SIZE (gnome2/gstreamer-0.8.0.tar.bz2) = 1120465 diff --git a/multimedia/gstreamer/files/patch-configure b/multimedia/gstreamer/files/patch-configure index 11e54cb76694..4dafb1ddde0d 100644 --- a/multimedia/gstreamer/files/patch-configure +++ b/multimedia/gstreamer/files/patch-configure @@ -1,6 +1,15 @@ ---- configure.orig Sat Sep 27 14:13:57 2003 -+++ configure Sat Sep 27 14:18:37 2003 -@@ -8173,7 +8173,7 @@ +--- configure.orig Thu Feb 26 14:03:31 2004 ++++ configure Thu Feb 26 14:03:31 2004 +@@ -21858,7 +21858,7 @@ + + + EXP_VAR=LOCALEDIR +- FROM_VAR=$datadir/locale ++ FROM_VAR=$prefix/share/locale + + prefix_save=$prefix + exec_prefix_save=$exec_prefix +@@ -21961,7 +21961,7 @@ echo $ECHO_N "checking to see if compiler understands -Werror... $ECHO_C" >&6 save_CFLAGS="$CFLAGS" @@ -8,8 +17,8 @@ + CFLAGS="$CFLAGS" cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" -@@ -8214,7 +8214,7 @@ + /* confdefs.h. */ +@@ -22011,7 +22011,7 @@ CFLAGS="$save_CFLAGS" if test "X$flag_ok" = Xyes ; then @@ -17,13 +26,4 @@ + GST_ERROR="$GST_ERROR" true else - -@@ -9607,7 +9607,7 @@ - : - fi - --if test "$ac_cv_check_mcsc" == "yes"; then -+if test "$ac_cv_check_mcsc" = "yes"; then - - cat >>confdefs.h <<_ACEOF - #define HAVE_MAKECONTEXT $HAVE_MAKECONTEXT + GST_ERROR="$GST_ERROR" diff --git a/multimedia/gstreamer/files/patch-gst::cothreads.c b/multimedia/gstreamer/files/patch-gst::cothreads.c index 3519fb0e7e01..b66b7062f37b 100644 --- a/multimedia/gstreamer/files/patch-gst::cothreads.c +++ b/multimedia/gstreamer/files/patch-gst::cothreads.c @@ -1,6 +1,6 @@ ---- gst/cothreads.c.orig Sat Feb 1 19:09:00 2003 -+++ gst/cothreads.c Mon Feb 3 10:57:44 2003 -@@ -41,12 +41,16 @@ +--- gst/cothreads.c.orig Mon Feb 2 06:56:53 2004 ++++ gst/cothreads.c Fri Feb 6 13:05:26 2004 +@@ -42,6 +42,10 @@ #include <ucontext.h> #endif @@ -8,9 +8,11 @@ +#include <ucontext.h> +#endif + - /* older glibc's have MAP_ANON instead of MAP_ANONYMOUS */ #ifndef MAP_ANONYMOUS - #define MAP_ANONYMOUS MAP_ANON + #ifdef MAP_ANON + /* older glibc's have MAP_ANON instead of MAP_ANONYMOUS */ +@@ -52,7 +56,7 @@ + #endif #endif -#define STACK_SIZE 0x200000 diff --git a/multimedia/gstreamer/files/patch-gst::gstthreaddummy.c b/multimedia/gstreamer/files/patch-gst::gstthreaddummy.c index 479a05ba9c9b..71bace4805c9 100644 --- a/multimedia/gstreamer/files/patch-gst::gstthreaddummy.c +++ b/multimedia/gstreamer/files/patch-gst::gstthreaddummy.c @@ -1,12 +1,10 @@ ---- 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 @@ +--- gst/gstthreaddummy.c.orig Mon Jun 30 14:31:13 2003 ++++ gst/gstthreaddummy.c Fri Nov 14 15:36:22 2003 +@@ -17,6 +17,7 @@ * Boston, MA 02111-1307, USA. */ +#include <sys/types.h> + #include <unistd.h> #include <sys/time.h> -+#include <unistd.h> #include <glib.h> - #include "gstlog.h" - diff --git a/multimedia/gstreamer/files/patch-libs::ext::cothreads::cothreads::cothreads.c b/multimedia/gstreamer/files/patch-libs::ext::cothreads::cothreads::cothreads.c deleted file mode 100644 index e0e229f97524..000000000000 --- a/multimedia/gstreamer/files/patch-libs::ext::cothreads::cothreads::cothreads.c +++ /dev/null @@ -1,19 +0,0 @@ ---- libs/ext/cothreads/cothreads/cothreads.c.orig Sat Feb 1 16:09:23 2003 -+++ libs/ext/cothreads/cothreads/cothreads.c Mon Mar 17 13:33:43 2003 -@@ -22,6 +22,7 @@ - - #include "pth_p.h" /* this pulls in everything */ - #include <sys/mman.h> -+#include <sys/time.h> - #include <sys/resource.h> - #include <stdlib.h> - -@@ -422,7 +423,7 @@ - *stack = malloc (_cothreads_chunk_size * (1.0 + 1.0/_cothreads_count)); - if (!stack) - return FALSE; -- *stack = (void*)((int)*stack &~ (int)(_cothreads_chunk_size / _cothreads_count - 1)); -+ *stack = (void*)((intptr_t)*stack &~ (intptr_t)(_cothreads_chunk_size / _cothreads_count - 1)); - *stack += 1; - #endif - diff --git a/multimedia/gstreamer/files/patch-libs::ext::cothreads::tests::Makefile.in b/multimedia/gstreamer/files/patch-libs::ext::cothreads::tests::Makefile.in deleted file mode 100644 index 4470b93eef61..000000000000 --- a/multimedia/gstreamer/files/patch-libs::ext::cothreads::tests::Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- libs/ext/cothreads/tests/Makefile.in.orig Mon Oct 13 15:10:38 2003 -+++ libs/ext/cothreads/tests/Makefile.in Mon Oct 13 15:11:13 2003 -@@ -83,7 +83,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@ diff --git a/multimedia/gstreamer/files/patch-ltmain.sh b/multimedia/gstreamer/files/patch-ltmain.sh index 284a2d7b15df..9b5b1ec3b9aa 100644 --- a/multimedia/gstreamer/files/patch-ltmain.sh +++ b/multimedia/gstreamer/files/patch-ltmain.sh @@ -1,15 +1,15 @@ ---- ltmain.sh.orig Mon Oct 13 14:17:09 2003 -+++ ltmain.sh Sat Feb 21 15:44:32 2004 -@@ -1075,7 +1075,7 @@ +--- ltmain.sh.orig Tue Oct 28 09:26:50 2003 ++++ ltmain.sh Sat Feb 21 15:30:25 2004 +@@ -1280,7 +1280,7 @@ esac - elif test "X$arg" = "X-lc_r"; then - case $host in + 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 @@ + # Do not include libc_r directly, use -pthread flag. + continue + ;; +@@ -1290,8 +1290,16 @@ continue ;; @@ -26,17 +26,17 @@ continue ;; -@@ -2503,6 +2511,9 @@ - *-*-openbsd* | *-*-freebsd*) - # Do not include libc due to us having libc/libc_r. +@@ -3000,6 +3008,9 @@ + # problems, so we reset it completely + verstring= ;; + *-*-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 @@ + verstring="0.0" + ;; +@@ -5428,10 +5439,12 @@ fi # Install the pseudo-library for information purposes. diff --git a/multimedia/gstreamer/pkg-plist b/multimedia/gstreamer/pkg-plist index bb840023d420..1e43cd5e04cf 100644 --- a/multimedia/gstreamer/pkg-plist +++ b/multimedia/gstreamer/pkg-plist @@ -1,13 +1,23 @@ -@unexec %D/bin/gst-register 2>/dev/null || true bin/gst-complete +bin/gst-complete-%%VERSION%% bin/gst-compprep +bin/gst-compprep-%%VERSION%% bin/gst-feedback +bin/gst-feedback-%%VERSION%% bin/gst-inspect +bin/gst-inspect-%%VERSION%% bin/gst-launch +bin/gst-launch-%%VERSION%% bin/gst-md5sum +bin/gst-md5sum-%%VERSION%% bin/gst-register +bin/gst-register-%%VERSION%% bin/gst-typefind +bin/gst-typefind-%%VERSION%% +bin/gst-xmlinspect +bin/gst-xmlinspect-%%VERSION%% bin/gst-xmllaunch +bin/gst-xmllaunch-%%VERSION%% include/gstreamer-%%VERSION%%/gst/bytestream/bytestream.h include/gstreamer-%%VERSION%%/gst/control/control.h include/gstreamer-%%VERSION%%/gst/control/dparam.h @@ -19,10 +29,8 @@ include/gstreamer-%%VERSION%%/gst/control/unitconvert.h include/gstreamer-%%VERSION%%/gst/getbits/getbits.h include/gstreamer-%%VERSION%%/gst/gst.h include/gstreamer-%%VERSION%%/gst/gstatomic.h -include/gstreamer-%%VERSION%%/gst/gstautoplug.h include/gstreamer-%%VERSION%%/gst/gstbin.h include/gstreamer-%%VERSION%%/gst/gstbuffer.h -include/gstreamer-%%VERSION%%/gst/gstbufferpool-default.h include/gstreamer-%%VERSION%%/gst/gstcaps.h include/gstreamer-%%VERSION%%/gst/gstclock.h include/gstreamer-%%VERSION%%/gst/gstcompat.h @@ -31,11 +39,13 @@ include/gstreamer-%%VERSION%%/gst/gstcpu.h include/gstreamer-%%VERSION%%/gst/gstdata.h include/gstreamer-%%VERSION%%/gst/gstelement.h include/gstreamer-%%VERSION%%/gst/gstenumtypes.h +include/gstreamer-%%VERSION%%/gst/gsterror.h include/gstreamer-%%VERSION%%/gst/gstevent.h -include/gstreamer-%%VERSION%%/gst/gstextratypes.h +include/gstreamer-%%VERSION%%/gst/gstfilter.h include/gstreamer-%%VERSION%%/gst/gstformat.h include/gstreamer-%%VERSION%%/gst/gstindex.h include/gstreamer-%%VERSION%%/gst/gstinfo.h +include/gstreamer-%%VERSION%%/gst/gstinterface.h include/gstreamer-%%VERSION%%/gst/gstlog.h include/gstreamer-%%VERSION%%/gst/gstmacros.h include/gstreamer-%%VERSION%%/gst/gstmarshal.h @@ -47,28 +57,28 @@ include/gstreamer-%%VERSION%%/gst/gstpipeline.h include/gstreamer-%%VERSION%%/gst/gstplugin.h include/gstreamer-%%VERSION%%/gst/gstpluginfeature.h include/gstreamer-%%VERSION%%/gst/gstprobe.h -include/gstreamer-%%VERSION%%/gst/gstprops.h include/gstreamer-%%VERSION%%/gst/gstquery.h include/gstreamer-%%VERSION%%/gst/gstqueue.h include/gstreamer-%%VERSION%%/gst/gstregistry.h +include/gstreamer-%%VERSION%%/gst/gstregistrypool.h include/gstreamer-%%VERSION%%/gst/gstscheduler.h +include/gstreamer-%%VERSION%%/gst/gststructure.h include/gstreamer-%%VERSION%%/gst/gstsystemclock.h +include/gstreamer-%%VERSION%%/gst/gsttag.h +include/gstreamer-%%VERSION%%/gst/gsttaginterface.h include/gstreamer-%%VERSION%%/gst/gstthread.h include/gstreamer-%%VERSION%%/gst/gsttrace.h include/gstreamer-%%VERSION%%/gst/gsttrashstack.h -include/gstreamer-%%VERSION%%/gst/gsttype.h include/gstreamer-%%VERSION%%/gst/gsttypefind.h include/gstreamer-%%VERSION%%/gst/gsttypes.h include/gstreamer-%%VERSION%%/gst/gsturi.h +include/gstreamer-%%VERSION%%/gst/gsturitype.h include/gstreamer-%%VERSION%%/gst/gstutils.h +include/gstreamer-%%VERSION%%/gst/gstvalue.h include/gstreamer-%%VERSION%%/gst/gstversion.h include/gstreamer-%%VERSION%%/gst/gstxml.h -include/gstreamer-%%VERSION%%/gst/putbits/putbits.h -lib/gstreamer-%%VERSION%%/libgstautoplugcache.so -lib/gstreamer-%%VERSION%%/libgstautoplugger.so lib/gstreamer-%%VERSION%%/libgstbasicgthreadscheduler.so lib/gstreamer-%%VERSION%%/libgstbasicomegascheduler.so -lib/gstreamer-%%VERSION%%/libgstbasicwingoscheduler.so lib/gstreamer-%%VERSION%%/libgstbytestream.so lib/gstreamer-%%VERSION%%/libgstelements.so lib/gstreamer-%%VERSION%%/libgstgetbits.so @@ -76,12 +86,7 @@ lib/gstreamer-%%VERSION%%/libgstindexers.so lib/gstreamer-%%VERSION%%/libgstoptgthreadscheduler.so lib/gstreamer-%%VERSION%%/libgstoptomegascheduler.so lib/gstreamer-%%VERSION%%/libgstoptscheduler.so -lib/gstreamer-%%VERSION%%/libgstoptwingoscheduler.so -lib/gstreamer-%%VERSION%%/libgstputbits.so lib/gstreamer-%%VERSION%%/libgstspider.so -lib/gstreamer-%%VERSION%%/libgststaticautoplug.so -lib/gstreamer-%%VERSION%%/libgststaticautoplugrender.so -lib/gstreamer-%%VERSION%%/libgsttypes.so lib/libgstcontrol-%%VERSION%%.a lib/libgstcontrol-%%VERSION%%.so lib/libgstcontrol-%%VERSION%%.so.%%SHLIB_VERSION%% @@ -91,11 +96,18 @@ lib/libgstreamer-%%VERSION%%.so.%%SHLIB_VERSION%% libdata/pkgconfig/gstreamer-%%VERSION%%.pc libdata/pkgconfig/gstreamer-control-%%VERSION%%.pc share/aclocal/gst-element-check-%%VERSION%%.m4 +share/locale/fr/LC_MESSAGES/gstreamer-%%VERSION%%.mo +share/locale/nl/LC_MESSAGES/gstreamer-%%VERSION%%.mo +share/locale/sr/LC_MESSAGES/gstreamer-%%VERSION%%.mo @unexec rm %D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true +@dirrm share/gnome/doc/gstreamer-%%VERSION%%.0/pwg +@dirrm share/gnome/doc/gstreamer-%%VERSION%%.0/manual +@dirrm share/gnome/doc/gstreamer-%%VERSION%%.0/faq +@dirrm share/gnome/doc/gstreamer-%%VERSION%%.0 @dirrm share/gnome/cache/gstreamer-%%VERSION%% @unexec rmdir %D/share/gnome/cache 2>/dev/null || true @dirrm lib/gstreamer-%%VERSION%% -@dirrm include/gstreamer-%%VERSION%%/gst/putbits +@dirrm include/gstreamer-%%VERSION%%/gst/tag @dirrm include/gstreamer-%%VERSION%%/gst/getbits @dirrm include/gstreamer-%%VERSION%%/gst/control @dirrm include/gstreamer-%%VERSION%%/gst/bytestream diff --git a/multimedia/gstreamer80/Makefile b/multimedia/gstreamer80/Makefile index 3f7a4303ae02..e523e02d7034 100644 --- a/multimedia/gstreamer80/Makefile +++ b/multimedia/gstreamer80/Makefile @@ -6,11 +6,12 @@ # PORTNAME= gstreamer -PORTVERSION= 0.6.4 -PORTREVISION= 2 +PORTVERSION= 0.8.0 +PORTREVISION= 1 CATEGORIES= multimedia -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.6 +MASTER_SITES= ${MASTER_SITE_GNOME} \ + http://gstreamer.freedesktop.org/src/gstreamer/ +MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.8 DIST_SUBDIR= gnome2 MAINTAINER= lioux@FreeBSD.org @@ -21,39 +22,41 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt USE_X_PREFIX= yes USE_BISON= yes USE_BZIP2= yes +USE_PYTHON= yes USE_GMAKE= yes +USE_REINPLACE= yes WANT_GNOME= yes USE_GNOME= gnomehack \ gnomeprefix \ glib20 \ pkgconfig \ libxml2 -USE_SIZE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-tests \ --disable-failing-tests CONFIGURE_ENV= PKG_CONFIG=${PKG_CONFIG} \ CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" -CONFIGURE_TARGET= PLIST_SUB= \ - VERSION="${PORTVERSION:C/..$//}" \ + VERSION="${GST_VERSION}" \ SHLIB_VERSION="${SHLIB_VERSION}" INSTALLS_SHLIB= yes -MAN1= gst-complete.1 gst-compprep.1 gst-inspect.1 gst-launch.1 \ - gst-feedback.1 gst-md5sum.1 \ - gst-typefind.1 \ - gst-register.1 gst-xmllaunch.1 +MAN1= gst-complete-${GST_VERSION}.1 gst-compprep-${GST_VERSION}.1 \ + gst-feedback-${GST_VERSION}.1 gst-inspect-${GST_VERSION}.1 \ + gst-launch-${GST_VERSION}.1 gst-md5sum-${GST_VERSION}.1 \ + gst-register-${GST_VERSION}.1 gst-typefind-${GST_VERSION}.1 \ + gst-xmllaunch-${GST_VERSION}.1 PKG_CONFIG?="${LOCALBASE}/bin/pkg-config" +GST_VERSION=${PORTVERSION:C/..$//} # library minor number SHLIB_VERSION= 1 post-install: # register plugins - @${PREFIX}/bin/gst-register 2>/dev/null + -@${PREFIX}/bin/gst-register-${GST_VERSION} 2>/dev/null .include <bsd.port.pre.mk> diff --git a/multimedia/gstreamer80/distinfo b/multimedia/gstreamer80/distinfo index 2fd78bcd5366..a0fd0e772b25 100644 --- a/multimedia/gstreamer80/distinfo +++ b/multimedia/gstreamer80/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gstreamer-0.6.4.tar.bz2) = d607f42d4a6de9e79d74ccaa6469ded6 -SIZE (gnome2/gstreamer-0.6.4.tar.bz2) = 1108361 +MD5 (gnome2/gstreamer-0.8.0.tar.bz2) = 275384c4001c6b934f159952f39e2f36 +SIZE (gnome2/gstreamer-0.8.0.tar.bz2) = 1120465 diff --git a/multimedia/gstreamer80/files/patch-configure b/multimedia/gstreamer80/files/patch-configure index 11e54cb76694..4dafb1ddde0d 100644 --- a/multimedia/gstreamer80/files/patch-configure +++ b/multimedia/gstreamer80/files/patch-configure @@ -1,6 +1,15 @@ ---- configure.orig Sat Sep 27 14:13:57 2003 -+++ configure Sat Sep 27 14:18:37 2003 -@@ -8173,7 +8173,7 @@ +--- configure.orig Thu Feb 26 14:03:31 2004 ++++ configure Thu Feb 26 14:03:31 2004 +@@ -21858,7 +21858,7 @@ + + + EXP_VAR=LOCALEDIR +- FROM_VAR=$datadir/locale ++ FROM_VAR=$prefix/share/locale + + prefix_save=$prefix + exec_prefix_save=$exec_prefix +@@ -21961,7 +21961,7 @@ echo $ECHO_N "checking to see if compiler understands -Werror... $ECHO_C" >&6 save_CFLAGS="$CFLAGS" @@ -8,8 +17,8 @@ + CFLAGS="$CFLAGS" cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" -@@ -8214,7 +8214,7 @@ + /* confdefs.h. */ +@@ -22011,7 +22011,7 @@ CFLAGS="$save_CFLAGS" if test "X$flag_ok" = Xyes ; then @@ -17,13 +26,4 @@ + GST_ERROR="$GST_ERROR" true else - -@@ -9607,7 +9607,7 @@ - : - fi - --if test "$ac_cv_check_mcsc" == "yes"; then -+if test "$ac_cv_check_mcsc" = "yes"; then - - cat >>confdefs.h <<_ACEOF - #define HAVE_MAKECONTEXT $HAVE_MAKECONTEXT + GST_ERROR="$GST_ERROR" diff --git a/multimedia/gstreamer80/files/patch-gst::cothreads.c b/multimedia/gstreamer80/files/patch-gst::cothreads.c index 3519fb0e7e01..b66b7062f37b 100644 --- a/multimedia/gstreamer80/files/patch-gst::cothreads.c +++ b/multimedia/gstreamer80/files/patch-gst::cothreads.c @@ -1,6 +1,6 @@ ---- gst/cothreads.c.orig Sat Feb 1 19:09:00 2003 -+++ gst/cothreads.c Mon Feb 3 10:57:44 2003 -@@ -41,12 +41,16 @@ +--- gst/cothreads.c.orig Mon Feb 2 06:56:53 2004 ++++ gst/cothreads.c Fri Feb 6 13:05:26 2004 +@@ -42,6 +42,10 @@ #include <ucontext.h> #endif @@ -8,9 +8,11 @@ +#include <ucontext.h> +#endif + - /* older glibc's have MAP_ANON instead of MAP_ANONYMOUS */ #ifndef MAP_ANONYMOUS - #define MAP_ANONYMOUS MAP_ANON + #ifdef MAP_ANON + /* older glibc's have MAP_ANON instead of MAP_ANONYMOUS */ +@@ -52,7 +56,7 @@ + #endif #endif -#define STACK_SIZE 0x200000 diff --git a/multimedia/gstreamer80/files/patch-gst::gstthreaddummy.c b/multimedia/gstreamer80/files/patch-gst::gstthreaddummy.c index 479a05ba9c9b..71bace4805c9 100644 --- a/multimedia/gstreamer80/files/patch-gst::gstthreaddummy.c +++ b/multimedia/gstreamer80/files/patch-gst::gstthreaddummy.c @@ -1,12 +1,10 @@ ---- 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 @@ +--- gst/gstthreaddummy.c.orig Mon Jun 30 14:31:13 2003 ++++ gst/gstthreaddummy.c Fri Nov 14 15:36:22 2003 +@@ -17,6 +17,7 @@ * Boston, MA 02111-1307, USA. */ +#include <sys/types.h> + #include <unistd.h> #include <sys/time.h> -+#include <unistd.h> #include <glib.h> - #include "gstlog.h" - diff --git a/multimedia/gstreamer80/files/patch-libs::ext::cothreads::cothreads::cothreads.c b/multimedia/gstreamer80/files/patch-libs::ext::cothreads::cothreads::cothreads.c deleted file mode 100644 index e0e229f97524..000000000000 --- a/multimedia/gstreamer80/files/patch-libs::ext::cothreads::cothreads::cothreads.c +++ /dev/null @@ -1,19 +0,0 @@ ---- libs/ext/cothreads/cothreads/cothreads.c.orig Sat Feb 1 16:09:23 2003 -+++ libs/ext/cothreads/cothreads/cothreads.c Mon Mar 17 13:33:43 2003 -@@ -22,6 +22,7 @@ - - #include "pth_p.h" /* this pulls in everything */ - #include <sys/mman.h> -+#include <sys/time.h> - #include <sys/resource.h> - #include <stdlib.h> - -@@ -422,7 +423,7 @@ - *stack = malloc (_cothreads_chunk_size * (1.0 + 1.0/_cothreads_count)); - if (!stack) - return FALSE; -- *stack = (void*)((int)*stack &~ (int)(_cothreads_chunk_size / _cothreads_count - 1)); -+ *stack = (void*)((intptr_t)*stack &~ (intptr_t)(_cothreads_chunk_size / _cothreads_count - 1)); - *stack += 1; - #endif - diff --git a/multimedia/gstreamer80/files/patch-libs::ext::cothreads::tests::Makefile.in b/multimedia/gstreamer80/files/patch-libs::ext::cothreads::tests::Makefile.in deleted file mode 100644 index 4470b93eef61..000000000000 --- a/multimedia/gstreamer80/files/patch-libs::ext::cothreads::tests::Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- libs/ext/cothreads/tests/Makefile.in.orig Mon Oct 13 15:10:38 2003 -+++ libs/ext/cothreads/tests/Makefile.in Mon Oct 13 15:11:13 2003 -@@ -83,7 +83,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@ diff --git a/multimedia/gstreamer80/files/patch-ltmain.sh b/multimedia/gstreamer80/files/patch-ltmain.sh index 284a2d7b15df..9b5b1ec3b9aa 100644 --- a/multimedia/gstreamer80/files/patch-ltmain.sh +++ b/multimedia/gstreamer80/files/patch-ltmain.sh @@ -1,15 +1,15 @@ ---- ltmain.sh.orig Mon Oct 13 14:17:09 2003 -+++ ltmain.sh Sat Feb 21 15:44:32 2004 -@@ -1075,7 +1075,7 @@ +--- ltmain.sh.orig Tue Oct 28 09:26:50 2003 ++++ ltmain.sh Sat Feb 21 15:30:25 2004 +@@ -1280,7 +1280,7 @@ esac - elif test "X$arg" = "X-lc_r"; then - case $host in + 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 @@ + # Do not include libc_r directly, use -pthread flag. + continue + ;; +@@ -1290,8 +1290,16 @@ continue ;; @@ -26,17 +26,17 @@ continue ;; -@@ -2503,6 +2511,9 @@ - *-*-openbsd* | *-*-freebsd*) - # Do not include libc due to us having libc/libc_r. +@@ -3000,6 +3008,9 @@ + # problems, so we reset it completely + verstring= ;; + *-*-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 @@ + verstring="0.0" + ;; +@@ -5428,10 +5439,12 @@ fi # Install the pseudo-library for information purposes. diff --git a/multimedia/gstreamer80/pkg-plist b/multimedia/gstreamer80/pkg-plist index bb840023d420..1e43cd5e04cf 100644 --- a/multimedia/gstreamer80/pkg-plist +++ b/multimedia/gstreamer80/pkg-plist @@ -1,13 +1,23 @@ -@unexec %D/bin/gst-register 2>/dev/null || true bin/gst-complete +bin/gst-complete-%%VERSION%% bin/gst-compprep +bin/gst-compprep-%%VERSION%% bin/gst-feedback +bin/gst-feedback-%%VERSION%% bin/gst-inspect +bin/gst-inspect-%%VERSION%% bin/gst-launch +bin/gst-launch-%%VERSION%% bin/gst-md5sum +bin/gst-md5sum-%%VERSION%% bin/gst-register +bin/gst-register-%%VERSION%% bin/gst-typefind +bin/gst-typefind-%%VERSION%% +bin/gst-xmlinspect +bin/gst-xmlinspect-%%VERSION%% bin/gst-xmllaunch +bin/gst-xmllaunch-%%VERSION%% include/gstreamer-%%VERSION%%/gst/bytestream/bytestream.h include/gstreamer-%%VERSION%%/gst/control/control.h include/gstreamer-%%VERSION%%/gst/control/dparam.h @@ -19,10 +29,8 @@ include/gstreamer-%%VERSION%%/gst/control/unitconvert.h include/gstreamer-%%VERSION%%/gst/getbits/getbits.h include/gstreamer-%%VERSION%%/gst/gst.h include/gstreamer-%%VERSION%%/gst/gstatomic.h -include/gstreamer-%%VERSION%%/gst/gstautoplug.h include/gstreamer-%%VERSION%%/gst/gstbin.h include/gstreamer-%%VERSION%%/gst/gstbuffer.h -include/gstreamer-%%VERSION%%/gst/gstbufferpool-default.h include/gstreamer-%%VERSION%%/gst/gstcaps.h include/gstreamer-%%VERSION%%/gst/gstclock.h include/gstreamer-%%VERSION%%/gst/gstcompat.h @@ -31,11 +39,13 @@ include/gstreamer-%%VERSION%%/gst/gstcpu.h include/gstreamer-%%VERSION%%/gst/gstdata.h include/gstreamer-%%VERSION%%/gst/gstelement.h include/gstreamer-%%VERSION%%/gst/gstenumtypes.h +include/gstreamer-%%VERSION%%/gst/gsterror.h include/gstreamer-%%VERSION%%/gst/gstevent.h -include/gstreamer-%%VERSION%%/gst/gstextratypes.h +include/gstreamer-%%VERSION%%/gst/gstfilter.h include/gstreamer-%%VERSION%%/gst/gstformat.h include/gstreamer-%%VERSION%%/gst/gstindex.h include/gstreamer-%%VERSION%%/gst/gstinfo.h +include/gstreamer-%%VERSION%%/gst/gstinterface.h include/gstreamer-%%VERSION%%/gst/gstlog.h include/gstreamer-%%VERSION%%/gst/gstmacros.h include/gstreamer-%%VERSION%%/gst/gstmarshal.h @@ -47,28 +57,28 @@ include/gstreamer-%%VERSION%%/gst/gstpipeline.h include/gstreamer-%%VERSION%%/gst/gstplugin.h include/gstreamer-%%VERSION%%/gst/gstpluginfeature.h include/gstreamer-%%VERSION%%/gst/gstprobe.h -include/gstreamer-%%VERSION%%/gst/gstprops.h include/gstreamer-%%VERSION%%/gst/gstquery.h include/gstreamer-%%VERSION%%/gst/gstqueue.h include/gstreamer-%%VERSION%%/gst/gstregistry.h +include/gstreamer-%%VERSION%%/gst/gstregistrypool.h include/gstreamer-%%VERSION%%/gst/gstscheduler.h +include/gstreamer-%%VERSION%%/gst/gststructure.h include/gstreamer-%%VERSION%%/gst/gstsystemclock.h +include/gstreamer-%%VERSION%%/gst/gsttag.h +include/gstreamer-%%VERSION%%/gst/gsttaginterface.h include/gstreamer-%%VERSION%%/gst/gstthread.h include/gstreamer-%%VERSION%%/gst/gsttrace.h include/gstreamer-%%VERSION%%/gst/gsttrashstack.h -include/gstreamer-%%VERSION%%/gst/gsttype.h include/gstreamer-%%VERSION%%/gst/gsttypefind.h include/gstreamer-%%VERSION%%/gst/gsttypes.h include/gstreamer-%%VERSION%%/gst/gsturi.h +include/gstreamer-%%VERSION%%/gst/gsturitype.h include/gstreamer-%%VERSION%%/gst/gstutils.h +include/gstreamer-%%VERSION%%/gst/gstvalue.h include/gstreamer-%%VERSION%%/gst/gstversion.h include/gstreamer-%%VERSION%%/gst/gstxml.h -include/gstreamer-%%VERSION%%/gst/putbits/putbits.h -lib/gstreamer-%%VERSION%%/libgstautoplugcache.so -lib/gstreamer-%%VERSION%%/libgstautoplugger.so lib/gstreamer-%%VERSION%%/libgstbasicgthreadscheduler.so lib/gstreamer-%%VERSION%%/libgstbasicomegascheduler.so -lib/gstreamer-%%VERSION%%/libgstbasicwingoscheduler.so lib/gstreamer-%%VERSION%%/libgstbytestream.so lib/gstreamer-%%VERSION%%/libgstelements.so lib/gstreamer-%%VERSION%%/libgstgetbits.so @@ -76,12 +86,7 @@ lib/gstreamer-%%VERSION%%/libgstindexers.so lib/gstreamer-%%VERSION%%/libgstoptgthreadscheduler.so lib/gstreamer-%%VERSION%%/libgstoptomegascheduler.so lib/gstreamer-%%VERSION%%/libgstoptscheduler.so -lib/gstreamer-%%VERSION%%/libgstoptwingoscheduler.so -lib/gstreamer-%%VERSION%%/libgstputbits.so lib/gstreamer-%%VERSION%%/libgstspider.so -lib/gstreamer-%%VERSION%%/libgststaticautoplug.so -lib/gstreamer-%%VERSION%%/libgststaticautoplugrender.so -lib/gstreamer-%%VERSION%%/libgsttypes.so lib/libgstcontrol-%%VERSION%%.a lib/libgstcontrol-%%VERSION%%.so lib/libgstcontrol-%%VERSION%%.so.%%SHLIB_VERSION%% @@ -91,11 +96,18 @@ lib/libgstreamer-%%VERSION%%.so.%%SHLIB_VERSION%% libdata/pkgconfig/gstreamer-%%VERSION%%.pc libdata/pkgconfig/gstreamer-control-%%VERSION%%.pc share/aclocal/gst-element-check-%%VERSION%%.m4 +share/locale/fr/LC_MESSAGES/gstreamer-%%VERSION%%.mo +share/locale/nl/LC_MESSAGES/gstreamer-%%VERSION%%.mo +share/locale/sr/LC_MESSAGES/gstreamer-%%VERSION%%.mo @unexec rm %D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true +@dirrm share/gnome/doc/gstreamer-%%VERSION%%.0/pwg +@dirrm share/gnome/doc/gstreamer-%%VERSION%%.0/manual +@dirrm share/gnome/doc/gstreamer-%%VERSION%%.0/faq +@dirrm share/gnome/doc/gstreamer-%%VERSION%%.0 @dirrm share/gnome/cache/gstreamer-%%VERSION%% @unexec rmdir %D/share/gnome/cache 2>/dev/null || true @dirrm lib/gstreamer-%%VERSION%% -@dirrm include/gstreamer-%%VERSION%%/gst/putbits +@dirrm include/gstreamer-%%VERSION%%/gst/tag @dirrm include/gstreamer-%%VERSION%%/gst/getbits @dirrm include/gstreamer-%%VERSION%%/gst/control @dirrm include/gstreamer-%%VERSION%%/gst/bytestream diff --git a/multimedia/nautilus-media/Makefile b/multimedia/nautilus-media/Makefile index 429f5879d59e..5d2c4f9115a9 100644 --- a/multimedia/nautilus-media/Makefile +++ b/multimedia/nautilus-media/Makefile @@ -6,10 +6,11 @@ # PORTNAME= nautilus-media -PORTVERSION= 0.3.4 +PORTVERSION= 0.8.0 +PORTREVISION= 1 CATEGORIES= multimedia gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.3 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.8 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -19,7 +20,7 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes GNOME_DESKTOP_VERSION=2 -USE_GNOME= gnomeprefix gnomehack lthack intlhack nautilus2 gstreamerplugins +USE_GNOME= gnomeprefix gnomehack intlhack lthack nautilus2 gstreamerplugins USE_LIBTOOL_VER=13 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/multimedia/nautilus-media/distinfo b/multimedia/nautilus-media/distinfo index 8227812ad9bb..c22a3f7ba884 100644 --- a/multimedia/nautilus-media/distinfo +++ b/multimedia/nautilus-media/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/nautilus-media-0.3.4.tar.bz2) = da00eaa7c47bb1685b7c320f8d9afeba -SIZE (gnome2/nautilus-media-0.3.4.tar.bz2) = 383338 +MD5 (gnome2/nautilus-media-0.8.0.tar.bz2) = 78b2cdc9146af482cac52a549440e1ca +SIZE (gnome2/nautilus-media-0.8.0.tar.bz2) = 411161 diff --git a/multimedia/nautilus-media/pkg-descr b/multimedia/nautilus-media/pkg-descr index c751c58049f7..c8ad32667488 100644 --- a/multimedia/nautilus-media/pkg-descr +++ b/multimedia/nautilus-media/pkg-descr @@ -1,2 +1,2 @@ -Nautilus-media is a GStreamer-based multimedia support for Nautilus, including -an awesome new music view and video thumbnailing. +Nautilus-media provides GStreamer-based multimedia support within +Nautilus, including music previewing and video thumbnailing. diff --git a/multimedia/nautilus-media/pkg-plist b/multimedia/nautilus-media/pkg-plist index 1a32de598fd3..907b600d85b3 100644 --- a/multimedia/nautilus-media/pkg-plist +++ b/multimedia/nautilus-media/pkg-plist @@ -1,10 +1,20 @@ bin/gst-thumbnail +etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-shockwave-flash/%gconf.xml etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@mpeg/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@quicktime/%gconf.xml etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@x-avi/%gconf.xml etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@x-fli/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@x-ms-asf/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@x-ms-wmv/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@x-msvideo/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-shockwave-flash/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@mpeg/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@quicktime/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@x-avi/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@x-fli/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@x-ms-asf/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@x-ms-wmv/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@x-msvideo/%gconf.xml etc/gconf/schemas/gst-thumbnail.schemas lib/bonobo/libnautilus-audio-properties-view.so libdata/bonobo/servers/Nautilus_View_audio.server @@ -19,6 +29,7 @@ share/gnome/pixmaps/nautilus-media/prev.png share/gnome/pixmaps/nautilus-media/scan.png share/gnome/pixmaps/nautilus-media/stop.png share/locale/am/LC_MESSAGES/nautilus-media.mo +share/locale/ar/LC_MESSAGES/nautilus-media.mo share/locale/az/LC_MESSAGES/nautilus-media.mo share/locale/be/LC_MESSAGES/nautilus-media.mo share/locale/bg/LC_MESSAGES/nautilus-media.mo @@ -26,9 +37,10 @@ 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/de/LC_MESSAGES/nautilus-media.mo share/locale/el/LC_MESSAGES/nautilus-media.mo +share/locale/en_GB/LC_MESSAGES/nautilus-media.mo share/locale/es/LC_MESSAGES/nautilus-media.mo share/locale/et/LC_MESSAGES/nautilus-media.mo share/locale/eu/LC_MESSAGES/nautilus-media.mo @@ -38,6 +50,7 @@ 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/hr/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 @@ -52,7 +65,9 @@ share/locale/ml/LC_MESSAGES/nautilus-media.mo share/locale/mn/LC_MESSAGES/nautilus-media.mo share/locale/ms/LC_MESSAGES/nautilus-media.mo share/locale/nl/LC_MESSAGES/nautilus-media.mo +share/locale/nn/LC_MESSAGES/nautilus-media.mo share/locale/no/LC_MESSAGES/nautilus-media.mo +share/locale/pa/LC_MESSAGES/nautilus-media.mo share/locale/pl/LC_MESSAGES/nautilus-media.mo share/locale/pt/LC_MESSAGES/nautilus-media.mo share/locale/pt_BR/LC_MESSAGES/nautilus-media.mo @@ -72,9 +87,19 @@ share/locale/vi/LC_MESSAGES/nautilus-media.mo share/locale/zh_CN/LC_MESSAGES/nautilus-media.mo share/locale/zh_TW/LC_MESSAGES/nautilus-media.mo @dirrm share/gnome/pixmaps/nautilus-media +@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@x-msvideo +@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@x-ms-wmv +@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@x-ms-asf @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@x-fli @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@x-avi +@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@quicktime @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@mpeg +@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-shockwave-flash +@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@x-msvideo +@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@x-ms-wmv +@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@x-ms-asf @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@x-fli @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@x-avi +@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@quicktime @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@mpeg +@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-shockwave-flash diff --git a/net/gnome-netstatus/Makefile b/net/gnome-netstatus/Makefile index 2938e741bd35..a72930dd143b 100644 --- a/net/gnome-netstatus/Makefile +++ b/net/gnome-netstatus/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomenetstatus -PORTVERSION= 0.13 -PORTREVISION= 1 +PORTVERSION= 2.6.0.1 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-netstatus/0.13 +MASTER_SITE_SUBDIR= sources/gnome-netstatus/2.6 DISTNAME= gnome-netstatus-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/net/gnome-netstatus/distinfo b/net/gnome-netstatus/distinfo index 3b36ccde4426..27edbd022e7a 100644 --- a/net/gnome-netstatus/distinfo +++ b/net/gnome-netstatus/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-netstatus-0.13.tar.bz2) = fcaa1e625c4edf66bd447046563b566f -SIZE (gnome2/gnome-netstatus-0.13.tar.bz2) = 323702 +MD5 (gnome2/gnome-netstatus-2.6.0.1.tar.bz2) = 8236eec5a7174375f28ec05bcc628aaf +SIZE (gnome2/gnome-netstatus-2.6.0.1.tar.bz2) = 417230 diff --git a/net/gnome-netstatus/files/patch-icons_Makefile.in b/net/gnome-netstatus/files/patch-icons_Makefile.in new file mode 100644 index 000000000000..a47c7f9e2715 --- /dev/null +++ b/net/gnome-netstatus/files/patch-icons_Makefile.in @@ -0,0 +1,11 @@ +--- icons/Makefile.in.orig Mon Mar 8 22:22:36 2004 ++++ icons/Makefile.in Mon Mar 8 22:22:53 2004 +@@ -133,7 +133,7 @@ + + iconsize = 48x48 + category = apps +-iconsdir = $(datadir)/icons/hicolor/$(iconsize)/$(category) ++iconsdir = $(prefix)/share/icons/hicolor/$(iconsize)/$(category) + icons_DATA = \ + gnome-netstatus-disconn.png \ + gnome-netstatus-idle.png \ diff --git a/net/gnome-netstatus/files/patch-src_netstatus-iface.c b/net/gnome-netstatus/files/patch-src_netstatus-iface.c index f332699155bc..1ffae4384ecb 100644 --- a/net/gnome-netstatus/files/patch-src_netstatus-iface.c +++ b/net/gnome-netstatus/files/patch-src_netstatus-iface.c @@ -1,114 +1,19 @@ ---- src/netstatus-iface.c.orig Fri Oct 31 08:49:51 2003 -+++ src/netstatus-iface.c Fri Jan 2 23:29:27 2004 -@@ -32,9 +32,12 @@ +--- src/netstatus-iface.c.orig Mon Mar 22 17:49:17 2004 ++++ src/netstatus-iface.c Mon Mar 22 17:50:12 2004 +@@ -32,6 +32,8 @@ #include <libgnome/gnome-i18n.h> +#include <sys/types.h> +#include <sys/socket.h> #include <sys/ioctl.h> + #ifdef HAVE_SYS_SOCKIO_H + #include <sys/sockio.h> +@@ -39,6 +41,7 @@ + #include <sys/param.h> #include <net/if.h> #include <net/if_arp.h> +#include <netinet/in.h> #include <arpa/inet.h> #include <errno.h> #include <unistd.h> -@@ -577,6 +580,7 @@ - iface); - - netstatus_iface_monitor_timeout (iface); -+ - } - } - -@@ -646,7 +650,11 @@ - strncpy (if_req.ifr_name, iface->priv->name, IF_NAMESIZE - 1); - if_req.ifr_name [IF_NAMESIZE - 1] = '\0'; - if (mask && ioctl (fd, SIOCGIFNETMASK, &if_req) == 0) -+#if !defined(__FreeBSD__) - *mask = g_strdup (inet_ntoa (((struct sockaddr_in *) &if_req.ifr_netmask)->sin_addr)); -+#else -+ *mask = g_strdup (inet_ntoa (((struct sockaddr_in *) &if_req.ifr_addr)->sin_addr)); -+#endif - - close (fd); - -@@ -925,6 +933,7 @@ - char **hw_addr) - - { -+#ifdef SIOCGIFHWADDR - static struct HwType *hw_type = NULL; - struct ifreq if_req; - int fd; -@@ -973,6 +982,9 @@ - *hw_addr = hw_type->print_hw_addr (if_req.ifr_hwaddr.sa_data); - - return hw_type; -+#else -+ return NULL; -+#endif - } - - gboolean -@@ -1083,8 +1095,11 @@ - struct ifconf *if_conf; - GList *interfaces; - GList *loopbacks; -+ gchar *ptr; - int fd; -- int i; -+ struct ifreq *if_req; -+ int len; -+ gboolean loopback; - - if ((fd = socket (AF_INET, SOCK_DGRAM, 0)) < 0) - { -@@ -1105,12 +1120,25 @@ - interfaces = NULL; - loopbacks = NULL; - -- for (i = 0; i < if_conf->ifc_len / sizeof (struct ifreq); i++) -+ for (ptr = if_conf->ifc_buf; ptr < if_conf->ifc_buf + if_conf->ifc_len;) - { -- struct ifreq if_req = if_conf->ifc_req [i]; -- gboolean loopback = FALSE; -+ if_req = (struct ifreq *) ptr; -+ loopback = FALSE; -+ len = sizeof(struct sockaddr); -+#if defined(HAVE_SOCKADDR_SA_LEN) || defined(__FreeBSD__) -+ if (if_req->ifr_addr.sa_len > len) -+ len = if_req->ifr_addr.sa_len; -+#endif -+ -+ ptr += sizeof(if_req->ifr_name) + len; -+ -+ if (g_list_find_custom (interfaces, if_req->ifr_name, -+ (GCompareFunc) g_ascii_strcasecmp) != NULL -+ || g_list_find_custom (loopbacks, if_req->ifr_name, -+ (GCompareFunc) g_ascii_strcasecmp) != NULL) -+ continue; - -- if (ioctl (fd, SIOCGIFFLAGS, &if_req) < 0) -+ if (ioctl (fd, SIOCGIFFLAGS, if_req) < 0) - { - if (error) - *error = g_error_new (NETSTATUS_ERROR, -@@ -1120,13 +1148,14 @@ - } - else - { -- loopback = (if_req.ifr_flags & IFF_LOOPBACK); -+ loopback = (if_req->ifr_flags & IFF_LOOPBACK); - } - - if (!loopback) -- interfaces = g_list_prepend (interfaces, g_strdup (if_req.ifr_name)); -+ interfaces = g_list_prepend (interfaces, g_strdup (if_req->ifr_name)); - else -- loopbacks = g_list_prepend (loopbacks, g_strdup (if_req.ifr_name)); -+ loopbacks = g_list_prepend (loopbacks, g_strdup (if_req->ifr_name)); -+ - } - - interfaces = g_list_concat (interfaces, loopbacks); diff --git a/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c b/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c index 3598a24e696d..218948f7600c 100644 --- a/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c +++ b/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c @@ -1,160 +1,10 @@ ---- src/netstatus-sysdeps.c.orig Mon Jun 9 13:18:04 2003 -+++ src/netstatus-sysdeps.c Fri Jan 2 23:29:16 2004 -@@ -27,10 +27,13 @@ - - #include <stdio.h> - #include <string.h> -+#include <unistd.h> - #include <errno.h> - #include <glib.h> - #include <libgnome/gnome-i18n.h> - -+#if !defined(__FreeBSD__) -+ - static inline char * - parse_iface_name (const char *buf) - { -@@ -90,6 +93,7 @@ - } +--- src/netstatus-sysdeps.c.orig Wed Mar 24 14:23:47 2004 ++++ src/netstatus-sysdeps.c Wed Mar 24 14:25:19 2004 +@@ -331,7 +331,6 @@ + + error_shutdown: + g_io_channel_unref (channel); +- g_io_channel_shutdown (channel, TRUE, NULL); + close (pipe_out); } - } -+#endif - - static inline int - parse_stats (char *buf, -@@ -124,6 +128,8 @@ - return TRUE; - } - -+#if !defined(__FreeBSD__) -+ - static inline FILE * - get_proc_net_dev_fh (void) - { -@@ -206,3 +212,126 @@ - - return error_message; - } -+ -+#else -+ -+static inline void -+parse_header (char *buf, -+ int *prx_idx, -+ int *ptx_idx, -+ int *brx_idx, -+ int *btx_idx) -+{ -+ char *p; -+ int i; -+ -+ *prx_idx = *ptx_idx = -1; -+ *brx_idx = *btx_idx = -1; -+ -+ p = strtok (buf, " \n\t"); -+ for (i = 0; p; i++, p = strtok (NULL, " \t\n")) -+ { -+ if (!strcmp (p, "Ipkts")) -+ { -+ *prx_idx = i; -+ } -+ else if (!strcmp (p, "Ibytes")) -+ { -+ *brx_idx = i; -+ } -+ else if (!strcmp (p, "Opkts")) -+ { -+ *ptx_idx = i; -+ } -+ else if (!strcmp (p, "Obytes")) -+ { -+ *btx_idx = i; -+ } -+ } -+} -+ -+char * -+netstatus_sysdeps_read_iface_statistics (const char *iface, -+ long *in_packets, -+ long *out_packets, -+ long *in_bytes, -+ long *out_bytes) -+{ -+ gchar *buf; -+ gchar *cmd = NULL; -+ gchar **command_line; -+ int prx_idx, ptx_idx; -+ int brx_idx, btx_idx; -+ char *error_message = NULL; -+ gchar *dir = g_get_current_dir (); -+ gint pout; -+ GIOChannel *channel; -+ GError *err = NULL; -+ -+ *in_packets = -1; -+ *out_packets = -1; -+ *in_bytes = -1; -+ *out_bytes = -1; -+ -+ cmd = g_strdup_printf ("/usr/bin/netstat netstat -n -I %s -b -f inet", iface); -+ command_line = g_strsplit (cmd, " ", -1); -+ g_free (cmd); -+ -+ if (g_spawn_async_with_pipes (dir, command_line, NULL, -+ G_SPAWN_FILE_AND_ARGV_ZERO, NULL, -+ NULL, NULL, NULL, &pout, -+ NULL, &err)) { -+ g_strfreev (command_line); -+ channel = g_io_channel_unix_new (pout); -+ g_io_channel_read_line (channel, &buf, NULL, NULL, NULL); -+ -+ parse_header (buf, &prx_idx, &ptx_idx, &brx_idx, &btx_idx); -+ if (prx_idx == -1 || ptx_idx == -1 || -+ brx_idx == -1 || btx_idx == -1) -+ { -+ if (buf) -+ g_free (buf); -+ g_io_channel_unref (channel); -+ g_io_channel_shutdown (channel, TRUE, NULL); -+ close (pout); -+ return g_strdup ("Could not parse netstat output. Unknown format"); -+ } -+ -+ if (buf) -+ g_free (buf); -+ g_io_channel_read_line (channel, &buf, NULL, NULL, NULL); -+ -+ if (!parse_stats (buf, prx_idx, ptx_idx, in_packets, out_packets, -+ brx_idx, btx_idx, in_bytes, out_bytes)) -+ { -+ if (error_message) -+ g_free (error_message); -+ error_message = g_strdup_printf (_("Could not parse interface statistics from '%s'. " -+ "prx_idx = %d; ptx_idx = %d; brx_idx = %d; btx_idx = %d;"), -+ buf, prx_idx, ptx_idx, brx_idx, btx_idx); -+ } -+ -+ if (buf) -+ g_free (buf); -+ -+ if ((*in_packets == -1 || *out_packets == -1 || *in_bytes == -1 || *out_bytes == -1) && !error_message) -+ error_message = g_strdup_printf ("Could not obtain information on interface '%s' from netstat", iface); -+ -+ g_io_channel_unref (channel); -+ g_io_channel_shutdown (channel, TRUE, NULL); -+ close (pout); -+ } -+ else { -+ g_strfreev (command_line); -+ if (error_message) -+ g_free (error_message); -+ error_message = g_strdup_printf ("Error running /usr/bin/netstat for '%s': %s", -+ iface, err->message); -+ g_error_free (err); -+ } -+ -+ g_free (dir); -+ -+ return error_message; -+} -+#endif + else diff --git a/net/gnome-netstatus/pkg-descr b/net/gnome-netstatus/pkg-descr index 85e70885cf36..0848cf01ffc2 100644 --- a/net/gnome-netstatus/pkg-descr +++ b/net/gnome-netstatus/pkg-descr @@ -1,2 +1,2 @@ -Gnome-netstatus is an applet which provides information about a network -interface on your panel. +Gnome-netstatus is a panel applet which provides information about +network interfaces. diff --git a/net/gnome-netstatus/pkg-plist b/net/gnome-netstatus/pkg-plist index 75f6a0c128fc..c4e0a7b62327 100644 --- a/net/gnome-netstatus/pkg-plist +++ b/net/gnome-netstatus/pkg-plist @@ -6,36 +6,203 @@ libdata/bonobo/servers/GNOME_NetstatusApplet_Factory.server libexec/gnome-netstatus-applet share/gnome/gnome-2.0/ui/GNOME_NetstatusApplet.xml share/gnome/gnome-netstatus/gnome-netstatus.glade -share/gnome/icons/gnome-netstatus/gnome-netstatus-disconn.png -share/gnome/icons/gnome-netstatus/gnome-netstatus-error.png -share/gnome/icons/gnome-netstatus/gnome-netstatus-idle.png -share/gnome/icons/gnome-netstatus/gnome-netstatus-rx.png -share/gnome/icons/gnome-netstatus/gnome-netstatus-tx.png -share/gnome/icons/gnome-netstatus/gnome-netstatus-txrx.png +share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-disconn.png +share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-error.png +share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-idle.png +share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-rx.png +share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-tx.png +share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-txrx.png +share/gnome/help/gnome-netstatus/C/gnome-netstatus.xml +share/gnome/help/gnome-netstatus/C/legal.xml +share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-disconn.png +share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-error.png +share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-idle.png +share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-rx.png +share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-tx.png +share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-txrx.png +share/gnome/help/gnome-netstatus/de/gnome-netstatus.xml +share/gnome/help/gnome-netstatus/de/legal.xml +share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-disconn.png +share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-error.png +share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-idle.png +share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-rx.png +share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-tx.png +share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-txrx.png +share/gnome/help/gnome-netstatus/es/gnome-netstatus.xml +share/gnome/help/gnome-netstatus/es/legal.xml +share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-disconn.png +share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-error.png +share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-idle.png +share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-rx.png +share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-tx.png +share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-txrx.png +share/gnome/help/gnome-netstatus/fr/gnome-netstatus.xml +share/gnome/help/gnome-netstatus/fr/legal.xml +share/gnome/help/gnome-netstatus/it/figures/gnome-netstatus-disconn.png +share/gnome/help/gnome-netstatus/it/figures/gnome-netstatus-error.png +share/gnome/help/gnome-netstatus/it/figures/gnome-netstatus-idle.png +share/gnome/help/gnome-netstatus/it/figures/gnome-netstatus-rx.png +share/gnome/help/gnome-netstatus/it/figures/gnome-netstatus-tx.png +share/gnome/help/gnome-netstatus/it/figures/gnome-netstatus-txrx.png +share/gnome/help/gnome-netstatus/it/gnome-netstatus.xml +share/gnome/help/gnome-netstatus/it/legal.xml +share/gnome/help/gnome-netstatus/ja/figures/gnome-netstatus-disconn.png +share/gnome/help/gnome-netstatus/ja/figures/gnome-netstatus-error.png +share/gnome/help/gnome-netstatus/ja/figures/gnome-netstatus-idle.png +share/gnome/help/gnome-netstatus/ja/figures/gnome-netstatus-rx.png +share/gnome/help/gnome-netstatus/ja/figures/gnome-netstatus-tx.png +share/gnome/help/gnome-netstatus/ja/figures/gnome-netstatus-txrx.png +share/gnome/help/gnome-netstatus/ja/gnome-netstatus.xml +share/gnome/help/gnome-netstatus/ja/legal.xml +share/gnome/help/gnome-netstatus/ko/figures/gnome-netstatus-disconn.png +share/gnome/help/gnome-netstatus/ko/figures/gnome-netstatus-error.png +share/gnome/help/gnome-netstatus/ko/figures/gnome-netstatus-idle.png +share/gnome/help/gnome-netstatus/ko/figures/gnome-netstatus-rx.png +share/gnome/help/gnome-netstatus/ko/figures/gnome-netstatus-tx.png +share/gnome/help/gnome-netstatus/ko/figures/gnome-netstatus-txrx.png +share/gnome/help/gnome-netstatus/ko/gnome-netstatus.xml +share/gnome/help/gnome-netstatus/ko/legal.xml +share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-disconn.png +share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-error.png +share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-idle.png +share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-rx.png +share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-tx.png +share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-txrx.png +share/gnome/help/gnome-netstatus/sv/gnome-netstatus.xml +share/gnome/help/gnome-netstatus/sv/legal.xml +share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-disconn.png +share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-error.png +share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-idle.png +share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-rx.png +share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-tx.png +share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-txrx.png +share/gnome/help/gnome-netstatus/zh_CN/gnome-netstatus.xml +share/gnome/help/gnome-netstatus/zh_CN/legal.xml +share/gnome/help/gnome-netstatus/zh_HK/figures/gnome-netstatus-disconn.png +share/gnome/help/gnome-netstatus/zh_HK/figures/gnome-netstatus-error.png +share/gnome/help/gnome-netstatus/zh_HK/figures/gnome-netstatus-idle.png +share/gnome/help/gnome-netstatus/zh_HK/figures/gnome-netstatus-rx.png +share/gnome/help/gnome-netstatus/zh_HK/figures/gnome-netstatus-tx.png +share/gnome/help/gnome-netstatus/zh_HK/figures/gnome-netstatus-txrx.png +share/gnome/help/gnome-netstatus/zh_HK/gnome-netstatus.xml +share/gnome/help/gnome-netstatus/zh_HK/legal.xml +share/gnome/help/gnome-netstatus/zh_TW/figures/gnome-netstatus-disconn.png +share/gnome/help/gnome-netstatus/zh_TW/figures/gnome-netstatus-error.png +share/gnome/help/gnome-netstatus/zh_TW/figures/gnome-netstatus-idle.png +share/gnome/help/gnome-netstatus/zh_TW/figures/gnome-netstatus-rx.png +share/gnome/help/gnome-netstatus/zh_TW/figures/gnome-netstatus-tx.png +share/gnome/help/gnome-netstatus/zh_TW/figures/gnome-netstatus-txrx.png +share/gnome/help/gnome-netstatus/zh_TW/gnome-netstatus.xml +share/gnome/help/gnome-netstatus/zh_TW/legal.xml +share/gnome/omf/gnome-netstatus/gnome-netstatus-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-C.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-netstatus/gnome-netstatus-de.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-de.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-netstatus/gnome-netstatus-es.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-es.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-netstatus/gnome-netstatus-fr.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-fr.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-netstatus/gnome-netstatus-it.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-it.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-netstatus/gnome-netstatus-ja.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-ja.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-netstatus/gnome-netstatus-ko.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-ko.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-netstatus/gnome-netstatus-sv.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-sv.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_CN.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_CN.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_HK.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_HK.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_TW.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_TW.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/gnome-netstatus-tx.png +share/icons/hicolor/48x48/apps/gnome-netstatus-disconn.png +share/icons/hicolor/48x48/apps/gnome-netstatus-error.png +share/icons/hicolor/48x48/apps/gnome-netstatus-idle.png +share/icons/hicolor/48x48/apps/gnome-netstatus-rx.png +share/icons/hicolor/48x48/apps/gnome-netstatus-tx.png +share/icons/hicolor/48x48/apps/gnome-netstatus-txrx.png +share/locale/ar/LC_MESSAGES/gnome-netstatus.mo share/locale/az/LC_MESSAGES/gnome-netstatus.mo +share/locale/bn/LC_MESSAGES/gnome-netstatus.mo +share/locale/ca/LC_MESSAGES/gnome-netstatus.mo share/locale/cs/LC_MESSAGES/gnome-netstatus.mo +share/locale/cy/LC_MESSAGES/gnome-netstatus.mo +share/locale/da/LC_MESSAGES/gnome-netstatus.mo share/locale/de/LC_MESSAGES/gnome-netstatus.mo share/locale/el/LC_MESSAGES/gnome-netstatus.mo +share/locale/en_CA/LC_MESSAGES/gnome-netstatus.mo +share/locale/en_GB/LC_MESSAGES/gnome-netstatus.mo share/locale/es/LC_MESSAGES/gnome-netstatus.mo +share/locale/fi/LC_MESSAGES/gnome-netstatus.mo share/locale/fr/LC_MESSAGES/gnome-netstatus.mo +share/locale/ga/LC_MESSAGES/gnome-netstatus.mo +share/locale/hi/LC_MESSAGES/gnome-netstatus.mo +share/locale/hr/LC_MESSAGES/gnome-netstatus.mo +share/locale/hu/LC_MESSAGES/gnome-netstatus.mo share/locale/it/LC_MESSAGES/gnome-netstatus.mo share/locale/ja/LC_MESSAGES/gnome-netstatus.mo +share/locale/ko/LC_MESSAGES/gnome-netstatus.mo +share/locale/lt/LC_MESSAGES/gnome-netstatus.mo share/locale/mn/LC_MESSAGES/gnome-netstatus.mo share/locale/ms/LC_MESSAGES/gnome-netstatus.mo share/locale/nl/LC_MESSAGES/gnome-netstatus.mo +share/locale/nn/LC_MESSAGES/gnome-netstatus.mo +share/locale/no/LC_MESSAGES/gnome-netstatus.mo +share/locale/pa/LC_MESSAGES/gnome-netstatus.mo share/locale/pl/LC_MESSAGES/gnome-netstatus.mo share/locale/pt/LC_MESSAGES/gnome-netstatus.mo +share/locale/pt_BR/LC_MESSAGES/gnome-netstatus.mo +share/locale/ro/LC_MESSAGES/gnome-netstatus.mo share/locale/ru/LC_MESSAGES/gnome-netstatus.mo +share/locale/sk/LC_MESSAGES/gnome-netstatus.mo +share/locale/sq/LC_MESSAGES/gnome-netstatus.mo share/locale/sr/LC_MESSAGES/gnome-netstatus.mo share/locale/sr@Latn/LC_MESSAGES/gnome-netstatus.mo share/locale/sv/LC_MESSAGES/gnome-netstatus.mo +share/locale/th/LC_MESSAGES/gnome-netstatus.mo share/locale/tr/LC_MESSAGES/gnome-netstatus.mo +share/locale/uk/LC_MESSAGES/gnome-netstatus.mo share/locale/vi/LC_MESSAGES/gnome-netstatus.mo share/locale/wa/LC_MESSAGES/gnome-netstatus.mo share/locale/zh_CN/LC_MESSAGES/gnome-netstatus.mo -@dirrm share/gnome/icons/gnome-netstatus +@dirrm share/gnome/omf/gnome-netstatus +@dirrm share/gnome/help/gnome-netstatus/zh_TW/figures +@dirrm share/gnome/help/gnome-netstatus/zh_TW +@dirrm share/gnome/help/gnome-netstatus/zh_HK/figures +@dirrm share/gnome/help/gnome-netstatus/zh_HK +@dirrm share/gnome/help/gnome-netstatus/zh_CN/figures +@dirrm share/gnome/help/gnome-netstatus/zh_CN +@dirrm share/gnome/help/gnome-netstatus/sv/figures +@dirrm share/gnome/help/gnome-netstatus/sv +@dirrm share/gnome/help/gnome-netstatus/ko/figures +@dirrm share/gnome/help/gnome-netstatus/ko +@dirrm share/gnome/help/gnome-netstatus/ja/figures +@dirrm share/gnome/help/gnome-netstatus/ja +@dirrm share/gnome/help/gnome-netstatus/it/figures +@dirrm share/gnome/help/gnome-netstatus/it +@dirrm share/gnome/help/gnome-netstatus/fr/figures +@dirrm share/gnome/help/gnome-netstatus/fr +@dirrm share/gnome/help/gnome-netstatus/es/figures +@dirrm share/gnome/help/gnome-netstatus/es +@dirrm share/gnome/help/gnome-netstatus/de/figures +@dirrm share/gnome/help/gnome-netstatus/de +@dirrm share/gnome/help/gnome-netstatus/C/figures +@dirrm share/gnome/help/gnome-netstatus/C +@dirrm share/gnome/help/gnome-netstatus @dirrm share/gnome/gnome-netstatus @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/netstatus_applet/prefs @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/netstatus_applet @dirrm etc/gconf/gconf.xml.defaults/apps/netstatus_applet +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-de.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-es.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-fr.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-it.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-ja.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-ko.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-sv.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_CN.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_HK.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_TW.omf 2>/dev/null || /usr/bin/true diff --git a/net/gnomenetstatus/Makefile b/net/gnomenetstatus/Makefile index 2938e741bd35..a72930dd143b 100644 --- a/net/gnomenetstatus/Makefile +++ b/net/gnomenetstatus/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomenetstatus -PORTVERSION= 0.13 -PORTREVISION= 1 +PORTVERSION= 2.6.0.1 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-netstatus/0.13 +MASTER_SITE_SUBDIR= sources/gnome-netstatus/2.6 DISTNAME= gnome-netstatus-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/net/gnomenetstatus/distinfo b/net/gnomenetstatus/distinfo index 3b36ccde4426..27edbd022e7a 100644 --- a/net/gnomenetstatus/distinfo +++ b/net/gnomenetstatus/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-netstatus-0.13.tar.bz2) = fcaa1e625c4edf66bd447046563b566f -SIZE (gnome2/gnome-netstatus-0.13.tar.bz2) = 323702 +MD5 (gnome2/gnome-netstatus-2.6.0.1.tar.bz2) = 8236eec5a7174375f28ec05bcc628aaf +SIZE (gnome2/gnome-netstatus-2.6.0.1.tar.bz2) = 417230 diff --git a/net/gnomenetstatus/files/patch-icons_Makefile.in b/net/gnomenetstatus/files/patch-icons_Makefile.in new file mode 100644 index 000000000000..a47c7f9e2715 --- /dev/null +++ b/net/gnomenetstatus/files/patch-icons_Makefile.in @@ -0,0 +1,11 @@ +--- icons/Makefile.in.orig Mon Mar 8 22:22:36 2004 ++++ icons/Makefile.in Mon Mar 8 22:22:53 2004 +@@ -133,7 +133,7 @@ + + iconsize = 48x48 + category = apps +-iconsdir = $(datadir)/icons/hicolor/$(iconsize)/$(category) ++iconsdir = $(prefix)/share/icons/hicolor/$(iconsize)/$(category) + icons_DATA = \ + gnome-netstatus-disconn.png \ + gnome-netstatus-idle.png \ diff --git a/net/gnomenetstatus/files/patch-src_netstatus-iface.c b/net/gnomenetstatus/files/patch-src_netstatus-iface.c index f332699155bc..1ffae4384ecb 100644 --- a/net/gnomenetstatus/files/patch-src_netstatus-iface.c +++ b/net/gnomenetstatus/files/patch-src_netstatus-iface.c @@ -1,114 +1,19 @@ ---- src/netstatus-iface.c.orig Fri Oct 31 08:49:51 2003 -+++ src/netstatus-iface.c Fri Jan 2 23:29:27 2004 -@@ -32,9 +32,12 @@ +--- src/netstatus-iface.c.orig Mon Mar 22 17:49:17 2004 ++++ src/netstatus-iface.c Mon Mar 22 17:50:12 2004 +@@ -32,6 +32,8 @@ #include <libgnome/gnome-i18n.h> +#include <sys/types.h> +#include <sys/socket.h> #include <sys/ioctl.h> + #ifdef HAVE_SYS_SOCKIO_H + #include <sys/sockio.h> +@@ -39,6 +41,7 @@ + #include <sys/param.h> #include <net/if.h> #include <net/if_arp.h> +#include <netinet/in.h> #include <arpa/inet.h> #include <errno.h> #include <unistd.h> -@@ -577,6 +580,7 @@ - iface); - - netstatus_iface_monitor_timeout (iface); -+ - } - } - -@@ -646,7 +650,11 @@ - strncpy (if_req.ifr_name, iface->priv->name, IF_NAMESIZE - 1); - if_req.ifr_name [IF_NAMESIZE - 1] = '\0'; - if (mask && ioctl (fd, SIOCGIFNETMASK, &if_req) == 0) -+#if !defined(__FreeBSD__) - *mask = g_strdup (inet_ntoa (((struct sockaddr_in *) &if_req.ifr_netmask)->sin_addr)); -+#else -+ *mask = g_strdup (inet_ntoa (((struct sockaddr_in *) &if_req.ifr_addr)->sin_addr)); -+#endif - - close (fd); - -@@ -925,6 +933,7 @@ - char **hw_addr) - - { -+#ifdef SIOCGIFHWADDR - static struct HwType *hw_type = NULL; - struct ifreq if_req; - int fd; -@@ -973,6 +982,9 @@ - *hw_addr = hw_type->print_hw_addr (if_req.ifr_hwaddr.sa_data); - - return hw_type; -+#else -+ return NULL; -+#endif - } - - gboolean -@@ -1083,8 +1095,11 @@ - struct ifconf *if_conf; - GList *interfaces; - GList *loopbacks; -+ gchar *ptr; - int fd; -- int i; -+ struct ifreq *if_req; -+ int len; -+ gboolean loopback; - - if ((fd = socket (AF_INET, SOCK_DGRAM, 0)) < 0) - { -@@ -1105,12 +1120,25 @@ - interfaces = NULL; - loopbacks = NULL; - -- for (i = 0; i < if_conf->ifc_len / sizeof (struct ifreq); i++) -+ for (ptr = if_conf->ifc_buf; ptr < if_conf->ifc_buf + if_conf->ifc_len;) - { -- struct ifreq if_req = if_conf->ifc_req [i]; -- gboolean loopback = FALSE; -+ if_req = (struct ifreq *) ptr; -+ loopback = FALSE; -+ len = sizeof(struct sockaddr); -+#if defined(HAVE_SOCKADDR_SA_LEN) || defined(__FreeBSD__) -+ if (if_req->ifr_addr.sa_len > len) -+ len = if_req->ifr_addr.sa_len; -+#endif -+ -+ ptr += sizeof(if_req->ifr_name) + len; -+ -+ if (g_list_find_custom (interfaces, if_req->ifr_name, -+ (GCompareFunc) g_ascii_strcasecmp) != NULL -+ || g_list_find_custom (loopbacks, if_req->ifr_name, -+ (GCompareFunc) g_ascii_strcasecmp) != NULL) -+ continue; - -- if (ioctl (fd, SIOCGIFFLAGS, &if_req) < 0) -+ if (ioctl (fd, SIOCGIFFLAGS, if_req) < 0) - { - if (error) - *error = g_error_new (NETSTATUS_ERROR, -@@ -1120,13 +1148,14 @@ - } - else - { -- loopback = (if_req.ifr_flags & IFF_LOOPBACK); -+ loopback = (if_req->ifr_flags & IFF_LOOPBACK); - } - - if (!loopback) -- interfaces = g_list_prepend (interfaces, g_strdup (if_req.ifr_name)); -+ interfaces = g_list_prepend (interfaces, g_strdup (if_req->ifr_name)); - else -- loopbacks = g_list_prepend (loopbacks, g_strdup (if_req.ifr_name)); -+ loopbacks = g_list_prepend (loopbacks, g_strdup (if_req->ifr_name)); -+ - } - - interfaces = g_list_concat (interfaces, loopbacks); diff --git a/net/gnomenetstatus/files/patch-src_netstatus-sysdeps.c b/net/gnomenetstatus/files/patch-src_netstatus-sysdeps.c index 3598a24e696d..218948f7600c 100644 --- a/net/gnomenetstatus/files/patch-src_netstatus-sysdeps.c +++ b/net/gnomenetstatus/files/patch-src_netstatus-sysdeps.c @@ -1,160 +1,10 @@ ---- src/netstatus-sysdeps.c.orig Mon Jun 9 13:18:04 2003 -+++ src/netstatus-sysdeps.c Fri Jan 2 23:29:16 2004 -@@ -27,10 +27,13 @@ - - #include <stdio.h> - #include <string.h> -+#include <unistd.h> - #include <errno.h> - #include <glib.h> - #include <libgnome/gnome-i18n.h> - -+#if !defined(__FreeBSD__) -+ - static inline char * - parse_iface_name (const char *buf) - { -@@ -90,6 +93,7 @@ - } +--- src/netstatus-sysdeps.c.orig Wed Mar 24 14:23:47 2004 ++++ src/netstatus-sysdeps.c Wed Mar 24 14:25:19 2004 +@@ -331,7 +331,6 @@ + + error_shutdown: + g_io_channel_unref (channel); +- g_io_channel_shutdown (channel, TRUE, NULL); + close (pipe_out); } - } -+#endif - - static inline int - parse_stats (char *buf, -@@ -124,6 +128,8 @@ - return TRUE; - } - -+#if !defined(__FreeBSD__) -+ - static inline FILE * - get_proc_net_dev_fh (void) - { -@@ -206,3 +212,126 @@ - - return error_message; - } -+ -+#else -+ -+static inline void -+parse_header (char *buf, -+ int *prx_idx, -+ int *ptx_idx, -+ int *brx_idx, -+ int *btx_idx) -+{ -+ char *p; -+ int i; -+ -+ *prx_idx = *ptx_idx = -1; -+ *brx_idx = *btx_idx = -1; -+ -+ p = strtok (buf, " \n\t"); -+ for (i = 0; p; i++, p = strtok (NULL, " \t\n")) -+ { -+ if (!strcmp (p, "Ipkts")) -+ { -+ *prx_idx = i; -+ } -+ else if (!strcmp (p, "Ibytes")) -+ { -+ *brx_idx = i; -+ } -+ else if (!strcmp (p, "Opkts")) -+ { -+ *ptx_idx = i; -+ } -+ else if (!strcmp (p, "Obytes")) -+ { -+ *btx_idx = i; -+ } -+ } -+} -+ -+char * -+netstatus_sysdeps_read_iface_statistics (const char *iface, -+ long *in_packets, -+ long *out_packets, -+ long *in_bytes, -+ long *out_bytes) -+{ -+ gchar *buf; -+ gchar *cmd = NULL; -+ gchar **command_line; -+ int prx_idx, ptx_idx; -+ int brx_idx, btx_idx; -+ char *error_message = NULL; -+ gchar *dir = g_get_current_dir (); -+ gint pout; -+ GIOChannel *channel; -+ GError *err = NULL; -+ -+ *in_packets = -1; -+ *out_packets = -1; -+ *in_bytes = -1; -+ *out_bytes = -1; -+ -+ cmd = g_strdup_printf ("/usr/bin/netstat netstat -n -I %s -b -f inet", iface); -+ command_line = g_strsplit (cmd, " ", -1); -+ g_free (cmd); -+ -+ if (g_spawn_async_with_pipes (dir, command_line, NULL, -+ G_SPAWN_FILE_AND_ARGV_ZERO, NULL, -+ NULL, NULL, NULL, &pout, -+ NULL, &err)) { -+ g_strfreev (command_line); -+ channel = g_io_channel_unix_new (pout); -+ g_io_channel_read_line (channel, &buf, NULL, NULL, NULL); -+ -+ parse_header (buf, &prx_idx, &ptx_idx, &brx_idx, &btx_idx); -+ if (prx_idx == -1 || ptx_idx == -1 || -+ brx_idx == -1 || btx_idx == -1) -+ { -+ if (buf) -+ g_free (buf); -+ g_io_channel_unref (channel); -+ g_io_channel_shutdown (channel, TRUE, NULL); -+ close (pout); -+ return g_strdup ("Could not parse netstat output. Unknown format"); -+ } -+ -+ if (buf) -+ g_free (buf); -+ g_io_channel_read_line (channel, &buf, NULL, NULL, NULL); -+ -+ if (!parse_stats (buf, prx_idx, ptx_idx, in_packets, out_packets, -+ brx_idx, btx_idx, in_bytes, out_bytes)) -+ { -+ if (error_message) -+ g_free (error_message); -+ error_message = g_strdup_printf (_("Could not parse interface statistics from '%s'. " -+ "prx_idx = %d; ptx_idx = %d; brx_idx = %d; btx_idx = %d;"), -+ buf, prx_idx, ptx_idx, brx_idx, btx_idx); -+ } -+ -+ if (buf) -+ g_free (buf); -+ -+ if ((*in_packets == -1 || *out_packets == -1 || *in_bytes == -1 || *out_bytes == -1) && !error_message) -+ error_message = g_strdup_printf ("Could not obtain information on interface '%s' from netstat", iface); -+ -+ g_io_channel_unref (channel); -+ g_io_channel_shutdown (channel, TRUE, NULL); -+ close (pout); -+ } -+ else { -+ g_strfreev (command_line); -+ if (error_message) -+ g_free (error_message); -+ error_message = g_strdup_printf ("Error running /usr/bin/netstat for '%s': %s", -+ iface, err->message); -+ g_error_free (err); -+ } -+ -+ g_free (dir); -+ -+ return error_message; -+} -+#endif + else diff --git a/net/gnomenetstatus/pkg-descr b/net/gnomenetstatus/pkg-descr index 85e70885cf36..0848cf01ffc2 100644 --- a/net/gnomenetstatus/pkg-descr +++ b/net/gnomenetstatus/pkg-descr @@ -1,2 +1,2 @@ -Gnome-netstatus is an applet which provides information about a network -interface on your panel. +Gnome-netstatus is a panel applet which provides information about +network interfaces. diff --git a/net/gnomenetstatus/pkg-plist b/net/gnomenetstatus/pkg-plist index 75f6a0c128fc..c4e0a7b62327 100644 --- a/net/gnomenetstatus/pkg-plist +++ b/net/gnomenetstatus/pkg-plist @@ -6,36 +6,203 @@ libdata/bonobo/servers/GNOME_NetstatusApplet_Factory.server libexec/gnome-netstatus-applet share/gnome/gnome-2.0/ui/GNOME_NetstatusApplet.xml share/gnome/gnome-netstatus/gnome-netstatus.glade -share/gnome/icons/gnome-netstatus/gnome-netstatus-disconn.png -share/gnome/icons/gnome-netstatus/gnome-netstatus-error.png -share/gnome/icons/gnome-netstatus/gnome-netstatus-idle.png -share/gnome/icons/gnome-netstatus/gnome-netstatus-rx.png -share/gnome/icons/gnome-netstatus/gnome-netstatus-tx.png -share/gnome/icons/gnome-netstatus/gnome-netstatus-txrx.png +share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-disconn.png +share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-error.png +share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-idle.png +share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-rx.png +share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-tx.png +share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-txrx.png +share/gnome/help/gnome-netstatus/C/gnome-netstatus.xml +share/gnome/help/gnome-netstatus/C/legal.xml +share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-disconn.png +share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-error.png +share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-idle.png +share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-rx.png +share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-tx.png +share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-txrx.png +share/gnome/help/gnome-netstatus/de/gnome-netstatus.xml +share/gnome/help/gnome-netstatus/de/legal.xml +share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-disconn.png +share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-error.png +share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-idle.png +share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-rx.png +share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-tx.png +share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-txrx.png +share/gnome/help/gnome-netstatus/es/gnome-netstatus.xml +share/gnome/help/gnome-netstatus/es/legal.xml +share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-disconn.png +share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-error.png +share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-idle.png +share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-rx.png +share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-tx.png +share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-txrx.png +share/gnome/help/gnome-netstatus/fr/gnome-netstatus.xml +share/gnome/help/gnome-netstatus/fr/legal.xml +share/gnome/help/gnome-netstatus/it/figures/gnome-netstatus-disconn.png +share/gnome/help/gnome-netstatus/it/figures/gnome-netstatus-error.png +share/gnome/help/gnome-netstatus/it/figures/gnome-netstatus-idle.png +share/gnome/help/gnome-netstatus/it/figures/gnome-netstatus-rx.png +share/gnome/help/gnome-netstatus/it/figures/gnome-netstatus-tx.png +share/gnome/help/gnome-netstatus/it/figures/gnome-netstatus-txrx.png +share/gnome/help/gnome-netstatus/it/gnome-netstatus.xml +share/gnome/help/gnome-netstatus/it/legal.xml +share/gnome/help/gnome-netstatus/ja/figures/gnome-netstatus-disconn.png +share/gnome/help/gnome-netstatus/ja/figures/gnome-netstatus-error.png +share/gnome/help/gnome-netstatus/ja/figures/gnome-netstatus-idle.png +share/gnome/help/gnome-netstatus/ja/figures/gnome-netstatus-rx.png +share/gnome/help/gnome-netstatus/ja/figures/gnome-netstatus-tx.png +share/gnome/help/gnome-netstatus/ja/figures/gnome-netstatus-txrx.png +share/gnome/help/gnome-netstatus/ja/gnome-netstatus.xml +share/gnome/help/gnome-netstatus/ja/legal.xml +share/gnome/help/gnome-netstatus/ko/figures/gnome-netstatus-disconn.png +share/gnome/help/gnome-netstatus/ko/figures/gnome-netstatus-error.png +share/gnome/help/gnome-netstatus/ko/figures/gnome-netstatus-idle.png +share/gnome/help/gnome-netstatus/ko/figures/gnome-netstatus-rx.png +share/gnome/help/gnome-netstatus/ko/figures/gnome-netstatus-tx.png +share/gnome/help/gnome-netstatus/ko/figures/gnome-netstatus-txrx.png +share/gnome/help/gnome-netstatus/ko/gnome-netstatus.xml +share/gnome/help/gnome-netstatus/ko/legal.xml +share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-disconn.png +share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-error.png +share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-idle.png +share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-rx.png +share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-tx.png +share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-txrx.png +share/gnome/help/gnome-netstatus/sv/gnome-netstatus.xml +share/gnome/help/gnome-netstatus/sv/legal.xml +share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-disconn.png +share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-error.png +share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-idle.png +share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-rx.png +share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-tx.png +share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-txrx.png +share/gnome/help/gnome-netstatus/zh_CN/gnome-netstatus.xml +share/gnome/help/gnome-netstatus/zh_CN/legal.xml +share/gnome/help/gnome-netstatus/zh_HK/figures/gnome-netstatus-disconn.png +share/gnome/help/gnome-netstatus/zh_HK/figures/gnome-netstatus-error.png +share/gnome/help/gnome-netstatus/zh_HK/figures/gnome-netstatus-idle.png +share/gnome/help/gnome-netstatus/zh_HK/figures/gnome-netstatus-rx.png +share/gnome/help/gnome-netstatus/zh_HK/figures/gnome-netstatus-tx.png +share/gnome/help/gnome-netstatus/zh_HK/figures/gnome-netstatus-txrx.png +share/gnome/help/gnome-netstatus/zh_HK/gnome-netstatus.xml +share/gnome/help/gnome-netstatus/zh_HK/legal.xml +share/gnome/help/gnome-netstatus/zh_TW/figures/gnome-netstatus-disconn.png +share/gnome/help/gnome-netstatus/zh_TW/figures/gnome-netstatus-error.png +share/gnome/help/gnome-netstatus/zh_TW/figures/gnome-netstatus-idle.png +share/gnome/help/gnome-netstatus/zh_TW/figures/gnome-netstatus-rx.png +share/gnome/help/gnome-netstatus/zh_TW/figures/gnome-netstatus-tx.png +share/gnome/help/gnome-netstatus/zh_TW/figures/gnome-netstatus-txrx.png +share/gnome/help/gnome-netstatus/zh_TW/gnome-netstatus.xml +share/gnome/help/gnome-netstatus/zh_TW/legal.xml +share/gnome/omf/gnome-netstatus/gnome-netstatus-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-C.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-netstatus/gnome-netstatus-de.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-de.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-netstatus/gnome-netstatus-es.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-es.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-netstatus/gnome-netstatus-fr.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-fr.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-netstatus/gnome-netstatus-it.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-it.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-netstatus/gnome-netstatus-ja.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-ja.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-netstatus/gnome-netstatus-ko.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-ko.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-netstatus/gnome-netstatus-sv.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-sv.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_CN.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_CN.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_HK.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_HK.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_TW.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_TW.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/gnome-netstatus-tx.png +share/icons/hicolor/48x48/apps/gnome-netstatus-disconn.png +share/icons/hicolor/48x48/apps/gnome-netstatus-error.png +share/icons/hicolor/48x48/apps/gnome-netstatus-idle.png +share/icons/hicolor/48x48/apps/gnome-netstatus-rx.png +share/icons/hicolor/48x48/apps/gnome-netstatus-tx.png +share/icons/hicolor/48x48/apps/gnome-netstatus-txrx.png +share/locale/ar/LC_MESSAGES/gnome-netstatus.mo share/locale/az/LC_MESSAGES/gnome-netstatus.mo +share/locale/bn/LC_MESSAGES/gnome-netstatus.mo +share/locale/ca/LC_MESSAGES/gnome-netstatus.mo share/locale/cs/LC_MESSAGES/gnome-netstatus.mo +share/locale/cy/LC_MESSAGES/gnome-netstatus.mo +share/locale/da/LC_MESSAGES/gnome-netstatus.mo share/locale/de/LC_MESSAGES/gnome-netstatus.mo share/locale/el/LC_MESSAGES/gnome-netstatus.mo +share/locale/en_CA/LC_MESSAGES/gnome-netstatus.mo +share/locale/en_GB/LC_MESSAGES/gnome-netstatus.mo share/locale/es/LC_MESSAGES/gnome-netstatus.mo +share/locale/fi/LC_MESSAGES/gnome-netstatus.mo share/locale/fr/LC_MESSAGES/gnome-netstatus.mo +share/locale/ga/LC_MESSAGES/gnome-netstatus.mo +share/locale/hi/LC_MESSAGES/gnome-netstatus.mo +share/locale/hr/LC_MESSAGES/gnome-netstatus.mo +share/locale/hu/LC_MESSAGES/gnome-netstatus.mo share/locale/it/LC_MESSAGES/gnome-netstatus.mo share/locale/ja/LC_MESSAGES/gnome-netstatus.mo +share/locale/ko/LC_MESSAGES/gnome-netstatus.mo +share/locale/lt/LC_MESSAGES/gnome-netstatus.mo share/locale/mn/LC_MESSAGES/gnome-netstatus.mo share/locale/ms/LC_MESSAGES/gnome-netstatus.mo share/locale/nl/LC_MESSAGES/gnome-netstatus.mo +share/locale/nn/LC_MESSAGES/gnome-netstatus.mo +share/locale/no/LC_MESSAGES/gnome-netstatus.mo +share/locale/pa/LC_MESSAGES/gnome-netstatus.mo share/locale/pl/LC_MESSAGES/gnome-netstatus.mo share/locale/pt/LC_MESSAGES/gnome-netstatus.mo +share/locale/pt_BR/LC_MESSAGES/gnome-netstatus.mo +share/locale/ro/LC_MESSAGES/gnome-netstatus.mo share/locale/ru/LC_MESSAGES/gnome-netstatus.mo +share/locale/sk/LC_MESSAGES/gnome-netstatus.mo +share/locale/sq/LC_MESSAGES/gnome-netstatus.mo share/locale/sr/LC_MESSAGES/gnome-netstatus.mo share/locale/sr@Latn/LC_MESSAGES/gnome-netstatus.mo share/locale/sv/LC_MESSAGES/gnome-netstatus.mo +share/locale/th/LC_MESSAGES/gnome-netstatus.mo share/locale/tr/LC_MESSAGES/gnome-netstatus.mo +share/locale/uk/LC_MESSAGES/gnome-netstatus.mo share/locale/vi/LC_MESSAGES/gnome-netstatus.mo share/locale/wa/LC_MESSAGES/gnome-netstatus.mo share/locale/zh_CN/LC_MESSAGES/gnome-netstatus.mo -@dirrm share/gnome/icons/gnome-netstatus +@dirrm share/gnome/omf/gnome-netstatus +@dirrm share/gnome/help/gnome-netstatus/zh_TW/figures +@dirrm share/gnome/help/gnome-netstatus/zh_TW +@dirrm share/gnome/help/gnome-netstatus/zh_HK/figures +@dirrm share/gnome/help/gnome-netstatus/zh_HK +@dirrm share/gnome/help/gnome-netstatus/zh_CN/figures +@dirrm share/gnome/help/gnome-netstatus/zh_CN +@dirrm share/gnome/help/gnome-netstatus/sv/figures +@dirrm share/gnome/help/gnome-netstatus/sv +@dirrm share/gnome/help/gnome-netstatus/ko/figures +@dirrm share/gnome/help/gnome-netstatus/ko +@dirrm share/gnome/help/gnome-netstatus/ja/figures +@dirrm share/gnome/help/gnome-netstatus/ja +@dirrm share/gnome/help/gnome-netstatus/it/figures +@dirrm share/gnome/help/gnome-netstatus/it +@dirrm share/gnome/help/gnome-netstatus/fr/figures +@dirrm share/gnome/help/gnome-netstatus/fr +@dirrm share/gnome/help/gnome-netstatus/es/figures +@dirrm share/gnome/help/gnome-netstatus/es +@dirrm share/gnome/help/gnome-netstatus/de/figures +@dirrm share/gnome/help/gnome-netstatus/de +@dirrm share/gnome/help/gnome-netstatus/C/figures +@dirrm share/gnome/help/gnome-netstatus/C +@dirrm share/gnome/help/gnome-netstatus @dirrm share/gnome/gnome-netstatus @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/netstatus_applet/prefs @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/netstatus_applet @dirrm etc/gconf/gconf.xml.defaults/apps/netstatus_applet +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-de.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-es.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-fr.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-it.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-ja.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-ko.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-sv.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_CN.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_HK.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_TW.omf 2>/dev/null || /usr/bin/true diff --git a/print/ggv2/Makefile b/print/ggv2/Makefile index ca017a713c36..336354b12e48 100644 --- a/print/ggv2/Makefile +++ b/print/ggv2/Makefile @@ -6,23 +6,22 @@ # PORTNAME= ggv2 -PORTVERSION= 2.4.1 +PORTVERSION= 2.6.0 CATEGORIES= print gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.4 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.6 DISTNAME= ggv-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME 2 ghostscript viewer -USE_GHOSTSCRIPT= yes - USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack libgnomeui -GNU_CONFIGURE= yes +USE_GNOME= gnomeprefix gnomehack lthack intlhack libgnomeui +USE_GHOSTSCRIPT=yes +USE_LIBTOOL_VER=13 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/print/ggv2/distinfo b/print/ggv2/distinfo index 2d9c5ef88f65..a0f5f95983f1 100644 --- a/print/ggv2/distinfo +++ b/print/ggv2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/ggv-2.4.1.tar.bz2) = 6d88e2c299d6062e85b8199f5f36c801 -SIZE (gnome2/ggv-2.4.1.tar.bz2) = 1130149 +MD5 (gnome2/ggv-2.6.0.tar.bz2) = 5d3920904e16cb30903bfd114daf59f3 +SIZE (gnome2/ggv-2.6.0.tar.bz2) = 1176804 diff --git a/print/ggv2/pkg-plist b/print/ggv2/pkg-plist index e80c738314b3..1836f6f79dc3 100644 --- a/print/ggv2/pkg-plist +++ b/print/ggv2/pkg-plist @@ -82,6 +82,7 @@ share/gnome/pixmaps/ggv/toggleodd.xpm share/gnome/pixmaps/ggv/zoom.xpm share/gnome/pixmaps/gnome-ghostview.png share/locale/am/LC_MESSAGES/ggv.mo +share/locale/ar/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 @@ -92,6 +93,7 @@ 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 +share/locale/en_GB/LC_MESSAGES/ggv.mo share/locale/es/LC_MESSAGES/ggv.mo share/locale/et/LC_MESSAGES/ggv.mo share/locale/eu/LC_MESSAGES/ggv.mo diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile index f8cb51cd89aa..e214b6558af9 100644 --- a/print/libgnomeprint/Makefile +++ b/print/libgnomeprint/Makefile @@ -6,11 +6,10 @@ # PORTNAME= libgnomeprint -PORTVERSION= 2.4.2 -PORTREVISION= 1 +PORTVERSION= 2.6.0 CATEGORIES= print gnome 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 @@ -20,7 +19,8 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes USE_REINPLACE= yes -USE_GNOME= gnomeprefix gnomehack gnomehier libbonobo libartlgpl2 gtk20 +USE_GNOME= gnomeprefix intlhack gnomehack gnomehier libbonobo libartlgpl2 \ + gtk20 lthack INSTALLS_SHLIB= yes USE_LIBTOOL_VER=13 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/print/libgnomeprint/distinfo b/print/libgnomeprint/distinfo index a5e9875af9c2..bd04e8a8d382 100644 --- a/print/libgnomeprint/distinfo +++ b/print/libgnomeprint/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libgnomeprint-2.4.2.tar.bz2) = d58534de6c0c6c953b42d82eec0ebfe8 -SIZE (gnome2/libgnomeprint-2.4.2.tar.bz2) = 639654 +MD5 (gnome2/libgnomeprint-2.6.0.tar.bz2) = f2010f398d12e9c589a8a7d05ef37d39 +SIZE (gnome2/libgnomeprint-2.6.0.tar.bz2) = 685974 diff --git a/print/libgnomeprint/files/patch-configure b/print/libgnomeprint/files/patch-configure deleted file mode 100644 index 1aa2a531a053..000000000000 --- a/print/libgnomeprint/files/patch-configure +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.orig Tue Mar 11 18:33:02 2003 -+++ configure Wed Mar 12 00:58:23 2003 -@@ -8580,6 +8580,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' diff --git a/print/libgnomeprint/files/patch-libgnomeprint::gnome-meta.c b/print/libgnomeprint/files/patch-libgnomeprint::gnome-meta.c new file mode 100644 index 000000000000..5526dceaa446 --- /dev/null +++ b/print/libgnomeprint/files/patch-libgnomeprint::gnome-meta.c @@ -0,0 +1,10 @@ +--- libgnomeprint/gnome-print-meta.c.orig Wed Oct 29 00:53:15 2003 ++++ libgnomeprint/gnome-print-meta.c Wed Oct 29 01:06:23 2003 +@@ -312,6 +312,7 @@ + gpm_encode_int (pc, w); + gpm_encode_int (pc, ch); + ++ gpm_ensure_space(pc, w * ch * h); + for (y = 0; y < h; y++){ + gpm_encode_block (pc, px, w * ch); + px += rowstride; diff --git a/print/libgnomeprint/files/patch-libgnomeprint_gnome-print.c b/print/libgnomeprint/files/patch-libgnomeprint_gnome-print.c deleted file mode 100644 index 6aa2b9a4fd79..000000000000 --- a/print/libgnomeprint/files/patch-libgnomeprint_gnome-print.c +++ /dev/null @@ -1,12 +0,0 @@ ---- libgnomeprint/gnome-print.c.orig Tue Jan 7 14:39:24 2003 -+++ libgnomeprint/gnome-print.c Tue Jan 7 14:39:35 2003 -@@ -38,8 +38,8 @@ - #include <libgnomeprint/gnome-print-frgba.h> - - /* For the buffer stuff, remove when the buffer stuff is moved out here */ --#include <sys/mman.h> - #include <sys/types.h> -+#include <sys/mman.h> - #include <sys/stat.h> - #include <fcntl.h> - #include <unistd.h> diff --git a/print/libgnomeprint/pkg-descr b/print/libgnomeprint/pkg-descr index f7ae47f42231..ad9ac2ec1f10 100644 --- a/print/libgnomeprint/pkg-descr +++ b/print/libgnomeprint/pkg-descr @@ -1,4 +1,3 @@ -This is a prototype implementation of the Gnome Printing Architecture, -as described in: +The basis for the Gnome Printing Architecture as described in: WWW: http://www.gnome.org/projects/gnome-print/ diff --git a/print/libgnomeprint/pkg-plist b/print/libgnomeprint/pkg-plist index 23e1585f32e1..bc6bb735e7ef 100644 --- a/print/libgnomeprint/pkg-plist +++ b/print/libgnomeprint/pkg-plist @@ -15,6 +15,7 @@ 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-pango.h include/libgnomeprint-2.2/libgnomeprint/private/gnome-print-private.h include/libgnomeprint-2.2/libgnomeprint/private/gp-gc-private.h include/libgnomeprint-2.2/libgnomeprint/private/gpa-config.h @@ -43,6 +44,16 @@ 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-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 @@ -67,6 +78,8 @@ 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 +share/locale/en_CA/LC_MESSAGES/libgnomeprint-2.2.mo +share/locale/en_GB/LC_MESSAGES/libgnomeprint-2.2.mo share/locale/es/LC_MESSAGES/libgnomeprint-2.2.mo share/locale/et/LC_MESSAGES/libgnomeprint-2.2.mo share/locale/fa/LC_MESSAGES/libgnomeprint-2.2.mo @@ -74,6 +87,7 @@ share/locale/fi/LC_MESSAGES/libgnomeprint-2.2.mo share/locale/fr/LC_MESSAGES/libgnomeprint-2.2.mo share/locale/ga/LC_MESSAGES/libgnomeprint-2.2.mo share/locale/he/LC_MESSAGES/libgnomeprint-2.2.mo +share/locale/hr/LC_MESSAGES/libgnomeprint-2.2.mo share/locale/hu/LC_MESSAGES/libgnomeprint-2.2.mo share/locale/hi/LC_MESSAGES/libgnomeprint-2.2.mo share/locale/id/LC_MESSAGES/libgnomeprint-2.2.mo @@ -91,6 +105,7 @@ share/locale/ms/LC_MESSAGES/libgnomeprint-2.2.mo share/locale/nl/LC_MESSAGES/libgnomeprint-2.2.mo share/locale/nn/LC_MESSAGES/libgnomeprint-2.2.mo share/locale/no/LC_MESSAGES/libgnomeprint-2.2.mo +share/locale/pa/LC_MESSAGES/libgnomeprint-2.2.mo share/locale/pl/LC_MESSAGES/libgnomeprint-2.2.mo share/locale/pt/LC_MESSAGES/libgnomeprint-2.2.mo share/locale/pt_BR/LC_MESSAGES/libgnomeprint-2.2.mo diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile index f671b006eadb..4c2e7d843870 100644 --- a/sysutils/gconf-editor/Makefile +++ b/sysutils/gconf-editor/Makefile @@ -6,12 +6,11 @@ # PORTNAME= gconf-editor -PORTVERSION= 2.4.0 -PORTREVISION= 1 +PORTVERSION= 2.6.0 PORTEPOCH= 1 CATEGORIES= sysutils gnome 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 @@ -22,7 +21,10 @@ USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack gconf2 USE_LIBTOOL_VER=13 +USE_REINPLACE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +MAN1= gconf-editor.1 + .include <bsd.port.mk> diff --git a/sysutils/gconf-editor/distinfo b/sysutils/gconf-editor/distinfo index f516c9ba7941..a6923b7cd49c 100644 --- a/sysutils/gconf-editor/distinfo +++ b/sysutils/gconf-editor/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gconf-editor-2.4.0.tar.bz2) = 7ebc352062fc8b6d3c09a69ad6e963a7 -SIZE (gnome2/gconf-editor-2.4.0.tar.bz2) = 352468 +MD5 (gnome2/gconf-editor-2.6.0.tar.bz2) = 456d5dbddefffe7b49f18688aa9c1975 +SIZE (gnome2/gconf-editor-2.6.0.tar.bz2) = 372032 diff --git a/sysutils/gconf-editor/pkg-descr b/sysutils/gconf-editor/pkg-descr index f840cc1d25d8..0c8d23c9b407 100644 --- a/sysutils/gconf-editor/pkg-descr +++ b/sysutils/gconf-editor/pkg-descr @@ -1,2 +1,2 @@ -gconf-editor is a gconf database editor for GNOME 2.0. It is similar to +gconf-editor is a GNOME 2 GConf database editor. It is analogous to regedit on Windows. diff --git a/sysutils/gconf-editor/pkg-plist b/sysutils/gconf-editor/pkg-plist index 55767281a4e8..75b183159c71 100644 --- a/sysutils/gconf-editor/pkg-plist +++ b/sysutils/gconf-editor/pkg-plist @@ -22,6 +22,7 @@ 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 +share/locale/en_GB/LC_MESSAGES/gconf-editor.mo share/locale/es/LC_MESSAGES/gconf-editor.mo share/locale/et/LC_MESSAGES/gconf-editor.mo share/locale/fa/LC_MESSAGES/gconf-editor.mo @@ -31,6 +32,7 @@ share/locale/ga/LC_MESSAGES/gconf-editor.mo share/locale/gl/LC_MESSAGES/gconf-editor.mo share/locale/he/LC_MESSAGES/gconf-editor.mo share/locale/hi/LC_MESSAGES/gconf-editor.mo +share/locale/hr/LC_MESSAGES/gconf-editor.mo share/locale/hu/LC_MESSAGES/gconf-editor.mo share/locale/id/LC_MESSAGES/gconf-editor.mo share/locale/it/LC_MESSAGES/gconf-editor.mo @@ -43,9 +45,11 @@ 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/mr/LC_MESSAGES/gconf-editor.mo share/locale/ms/LC_MESSAGES/gconf-editor.mo share/locale/nl/LC_MESSAGES/gconf-editor.mo share/locale/no/LC_MESSAGES/gconf-editor.mo +share/locale/pa/LC_MESSAGES/gconf-editor.mo share/locale/pl/LC_MESSAGES/gconf-editor.mo share/locale/pt/LC_MESSAGES/gconf-editor.mo share/locale/pt_BR/LC_MESSAGES/gconf-editor.mo @@ -58,6 +62,7 @@ share/locale/sr/LC_MESSAGES/gconf-editor.mo share/locale/sr@Latn/LC_MESSAGES/gconf-editor.mo share/locale/sv/LC_MESSAGES/gconf-editor.mo share/locale/ta/LC_MESSAGES/gconf-editor.mo +share/locale/th/LC_MESSAGES/gconf-editor.mo share/locale/tr/LC_MESSAGES/gconf-editor.mo share/locale/uk/LC_MESSAGES/gconf-editor.mo share/locale/vi/LC_MESSAGES/gconf-editor.mo diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile index ea79decebbdf..2dff803143d3 100644 --- a/sysutils/gnome-control-center/Makefile +++ b/sysutils/gnome-control-center/Makefile @@ -6,23 +6,24 @@ # PORTNAME= gnomecontrolcenter2 -PORTVERSION= 2.4.0 -PORTREVISION= 1 +PORTVERSION= 2.6.0.3 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/control-center/2.4 +MASTER_SITE_SUBDIR= sources/control-center/2.6 DISTNAME= control-center-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Control center for GNOME 2 project +LIB_DEPENDS= xklavier.8:${PORTSDIR}/x11/libxklavier + USE_BZIP2= yes USE_X_PREFIX= yes USE_REINPLACE= yes USE_GMAKE= yes GNOME_DESKTOP_VERSION=2 -USE_GNOME= gnomeprefix gnomehack gnomehier metacity nautilus2 +USE_GNOME= gnomeprefix gnomehack gnomehier intlhack metacity nautilus2 GNU_CONFIGURE= yes INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo index ff6267bd5edf..81cab7473379 100644 --- a/sysutils/gnome-control-center/distinfo +++ b/sysutils/gnome-control-center/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/control-center-2.4.0.tar.bz2) = 44115d3174d2f603f34a336ada562bae -SIZE (gnome2/control-center-2.4.0.tar.bz2) = 2042574 +MD5 (gnome2/control-center-2.6.0.3.tar.bz2) = 7d482e42842dc5b8a52714ae7a0aafed +SIZE (gnome2/control-center-2.6.0.3.tar.bz2) = 2364656 diff --git a/sysutils/gnome-control-center/files/patch-capplets_desktop-links_Makefile.in b/sysutils/gnome-control-center/files/patch-capplets_desktop-links_Makefile.in new file mode 100644 index 000000000000..5a6b0ba8f2d6 --- /dev/null +++ b/sysutils/gnome-control-center/files/patch-capplets_desktop-links_Makefile.in @@ -0,0 +1,11 @@ +--- capplets/desktop-links/Makefile.in.orig Tue Dec 30 15:55:28 2003 ++++ capplets/desktop-links/Makefile.in Tue Dec 30 15:55:49 2003 +@@ -190,7 +190,7 @@ + + pixmaps_pre = $(capplets:=-capplet.png) + pixmaps_DATA = $(pixmaps_pre) accessibility-directory.png +-pixmapsdir = $(datadir)/icons/gnome/48x48/apps ++pixmapsdir = $(prefix)/share/icons/gnome/48x48/apps + + desktop_files = $(capplets:=.desktop) + desktop_in_files = $(desktop_files:.desktop=.desktop.in) diff --git a/sysutils/gnome-control-center/files/patch-configure b/sysutils/gnome-control-center/files/patch-configure index 83ef8876cbb3..820e1fc4bfb4 100644 --- a/sysutils/gnome-control-center/files/patch-configure +++ b/sysutils/gnome-control-center/files/patch-configure @@ -1,6 +1,31 @@ ---- configure.orig Wed Dec 18 16:10:09 2002 -+++ configure Sun Dec 22 16:36:03 2002 -@@ -12607,7 +12608,7 @@ +--- configure.orig Thu Mar 11 03:09:48 2004 ++++ configure Thu Mar 11 03:12:25 2004 +@@ -21373,6 +21373,7 @@ + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else ++ LIBS="-lintl $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -21461,6 +21462,7 @@ + cat >>confdefs.h <<_ACEOF + #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF ++LIBS="-lintl $LIBS" + have_ngettext=yes + fi + done +@@ -25595,7 +25597,7 @@ + if test "x$CATOBJEXT" = "x.mo" ; then + localedir=`eval echo "${libdir}/locale"` + else +- localedir=`eval echo "${datadir}/locale"` ++ localedir=`eval echo "${prefix}/share/locale"` + fi + prefix="$glib_save_prefix" + exec_prefix="$glib_save_exec_prefix" +@@ -26257,7 +26259,7 @@ cat >>confdefs.h <<_ACEOF diff --git a/sysutils/gnome-control-center/pkg-descr b/sysutils/gnome-control-center/pkg-descr index 017e3d76e99e..26d4dbe929b2 100644 --- a/sysutils/gnome-control-center/pkg-descr +++ b/sysutils/gnome-control-center/pkg-descr @@ -1 +1 @@ -control center for GNOME 2.0 project. +Configuration tools tightly integrated within the GNOME 2 desktop. diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist index 00cba32274e8..a1c257fb1b00 100644 --- a/sysutils/gnome-control-center/pkg-plist +++ b/sysutils/gnome-control-center/pkg-plist @@ -11,7 +11,6 @@ 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 @@ -22,8 +21,10 @@ 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/keybindings/%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/peripherals/keyboard/xkb/%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 @@ -32,8 +33,10 @@ etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-them 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/keybindings/%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/peripherals/keyboard/xkb/%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 @@ -41,8 +44,10 @@ etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-fo 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_keybindings.schemas etc/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas etc/gconf/schemas/desktop_gnome_font_rendering.schemas +etc/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas etc/gconf/schemas/fontilus.schemas etc/gconf/schemas/themus.schemas etc/gnome-vfs-2.0/modules/font-method.conf @@ -62,41 +67,33 @@ libdata/bonobo/servers/Themus_Properties_View.server libdata/bonobo/servers/fontilus.server libdata/pkgconfig/gnome-window-settings-2.0.pc libexec/fontilus-context-menu +libexec/gnome-settings-daemon 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 +share/gnome/control-center-2.0/capplets/gnome-settings-mouse.desktop +share/gnome/control-center-2.0/capplets/gnome-settings-sound.desktop +share/gnome/control-center-2.0/capplets/gnome-ui-properties.desktop share/gnome/control-center-2.0/capplets/gtk-theme-selector.desktop share/gnome/control-center-2.0/capplets/keybinding.desktop share/gnome/control-center-2.0/capplets/keyboard.desktop -share/gnome/control-center-2.0/capplets/mouse.desktop -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/acme.glade +share/gnome/control-center-2.0/interfaces/apply-font.glade 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 share/gnome/control-center-2.0/interfaces/gnome-accessibility-keyboard-properties.glade +share/gnome/control-center-2.0/interfaces/gnome-background-properties.glade share/gnome/control-center-2.0/interfaces/gnome-default-applications-properties.glade share/gnome/control-center-2.0/interfaces/gnome-keybinding-properties.glade share/gnome/control-center-2.0/interfaces/gnome-keyboard-properties.glade @@ -112,7 +109,8 @@ 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/acme-brightness.png +share/gnome/control-center-2.0/pixmaps/acme-eject.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 @@ -122,8 +120,9 @@ 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 +share/gnome/control-center-2.0/pixmaps/gnome-speakernotes-muted.png +share/gnome/control-center-2.0/pixmaps/gnome-speakernotes.png share/gnome/control-center-2.0/pixmaps/keyboard-bell.png -share/gnome/control-center-2.0/pixmaps/keyboard-capplet.png share/gnome/control-center-2.0/pixmaps/keyboard-cursor.png share/gnome/control-center-2.0/pixmaps/keyboard-repeat.png share/gnome/control-center-2.0/pixmaps/keyboard-volume.png @@ -134,7 +133,6 @@ 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 @@ -148,7 +146,6 @@ 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 @@ -158,27 +155,18 @@ 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 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/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/icons/gnome/48x48/apps/accessibility-directory.png +share/locale/af/LC_MESSAGES/control-center-2.0.mo 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 @@ -191,6 +179,7 @@ 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 +share/locale/en_CA/LC_MESSAGES/control-center-2.0.mo share/locale/en_GB/LC_MESSAGES/control-center-2.0.mo share/locale/es/LC_MESSAGES/control-center-2.0.mo share/locale/et/LC_MESSAGES/control-center-2.0.mo @@ -217,6 +206,7 @@ share/locale/ms/LC_MESSAGES/control-center-2.0.mo share/locale/nl/LC_MESSAGES/control-center-2.0.mo share/locale/nn/LC_MESSAGES/control-center-2.0.mo share/locale/no/LC_MESSAGES/control-center-2.0.mo +share/locale/pa/LC_MESSAGES/control-center-2.0.mo share/locale/pl/LC_MESSAGES/control-center-2.0.mo share/locale/pt/LC_MESSAGES/control-center-2.0.mo share/locale/pt_BR/LC_MESSAGES/control-center-2.0.mo @@ -237,6 +227,7 @@ share/locale/wa/LC_MESSAGES/control-center-2.0.mo 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/gnome-background-properties @dirrm share/gnome/cursor-fonts @dirrm share/gnome/control-center-2.0/xrdb @dirrm share/gnome/control-center-2.0/pixmaps @@ -251,8 +242,11 @@ share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo @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/desktop/gnome/peripherals/keyboard/xkb +@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/font_rendering @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/keybindings @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 @@ -261,7 +255,8 @@ share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo @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/schemas/desktop/gnome/peripherals/keyboard/xkb @dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/screensaver +@dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/keybindings @dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/editor @dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile index 24082cb98839..ddf03c8cbaf9 100644 --- a/sysutils/gnome-system-monitor/Makefile +++ b/sysutils/gnome-system-monitor/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomesystemmonitor -PORTVERSION= 2.4.0 -PORTREVISION= 1 +PORTVERSION= 2.6.0 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-system-monitor/2.4 +MASTER_SITE_SUBDIR= sources/gnome-system-monitor/2.6 DISTNAME= gnome-system-monitor-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -22,7 +21,8 @@ LIB_DEPENDS= gtop-2.0.2:${PORTSDIR}/devel/libgtop2 USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack libgnomeui libwnck +USE_REINPLACE= yes +USE_GNOME= gnomeprefix intlhack lthack gnomehack libgnomeui libwnck USE_LIBTOOL_VER=13 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib -lutil" diff --git a/sysutils/gnome-system-monitor/distinfo b/sysutils/gnome-system-monitor/distinfo index 7115f703da96..75cc73e5deaa 100644 --- a/sysutils/gnome-system-monitor/distinfo +++ b/sysutils/gnome-system-monitor/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-system-monitor-2.4.0.tar.bz2) = f855d85adcc2eb0f20f639cbc2f00cbf -SIZE (gnome2/gnome-system-monitor-2.4.0.tar.bz2) = 546873 +MD5 (gnome2/gnome-system-monitor-2.6.0.tar.bz2) = 1bc8709baa43fdca7eee8cad1dc76b17 +SIZE (gnome2/gnome-system-monitor-2.6.0.tar.bz2) = 597694 diff --git a/sysutils/gnome-system-monitor/files/patch-src_util.c b/sysutils/gnome-system-monitor/files/patch-src_util.c index b7e262b0c599..288ccc26adc0 100644 --- a/sysutils/gnome-system-monitor/files/patch-src_util.c +++ b/sysutils/gnome-system-monitor/files/patch-src_util.c @@ -1,5 +1,5 @@ ---- src/util.c.orig Thu May 9 01:16:48 2002 -+++ src/util.c Thu May 9 01:17:13 2002 +--- src/util.c.orig Fri Dec 12 02:26:57 2003 ++++ src/util.c Fri Dec 12 02:35:38 2003 @@ -16,6 +16,7 @@ #ifdef __FreeBSD__ @@ -8,3 +8,27 @@ # include <libutil.h> #endif +@@ -181,7 +182,11 @@ + * Make su think we're sending the password from a terminal: + */ + ++#ifndef __FreeBSD__ + if (((t_fd = OPEN_TTY()) < 0) || (grantpt(t_fd) < 0) || (unlockpt(t_fd) < 0)) { ++#else ++ if ((t_fd = OPEN_TTY()) < 0) { ++#endif + fprintf (stderr, "Unable to open a terminal\n"); + ABORT (root); + } +@@ -259,7 +264,11 @@ + } + } + ++#ifndef __FreeBSD__ + if(((pts = ptsname(t_fd)) == NULL) || ((t_fd = open(pts, O_RDWR | O_NOCTTY)) < 0)) { ++#else ++ if (((pts = ttyname(t_fd)) == NULL) || ((t_fd = open(pts, O_RDWR | O_NOCTTY)) < 0)) { ++#endif + perror ("Unable to open pseudo slave terminal"); + _exit (-1); + } diff --git a/sysutils/gnome-system-monitor/pkg-plist b/sysutils/gnome-system-monitor/pkg-plist index d035ed3953c7..bf559c2732a3 100644 --- a/sysutils/gnome-system-monitor/pkg-plist +++ b/sysutils/gnome-system-monitor/pkg-plist @@ -13,6 +13,7 @@ share/gnome/help/gnome-system-monitor/C/figures/addColumn.png share/gnome/help/gnome-system-monitor/C/figures/changePriority.png share/gnome/help/gnome-system-monitor/C/figures/colorPanel.png share/gnome/help/gnome-system-monitor/C/figures/columnContextMenu.png +share/gnome/help/gnome-system-monitor/C/figures/gnome-system-monitor_window.png share/gnome/help/gnome-system-monitor/C/figures/memoryMaps.png share/gnome/help/gnome-system-monitor/C/figures/moreInfo.png share/gnome/help/gnome-system-monitor/C/figures/processListing.png @@ -38,6 +39,7 @@ 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/en_CA/LC_MESSAGES/gnome-system-monitor.mo share/locale/es/LC_MESSAGES/gnome-system-monitor.mo share/locale/fa/LC_MESSAGES/gnome-system-monitor.mo share/locale/fi/LC_MESSAGES/gnome-system-monitor.mo @@ -46,12 +48,14 @@ 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 +share/locale/hr/LC_MESSAGES/gnome-system-monitor.mo share/locale/hu/LC_MESSAGES/gnome-system-monitor.mo 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/lt/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 @@ -70,6 +74,7 @@ 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/ta/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 ea79decebbdf..2dff803143d3 100644 --- a/sysutils/gnomecontrolcenter2/Makefile +++ b/sysutils/gnomecontrolcenter2/Makefile @@ -6,23 +6,24 @@ # PORTNAME= gnomecontrolcenter2 -PORTVERSION= 2.4.0 -PORTREVISION= 1 +PORTVERSION= 2.6.0.3 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/control-center/2.4 +MASTER_SITE_SUBDIR= sources/control-center/2.6 DISTNAME= control-center-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Control center for GNOME 2 project +LIB_DEPENDS= xklavier.8:${PORTSDIR}/x11/libxklavier + USE_BZIP2= yes USE_X_PREFIX= yes USE_REINPLACE= yes USE_GMAKE= yes GNOME_DESKTOP_VERSION=2 -USE_GNOME= gnomeprefix gnomehack gnomehier metacity nautilus2 +USE_GNOME= gnomeprefix gnomehack gnomehier intlhack metacity nautilus2 GNU_CONFIGURE= yes INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ diff --git a/sysutils/gnomecontrolcenter2/distinfo b/sysutils/gnomecontrolcenter2/distinfo index ff6267bd5edf..81cab7473379 100644 --- a/sysutils/gnomecontrolcenter2/distinfo +++ b/sysutils/gnomecontrolcenter2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/control-center-2.4.0.tar.bz2) = 44115d3174d2f603f34a336ada562bae -SIZE (gnome2/control-center-2.4.0.tar.bz2) = 2042574 +MD5 (gnome2/control-center-2.6.0.3.tar.bz2) = 7d482e42842dc5b8a52714ae7a0aafed +SIZE (gnome2/control-center-2.6.0.3.tar.bz2) = 2364656 diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_desktop-links_Makefile.in b/sysutils/gnomecontrolcenter2/files/patch-capplets_desktop-links_Makefile.in new file mode 100644 index 000000000000..5a6b0ba8f2d6 --- /dev/null +++ b/sysutils/gnomecontrolcenter2/files/patch-capplets_desktop-links_Makefile.in @@ -0,0 +1,11 @@ +--- capplets/desktop-links/Makefile.in.orig Tue Dec 30 15:55:28 2003 ++++ capplets/desktop-links/Makefile.in Tue Dec 30 15:55:49 2003 +@@ -190,7 +190,7 @@ + + pixmaps_pre = $(capplets:=-capplet.png) + pixmaps_DATA = $(pixmaps_pre) accessibility-directory.png +-pixmapsdir = $(datadir)/icons/gnome/48x48/apps ++pixmapsdir = $(prefix)/share/icons/gnome/48x48/apps + + desktop_files = $(capplets:=.desktop) + desktop_in_files = $(desktop_files:.desktop=.desktop.in) diff --git a/sysutils/gnomecontrolcenter2/files/patch-configure b/sysutils/gnomecontrolcenter2/files/patch-configure index 83ef8876cbb3..820e1fc4bfb4 100644 --- a/sysutils/gnomecontrolcenter2/files/patch-configure +++ b/sysutils/gnomecontrolcenter2/files/patch-configure @@ -1,6 +1,31 @@ ---- configure.orig Wed Dec 18 16:10:09 2002 -+++ configure Sun Dec 22 16:36:03 2002 -@@ -12607,7 +12608,7 @@ +--- configure.orig Thu Mar 11 03:09:48 2004 ++++ configure Thu Mar 11 03:12:25 2004 +@@ -21373,6 +21373,7 @@ + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else ++ LIBS="-lintl $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -21461,6 +21462,7 @@ + cat >>confdefs.h <<_ACEOF + #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF ++LIBS="-lintl $LIBS" + have_ngettext=yes + fi + done +@@ -25595,7 +25597,7 @@ + if test "x$CATOBJEXT" = "x.mo" ; then + localedir=`eval echo "${libdir}/locale"` + else +- localedir=`eval echo "${datadir}/locale"` ++ localedir=`eval echo "${prefix}/share/locale"` + fi + prefix="$glib_save_prefix" + exec_prefix="$glib_save_exec_prefix" +@@ -26257,7 +26259,7 @@ cat >>confdefs.h <<_ACEOF diff --git a/sysutils/gnomecontrolcenter2/pkg-descr b/sysutils/gnomecontrolcenter2/pkg-descr index 017e3d76e99e..26d4dbe929b2 100644 --- a/sysutils/gnomecontrolcenter2/pkg-descr +++ b/sysutils/gnomecontrolcenter2/pkg-descr @@ -1 +1 @@ -control center for GNOME 2.0 project. +Configuration tools tightly integrated within the GNOME 2 desktop. diff --git a/sysutils/gnomecontrolcenter2/pkg-plist b/sysutils/gnomecontrolcenter2/pkg-plist index 00cba32274e8..a1c257fb1b00 100644 --- a/sysutils/gnomecontrolcenter2/pkg-plist +++ b/sysutils/gnomecontrolcenter2/pkg-plist @@ -11,7 +11,6 @@ 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 @@ -22,8 +21,10 @@ 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/keybindings/%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/peripherals/keyboard/xkb/%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 @@ -32,8 +33,10 @@ etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-them 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/keybindings/%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/peripherals/keyboard/xkb/%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 @@ -41,8 +44,10 @@ etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-fo 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_keybindings.schemas etc/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas etc/gconf/schemas/desktop_gnome_font_rendering.schemas +etc/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas etc/gconf/schemas/fontilus.schemas etc/gconf/schemas/themus.schemas etc/gnome-vfs-2.0/modules/font-method.conf @@ -62,41 +67,33 @@ libdata/bonobo/servers/Themus_Properties_View.server libdata/bonobo/servers/fontilus.server libdata/pkgconfig/gnome-window-settings-2.0.pc libexec/fontilus-context-menu +libexec/gnome-settings-daemon 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 +share/gnome/control-center-2.0/capplets/gnome-settings-mouse.desktop +share/gnome/control-center-2.0/capplets/gnome-settings-sound.desktop +share/gnome/control-center-2.0/capplets/gnome-ui-properties.desktop share/gnome/control-center-2.0/capplets/gtk-theme-selector.desktop share/gnome/control-center-2.0/capplets/keybinding.desktop share/gnome/control-center-2.0/capplets/keyboard.desktop -share/gnome/control-center-2.0/capplets/mouse.desktop -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/acme.glade +share/gnome/control-center-2.0/interfaces/apply-font.glade 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 share/gnome/control-center-2.0/interfaces/gnome-accessibility-keyboard-properties.glade +share/gnome/control-center-2.0/interfaces/gnome-background-properties.glade share/gnome/control-center-2.0/interfaces/gnome-default-applications-properties.glade share/gnome/control-center-2.0/interfaces/gnome-keybinding-properties.glade share/gnome/control-center-2.0/interfaces/gnome-keyboard-properties.glade @@ -112,7 +109,8 @@ 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/acme-brightness.png +share/gnome/control-center-2.0/pixmaps/acme-eject.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 @@ -122,8 +120,9 @@ 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 +share/gnome/control-center-2.0/pixmaps/gnome-speakernotes-muted.png +share/gnome/control-center-2.0/pixmaps/gnome-speakernotes.png share/gnome/control-center-2.0/pixmaps/keyboard-bell.png -share/gnome/control-center-2.0/pixmaps/keyboard-capplet.png share/gnome/control-center-2.0/pixmaps/keyboard-cursor.png share/gnome/control-center-2.0/pixmaps/keyboard-repeat.png share/gnome/control-center-2.0/pixmaps/keyboard-volume.png @@ -134,7 +133,6 @@ 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 @@ -148,7 +146,6 @@ 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 @@ -158,27 +155,18 @@ 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 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/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/icons/gnome/48x48/apps/accessibility-directory.png +share/locale/af/LC_MESSAGES/control-center-2.0.mo 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 @@ -191,6 +179,7 @@ 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 +share/locale/en_CA/LC_MESSAGES/control-center-2.0.mo share/locale/en_GB/LC_MESSAGES/control-center-2.0.mo share/locale/es/LC_MESSAGES/control-center-2.0.mo share/locale/et/LC_MESSAGES/control-center-2.0.mo @@ -217,6 +206,7 @@ share/locale/ms/LC_MESSAGES/control-center-2.0.mo share/locale/nl/LC_MESSAGES/control-center-2.0.mo share/locale/nn/LC_MESSAGES/control-center-2.0.mo share/locale/no/LC_MESSAGES/control-center-2.0.mo +share/locale/pa/LC_MESSAGES/control-center-2.0.mo share/locale/pl/LC_MESSAGES/control-center-2.0.mo share/locale/pt/LC_MESSAGES/control-center-2.0.mo share/locale/pt_BR/LC_MESSAGES/control-center-2.0.mo @@ -237,6 +227,7 @@ share/locale/wa/LC_MESSAGES/control-center-2.0.mo 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/gnome-background-properties @dirrm share/gnome/cursor-fonts @dirrm share/gnome/control-center-2.0/xrdb @dirrm share/gnome/control-center-2.0/pixmaps @@ -251,8 +242,11 @@ share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo @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/desktop/gnome/peripherals/keyboard/xkb +@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/font_rendering @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/keybindings @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 @@ -261,7 +255,8 @@ share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo @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/schemas/desktop/gnome/peripherals/keyboard/xkb @dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/screensaver +@dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/keybindings @dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/editor @dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon diff --git a/sysutils/gnomesystemmonitor/Makefile b/sysutils/gnomesystemmonitor/Makefile index 24082cb98839..ddf03c8cbaf9 100644 --- a/sysutils/gnomesystemmonitor/Makefile +++ b/sysutils/gnomesystemmonitor/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomesystemmonitor -PORTVERSION= 2.4.0 -PORTREVISION= 1 +PORTVERSION= 2.6.0 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-system-monitor/2.4 +MASTER_SITE_SUBDIR= sources/gnome-system-monitor/2.6 DISTNAME= gnome-system-monitor-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -22,7 +21,8 @@ LIB_DEPENDS= gtop-2.0.2:${PORTSDIR}/devel/libgtop2 USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack libgnomeui libwnck +USE_REINPLACE= yes +USE_GNOME= gnomeprefix intlhack lthack gnomehack libgnomeui libwnck USE_LIBTOOL_VER=13 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib -lutil" diff --git a/sysutils/gnomesystemmonitor/distinfo b/sysutils/gnomesystemmonitor/distinfo index 7115f703da96..75cc73e5deaa 100644 --- a/sysutils/gnomesystemmonitor/distinfo +++ b/sysutils/gnomesystemmonitor/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-system-monitor-2.4.0.tar.bz2) = f855d85adcc2eb0f20f639cbc2f00cbf -SIZE (gnome2/gnome-system-monitor-2.4.0.tar.bz2) = 546873 +MD5 (gnome2/gnome-system-monitor-2.6.0.tar.bz2) = 1bc8709baa43fdca7eee8cad1dc76b17 +SIZE (gnome2/gnome-system-monitor-2.6.0.tar.bz2) = 597694 diff --git a/sysutils/gnomesystemmonitor/files/patch-src_util.c b/sysutils/gnomesystemmonitor/files/patch-src_util.c index b7e262b0c599..288ccc26adc0 100644 --- a/sysutils/gnomesystemmonitor/files/patch-src_util.c +++ b/sysutils/gnomesystemmonitor/files/patch-src_util.c @@ -1,5 +1,5 @@ ---- src/util.c.orig Thu May 9 01:16:48 2002 -+++ src/util.c Thu May 9 01:17:13 2002 +--- src/util.c.orig Fri Dec 12 02:26:57 2003 ++++ src/util.c Fri Dec 12 02:35:38 2003 @@ -16,6 +16,7 @@ #ifdef __FreeBSD__ @@ -8,3 +8,27 @@ # include <libutil.h> #endif +@@ -181,7 +182,11 @@ + * Make su think we're sending the password from a terminal: + */ + ++#ifndef __FreeBSD__ + if (((t_fd = OPEN_TTY()) < 0) || (grantpt(t_fd) < 0) || (unlockpt(t_fd) < 0)) { ++#else ++ if ((t_fd = OPEN_TTY()) < 0) { ++#endif + fprintf (stderr, "Unable to open a terminal\n"); + ABORT (root); + } +@@ -259,7 +264,11 @@ + } + } + ++#ifndef __FreeBSD__ + if(((pts = ptsname(t_fd)) == NULL) || ((t_fd = open(pts, O_RDWR | O_NOCTTY)) < 0)) { ++#else ++ if (((pts = ttyname(t_fd)) == NULL) || ((t_fd = open(pts, O_RDWR | O_NOCTTY)) < 0)) { ++#endif + perror ("Unable to open pseudo slave terminal"); + _exit (-1); + } diff --git a/sysutils/gnomesystemmonitor/pkg-plist b/sysutils/gnomesystemmonitor/pkg-plist index d035ed3953c7..bf559c2732a3 100644 --- a/sysutils/gnomesystemmonitor/pkg-plist +++ b/sysutils/gnomesystemmonitor/pkg-plist @@ -13,6 +13,7 @@ share/gnome/help/gnome-system-monitor/C/figures/addColumn.png share/gnome/help/gnome-system-monitor/C/figures/changePriority.png share/gnome/help/gnome-system-monitor/C/figures/colorPanel.png share/gnome/help/gnome-system-monitor/C/figures/columnContextMenu.png +share/gnome/help/gnome-system-monitor/C/figures/gnome-system-monitor_window.png share/gnome/help/gnome-system-monitor/C/figures/memoryMaps.png share/gnome/help/gnome-system-monitor/C/figures/moreInfo.png share/gnome/help/gnome-system-monitor/C/figures/processListing.png @@ -38,6 +39,7 @@ 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/en_CA/LC_MESSAGES/gnome-system-monitor.mo share/locale/es/LC_MESSAGES/gnome-system-monitor.mo share/locale/fa/LC_MESSAGES/gnome-system-monitor.mo share/locale/fi/LC_MESSAGES/gnome-system-monitor.mo @@ -46,12 +48,14 @@ 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 +share/locale/hr/LC_MESSAGES/gnome-system-monitor.mo share/locale/hu/LC_MESSAGES/gnome-system-monitor.mo 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/lt/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 @@ -70,6 +74,7 @@ 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/ta/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/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile index f2f68f798864..715870d6a315 100644 --- a/sysutils/nautilus-cd-burner/Makefile +++ b/sysutils/nautilus-cd-burner/Makefile @@ -6,11 +6,10 @@ # PORTNAME= nautilus-cd-burner -PORTVERSION= 0.5.3 -PORTREVISION= 7 +PORTVERSION= 2.6.0 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.5 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.6 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -21,14 +20,31 @@ RUN_DEPENDS= mkisofs:${PORTSDIR}/sysutils/mkisofs \ USE_BZIP2= yes USE_X_PREFIX= yes +USE_REINPLACE= yes USE_GMAKE= yes GNOME_DESKTOP_VERSION=2 -USE_GNOME= gnomeprefix gnomehack nautilus2 +USE_GNOME= gnomeprefix gnomehack intlhack lthack nautilus2 USE_LIBTOOL_VER=13 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +.include <bsd.port.pre.mk> + +.if exists(${LOCALBASE}/bin/growisofs) +WITH_DVD= yes +.endif + +.if defined(WITH_DVD) +RUN_DEPENDS+= growisofs:${PORTSDIR}/sysutils/dvd+rw-tools +.endif + +pre-everything:: + @${ECHO_MSG} "" + @${ECHO_MSG} "${PORTNAME} has the following configurable option(s):" + @${ECHO_MSG} " WITH_DVD Enable DVD burning support" + @${ECHO_MSG} "" + post-install: @${CAT} ${PKGMESSAGE} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/sysutils/nautilus-cd-burner/distinfo b/sysutils/nautilus-cd-burner/distinfo index 90ebf051db16..7f3b60ce0435 100644 --- a/sysutils/nautilus-cd-burner/distinfo +++ b/sysutils/nautilus-cd-burner/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/nautilus-cd-burner-0.5.3.tar.bz2) = ba461f080a3ca63936c0c7cab46dd8d8 -SIZE (gnome2/nautilus-cd-burner-0.5.3.tar.bz2) = 311289 +MD5 (gnome2/nautilus-cd-burner-2.6.0.tar.bz2) = 3e1dbaa4b4a9c512cec8d7b5a5d86bf0 +SIZE (gnome2/nautilus-cd-burner-2.6.0.tar.bz2) = 448199 diff --git a/sysutils/nautilus-cd-burner/files/patch-cd-drive.c b/sysutils/nautilus-cd-burner/files/patch-cd-drive.c deleted file mode 100644 index aea6a2e1289f..000000000000 --- a/sysutils/nautilus-cd-burner/files/patch-cd-drive.c +++ /dev/null @@ -1,221 +0,0 @@ ---- cd-drive.c.orig Mon Sep 8 15:24:07 2003 -+++ cd-drive.c Tue Dec 30 12:46:59 2003 -@@ -693,28 +693,133 @@ - #endif /* __linux__ */ - - #ifdef __FreeBSD__ -+static void -+get_cd_properties (char *id, int *max_rd_speed, int *max_wr_speed, -+ CDDriveType *type) -+{ -+ int i; -+ const char *argv[20]; -+ char *dev_str, *stdout_data, *rd_speed, *wr_speed, *drive_cap; -+ -+ *max_rd_speed = -1; -+ *max_wr_speed = -1; -+ *type = 0; -+ -+ i = 0; -+ argv[i++] = "cdrecord"; -+ argv[i++] = "-prcap"; -+ dev_str = g_strdup_printf ("dev=%s", id); -+ argv[i++] = dev_str; -+ argv[i++] = NULL; -+ -+ if (g_spawn_sync (NULL, -+ (char **)argv, -+ NULL, -+ G_SPAWN_SEARCH_PATH | G_SPAWN_STDERR_TO_DEV_NULL, -+ NULL, NULL, -+ &stdout_data, -+ NULL, -+ NULL, -+ NULL)) { -+ wr_speed = strstr (stdout_data, "Maximum write speed:"); -+ if (wr_speed != NULL) { -+ char *tok; -+ wr_speed += strlen ("Maximum write speed:"); -+ for (tok = strtok (wr_speed, " (),\t\n"); -+ tok && strcmp (tok, "CD"); -+ tok = strtok (NULL, " (),\t\n")) {} -+ tok = strtok (NULL, " (),\t\n"); /* Get the CD speed. */ -+ *max_wr_speed = atol (tok); -+ } -+ else { -+ wr_speed = strstr (stdout_data, "Maximum write speed in kB/s:"); -+ if (wr_speed != NULL) { -+ char *tok; -+ wr_speed += strlen ("Maximum write speed in kB/s:"); -+ for (tok = strtok (wr_speed, " (),\t\n"); -+ tok && strcmp (tok, "CD"); -+ tok = strtok (NULL, " (),\t\n")) {} -+ tok = strtok (NULL, " (),\t\n"); /* Get the CD speed. */ -+ *max_wr_speed = atol (tok); -+ } -+ } -+ -+ rd_speed = strstr (stdout_data, "Maximum read speed:"); -+ if (rd_speed != NULL) { -+ char *tok; -+ rd_speed += strlen ("Maximum read speed:"); -+ for (tok = strtok (rd_speed, " (),\t\n"); -+ tok && strcmp (tok, "CD"); -+ tok = strtok (NULL, " (),\t\n")) {} -+ tok = strtok (NULL, " (),\t\n"); /* Get the CD speed. */ -+ *max_rd_speed = atol (tok); -+ } -+ else { -+ rd_speed = strstr (stdout_data, "Maximum read speed in kB/s:"); -+ if (rd_speed != NULL) { -+ char *tok; -+ rd_speed += strlen ("Maximum read speed in kB/s:"); -+ for (tok = strtok (rd_speed, " (),\t\n"); -+ tok && strcmp (tok, "CD"); -+ tok = strtok (NULL, " (),\t\n")) {} -+ tok = strtok (NULL, " (),\t\n"); /* Get the CD speed. */ -+ *max_rd_speed = atol (tok); -+ } -+ } -+ drive_cap = strstr (stdout_data, "Does write DVD-RAM media"); -+ if (drive_cap != NULL) { -+ *type |= CDDRIVE_TYPE_DVD_RAM_RECORDER; -+ } -+ drive_cap = strstr (stdout_data, "Does read DVD-R media"); -+ if (drive_cap != NULL) { -+ *type |= CDDRIVE_TYPE_DVD_RW_RECORDER; -+ } -+ drive_cap = strstr (stdout_data, "Does read DVD-ROM media"); -+ if (drive_cap != NULL) { -+ *type |= CDDRIVE_TYPE_DVD_DRIVE; -+ } -+ drive_cap = strstr (stdout_data, "Does write CD-RW media"); -+ if (drive_cap != NULL) { -+ *type |= CDDRIVE_TYPE_CDRW_RECORDER; -+ } -+ drive_cap = strstr (stdout_data, "Does write CD-R media"); -+ if (drive_cap != NULL) { -+ *type |= CDDRIVE_TYPE_CD_RECORDER; -+ } -+ drive_cap = strstr (stdout_data, "Does read CD-R media"); -+ if (drive_cap != NULL) { -+ *type |= CDDRIVE_TYPE_CD_DRIVE; -+ } -+ g_free (stdout_data); -+ } -+ -+ g_free (dev_str); -+} -+ - static GList * - freebsd_scan (gboolean recorder_only) - { - GList *cdroms_list = NULL; - const char *dev_type = "cd"; -- int fd; - int speed = 16; /* XXX Hardcode the write speed for now. */ -- int max_speed = CDR_MAX_SPEED; - int i = 0; -+ int cnode = 1; /* Use the CD device's 'c' node. */ - - while (1) { -- CDDriveType type; - CDDrive *cdrom; -- gchar *cam_path, *dev; -+ gchar *cam_path; - struct cam_device *cam_dev; - -- type = 0; - cam_path = g_strdup_printf ("/dev/%s%dc", dev_type, i); - - if (!g_file_test (cam_path, G_FILE_TEST_EXISTS)) { - g_free (cam_path); -- break; -+ cam_path = g_strdup_printf ("/dev/%s%d", dev_type, i); -+ cnode = 0; -+ if (!g_file_test (cam_path, G_FILE_TEST_EXISTS)) { -+ g_free (cam_path); -+ break; -+ } - } - - if ((cam_dev = cam_open_spec_device (dev_type, i, O_RDWR, NULL)) == NULL) { -@@ -723,47 +828,41 @@ - continue; - } - -- /* XXX Other controllers might need to be added. */ -- if ((strncmp (cam_dev->sim_name, "ata", 3)) == 0) { -- dev = g_strdup_printf ("/dev/a%s%dc", dev_type, i); -- } else { -- dev = g_strdup (cam_path); -- } -- -- g_free (cam_path); -- -- if ((fd = open (dev, O_RDWR, 0)) < 0) { -- g_free (dev); -- free (cam_dev); -- i++; -- continue; -- } -- -- type |= CDDRIVE_TYPE_CD_DRIVE; -- if (ioctl (fd, CDRIOCWRITESPEED, &max_speed) >= 0) { -- /* XXX is it CD-R or CD-RW ? */ -- type |= CDDRIVE_TYPE_CD_RECORDER; -- } -- -- close (fd); -- -- if (type & CDDRIVE_TYPE_CD_RECORDER -- || type & CDDRIVE_TYPE_CDRW_RECORDER -- || recorder_only == FALSE) { -- cdrom = g_new0 (CDDrive, 1); -- cdrom->display_name = g_strdup_printf ("%s %s", cam_dev->inq_data.vendor, cam_dev->inq_data.revision); -- cdrom->device = g_strdup (dev); -- cdrom->max_speed_read = speed; -- cdrom->max_speed_write = speed; -- cdrom->cdrecord_id = g_strdup_printf ("%d,%d,%d", cam_dev->path_id, cam_dev->target_id, cam_dev->target_lun); -- cdrom->type = type; -- -- add_dvd_plus (cdrom); -+ cdrom = g_new0 (CDDrive, 1); -+ cdrom->display_name = g_strdup_printf ("%s %s", cam_dev->inq_data.vendor, cam_dev->inq_data.revision); -+ cdrom->device = g_strdup (cam_path); -+ cdrom->cdrecord_id = g_strdup_printf ("%d,%d,%d", cam_dev->path_id, cam_dev->target_id, cam_dev->target_lun); -+ /* Attempt to get more specific information from -+ * this drive by using cdrecord. -+ */ -+ get_cd_properties (cdrom->cdrecord_id, -+ &(cdrom->max_speed_read), -+ &(cdrom->max_speed_write), -+ &(cdrom->type)); -+ if (cdrom->type & CDDRIVE_TYPE_CD_RECORDER -+ || cdrom->type & CDDRIVE_TYPE_CDRW_RECORDER -+ || cdrom->type & CDDRIVE_TYPE_DVD_RAM_RECORDER -+ || cdrom->type & CDDRIVE_TYPE_DVD_RW_RECORDER -+ || !recorder_only) { -+ -+ if (cdrom->max_speed_read == -1) { -+ cdrom->max_speed_read = speed; -+ } -+ if (cdrom->max_speed_write == -1) { -+ cdrom->max_speed_write = speed; -+ } -+ -+ if (cdrom->type & CDDRIVE_TYPE_DVD_DRIVE) { -+ add_dvd_plus (cdrom); -+ } - - cdroms_list = g_list_append (cdroms_list, cdrom); - } -+ else { -+ cd_drive_free (cdrom); -+ } - -- g_free (dev); -+ g_free (cam_path); - free (cam_dev); - - i++; diff --git a/sysutils/nautilus-cd-burner/files/patch-cd-record.c b/sysutils/nautilus-cd-burner/files/patch-cd-record.c deleted file mode 100644 index e7b501be0227..000000000000 --- a/sysutils/nautilus-cd-burner/files/patch-cd-record.c +++ /dev/null @@ -1,16 +0,0 @@ ---- cd-recorder.c.orig Thu Oct 2 13:09:26 2003 -+++ cd-recorder.c Thu Oct 2 13:10:27 2003 -@@ -334,12 +334,9 @@ - cdrecorder->priv->music_count = build_list_of_music_arguments ("burn:///", &i, argv, 200-i-5); - } else { - cdrecorder->priv->music_count = 0; -+ argv[i++] = "-dao"; /* XXX, this is a hack. */ - argv[i++] = "-data"; - argv[i++] = filename; -- } -- -- if (needs_dvd_writer) { -- argv[i++] = "-dao"; - } - - argv[i++] = NULL; diff --git a/sysutils/nautilus-cd-burner/files/patch-configure b/sysutils/nautilus-cd-burner/files/patch-configure deleted file mode 100644 index ff42da02d5ad..000000000000 --- a/sysutils/nautilus-cd-burner/files/patch-configure +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.orig Wed Dec 11 15:37:55 2002 -+++ configure Wed Dec 11 15:38:17 2002 -@@ -7313,6 +7313,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' diff --git a/sysutils/nautilus-cd-burner/files/patch-make-iso.c b/sysutils/nautilus-cd-burner/files/patch-make-iso.c index 958fe4cd050f..87cd0836b813 100644 --- a/sysutils/nautilus-cd-burner/files/patch-make-iso.c +++ b/sysutils/nautilus-cd-burner/files/patch-make-iso.c @@ -1,18 +1,18 @@ ---- make-iso.c.orig Mon Sep 8 21:24:07 2003 -+++ make-iso.c Thu Oct 2 21:06:43 2003 -@@ -545,6 +545,7 @@ - argv[i++] = "mkisofs"; +--- make-iso.c.orig Fri Dec 19 13:06:34 2003 ++++ make-iso.c Mon Dec 29 16:18:15 2003 +@@ -571,6 +571,7 @@ argv[i++] = "-r"; - argv[i++] = "-J"; -+ argv[i++] = "-joliet-long"; + if (use_joliet) { + argv[i++] = "-J"; ++ argv[i++] = "-joliet-long"; + } + argv[i++] = "-q"; argv[i++] = "-graft-points"; - argv[i++] = "-path-list"; - argv[i++] = filelist; -@@ -598,6 +599,7 @@ - argv[i++] = "mkisofs"; +@@ -650,6 +651,7 @@ argv[i++] = "-r"; - argv[i++] = "-J"; -+ argv[i++] = "-joliet-long"; + if (use_joliet) { + argv[i++] = "-J"; ++ argv[i++] = "-joliet-long"; + } argv[i++] = "-graft-points"; argv[i++] = "-path-list"; - argv[i++] = filelist; diff --git a/sysutils/nautilus-cd-burner/pkg-descr b/sysutils/nautilus-cd-burner/pkg-descr index c3520e981e0f..0bdde4f1ac65 100644 --- a/sysutils/nautilus-cd-burner/pkg-descr +++ b/sysutils/nautilus-cd-burner/pkg-descr @@ -1,6 +1,2 @@ -nautilus-cd-burner is an extension to Nautilus that makes it easy to -write files to a CD burner. - -The user uses Nautilus or another gnome-vfs aware app to copy the -files he wants to write to burn:///, and then nautilus-cd-burner is -launched in some way to write the files to the CD. +Nautilus-cd-burner allows CDs to be created and burned directly from +within Nautilus (using the burn:/// URI). diff --git a/sysutils/nautilus-cd-burner/pkg-plist b/sysutils/nautilus-cd-burner/pkg-plist index 0e601abc70ac..e3ba00c5161d 100644 --- a/sysutils/nautilus-cd-burner/pkg-plist +++ b/sysutils/nautilus-cd-burner/pkg-plist @@ -1,9 +1,13 @@ bin/nautilus-cd-burner +etc/gconf/gconf.xml.defaults/apps/nautilus-cd-burner/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/nautilus-cd-burner/%gconf.xml +etc/gconf/schemas/ncb.schemas etc/gnome-vfs-2.0/modules/mapping-modules.conf lib/gnome-vfs-2.0/modules/libmapping.so -libdata/bonobo/servers/Nautilus_CD_Burner_Context_Menu.server +lib/nautilus/extensions-1.0/libnautilus-burn.a +lib/nautilus/extensions-1.0/libnautilus-burn.so +lib/nautilus/extensions-1.0/libnautilus-burn.so.0 libexec/mapping-daemon -libexec/nautilus-cd-burner-context-menu share/gnome/nautilus-cd-burner/cdburn.glade share/gnome/nautilus-cd-burner/cdspin1.png share/gnome/nautilus-cd-burner/cdspin2.png @@ -14,6 +18,7 @@ share/gnome/nautilus-cd-burner/cdspin6.png share/gnome/nautilus-cd-burner/cdspin7.png share/gnome/nautilus-cd-burner/cdspin8.png share/locale/am/LC_MESSAGES/nautilus-cd-burner.mo +share/locale/ar/LC_MESSAGES/nautilus-cd-burner.mo share/locale/az/LC_MESSAGES/nautilus-cd-burner.mo share/locale/be/LC_MESSAGES/nautilus-cd-burner.mo share/locale/bg/LC_MESSAGES/nautilus-cd-burner.mo @@ -24,25 +29,33 @@ share/locale/cy/LC_MESSAGES/nautilus-cd-burner.mo share/locale/da/LC_MESSAGES/nautilus-cd-burner.mo share/locale/de/LC_MESSAGES/nautilus-cd-burner.mo share/locale/el/LC_MESSAGES/nautilus-cd-burner.mo +share/locale/en_GB/LC_MESSAGES/nautilus-cd-burner.mo share/locale/es/LC_MESSAGES/nautilus-cd-burner.mo share/locale/et/LC_MESSAGES/nautilus-cd-burner.mo +share/locale/eu/LC_MESSAGES/nautilus-cd-burner.mo +share/locale/fa/LC_MESSAGES/nautilus-cd-burner.mo share/locale/fi/LC_MESSAGES/nautilus-cd-burner.mo share/locale/fr/LC_MESSAGES/nautilus-cd-burner.mo share/locale/ga/LC_MESSAGES/nautilus-cd-burner.mo share/locale/he/LC_MESSAGES/nautilus-cd-burner.mo share/locale/hi/LC_MESSAGES/nautilus-cd-burner.mo +share/locale/hr/LC_MESSAGES/nautilus-cd-burner.mo share/locale/hu/LC_MESSAGES/nautilus-cd-burner.mo +share/locale/id/LC_MESSAGES/nautilus-cd-burner.mo share/locale/it/LC_MESSAGES/nautilus-cd-burner.mo share/locale/ja/LC_MESSAGES/nautilus-cd-burner.mo share/locale/ko/LC_MESSAGES/nautilus-cd-burner.mo +share/locale/lt/LC_MESSAGES/nautilus-cd-burner.mo share/locale/lv/LC_MESSAGES/nautilus-cd-burner.mo -share/locale/mk/LC_MESSAGES/nautilus-cd-burner.mo +share/locale/mn/LC_MESSAGES/nautilus-cd-burner.mo share/locale/ms/LC_MESSAGES/nautilus-cd-burner.mo share/locale/nl/LC_MESSAGES/nautilus-cd-burner.mo share/locale/no/LC_MESSAGES/nautilus-cd-burner.mo +share/locale/pa/LC_MESSAGES/nautilus-cd-burner.mo share/locale/pl/LC_MESSAGES/nautilus-cd-burner.mo share/locale/pt/LC_MESSAGES/nautilus-cd-burner.mo share/locale/pt_BR/LC_MESSAGES/nautilus-cd-burner.mo +share/locale/ro/LC_MESSAGES/nautilus-cd-burner.mo share/locale/ru/LC_MESSAGES/nautilus-cd-burner.mo share/locale/sk/LC_MESSAGES/nautilus-cd-burner.mo share/locale/sl/LC_MESSAGES/nautilus-cd-burner.mo @@ -57,3 +70,5 @@ share/locale/vi/LC_MESSAGES/nautilus-cd-burner.mo share/locale/zh_CN/LC_MESSAGES/nautilus-cd-burner.mo share/locale/zh_TW/LC_MESSAGES/nautilus-cd-burner.mo @dirrm share/gnome/nautilus-cd-burner +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus-cd-burner +@dirrm etc/gconf/gconf.xml.defaults/apps/nautilus-cd-burner diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile index de0a05774cd8..a5e693257205 100644 --- a/www/epiphany/Makefile +++ b/www/epiphany/Makefile @@ -6,10 +6,10 @@ # PORTNAME= epiphany -PORTVERSION= 1.0.8 +PORTVERSION= 1.2.2 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.2 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -27,10 +27,10 @@ HEADERS_SUFX= MOZILLA= mozilla HEADERS_SUFX= .else -.if ${WITH_MOZILLA}=="mozilla-devel-gtk2" || ${WITH_MOZILLA}=="mozilla-devel" +.if ${WITH_MOZILLA}=="mozilla-devel" || ${WITH_MOZILLA}=="mozilla-devel-gtk2" MOZILLA= mozilla-devel HEADERS_SUFX= -devel -MOZ_CONFIGURE_ARGS= --with-mozilla-snapshot="trunk" +MOZ_CONFIGURE_ARGS= --with-mozilla-snapshot="1.7b" .else MOZILLA= mozilla HEADERS_SUFX= @@ -39,7 +39,7 @@ HEADERS_SUFX= USE_BZIP2= yes USE_X_PREFIX= yes -USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui +USE_GNOME= gnomeprefix gnomehack intlhack lthack libgnomeui WANT_GNOME= yes USE_LIBTOOL_VER=13 USE_GMAKE= yes @@ -53,6 +53,13 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_C FLASHPLAYER= ${LOCALBASE}/lib/libflashplayer.so.1 XXX_FILES= EphyAutomation-common.c EphyAutomation-stubs.c \ EphyAutomation-skels.c EphyAutomation.h +PLIST_SUB+= EPHY_VERSION="${PORTVERSION:C/\.[0-9]+$//}" + +.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD) +.undef WITHOUT_GNOME +.undef WITHOUT_ALL +WITH_GNOME= yes +.endif .include <bsd.port.pre.mk> diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo index 1e489a7b4bc1..157a17584241 100644 --- a/www/epiphany/distinfo +++ b/www/epiphany/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/epiphany-1.0.8.tar.bz2) = 042fc75b9a272d3afce2677d04c0e927 -SIZE (gnome2/epiphany-1.0.8.tar.bz2) = 1830050 +MD5 (gnome2/epiphany-1.2.2.tar.bz2) = abf9a04159e1c0ef8c27d676ab383b8d +SIZE (gnome2/epiphany-1.2.2.tar.bz2) = 2148870 diff --git a/www/epiphany/files/patch-configure b/www/epiphany/files/patch-configure deleted file mode 100644 index 0f5ae010c697..000000000000 --- a/www/epiphany/files/patch-configure +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.orig Tue Jul 15 14:31:11 2003 -+++ configure Tue Jul 15 14:31:11 2003 -@@ -18205,6 +18205,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' diff --git a/www/epiphany/files/patch-embed_mozilla_mozilla-embed-single.cpp b/www/epiphany/files/patch-embed_mozilla_mozilla-embed-single.cpp new file mode 100644 index 000000000000..5f7bbebe333f --- /dev/null +++ b/www/epiphany/files/patch-embed_mozilla_mozilla-embed-single.cpp @@ -0,0 +1,11 @@ +--- embed/mozilla/mozilla-embed-single.cpp.orig Thu Dec 11 14:58:19 2003 ++++ embed/mozilla/mozilla-embed-single.cpp Thu Dec 11 14:58:27 2003 +@@ -385,7 +385,7 @@ + return NS_ERROR_FAILURE; + } + +-#if MOZILLA_SNAPSHOT >= 12 ++#if MOZILLA_SNAPSHOT > 12 + result = localeService->GetLocaleComponentForUserAgent (aUILang); + #else + nsXPIDLString uiLang; diff --git a/www/epiphany/files/patch-src_epiphany.in b/www/epiphany/files/patch-src_epiphany.in index a5ded3caaecf..23583b77fe82 100644 --- a/www/epiphany/files/patch-src_epiphany.in +++ b/www/epiphany/files/patch-src_epiphany.in @@ -1,13 +1,19 @@ ---- src/epiphany.in.orig Sat Dec 20 14:35:41 2003 -+++ src/epiphany.in Fri Jan 16 18:47:43 2004 -@@ -15,4 +15,12 @@ +--- src/epiphany.in.orig Sat Dec 20 14:35:58 2003 ++++ src/epiphany.in Sun Dec 28 16:44:41 2003 +@@ -5,7 +5,7 @@ + MOZILLA_HOME=@MOZILLA_HOME@ + + if [ -z "$MOZ_PLUGIN_PATH" ]; then +- MOZ_PLUGIN_PATH=/usr/lib/mozilla/plugins:/usr/libexec/plugins/mozilla ++ MOZ_PLUGIN_PATH=%%X11BASE%%/lib/browser_plugins + export MOZ_PLUGIN_PATH + fi + +@@ -28,4 +28,9 @@ MOZILLA_FIVE_HOME=$MOZILLA_HOME export MOZILLA_FIVE_HOME -exec "$dist_bin/epiphany-bin" "$@" -+MOZ_PLUGIN_PATH=%%X11BASE%%/lib/browser_plugins -+export MOZ_PLUGIN_PATH -+ +if [ -f %%FLASHPLAYER%% ]; then + LD_PRELOAD=%%FLASHPLAYER%% + export LD_PRELOAD diff --git a/www/epiphany/pkg-descr b/www/epiphany/pkg-descr index f24cd9a2e683..24a41f93deac 100644 --- a/www/epiphany/pkg-descr +++ b/www/epiphany/pkg-descr @@ -1,7 +1,5 @@ -Epiphany, as it's manifesto states, is a web browser designed for the layman, -by being consistent, lightweight and fast throughout all its operations. - -Originally forked from Galeon's (www/galeon2) source code, Epiphany looks to -be a very promising browser indeed. +Epiphany is a web browser designed to be as lightweight and fast as +possible, at the expense of many of the features found in other +browsers. WWW: http://epiphany.mozdev.org/ diff --git a/www/epiphany/pkg-plist b/www/epiphany/pkg-plist index 042b95d598eb..d4237ee0eeb2 100644 --- a/www/epiphany/pkg-plist +++ b/www/epiphany/pkg-plist @@ -4,82 +4,94 @@ etc/gconf/gconf.xml.defaults/apps/epiphany/%gconf.xml etc/gconf/gconf.xml.defaults/apps/epiphany/dialogs/%gconf.xml etc/gconf/gconf.xml.defaults/apps/epiphany/directories/%gconf.xml etc/gconf/gconf.xml.defaults/apps/epiphany/general/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/epiphany/lockdown/%gconf.xml etc/gconf/gconf.xml.defaults/apps/epiphany/web/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/epiphany/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/epiphany/dialogs/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/epiphany/directories/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/epiphany/general/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/epiphany/lockdown/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/epiphany/web/%gconf.xml +etc/gconf/schemas/epiphany-lockdown.schemas etc/gconf/schemas/epiphany.schemas -include/epiphany-1.0/epiphany/ephy-bookmarks.h -include/epiphany-1.0/epiphany/ephy-dialog.h -include/epiphany-1.0/epiphany/ephy-embed-event.h -include/epiphany-1.0/epiphany/ephy-embed-persist.h -include/epiphany-1.0/epiphany/ephy-embed-prefs.h -include/epiphany-1.0/epiphany/ephy-embed-shell.h -include/epiphany-1.0/epiphany/ephy-embed-single.h -include/epiphany-1.0/epiphany/ephy-embed-types.h -include/epiphany-1.0/epiphany/ephy-embed.h -include/epiphany-1.0/epiphany/ephy-history.h -include/epiphany-1.0/epiphany/ephy-langs.h -include/epiphany-1.0/epiphany/ephy-node-db.h -include/epiphany-1.0/epiphany/ephy-node.h -include/epiphany-1.0/epiphany/ephy-notebook.h -include/epiphany-1.0/epiphany/ephy-shell.h -include/epiphany-1.0/epiphany/ephy-tab.h -include/epiphany-1.0/epiphany/ephy-types.h -include/epiphany-1.0/epiphany/ephy-window.h -include/epiphany-1.0/epiphany/session.h +include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-bookmarks.h +include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-command-manager.h +include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-cookie-manager.h +include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-dialog.h +include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-embed-event.h +include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-embed-persist.h +include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-embed-prefs.h +include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-embed-shell.h +include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-embed-single.h +include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-embed.h +include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-encodings.h +include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-extension.h +include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-history.h +include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-node-db.h +include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-node.h +include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-notebook.h +include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-password-manager.h +include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-permission-manager.h +include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-session.h +include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-shell.h +include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-statusbar.h +include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-tab.h +include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-window.h libdata/bonobo/servers/GNOME_Epiphany_Automation.server libdata/bonobo/servers/GNOME_Epiphany_NautilusView.server -libdata/pkgconfig/epiphany-1.0.pc +libdata/pkgconfig/epiphany-1.2.pc +%%DOCSDIR%%/ch01.html +%%DOCSDIR%%/epiphany-ephy-cookie-manager.html +%%DOCSDIR%%/epiphany-ephy-embed-factory.html +%%DOCSDIR%%/epiphany-ephy-embed-single.html +%%DOCSDIR%%/epiphany-ephy-password-manager.html +%%DOCSDIR%%/epiphany-ephy-permission-manager.html +%%DOCSDIR%%/epiphany-ephy-session.html +%%DOCSDIR%%/epiphany-ephy-shell.html +%%DOCSDIR%%/epiphany.devhelp +%%DOCSDIR%%/home.png +%%DOCSDIR%%/index.html +%%DOCSDIR%%/index.sgml +%%DOCSDIR%%/left.png +%%DOCSDIR%%/right.png +%%DOCSDIR%%/up.png share/gnome/application-registry/epiphany.applications share/gnome/applications/bme.desktop share/gnome/applications/epiphany.desktop -share/gnome/epiphany/art/epiphany-bookmark-page.png share/gnome/epiphany/art/epiphany-bookmarks.png share/gnome/epiphany/art/epiphany-download.png share/gnome/epiphany/art/epiphany-entry.png -share/gnome/epiphany/art/epiphany-fullscreen.png share/gnome/epiphany/art/epiphany-history.png -share/gnome/epiphany/art/epiphany-new-tab.png share/gnome/epiphany/art/epiphany-secure.png -share/gnome/epiphany/art/epiphany-send-link.png share/gnome/epiphany/art/epiphany-tab-loading.gif share/gnome/epiphany/art/epiphany-unsecure.png -share/gnome/epiphany/art/epiphany-viewsource.png +share/gnome/epiphany/art/hand-open.png share/gnome/epiphany/conspiracy.xhtml +share/gnome/epiphany/default-prefs.js share/gnome/epiphany/epiphany-bookmark-editor-ui.xml +share/gnome/epiphany/epiphany-fs-toolbar.xml share/gnome/epiphany/epiphany-history-window-ui.xml share/gnome/epiphany/epiphany-toolbar.xml share/gnome/epiphany/epiphany-ui.xml share/gnome/epiphany/epiphany.xhtml +share/gnome/epiphany/glade/certificate-dialogs.glade share/gnome/epiphany/glade/epiphany.glade share/gnome/epiphany/glade/prefs-dialog.glade share/gnome/epiphany/glade/print.glade +share/gnome/epiphany/mime-types-permissions.xml share/gnome/epiphany/nautilus-epiphany-view.xml share/gnome/help/epiphany/C/epiphany.xml share/gnome/help/epiphany/C/figures/ephy-history-window-screenshot.png share/gnome/help/epiphany/C/figures/ephy-screenshot.png share/gnome/help/epiphany/C/legal.xml -share/gnome/help/epiphany/nl/epiphany.xml -share/gnome/help/epiphany/nl/figures/ephy-screenshot.png -share/gnome/help/epiphany/nl/legal.xml -share/gnome/help/epiphany/uk/epiphany.xml -share/gnome/help/epiphany/uk/figures/ephy-history-window-screenshot.png -share/gnome/help/epiphany/uk/figures/ephy-screenshot.png -share/gnome/help/epiphany/uk/legal.xml share/gnome/omf/epiphany/epiphany-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/epiphany/epiphany-C.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/epiphany/epiphany-nl.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/epiphany/epiphany-nl.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/epiphany/epiphany-uk.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/epiphany/epiphany-uk.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/epiphany-bookmarks.png share/locale/am/LC_MESSAGES/epiphany.mo share/locale/az/LC_MESSAGES/epiphany.mo share/locale/ar/LC_MESSAGES/epiphany.mo share/locale/be/LC_MESSAGES/epiphany.mo +share/locale/bg/LC_MESSAGES/epiphany.mo share/locale/bn/LC_MESSAGES/epiphany.mo share/locale/ca/LC_MESSAGES/epiphany.mo share/locale/cs/LC_MESSAGES/epiphany.mo @@ -87,26 +99,33 @@ share/locale/cy/LC_MESSAGES/epiphany.mo share/locale/da/LC_MESSAGES/epiphany.mo share/locale/de/LC_MESSAGES/epiphany.mo share/locale/el/LC_MESSAGES/epiphany.mo +share/locale/en_CA/LC_MESSAGES/epiphany.mo share/locale/en_GB/LC_MESSAGES/epiphany.mo share/locale/es/LC_MESSAGES/epiphany.mo share/locale/et/LC_MESSAGES/epiphany.mo +share/locale/fa/LC_MESSAGES/epiphany.mo share/locale/fi/LC_MESSAGES/epiphany.mo share/locale/fr/LC_MESSAGES/epiphany.mo share/locale/ga/LC_MESSAGES/epiphany.mo +share/locale/gu/LC_MESSAGES/epiphany.mo share/locale/hi/LC_MESSAGES/epiphany.mo +share/locale/hr/LC_MESSAGES/epiphany.mo share/locale/hu/LC_MESSAGES/epiphany.mo +share/locale/id/LC_MESSAGES/epiphany.mo share/locale/is/LC_MESSAGES/epiphany.mo share/locale/it/LC_MESSAGES/epiphany.mo share/locale/ja/LC_MESSAGES/epiphany.mo -share/locale/kn/LC_MESSAGES/epiphany.mo share/locale/ko/LC_MESSAGES/epiphany.mo share/locale/li/LC_MESSAGES/epiphany.mo share/locale/lt/LC_MESSAGES/epiphany.mo +share/locale/mi/LC_MESSAGES/epiphany.mo share/locale/mk/LC_MESSAGES/epiphany.mo share/locale/mn/LC_MESSAGES/epiphany.mo share/locale/ms/LC_MESSAGES/epiphany.mo share/locale/nl/LC_MESSAGES/epiphany.mo share/locale/no/LC_MESSAGES/epiphany.mo +share/locale/nn/LC_MESSAGES/epiphany.mo +share/locale/pa/LC_MESSAGES/epiphany.mo share/locale/pl/LC_MESSAGES/epiphany.mo share/locale/pt/LC_MESSAGES/epiphany.mo share/locale/pt_BR/LC_MESSAGES/epiphany.mo @@ -122,31 +141,29 @@ share/locale/ta/LC_MESSAGES/epiphany.mo share/locale/tr/LC_MESSAGES/epiphany.mo share/locale/uk/LC_MESSAGES/epiphany.mo share/locale/vi/LC_MESSAGES/epiphany.mo +share/locale/wa/LC_MESSAGES/epiphany.mo share/locale/zh_CN/LC_MESSAGES/epiphany.mo share/locale/zh_TW/LC_MESSAGES/epiphany.mo @dirrm share/gnome/omf/epiphany -@dirrm share/gnome/help/epiphany/uk/figures -@dirrm share/gnome/help/epiphany/uk -@dirrm share/gnome/help/epiphany/nl/figures -@dirrm share/gnome/help/epiphany/nl @dirrm share/gnome/help/epiphany/C/figures @dirrm share/gnome/help/epiphany/C @dirrm share/gnome/help/epiphany @dirrm share/gnome/epiphany/glade @dirrm share/gnome/epiphany/art @dirrm share/gnome/epiphany -@dirrm include/epiphany-1.0/epiphany -@dirrm include/epiphany-1.0 +@dirrm %%DOCSDIR%% +@dirrm include/epiphany-%%EPHY_VERSION%%/epiphany +@dirrm include/epiphany-%%EPHY_VERSION%% @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/epiphany/web +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/epiphany/lockdown @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/epiphany/general @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/epiphany/directories @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/epiphany/dialogs @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/epiphany @dirrm etc/gconf/gconf.xml.defaults/apps/epiphany/web +@dirrm etc/gconf/gconf.xml.defaults/apps/epiphany/lockdown @dirrm etc/gconf/gconf.xml.defaults/apps/epiphany/general @dirrm etc/gconf/gconf.xml.defaults/apps/epiphany/directories @dirrm etc/gconf/gconf.xml.defaults/apps/epiphany/dialogs @dirrm etc/gconf/gconf.xml.defaults/apps/epiphany @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/epiphany/epiphany-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/epiphany/epiphany-nl.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/epiphany/epiphany-uk.omf 2>/dev/null || /usr/bin/true diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile index db05fa2143a4..7b2d4f72b36b 100644 --- a/www/libgtkhtml/Makefile +++ b/www/libgtkhtml/Makefile @@ -6,11 +6,10 @@ # PORTNAME= libgtkhtml -PORTVERSION= 2.4.1 -PORTREVISION= 2 +PORTVERSION= 2.6.0 CATEGORIES= www gnome 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 @@ -19,7 +18,8 @@ COMMENT= Lightweight HTML rendering/printing/editing engine USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack libxslt gnomevfs2 gail +USE_REINPLACE= yes +USE_GNOME= gnomeprefix gnomehack lthack libxslt gnomevfs2 gail INSTALLS_SHLIB= yes USE_LIBTOOL_VER=13 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/www/libgtkhtml/distinfo b/www/libgtkhtml/distinfo index 2a5cb0938b19..c1b838f2e683 100644 --- a/www/libgtkhtml/distinfo +++ b/www/libgtkhtml/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libgtkhtml-2.4.1.tar.bz2) = 31f9476871517a82aafad3cdda43ac1e -SIZE (gnome2/libgtkhtml-2.4.1.tar.bz2) = 408563 +MD5 (gnome2/libgtkhtml-2.6.0.tar.bz2) = 100d747ee9dce852e313c4f9fa202813 +SIZE (gnome2/libgtkhtml-2.6.0.tar.bz2) = 426126 diff --git a/www/libgtkhtml/files/patch-af b/www/libgtkhtml/files/patch-af deleted file mode 100644 index de57871ffe2f..000000000000 --- a/www/libgtkhtml/files/patch-af +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- configure.orig Fri May 17 13:34:46 2002 -+++ configure Fri May 17 13:37:13 2002 -@@ -6567,6 +6567,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' diff --git a/www/libgtkhtml/pkg-descr b/www/libgtkhtml/pkg-descr index abb1b154d544..173991abc3fa 100644 --- a/www/libgtkhtml/pkg-descr +++ b/www/libgtkhtml/pkg-descr @@ -1,5 +1,3 @@ -This is GtkHTML, a lightweight HTML rendering/printing/editing engine. -It was originally based on KHTMLW, but is now being developed -independently. +GtkHTML is a lightweight HTML rendering, printing, and editing engine. WWW: http://www.gnome.org/ diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile index e5020971b94c..f6f29a74ef9e 100644 --- a/x11-fm/nautilus2/Makefile +++ b/x11-fm/nautilus2/Makefile @@ -6,30 +6,29 @@ # PORTNAME= nautilus2 -PORTVERSION= 2.4.2 +PORTVERSION= 2.6.0 PORTREVISION= 1 CATEGORIES= x11-fm gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.4 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.6 DIST_SUBDIR= gnome2 DISTNAME= nautilus-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME file manager and graphical shell developed by Eazel -BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 - USE_BZIP2= yes USE_GMAKE= yes USE_X_PREFIX= yes -USE_GNOME= gnomeprefix intlhack gnomehack gnomehier gnomedesktop eel2 \ +USE_GNOME= gnomeprefix gnomehack gnomehier intlhack gnomedesktop eel2 \ librsvg2 GNOME_DESKTOP_VERSION=2 INSTALLS_SHLIB= yes GNU_CONFIGURE= yes +USE_REINPLACE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib -liconv" \ - LIBPNG="-L${LOCALBASE}/lib -lpng -lz ${MOZILLA_LIBS}" + LIBPNG="-L${LOCALBASE}/lib -lpng -lz" CONFIGURE_ARGS= --with-freetype2-lib-place=${LOCALBASE}/lib \ --with-freetype2-include-place=${LOCALBASE}/include/freetype2 \ --enable-static diff --git a/x11-fm/nautilus2/distinfo b/x11-fm/nautilus2/distinfo index f10149ba9a94..85da654bc7e2 100644 --- a/x11-fm/nautilus2/distinfo +++ b/x11-fm/nautilus2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/nautilus-2.4.2.tar.bz2) = 2023d525f1d81b6752ce7b118728b19c -SIZE (gnome2/nautilus-2.4.2.tar.bz2) = 5687876 +MD5 (gnome2/nautilus-2.6.0.tar.bz2) = a8baee6e907d36fd19f4082d6cfd3a9e +SIZE (gnome2/nautilus-2.6.0.tar.bz2) = 5502083 diff --git a/x11-fm/nautilus2/files/patch-Makefile.in b/x11-fm/nautilus2/files/patch-Makefile.in index 7fe0bcd6e288..54984be63e96 100644 --- a/x11-fm/nautilus2/files/patch-Makefile.in +++ b/x11-fm/nautilus2/files/patch-Makefile.in @@ -1,10 +1,11 @@ ---- Makefile.in.orig Tue Jan 7 12:28:34 2003 -+++ Makefile.in Tue Jan 7 12:29:48 2003 -@@ -153,7 +153,6 @@ - libnautilus-private \ - libnautilus-adapter \ - src \ -- test \ - components \ - po \ - data \ +--- Makefile.in.orig Fri Jan 30 16:22:10 2004 ++++ Makefile.in Fri Jan 30 16:41:37 2004 +@@ -176,7 +176,7 @@ + DESKTOP_SETTINGS_FILES = nautilus-file-management-properties.desktop + + +-SUBDIRS = libnautilus libnautilus-extension cut-n-paste-code libbackground libnautilus-private libnautilus-adapter src test components po data icons docs $(NULL) ++SUBDIRS = libnautilus libnautilus-extension cut-n-paste-code libbackground libnautilus-private libnautilus-adapter src components po data icons docs $(NULL) + + + EXTRA_DIST = COPYING.LIB COPYING-DOCS HACKING MAINTAINERS nautilus.spec.in nautilus.desktop nautilus.desktop.in ChangeLog-20000414 ChangeLog-20000625 ChangeLog-20000831 ChangeLog-20001018 intltool-extract.in intltool-merge.in intltool-update.in Makefile.shared add-include-prefix $(DESKTOP_IN_FILES) $(DESKTOP_APPLICATIONS_FILES) $(DESKTOP_SETTINGS_FILES) $(NULL) diff --git a/x11-fm/nautilus2/files/patch-aa b/x11-fm/nautilus2/files/patch-aa index 3881dec5e6a5..d4741108d1e0 100644 --- a/x11-fm/nautilus2/files/patch-aa +++ b/x11-fm/nautilus2/files/patch-aa @@ -1,6 +1,6 @@ ---- configure.orig Sat Jun 28 00:42:27 2003 -+++ configure Sat Jun 28 00:44:45 2003 -@@ -12860,7 +12860,7 @@ +--- configure.orig Mon Nov 10 22:08:05 2003 ++++ configure Mon Nov 10 22:08:05 2003 +@@ -12971,7 +12971,7 @@ LIBNAUTILUS_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_MODULES`" @@ -9,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" -@@ -12868,7 +12868,7 @@ +@@ -12979,7 +12979,7 @@ CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $CDDA_LIBS $LIBJPEG $x_libs" @@ -18,7 +18,7 @@ COMPONENT_MODULES="eel-2.0 libbonoboui-2.0 gnome-vfs-module-2.0 gnome-desktop-2.0" -@@ -13849,7 +13849,7 @@ +@@ -13959,7 +13959,7 @@ s,@PKG_CONFIG@,$PKG_CONFIG,;t t s,@STARTUP_NOTIFICATION_PACKAGE@,$STARTUP_NOTIFICATION_PACKAGE,;t t s,@ALL_CFLAGS@,$ALL_CFLAGS,;t t @@ -27,35 +27,3 @@ s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t s,@USE_NLS@,$USE_NLS,;t t 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 --s,@MEDUSA_LIBS@,$MEDUSA_LIBS,;t t -+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 -+s~@LIBNAUTILUS_LIBS@~$LIBNAUTILUS_LIBS~;t t - s,@LIBNAUTILUS_IDL_INCLUDES@,$LIBNAUTILUS_IDL_INCLUDES,;t t - s,@CORE_CFLAGS@,$CORE_CFLAGS,;t t --s,@CORE_LIBS@,$CORE_LIBS,;t t -+s~@CORE_LIBS@~$CORE_LIBS~;t t - s,@CORE_IDL_INCLUDES@,$CORE_IDL_INCLUDES,;t t - s,@COMPONENT_CFLAGS@,$COMPONENT_CFLAGS,;t t --s,@COMPONENT_LIBS@,$COMPONENT_LIBS,;t t -+s~@COMPONENT_LIBS@~$COMPONENT_LIBS~;t t - s,@EMBLEM_COMPONENT_CFLAGS@,$EMBLEM_COMPONENT_CFLAGS,;t t - s,@EMBLEM_COMPONENT_LIBS@,$EMBLEM_COMPONENT_LIBS,;t t - s,@DISABLE_DEPRECATED_CFLAGS@,$DISABLE_DEPRECATED_CFLAGS,;t t - s,@ENABLE_HARDWARE_VIEW_TRUE@,$ENABLE_HARDWARE_VIEW_TRUE,;t t - s,@ENABLE_HARDWARE_VIEW_FALSE@,$ENABLE_HARDWARE_VIEW_FALSE,;t t - s,@CAPPLET_CFLAGS@,$CAPPLET_CFLAGS,;t t --s,@CAPPLET_LIBS@,$CAPPLET_LIBS,;t t -+s~@CAPPLET_LIBS@~$CAPPLET_LIBS~;t t - s,@GCONFTOOL@,$GCONFTOOL,;t t - s,@GCONF_SCHEMA_CONFIG_SOURCE@,$GCONF_SCHEMA_CONFIG_SOURCE,;t t - s,@GCONF_SCHEMA_FILE_DIR@,$GCONF_SCHEMA_FILE_DIR,;t t diff --git a/x11-fm/nautilus2/files/patch-libbackground_Makefile.in b/x11-fm/nautilus2/files/patch-libbackground_Makefile.in index 835db34742aa..e60d29e99b67 100644 --- a/x11-fm/nautilus2/files/patch-libbackground_Makefile.in +++ b/x11-fm/nautilus2/files/patch-libbackground_Makefile.in @@ -1,11 +1,11 @@ ---- libbackground/Makefile.in.orig Tue Jan 7 12:30:18 2003 -+++ libbackground/Makefile.in Tue Jan 7 12:30:58 2003 -@@ -141,7 +141,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@ +--- libbackground/Makefile.in.orig Fri Jan 30 16:42:13 2004 ++++ libbackground/Makefile.in Fri Jan 30 16:43:02 2004 +@@ -168,7 +168,7 @@ + + EXTRA_DIST = ChangeLog + +-INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" -DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" -DG_LOG_DOMAIN=\"capplet-common\" -I$(top_srcdir)/ @CAPPLET_CFLAGS@ ++INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" -DGNOME_ICONDIR=\""${datadir}/pixmaps"\" -DG_LOG_DOMAIN=\"capplet-common\" -I$(top_srcdir)/ @CAPPLET_CFLAGS@ + + + noinst_LTLIBRARIES = libbackground.la 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 deleted file mode 100644 index 62ef3a83acd5..000000000000 --- a/x11-fm/nautilus2/files/patch-libnautilus-private::nautilus-volume-monitor.c +++ /dev/null @@ -1,317 +0,0 @@ ---- libnautilus-private/nautilus-volume-monitor.c.orig Mon Jul 7 07:05:04 2003 -+++ libnautilus-private/nautilus-volume-monitor.c Thu Oct 2 22:59:30 2003 -@@ -60,6 +60,16 @@ - #include <sys/types.h> - #include <unistd.h> - -+#ifdef __FreeBSD__ -+#include <sys/param.h> -+#include <sys/ucred.h> -+#include <sys/mount.h> -+ -+#define HAVE_SETFSENT -+#define FREEBSD_MNT -+#define setmntent(f,m) setfsent() -+#endif -+ - #ifdef HAVE_SYS_VFSTAB_H - #include <sys/vfstab.h> - #elif HAVE_FSTAB_H -@@ -121,7 +131,7 @@ - #define MNTOPT_RO "ro" - #endif - --#ifndef HAVE_SETMNTENT -+#if !defined(HAVE_SETMNTENT) && !defined(HAVE_SETFSENT) - #define setmntent(f,m) fopen(f,m) - #endif - #ifndef HAVE_ENDMNTENT -@@ -585,6 +595,9 @@ - static gboolean - has_removable_mntent_options (MountTableEntry *ent) - { -+#ifdef __FreeBSD__ -+ struct fstab *fsent; -+#endif - #ifdef HAVE_HASMNTOPT - /* Use "owner" or "user" or "users" as our way of determining a removable volume */ - if (hasmntopt (ent, "user") != NULL -@@ -594,6 +607,12 @@ - return TRUE; - } - #endif -+#ifdef __FreeBSD__ -+ fsent = getfsspec(ent->f_mntfromname); -+ if (fsent != NULL && strstr (fsent->fs_mntops, "noauto")) { -+ return TRUE; -+ } -+#endif - - #ifdef SOLARIS_MNT - if (eel_str_has_prefix (ent->mnt_special, "/vol/")) { -@@ -733,10 +752,15 @@ - static GList * - get_removable_volumes (NautilusVolumeMonitor *monitor) - { -+#ifndef HAVE_SETFSENT - FILE *file; -- GList *volumes; -- MountTableEntry *ent; -- NautilusVolume *volume; -+#else -+ int file; -+ struct fstab *fsent; -+#endif -+ GList *volumes = NULL; -+ MountTableEntry *ent = NULL; -+ NautilusVolume *volume = NULL; - char * fs_opt; - #if defined(HAVE_SYS_MNTTAB_H) || defined(AIX_MNT) - MountTableEntry ent_storage; -@@ -744,26 +768,27 @@ - #ifdef HAVE_GETMNTINFO - int count, index; - #endif -- ent = NULL; -- volume = NULL; -- volumes = NULL; - - #ifdef HAVE_GETMNTINFO - count = getmntinfo (&ent, MNT_WAIT); - /* getmentinfo returns a pointer to static data. Do not free. */ - for (index = 0; index < count; index++) { -- if (has_removable_mntent_options (&ent[index])) { -+ if (has_removable_mntent_options (ent + index)) { - volume = create_volume (ent[index].f_mntfromname, - ent[index].f_mntonname); - volume->is_removable = TRUE; - volumes = finish_creating_volume_and_prepend -- (monitor, volume, ent[index].f_fstypename, volumes); -+ (monitor, volume, ent[index].f_fstypename, volumes); - } - } - #endif - - file = setmntent (MOUNT_TABLE_PATH, "r"); -+#ifndef HAVE_SETFSENT - if (file == NULL) { -+#else -+ if (file == 0) { -+#endif - return NULL; - } - -@@ -808,9 +833,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); -+ } -+ } - #endif -- -+ -+#ifndef HAVE_SETFSENT - endmntent (file); -+#else -+ endfsent(); -+#endif - - #ifdef HAVE_CDDA - volume = create_volume (CD_AUDIO_PATH, CD_AUDIO_PATH); -@@ -840,7 +877,7 @@ - return result; - } - --#ifndef SOLARIS_MNT -+#if !defined(SOLARIS_MNT) && !defined(FREEBSD_MNT) - - static gboolean - volume_is_removable (const NautilusVolume *volume) -@@ -1152,7 +1189,7 @@ - char *command; - - if (path != NULL) { -- command = g_strdup_printf ("eject %s", path); -+ command = g_strdup_printf ("/usr/sbin/cdcontrol -f %s eject", path); - eel_gnome_shell_execute (command); - g_free (command); - } -@@ -1309,23 +1346,34 @@ - return volumes; - } - --#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; -+ FILE *fh; -+#else -+ MountTableEntry *ent; -+ int fh, index; -+#endif - - volumes = NULL; - -+#ifndef HAVE_SETFSENT - fh = setmntent (MOUNT_TABLE_PATH, "r"); - if (fh == NULL) { -+#else -+ fh = getmntinfo (&ent, MNT_WAIT); -+ if (fh == 0) { -+#endif - return NULL; - } - -+#ifndef HAVE_SETFSENT - while (! getmntent(fh, &ent)) { - volume = create_volume (ent.mnt_special, ent.mnt_mountp); - volume->is_removable = has_removable_mntent_options (&ent); -@@ -1334,6 +1382,16 @@ - } - - 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); -+ } -+#endif - - return volumes; - } -@@ -1560,7 +1618,7 @@ - static int - get_cdrom_type (const char *vol_dev_path, int* fd) - { --#ifdef SOLARIS_MNT -+#if defined(SOLARIS_MNT) - GString *new_dev_path; - struct cdrom_tocentry entry; - struct cdrom_tochdr header; -@@ -1599,6 +1657,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; -+ -+ *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; -+ } -+ -+ 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; - #else - *fd = open (vol_dev_path, O_RDONLY|O_NONBLOCK); - return ioctl (*fd, CDROM_DISC_STATUS, CDSL_CURRENT); -@@ -2116,7 +2202,7 @@ - for (node = volume_list; node != NULL; node = node->next) { - volume = node->data; - --#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 -@@ -2145,7 +2231,7 @@ - ok = mount_volume_auto_add (volume); - } else if (strcmp (file_system_type_name, "cdda") == 0) { - ok = mount_volume_cdda_add (volume); -- } else if (strcmp (file_system_type_name, "iso9660") == 0) { -+ } else if (strcmp (file_system_type_name, "cd9660") == 0) { - ok = mount_volume_iso9660_add (volume); - } else if (strcmp (file_system_type_name, "nfs") == 0) { - ok = mount_volume_nfs_add (volume); -@@ -2180,9 +2266,18 @@ - } else if (eel_str_has_prefix (volume->device_path, "/dev/floppy")) { - volume->device_type = NAUTILUS_DEVICE_FLOPPY_DRIVE; - volume->is_removable = TRUE; -+ } else if (eel_str_has_prefix (volume->device_path, "/dev/fd")) { -+ volume->device_type = NAUTILUS_DEVICE_FLOPPY_DRIVE; -+ volume->is_removable = TRUE; - } else if (eel_str_has_prefix (volume->device_path, "/dev/cdrom")) { - volume->device_type = NAUTILUS_DEVICE_CDROM_DRIVE; - volume->is_removable = TRUE; -+ } else if (eel_str_has_prefix (volume->device_path, "/dev/acd")) { -+ volume->device_type = NAUTILUS_DEVICE_CDROM_DRIVE; -+ volume->is_removable = TRUE; -+ } else if (eel_str_has_prefix (volume->device_path, "/dev/cd")) { -+ volume->device_type = NAUTILUS_DEVICE_CDROM_DRIVE; -+ volume->is_removable = TRUE; - } else if (eel_str_has_prefix (volume->mount_path, "/mnt/")) { - name = volume->mount_path + strlen ("/mnt/"); - -@@ -2243,7 +2338,36 @@ - } else { - volume->is_removable = FALSE; - } -+ } else if (eel_str_has_prefix (volume->mount_path, "/")) { -+ name = volume->mount_path + strlen ("/"); -+ -+ if (eel_str_has_prefix (name, "cdrom") -+ || eel_str_has_prefix (name, "burn")) { -+ volume->device_type = NAUTILUS_DEVICE_CDROM_DRIVE; -+ volume->is_removable = TRUE; -+ } else if (eel_str_has_prefix (name, "floppy")) { -+ volume->device_type = NAUTILUS_DEVICE_FLOPPY_DRIVE; -+ volume->is_removable = TRUE; -+ } else if (eel_str_has_prefix (name, "zip")) { -+ volume->device_type = NAUTILUS_DEVICE_ZIP_DRIVE; -+ volume->is_removable = TRUE; -+ } else if (eel_str_has_prefix (name, "jaz")) { -+ volume->device_type = NAUTILUS_DEVICE_JAZ_DRIVE; -+ volume->is_removable = TRUE; -+ } else if (eel_str_has_prefix (name, "camera")) { -+ volume->device_type = NAUTILUS_DEVICE_CAMERA; -+ volume->is_removable = TRUE; -+ } else if (eel_str_has_prefix (name, "memstick") -+ || eel_str_has_prefix (name, "ram")) { -+ volume->device_type = NAUTILUS_DEVICE_MEMORY_STICK; -+ volume->is_removable = TRUE; -+ } else if (eel_str_has_prefix (name, "ipod")) { -+ volume->device_type = NAUTILUS_DEVICE_APPLE; -+ volume->is_removable = TRUE; -+ } else { -+ volume->is_removable = FALSE; - } -+ } - - return TRUE; - } diff --git a/x11-fm/nautilus2/files/patch-libnautilus-private_filesystem-attributes.xml b/x11-fm/nautilus2/files/patch-libnautilus-private_filesystem-attributes.xml deleted file mode 100644 index 81e3a2a71451..000000000000 --- a/x11-fm/nautilus2/files/patch-libnautilus-private_filesystem-attributes.xml +++ /dev/null @@ -1,31 +0,0 @@ ---- libnautilus-private/filesystem-attributes.xml.orig Sat Sep 14 16:56:38 2002 -+++ libnautilus-private/filesystem-attributes.xml Sat Sep 14 17:01:31 2002 -@@ -3,10 +3,12 @@ - <filesystem name="affs" _default_volume_name="AFFS Volume"/> - <filesystem name="afs" _default_volume_name="AFS Network Volume"/> - <filesystem name="auto" _default_volume_name="Auto-detected Volume"/> -+ <filesystem name="cd9660" _default_volume_name="CDROM Volume"/> - <filesystem name="cdda" _default_volume_name="CD Digital Audio"/> - <filesystem name="cdrom" _default_volume_name="CD-ROM Drive"/> - <filesystem name="devfs" _default_volume_name="Hardware Device Volume"/> - <filesystem name="ext2" _default_volume_name="Ext2 Linux Volume" trash="yes"/> -+ <filesystem name="ext2fs" _default_volume_name="Ext2 Linux Volume" trash="yes"/> - <filesystem name="ext3" _default_volume_name="Ext3 Linux Volume" trash="yes"/> - <filesystem name="fat" _default_volume_name="MSDOS Volume" trash="yes"/> - <filesystem name="hfs" _default_volume_name="MacOS Volume" trash="yes"/> -@@ -15,10 +17,15 @@ - <filesystem name="hsfs" _default_volume_name="Hsfs CDROM Volume"/> - <filesystem name="jfs" _default_volume_name="JFS Volume" trash="yes"/> - <filesystem name="hpfs" _default_volume_name="Windows NT Volume"/> -+ <filesystem name="linprocfs" _default_volume_name="System Volume"/> -+ <filesystem name="mfs" _default_volume_name="Memory Volume" trash="yes"/> - <filesystem name="minix" _default_volume_name="Minix Volume"/> - <filesystem name="msdos" _default_volume_name="MSDOS Volume"/> - <filesystem name="nfs" _default_volume_name="NFS Network Volume" trash="yes"/> -+ <filesystem name="ntfs" _default_volume_name="Windows NT Volume"/> -+ <filesystem name="nwfs" _default_volume_name="Netware Volume"/> - <filesystem name="proc" _default_volume_name="System Volume"/> -+ <filesystem name="procfs" _default_volume_name="System Volume"/> - <filesystem name="reiserfs" _default_volume_name="ReiserFS Linux Volume" trash="yes"/> - <filesystem name="smbfs" _default_volume_name="Windows Shared Volume" trash="yes"/> - <filesystem name="supermount" _default_volume_name="SuperMount Volume" /> diff --git a/x11-fm/nautilus2/files/patch-libnautilus-private_nautilus-desktop-icon-file.c b/x11-fm/nautilus2/files/patch-libnautilus-private_nautilus-desktop-icon-file.c new file mode 100644 index 000000000000..62385a0ac826 --- /dev/null +++ b/x11-fm/nautilus2/files/patch-libnautilus-private_nautilus-desktop-icon-file.c @@ -0,0 +1,13 @@ +--- libnautilus-private/nautilus-desktop-icon-file.c.orig Fri Jan 30 16:49:53 2004 ++++ libnautilus-private/nautilus-desktop-icon-file.c Fri Jan 30 16:50:52 2004 +@@ -199,6 +199,10 @@ + file_info->flags = GNOME_VFS_FILE_FLAGS_NONE; + file_info->link_count = 1; + file_info->size = 0; ++ /* Set a bogus owner and group on these files to prevent nowrite ++ * emblems from showing up on the files. */ ++ file_info->uid = -993; ++ file_info->gid = -993; + file_info->permissions = + GNOME_VFS_PERM_OTHER_WRITE | + GNOME_VFS_PERM_USER_READ | diff --git a/x11-fm/nautilus2/files/patch-ltmain.sh b/x11-fm/nautilus2/files/patch-ltmain.sh index 854b2a10a327..3232b8da9655 100644 --- a/x11-fm/nautilus2/files/patch-ltmain.sh +++ b/x11-fm/nautilus2/files/patch-ltmain.sh @@ -1,15 +1,15 @@ ---- ltmain.sh.orig Sat Feb 8 09:47:44 2003 -+++ ltmain.sh Mon Jun 30 18:31:09 2003 -@@ -1075,7 +1075,7 @@ +--- ltmain.sh.orig Sun Jan 11 17:28:53 2004 ++++ ltmain.sh Fri Jan 30 16:45:37 2004 +@@ -1280,7 +1280,7 @@ esac - elif test "X$arg" = "X-lc_r"; then - case $host in + 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 @@ + # Do not include libc_r directly, use -pthread flag. + continue + ;; +@@ -1290,8 +1290,16 @@ continue ;; @@ -26,17 +26,17 @@ continue ;; -@@ -2503,6 +2511,9 @@ - *-*-openbsd* | *-*-freebsd*) - # Do not include libc due to us having libc/libc_r. +@@ -3000,6 +3008,9 @@ + # problems, so we reset it completely + verstring= ;; + *-*-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 @@ + verstring="0.0" + ;; +@@ -5428,10 +5439,12 @@ fi # Install the pseudo-library for information purposes. diff --git a/x11-fm/nautilus2/files/patch-src_file-manager_fm-directory-view.c b/x11-fm/nautilus2/files/patch-src_file-manager_fm-directory-view.c index 5f84cfbe5aee..5246e273c532 100644 --- a/x11-fm/nautilus2/files/patch-src_file-manager_fm-directory-view.c +++ b/x11-fm/nautilus2/files/patch-src_file-manager_fm-directory-view.c @@ -1,6 +1,6 @@ ---- src/file-manager/fm-directory-view.c.orig Thu Oct 2 23:30:40 2003 -+++ src/file-manager/fm-directory-view.c Thu Oct 2 23:52:04 2003 -@@ -4314,19 +4314,25 @@ +--- src/file-manager/fm-directory-view.c.orig Tue Feb 24 08:17:24 2004 ++++ src/file-manager/fm-directory-view.c Wed Feb 25 02:43:55 2004 +@@ -4476,19 +4476,25 @@ nautilus_bonobo_set_hidden (view->details->ui, FM_DIRECTORY_VIEW_MENU_PATH_SCRIPTS, diff --git a/x11-fm/nautilus2/pkg-descr b/x11-fm/nautilus2/pkg-descr index 41244cfac345..b4f3fd678e8f 100644 --- a/x11-fm/nautilus2/pkg-descr +++ b/x11-fm/nautilus2/pkg-descr @@ -1,6 +1,5 @@ -Nautilus is the official file manager for the GNOME desktop. It is -designed to be primarly a file manager, but there are support for web -and file viewing too. It is also responsible for managing of desktop -and its icons. +Nautilus is a file manager tightly integrated into the GNOME destkop. +It is also responsible for desktop and icon management, and provides +an intuitive interface for accessing files and webpages. WWW: http://www.gnome.org/projects/nautilus/ diff --git a/x11-fm/nautilus2/pkg-plist b/x11-fm/nautilus2/pkg-plist index 068fc4e9fd7d..736238acc8f9 100644 --- a/x11-fm/nautilus2/pkg-plist +++ b/x11-fm/nautilus2/pkg-plist @@ -1,6 +1,5 @@ bin/nautilus bin/nautilus-file-management-properties -bin/nautilus-server-connect etc/X11/serverconfig/.directory etc/X11/starthere/.directory etc/X11/starthere/applications.desktop @@ -34,14 +33,25 @@ include/libnautilus/nautilus-undo.h include/libnautilus/nautilus-view-component.h include/libnautilus/nautilus-view-standard-main.h include/libnautilus/nautilus-view.h +include/nautilus/libnautilus-extension/nautilus-column-provider.h +include/nautilus/libnautilus-extension/nautilus-column.h +include/nautilus/libnautilus-extension/nautilus-extension-types.h +include/nautilus/libnautilus-extension/nautilus-file-info.h +include/nautilus/libnautilus-extension/nautilus-info-provider.h +include/nautilus/libnautilus-extension/nautilus-menu-item.h +include/nautilus/libnautilus-extension/nautilus-menu-provider.h +include/nautilus/libnautilus-extension/nautilus-property-page-provider.h +include/nautilus/libnautilus-extension/nautilus-property-page.h lib/bonobo/libnautilus-emblem-view.so lib/bonobo/libnautilus-history-view.so lib/bonobo/libnautilus-image-properties-view.so lib/bonobo/libnautilus-notes-view.so -lib/bonobo/libnautilus-tree-view.so lib/libnautilus-adapter.a lib/libnautilus-adapter.so lib/libnautilus-adapter.so.2 +lib/libnautilus-extension.a +lib/libnautilus-extension.so +lib/libnautilus-extension.so.1 lib/libnautilus-private.a lib/libnautilus-private.so lib/libnautilus-private.so.2 @@ -55,29 +65,32 @@ libdata/bonobo/servers/Nautilus_View_history.server libdata/bonobo/servers/Nautilus_View_image_properties.server libdata/bonobo/servers/Nautilus_View_notes.server libdata/bonobo/servers/Nautilus_View_text.server -libdata/bonobo/servers/Nautilus_View_tree.server libdata/bonobo/servers/Nautilus_shell.server libdata/pkgconfig/libnautilus.pc +libdata/pkgconfig/libnautilus-extension.pc libexec/nautilus-adapter libexec/nautilus-text-view libexec/nautilus-throbber share/gnome/applications/nautilus.desktop +share/gnome/applications/nautilus-computer.desktop +share/gnome/applications/nautilus-home.desktop share/gnome/applications/network-scheme.desktop share/gnome/control-center-2.0/capplets/nautilus-file-management-properties.desktop share/gnome/gnome-2.0/ui/nautilus-clipboard-ui.xml share/gnome/gnome-2.0/ui/nautilus-desktop-icon-view-ui.xml share/gnome/gnome-2.0/ui/nautilus-directory-view-ui.xml share/gnome/gnome-2.0/ui/nautilus-icon-view-ui.xml +share/gnome/gnome-2.0/ui/nautilus-list-view-ui.xml +share/gnome/gnome-2.0/ui/nautilus-navigation-window-ui.xml share/gnome/gnome-2.0/ui/nautilus-search-list-view-ui.xml share/gnome/gnome-2.0/ui/nautilus-shell-ui.xml +share/gnome/gnome-2.0/ui/nautilus-spatial-window-ui.xml share/gnome/gnome-2.0/ui/nautilus-text-view-ui.xml share/gnome/idl/nautilus-distributed-undo.idl share/gnome/idl/nautilus-view-component.idl share/gnome/nautilus/browser.xml -share/gnome/nautilus/filesystem-attributes.xml share/gnome/nautilus/glade/nautilus-bookmarks-window.glade share/gnome/nautilus/glade/nautilus-file-management-properties.glade -share/gnome/nautilus/glade/nautilus-server-connect.glade share/gnome/nautilus/nautilus-extras.placeholder share/gnome/nautilus/nautilus-suggested.placeholder share/gnome/nautilus/patterns/.striated.png @@ -112,20 +125,14 @@ share/gnome/nautilus/patterns/snow_ridge.png share/gnome/nautilus/patterns/stucco.jpg share/gnome/nautilus/patterns/terracotta.png share/gnome/nautilus/patterns/wavy_white.png -share/gnome/nautilus/services/text/google.xml -share/gnome/nautilus/services/text/webster.xml 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/CD_drive.png -share/gnome/pixmaps/nautilus/HD_drive.png share/gnome/pixmaps/nautilus/Search.png share/gnome/pixmaps/nautilus/audio.png share/gnome/pixmaps/nautilus/backgrounds.png share/gnome/pixmaps/nautilus/chit_frame.png 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_teal/Search.png @@ -138,7 +145,6 @@ share/gnome/pixmaps/nautilus/erase.png share/gnome/pixmaps/nautilus/gnome/Services.png share/gnome/pixmaps/nautilus/gnome/gnome.xml 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 @@ -164,6 +170,7 @@ 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 +share/locale/en_CA/LC_MESSAGES/nautilus.mo share/locale/en_GB/LC_MESSAGES/nautilus.mo share/locale/es/LC_MESSAGES/nautilus.mo share/locale/et/LC_MESSAGES/nautilus.mo @@ -175,16 +182,17 @@ share/locale/ga/LC_MESSAGES/nautilus.mo share/locale/gl/LC_MESSAGES/nautilus.mo share/locale/he/LC_MESSAGES/nautilus.mo share/locale/hi/LC_MESSAGES/nautilus.mo +share/locale/hr/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/kn/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/mi/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 @@ -193,6 +201,7 @@ 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 +share/locale/pa/LC_MESSAGES/nautilus.mo share/locale/pl/LC_MESSAGES/nautilus.mo share/locale/pt/LC_MESSAGES/nautilus.mo share/locale/pt_BR/LC_MESSAGES/nautilus.mo @@ -203,8 +212,8 @@ share/locale/sl/LC_MESSAGES/nautilus.mo share/locale/sq/LC_MESSAGES/nautilus.mo share/locale/sr/LC_MESSAGES/nautilus.mo share/locale/sr@Latn/LC_MESSAGES/nautilus.mo +share/locale/sr@ije/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 @@ -214,8 +223,9 @@ share/locale/yi/LC_MESSAGES/nautilus.mo share/locale/zh_CN/LC_MESSAGES/nautilus.mo share/locale/zh_TW/LC_MESSAGES/nautilus.mo @dirrm share/gnome/pixmaps/nautilus/default -@dirrm share/gnome/network @dirrm share/gnome/nautilus/glade +@dirrm include/nautilus/libnautilus-extension +@dirrm include/nautilus @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/sidebar_panels/tree @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/sidebar_panels @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/preferences @@ -230,3 +240,5 @@ share/locale/zh_TW/LC_MESSAGES/nautilus.mo @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 +@unexec /bin/rmdir %D/lib/nautilus/extensions-1.0 2>/dev/null || /usr/bin/true +@dirrm lib/nautilus diff --git a/x11-themes/gnome-themes/Makefile b/x11-themes/gnome-themes/Makefile index c4e6ffbabcf0..9c40ebfcd0f7 100644 --- a/x11-themes/gnome-themes/Makefile +++ b/x11-themes/gnome-themes/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnome-themes -PORTVERSION= 2.4.1 -PORTREVISION= 2 +PORTVERSION= 2.6.0 CATEGORIES= x11-toolkits gnome 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 @@ -23,10 +22,12 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_REINPLACE= yes USE_LIBTOOL_VER=13 -USE_GNOME= gnomehack metacity libgnomeui +USE_GNOME= gnomehack lthack metacity libgnomeui CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +PLIST_SUB= GTK_VERSION="2.4.0" + post-patch: @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ 's|noinst_PROGRAMS = |noinst_PROGRAMS = #|g' diff --git a/x11-themes/gnome-themes/distinfo b/x11-themes/gnome-themes/distinfo index 38b749dccb7d..34aec8dc8691 100644 --- a/x11-themes/gnome-themes/distinfo +++ b/x11-themes/gnome-themes/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-themes-2.4.1.tar.bz2) = 304237994a5bdd8b89628f4387cd0d10 -SIZE (gnome2/gnome-themes-2.4.1.tar.bz2) = 2485378 +MD5 (gnome2/gnome-themes-2.6.0.tar.bz2) = 17817f602713b9ac8ebaff9a7f0cb996 +SIZE (gnome2/gnome-themes-2.6.0.tar.bz2) = 2597765 diff --git a/x11-themes/gnome-themes/files/patch-configure b/x11-themes/gnome-themes/files/patch-configure deleted file mode 100644 index 3a3c068040c5..000000000000 --- a/x11-themes/gnome-themes/files/patch-configure +++ /dev/null @@ -1,10 +0,0 @@ ---- 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" -+$ac_aux_dir/ltconfig $LIBTOOL_DEPS - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' diff --git a/x11-themes/gnome-themes/files/patch-metacity-themes_Makefile.in b/x11-themes/gnome-themes/files/patch-metacity-themes_Makefile.in index 02365472fd62..090c18883e26 100644 --- a/x11-themes/gnome-themes/files/patch-metacity-themes_Makefile.in +++ b/x11-themes/gnome-themes/files/patch-metacity-themes_Makefile.in @@ -1,6 +1,6 @@ ---- metacity-themes/Makefile.in.orig Mon Feb 3 20:16:59 2003 -+++ metacity-themes/Makefile.in Mon Feb 3 20:17:33 2003 -@@ -120,7 +120,7 @@ +--- metacity-themes/Makefile.in.orig Tue Dec 9 22:11:42 2003 ++++ metacity-themes/Makefile.in Tue Dec 9 22:12:00 2003 +@@ -122,7 +122,7 @@ THEMES = Mist Sandwish Smokey diff --git a/x11-themes/gnome-themes/pkg-descr b/x11-themes/gnome-themes/pkg-descr index f3fa6135cc4b..333388e7853d 100644 --- a/x11-themes/gnome-themes/pkg-descr +++ b/x11-themes/gnome-themes/pkg-descr @@ -1,2 +1,2 @@ -New package of default themes for GNOME, which currently includes GTK+ and -icon themes designed for accessibility. +A collection of themes for metacity and Gtk, and some basic icon +sets. diff --git a/x11-themes/gnome-themes/pkg-plist b/x11-themes/gnome-themes/pkg-plist index 2b7248fd0106..a2e046b7ac75 100644 --- a/x11-themes/gnome-themes/pkg-plist +++ b/x11-themes/gnome-themes/pkg-plist @@ -1,8 +1,8 @@ -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 +lib/gtk-2.0/%%GTK_VERSION%%/engines/libcrux-engine.so +lib/gtk-2.0/%%GTK_VERSION%%/engines/libhcengine.so +lib/gtk-2.0/%%GTK_VERSION%%/engines/liblighthouseblue.so +lib/gtk-2.0/%%GTK_VERSION%%/engines/libmist.so +lib/gtk-2.0/%%GTK_VERSION%%/engines/libthinice.so share/eazel-engine/arrow_down-spinner.png share/eazel-engine/arrow_down.png share/eazel-engine/arrow_left.png @@ -241,13 +241,14 @@ share/icons/Flat-Blue/scalable/emblems/emblem-urgent.svg share/icons/HighContrast/index.theme share/icons/HighContrastInverse/index.theme share/icons/HighContrastLargePrint/48x48/apps/accessibility-directory.png -share/icons/HighContrastLargePrint/48x48/apps/accessibility-keyboard-capplet.png share/icons/HighContrastLargePrint/48x48/apps/advanced-directory.png -share/icons/HighContrastLargePrint/48x48/apps/background-capplet.png -share/icons/HighContrastLargePrint/48x48/apps/behavior-capplet.png +share/icons/HighContrastLargePrint/48x48/apps/ax-applet.png share/icons/HighContrastLargePrint/48x48/apps/charpick.png -share/icons/HighContrastLargePrint/48x48/apps/default-applications-capplet.png -share/icons/HighContrastLargePrint/48x48/apps/font-capplet.png +share/icons/HighContrastLargePrint/48x48/apps/display-capplet.png +share/icons/HighContrastLargePrint/48x48/apps/file-manager.png +share/icons/HighContrastLargePrint/48x48/apps/file-roller.png +share/icons/HighContrastLargePrint/48x48/apps/gcalctool.png +share/icons/HighContrastLargePrint/48x48/apps/gdict.png share/icons/HighContrastLargePrint/48x48/apps/gedit-icon.png share/icons/HighContrastLargePrint/48x48/apps/gkb.png share/icons/HighContrastLargePrint/48x48/apps/gnome-applications.png @@ -255,7 +256,6 @@ share/icons/HighContrastLargePrint/48x48/apps/gnome-audio2.png share/icons/HighContrastLargePrint/48x48/apps/gnome-calc3.png share/icons/HighContrastLargePrint/48x48/apps/gnome-ccmime.png share/icons/HighContrastLargePrint/48x48/apps/gnome-ccscreensaver.png -share/icons/HighContrastLargePrint/48x48/apps/gnome-ccthemes.png share/icons/HighContrastLargePrint/48x48/apps/gnome-cd.png share/icons/HighContrastLargePrint/48x48/apps/gnome-cdplayer-icon.png share/icons/HighContrastLargePrint/48x48/apps/gnome-character-map.png @@ -273,29 +273,44 @@ share/icons/HighContrastLargePrint/48x48/apps/gnome-joystick.png share/icons/HighContrastLargePrint/48x48/apps/gnome-log.png share/icons/HighContrastLargePrint/48x48/apps/gnome-logo-icon-transparent.png share/icons/HighContrastLargePrint/48x48/apps/gnome-mailcheck.png +share/icons/HighContrastLargePrint/48x48/apps/gnome-main-menu.png share/icons/HighContrastLargePrint/48x48/apps/gnome-mini-commander.png share/icons/HighContrastLargePrint/48x48/apps/gnome-mixer-applet.png +share/icons/HighContrastLargePrint/48x48/apps/gnome-mixer.png share/icons/HighContrastLargePrint/48x48/apps/gnome-multimedia.png share/icons/HighContrastLargePrint/48x48/apps/gnome-panel.png share/icons/HighContrastLargePrint/48x48/apps/gnome-session.png +share/icons/HighContrastLargePrint/48x48/apps/gnome-settings-accessibility-keyboard.png +share/icons/HighContrastLargePrint/48x48/apps/gnome-settings-accessibility-technologies.png +share/icons/HighContrastLargePrint/48x48/apps/gnome-settings-background.png +share/icons/HighContrastLargePrint/48x48/apps/gnome-settings-default-applications.png +share/icons/HighContrastLargePrint/48x48/apps/gnome-settings-font.png +share/icons/HighContrastLargePrint/48x48/apps/gnome-settings-keybindings.png +share/icons/HighContrastLargePrint/48x48/apps/gnome-settings-sound.png +share/icons/HighContrastLargePrint/48x48/apps/gnome-settings-theme.png +share/icons/HighContrastLargePrint/48x48/apps/gnome-settings-ui-behavior.png share/icons/HighContrastLargePrint/48x48/apps/gnome-settings.png share/icons/HighContrastLargePrint/48x48/apps/gnome-starthere.png share/icons/HighContrastLargePrint/48x48/apps/gnome-system.png share/icons/HighContrastLargePrint/48x48/apps/gnome-terminal.png share/icons/HighContrastLargePrint/48x48/apps/gnome-util.png +share/icons/HighContrastLargePrint/48x48/apps/gnome-window-manager.png share/icons/HighContrastLargePrint/48x48/apps/gnome-windows.png share/icons/HighContrastLargePrint/48x48/apps/gnome-workspace.png -share/icons/HighContrastLargePrint/48x48/apps/keyboard-capplet.png -share/icons/HighContrastLargePrint/48x48/apps/keyboard-shortcut.png +share/icons/HighContrastLargePrint/48x48/apps/gucharmap.png share/icons/HighContrastLargePrint/48x48/apps/launcher-program.png -share/icons/HighContrastLargePrint/48x48/apps/metacity-properties.png -share/icons/HighContrastLargePrint/48x48/apps/mouse-capplet.png -share/icons/HighContrastLargePrint/48x48/apps/sound-capplet.png +share/icons/HighContrastLargePrint/48x48/apps/perfmeter.png share/icons/HighContrastLargePrint/48x48/apps/window-capplet.png share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-cdrom-audio.png share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-cdrom.png share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-floppy.png +share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-keyboard.png +share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-mouse-optical.png +share/icons/HighContrastLargePrint/48x48/emblems/emblem-important.png share/icons/HighContrastLargePrint/48x48/emblems/emblem-noread.png +share/icons/HighContrastLargePrint/48x48/emblems/emblem-personal.png +share/icons/HighContrastLargePrint/48x48/emblems/emblem-special.png +share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-client.png share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-directory-accept.icon share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-directory-accept.png share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-directory.icon @@ -303,6 +318,7 @@ share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-directory.png share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-executable.png share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-ftp.png share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-home.png +share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-network.png share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-nfs.png share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-regular.png share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-share.png @@ -449,13 +465,13 @@ share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-x-font-afm.png share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-package.png share/icons/HighContrastLargePrint/index.theme share/icons/HighContrastLargePrintInverse/48x48/apps/accessibility-directory.png -share/icons/HighContrastLargePrintInverse/48x48/apps/accessibility-keyboard-capplet.png share/icons/HighContrastLargePrintInverse/48x48/apps/advanced-directory.png -share/icons/HighContrastLargePrintInverse/48x48/apps/background-capplet.png -share/icons/HighContrastLargePrintInverse/48x48/apps/behavior-capplet.png share/icons/HighContrastLargePrintInverse/48x48/apps/charpick.png -share/icons/HighContrastLargePrintInverse/48x48/apps/default-applications-capplet.png -share/icons/HighContrastLargePrintInverse/48x48/apps/font-capplet.png +share/icons/HighContrastLargePrintInverse/48x48/apps/display-capplet.png +share/icons/HighContrastLargePrintInverse/48x48/apps/file-manager.png +share/icons/HighContrastLargePrintInverse/48x48/apps/file-roller.png +share/icons/HighContrastLargePrintInverse/48x48/apps/gcalctool.png +share/icons/HighContrastLargePrintInverse/48x48/apps/gdict.png share/icons/HighContrastLargePrintInverse/48x48/apps/gedit-icon.png share/icons/HighContrastLargePrintInverse/48x48/apps/gkb.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-applications.png @@ -463,7 +479,6 @@ share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-audio2.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-calc3.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-ccmime.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-ccscreensaver.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-ccthemes.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-cd.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-cdplayer-icon.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-character-map.png @@ -481,29 +496,44 @@ share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-joystick.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-log.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-logo-icon-transparent.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-mailcheck.png +share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-main-menu.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-mini-commander.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-mixer-applet.png +share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-mixer.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-multimedia.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-panel.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-session.png +share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-accessibility-keyboard.png +share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-accessibility-technologies.png +share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-background.png +share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-default-applications.png +share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-font.png +share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-keybindings.png +share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-sound.png +share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-theme.png +share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-ui-behavior.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-starthere.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-system.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-terminal.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-util.png +share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-window-manager.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-windows.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-workspace.png -share/icons/HighContrastLargePrintInverse/48x48/apps/keyboard-capplet.png -share/icons/HighContrastLargePrintInverse/48x48/apps/keyboard-shortcut.png +share/icons/HighContrastLargePrintInverse/48x48/apps/gucharmap.png share/icons/HighContrastLargePrintInverse/48x48/apps/launcher-program.png -share/icons/HighContrastLargePrintInverse/48x48/apps/metacity-properties.png -share/icons/HighContrastLargePrintInverse/48x48/apps/mouse-capplet.png -share/icons/HighContrastLargePrintInverse/48x48/apps/sound-capplet.png +share/icons/HighContrastLargePrintInverse/48x48/apps/perfmeter.png share/icons/HighContrastLargePrintInverse/48x48/apps/window-capplet.png share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-cdrom-audio.png share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-cdrom.png share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-floppy.png +share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-keyboard.png +share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-mouse-optical.png +share/icons/HighContrastLargePrintInverse/48x48/emblems/emblem-important.png share/icons/HighContrastLargePrintInverse/48x48/emblems/emblem-noread.png +share/icons/HighContrastLargePrintInverse/48x48/emblems/emblem-personal.png +share/icons/HighContrastLargePrintInverse/48x48/emblems/emblem-special.png +share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-client.png share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-directory-accept.icon share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-directory-accept.png share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-directory.icon @@ -511,6 +541,7 @@ share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-directory.p share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-executable.png share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-ftp.png share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-home.png +share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-network.png share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-nfs.png share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-regular.png share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-share.png @@ -659,13 +690,14 @@ share/icons/HighContrastLargePrintInverse/index.theme share/icons/LargePrint/index.theme share/icons/LowContrast/index.theme share/icons/LowContrastLargePrint/48x48/apps/accessibility-directory.png -share/icons/LowContrastLargePrint/48x48/apps/accessibility-keyboard-capplet.png share/icons/LowContrastLargePrint/48x48/apps/advanced-directory.png -share/icons/LowContrastLargePrint/48x48/apps/background-capplet.png -share/icons/LowContrastLargePrint/48x48/apps/behavior-capplet.png +share/icons/LowContrastLargePrint/48x48/apps/ax-applet.png share/icons/LowContrastLargePrint/48x48/apps/charpick.png -share/icons/LowContrastLargePrint/48x48/apps/default-applications-capplet.png -share/icons/LowContrastLargePrint/48x48/apps/font-capplet.png +share/icons/LowContrastLargePrint/48x48/apps/display-capplet.png +share/icons/LowContrastLargePrint/48x48/apps/file-manager.png +share/icons/LowContrastLargePrint/48x48/apps/file-roller.png +share/icons/LowContrastLargePrint/48x48/apps/gcalctool.png +share/icons/LowContrastLargePrint/48x48/apps/gdict.png share/icons/LowContrastLargePrint/48x48/apps/gedit-icon.png share/icons/LowContrastLargePrint/48x48/apps/gkb.png share/icons/LowContrastLargePrint/48x48/apps/gnome-applications.png @@ -673,7 +705,6 @@ share/icons/LowContrastLargePrint/48x48/apps/gnome-audio2.png share/icons/LowContrastLargePrint/48x48/apps/gnome-calc3.png share/icons/LowContrastLargePrint/48x48/apps/gnome-ccmime.png share/icons/LowContrastLargePrint/48x48/apps/gnome-ccscreensaver.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-ccthemes.png share/icons/LowContrastLargePrint/48x48/apps/gnome-cd.png share/icons/LowContrastLargePrint/48x48/apps/gnome-cdplayer-icon.png share/icons/LowContrastLargePrint/48x48/apps/gnome-character-map.png @@ -691,24 +722,33 @@ share/icons/LowContrastLargePrint/48x48/apps/gnome-joystick.png share/icons/LowContrastLargePrint/48x48/apps/gnome-log.png share/icons/LowContrastLargePrint/48x48/apps/gnome-logo-icon-transparent.png share/icons/LowContrastLargePrint/48x48/apps/gnome-mailcheck.png +share/icons/LowContrastLargePrint/48x48/apps/gnome-main-menu.png share/icons/LowContrastLargePrint/48x48/apps/gnome-mini-commander.png share/icons/LowContrastLargePrint/48x48/apps/gnome-mixer-applet.png +share/icons/LowContrastLargePrint/48x48/apps/gnome-mixer.png share/icons/LowContrastLargePrint/48x48/apps/gnome-multimedia.png share/icons/LowContrastLargePrint/48x48/apps/gnome-panel.png share/icons/LowContrastLargePrint/48x48/apps/gnome-session.png +share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-accessibility-keyboard.png +share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-accessibility-technologies.png +share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-background.png +share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-default-applications.png +share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-font.png +share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-keybindings.png +share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-sound.png +share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-theme.png +share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-ui-behavior.png share/icons/LowContrastLargePrint/48x48/apps/gnome-settings.png share/icons/LowContrastLargePrint/48x48/apps/gnome-starthere.png share/icons/LowContrastLargePrint/48x48/apps/gnome-system.png share/icons/LowContrastLargePrint/48x48/apps/gnome-terminal.png share/icons/LowContrastLargePrint/48x48/apps/gnome-util.png +share/icons/LowContrastLargePrint/48x48/apps/gnome-window-manager.png share/icons/LowContrastLargePrint/48x48/apps/gnome-windows.png share/icons/LowContrastLargePrint/48x48/apps/gnome-workspace.png -share/icons/LowContrastLargePrint/48x48/apps/keyboard-capplet.png -share/icons/LowContrastLargePrint/48x48/apps/keyboard-shortcut.png +share/icons/LowContrastLargePrint/48x48/apps/gucharmap.png share/icons/LowContrastLargePrint/48x48/apps/launcher-program.png -share/icons/LowContrastLargePrint/48x48/apps/metacity-properties.png -share/icons/LowContrastLargePrint/48x48/apps/mouse-capplet.png -share/icons/LowContrastLargePrint/48x48/apps/sound-capplet.png +share/icons/LowContrastLargePrint/48x48/apps/perfmeter.png share/icons/LowContrastLargePrint/48x48/apps/window-capplet.png share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-cdrom-audio.png share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-cdrom.png @@ -716,7 +756,9 @@ share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-dvd.png share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-floppy.png share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-harddisk.png share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-jazdisk.png +share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-keyboard.png share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-memory.png +share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-mouse-optical.png share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-zipdisk.png share/icons/LowContrastLargePrint/48x48/emblems/emblem-art.png share/icons/LowContrastLargePrint/48x48/emblems/emblem-camera.png @@ -734,6 +776,7 @@ share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-blockdev.png share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-bookmark-missing.png share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-bookmark.png share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-chardev.png +share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-client.png share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-directory-accept.icon share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-directory-accept.png share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-directory.icon @@ -743,6 +786,7 @@ share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-fifo.png share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-ftp.png share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-home.png share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-loading-icon.png +share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-network.png share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-nfs.png share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-regular.icon share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-regular.png @@ -926,6 +970,7 @@ share/icons/Smokey-Red/48x48/filesystems/gnome-fs-trash-full-accept.png share/icons/Smokey-Red/48x48/filesystems/gnome-fs-trash-full.png share/icons/Smokey-Red/index.theme share/locale/am/LC_MESSAGES/gnome-themes.mo +share/locale/ar/LC_MESSAGES/gnome-themes.mo share/locale/az/LC_MESSAGES/gnome-themes.mo share/locale/be/LC_MESSAGES/gnome-themes.mo share/locale/bg/LC_MESSAGES/gnome-themes.mo @@ -936,6 +981,8 @@ 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 +share/locale/en_CA/LC_MESSAGES/gnome-themes.mo +share/locale/en_GB/LC_MESSAGES/gnome-themes.mo share/locale/es/LC_MESSAGES/gnome-themes.mo share/locale/et/LC_MESSAGES/gnome-themes.mo share/locale/eu/LC_MESSAGES/gnome-themes.mo @@ -945,6 +992,7 @@ 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/hr/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 @@ -971,7 +1019,6 @@ share/locale/sq/LC_MESSAGES/gnome-themes.mo share/locale/sr/LC_MESSAGES/gnome-themes.mo share/locale/sr@Latn/LC_MESSAGES/gnome-themes.mo share/locale/sv/LC_MESSAGES/gnome-themes.mo -share/locale/ta/LC_MESSAGES/gnome-themes.mo share/locale/th/LC_MESSAGES/gnome-themes.mo share/locale/tr/LC_MESSAGES/gnome-themes.mo share/locale/uk/LC_MESSAGES/gnome-themes.mo @@ -1023,7 +1070,7 @@ share/themes/HighContrast/index.theme share/themes/HighContrastInverse/gtk-2.0/gtkrc share/themes/HighContrastInverse/index.theme share/themes/HighContrastLargePrint/gtk-2.0/gtkrc -share/themes/HighContrastLargePrint/index.theme~ +share/themes/HighContrastLargePrint/index.theme.disabled share/themes/HighContrastLargePrint/pixmaps/double-click-maybe.png share/themes/HighContrastLargePrint/pixmaps/double-click-off.png share/themes/HighContrastLargePrint/pixmaps/double-click-on.png @@ -1157,7 +1204,7 @@ share/themes/HighContrastLargePrint/pixmaps/volume-min.png share/themes/HighContrastLargePrint/pixmaps/volume-mute.png share/themes/HighContrastLargePrint/pixmaps/volume-zero.png share/themes/HighContrastLargePrintInverse/gtk-2.0/gtkrc -share/themes/HighContrastLargePrintInverse/index.theme~ +share/themes/HighContrastLargePrintInverse/index.theme.disabled share/themes/HighContrastLargePrintInverse/pixmaps/double-click-maybe.png share/themes/HighContrastLargePrintInverse/pixmaps/double-click-off.png share/themes/HighContrastLargePrintInverse/pixmaps/double-click-on.png @@ -1426,9 +1473,9 @@ share/themes/LargePrint/pixmaps/volume-mute.png share/themes/LargePrint/pixmaps/volume-zero.png share/themes/LighthouseBlue/gtk-2.0/gtkrc share/themes/LowContrast/gtk-2.0/gtkrc -share/themes/LowContrast/index.theme~ +share/themes/LowContrast/index.theme.disabled share/themes/LowContrastLargePrint/gtk-2.0/gtkrc -share/themes/LowContrastLargePrint/index.theme~ +share/themes/LowContrastLargePrint/index.theme.disabled share/themes/LowContrastLargePrint/pixmaps/double-click-maybe.png share/themes/LowContrastLargePrint/pixmaps/double-click-off.png share/themes/LowContrastLargePrint/pixmaps/double-click-on.png diff --git a/x11-themes/gtk-engines2/Makefile b/x11-themes/gtk-engines2/Makefile index dbde4b8854eb..3566b9685b3b 100644 --- a/x11-themes/gtk-engines2/Makefile +++ b/x11-themes/gtk-engines2/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtk-engines2 PORTVERSION= 2.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.2 @@ -21,7 +21,7 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_LIBTOOL_VER=13 USE_GNOME= gnomehack gtk20 -PLIST_SUB= VERSION=2.2.0 +PLIST_SUB= GTK_VERSION="2.4.0" THEMES= metal redmond95 diff --git a/x11-themes/gtk-engines2/pkg-plist b/x11-themes/gtk-engines2/pkg-plist index 39f05f6c3a84..fb60fd7a4cfe 100644 --- a/x11-themes/gtk-engines2/pkg-plist +++ b/x11-themes/gtk-engines2/pkg-plist @@ -1,6 +1,6 @@ -lib/gtk-2.0/%%VERSION%%/engines/libmetal.so -lib/gtk-2.0/%%VERSION%%/engines/libpixmap.so -lib/gtk-2.0/%%VERSION%%/engines/libredmond95.so +lib/gtk-2.0/%%GTK_VERSION%%/engines/libmetal.so +lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.so +lib/gtk-2.0/%%GTK_VERSION%%/engines/libredmond95.so libdata/pkgconfig/gtk-engines-2.pc share/themes/Metal/README.html share/themes/Metal/gtk-2.0/gtkrc @@ -8,6 +8,6 @@ share/themes/Redmond95/README.html share/themes/Redmond95/gtk-2.0/gtkrc @dirrm share/themes/Redmond95/gtk-2.0 @dirrm share/themes/Metal/gtk-2.0 -@dirrm lib/gtk-2.0/%%VERSION%%/engines +@dirrm lib/gtk-2.0/%%GTK_VERSION%%/engines @unexec /bin/rmdir %D/share/themes/Redmond95 2>/dev/null || /usr/bin/true @unexec /bin/rmdir %D/share/themes/Metal 2>/dev/null || /usr/bin/true diff --git a/x11-toolkits/eel2/Makefile b/x11-toolkits/eel2/Makefile index f8016503bc62..e893d010da39 100644 --- a/x11-toolkits/eel2/Makefile +++ b/x11-toolkits/eel2/Makefile @@ -6,24 +6,22 @@ # PORTNAME= eel2 -PORTVERSION= 2.4.2 -PORTREVISION= 1 +PORTVERSION= 2.6.0 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.4 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.6 DIST_SUBDIR= gnome2 DISTNAME= eel-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org COMMENT= Generally useful classes and extensions to GNOME -BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 - USE_BZIP2= yes USE_GMAKE= yes USE_X_PREFIX= yes USE_GNOME= gnomeprefix gnomehack gnomehier gnomevfs2 gail libgnomeui USE_LIBTOOL_VER=13 +USE_REINPLACE= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS= --enable-shared --enable-static CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/x11-toolkits/eel2/distinfo b/x11-toolkits/eel2/distinfo index 6221e15d7cb1..d799711f4fbf 100644 --- a/x11-toolkits/eel2/distinfo +++ b/x11-toolkits/eel2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/eel-2.4.2.tar.bz2) = 230c0fe2d7a756d65b2af6c5accfef88 -SIZE (gnome2/eel-2.4.2.tar.bz2) = 496160 +MD5 (gnome2/eel-2.6.0.tar.bz2) = a5e51e028011a7b92ccc30d0a86aa6bb +SIZE (gnome2/eel-2.6.0.tar.bz2) = 552049 diff --git a/x11-toolkits/eel2/pkg-descr b/x11-toolkits/eel2/pkg-descr index 9f0aeb752fda..4b91eb9d0da3 100644 --- a/x11-toolkits/eel2/pkg-descr +++ b/x11-toolkits/eel2/pkg-descr @@ -1,10 +1,7 @@ -The eel library contains a number of generally useful classes and functions. -Many of them are extensions to things in glib, gtk, gnome-libs, and other -widely-used GNOME platform libraries. The long term plan is to move much of -this into the platform libraries themselves. +The eel library contains a number of useful classes and functions which +extend glib, gtk, gnome-libs, and other widely-used GNOME platform libraries. -Almost all of the eel library was previously part of Nautilus, in the -"libnautilus-extensions" private library in Nautilus 1.0 - 1.0.2. It is now -a separate package so it can be used by packages other than Nautilus. +Almost all of the eel library was previously part of Nautilus, but is now +a separate package so it can be used by other applications. WWW: http://www.gnome.org/ diff --git a/x11-toolkits/eel2/pkg-plist b/x11-toolkits/eel2/pkg-plist index c053ca9c887f..f089f11c5b22 100644 --- a/x11-toolkits/eel2/pkg-plist +++ b/x11-toolkits/eel2/pkg-plist @@ -1,4 +1,5 @@ include/eel-2/eel/eel-accessibility.h +include/eel-2/eel/eel-alert-dialog.h include/eel-2/eel/eel-art-extensions.h include/eel-2/eel/eel-art-gtk-extensions.h include/eel-2/eel/eel-background-box.h @@ -6,7 +7,6 @@ include/eel-2/eel/eel-background.h include/eel-2/eel/eel-canvas-rect-ellipse.h include/eel-2/eel/eel-canvas-util.h include/eel-2/eel/eel-canvas.h -include/eel-2/eel/eel-caption.h include/eel-2/eel/eel-cell-renderer-pixbuf-list.h include/eel-2/eel/eel-dateedit-extensions.h include/eel-2/eel/eel-debug-drawing.h @@ -18,7 +18,6 @@ include/eel-2/eel/eel-features.h include/eel-2/eel/eel-gconf-extensions.h include/eel-2/eel/eel-gdk-extensions.h include/eel-2/eel/eel-gdk-pixbuf-extensions.h -include/eel-2/eel/eel-generous-bin.h include/eel-2/eel/eel-glib-extensions.h include/eel-2/eel/eel-gnome-extensions.h include/eel-2/eel/eel-graphic-effects.h @@ -26,19 +25,15 @@ include/eel-2/eel/eel-gtk-container.h include/eel-2/eel/eel-gtk-extensions.h include/eel-2/eel/eel-gtk-macros.h include/eel-2/eel/eel-i18n.h -include/eel-2/eel/eel-image-chooser.h include/eel-2/eel/eel-image-table.h -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-preferences-glade.h include/eel-2/eel/eel-preferences.h -include/eel-2/eel/eel-radio-button-group.h include/eel-2/eel/eel-self-checks.h include/eel-2/eel/eel-stock-dialogs.h include/eel-2/eel/eel-string-list.h -include/eel-2/eel/eel-string-picker.h include/eel-2/eel/eel-string.h include/eel-2/eel/eel-type-builtins.h include/eel-2/eel/eel-types.h @@ -48,7 +43,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.6 +lib/libeel-2.so.8 libdata/pkgconfig/eel-2.0.pc share/locale/am/LC_MESSAGES/eel-2.0.mo share/locale/ar/LC_MESSAGES/eel-2.0.mo @@ -64,6 +59,7 @@ 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 +share/locale/en_CA/LC_MESSAGES/eel-2.0.mo share/locale/en_GB/LC_MESSAGES/eel-2.0.mo share/locale/es/LC_MESSAGES/eel-2.0.mo share/locale/et/LC_MESSAGES/eel-2.0.mo @@ -75,6 +71,7 @@ share/locale/ga/LC_MESSAGES/eel-2.0.mo share/locale/gl/LC_MESSAGES/eel-2.0.mo share/locale/he/LC_MESSAGES/eel-2.0.mo share/locale/hi/LC_MESSAGES/eel-2.0.mo +share/locale/hr/LC_MESSAGES/eel-2.0.mo share/locale/hu/LC_MESSAGES/eel-2.0.mo share/locale/id/LC_MESSAGES/eel-2.0.mo share/locale/is/LC_MESSAGES/eel-2.0.mo @@ -94,6 +91,7 @@ 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 +share/locale/pa/LC_MESSAGES/eel-2.0.mo share/locale/pl/LC_MESSAGES/eel-2.0.mo share/locale/pt/LC_MESSAGES/eel-2.0.mo share/locale/pt_BR/LC_MESSAGES/eel-2.0.mo diff --git a/x11-toolkits/gnome-themes/Makefile b/x11-toolkits/gnome-themes/Makefile index c4e6ffbabcf0..9c40ebfcd0f7 100644 --- a/x11-toolkits/gnome-themes/Makefile +++ b/x11-toolkits/gnome-themes/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnome-themes -PORTVERSION= 2.4.1 -PORTREVISION= 2 +PORTVERSION= 2.6.0 CATEGORIES= x11-toolkits gnome 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 @@ -23,10 +22,12 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_REINPLACE= yes USE_LIBTOOL_VER=13 -USE_GNOME= gnomehack metacity libgnomeui +USE_GNOME= gnomehack lthack metacity libgnomeui CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +PLIST_SUB= GTK_VERSION="2.4.0" + post-patch: @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ 's|noinst_PROGRAMS = |noinst_PROGRAMS = #|g' diff --git a/x11-toolkits/gnome-themes/distinfo b/x11-toolkits/gnome-themes/distinfo index 38b749dccb7d..34aec8dc8691 100644 --- a/x11-toolkits/gnome-themes/distinfo +++ b/x11-toolkits/gnome-themes/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-themes-2.4.1.tar.bz2) = 304237994a5bdd8b89628f4387cd0d10 -SIZE (gnome2/gnome-themes-2.4.1.tar.bz2) = 2485378 +MD5 (gnome2/gnome-themes-2.6.0.tar.bz2) = 17817f602713b9ac8ebaff9a7f0cb996 +SIZE (gnome2/gnome-themes-2.6.0.tar.bz2) = 2597765 diff --git a/x11-toolkits/gnome-themes/files/patch-configure b/x11-toolkits/gnome-themes/files/patch-configure deleted file mode 100644 index 3a3c068040c5..000000000000 --- a/x11-toolkits/gnome-themes/files/patch-configure +++ /dev/null @@ -1,10 +0,0 @@ ---- 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" -+$ac_aux_dir/ltconfig $LIBTOOL_DEPS - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' diff --git a/x11-toolkits/gnome-themes/files/patch-metacity-themes_Makefile.in b/x11-toolkits/gnome-themes/files/patch-metacity-themes_Makefile.in index 02365472fd62..090c18883e26 100644 --- a/x11-toolkits/gnome-themes/files/patch-metacity-themes_Makefile.in +++ b/x11-toolkits/gnome-themes/files/patch-metacity-themes_Makefile.in @@ -1,6 +1,6 @@ ---- metacity-themes/Makefile.in.orig Mon Feb 3 20:16:59 2003 -+++ metacity-themes/Makefile.in Mon Feb 3 20:17:33 2003 -@@ -120,7 +120,7 @@ +--- metacity-themes/Makefile.in.orig Tue Dec 9 22:11:42 2003 ++++ metacity-themes/Makefile.in Tue Dec 9 22:12:00 2003 +@@ -122,7 +122,7 @@ THEMES = Mist Sandwish Smokey diff --git a/x11-toolkits/gnome-themes/pkg-descr b/x11-toolkits/gnome-themes/pkg-descr index f3fa6135cc4b..333388e7853d 100644 --- a/x11-toolkits/gnome-themes/pkg-descr +++ b/x11-toolkits/gnome-themes/pkg-descr @@ -1,2 +1,2 @@ -New package of default themes for GNOME, which currently includes GTK+ and -icon themes designed for accessibility. +A collection of themes for metacity and Gtk, and some basic icon +sets. diff --git a/x11-toolkits/gnome-themes/pkg-plist b/x11-toolkits/gnome-themes/pkg-plist index 2b7248fd0106..a2e046b7ac75 100644 --- a/x11-toolkits/gnome-themes/pkg-plist +++ b/x11-toolkits/gnome-themes/pkg-plist @@ -1,8 +1,8 @@ -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 +lib/gtk-2.0/%%GTK_VERSION%%/engines/libcrux-engine.so +lib/gtk-2.0/%%GTK_VERSION%%/engines/libhcengine.so +lib/gtk-2.0/%%GTK_VERSION%%/engines/liblighthouseblue.so +lib/gtk-2.0/%%GTK_VERSION%%/engines/libmist.so +lib/gtk-2.0/%%GTK_VERSION%%/engines/libthinice.so share/eazel-engine/arrow_down-spinner.png share/eazel-engine/arrow_down.png share/eazel-engine/arrow_left.png @@ -241,13 +241,14 @@ share/icons/Flat-Blue/scalable/emblems/emblem-urgent.svg share/icons/HighContrast/index.theme share/icons/HighContrastInverse/index.theme share/icons/HighContrastLargePrint/48x48/apps/accessibility-directory.png -share/icons/HighContrastLargePrint/48x48/apps/accessibility-keyboard-capplet.png share/icons/HighContrastLargePrint/48x48/apps/advanced-directory.png -share/icons/HighContrastLargePrint/48x48/apps/background-capplet.png -share/icons/HighContrastLargePrint/48x48/apps/behavior-capplet.png +share/icons/HighContrastLargePrint/48x48/apps/ax-applet.png share/icons/HighContrastLargePrint/48x48/apps/charpick.png -share/icons/HighContrastLargePrint/48x48/apps/default-applications-capplet.png -share/icons/HighContrastLargePrint/48x48/apps/font-capplet.png +share/icons/HighContrastLargePrint/48x48/apps/display-capplet.png +share/icons/HighContrastLargePrint/48x48/apps/file-manager.png +share/icons/HighContrastLargePrint/48x48/apps/file-roller.png +share/icons/HighContrastLargePrint/48x48/apps/gcalctool.png +share/icons/HighContrastLargePrint/48x48/apps/gdict.png share/icons/HighContrastLargePrint/48x48/apps/gedit-icon.png share/icons/HighContrastLargePrint/48x48/apps/gkb.png share/icons/HighContrastLargePrint/48x48/apps/gnome-applications.png @@ -255,7 +256,6 @@ share/icons/HighContrastLargePrint/48x48/apps/gnome-audio2.png share/icons/HighContrastLargePrint/48x48/apps/gnome-calc3.png share/icons/HighContrastLargePrint/48x48/apps/gnome-ccmime.png share/icons/HighContrastLargePrint/48x48/apps/gnome-ccscreensaver.png -share/icons/HighContrastLargePrint/48x48/apps/gnome-ccthemes.png share/icons/HighContrastLargePrint/48x48/apps/gnome-cd.png share/icons/HighContrastLargePrint/48x48/apps/gnome-cdplayer-icon.png share/icons/HighContrastLargePrint/48x48/apps/gnome-character-map.png @@ -273,29 +273,44 @@ share/icons/HighContrastLargePrint/48x48/apps/gnome-joystick.png share/icons/HighContrastLargePrint/48x48/apps/gnome-log.png share/icons/HighContrastLargePrint/48x48/apps/gnome-logo-icon-transparent.png share/icons/HighContrastLargePrint/48x48/apps/gnome-mailcheck.png +share/icons/HighContrastLargePrint/48x48/apps/gnome-main-menu.png share/icons/HighContrastLargePrint/48x48/apps/gnome-mini-commander.png share/icons/HighContrastLargePrint/48x48/apps/gnome-mixer-applet.png +share/icons/HighContrastLargePrint/48x48/apps/gnome-mixer.png share/icons/HighContrastLargePrint/48x48/apps/gnome-multimedia.png share/icons/HighContrastLargePrint/48x48/apps/gnome-panel.png share/icons/HighContrastLargePrint/48x48/apps/gnome-session.png +share/icons/HighContrastLargePrint/48x48/apps/gnome-settings-accessibility-keyboard.png +share/icons/HighContrastLargePrint/48x48/apps/gnome-settings-accessibility-technologies.png +share/icons/HighContrastLargePrint/48x48/apps/gnome-settings-background.png +share/icons/HighContrastLargePrint/48x48/apps/gnome-settings-default-applications.png +share/icons/HighContrastLargePrint/48x48/apps/gnome-settings-font.png +share/icons/HighContrastLargePrint/48x48/apps/gnome-settings-keybindings.png +share/icons/HighContrastLargePrint/48x48/apps/gnome-settings-sound.png +share/icons/HighContrastLargePrint/48x48/apps/gnome-settings-theme.png +share/icons/HighContrastLargePrint/48x48/apps/gnome-settings-ui-behavior.png share/icons/HighContrastLargePrint/48x48/apps/gnome-settings.png share/icons/HighContrastLargePrint/48x48/apps/gnome-starthere.png share/icons/HighContrastLargePrint/48x48/apps/gnome-system.png share/icons/HighContrastLargePrint/48x48/apps/gnome-terminal.png share/icons/HighContrastLargePrint/48x48/apps/gnome-util.png +share/icons/HighContrastLargePrint/48x48/apps/gnome-window-manager.png share/icons/HighContrastLargePrint/48x48/apps/gnome-windows.png share/icons/HighContrastLargePrint/48x48/apps/gnome-workspace.png -share/icons/HighContrastLargePrint/48x48/apps/keyboard-capplet.png -share/icons/HighContrastLargePrint/48x48/apps/keyboard-shortcut.png +share/icons/HighContrastLargePrint/48x48/apps/gucharmap.png share/icons/HighContrastLargePrint/48x48/apps/launcher-program.png -share/icons/HighContrastLargePrint/48x48/apps/metacity-properties.png -share/icons/HighContrastLargePrint/48x48/apps/mouse-capplet.png -share/icons/HighContrastLargePrint/48x48/apps/sound-capplet.png +share/icons/HighContrastLargePrint/48x48/apps/perfmeter.png share/icons/HighContrastLargePrint/48x48/apps/window-capplet.png share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-cdrom-audio.png share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-cdrom.png share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-floppy.png +share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-keyboard.png +share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-mouse-optical.png +share/icons/HighContrastLargePrint/48x48/emblems/emblem-important.png share/icons/HighContrastLargePrint/48x48/emblems/emblem-noread.png +share/icons/HighContrastLargePrint/48x48/emblems/emblem-personal.png +share/icons/HighContrastLargePrint/48x48/emblems/emblem-special.png +share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-client.png share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-directory-accept.icon share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-directory-accept.png share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-directory.icon @@ -303,6 +318,7 @@ share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-directory.png share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-executable.png share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-ftp.png share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-home.png +share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-network.png share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-nfs.png share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-regular.png share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-share.png @@ -449,13 +465,13 @@ share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-x-font-afm.png share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-package.png share/icons/HighContrastLargePrint/index.theme share/icons/HighContrastLargePrintInverse/48x48/apps/accessibility-directory.png -share/icons/HighContrastLargePrintInverse/48x48/apps/accessibility-keyboard-capplet.png share/icons/HighContrastLargePrintInverse/48x48/apps/advanced-directory.png -share/icons/HighContrastLargePrintInverse/48x48/apps/background-capplet.png -share/icons/HighContrastLargePrintInverse/48x48/apps/behavior-capplet.png share/icons/HighContrastLargePrintInverse/48x48/apps/charpick.png -share/icons/HighContrastLargePrintInverse/48x48/apps/default-applications-capplet.png -share/icons/HighContrastLargePrintInverse/48x48/apps/font-capplet.png +share/icons/HighContrastLargePrintInverse/48x48/apps/display-capplet.png +share/icons/HighContrastLargePrintInverse/48x48/apps/file-manager.png +share/icons/HighContrastLargePrintInverse/48x48/apps/file-roller.png +share/icons/HighContrastLargePrintInverse/48x48/apps/gcalctool.png +share/icons/HighContrastLargePrintInverse/48x48/apps/gdict.png share/icons/HighContrastLargePrintInverse/48x48/apps/gedit-icon.png share/icons/HighContrastLargePrintInverse/48x48/apps/gkb.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-applications.png @@ -463,7 +479,6 @@ share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-audio2.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-calc3.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-ccmime.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-ccscreensaver.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-ccthemes.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-cd.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-cdplayer-icon.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-character-map.png @@ -481,29 +496,44 @@ share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-joystick.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-log.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-logo-icon-transparent.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-mailcheck.png +share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-main-menu.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-mini-commander.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-mixer-applet.png +share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-mixer.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-multimedia.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-panel.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-session.png +share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-accessibility-keyboard.png +share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-accessibility-technologies.png +share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-background.png +share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-default-applications.png +share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-font.png +share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-keybindings.png +share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-sound.png +share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-theme.png +share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-ui-behavior.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-starthere.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-system.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-terminal.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-util.png +share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-window-manager.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-windows.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-workspace.png -share/icons/HighContrastLargePrintInverse/48x48/apps/keyboard-capplet.png -share/icons/HighContrastLargePrintInverse/48x48/apps/keyboard-shortcut.png +share/icons/HighContrastLargePrintInverse/48x48/apps/gucharmap.png share/icons/HighContrastLargePrintInverse/48x48/apps/launcher-program.png -share/icons/HighContrastLargePrintInverse/48x48/apps/metacity-properties.png -share/icons/HighContrastLargePrintInverse/48x48/apps/mouse-capplet.png -share/icons/HighContrastLargePrintInverse/48x48/apps/sound-capplet.png +share/icons/HighContrastLargePrintInverse/48x48/apps/perfmeter.png share/icons/HighContrastLargePrintInverse/48x48/apps/window-capplet.png share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-cdrom-audio.png share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-cdrom.png share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-floppy.png +share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-keyboard.png +share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-mouse-optical.png +share/icons/HighContrastLargePrintInverse/48x48/emblems/emblem-important.png share/icons/HighContrastLargePrintInverse/48x48/emblems/emblem-noread.png +share/icons/HighContrastLargePrintInverse/48x48/emblems/emblem-personal.png +share/icons/HighContrastLargePrintInverse/48x48/emblems/emblem-special.png +share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-client.png share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-directory-accept.icon share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-directory-accept.png share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-directory.icon @@ -511,6 +541,7 @@ share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-directory.p share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-executable.png share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-ftp.png share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-home.png +share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-network.png share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-nfs.png share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-regular.png share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-share.png @@ -659,13 +690,14 @@ share/icons/HighContrastLargePrintInverse/index.theme share/icons/LargePrint/index.theme share/icons/LowContrast/index.theme share/icons/LowContrastLargePrint/48x48/apps/accessibility-directory.png -share/icons/LowContrastLargePrint/48x48/apps/accessibility-keyboard-capplet.png share/icons/LowContrastLargePrint/48x48/apps/advanced-directory.png -share/icons/LowContrastLargePrint/48x48/apps/background-capplet.png -share/icons/LowContrastLargePrint/48x48/apps/behavior-capplet.png +share/icons/LowContrastLargePrint/48x48/apps/ax-applet.png share/icons/LowContrastLargePrint/48x48/apps/charpick.png -share/icons/LowContrastLargePrint/48x48/apps/default-applications-capplet.png -share/icons/LowContrastLargePrint/48x48/apps/font-capplet.png +share/icons/LowContrastLargePrint/48x48/apps/display-capplet.png +share/icons/LowContrastLargePrint/48x48/apps/file-manager.png +share/icons/LowContrastLargePrint/48x48/apps/file-roller.png +share/icons/LowContrastLargePrint/48x48/apps/gcalctool.png +share/icons/LowContrastLargePrint/48x48/apps/gdict.png share/icons/LowContrastLargePrint/48x48/apps/gedit-icon.png share/icons/LowContrastLargePrint/48x48/apps/gkb.png share/icons/LowContrastLargePrint/48x48/apps/gnome-applications.png @@ -673,7 +705,6 @@ share/icons/LowContrastLargePrint/48x48/apps/gnome-audio2.png share/icons/LowContrastLargePrint/48x48/apps/gnome-calc3.png share/icons/LowContrastLargePrint/48x48/apps/gnome-ccmime.png share/icons/LowContrastLargePrint/48x48/apps/gnome-ccscreensaver.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-ccthemes.png share/icons/LowContrastLargePrint/48x48/apps/gnome-cd.png share/icons/LowContrastLargePrint/48x48/apps/gnome-cdplayer-icon.png share/icons/LowContrastLargePrint/48x48/apps/gnome-character-map.png @@ -691,24 +722,33 @@ share/icons/LowContrastLargePrint/48x48/apps/gnome-joystick.png share/icons/LowContrastLargePrint/48x48/apps/gnome-log.png share/icons/LowContrastLargePrint/48x48/apps/gnome-logo-icon-transparent.png share/icons/LowContrastLargePrint/48x48/apps/gnome-mailcheck.png +share/icons/LowContrastLargePrint/48x48/apps/gnome-main-menu.png share/icons/LowContrastLargePrint/48x48/apps/gnome-mini-commander.png share/icons/LowContrastLargePrint/48x48/apps/gnome-mixer-applet.png +share/icons/LowContrastLargePrint/48x48/apps/gnome-mixer.png share/icons/LowContrastLargePrint/48x48/apps/gnome-multimedia.png share/icons/LowContrastLargePrint/48x48/apps/gnome-panel.png share/icons/LowContrastLargePrint/48x48/apps/gnome-session.png +share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-accessibility-keyboard.png +share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-accessibility-technologies.png +share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-background.png +share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-default-applications.png +share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-font.png +share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-keybindings.png +share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-sound.png +share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-theme.png +share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-ui-behavior.png share/icons/LowContrastLargePrint/48x48/apps/gnome-settings.png share/icons/LowContrastLargePrint/48x48/apps/gnome-starthere.png share/icons/LowContrastLargePrint/48x48/apps/gnome-system.png share/icons/LowContrastLargePrint/48x48/apps/gnome-terminal.png share/icons/LowContrastLargePrint/48x48/apps/gnome-util.png +share/icons/LowContrastLargePrint/48x48/apps/gnome-window-manager.png share/icons/LowContrastLargePrint/48x48/apps/gnome-windows.png share/icons/LowContrastLargePrint/48x48/apps/gnome-workspace.png -share/icons/LowContrastLargePrint/48x48/apps/keyboard-capplet.png -share/icons/LowContrastLargePrint/48x48/apps/keyboard-shortcut.png +share/icons/LowContrastLargePrint/48x48/apps/gucharmap.png share/icons/LowContrastLargePrint/48x48/apps/launcher-program.png -share/icons/LowContrastLargePrint/48x48/apps/metacity-properties.png -share/icons/LowContrastLargePrint/48x48/apps/mouse-capplet.png -share/icons/LowContrastLargePrint/48x48/apps/sound-capplet.png +share/icons/LowContrastLargePrint/48x48/apps/perfmeter.png share/icons/LowContrastLargePrint/48x48/apps/window-capplet.png share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-cdrom-audio.png share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-cdrom.png @@ -716,7 +756,9 @@ share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-dvd.png share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-floppy.png share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-harddisk.png share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-jazdisk.png +share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-keyboard.png share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-memory.png +share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-mouse-optical.png share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-zipdisk.png share/icons/LowContrastLargePrint/48x48/emblems/emblem-art.png share/icons/LowContrastLargePrint/48x48/emblems/emblem-camera.png @@ -734,6 +776,7 @@ share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-blockdev.png share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-bookmark-missing.png share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-bookmark.png share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-chardev.png +share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-client.png share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-directory-accept.icon share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-directory-accept.png share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-directory.icon @@ -743,6 +786,7 @@ share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-fifo.png share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-ftp.png share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-home.png share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-loading-icon.png +share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-network.png share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-nfs.png share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-regular.icon share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-regular.png @@ -926,6 +970,7 @@ share/icons/Smokey-Red/48x48/filesystems/gnome-fs-trash-full-accept.png share/icons/Smokey-Red/48x48/filesystems/gnome-fs-trash-full.png share/icons/Smokey-Red/index.theme share/locale/am/LC_MESSAGES/gnome-themes.mo +share/locale/ar/LC_MESSAGES/gnome-themes.mo share/locale/az/LC_MESSAGES/gnome-themes.mo share/locale/be/LC_MESSAGES/gnome-themes.mo share/locale/bg/LC_MESSAGES/gnome-themes.mo @@ -936,6 +981,8 @@ 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 +share/locale/en_CA/LC_MESSAGES/gnome-themes.mo +share/locale/en_GB/LC_MESSAGES/gnome-themes.mo share/locale/es/LC_MESSAGES/gnome-themes.mo share/locale/et/LC_MESSAGES/gnome-themes.mo share/locale/eu/LC_MESSAGES/gnome-themes.mo @@ -945,6 +992,7 @@ 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/hr/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 @@ -971,7 +1019,6 @@ share/locale/sq/LC_MESSAGES/gnome-themes.mo share/locale/sr/LC_MESSAGES/gnome-themes.mo share/locale/sr@Latn/LC_MESSAGES/gnome-themes.mo share/locale/sv/LC_MESSAGES/gnome-themes.mo -share/locale/ta/LC_MESSAGES/gnome-themes.mo share/locale/th/LC_MESSAGES/gnome-themes.mo share/locale/tr/LC_MESSAGES/gnome-themes.mo share/locale/uk/LC_MESSAGES/gnome-themes.mo @@ -1023,7 +1070,7 @@ share/themes/HighContrast/index.theme share/themes/HighContrastInverse/gtk-2.0/gtkrc share/themes/HighContrastInverse/index.theme share/themes/HighContrastLargePrint/gtk-2.0/gtkrc -share/themes/HighContrastLargePrint/index.theme~ +share/themes/HighContrastLargePrint/index.theme.disabled share/themes/HighContrastLargePrint/pixmaps/double-click-maybe.png share/themes/HighContrastLargePrint/pixmaps/double-click-off.png share/themes/HighContrastLargePrint/pixmaps/double-click-on.png @@ -1157,7 +1204,7 @@ share/themes/HighContrastLargePrint/pixmaps/volume-min.png share/themes/HighContrastLargePrint/pixmaps/volume-mute.png share/themes/HighContrastLargePrint/pixmaps/volume-zero.png share/themes/HighContrastLargePrintInverse/gtk-2.0/gtkrc -share/themes/HighContrastLargePrintInverse/index.theme~ +share/themes/HighContrastLargePrintInverse/index.theme.disabled share/themes/HighContrastLargePrintInverse/pixmaps/double-click-maybe.png share/themes/HighContrastLargePrintInverse/pixmaps/double-click-off.png share/themes/HighContrastLargePrintInverse/pixmaps/double-click-on.png @@ -1426,9 +1473,9 @@ share/themes/LargePrint/pixmaps/volume-mute.png share/themes/LargePrint/pixmaps/volume-zero.png share/themes/LighthouseBlue/gtk-2.0/gtkrc share/themes/LowContrast/gtk-2.0/gtkrc -share/themes/LowContrast/index.theme~ +share/themes/LowContrast/index.theme.disabled share/themes/LowContrastLargePrint/gtk-2.0/gtkrc -share/themes/LowContrastLargePrint/index.theme~ +share/themes/LowContrastLargePrint/index.theme.disabled share/themes/LowContrastLargePrint/pixmaps/double-click-maybe.png share/themes/LowContrastLargePrint/pixmaps/double-click-off.png share/themes/LowContrastLargePrint/pixmaps/double-click-on.png diff --git a/x11-toolkits/gtk-engines2/Makefile b/x11-toolkits/gtk-engines2/Makefile index dbde4b8854eb..3566b9685b3b 100644 --- a/x11-toolkits/gtk-engines2/Makefile +++ b/x11-toolkits/gtk-engines2/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtk-engines2 PORTVERSION= 2.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.2 @@ -21,7 +21,7 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_LIBTOOL_VER=13 USE_GNOME= gnomehack gtk20 -PLIST_SUB= VERSION=2.2.0 +PLIST_SUB= GTK_VERSION="2.4.0" THEMES= metal redmond95 diff --git a/x11-toolkits/gtk-engines2/pkg-plist b/x11-toolkits/gtk-engines2/pkg-plist index 39f05f6c3a84..fb60fd7a4cfe 100644 --- a/x11-toolkits/gtk-engines2/pkg-plist +++ b/x11-toolkits/gtk-engines2/pkg-plist @@ -1,6 +1,6 @@ -lib/gtk-2.0/%%VERSION%%/engines/libmetal.so -lib/gtk-2.0/%%VERSION%%/engines/libpixmap.so -lib/gtk-2.0/%%VERSION%%/engines/libredmond95.so +lib/gtk-2.0/%%GTK_VERSION%%/engines/libmetal.so +lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.so +lib/gtk-2.0/%%GTK_VERSION%%/engines/libredmond95.so libdata/pkgconfig/gtk-engines-2.pc share/themes/Metal/README.html share/themes/Metal/gtk-2.0/gtkrc @@ -8,6 +8,6 @@ share/themes/Redmond95/README.html share/themes/Redmond95/gtk-2.0/gtkrc @dirrm share/themes/Redmond95/gtk-2.0 @dirrm share/themes/Metal/gtk-2.0 -@dirrm lib/gtk-2.0/%%VERSION%%/engines +@dirrm lib/gtk-2.0/%%GTK_VERSION%%/engines @unexec /bin/rmdir %D/share/themes/Redmond95 2>/dev/null || /usr/bin/true @unexec /bin/rmdir %D/share/themes/Metal 2>/dev/null || /usr/bin/true diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index e5462e44ed34..edebf8982175 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gtk -PORTVERSION= 2.2.4 -PORTREVISION= 2 +PORTVERSION= 2.4.0 CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.2,} \ - ftp://ftp.gtk.org/pub/gtk/v2.2/ \ +MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.4,} \ + ftp://ftp.gtk.org/pub/gtk/v2.3/ \ ftp://ftp.gimp.org/pub/%SUBDIR%/ \ ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \ http://www.ameth.org/gimp/%SUBDIR%/ \ @@ -20,19 +19,14 @@ MASTER_SITE_SUBDIR= gtk/v${PORTVERSION:R} DISTNAME= gtk+-${PORTVERSION} DIST_SUBDIR= gnome2 -.if defined(WITH_DROPSHADOW) -PATCH_SITES= ${MASTER_SITE_SOURCEFORGE} -PATCH_SITE_SUBDIR= xfce -PATCHFILES= gtk+-menushadow.patch -PATCH_DIST_STRIP= -p1 -.endif - MAINTAINER= gnome@FreeBSD.org COMMENT= Gimp Toolkit for X11 GUI (current stable version) LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ jpeg.9:${PORTSDIR}/graphics/jpeg +RUN_DEPENDS= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \ + ${X11BASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme USE_BZIP2= yes LATEST_LINK= gtk20 @@ -41,33 +35,23 @@ USE_XPM= yes USE_REINPLACE= yes USE_PERL5= yes INSTALLS_SHLIB= yes -USE_LIBTOOL_VER=13 +GNU_CONFIGURE= yes USE_GNOME= gnomehack atk pango CONFIGURE_ARGS= --enable-static --with-xinput=yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \ -I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" -PLIST_SUB= GTK_VERSION="2.2.0" - -MAN1= gdk-pixbuf-csource.1 - -pre-everything:: -.if !defined(WITH_DROPSHADOW) - @${ECHO_MSG} - @${ECHO_MSG} "If you want to compile with experimental menu dropshadow patch, - @${ECHO_MSG} "hit Ctrl-C right now and use make \"WITH_DROPSHADOW=yes\"" - @${ECHO_MSG} "NOTE: This option is not supported by FreeBSD GNOME Team." - @${ECHO_MSG} "Please, don't bug us if it doesn't work or build broken." - @${ECHO_MSG} -.endif +PLIST_SUB= GTK_VERSION="2.4.0" post-patch: @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${GREP} -l lgmodule | \ ${XARGS} ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g' @${REINPLACE_CMD} -e 's|[{]libdir[}]/locale|{datadir}/locale|g' \ ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ + ${WRKSRC}/gtk/xdgmime/xdgmime.c pre-build: - ${RM} -rf ${WRKSRC}/docs/gtk.info* + @${RM} -rf ${WRKSRC}/docs/gtk.info* .include <bsd.port.mk> diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo index d327f8a90e90..44f12bfe6a47 100644 --- a/x11-toolkits/gtk20/distinfo +++ b/x11-toolkits/gtk20/distinfo @@ -1,4 +1,2 @@ -MD5 (gnome2/gtk+-2.2.4.tar.bz2) = 605332199533e73bc6eec481fb4f1671 -SIZE (gnome2/gtk+-2.2.4.tar.bz2) = 7189272 -MD5 (gnome2/gtk+-menushadow.patch) = 5e02af6c81df2c312c569b40bea129ba -SIZE (gnome2/gtk+-menushadow.patch) = 15970 +MD5 (gnome2/gtk+-2.4.0.tar.bz2) = fd16157de447c7f0a86495ad0dc67a1b +SIZE (gnome2/gtk+-2.4.0.tar.bz2) = 8476610 diff --git a/x11-toolkits/gtk20/files/patch-Makefile.in b/x11-toolkits/gtk20/files/patch-Makefile.in index 85e372a01c60..c47baaab5ef5 100644 --- a/x11-toolkits/gtk20/files/patch-Makefile.in +++ b/x11-toolkits/gtk20/files/patch-Makefile.in @@ -1,14 +1,11 @@ - -$FreeBSD$ - ---- Makefile.in 2002/02/12 13:29:11 1.1 -+++ Makefile.in 2002/02/12 13:29:28 -@@ -168,7 +168,7 @@ - ms_librarian = @ms_librarian@ - xinput_progs = @xinput_progs@ +--- Makefile.in.orig Thu Jan 22 19:40:10 2004 ++++ Makefile.in Thu Jan 22 19:40:52 2004 +@@ -286,7 +286,7 @@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ -SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests contrib -+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules contrib - SUBDIRS = po $(SRC_SUBDIRS) docs build m4macros ++SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos contrib + SUBDIRS = po po-properties $(SRC_SUBDIRS) docs build m4macros # require automake 1.4 diff --git a/x11-toolkits/gtk20/files/patch-ae b/x11-toolkits/gtk20/files/patch-ae deleted file mode 100644 index b1750b724600..000000000000 --- a/x11-toolkits/gtk20/files/patch-ae +++ /dev/null @@ -1,20 +0,0 @@ ---- configure.orig Thu Sep 4 13:17:19 2003 -+++ configure Tue Mar 16 17:14:34 2004 -@@ -18367,6 +18367,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' -@@ -24746,7 +24747,8 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --#include <freetype/freetype.h> -+#include <ft2build.h> -+#include FT_FREETYPE_H - #include FT_ERRORS_H - - int diff --git a/x11-toolkits/gtk20/files/patch-ag b/x11-toolkits/gtk20/files/patch-ag index c4879a292522..b34d2b3f24b6 100644 --- a/x11-toolkits/gtk20/files/patch-ag +++ b/x11-toolkits/gtk20/files/patch-ag @@ -1,19 +1,19 @@ ---- gtk/Makefile.in.orig Sat May 3 02:43:20 2003 -+++ gtk/Makefile.in Sat May 3 02:46:30 2003 -@@ -175,7 +175,7 @@ - -DG_LOG_DOMAIN=\"Gtk\" \ +--- gtk/Makefile.in.orig Fri Oct 24 21:45:12 2003 ++++ gtk/Makefile.in Fri Oct 24 21:46:49 2003 +@@ -301,7 +301,7 @@ -DGTK_LIBDIR=\"$(libdir)\" \ + -DGTK_DATADIR=\"$(datadir)\" \ -DGTK_DATA_PREFIX=\"$(prefix)\" \ - -DGTK_SYSCONFDIR=\"$(sysconfdir)\" \ -+ -DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\" \ - -DGTK_VERSION=\"@GTK_VERSION@\" \ - -DGTK_BINARY_VERSION=\"@GTK_BINARY_VERSION@\" \ - -DGTK_HOST=\"@host@\" \ -@@ -651,6 +651,7 @@ ++ -DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\" \ + -DGTK_VERSION=\"$(GTK_VERSION)\" \ + -DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\" \ + -DGTK_HOST=\"$(host)\" \ +@@ -856,6 +856,7 @@ TEST_DEPS = $(DEPS) gtk.immodules - LDADDS = @STRIP_BEGIN@ \ + LDADDS = \ + $(GLIB_LIBS) \ $(gtktargetlib) \ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ - $(top_builddir)/gdk/$(gdktargetlib) \ + $(top_builddir)/gdk/$(gdktargetlib) diff --git a/x11-toolkits/gtk20/files/patch-ah b/x11-toolkits/gtk20/files/patch-ah index 32c2663f049f..88bfe209d8ae 100644 --- a/x11-toolkits/gtk20/files/patch-ah +++ b/x11-toolkits/gtk20/files/patch-ah @@ -1,14 +1,11 @@ - -$FreeBSD$ - ---- docs/Makefile.in.orig Wed Oct 24 10:33:45 2001 -+++ docs/Makefile.in Wed Oct 24 10:33:46 2001 -@@ -136,7 +136,7 @@ - LT_RELEASE = @LT_RELEASE@ - LT_REVISION = @LT_REVISION@ +--- docs/Makefile.in.orig Fri Oct 24 21:47:52 2003 ++++ docs/Makefile.in Fri Oct 24 23:35:09 2003 +@@ -179,7 +179,7 @@ MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ + MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ -MAKEINFO = @MAKEINFO@ +MAKEINFO = @MAKEINFO@ --no-split MKINSTALLDIRS = @MKINSTALLDIRS@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ + MSGFMT = @MSGFMT@ + MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ diff --git a/x11-toolkits/gtk20/files/patch-ai b/x11-toolkits/gtk20/files/patch-ai index a128c58ffe80..a04d08ef58b3 100644 --- a/x11-toolkits/gtk20/files/patch-ai +++ b/x11-toolkits/gtk20/files/patch-ai @@ -1,11 +1,11 @@ ---- docs/reference/Makefile.in.orig Sat Nov 18 03:17:56 2000 -+++ docs/reference/Makefile.in Mon Nov 20 15:33:25 2000 -@@ -160,7 +160,7 @@ - x_libs = @x_libs@ - xinput_progs = @xinput_progs@ +--- docs/reference/Makefile.in.orig Fri Oct 24 23:38:06 2003 ++++ docs/reference/Makefile.in Fri Oct 24 23:48:00 2003 +@@ -286,7 +286,7 @@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ -SUBDIRS = gdk-pixbuf gdk gtk -+SUBDIRS = ++SUBDIRS = #gdk-pixbuf gdk gtk + subdir = docs/reference mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../config.h - CONFIG_CLEAN_FILES = + CONFIG_HEADER = $(top_builddir)/config.h diff --git a/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in b/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in index fa3e1270f1b2..c2cb10b5478c 100644 --- a/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in +++ b/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in @@ -1,6 +1,6 @@ ---- gdk-pixbuf/Makefile.in.orig Sat May 3 02:51:31 2003 -+++ gdk-pixbuf/Makefile.in Sat May 3 02:51:59 2003 -@@ -384,7 +384,9 @@ +--- gdk-pixbuf/Makefile.in.orig Thu Nov 20 15:39:55 2003 ++++ gdk-pixbuf/Makefile.in Thu Nov 20 15:40:17 2003 +@@ -517,7 +517,9 @@ AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\"" diff --git a/x11-toolkits/gtk20/files/patch-gtk_gtkicontheme.c b/x11-toolkits/gtk20/files/patch-gtk_gtkicontheme.c new file mode 100644 index 000000000000..07bb57a6d022 --- /dev/null +++ b/x11-toolkits/gtk20/files/patch-gtk_gtkicontheme.c @@ -0,0 +1,26 @@ +--- gtk/gtkicontheme.c.orig Thu Jan 29 16:53:42 2004 ++++ gtk/gtkicontheme.c Thu Jan 29 16:54:56 2004 +@@ -526,7 +526,7 @@ + + priv->custom_theme = FALSE; + priv->current_theme = g_strdup (DEFAULT_THEME_NAME); +- priv->search_path = g_new (char *, 5); ++ priv->search_path = g_new (char *, 7); + + + priv->search_path[0] = g_build_filename (g_get_home_dir (), +@@ -534,9 +534,11 @@ + NULL); + priv->search_path[1] = g_build_filename (GTK_DATADIR, "pixmaps", NULL); + priv->search_path[2] = g_build_filename (GTK_DATADIR, "icons", NULL); +- priv->search_path[3] = g_strdup ("/usr/share/icons"); +- priv->search_path[4] = g_strdup ("/usr/share/pixmaps"); +- priv->search_path_len = 5; ++ priv->search_path[3] = g_build_filename (GTK_DATADIR, "gnome", "pixmaps", NULL); ++ priv->search_path[4] = g_build_filename (GTK_DATADIR, "gnome", "icons", NULL); ++ priv->search_path[5] = g_strdup ("/usr/share/icons"); ++ priv->search_path[6] = g_strdup ("/usr/share/pixmaps"); ++ priv->search_path_len = 7; + + priv->themes_valid = FALSE; + priv->themes = NULL; diff --git a/x11-toolkits/gtk20/files/patch-ltmain.sh b/x11-toolkits/gtk20/files/patch-ltmain.sh new file mode 100644 index 000000000000..58384ee38d2e --- /dev/null +++ b/x11-toolkits/gtk20/files/patch-ltmain.sh @@ -0,0 +1,51 @@ +--- ltmain.sh.orig Sat Dec 6 14:47:45 2003 ++++ ltmain.sh Tue Dec 9 14:09:01 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/x11-toolkits/gtk20/pkg-descr b/x11-toolkits/gtk20/pkg-descr index 83ab3d952191..8cee4afc7448 100644 --- a/x11-toolkits/gtk20/pkg-descr +++ b/x11-toolkits/gtk20/pkg-descr @@ -1,21 +1,10 @@ - GTK is a library for creating graphical user interfaces similar to -the Motif "look and feel". It is designed to be small and efficient, but -still flexible enough to allow the programmer freedom in the interfaces -created. GTK allows the programmer to use a variety of standard user -interface widgets such as push, radio and check buttons, menus, lists -and frames. It also provides several "container" widgets which can be -used to control the layout of the user interface elements. +The GIMP ToolKit (GTK+) is a collection of GUI widgets. GTK+ +essentially provides the building blocks from which GUIs can be +built. It is highly themable, and its functionality is highly +extensible. - GTK provides some unique features. (At least, I know of no other -widget library which provides them). For example, a button does not -contain a label, it contains a child widget, which in most instances -will be a label. However, the child widget can also be a pixmap, image -or any combination possible the programmer desires. This flexibility is -adhered to throughout the library. - -GTK+-2.0 is a stable release, but many applications still require -GTK+-1.2, the previous stable version. You can have the runtime and -development environments for both GTK+-2.0 and GTK+-1.2 installed -simultaneously on your computer. +GTK+-2 is a very stable release, similar only in design to GTK+-1. +GTK+-2 can coexist happily alongside GTK+-1, but applications are +written for one version or the other. WWW: http://www.gtk.org/ diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist index 07e8ff08f981..5b137af92f90 100644 --- a/x11-toolkits/gtk20/pkg-plist +++ b/x11-toolkits/gtk20/pkg-plist @@ -1,6 +1,7 @@ bin/gdk-pixbuf-csource -bin/gtk-query-immodules-2.0 bin/gdk-pixbuf-query-loaders +bin/gtk-demo +bin/gtk-query-immodules-2.0 etc/gtk-2.0/gdk-pixbuf.loaders etc/gtk-2.0/gtk.immodules include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h @@ -38,6 +39,7 @@ include/gtk-2.0/gdk/gdkregion.h include/gtk-2.0/gdk/gdkrgb.h include/gtk-2.0/gdk/gdkscreen.h include/gtk-2.0/gdk/gdkselection.h +include/gtk-2.0/gdk/gdkspawn.h include/gtk-2.0/gdk/gdktypes.h include/gtk-2.0/gdk/gdkvisual.h include/gtk-2.0/gdk/gdkwindow.h @@ -48,6 +50,8 @@ include/gtk-2.0/gtk/gtkaccelgroup.h include/gtk-2.0/gtk/gtkaccellabel.h include/gtk-2.0/gtk/gtkaccelmap.h include/gtk-2.0/gtk/gtkaccessible.h +include/gtk-2.0/gtk/gtkaction.h +include/gtk-2.0/gtk/gtkactiongroup.h include/gtk-2.0/gtk/gtkadjustment.h include/gtk-2.0/gtk/gtkalignment.h include/gtk-2.0/gtk/gtkarrow.h @@ -59,6 +63,7 @@ include/gtk-2.0/gtk/gtkbox.h include/gtk-2.0/gtk/gtkbutton.h include/gtk-2.0/gtk/gtkcalendar.h include/gtk-2.0/gtk/gtkcelleditable.h +include/gtk-2.0/gtk/gtkcelllayout.h include/gtk-2.0/gtk/gtkcellrenderer.h include/gtk-2.0/gtk/gtkcellrendererpixbuf.h include/gtk-2.0/gtk/gtkcellrenderertext.h @@ -67,9 +72,12 @@ include/gtk-2.0/gtk/gtkcheckbutton.h include/gtk-2.0/gtk/gtkcheckmenuitem.h include/gtk-2.0/gtk/gtkclipboard.h include/gtk-2.0/gtk/gtkclist.h +include/gtk-2.0/gtk/gtkcolorbutton.h include/gtk-2.0/gtk/gtkcolorsel.h include/gtk-2.0/gtk/gtkcolorseldialog.h include/gtk-2.0/gtk/gtkcombo.h +include/gtk-2.0/gtk/gtkcombobox.h +include/gtk-2.0/gtk/gtkcomboboxentry.h include/gtk-2.0/gtk/gtkcontainer.h include/gtk-2.0/gtk/gtkctree.h include/gtk-2.0/gtk/gtkcurve.h @@ -80,9 +88,17 @@ include/gtk-2.0/gtk/gtkdrawingarea.h include/gtk-2.0/gtk/gtkeditable.h include/gtk-2.0/gtk/gtkentry.h include/gtk-2.0/gtk/gtkenums.h +include/gtk-2.0/gtk/gtkentrycompletion.h +include/gtk-2.0/gtk/gtkexpander.h include/gtk-2.0/gtk/gtkeventbox.h +include/gtk-2.0/gtk/gtkfilechooser.h +include/gtk-2.0/gtk/gtkfilechooserdialog.h +include/gtk-2.0/gtk/gtkfilechooserwidget.h +include/gtk-2.0/gtk/gtkfilefilter.h include/gtk-2.0/gtk/gtkfilesel.h +include/gtk-2.0/gtk/gtkfilesystem.h include/gtk-2.0/gtk/gtkfixed.h +include/gtk-2.0/gtk/gtkfontbutton.h include/gtk-2.0/gtk/gtkfontsel.h include/gtk-2.0/gtk/gtkframe.h include/gtk-2.0/gtk/gtkgamma.h @@ -96,6 +112,7 @@ include/gtk-2.0/gtk/gtkhscale.h include/gtk-2.0/gtk/gtkhscrollbar.h include/gtk-2.0/gtk/gtkhseparator.h include/gtk-2.0/gtk/gtkiconfactory.h +include/gtk-2.0/gtk/gtkicontheme.h include/gtk-2.0/gtk/gtkimage.h include/gtk-2.0/gtk/gtkimagemenuitem.h include/gtk-2.0/gtk/gtkimcontext.h @@ -130,8 +147,10 @@ include/gtk-2.0/gtk/gtkpreview.h include/gtk-2.0/gtk/gtkprivate.h include/gtk-2.0/gtk/gtkprogress.h include/gtk-2.0/gtk/gtkprogressbar.h +include/gtk-2.0/gtk/gtkradioaction.h include/gtk-2.0/gtk/gtkradiobutton.h include/gtk-2.0/gtk/gtkradiomenuitem.h +include/gtk-2.0/gtk/gtkradiotoolbutton.h include/gtk-2.0/gtk/gtkrange.h include/gtk-2.0/gtk/gtkrc.h include/gtk-2.0/gtk/gtkruler.h @@ -141,6 +160,7 @@ include/gtk-2.0/gtk/gtkscrolledwindow.h include/gtk-2.0/gtk/gtkselection.h include/gtk-2.0/gtk/gtkseparator.h include/gtk-2.0/gtk/gtkseparatormenuitem.h +include/gtk-2.0/gtk/gtkseparatortoolitem.h include/gtk-2.0/gtk/gtksettings.h include/gtk-2.0/gtk/gtksignal.h include/gtk-2.0/gtk/gtksizegroup.h @@ -162,13 +182,18 @@ include/gtk-2.0/gtk/gtktexttag.h include/gtk-2.0/gtk/gtktexttagtable.h include/gtk-2.0/gtk/gtktextview.h include/gtk-2.0/gtk/gtktipsquery.h +include/gtk-2.0/gtk/gtktoggleaction.h include/gtk-2.0/gtk/gtktogglebutton.h +include/gtk-2.0/gtk/gtktoggletoolbutton.h include/gtk-2.0/gtk/gtktoolbar.h +include/gtk-2.0/gtk/gtktoolbutton.h +include/gtk-2.0/gtk/gtktoolitem.h include/gtk-2.0/gtk/gtktooltips.h include/gtk-2.0/gtk/gtktree.h include/gtk-2.0/gtk/gtktreednd.h include/gtk-2.0/gtk/gtktreeitem.h include/gtk-2.0/gtk/gtktreemodel.h +include/gtk-2.0/gtk/gtktreemodelfilter.h include/gtk-2.0/gtk/gtktreemodelsort.h include/gtk-2.0/gtk/gtktreeselection.h include/gtk-2.0/gtk/gtktreesortable.h @@ -177,6 +202,7 @@ include/gtk-2.0/gtk/gtktreeview.h include/gtk-2.0/gtk/gtktreeviewcolumn.h include/gtk-2.0/gtk/gtktypebuiltins.h include/gtk-2.0/gtk/gtktypeutils.h +include/gtk-2.0/gtk/gtkuimanager.h include/gtk-2.0/gtk/gtkvbbox.h include/gtk-2.0/gtk/gtkvbox.h include/gtk-2.0/gtk/gtkversion.h @@ -193,6 +219,7 @@ lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.so +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pcx.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-png.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pnm.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ras.so @@ -204,7 +231,6 @@ lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.so lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-am-et.so lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cedilla.so lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cyrillic-translit.so -lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-hangul.so lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-inuktitut.so lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.so lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai-broken.so @@ -214,16 +240,16 @@ lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-viqr.so lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-xim.so lib/libgdk-x11-2.0.a lib/libgdk-x11-2.0.so -lib/libgdk-x11-2.0.so.200 +lib/libgdk-x11-2.0.so.400 lib/libgdk_pixbuf-2.0.a lib/libgdk_pixbuf-2.0.so -lib/libgdk_pixbuf-2.0.so.200 +lib/libgdk_pixbuf-2.0.so.400 lib/libgdk_pixbuf_xlib-2.0.a lib/libgdk_pixbuf_xlib-2.0.so -lib/libgdk_pixbuf_xlib-2.0.so.200 +lib/libgdk_pixbuf_xlib-2.0.so.400 lib/libgtk-x11-2.0.a lib/libgtk-x11-2.0.so -lib/libgtk-x11-2.0.so.200 +lib/libgtk-x11-2.0.so.400 libdata/pkgconfig/gdk-2.0.pc libdata/pkgconfig/gdk-pixbuf-2.0.pc libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc @@ -231,64 +257,172 @@ libdata/pkgconfig/gdk-x11-2.0.pc libdata/pkgconfig/gtk+-2.0.pc libdata/pkgconfig/gtk+-x11-2.0.pc share/aclocal/gtk-2.0.m4 +share/gtk-2.0/demo/alphatest.png +share/gtk-2.0/demo/apple-red.png +share/gtk-2.0/demo/appwindow.c +share/gtk-2.0/demo/background.jpg +share/gtk-2.0/demo/button_box.c +share/gtk-2.0/demo/changedisplay.c +share/gtk-2.0/demo/colorsel.c +share/gtk-2.0/demo/dialog.c +share/gtk-2.0/demo/drawingarea.c +share/gtk-2.0/demo/editable_cells.c +share/gtk-2.0/demo/entry_completion.c +share/gtk-2.0/demo/floppybuddy.gif +share/gtk-2.0/demo/gnome-applets.png +share/gtk-2.0/demo/gnome-calendar.png +share/gtk-2.0/demo/gnome-foot.png +share/gtk-2.0/demo/gnome-gimp.png +share/gtk-2.0/demo/gnome-gmush.png +share/gtk-2.0/demo/gnome-gsame.png +share/gtk-2.0/demo/gnu-keys.png +share/gtk-2.0/demo/gtk-logo-rgb.gif +share/gtk-2.0/demo/hypertext.c +share/gtk-2.0/demo/images.c +share/gtk-2.0/demo/list_store.c +share/gtk-2.0/demo/menus.c +share/gtk-2.0/demo/panes.c +share/gtk-2.0/demo/pixbufs.c +share/gtk-2.0/demo/sizegroup.c +share/gtk-2.0/demo/stock_browser.c +share/gtk-2.0/demo/textview.c +share/gtk-2.0/demo/tree_store.c +share/gtk-2.0/demo/ui_manager.c +share/locale/af/LC_MESSAGES/gtk20-properties.mo +share/locale/af/LC_MESSAGES/gtk20.mo +share/locale/am/LC_MESSAGES/gtk20-properties.mo share/locale/am/LC_MESSAGES/gtk20.mo +share/locale/ar/LC_MESSAGES/gtk20-properties.mo share/locale/ar/LC_MESSAGES/gtk20.mo +share/locale/az/LC_MESSAGES/gtk20-properties.mo share/locale/az/LC_MESSAGES/gtk20.mo +share/locale/be/LC_MESSAGES/gtk20-properties.mo share/locale/be/LC_MESSAGES/gtk20.mo +share/locale/bg/LC_MESSAGES/gtk20-properties.mo share/locale/bg/LC_MESSAGES/gtk20.mo +share/locale/bn/LC_MESSAGES/gtk20-properties.mo +share/locale/bn/LC_MESSAGES/gtk20.mo +share/locale/br/LC_MESSAGES/gtk20-properties.mo +share/locale/br/LC_MESSAGES/gtk20.mo +share/locale/ca/LC_MESSAGES/gtk20-properties.mo share/locale/ca/LC_MESSAGES/gtk20.mo +share/locale/cs/LC_MESSAGES/gtk20-properties.mo share/locale/cs/LC_MESSAGES/gtk20.mo +share/locale/cy/LC_MESSAGES/gtk20-properties.mo share/locale/cy/LC_MESSAGES/gtk20.mo +share/locale/da/LC_MESSAGES/gtk20-properties.mo share/locale/da/LC_MESSAGES/gtk20.mo +share/locale/de/LC_MESSAGES/gtk20-properties.mo share/locale/de/LC_MESSAGES/gtk20.mo +share/locale/el/LC_MESSAGES/gtk20-properties.mo share/locale/el/LC_MESSAGES/gtk20.mo +share/locale/en_CA/LC_MESSAGES/gtk20-properties.mo +share/locale/en_CA/LC_MESSAGES/gtk20.mo +share/locale/en_GB/LC_MESSAGES/gtk20-properties.mo share/locale/en_GB/LC_MESSAGES/gtk20.mo +share/locale/es/LC_MESSAGES/gtk20-properties.mo share/locale/es/LC_MESSAGES/gtk20.mo +share/locale/et/LC_MESSAGES/gtk20-properties.mo share/locale/et/LC_MESSAGES/gtk20.mo +share/locale/eu/LC_MESSAGES/gtk20-properties.mo share/locale/eu/LC_MESSAGES/gtk20.mo +share/locale/fa/LC_MESSAGES/gtk20-properties.mo share/locale/fa/LC_MESSAGES/gtk20.mo +share/locale/fi/LC_MESSAGES/gtk20-properties.mo share/locale/fi/LC_MESSAGES/gtk20.mo +share/locale/fr/LC_MESSAGES/gtk20-properties.mo share/locale/fr/LC_MESSAGES/gtk20.mo +share/locale/ga/LC_MESSAGES/gtk20-properties.mo share/locale/ga/LC_MESSAGES/gtk20.mo +share/locale/gl/LC_MESSAGES/gtk20-properties.mo share/locale/gl/LC_MESSAGES/gtk20.mo +share/locale/he/LC_MESSAGES/gtk20-properties.mo share/locale/he/LC_MESSAGES/gtk20.mo +share/locale/hi/LC_MESSAGES/gtk20-properties.mo share/locale/hi/LC_MESSAGES/gtk20.mo +share/locale/hr/LC_MESSAGES/gtk20-properties.mo share/locale/hr/LC_MESSAGES/gtk20.mo +share/locale/hu/LC_MESSAGES/gtk20-properties.mo share/locale/hu/LC_MESSAGES/gtk20.mo +share/locale/ia/LC_MESSAGES/gtk20-properties.mo share/locale/ia/LC_MESSAGES/gtk20.mo +share/locale/id/LC_MESSAGES/gtk20-properties.mo share/locale/id/LC_MESSAGES/gtk20.mo -share/locale/is/LC_MESSAGES/gtk20.mo +share/locale/it/LC_MESSAGES/gtk20-properties.mo share/locale/it/LC_MESSAGES/gtk20.mo +share/locale/ja/LC_MESSAGES/gtk20-properties.mo share/locale/ja/LC_MESSAGES/gtk20.mo +share/locale/ko/LC_MESSAGES/gtk20-properties.mo share/locale/ko/LC_MESSAGES/gtk20.mo +share/locale/li/LC_MESSAGES/gtk20-properties.mo +share/locale/li/LC_MESSAGES/gtk20.mo +share/locale/lt/LC_MESSAGES/gtk20-properties.mo share/locale/lt/LC_MESSAGES/gtk20.mo +share/locale/lv/LC_MESSAGES/gtk20-properties.mo share/locale/lv/LC_MESSAGES/gtk20.mo +share/locale/mi/LC_MESSAGES/gtk20-properties.mo +share/locale/mi/LC_MESSAGES/gtk20.mo +share/locale/mk/LC_MESSAGES/gtk20-properties.mo share/locale/mk/LC_MESSAGES/gtk20.mo +share/locale/ml/LC_MESSAGES/gtk20-properties.mo share/locale/ml/LC_MESSAGES/gtk20.mo +share/locale/mn/LC_MESSAGES/gtk20-properties.mo share/locale/mn/LC_MESSAGES/gtk20.mo +share/locale/ms/LC_MESSAGES/gtk20-properties.mo share/locale/ms/LC_MESSAGES/gtk20.mo +share/locale/ne/LC_MESSAGES/gtk20-properties.mo share/locale/ne/LC_MESSAGES/gtk20.mo +share/locale/nl/LC_MESSAGES/gtk20-properties.mo share/locale/nl/LC_MESSAGES/gtk20.mo +share/locale/nn/LC_MESSAGES/gtk20-properties.mo share/locale/nn/LC_MESSAGES/gtk20.mo +share/locale/no/LC_MESSAGES/gtk20-properties.mo share/locale/no/LC_MESSAGES/gtk20.mo +share/locale/pl/LC_MESSAGES/gtk20-properties.mo share/locale/pl/LC_MESSAGES/gtk20.mo +share/locale/pt/LC_MESSAGES/gtk20-properties.mo share/locale/pt/LC_MESSAGES/gtk20.mo +share/locale/pt_BR/LC_MESSAGES/gtk20-properties.mo share/locale/pt_BR/LC_MESSAGES/gtk20.mo +share/locale/ro/LC_MESSAGES/gtk20-properties.mo share/locale/ro/LC_MESSAGES/gtk20.mo +share/locale/ru/LC_MESSAGES/gtk20-properties.mo share/locale/ru/LC_MESSAGES/gtk20.mo +share/locale/sk/LC_MESSAGES/gtk20-properties.mo share/locale/sk/LC_MESSAGES/gtk20.mo +share/locale/sl/LC_MESSAGES/gtk20-properties.mo share/locale/sl/LC_MESSAGES/gtk20.mo +share/locale/sq/LC_MESSAGES/gtk20-properties.mo +share/locale/sr/LC_MESSAGES/gtk20-properties.mo share/locale/sr/LC_MESSAGES/gtk20.mo +share/locale/sr@Latn/LC_MESSAGES/gtk20-properties.mo share/locale/sr@Latn/LC_MESSAGES/gtk20.mo +share/locale/sr@ije/LC_MESSAGES/gtk20-properties.mo +share/locale/sr@ije/LC_MESSAGES/gtk20.mo share/locale/sq/LC_MESSAGES/gtk20.mo +share/locale/sv/LC_MESSAGES/gtk20-properties.mo share/locale/sv/LC_MESSAGES/gtk20.mo +share/locale/ta/LC_MESSAGES/gtk20-properties.mo share/locale/ta/LC_MESSAGES/gtk20.mo +share/locale/th/LC_MESSAGES/gtk20-properties.mo +share/locale/th/LC_MESSAGES/gtk20.mo +share/locale/tr/LC_MESSAGES/gtk20-properties.mo share/locale/tr/LC_MESSAGES/gtk20.mo +share/locale/uk/LC_MESSAGES/gtk20-properties.mo share/locale/uk/LC_MESSAGES/gtk20.mo +share/locale/uz/LC_MESSAGES/gtk20-properties.mo +share/locale/uz/LC_MESSAGES/gtk20.mo +share/locale/uz@Latn/LC_MESSAGES/gtk20-properties.mo +share/locale/uz@Latn/LC_MESSAGES/gtk20.mo +share/locale/vi/LC_MESSAGES/gtk20-properties.mo share/locale/vi/LC_MESSAGES/gtk20.mo +share/locale/wa/LC_MESSAGES/gtk20-properties.mo share/locale/wa/LC_MESSAGES/gtk20.mo +share/locale/yi/LC_MESSAGES/gtk20-properties.mo share/locale/yi/LC_MESSAGES/gtk20.mo +share/locale/zh_CN/LC_MESSAGES/gtk20-properties.mo share/locale/zh_CN/LC_MESSAGES/gtk20.mo +share/locale/zh_TW/LC_MESSAGES/gtk20-properties.mo share/locale/zh_TW/LC_MESSAGES/gtk20.mo share/themes/Default/gtk-2.0-key/gtkrc share/themes/Default/gtk-2.0/gtkrc @@ -297,6 +431,8 @@ share/themes/Emacs/gtk-2.0-key/gtkrc @dirrm share/themes/Emacs @dirrm share/themes/Default/gtk-2.0-key @dirrm share/themes/Default/gtk-2.0 +@dirrm share/gtk-2.0/demo +@dirrm share/gtk-2.0 @dirrm lib/gtk-2.0/%%GTK_VERSION%%/loaders @dirrm lib/gtk-2.0/%%GTK_VERSION%%/immodules @dirrm lib/gtk-2.0/%%GTK_VERSION%% diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile index e5462e44ed34..edebf8982175 100644 --- a/x11-toolkits/gtk30/Makefile +++ b/x11-toolkits/gtk30/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gtk -PORTVERSION= 2.2.4 -PORTREVISION= 2 +PORTVERSION= 2.4.0 CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.2,} \ - ftp://ftp.gtk.org/pub/gtk/v2.2/ \ +MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.4,} \ + ftp://ftp.gtk.org/pub/gtk/v2.3/ \ ftp://ftp.gimp.org/pub/%SUBDIR%/ \ ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \ http://www.ameth.org/gimp/%SUBDIR%/ \ @@ -20,19 +19,14 @@ MASTER_SITE_SUBDIR= gtk/v${PORTVERSION:R} DISTNAME= gtk+-${PORTVERSION} DIST_SUBDIR= gnome2 -.if defined(WITH_DROPSHADOW) -PATCH_SITES= ${MASTER_SITE_SOURCEFORGE} -PATCH_SITE_SUBDIR= xfce -PATCHFILES= gtk+-menushadow.patch -PATCH_DIST_STRIP= -p1 -.endif - MAINTAINER= gnome@FreeBSD.org COMMENT= Gimp Toolkit for X11 GUI (current stable version) LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ jpeg.9:${PORTSDIR}/graphics/jpeg +RUN_DEPENDS= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \ + ${X11BASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme USE_BZIP2= yes LATEST_LINK= gtk20 @@ -41,33 +35,23 @@ USE_XPM= yes USE_REINPLACE= yes USE_PERL5= yes INSTALLS_SHLIB= yes -USE_LIBTOOL_VER=13 +GNU_CONFIGURE= yes USE_GNOME= gnomehack atk pango CONFIGURE_ARGS= --enable-static --with-xinput=yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \ -I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" -PLIST_SUB= GTK_VERSION="2.2.0" - -MAN1= gdk-pixbuf-csource.1 - -pre-everything:: -.if !defined(WITH_DROPSHADOW) - @${ECHO_MSG} - @${ECHO_MSG} "If you want to compile with experimental menu dropshadow patch, - @${ECHO_MSG} "hit Ctrl-C right now and use make \"WITH_DROPSHADOW=yes\"" - @${ECHO_MSG} "NOTE: This option is not supported by FreeBSD GNOME Team." - @${ECHO_MSG} "Please, don't bug us if it doesn't work or build broken." - @${ECHO_MSG} -.endif +PLIST_SUB= GTK_VERSION="2.4.0" post-patch: @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${GREP} -l lgmodule | \ ${XARGS} ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g' @${REINPLACE_CMD} -e 's|[{]libdir[}]/locale|{datadir}/locale|g' \ ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ + ${WRKSRC}/gtk/xdgmime/xdgmime.c pre-build: - ${RM} -rf ${WRKSRC}/docs/gtk.info* + @${RM} -rf ${WRKSRC}/docs/gtk.info* .include <bsd.port.mk> diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo index d327f8a90e90..44f12bfe6a47 100644 --- a/x11-toolkits/gtk30/distinfo +++ b/x11-toolkits/gtk30/distinfo @@ -1,4 +1,2 @@ -MD5 (gnome2/gtk+-2.2.4.tar.bz2) = 605332199533e73bc6eec481fb4f1671 -SIZE (gnome2/gtk+-2.2.4.tar.bz2) = 7189272 -MD5 (gnome2/gtk+-menushadow.patch) = 5e02af6c81df2c312c569b40bea129ba -SIZE (gnome2/gtk+-menushadow.patch) = 15970 +MD5 (gnome2/gtk+-2.4.0.tar.bz2) = fd16157de447c7f0a86495ad0dc67a1b +SIZE (gnome2/gtk+-2.4.0.tar.bz2) = 8476610 diff --git a/x11-toolkits/gtk30/files/patch-Makefile.in b/x11-toolkits/gtk30/files/patch-Makefile.in index 85e372a01c60..c47baaab5ef5 100644 --- a/x11-toolkits/gtk30/files/patch-Makefile.in +++ b/x11-toolkits/gtk30/files/patch-Makefile.in @@ -1,14 +1,11 @@ - -$FreeBSD$ - ---- Makefile.in 2002/02/12 13:29:11 1.1 -+++ Makefile.in 2002/02/12 13:29:28 -@@ -168,7 +168,7 @@ - ms_librarian = @ms_librarian@ - xinput_progs = @xinput_progs@ +--- Makefile.in.orig Thu Jan 22 19:40:10 2004 ++++ Makefile.in Thu Jan 22 19:40:52 2004 +@@ -286,7 +286,7 @@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ -SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests contrib -+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules contrib - SUBDIRS = po $(SRC_SUBDIRS) docs build m4macros ++SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos contrib + SUBDIRS = po po-properties $(SRC_SUBDIRS) docs build m4macros # require automake 1.4 diff --git a/x11-toolkits/gtk30/files/patch-ae b/x11-toolkits/gtk30/files/patch-ae deleted file mode 100644 index b1750b724600..000000000000 --- a/x11-toolkits/gtk30/files/patch-ae +++ /dev/null @@ -1,20 +0,0 @@ ---- configure.orig Thu Sep 4 13:17:19 2003 -+++ configure Tue Mar 16 17:14:34 2004 -@@ -18367,6 +18367,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' -@@ -24746,7 +24747,8 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --#include <freetype/freetype.h> -+#include <ft2build.h> -+#include FT_FREETYPE_H - #include FT_ERRORS_H - - int diff --git a/x11-toolkits/gtk30/files/patch-ag b/x11-toolkits/gtk30/files/patch-ag index c4879a292522..b34d2b3f24b6 100644 --- a/x11-toolkits/gtk30/files/patch-ag +++ b/x11-toolkits/gtk30/files/patch-ag @@ -1,19 +1,19 @@ ---- gtk/Makefile.in.orig Sat May 3 02:43:20 2003 -+++ gtk/Makefile.in Sat May 3 02:46:30 2003 -@@ -175,7 +175,7 @@ - -DG_LOG_DOMAIN=\"Gtk\" \ +--- gtk/Makefile.in.orig Fri Oct 24 21:45:12 2003 ++++ gtk/Makefile.in Fri Oct 24 21:46:49 2003 +@@ -301,7 +301,7 @@ -DGTK_LIBDIR=\"$(libdir)\" \ + -DGTK_DATADIR=\"$(datadir)\" \ -DGTK_DATA_PREFIX=\"$(prefix)\" \ - -DGTK_SYSCONFDIR=\"$(sysconfdir)\" \ -+ -DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\" \ - -DGTK_VERSION=\"@GTK_VERSION@\" \ - -DGTK_BINARY_VERSION=\"@GTK_BINARY_VERSION@\" \ - -DGTK_HOST=\"@host@\" \ -@@ -651,6 +651,7 @@ ++ -DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\" \ + -DGTK_VERSION=\"$(GTK_VERSION)\" \ + -DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\" \ + -DGTK_HOST=\"$(host)\" \ +@@ -856,6 +856,7 @@ TEST_DEPS = $(DEPS) gtk.immodules - LDADDS = @STRIP_BEGIN@ \ + LDADDS = \ + $(GLIB_LIBS) \ $(gtktargetlib) \ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ - $(top_builddir)/gdk/$(gdktargetlib) \ + $(top_builddir)/gdk/$(gdktargetlib) diff --git a/x11-toolkits/gtk30/files/patch-ah b/x11-toolkits/gtk30/files/patch-ah index 32c2663f049f..88bfe209d8ae 100644 --- a/x11-toolkits/gtk30/files/patch-ah +++ b/x11-toolkits/gtk30/files/patch-ah @@ -1,14 +1,11 @@ - -$FreeBSD$ - ---- docs/Makefile.in.orig Wed Oct 24 10:33:45 2001 -+++ docs/Makefile.in Wed Oct 24 10:33:46 2001 -@@ -136,7 +136,7 @@ - LT_RELEASE = @LT_RELEASE@ - LT_REVISION = @LT_REVISION@ +--- docs/Makefile.in.orig Fri Oct 24 21:47:52 2003 ++++ docs/Makefile.in Fri Oct 24 23:35:09 2003 +@@ -179,7 +179,7 @@ MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ + MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ -MAKEINFO = @MAKEINFO@ +MAKEINFO = @MAKEINFO@ --no-split MKINSTALLDIRS = @MKINSTALLDIRS@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ + MSGFMT = @MSGFMT@ + MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ diff --git a/x11-toolkits/gtk30/files/patch-ai b/x11-toolkits/gtk30/files/patch-ai index a128c58ffe80..a04d08ef58b3 100644 --- a/x11-toolkits/gtk30/files/patch-ai +++ b/x11-toolkits/gtk30/files/patch-ai @@ -1,11 +1,11 @@ ---- docs/reference/Makefile.in.orig Sat Nov 18 03:17:56 2000 -+++ docs/reference/Makefile.in Mon Nov 20 15:33:25 2000 -@@ -160,7 +160,7 @@ - x_libs = @x_libs@ - xinput_progs = @xinput_progs@ +--- docs/reference/Makefile.in.orig Fri Oct 24 23:38:06 2003 ++++ docs/reference/Makefile.in Fri Oct 24 23:48:00 2003 +@@ -286,7 +286,7 @@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ -SUBDIRS = gdk-pixbuf gdk gtk -+SUBDIRS = ++SUBDIRS = #gdk-pixbuf gdk gtk + subdir = docs/reference mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../config.h - CONFIG_CLEAN_FILES = + CONFIG_HEADER = $(top_builddir)/config.h diff --git a/x11-toolkits/gtk30/files/patch-gdk-pixbuf_Makefile.in b/x11-toolkits/gtk30/files/patch-gdk-pixbuf_Makefile.in index fa3e1270f1b2..c2cb10b5478c 100644 --- a/x11-toolkits/gtk30/files/patch-gdk-pixbuf_Makefile.in +++ b/x11-toolkits/gtk30/files/patch-gdk-pixbuf_Makefile.in @@ -1,6 +1,6 @@ ---- gdk-pixbuf/Makefile.in.orig Sat May 3 02:51:31 2003 -+++ gdk-pixbuf/Makefile.in Sat May 3 02:51:59 2003 -@@ -384,7 +384,9 @@ +--- gdk-pixbuf/Makefile.in.orig Thu Nov 20 15:39:55 2003 ++++ gdk-pixbuf/Makefile.in Thu Nov 20 15:40:17 2003 +@@ -517,7 +517,9 @@ AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\"" diff --git a/x11-toolkits/gtk30/files/patch-gtk_gtkicontheme.c b/x11-toolkits/gtk30/files/patch-gtk_gtkicontheme.c new file mode 100644 index 000000000000..07bb57a6d022 --- /dev/null +++ b/x11-toolkits/gtk30/files/patch-gtk_gtkicontheme.c @@ -0,0 +1,26 @@ +--- gtk/gtkicontheme.c.orig Thu Jan 29 16:53:42 2004 ++++ gtk/gtkicontheme.c Thu Jan 29 16:54:56 2004 +@@ -526,7 +526,7 @@ + + priv->custom_theme = FALSE; + priv->current_theme = g_strdup (DEFAULT_THEME_NAME); +- priv->search_path = g_new (char *, 5); ++ priv->search_path = g_new (char *, 7); + + + priv->search_path[0] = g_build_filename (g_get_home_dir (), +@@ -534,9 +534,11 @@ + NULL); + priv->search_path[1] = g_build_filename (GTK_DATADIR, "pixmaps", NULL); + priv->search_path[2] = g_build_filename (GTK_DATADIR, "icons", NULL); +- priv->search_path[3] = g_strdup ("/usr/share/icons"); +- priv->search_path[4] = g_strdup ("/usr/share/pixmaps"); +- priv->search_path_len = 5; ++ priv->search_path[3] = g_build_filename (GTK_DATADIR, "gnome", "pixmaps", NULL); ++ priv->search_path[4] = g_build_filename (GTK_DATADIR, "gnome", "icons", NULL); ++ priv->search_path[5] = g_strdup ("/usr/share/icons"); ++ priv->search_path[6] = g_strdup ("/usr/share/pixmaps"); ++ priv->search_path_len = 7; + + priv->themes_valid = FALSE; + priv->themes = NULL; diff --git a/x11-toolkits/gtk30/files/patch-ltmain.sh b/x11-toolkits/gtk30/files/patch-ltmain.sh new file mode 100644 index 000000000000..58384ee38d2e --- /dev/null +++ b/x11-toolkits/gtk30/files/patch-ltmain.sh @@ -0,0 +1,51 @@ +--- ltmain.sh.orig Sat Dec 6 14:47:45 2003 ++++ ltmain.sh Tue Dec 9 14:09:01 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/x11-toolkits/gtk30/pkg-descr b/x11-toolkits/gtk30/pkg-descr index 83ab3d952191..8cee4afc7448 100644 --- a/x11-toolkits/gtk30/pkg-descr +++ b/x11-toolkits/gtk30/pkg-descr @@ -1,21 +1,10 @@ - GTK is a library for creating graphical user interfaces similar to -the Motif "look and feel". It is designed to be small and efficient, but -still flexible enough to allow the programmer freedom in the interfaces -created. GTK allows the programmer to use a variety of standard user -interface widgets such as push, radio and check buttons, menus, lists -and frames. It also provides several "container" widgets which can be -used to control the layout of the user interface elements. +The GIMP ToolKit (GTK+) is a collection of GUI widgets. GTK+ +essentially provides the building blocks from which GUIs can be +built. It is highly themable, and its functionality is highly +extensible. - GTK provides some unique features. (At least, I know of no other -widget library which provides them). For example, a button does not -contain a label, it contains a child widget, which in most instances -will be a label. However, the child widget can also be a pixmap, image -or any combination possible the programmer desires. This flexibility is -adhered to throughout the library. - -GTK+-2.0 is a stable release, but many applications still require -GTK+-1.2, the previous stable version. You can have the runtime and -development environments for both GTK+-2.0 and GTK+-1.2 installed -simultaneously on your computer. +GTK+-2 is a very stable release, similar only in design to GTK+-1. +GTK+-2 can coexist happily alongside GTK+-1, but applications are +written for one version or the other. WWW: http://www.gtk.org/ diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist index 07e8ff08f981..5b137af92f90 100644 --- a/x11-toolkits/gtk30/pkg-plist +++ b/x11-toolkits/gtk30/pkg-plist @@ -1,6 +1,7 @@ bin/gdk-pixbuf-csource -bin/gtk-query-immodules-2.0 bin/gdk-pixbuf-query-loaders +bin/gtk-demo +bin/gtk-query-immodules-2.0 etc/gtk-2.0/gdk-pixbuf.loaders etc/gtk-2.0/gtk.immodules include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h @@ -38,6 +39,7 @@ include/gtk-2.0/gdk/gdkregion.h include/gtk-2.0/gdk/gdkrgb.h include/gtk-2.0/gdk/gdkscreen.h include/gtk-2.0/gdk/gdkselection.h +include/gtk-2.0/gdk/gdkspawn.h include/gtk-2.0/gdk/gdktypes.h include/gtk-2.0/gdk/gdkvisual.h include/gtk-2.0/gdk/gdkwindow.h @@ -48,6 +50,8 @@ include/gtk-2.0/gtk/gtkaccelgroup.h include/gtk-2.0/gtk/gtkaccellabel.h include/gtk-2.0/gtk/gtkaccelmap.h include/gtk-2.0/gtk/gtkaccessible.h +include/gtk-2.0/gtk/gtkaction.h +include/gtk-2.0/gtk/gtkactiongroup.h include/gtk-2.0/gtk/gtkadjustment.h include/gtk-2.0/gtk/gtkalignment.h include/gtk-2.0/gtk/gtkarrow.h @@ -59,6 +63,7 @@ include/gtk-2.0/gtk/gtkbox.h include/gtk-2.0/gtk/gtkbutton.h include/gtk-2.0/gtk/gtkcalendar.h include/gtk-2.0/gtk/gtkcelleditable.h +include/gtk-2.0/gtk/gtkcelllayout.h include/gtk-2.0/gtk/gtkcellrenderer.h include/gtk-2.0/gtk/gtkcellrendererpixbuf.h include/gtk-2.0/gtk/gtkcellrenderertext.h @@ -67,9 +72,12 @@ include/gtk-2.0/gtk/gtkcheckbutton.h include/gtk-2.0/gtk/gtkcheckmenuitem.h include/gtk-2.0/gtk/gtkclipboard.h include/gtk-2.0/gtk/gtkclist.h +include/gtk-2.0/gtk/gtkcolorbutton.h include/gtk-2.0/gtk/gtkcolorsel.h include/gtk-2.0/gtk/gtkcolorseldialog.h include/gtk-2.0/gtk/gtkcombo.h +include/gtk-2.0/gtk/gtkcombobox.h +include/gtk-2.0/gtk/gtkcomboboxentry.h include/gtk-2.0/gtk/gtkcontainer.h include/gtk-2.0/gtk/gtkctree.h include/gtk-2.0/gtk/gtkcurve.h @@ -80,9 +88,17 @@ include/gtk-2.0/gtk/gtkdrawingarea.h include/gtk-2.0/gtk/gtkeditable.h include/gtk-2.0/gtk/gtkentry.h include/gtk-2.0/gtk/gtkenums.h +include/gtk-2.0/gtk/gtkentrycompletion.h +include/gtk-2.0/gtk/gtkexpander.h include/gtk-2.0/gtk/gtkeventbox.h +include/gtk-2.0/gtk/gtkfilechooser.h +include/gtk-2.0/gtk/gtkfilechooserdialog.h +include/gtk-2.0/gtk/gtkfilechooserwidget.h +include/gtk-2.0/gtk/gtkfilefilter.h include/gtk-2.0/gtk/gtkfilesel.h +include/gtk-2.0/gtk/gtkfilesystem.h include/gtk-2.0/gtk/gtkfixed.h +include/gtk-2.0/gtk/gtkfontbutton.h include/gtk-2.0/gtk/gtkfontsel.h include/gtk-2.0/gtk/gtkframe.h include/gtk-2.0/gtk/gtkgamma.h @@ -96,6 +112,7 @@ include/gtk-2.0/gtk/gtkhscale.h include/gtk-2.0/gtk/gtkhscrollbar.h include/gtk-2.0/gtk/gtkhseparator.h include/gtk-2.0/gtk/gtkiconfactory.h +include/gtk-2.0/gtk/gtkicontheme.h include/gtk-2.0/gtk/gtkimage.h include/gtk-2.0/gtk/gtkimagemenuitem.h include/gtk-2.0/gtk/gtkimcontext.h @@ -130,8 +147,10 @@ include/gtk-2.0/gtk/gtkpreview.h include/gtk-2.0/gtk/gtkprivate.h include/gtk-2.0/gtk/gtkprogress.h include/gtk-2.0/gtk/gtkprogressbar.h +include/gtk-2.0/gtk/gtkradioaction.h include/gtk-2.0/gtk/gtkradiobutton.h include/gtk-2.0/gtk/gtkradiomenuitem.h +include/gtk-2.0/gtk/gtkradiotoolbutton.h include/gtk-2.0/gtk/gtkrange.h include/gtk-2.0/gtk/gtkrc.h include/gtk-2.0/gtk/gtkruler.h @@ -141,6 +160,7 @@ include/gtk-2.0/gtk/gtkscrolledwindow.h include/gtk-2.0/gtk/gtkselection.h include/gtk-2.0/gtk/gtkseparator.h include/gtk-2.0/gtk/gtkseparatormenuitem.h +include/gtk-2.0/gtk/gtkseparatortoolitem.h include/gtk-2.0/gtk/gtksettings.h include/gtk-2.0/gtk/gtksignal.h include/gtk-2.0/gtk/gtksizegroup.h @@ -162,13 +182,18 @@ include/gtk-2.0/gtk/gtktexttag.h include/gtk-2.0/gtk/gtktexttagtable.h include/gtk-2.0/gtk/gtktextview.h include/gtk-2.0/gtk/gtktipsquery.h +include/gtk-2.0/gtk/gtktoggleaction.h include/gtk-2.0/gtk/gtktogglebutton.h +include/gtk-2.0/gtk/gtktoggletoolbutton.h include/gtk-2.0/gtk/gtktoolbar.h +include/gtk-2.0/gtk/gtktoolbutton.h +include/gtk-2.0/gtk/gtktoolitem.h include/gtk-2.0/gtk/gtktooltips.h include/gtk-2.0/gtk/gtktree.h include/gtk-2.0/gtk/gtktreednd.h include/gtk-2.0/gtk/gtktreeitem.h include/gtk-2.0/gtk/gtktreemodel.h +include/gtk-2.0/gtk/gtktreemodelfilter.h include/gtk-2.0/gtk/gtktreemodelsort.h include/gtk-2.0/gtk/gtktreeselection.h include/gtk-2.0/gtk/gtktreesortable.h @@ -177,6 +202,7 @@ include/gtk-2.0/gtk/gtktreeview.h include/gtk-2.0/gtk/gtktreeviewcolumn.h include/gtk-2.0/gtk/gtktypebuiltins.h include/gtk-2.0/gtk/gtktypeutils.h +include/gtk-2.0/gtk/gtkuimanager.h include/gtk-2.0/gtk/gtkvbbox.h include/gtk-2.0/gtk/gtkvbox.h include/gtk-2.0/gtk/gtkversion.h @@ -193,6 +219,7 @@ lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.so +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pcx.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-png.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pnm.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ras.so @@ -204,7 +231,6 @@ lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.so lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-am-et.so lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cedilla.so lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cyrillic-translit.so -lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-hangul.so lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-inuktitut.so lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.so lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai-broken.so @@ -214,16 +240,16 @@ lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-viqr.so lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-xim.so lib/libgdk-x11-2.0.a lib/libgdk-x11-2.0.so -lib/libgdk-x11-2.0.so.200 +lib/libgdk-x11-2.0.so.400 lib/libgdk_pixbuf-2.0.a lib/libgdk_pixbuf-2.0.so -lib/libgdk_pixbuf-2.0.so.200 +lib/libgdk_pixbuf-2.0.so.400 lib/libgdk_pixbuf_xlib-2.0.a lib/libgdk_pixbuf_xlib-2.0.so -lib/libgdk_pixbuf_xlib-2.0.so.200 +lib/libgdk_pixbuf_xlib-2.0.so.400 lib/libgtk-x11-2.0.a lib/libgtk-x11-2.0.so -lib/libgtk-x11-2.0.so.200 +lib/libgtk-x11-2.0.so.400 libdata/pkgconfig/gdk-2.0.pc libdata/pkgconfig/gdk-pixbuf-2.0.pc libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc @@ -231,64 +257,172 @@ libdata/pkgconfig/gdk-x11-2.0.pc libdata/pkgconfig/gtk+-2.0.pc libdata/pkgconfig/gtk+-x11-2.0.pc share/aclocal/gtk-2.0.m4 +share/gtk-2.0/demo/alphatest.png +share/gtk-2.0/demo/apple-red.png +share/gtk-2.0/demo/appwindow.c +share/gtk-2.0/demo/background.jpg +share/gtk-2.0/demo/button_box.c +share/gtk-2.0/demo/changedisplay.c +share/gtk-2.0/demo/colorsel.c +share/gtk-2.0/demo/dialog.c +share/gtk-2.0/demo/drawingarea.c +share/gtk-2.0/demo/editable_cells.c +share/gtk-2.0/demo/entry_completion.c +share/gtk-2.0/demo/floppybuddy.gif +share/gtk-2.0/demo/gnome-applets.png +share/gtk-2.0/demo/gnome-calendar.png +share/gtk-2.0/demo/gnome-foot.png +share/gtk-2.0/demo/gnome-gimp.png +share/gtk-2.0/demo/gnome-gmush.png +share/gtk-2.0/demo/gnome-gsame.png +share/gtk-2.0/demo/gnu-keys.png +share/gtk-2.0/demo/gtk-logo-rgb.gif +share/gtk-2.0/demo/hypertext.c +share/gtk-2.0/demo/images.c +share/gtk-2.0/demo/list_store.c +share/gtk-2.0/demo/menus.c +share/gtk-2.0/demo/panes.c +share/gtk-2.0/demo/pixbufs.c +share/gtk-2.0/demo/sizegroup.c +share/gtk-2.0/demo/stock_browser.c +share/gtk-2.0/demo/textview.c +share/gtk-2.0/demo/tree_store.c +share/gtk-2.0/demo/ui_manager.c +share/locale/af/LC_MESSAGES/gtk20-properties.mo +share/locale/af/LC_MESSAGES/gtk20.mo +share/locale/am/LC_MESSAGES/gtk20-properties.mo share/locale/am/LC_MESSAGES/gtk20.mo +share/locale/ar/LC_MESSAGES/gtk20-properties.mo share/locale/ar/LC_MESSAGES/gtk20.mo +share/locale/az/LC_MESSAGES/gtk20-properties.mo share/locale/az/LC_MESSAGES/gtk20.mo +share/locale/be/LC_MESSAGES/gtk20-properties.mo share/locale/be/LC_MESSAGES/gtk20.mo +share/locale/bg/LC_MESSAGES/gtk20-properties.mo share/locale/bg/LC_MESSAGES/gtk20.mo +share/locale/bn/LC_MESSAGES/gtk20-properties.mo +share/locale/bn/LC_MESSAGES/gtk20.mo +share/locale/br/LC_MESSAGES/gtk20-properties.mo +share/locale/br/LC_MESSAGES/gtk20.mo +share/locale/ca/LC_MESSAGES/gtk20-properties.mo share/locale/ca/LC_MESSAGES/gtk20.mo +share/locale/cs/LC_MESSAGES/gtk20-properties.mo share/locale/cs/LC_MESSAGES/gtk20.mo +share/locale/cy/LC_MESSAGES/gtk20-properties.mo share/locale/cy/LC_MESSAGES/gtk20.mo +share/locale/da/LC_MESSAGES/gtk20-properties.mo share/locale/da/LC_MESSAGES/gtk20.mo +share/locale/de/LC_MESSAGES/gtk20-properties.mo share/locale/de/LC_MESSAGES/gtk20.mo +share/locale/el/LC_MESSAGES/gtk20-properties.mo share/locale/el/LC_MESSAGES/gtk20.mo +share/locale/en_CA/LC_MESSAGES/gtk20-properties.mo +share/locale/en_CA/LC_MESSAGES/gtk20.mo +share/locale/en_GB/LC_MESSAGES/gtk20-properties.mo share/locale/en_GB/LC_MESSAGES/gtk20.mo +share/locale/es/LC_MESSAGES/gtk20-properties.mo share/locale/es/LC_MESSAGES/gtk20.mo +share/locale/et/LC_MESSAGES/gtk20-properties.mo share/locale/et/LC_MESSAGES/gtk20.mo +share/locale/eu/LC_MESSAGES/gtk20-properties.mo share/locale/eu/LC_MESSAGES/gtk20.mo +share/locale/fa/LC_MESSAGES/gtk20-properties.mo share/locale/fa/LC_MESSAGES/gtk20.mo +share/locale/fi/LC_MESSAGES/gtk20-properties.mo share/locale/fi/LC_MESSAGES/gtk20.mo +share/locale/fr/LC_MESSAGES/gtk20-properties.mo share/locale/fr/LC_MESSAGES/gtk20.mo +share/locale/ga/LC_MESSAGES/gtk20-properties.mo share/locale/ga/LC_MESSAGES/gtk20.mo +share/locale/gl/LC_MESSAGES/gtk20-properties.mo share/locale/gl/LC_MESSAGES/gtk20.mo +share/locale/he/LC_MESSAGES/gtk20-properties.mo share/locale/he/LC_MESSAGES/gtk20.mo +share/locale/hi/LC_MESSAGES/gtk20-properties.mo share/locale/hi/LC_MESSAGES/gtk20.mo +share/locale/hr/LC_MESSAGES/gtk20-properties.mo share/locale/hr/LC_MESSAGES/gtk20.mo +share/locale/hu/LC_MESSAGES/gtk20-properties.mo share/locale/hu/LC_MESSAGES/gtk20.mo +share/locale/ia/LC_MESSAGES/gtk20-properties.mo share/locale/ia/LC_MESSAGES/gtk20.mo +share/locale/id/LC_MESSAGES/gtk20-properties.mo share/locale/id/LC_MESSAGES/gtk20.mo -share/locale/is/LC_MESSAGES/gtk20.mo +share/locale/it/LC_MESSAGES/gtk20-properties.mo share/locale/it/LC_MESSAGES/gtk20.mo +share/locale/ja/LC_MESSAGES/gtk20-properties.mo share/locale/ja/LC_MESSAGES/gtk20.mo +share/locale/ko/LC_MESSAGES/gtk20-properties.mo share/locale/ko/LC_MESSAGES/gtk20.mo +share/locale/li/LC_MESSAGES/gtk20-properties.mo +share/locale/li/LC_MESSAGES/gtk20.mo +share/locale/lt/LC_MESSAGES/gtk20-properties.mo share/locale/lt/LC_MESSAGES/gtk20.mo +share/locale/lv/LC_MESSAGES/gtk20-properties.mo share/locale/lv/LC_MESSAGES/gtk20.mo +share/locale/mi/LC_MESSAGES/gtk20-properties.mo +share/locale/mi/LC_MESSAGES/gtk20.mo +share/locale/mk/LC_MESSAGES/gtk20-properties.mo share/locale/mk/LC_MESSAGES/gtk20.mo +share/locale/ml/LC_MESSAGES/gtk20-properties.mo share/locale/ml/LC_MESSAGES/gtk20.mo +share/locale/mn/LC_MESSAGES/gtk20-properties.mo share/locale/mn/LC_MESSAGES/gtk20.mo +share/locale/ms/LC_MESSAGES/gtk20-properties.mo share/locale/ms/LC_MESSAGES/gtk20.mo +share/locale/ne/LC_MESSAGES/gtk20-properties.mo share/locale/ne/LC_MESSAGES/gtk20.mo +share/locale/nl/LC_MESSAGES/gtk20-properties.mo share/locale/nl/LC_MESSAGES/gtk20.mo +share/locale/nn/LC_MESSAGES/gtk20-properties.mo share/locale/nn/LC_MESSAGES/gtk20.mo +share/locale/no/LC_MESSAGES/gtk20-properties.mo share/locale/no/LC_MESSAGES/gtk20.mo +share/locale/pl/LC_MESSAGES/gtk20-properties.mo share/locale/pl/LC_MESSAGES/gtk20.mo +share/locale/pt/LC_MESSAGES/gtk20-properties.mo share/locale/pt/LC_MESSAGES/gtk20.mo +share/locale/pt_BR/LC_MESSAGES/gtk20-properties.mo share/locale/pt_BR/LC_MESSAGES/gtk20.mo +share/locale/ro/LC_MESSAGES/gtk20-properties.mo share/locale/ro/LC_MESSAGES/gtk20.mo +share/locale/ru/LC_MESSAGES/gtk20-properties.mo share/locale/ru/LC_MESSAGES/gtk20.mo +share/locale/sk/LC_MESSAGES/gtk20-properties.mo share/locale/sk/LC_MESSAGES/gtk20.mo +share/locale/sl/LC_MESSAGES/gtk20-properties.mo share/locale/sl/LC_MESSAGES/gtk20.mo +share/locale/sq/LC_MESSAGES/gtk20-properties.mo +share/locale/sr/LC_MESSAGES/gtk20-properties.mo share/locale/sr/LC_MESSAGES/gtk20.mo +share/locale/sr@Latn/LC_MESSAGES/gtk20-properties.mo share/locale/sr@Latn/LC_MESSAGES/gtk20.mo +share/locale/sr@ije/LC_MESSAGES/gtk20-properties.mo +share/locale/sr@ije/LC_MESSAGES/gtk20.mo share/locale/sq/LC_MESSAGES/gtk20.mo +share/locale/sv/LC_MESSAGES/gtk20-properties.mo share/locale/sv/LC_MESSAGES/gtk20.mo +share/locale/ta/LC_MESSAGES/gtk20-properties.mo share/locale/ta/LC_MESSAGES/gtk20.mo +share/locale/th/LC_MESSAGES/gtk20-properties.mo +share/locale/th/LC_MESSAGES/gtk20.mo +share/locale/tr/LC_MESSAGES/gtk20-properties.mo share/locale/tr/LC_MESSAGES/gtk20.mo +share/locale/uk/LC_MESSAGES/gtk20-properties.mo share/locale/uk/LC_MESSAGES/gtk20.mo +share/locale/uz/LC_MESSAGES/gtk20-properties.mo +share/locale/uz/LC_MESSAGES/gtk20.mo +share/locale/uz@Latn/LC_MESSAGES/gtk20-properties.mo +share/locale/uz@Latn/LC_MESSAGES/gtk20.mo +share/locale/vi/LC_MESSAGES/gtk20-properties.mo share/locale/vi/LC_MESSAGES/gtk20.mo +share/locale/wa/LC_MESSAGES/gtk20-properties.mo share/locale/wa/LC_MESSAGES/gtk20.mo +share/locale/yi/LC_MESSAGES/gtk20-properties.mo share/locale/yi/LC_MESSAGES/gtk20.mo +share/locale/zh_CN/LC_MESSAGES/gtk20-properties.mo share/locale/zh_CN/LC_MESSAGES/gtk20.mo +share/locale/zh_TW/LC_MESSAGES/gtk20-properties.mo share/locale/zh_TW/LC_MESSAGES/gtk20.mo share/themes/Default/gtk-2.0-key/gtkrc share/themes/Default/gtk-2.0/gtkrc @@ -297,6 +431,8 @@ share/themes/Emacs/gtk-2.0-key/gtkrc @dirrm share/themes/Emacs @dirrm share/themes/Default/gtk-2.0-key @dirrm share/themes/Default/gtk-2.0 +@dirrm share/gtk-2.0/demo +@dirrm share/gtk-2.0 @dirrm lib/gtk-2.0/%%GTK_VERSION%%/loaders @dirrm lib/gtk-2.0/%%GTK_VERSION%%/immodules @dirrm lib/gtk-2.0/%%GTK_VERSION%% diff --git a/x11-toolkits/gtksourceview/Makefile b/x11-toolkits/gtksourceview/Makefile index d66a991c4924..97446a409ced 100644 --- a/x11-toolkits/gtksourceview/Makefile +++ b/x11-toolkits/gtksourceview/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gtksourceview -PORTVERSION= 0.7.1 +PORTVERSION= 1.0.0 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.7 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -20,7 +20,7 @@ USE_X_PREFIX= yes USE_GMAKE= yes USE_LIBTOOL_VER=13 INSTALLS_SHLIB= yes -USE_GNOME= gnomeprefix gnomehack libgnome libgnomeprintui +USE_GNOME= gnomeprefix gnomehack lthack libgnome libgnomeprintui CONFIGURE_ARGS= --enable-compile-warnings=no CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib -lgnuregex" diff --git a/x11-toolkits/gtksourceview/distinfo b/x11-toolkits/gtksourceview/distinfo index baa85c4fd5d6..ce801f570f5a 100644 --- a/x11-toolkits/gtksourceview/distinfo +++ b/x11-toolkits/gtksourceview/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gtksourceview-0.7.1.tar.bz2) = 0803ae4d035f5146f69e3d5785bb00c6 -SIZE (gnome2/gtksourceview-0.7.1.tar.bz2) = 573783 +MD5 (gnome2/gtksourceview-1.0.0.tar.bz2) = 0c17b39420e36fcdc9688da95b83c110 +SIZE (gnome2/gtksourceview-1.0.0.tar.bz2) = 656205 diff --git a/x11-toolkits/gtksourceview/files/patch-configure b/x11-toolkits/gtksourceview/files/patch-configure deleted file mode 100644 index 6718d62e1a0f..000000000000 --- a/x11-toolkits/gtksourceview/files/patch-configure +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.orig Tue Dec 17 05:27:57 2002 -+++ configure Sun Dec 22 17:31:25 2002 -@@ -7270,6 +7270,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' diff --git a/x11-toolkits/gtksourceview/pkg-descr b/x11-toolkits/gtksourceview/pkg-descr index d24afadff56d..729f7178053b 100644 --- a/x11-toolkits/gtksourceview/pkg-descr +++ b/x11-toolkits/gtksourceview/pkg-descr @@ -1,3 +1,2 @@ -Gtksourceview is a text widget that extends the standard Gtk+ 2.x GtkTextView. -It improves it by implementing syntax highlighting and other features typical -of a source editor. +GtkSourceView is a text widget for Gtk+-2 that provides syntax highlighting +and other features typically expected in a source code editor. diff --git a/x11-toolkits/gtksourceview/pkg-plist b/x11-toolkits/gtksourceview/pkg-plist index 5609a49fbbbe..bba83ab53074 100644 --- a/x11-toolkits/gtksourceview/pkg-plist +++ b/x11-toolkits/gtksourceview/pkg-plist @@ -14,27 +14,29 @@ lib/libgtksourceview-1.0.a lib/libgtksourceview-1.0.so lib/libgtksourceview-1.0.so.0 libdata/pkgconfig/gtksourceview-1.0.pc -share/doc/gtksourceview/GtkSourceBuffer.html -share/doc/gtksourceview/GtkSourceLanguage.html -share/doc/gtksourceview/GtkSourceLanguagesManager.html -share/doc/gtksourceview/GtkSourcePrintJob.html -share/doc/gtksourceview/GtkSourceStyleScheme.html -share/doc/gtksourceview/GtkSourceTag.html -share/doc/gtksourceview/GtkSourceTagTable.html -share/doc/gtksourceview/GtkSourceView.html -share/doc/gtksourceview/gtksourceview-GtkSourceMarker.html -share/doc/gtksourceview/gtksourceview-GtkSourceTagStyle.html -share/doc/gtksourceview/gtksourceview-Searching-in-a-GtkSourceBuffer.html -share/doc/gtksourceview/gtksourceview.devhelp -share/doc/gtksourceview/home.png -share/doc/gtksourceview/index.html -share/doc/gtksourceview/index.sgml -share/doc/gtksourceview/left.png -share/doc/gtksourceview/right.png -share/doc/gtksourceview/up.png +%%DOCSDIR%%/GtkSourceBuffer.html +%%DOCSDIR%%/GtkSourceLanguage.html +%%DOCSDIR%%/GtkSourceLanguagesManager.html +%%DOCSDIR%%/GtkSourcePrintJob.html +%%DOCSDIR%%/GtkSourceStyleScheme.html +%%DOCSDIR%%/GtkSourceTag.html +%%DOCSDIR%%/GtkSourceTagTable.html +%%DOCSDIR%%/GtkSourceView.html +%%DOCSDIR%%/gtksourceview-GtkSourceMarker.html +%%DOCSDIR%%/gtksourceview-GtkSourceTagStyle.html +%%DOCSDIR%%/gtksourceview-Searching-in-a-GtkSourceBuffer.html +%%DOCSDIR%%/gtksourceview.devhelp +%%DOCSDIR%%/home.png +%%DOCSDIR%%/index.html +%%DOCSDIR%%/index.sgml +%%DOCSDIR%%/left.png +%%DOCSDIR%%/right.png +%%DOCSDIR%%/rn01.html +%%DOCSDIR%%/up.png share/gnome/gtksourceview-1.0/language-specs/ada.lang share/gnome/gtksourceview-1.0/language-specs/c.lang share/gnome/gtksourceview-1.0/language-specs/cpp.lang +share/gnome/gtksourceview-1.0/language-specs/csharp.lang share/gnome/gtksourceview-1.0/language-specs/desktop.lang share/gnome/gtksourceview-1.0/language-specs/diff.lang share/gnome/gtksourceview-1.0/language-specs/html.lang @@ -42,10 +44,15 @@ share/gnome/gtksourceview-1.0/language-specs/idl.lang share/gnome/gtksourceview-1.0/language-specs/java.lang share/gnome/gtksourceview-1.0/language-specs/language.dtd share/gnome/gtksourceview-1.0/language-specs/latex.lang +share/gnome/gtksourceview-1.0/language-specs/msil.lang share/gnome/gtksourceview-1.0/language-specs/perl.lang +share/gnome/gtksourceview-1.0/language-specs/php.lang share/gnome/gtksourceview-1.0/language-specs/po.lang share/gnome/gtksourceview-1.0/language-specs/python.lang +share/gnome/gtksourceview-1.0/language-specs/sql.lang +share/gnome/gtksourceview-1.0/language-specs/verilog.lang share/gnome/gtksourceview-1.0/language-specs/xml.lang +share/locale/ar/LC_MESSAGES/gtksourceview-1.0.mo share/locale/az/LC_MESSAGES/gtksourceview-1.0.mo share/locale/be/LC_MESSAGES/gtksourceview-1.0.mo share/locale/bn/LC_MESSAGES/gtksourceview-1.0.mo @@ -55,17 +62,22 @@ share/locale/cy/LC_MESSAGES/gtksourceview-1.0.mo share/locale/da/LC_MESSAGES/gtksourceview-1.0.mo share/locale/de/LC_MESSAGES/gtksourceview-1.0.mo share/locale/el/LC_MESSAGES/gtksourceview-1.0.mo +share/locale/en_CA/LC_MESSAGES/gtksourceview-1.0.mo +share/locale/en_GB/LC_MESSAGES/gtksourceview-1.0.mo share/locale/es/LC_MESSAGES/gtksourceview-1.0.mo share/locale/et/LC_MESSAGES/gtksourceview-1.0.mo share/locale/eu/LC_MESSAGES/gtksourceview-1.0.mo +share/locale/fa/LC_MESSAGES/gtksourceview-1.0.mo share/locale/fi/LC_MESSAGES/gtksourceview-1.0.mo share/locale/fr/LC_MESSAGES/gtksourceview-1.0.mo +share/locale/ga/LC_MESSAGES/gtksourceview-1.0.mo share/locale/he/LC_MESSAGES/gtksourceview-1.0.mo +share/locale/hi/LC_MESSAGES/gtksourceview-1.0.mo +share/locale/hr/LC_MESSAGES/gtksourceview-1.0.mo +share/locale/hu/LC_MESSAGES/gtksourceview-1.0.mo share/locale/id/LC_MESSAGES/gtksourceview-1.0.mo share/locale/it/LC_MESSAGES/gtksourceview-1.0.mo share/locale/ja/LC_MESSAGES/gtksourceview-1.0.mo -share/locale/hi/LC_MESSAGES/gtksourceview-1.0.mo -share/locale/hu/LC_MESSAGES/gtksourceview-1.0.mo share/locale/ko/LC_MESSAGES/gtksourceview-1.0.mo share/locale/lt/LC_MESSAGES/gtksourceview-1.0.mo share/locale/mk/LC_MESSAGES/gtksourceview-1.0.mo @@ -74,14 +86,15 @@ share/locale/mn/LC_MESSAGES/gtksourceview-1.0.mo share/locale/ms/LC_MESSAGES/gtksourceview-1.0.mo share/locale/nl/LC_MESSAGES/gtksourceview-1.0.mo share/locale/no/LC_MESSAGES/gtksourceview-1.0.mo +share/locale/pa/LC_MESSAGES/gtksourceview-1.0.mo share/locale/pl/LC_MESSAGES/gtksourceview-1.0.mo share/locale/pt/LC_MESSAGES/gtksourceview-1.0.mo share/locale/pt_BR/LC_MESSAGES/gtksourceview-1.0.mo share/locale/ru/LC_MESSAGES/gtksourceview-1.0.mo share/locale/sk/LC_MESSAGES/gtksourceview-1.0.mo +share/locale/sq/LC_MESSAGES/gtksourceview-1.0.mo share/locale/sr/LC_MESSAGES/gtksourceview-1.0.mo share/locale/sr@Latn/LC_MESSAGES/gtksourceview-1.0.mo -share/locale/sq/LC_MESSAGES/gtksourceview-1.0.mo share/locale/sv/LC_MESSAGES/gtksourceview-1.0.mo share/locale/ta/LC_MESSAGES/gtksourceview-1.0.mo share/locale/tr/LC_MESSAGES/gtksourceview-1.0.mo @@ -91,6 +104,6 @@ share/locale/zh_CN/LC_MESSAGES/gtksourceview-1.0.mo share/locale/zh_TW/LC_MESSAGES/gtksourceview-1.0.mo @dirrm share/gnome/gtksourceview-1.0/language-specs @dirrm share/gnome/gtksourceview-1.0 -@dirrm share/doc/gtksourceview +@dirrm %%DOCSDIR%% @dirrm include/gtksourceview-1.0/gtksourceview @dirrm include/gtksourceview-1.0 diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile index dda4ab248728..15cef2fa322c 100644 --- a/x11-toolkits/libbonoboui/Makefile +++ b/x11-toolkits/libbonoboui/Makefile @@ -6,11 +6,10 @@ # PORTNAME= libbonoboui -PORTVERSION= 2.4.3 -PORTREVISION= 1 +PORTVERSION= 2.6.0 CATEGORIES= x11-toolkits gnome 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 @@ -19,7 +18,8 @@ COMMENT= GUI frontend to the libbonobo component of GNOME 2 USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack gnomehier libgnomecanvas libgnome +USE_GNOME= gnomeprefix gnomehack gnomehier intlhack lthack \ + libgnomecanvas libgnome USE_LIBTOOL_VER=13 INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/x11-toolkits/libbonoboui/distinfo b/x11-toolkits/libbonoboui/distinfo index 389b480a34e6..105514cc5b47 100644 --- a/x11-toolkits/libbonoboui/distinfo +++ b/x11-toolkits/libbonoboui/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libbonoboui-2.4.3.tar.bz2) = b2e4b0e62d5d32ba713221fb63faa6d1 -SIZE (gnome2/libbonoboui-2.4.3.tar.bz2) = 889106 +MD5 (gnome2/libbonoboui-2.6.0.tar.bz2) = 948dbd0ffe2c460ff2986254a40a5c7f +SIZE (gnome2/libbonoboui-2.6.0.tar.bz2) = 917849 diff --git a/x11-toolkits/libbonoboui/files/patch-Makefile.in b/x11-toolkits/libbonoboui/files/patch-Makefile.in index 156a4f587188..fcdbe416ba34 100644 --- a/x11-toolkits/libbonoboui/files/patch-Makefile.in +++ b/x11-toolkits/libbonoboui/files/patch-Makefile.in @@ -1,9 +1,9 @@ ---- 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@ +--- Makefile.in.orig Fri Jan 16 13:17:47 2004 ++++ Makefile.in Fri Jan 16 13:18:13 2004 +@@ -146,7 +146,7 @@ + am__quote = @am__quote@ + gnomelocaledir = @gnomelocaledir@ + install_sh = @install_sh@ -SUBDIRS = bonobo glade samples tests po doc +SUBDIRS = bonobo glade samples po doc diff --git a/x11-toolkits/libbonoboui/files/patch-configure b/x11-toolkits/libbonoboui/files/patch-configure deleted file mode 100644 index e33f9e6ceb4e..000000000000 --- a/x11-toolkits/libbonoboui/files/patch-configure +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- configure 2002/04/26 11:11:58 1.1 -+++ configure 2002/04/26 11:12:23 -@@ -7013,6 +7013,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' diff --git a/x11-toolkits/libbonoboui/pkg-descr b/x11-toolkits/libbonoboui/pkg-descr index 22194d3a1d97..8ca4e661c557 100644 --- a/x11-toolkits/libbonoboui/pkg-descr +++ b/x11-toolkits/libbonoboui/pkg-descr @@ -1,9 +1,7 @@ -Bonobo is a set of language and system independant CORBA -interfaces for creating reusable components and creating compound -documents. +Bonobo is a set of language- and system-independant CORBA +interfaces for creating reusable components and compound documents. -libbonoboui includes a Gtk+ based implementation of the Bonobo -interfaces, enabling developers to create reusable components -and applications that can be used to form more complex documents. +libbonoboui includes a Gtk+-based implementation of the Bonobo +interfaces. WWW: http://www.gnome.org/ diff --git a/x11-toolkits/libbonoboui/pkg-plist b/x11-toolkits/libbonoboui/pkg-plist index 7360b136d008..a2dba1c8cc79 100644 --- a/x11-toolkits/libbonoboui/pkg-plist +++ b/x11-toolkits/libbonoboui/pkg-plist @@ -39,40 +39,40 @@ 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 -share/doc/libbonoboui/bonobo-ui.html -share/doc/libbonoboui/ch01.html -share/doc/libbonoboui/control-frame.png -share/doc/libbonoboui/control.png -share/doc/libbonoboui/home.png -share/doc/libbonoboui/index.html -share/doc/libbonoboui/index.sgml -share/doc/libbonoboui/left.png -share/doc/libbonoboui/libbonoboui-bonobo-a11y.html -share/doc/libbonoboui/libbonoboui-bonobo-control-frame.html -share/doc/libbonoboui/libbonoboui-bonobo-control.html -share/doc/libbonoboui/libbonoboui-bonobo-file-selector-util.html -share/doc/libbonoboui/libbonoboui-bonobo-plug.html -share/doc/libbonoboui/libbonoboui-bonobo-property-control.html -share/doc/libbonoboui/libbonoboui-bonobo-selector-widget.html -share/doc/libbonoboui/libbonoboui-bonobo-selector.html -share/doc/libbonoboui/libbonoboui-bonobo-socket.html -share/doc/libbonoboui/libbonoboui-bonobo-ui-component.html -share/doc/libbonoboui/libbonoboui-bonobo-ui-container.html -share/doc/libbonoboui/libbonoboui-bonobo-ui-engine-config.html -share/doc/libbonoboui/libbonoboui-bonobo-ui-engine.html -share/doc/libbonoboui/libbonoboui-bonobo-ui-node.html -share/doc/libbonoboui/libbonoboui-bonobo-ui-preferences.html -share/doc/libbonoboui/libbonoboui-bonobo-ui-sync.html -share/doc/libbonoboui/libbonoboui-bonobo-ui-util.html -share/doc/libbonoboui/libbonoboui-bonobo-widget.html -share/doc/libbonoboui/libbonoboui-bonobo-window.html -share/doc/libbonoboui/libbonoboui-bonobo-wrapper.html -share/doc/libbonoboui/libbonoboui-faq.html -share/doc/libbonoboui/libbonoboui.devhelp -share/doc/libbonoboui/right.png -share/doc/libbonoboui/up.png +%%DOCSDIR%%/bonobo-controls.html +%%DOCSDIR%%/bonobo-support-utilities.html +%%DOCSDIR%%/bonobo-ui.html +%%DOCSDIR%%/ch01.html +%%DOCSDIR%%/control-frame.png +%%DOCSDIR%%/control.png +%%DOCSDIR%%/home.png +%%DOCSDIR%%/index.html +%%DOCSDIR%%/index.sgml +%%DOCSDIR%%/left.png +%%DOCSDIR%%/libbonoboui-bonobo-a11y.html +%%DOCSDIR%%/libbonoboui-bonobo-control-frame.html +%%DOCSDIR%%/libbonoboui-bonobo-control.html +%%DOCSDIR%%/libbonoboui-bonobo-file-selector-util.html +%%DOCSDIR%%/libbonoboui-bonobo-plug.html +%%DOCSDIR%%/libbonoboui-bonobo-property-control.html +%%DOCSDIR%%/libbonoboui-bonobo-selector-widget.html +%%DOCSDIR%%/libbonoboui-bonobo-selector.html +%%DOCSDIR%%/libbonoboui-bonobo-socket.html +%%DOCSDIR%%/libbonoboui-bonobo-ui-component.html +%%DOCSDIR%%/libbonoboui-bonobo-ui-container.html +%%DOCSDIR%%/libbonoboui-bonobo-ui-engine-config.html +%%DOCSDIR%%/libbonoboui-bonobo-ui-engine.html +%%DOCSDIR%%/libbonoboui-bonobo-ui-node.html +%%DOCSDIR%%/libbonoboui-bonobo-ui-preferences.html +%%DOCSDIR%%/libbonoboui-bonobo-ui-sync.html +%%DOCSDIR%%/libbonoboui-bonobo-ui-util.html +%%DOCSDIR%%/libbonoboui-bonobo-widget.html +%%DOCSDIR%%/libbonoboui-bonobo-window.html +%%DOCSDIR%%/libbonoboui-bonobo-wrapper.html +%%DOCSDIR%%/libbonoboui-faq.html +%%DOCSDIR%%/libbonoboui.devhelp +%%DOCSDIR%%/right.png +%%DOCSDIR%%/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 @@ -87,12 +87,16 @@ share/locale/cy/LC_MESSAGES/libbonoboui-2.0.mo share/locale/da/LC_MESSAGES/libbonoboui-2.0.mo share/locale/de/LC_MESSAGES/libbonoboui-2.0.mo share/locale/el/LC_MESSAGES/libbonoboui-2.0.mo +share/locale/en_GB/LC_MESSAGES/libbonoboui-2.0.mo share/locale/es/LC_MESSAGES/libbonoboui-2.0.mo +share/locale/et/LC_MESSAGES/libbonoboui-2.0.mo share/locale/fa/LC_MESSAGES/libbonoboui-2.0.mo share/locale/fi/LC_MESSAGES/libbonoboui-2.0.mo share/locale/fr/LC_MESSAGES/libbonoboui-2.0.mo +share/locale/ga/LC_MESSAGES/libbonoboui-2.0.mo share/locale/he/LC_MESSAGES/libbonoboui-2.0.mo share/locale/hi/LC_MESSAGES/libbonoboui-2.0.mo +share/locale/hr/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 @@ -111,6 +115,7 @@ share/locale/ne/LC_MESSAGES/libbonoboui-2.0.mo share/locale/nl/LC_MESSAGES/libbonoboui-2.0.mo share/locale/nn/LC_MESSAGES/libbonoboui-2.0.mo share/locale/no/LC_MESSAGES/libbonoboui-2.0.mo +share/locale/pa/LC_MESSAGES/libbonoboui-2.0.mo share/locale/pl/LC_MESSAGES/libbonoboui-2.0.mo share/locale/pt/LC_MESSAGES/libbonoboui-2.0.mo share/locale/pt_BR/LC_MESSAGES/libbonoboui-2.0.mo @@ -121,6 +126,7 @@ share/locale/sl/LC_MESSAGES/libbonoboui-2.0.mo share/locale/sq/LC_MESSAGES/libbonoboui-2.0.mo share/locale/sr/LC_MESSAGES/libbonoboui-2.0.mo share/locale/sr@Latn/LC_MESSAGES/libbonoboui-2.0.mo +share/locale/sr@ije/LC_MESSAGES/libbonoboui-2.0.mo share/locale/sv/LC_MESSAGES/libbonoboui-2.0.mo share/locale/ta/LC_MESSAGES/libbonoboui-2.0.mo share/locale/tr/LC_MESSAGES/libbonoboui-2.0.mo @@ -134,4 +140,4 @@ share/locale/zh_TW/LC_MESSAGES/libbonoboui-2.0.mo @dirrm lib/bonobo-2.0 @dirrm include/libbonoboui-2.0/bonobo @dirrm include/libbonoboui-2.0 -@dirrm share/doc/libbonoboui +@dirrm %%DOCSDIR%% diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile index 449e8de063c6..f7496a9fc5ab 100644 --- a/x11-toolkits/libgnomeprintui/Makefile +++ b/x11-toolkits/libgnomeprintui/Makefile @@ -6,21 +6,25 @@ # PORTNAME= libgnomeprintui -PORTVERSION= 2.4.2 +PORTVERSION= 2.6.0 PORTREVISION= 1 CATEGORIES= x11-toolkits gnome 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 COMMENT= Gnome print support library +BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme +RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme + USE_BZIP2= yes USE_X_PREFIX= yes USE_XPM= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack libgnomeprint libgnomecanvas +USE_GNOME= gnomeprefix gnomehack libgnomeprint libgnomecanvas lthack intlhack +USE_REINPLACE= yes INSTALLS_SHLIB= yes USE_LIBTOOL_VER=13 USE_BISON= yes diff --git a/x11-toolkits/libgnomeprintui/distinfo b/x11-toolkits/libgnomeprintui/distinfo index ac074cf8fca4..5364d1a70072 100644 --- a/x11-toolkits/libgnomeprintui/distinfo +++ b/x11-toolkits/libgnomeprintui/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libgnomeprintui-2.4.2.tar.bz2) = 5a28283f32efaa6fa401c5e9385b9634 -SIZE (gnome2/libgnomeprintui-2.4.2.tar.bz2) = 509655 +MD5 (gnome2/libgnomeprintui-2.6.0.tar.bz2) = e6a84427a66f75137f3db735aaddacdc +SIZE (gnome2/libgnomeprintui-2.6.0.tar.bz2) = 551097 diff --git a/x11-toolkits/libgnomeprintui/files/patch-configure b/x11-toolkits/libgnomeprintui/files/patch-configure deleted file mode 100644 index 188be53fea84..000000000000 --- a/x11-toolkits/libgnomeprintui/files/patch-configure +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.orig Tue Dec 10 22:29:55 2002 -+++ configure Tue Dec 10 22:30:17 2002 -@@ -8158,6 +8158,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' diff --git a/x11-toolkits/libgnomeprintui/pkg-descr b/x11-toolkits/libgnomeprintui/pkg-descr index f7ae47f42231..cbc8ebcc69c3 100644 --- a/x11-toolkits/libgnomeprintui/pkg-descr +++ b/x11-toolkits/libgnomeprintui/pkg-descr @@ -1,4 +1,4 @@ -This is a prototype implementation of the Gnome Printing Architecture, +The user interface for the Gnome Printing Architecture, as described in: WWW: http://www.gnome.org/projects/gnome-print/ diff --git a/x11-toolkits/libgnomeprintui/pkg-plist b/x11-toolkits/libgnomeprintui/pkg-plist index b646179008ff..8d90e43fa5b5 100644 --- a/x11-toolkits/libgnomeprintui/pkg-plist +++ b/x11-toolkits/libgnomeprintui/pkg-plist @@ -1,4 +1,5 @@ include/libgnomeprintui-2.2/libgnomeprintui/gnome-font-dialog.h +include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-config-dialog.h include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-dialog.h include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-job-preview.h include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-paper-selector.h @@ -13,6 +14,13 @@ 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 +share/doc/libgnomeprintui/libgnomeprintui-gnome-print-job-preview.html +share/doc/libgnomeprintui/libgnomeprintui-gnome-print-paper-selector.html +share/doc/libgnomeprintui/libgnomeprintui-gnome-print-preview.html +share/doc/libgnomeprintui/libgnomeprintui-gnome-printer-selector.html share/doc/libgnomeprintui/libgnomeprintui.html share/doc/libgnomeprintui/right.png share/doc/libgnomeprintui/up.png @@ -28,6 +36,8 @@ 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 +share/locale/en_CA/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/en_GB/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/es/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/et/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/eu/LC_MESSAGES/libgnomeprintui-2.2.mo @@ -55,6 +65,7 @@ share/locale/ms/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/nl/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/nn/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/no/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/pa/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/pl/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/pt/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/pt_BR/LC_MESSAGES/libgnomeprintui-2.2.mo @@ -67,6 +78,7 @@ share/locale/sr/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/sr@Latn/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/sv/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/ta/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/th/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/tr/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/uk/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/vi/LC_MESSAGES/libgnomeprintui-2.2.mo diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile index f221c12df2f6..c7ac61fe1ea9 100644 --- a/x11-toolkits/libgnomeui/Makefile +++ b/x11-toolkits/libgnomeui/Makefile @@ -6,28 +6,30 @@ # PORTNAME= libgnomeui -PORTVERSION= 2.4.0.1 -PORTREVISION= 2 +PORTVERSION= 2.6.0 +PORTREVISION= 1 CATEGORIES= x11-toolkits gnome 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 COMMENT= Libraries for the GNOME GUI, a GNU desktop environment -LIB_DEPENDS+= startup-notification-1.0:${PORTSDIR}/x11/startup-notification +LIB_DEPENDS+= gnome-keyring.0:${PORTSDIR}/security/gnomekeyring \ + startup-notification-1.0:${PORTSDIR}/x11/startup-notification RUN_DEPENDS= ${X11BASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme USE_BZIP2= yes USE_X_PREFIX= yes USE_XPM= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack gnomehier libbonoboui +USE_GNOME= gnomeprefix gnomehack lthack gnomehier libbonoboui INSTALLS_SHLIB= yes USE_LIBTOOL_VER=13 USE_BISON= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +PLIST_SUB= GTK_VERSION="2.4.0" .include <bsd.port.mk> diff --git a/x11-toolkits/libgnomeui/distinfo b/x11-toolkits/libgnomeui/distinfo index 179b2af4fbe8..18b0a7cd5466 100644 --- a/x11-toolkits/libgnomeui/distinfo +++ b/x11-toolkits/libgnomeui/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libgnomeui-2.4.0.1.tar.bz2) = 196f4a3f1f4a531ff57acaa879e98dd2 -SIZE (gnome2/libgnomeui-2.4.0.1.tar.bz2) = 1269316 +MD5 (gnome2/libgnomeui-2.6.0.tar.bz2) = ef295e03112ed1647de991ad4552ce28 +SIZE (gnome2/libgnomeui-2.6.0.tar.bz2) = 1456029 diff --git a/x11-toolkits/libgnomeui/files/patch-Makefile.in b/x11-toolkits/libgnomeui/files/patch-Makefile.in index 5eb473f9c1d8..045ff7f723b0 100644 --- a/x11-toolkits/libgnomeui/files/patch-Makefile.in +++ b/x11-toolkits/libgnomeui/files/patch-Makefile.in @@ -1,11 +1,11 @@ ---- Makefile.in.orig Sat Nov 9 02:33:58 2002 -+++ Makefile.in Sat Nov 9 02:36:36 2002 -@@ -122,7 +122,7 @@ - cxxflags_set = @cxxflags_set@ +--- Makefile.in.orig Mon Mar 22 00:31:40 2004 ++++ Makefile.in Mon Mar 22 00:32:06 2004 +@@ -139,7 +139,7 @@ + YACC = @YACC@ gnomelocaledir = @gnomelocaledir@ --SUBDIRS = libgnomeui glade images demos test-gnome doc po #tests -+SUBDIRS = libgnomeui glade images demos doc po #tests +-SUBDIRS = libgnomeui file-chooser glade images demos test-gnome doc po #tests ++SUBDIRS = libgnomeui file-chooser glade images demos doc po #tests + + EXTRA_DIST = COPYING.LIB NEWS ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = config.h diff --git a/x11-toolkits/libgnomeui/files/patch-configure b/x11-toolkits/libgnomeui/files/patch-configure deleted file mode 100644 index 54a31067fcc7..000000000000 --- a/x11-toolkits/libgnomeui/files/patch-configure +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- configure 2002/04/26 12:31:45 1.1 -+++ configure 2002/04/26 12:32:10 -@@ -7099,6 +7099,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' diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui_Makefile.in b/x11-toolkits/libgnomeui/files/patch-libgnomeui_Makefile.in index 69f8b2e7c4d5..938ac8dbe444 100644 --- a/x11-toolkits/libgnomeui/files/patch-libgnomeui_Makefile.in +++ b/x11-toolkits/libgnomeui/files/patch-libgnomeui_Makefile.in @@ -1,11 +1,11 @@ ---- 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 - --INCLUDES = -I$(top_builddir) -I$(top_srcdir) -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGNOMEUILIBDIR=\""$(libdir)"\" -DGNOMEUIDATADIR=\""$(datadir)"\" -DGNOMEUIPIXMAPDIR=\""$(datadir)/pixmaps"\" -DGNOMEUIICONDIR=\""$(datadir)/icons"\" -DGNOMEUISERVERDIR=\""$(libexecdir)"\" -DGNOMEUILOCALSTATEDIR=\""$(localstatedir)"\" -DGNOMEUILOCALEDIR=\""$(gnomelocaledir)"\" -DSYSCONFDIR=\""$(sysconfdir)"\" -DG_LOG_DOMAIN=\"GnomeUI\" $(WARN_CFLAGS) $(LIBGNOMEUI_CFLAGS) -+INCLUDES = -I$(top_builddir) -I$(top_srcdir) -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGNOMEUILIBDIR=\""$(libdir)"\" -DGNOMEUIDATADIR=\""$(datadir)"\" -DGNOMEUIPIXMAPDIR=\""$(datadir)/pixmaps"\" -DGNOMEUIICONDIR=\""$(prefix)/share/icons"\" -DGNOMEUISERVERDIR=\""$(libexecdir)"\" -DGNOMEUILOCALSTATEDIR=\""$(localstatedir)"\" -DGNOMEUILOCALEDIR=\""$(gnomelocaledir)"\" -DSYSCONFDIR=\""$(sysconfdir)"\" -DG_LOG_DOMAIN=\"GnomeUI\" $(WARN_CFLAGS) $(LIBGNOMEUI_CFLAGS) - - - EXTRA_HEADERS = +--- libgnomeui/Makefile.in.orig Wed Feb 25 01:08:42 2004 ++++ libgnomeui/Makefile.in Wed Feb 25 01:10:01 2004 +@@ -158,7 +158,7 @@ + -DGNOMEUILIBDIR=\""$(libdir)"\" \ + -DGNOMEUIDATADIR=\""$(datadir)"\" \ + -DGNOMEUIPIXMAPDIR=\""$(datadir)/pixmaps"\" \ +- -DGNOMEUIICONDIR=\""$(datadir)/icons"\" \ ++ -DGNOMEUIICONDIR=\""$(prefix)/share/icons"\" \ + -DGNOMEUISERVERDIR=\""$(libexecdir)"\" \ + -DGNOMEUILOCALSTATEDIR=\""$(localstatedir)"\" \ + -DGNOMEUILOCALEDIR=\""$(gnomelocaledir)"\" \ diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-icon-lookup.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-icon-lookup.c deleted file mode 100644 index ecb6739ab17b..000000000000 --- a/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-icon-lookup.c +++ /dev/null @@ -1,24 +0,0 @@ ---- 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-descr b/x11-toolkits/libgnomeui/pkg-descr index 1dc68ad2b699..706980baddfc 100644 --- a/x11-toolkits/libgnomeui/pkg-descr +++ b/x11-toolkits/libgnomeui/pkg-descr @@ -1,3 +1,4 @@ -Libraries for the GNOME GUI, a GNU desktop environment +LibGnomeUI provides backend GUI components common to GNOME +applications. WWW: http://www.gnome.org/ diff --git a/x11-toolkits/libgnomeui/pkg-plist b/x11-toolkits/libgnomeui/pkg-plist index e7113b5466a7..c4e7ea765f94 100644 --- a/x11-toolkits/libgnomeui/pkg-plist +++ b/x11-toolkits/libgnomeui/pkg-plist @@ -17,6 +17,7 @@ include/libgnomeui-2.0/libgnomeui/gnome-druid.h include/libgnomeui-2.0/libgnomeui/gnome-entry.h include/libgnomeui-2.0/libgnomeui/gnome-file-entry.h include/libgnomeui-2.0/libgnomeui/gnome-font-picker.h +include/libgnomeui-2.0/libgnomeui/gnome-help.h include/libgnomeui-2.0/libgnomeui/gnome-href.h include/libgnomeui-2.0/libgnomeui/gnome-ice.h include/libgnomeui-2.0/libgnomeui/gnome-icon-entry.h @@ -42,68 +43,70 @@ include/libgnomeui-2.0/libgnomeui/gnome-thumbnail.h include/libgnomeui-2.0/libgnomeui/gnome-types.h include/libgnomeui-2.0/libgnomeui/gnome-ui-init.h include/libgnomeui-2.0/libgnomeui/gnome-uidefs.h +include/libgnomeui-2.0/libgnomeui/gnome-url.h include/libgnomeui-2.0/libgnomeui/gnome-vfs-util.h include/libgnomeui-2.0/libgnomeui/gnome-window-icon.h include/libgnomeui-2.0/libgnomeui/gnome-window.h include/libgnomeui-2.0/libgnomeui/gnometypebuiltins.h include/libgnomeui-2.0/libgnomeui/libgnomeui.h +lib/gtk-2.0/%%GTK_VERSION%%/filesystems/libgnome-vfs.so lib/libglade/2.0/libgnome.so lib/libgnomeui-2.a lib/libgnomeui-2.so -lib/libgnomeui-2.so.400 +lib/libgnomeui-2.so.600 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/ch01.html -share/doc/libgnomeui/deprecated.html -share/doc/libgnomeui/druids.html -share/doc/libgnomeui/fixme.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 -share/doc/libgnomeui/libgnomeui-gnome-mdi-session.html -share/doc/libgnomeui/libgnomeui-gnome-popup-menu.html -share/doc/libgnomeui/libgnomeui-gnome-stock-icons.html -share/doc/libgnomeui/libgnomeui-gnome-types.html -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-gnometypebuiltins.html -share/doc/libgnomeui/libgnomeui-objects.html -share/doc/libgnomeui/miscellaneous.html +%%DOCSDIR%%/GnomeAbout.html +%%DOCSDIR%%/GnomeApp.html +%%DOCSDIR%%/GnomeAppBar.html +%%DOCSDIR%%/GnomeClient.html +%%DOCSDIR%%/GnomeColorPicker.html +%%DOCSDIR%%/GnomeDateEdit.html +%%DOCSDIR%%/GnomeDialog.html +%%DOCSDIR%%/GnomeDruid.html +%%DOCSDIR%%/GnomeDruidPage.html +%%DOCSDIR%%/GnomeDruidPageEdge.html +%%DOCSDIR%%/GnomeDruidPageStandard.html +%%DOCSDIR%%/GnomeEntry.html +%%DOCSDIR%%/GnomeFileEntry.html +%%DOCSDIR%%/GnomeFontPicker.html +%%DOCSDIR%%/GnomeHRef.html +%%DOCSDIR%%/GnomeIconEntry.html +%%DOCSDIR%%/GnomeIconList.html +%%DOCSDIR%%/GnomeIconSelection.html +%%DOCSDIR%%/GnomeMDI.html +%%DOCSDIR%%/GnomeMDIChild.html +%%DOCSDIR%%/GnomeMDIGenericChild.html +%%DOCSDIR%%/GnomeMessageBox.html +%%DOCSDIR%%/GnomePixmap.html +%%DOCSDIR%%/GnomePixmapEntry.html +%%DOCSDIR%%/GnomePropertyBox.html +%%DOCSDIR%%/GnomeScores.html +%%DOCSDIR%%/application-mgmt.html +%%DOCSDIR%%/ch01.html +%%DOCSDIR%%/deprecated.html +%%DOCSDIR%%/druids.html +%%DOCSDIR%%/fixme.html +%%DOCSDIR%%/index.html +%%DOCSDIR%%/index.sgml +%%DOCSDIR%%/libgnomeui-GnomeIconLookup.html +%%DOCSDIR%%/libgnomeui-GnomeIconTheme.html +%%DOCSDIR%%/libgnomeui-GnomeThemeFile.html +%%DOCSDIR%%/libgnomeui-GnomeThumbnail.html +%%DOCSDIR%%/libgnomeui-gnome-app-helper.html +%%DOCSDIR%%/libgnomeui-gnome-app-util.html +%%DOCSDIR%%/libgnomeui-gnome-dialog-util.html +%%DOCSDIR%%/libgnomeui-gnome-mdi-session.html +%%DOCSDIR%%/libgnomeui-gnome-popup-menu.html +%%DOCSDIR%%/libgnomeui-gnome-stock-icons.html +%%DOCSDIR%%/libgnomeui-gnome-types.html +%%DOCSDIR%%/libgnomeui-gnome-ui-init.html +%%DOCSDIR%%/libgnomeui-gnome-uidefs.html +%%DOCSDIR%%/libgnomeui-gnome-vfs-util.html +%%DOCSDIR%%/libgnomeui-gnome-window.html +%%DOCSDIR%%/libgnomeui-gnometypebuiltins.html +%%DOCSDIR%%/libgnomeui-objects.html +%%DOCSDIR%%/miscellaneous.html share/gnome/pixmaps/gnome-about-logo.png share/gnome/pixmaps/gnome-default-dlg.png share/gnome/pixmaps/gnome-error.png @@ -122,6 +125,7 @@ share/locale/cy/LC_MESSAGES/libgnomeui-2.0.mo share/locale/da/LC_MESSAGES/libgnomeui-2.0.mo share/locale/de/LC_MESSAGES/libgnomeui-2.0.mo share/locale/el/LC_MESSAGES/libgnomeui-2.0.mo +share/locale/en_CA/LC_MESSAGES/libgnomeui-2.0.mo share/locale/en_GB/LC_MESSAGES/libgnomeui-2.0.mo share/locale/eo/LC_MESSAGES/libgnomeui-2.0.mo share/locale/es/LC_MESSAGES/libgnomeui-2.0.mo @@ -132,6 +136,7 @@ share/locale/fr/LC_MESSAGES/libgnomeui-2.0.mo share/locale/ga/LC_MESSAGES/libgnomeui-2.0.mo share/locale/he/LC_MESSAGES/libgnomeui-2.0.mo share/locale/hi/LC_MESSAGES/libgnomeui-2.0.mo +share/locale/hr/LC_MESSAGES/libgnomeui-2.0.mo share/locale/hu/LC_MESSAGES/libgnomeui-2.0.mo share/locale/id/LC_MESSAGES/libgnomeui-2.0.mo share/locale/is/LC_MESSAGES/libgnomeui-2.0.mo @@ -145,6 +150,7 @@ share/locale/lv/LC_MESSAGES/libgnomeui-2.0.mo share/locale/mk/LC_MESSAGES/libgnomeui-2.0.mo share/locale/ml/LC_MESSAGES/libgnomeui-2.0.mo share/locale/mn/LC_MESSAGES/libgnomeui-2.0.mo +share/locale/mr/LC_MESSAGES/libgnomeui-2.0.mo share/locale/ms/LC_MESSAGES/libgnomeui-2.0.mo share/locale/nl/LC_MESSAGES/libgnomeui-2.0.mo share/locale/nn/LC_MESSAGES/libgnomeui-2.0.mo @@ -159,8 +165,10 @@ 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/sr@ije/LC_MESSAGES/libgnomeui-2.0.mo share/locale/sv/LC_MESSAGES/libgnomeui-2.0.mo share/locale/ta/LC_MESSAGES/libgnomeui-2.0.mo +share/locale/th/LC_MESSAGES/libgnomeui-2.0.mo share/locale/tr/LC_MESSAGES/libgnomeui-2.0.mo share/locale/uk/LC_MESSAGES/libgnomeui-2.0.mo share/locale/vi/LC_MESSAGES/libgnomeui-2.0.mo @@ -168,6 +176,7 @@ share/locale/wa/LC_MESSAGES/libgnomeui-2.0.mo share/locale/yi/LC_MESSAGES/libgnomeui-2.0.mo share/locale/zh_CN/LC_MESSAGES/libgnomeui-2.0.mo share/locale/zh_TW/LC_MESSAGES/libgnomeui-2.0.mo -@dirrm share/doc/libgnomeui +@dirrm %%DOCSDIR%% @dirrm include/libgnomeui-2.0/libgnomeui @dirrm include/libgnomeui-2.0 +@dirrm lib/gtk-2.0/%%GTK_VERSION%%/filesystems diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile index e8d0dcc183c7..18271418f8be 100644 --- a/x11-toolkits/libwnck/Makefile +++ b/x11-toolkits/libwnck/Makefile @@ -6,11 +6,10 @@ # PORTNAME= libwnck -PORTVERSION= 2.4.0.1 -PORTREVISION= 1 +PORTVERSION= 2.6.0.1 CATEGORIES= x11-toolkits gnome 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 @@ -21,7 +20,7 @@ LIB_DEPENDS= startup-notification-1.0:${PORTSDIR}/x11/startup-notification USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOME= gnomehack gtk20 +USE_GNOME= gnomehack lthack gtk20 USE_BISON= yes INSTALLS_SHLIB= yes USE_LIBTOOL_VER=13 diff --git a/x11-toolkits/libwnck/distinfo b/x11-toolkits/libwnck/distinfo index 259371461094..049453299bed 100644 --- a/x11-toolkits/libwnck/distinfo +++ b/x11-toolkits/libwnck/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libwnck-2.4.0.1.tar.bz2) = 7a7007b285a4e3c39a7bb113cb2be45b -SIZE (gnome2/libwnck-2.4.0.1.tar.bz2) = 310490 +MD5 (gnome2/libwnck-2.6.0.1.tar.bz2) = 86b0258fa7dc8b66e3314a05862bb10f +SIZE (gnome2/libwnck-2.6.0.1.tar.bz2) = 329697 diff --git a/x11-toolkits/libwnck/files/patch-configure b/x11-toolkits/libwnck/files/patch-configure deleted file mode 100644 index c607938f6e76..000000000000 --- a/x11-toolkits/libwnck/files/patch-configure +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- configure 2002/04/26 13:54:14 1.1 -+++ configure 2002/04/26 13:54:34 -@@ -6400,6 +6400,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' diff --git a/x11-toolkits/libwnck/pkg-descr b/x11-toolkits/libwnck/pkg-descr index ada0fd869e07..685bf95e056d 100644 --- a/x11-toolkits/libwnck/pkg-descr +++ b/x11-toolkits/libwnck/pkg-descr @@ -1,5 +1,5 @@ -libwnck is aWindow Navigator Construction Kit, i.e. a library to use -for writing pagers and taskslists and stuff. It is needed for the +libwnck is a Window Navigator Construction Kit, i.e. a library used +for writing pagers and taskslists. It is needed for the GNOME 2.0 desktop. WWW: http://www.gnome.org/ diff --git a/x11-toolkits/libwnck/pkg-plist b/x11-toolkits/libwnck/pkg-plist index 8094fd6082e1..049e9e39f755 100644 --- a/x11-toolkits/libwnck/pkg-plist +++ b/x11-toolkits/libwnck/pkg-plist @@ -1,4 +1,5 @@ include/libwnck-1.0/libwnck/application.h +include/libwnck-1.0/libwnck/class-group.h include/libwnck-1.0/libwnck/libwnck.h include/libwnck-1.0/libwnck/pager.h include/libwnck-1.0/libwnck/screen.h @@ -11,7 +12,7 @@ include/libwnck-1.0/libwnck/wnck-enum-types.h include/libwnck-1.0/libwnck/workspace.h lib/libwnck-1.a lib/libwnck-1.so -lib/libwnck-1.so.11 +lib/libwnck-1.so.13 libdata/pkgconfig/libwnck-1.0.pc share/locale/am/LC_MESSAGES/libwnck.mo share/locale/ar/LC_MESSAGES/libwnck.mo @@ -25,6 +26,8 @@ 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/en_CA/LC_MESSAGES/libwnck.mo +share/locale/en_GB/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 @@ -35,6 +38,7 @@ share/locale/ga/LC_MESSAGES/libwnck.mo share/locale/gl/LC_MESSAGES/libwnck.mo share/locale/he/LC_MESSAGES/libwnck.mo share/locale/hi/LC_MESSAGES/libwnck.mo +share/locale/hr/LC_MESSAGES/libwnck.mo share/locale/hu/LC_MESSAGES/libwnck.mo share/locale/id/LC_MESSAGES/libwnck.mo share/locale/is/LC_MESSAGES/libwnck.mo @@ -48,10 +52,12 @@ share/locale/lv/LC_MESSAGES/libwnck.mo share/locale/mk/LC_MESSAGES/libwnck.mo share/locale/ml/LC_MESSAGES/libwnck.mo share/locale/mn/LC_MESSAGES/libwnck.mo +share/locale/mr/LC_MESSAGES/libwnck.mo share/locale/ms/LC_MESSAGES/libwnck.mo share/locale/nl/LC_MESSAGES/libwnck.mo share/locale/nn/LC_MESSAGES/libwnck.mo share/locale/no/LC_MESSAGES/libwnck.mo +share/locale/pa/LC_MESSAGES/libwnck.mo share/locale/pl/LC_MESSAGES/libwnck.mo share/locale/pt/LC_MESSAGES/libwnck.mo share/locale/pt_BR/LC_MESSAGES/libwnck.mo diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile index 7124c70c878b..5aae206ceffb 100644 --- a/x11-toolkits/pango/Makefile +++ b/x11-toolkits/pango/Makefile @@ -6,11 +6,10 @@ # PORTNAME= pango -PORTVERSION= 1.2.5 -PORTREVISION= 2 +PORTVERSION= 1.4.0 CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/1.2,} \ - ftp://ftp.gtk.org/pub/gtk/v2.2/ +MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/1.4,} \ + ftp://ftp.gtk.org/pub/gtk/v2.3/ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -33,7 +32,7 @@ CONFIGURE_ARGS= --with-qt=no \ --with-html-dir=${PREFIX}/share/doc \ --enable-static PKGINSTALL= ${WRKDIR}/pkg-install -# Hmm.. tough one. Found this one when I had science/hdf installed +# Hmm.. tough one. Found this one when I had graphics/hdf installed # (which installs glist.h) which is picked up before the glib-2.0 # stuff, with Bad Results[tm] # @@ -42,11 +41,13 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \ ${GLIB2_CFLAGS} -I${LOCALBASE}/include \ -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" -PLIST_SUB= VERSION="1.2.0" +PLIST_SUB= VERSION="1.4.0" FONTSCALE= ${X11BASE}/lib/X11/fonts/TTF/luximb.ttf FONTENCOD= ${X11BASE}/lib/X11/fonts/encodings/tcvn-0.enc +MAN1= pango-querymodules.1 + post-patch: @${FIND} ${WRKSRC}/pango/opentype -name "*.[ch]" | ${XARGS} \ ${REINPLACE_CMD} -e 's|internal/tterrors\.h|fterrors.h| ; \ diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo index a6d34f66c3f8..91ee4b4a4267 100644 --- a/x11-toolkits/pango/distinfo +++ b/x11-toolkits/pango/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/pango-1.2.5.tar.bz2) = df00fe3e71cd297010f24f439b6c8ee6 -SIZE (gnome2/pango-1.2.5.tar.bz2) = 865495 +MD5 (gnome2/pango-1.4.0.tar.bz2) = 9b5d9a5dcce5b3899d401f9c2cd6873f +SIZE (gnome2/pango-1.4.0.tar.bz2) = 921472 diff --git a/x11-toolkits/pango/files/patch-modules_indic_indic-ot.h b/x11-toolkits/pango/files/patch-modules_indic_indic-ot.h deleted file mode 100644 index 9e6a2e4292d0..000000000000 --- a/x11-toolkits/pango/files/patch-modules_indic_indic-ot.h +++ /dev/null @@ -1,12 +0,0 @@ ---- modules/indic/indic-ot.h.orig Tue Mar 16 16:23:13 2004 -+++ modules/indic/indic-ot.h Tue Mar 16 16:23:38 2004 -@@ -9,7 +9,8 @@ - #ifndef __INDIC_OT_H__ - #define __INDIC_OT_H__ - --#include <freetype/freetype.h> -+#include <ft2build.h> -+#include FT_FREETYPE_H - #include <pango/pango-glyph.h> - #include <pango/pango-types.h> - #include "mprefixups.h" diff --git a/x11-toolkits/pango/files/patch-pango_opentype_ftxopen.h b/x11-toolkits/pango/files/patch-pango_opentype_ftxopen.h deleted file mode 100644 index 25a937a88ef1..000000000000 --- a/x11-toolkits/pango/files/patch-pango_opentype_ftxopen.h +++ /dev/null @@ -1,12 +0,0 @@ ---- pango/opentype/ftxopen.h.orig Tue Mar 16 16:19:27 2004 -+++ pango/opentype/ftxopen.h Tue Mar 16 16:19:45 2004 -@@ -22,7 +22,8 @@ - #ifndef FTXOPEN_H - #define FTXOPEN_H - --#include <freetype/freetype.h> -+#include <ft2build.h> -+#include FT_FREETYPE_H - - #ifdef __cplusplus - extern "C" { diff --git a/x11-toolkits/pango/files/patch-pango_opentype_pango-ot-info.c b/x11-toolkits/pango/files/patch-pango_opentype_pango-ot-info.c deleted file mode 100644 index 0deb4b92e48c..000000000000 --- a/x11-toolkits/pango/files/patch-pango_opentype_pango-ot-info.c +++ /dev/null @@ -1,11 +0,0 @@ ---- pango/opentype/pango-ot-info.c.orig Tue Mar 16 16:18:19 2004 -+++ pango/opentype/pango-ot-info.c Tue Mar 16 16:17:38 2004 -@@ -22,7 +22,7 @@ - #include "pango-ot-private.h" - #include "fterrcompat.h" - #include <freetype/internal/ftobjs.h> --#include <freetype/ftmodule.h> -+#include <freetype/ftmodapi.h> - - static void pango_ot_info_class_init (GObjectClass *object_class); - static void pango_ot_info_finalize (GObject *object); diff --git a/x11-toolkits/pango/files/patch-pango_opentype_pango-ot-private.h b/x11-toolkits/pango/files/patch-pango_opentype_pango-ot-private.h deleted file mode 100644 index 0d2e0c944177..000000000000 --- a/x11-toolkits/pango/files/patch-pango_opentype_pango-ot-private.h +++ /dev/null @@ -1,12 +0,0 @@ ---- pango/opentype/pango-ot-private.h.orig Tue Mar 16 16:16:35 2004 -+++ pango/opentype/pango-ot-private.h Tue Mar 16 16:18:53 2004 -@@ -22,7 +22,8 @@ - #ifndef __PANGO_OT_PRIVATE_H__ - #define __PANGO_OT_PRIVATE_H__ - --#include <freetype/freetype.h> -+#include <ft2build.h> -+#include FT_FREETYPE_H - - #include <glib-object.h> - diff --git a/x11-toolkits/pango/files/patch-pango_pango-ot.h b/x11-toolkits/pango/files/patch-pango_pango-ot.h deleted file mode 100644 index 61e68f7207e7..000000000000 --- a/x11-toolkits/pango/files/patch-pango_pango-ot.h +++ /dev/null @@ -1,12 +0,0 @@ ---- pango/pango-ot.h.orig Tue Mar 16 16:21:00 2004 -+++ pango/pango-ot.h Tue Mar 16 16:21:18 2004 -@@ -22,7 +22,8 @@ - #ifndef __PANGO_OT_H__ - #define __PANGO_OT_H__ - --#include <freetype/freetype.h> -+#include <ft2build.h> -+#include FT_FREETYPE_H - #include <pango/pango-glyph.h> - - G_BEGIN_DECLS diff --git a/x11-toolkits/pango/files/patch-pango_pangoft2.c b/x11-toolkits/pango/files/patch-pango_pangoft2.c deleted file mode 100644 index f1d05cd84dfd..000000000000 --- a/x11-toolkits/pango/files/patch-pango_pangoft2.c +++ /dev/null @@ -1,12 +0,0 @@ ---- pango/pangoft2.c.orig Tue Mar 16 16:21:59 2004 -+++ pango/pangoft2.c Tue Mar 16 16:22:20 2004 -@@ -28,7 +28,8 @@ - #include <glib.h> - #include <glib/gprintf.h> - --#include <freetype/freetype.h> -+#include <ft2build.h> -+#include FT_FREETYPE_H - - #include "pango-utils.h" - #include "pangoft2.h" diff --git a/x11-toolkits/pango/files/patch-pango_pangoft2.h b/x11-toolkits/pango/files/patch-pango_pangoft2.h deleted file mode 100644 index af7dcded906f..000000000000 --- a/x11-toolkits/pango/files/patch-pango_pangoft2.h +++ /dev/null @@ -1,12 +0,0 @@ ---- pango/pangoft2.h.orig Tue Mar 16 16:14:49 2004 -+++ pango/pangoft2.h Tue Mar 16 16:15:21 2004 -@@ -23,7 +23,8 @@ - #ifndef __PANGOFT2_H__ - #define __PANGOFT2_H__ - --#include <freetype/freetype.h> -+#include <ft2build.h> -+#include FT_FREETYPE_H - - #include <fontconfig/fontconfig.h> - diff --git a/x11-toolkits/pango/files/pkg-install.in b/x11-toolkits/pango/files/pkg-install.in index d734df0dddfc..2eefcdfcd015 100644 --- a/x11-toolkits/pango/files/pkg-install.in +++ b/x11-toolkits/pango/files/pkg-install.in @@ -3,7 +3,9 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin:%%X11BASE%%/bin export PATH -if [ "$2" = "POST-INSTALL" ]; then +case $2 in +POST-INSTALL) echo "Running fc-cache to build fontconfig cache..." fc-cache -f -v -fi + ;; +esac diff --git a/x11-toolkits/pango/pkg-descr b/x11-toolkits/pango/pkg-descr index 49eeb62d0df3..9ff793b51135 100644 --- a/x11-toolkits/pango/pkg-descr +++ b/x11-toolkits/pango/pkg-descr @@ -1,8 +1,6 @@ -The goal of the Pango project is to provide an open-source framework for the -layout and rendering of internationalized text. Pango is an offshoot of the -GTK+ and GNOME projects, and the initial focus is operation in those -environments, however there is nothing fundamentally GTK+ or GNOME specific -about Pango. Pango uses Unicode for all of its encoding, and will eventually -support output in all the world's major languages. +Pango provides a framework to render and control the layout of +internationalized text, and is the backend for right-to-left text. +Pango is an integral part of the GTK+ and GNOME projects, but its +code is platform- and toolkit-independent. WWW: http://www.pango.org/ diff --git a/x11-toolkits/pango/pkg-plist b/x11-toolkits/pango/pkg-plist index 575d51a21f62..cbb44b3091ae 100644 --- a/x11-toolkits/pango/pkg-plist +++ b/x11-toolkits/pango/pkg-plist @@ -12,56 +12,47 @@ include/pango-1.0/pango/pango-fontmap.h include/pango-1.0/pango/pango-fontset.h include/pango-1.0/pango/pango-glyph-item.h include/pango-1.0/pango/pango-glyph.h -include/pango-1.0/pango/pango-indic.h include/pango-1.0/pango/pango-item.h include/pango-1.0/pango/pango-layout.h include/pango-1.0/pango/pango-modules.h include/pango-1.0/pango/pango-ot.h +include/pango-1.0/pango/pango-script.h include/pango-1.0/pango/pango-tabs.h include/pango-1.0/pango/pango-types.h include/pango-1.0/pango/pango-utils.h include/pango-1.0/pango/pango.h +include/pango-1.0/pango/pangofc-font.h +include/pango-1.0/pango/pangofc-fontmap.h include/pango-1.0/pango/pangoft2.h include/pango-1.0/pango/pangox.h include/pango-1.0/pango/pangoxft.h lib/libpango-1.0.a lib/libpango-1.0.so -lib/libpango-1.0.so.200 +lib/libpango-1.0.so.399 lib/libpangoft2-1.0.a lib/libpangoft2-1.0.so -lib/libpangoft2-1.0.so.200 +lib/libpangoft2-1.0.so.399 lib/libpangox-1.0.a lib/libpangox-1.0.so -lib/libpangox-1.0.so.200 +lib/libpangox-1.0.so.399 lib/libpangoxft-1.0.a lib/libpangoxft-1.0.so -lib/libpangoxft-1.0.so.200 -lib/pango/%%VERSION%%/modules/pango-arabic-ft2.so -lib/pango/%%VERSION%%/modules/pango-arabic-x.so -lib/pango/%%VERSION%%/modules/pango-arabic-xft.so -lib/pango/%%VERSION%%/modules/pango-basic-ft2.so +lib/libpangoxft-1.0.so.399 +lib/pango/%%VERSION%%/modules/pango-arabic-fc.so +lib/pango/%%VERSION%%/modules/pango-basic-fc.so lib/pango/%%VERSION%%/modules/pango-basic-x.so -lib/pango/%%VERSION%%/modules/pango-basic-xft.so -lib/pango/%%VERSION%%/modules/pango-bengali-x.so -lib/pango/%%VERSION%%/modules/pango-devanagari-x.so -lib/pango/%%VERSION%%/modules/pango-gujarati-x.so -lib/pango/%%VERSION%%/modules/pango-gurmukhi-x.so -lib/pango/%%VERSION%%/modules/pango-hangul-xft.so -lib/pango/%%VERSION%%/modules/pango-hangul-x.so -lib/pango/%%VERSION%%/modules/pango-hebrew-ft2.so -lib/pango/%%VERSION%%/modules/pango-hebrew-x.so -lib/pango/%%VERSION%%/modules/pango-hebrew-xft.so -lib/pango/%%VERSION%%/modules/pango-indic-xft.so -lib/pango/%%VERSION%%/modules/pango-indic-ft2.so -lib/pango/%%VERSION%%/modules/pango-myanmar-x.so -lib/pango/%%VERSION%%/modules/pango-tamil-x.so -lib/pango/%%VERSION%%/modules/pango-thai-x.so -lib/pango/%%VERSION%%/modules/pango-thai-xft.so -lib/pango/%%VERSION%%/modules/pango-thai-ft2.so +lib/pango/%%VERSION%%/modules/pango-hangul-fc.so +lib/pango/%%VERSION%%/modules/pango-hebrew-fc.so +lib/pango/%%VERSION%%/modules/pango-indic-fc.so +lib/pango/%%VERSION%%/modules/pango-thai-fc.so libdata/pkgconfig/pango.pc libdata/pkgconfig/pangoft2.pc libdata/pkgconfig/pangox.pc libdata/pkgconfig/pangoxft.pc +share/doc/pango/PangoEngineLang.html +share/doc/pango/PangoEngineShape.html +share/doc/pango/PangoFcFont.html +share/doc/pango/PangoFcFontMap.html share/doc/pango/home.png share/doc/pango/index.html share/doc/pango/index.sgml @@ -75,20 +66,22 @@ share/doc/pango/pango-Engines.html share/doc/pango/pango-Fonts.html share/doc/pango/pango-FreeType-Fonts-and-Rendering.html share/doc/pango/pango-Glyph-Storage.html -share/doc/pango/pango-Indic-Engine-Support.html share/doc/pango/pango-Layout-Objects.html share/doc/pango/pango-Modules.html share/doc/pango/pango-OpenType-Font-Handling.html +share/doc/pango/pango-Scripts.html share/doc/pango/pango-Tab-Stops.html share/doc/pango/pango-Text-Attributes.html share/doc/pango/pango-Text-Processing.html share/doc/pango/pango-Win32-Fonts-and-Rendering.html share/doc/pango/pango-X-Fonts-and-Rendering.html share/doc/pango/pango-Xft-Fonts-and-Rendering.html +share/doc/pango/pango-querymodules.html share/doc/pango/pango.devhelp share/doc/pango/pango.html share/doc/pango/rendering.html share/doc/pango/right.png +share/doc/pango/tools.html share/doc/pango/up.png @dirrm share/doc/pango @dirrm lib/pango/%%VERSION%%/modules diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile index 389226446b2e..2df4b83617cf 100644 --- a/x11-wm/metacity/Makefile +++ b/x11-wm/metacity/Makefile @@ -6,10 +6,10 @@ # PORTNAME= metacity -PORTVERSION= 2.6.5 +PORTVERSION= 2.8.0 CATEGORIES= x11-wm 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 diff --git a/x11-wm/metacity/distinfo b/x11-wm/metacity/distinfo index d19032956bdd..6bea381d8ea0 100644 --- a/x11-wm/metacity/distinfo +++ b/x11-wm/metacity/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/metacity-2.6.5.tar.bz2) = 2530cca3818a6c25caa2f2aa135cfd62 -SIZE (gnome2/metacity-2.6.5.tar.bz2) = 1775893 +MD5 (gnome2/metacity-2.8.0.tar.bz2) = c40109eaaaaf28c70eafce140b61bf13 +SIZE (gnome2/metacity-2.8.0.tar.bz2) = 1998468 diff --git a/x11-wm/metacity/pkg-descr b/x11-wm/metacity/pkg-descr index 1323c5dcb06f..fb1cb52b9383 100644 --- a/x11-wm/metacity/pkg-descr +++ b/x11-wm/metacity/pkg-descr @@ -1 +1,4 @@ -A window manager for the adult in you. +Metacity is a low-frills Window Manager, and is the default +Window Manager of the GNOME 2 desktop. It provides most of +the features expected of a Window Manager, but leaves everything +it can up to other components of the GNOME environment. diff --git a/x11-wm/metacity/pkg-plist b/x11-wm/metacity/pkg-plist index 68b26abe73dd..e1e41ed5079b 100644 --- a/x11-wm/metacity/pkg-plist +++ b/x11-wm/metacity/pkg-plist @@ -119,6 +119,7 @@ share/gnome/themes/Simple/metacity-1/metacity-theme-1.xml share/gnome/themes/Simple/metacity-1/minimize.png share/gnome/wm-properties/metacity.desktop share/locale/am/LC_MESSAGES/metacity.mo +share/locale/ar/LC_MESSAGES/metacity.mo share/locale/az/LC_MESSAGES/metacity.mo share/locale/be/LC_MESSAGES/metacity.mo share/locale/bg/LC_MESSAGES/metacity.mo @@ -129,6 +130,7 @@ 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_CA/LC_MESSAGES/metacity.mo share/locale/en_GB/LC_MESSAGES/metacity.mo share/locale/es/LC_MESSAGES/metacity.mo share/locale/fa/LC_MESSAGES/metacity.mo @@ -138,6 +140,7 @@ 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/hr/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 @@ -165,6 +168,7 @@ share/locale/sr/LC_MESSAGES/metacity.mo share/locale/sr@Latn/LC_MESSAGES/metacity.mo share/locale/sv/LC_MESSAGES/metacity.mo share/locale/ta/LC_MESSAGES/metacity.mo +share/locale/th/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 diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile index 99b9aec6880d..1a6eadf946e4 100644 --- a/x11/gdm2/Makefile +++ b/x11/gdm2/Makefile @@ -6,11 +6,11 @@ # PORTNAME= gdm2 -PORTVERSION= 2.4.4.7 -PORTREVISION= 2 +PORTVERSION= 2.6.0.0 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.4 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.6 DISTNAME= gdm-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -19,14 +19,14 @@ COMMENT= GNOME 2 version of xdm display manager USE_BZIP2= yes USE_X_PREFIX= yes -USE_REINPLACE= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix intlhack gnomehack gnomehier libgnomeui librsvg2 +USE_GNOME= gnomeprefix gnomehack intlhack gnomehier libgnomeui librsvg2 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" GDMDIR?= ${PREFIX}/etc/gdm +PKGMESSAGE= ${WRKDIR}/pkg-message MAN1= gdm.1 @@ -42,16 +42,13 @@ post-extract: @${SED} -e "s,%%PREFIX%%,${PREFIX},g" \ ${FILESDIR}/gdm.sh.sample > ${WRKSRC}/gdm.sh.sample -post-patch: -.if ${OSVERSION} >= 450002 && ${OSVERSION} < 500000 || ${OSVERSION} >= 500020 - @${REINPLACE_CMD} -E -e 's/(..)\.EUC/\1.euc\1/' ${WRKSRC}/config/locale.alias -.endif - post-install: .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif @${INSTALL_SCRIPT} ${WRKSRC}/gdm.sh.sample ${PREFIX}/etc/rc.d + @${SED} -e 's|%%PREFIX%%|${PREFIX}|g' < ${PKGDIR}/pkg-message \ + | /usr/bin/fmt 75 79 > ${PKGMESSAGE} @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/x11/gdm2/distinfo b/x11/gdm2/distinfo index 015a197fff22..43b847b7a871 100644 --- a/x11/gdm2/distinfo +++ b/x11/gdm2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gdm-2.4.4.7.tar.bz2) = a3d2f243c4f42e2542bda8cb5fb9a7c5 -SIZE (gnome2/gdm-2.4.4.7.tar.bz2) = 2430455 +MD5 (gnome2/gdm-2.6.0.0.tar.bz2) = 3dbf4074a4ec78627a5d099d30126d45 +SIZE (gnome2/gdm-2.6.0.0.tar.bz2) = 2850702 diff --git a/x11/gdm2/files/patch-ab b/x11/gdm2/files/patch-ab index 11f4da7ee56b..cc11b86e69c2 100644 --- a/x11/gdm2/files/patch-ab +++ b/x11/gdm2/files/patch-ab @@ -1,6 +1,6 @@ ---- config/gdm.conf.in.orig Fri Oct 10 16:57:25 2003 -+++ config/gdm.conf.in Thu Oct 16 14:33:28 2003 -@@ -73,7 +73,7 @@ +--- config/gdm.conf.in.orig Thu Feb 12 14:22:36 2004 ++++ config/gdm.conf.in Sat Mar 6 17:22:29 2004 +@@ -77,7 +77,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 @@ -9,7 +9,7 @@ # You should probably never change this value unless you have a weird setup PidFile=/var/run/gdm.pid # Note that a post login script is run before a PreSession script. -@@ -93,7 +93,7 @@ +@@ -97,7 +97,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=/usr/bin/reboot;/sbin/reboot;/sbin/shutdown -r now;/usr/sbin/shutdown -r now @@ -18,7 +18,7 @@ #SuspendCommand= # Probably should not touch the below this is the standard setup ServAuthDir=@EXPANDED_AUTHDIR@ -@@ -127,7 +127,7 @@ +@@ -136,7 +136,7 @@ # we force X to use specific vts. turn VTAllocation to false if this # is causing problems. #FirstVT=7 @@ -27,16 +27,16 @@ # Should double login be treated with a warning (and possibility to change # vts on linux systems for console logins) #DoubleLoginWarning=true -@@ -211,7 +211,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. +@@ -232,7 +232,7 @@ + # The specific gtkrc file we use. It should be the full path to the gtkrc + # that we need. Unless you need a specific gtkrc that doesn't correspond to + # a specific theme, then just use the GtkTheme key -#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 -@@ -364,7 +364,7 @@ + + # The GTK+ theme to use for the gui + #GtkTheme=Default +@@ -415,7 +415,7 @@ # Definition of the standard X server. [server-Standard] name=Standard server diff --git a/x11/gdm2/files/patch-config_locale.alias b/x11/gdm2/files/patch-config_locale.alias index 8ac5400b0567..7e944b8d2900 100644 --- a/x11/gdm2/files/patch-config_locale.alias +++ b/x11/gdm2/files/patch-config_locale.alias @@ -1,6 +1,6 @@ ---- 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 @@ +--- config/locale.alias.orig Sun Feb 29 12:56:10 2004 ++++ config/locale.alias Sat Mar 6 17:45:16 2004 +@@ -14,79 +14,43 @@ # # - George @@ -25,6 +25,7 @@ -English(American) en_US.UTF-8,en_US -English(Australian) en_AU.UTF-8,en_AU -English(British) en_GB.UTF-8,en_GB +-English(Canadian) en_CA.UTF-8,en_CA -English(Ireland) en_IE.UTF-8,en_IE -Estonian et_EE.UTF-8,et_EE -Finnish fi_FI.UTF-8,fi_FI @@ -61,7 +62,9 @@ -Portuguese pt_PT.UTF-8,pt_PT -Romanian ro_RO.UTF-8,ro_RO -Russian ru_RU.UTF-8,ru_RU --Serbian sr_YU.UTF-8,sr_YU +-Serbian sr_CS.UTF-8,sr_CS,sr_YU@cyrillic,sr_YU +-Serbian(Latin) sr_CS.UTF-8@Latn,sr_CS@Latn,sr_YU@Latn +-Serbian(Jekavian) sr_CS.UTF-8@ije,sr_CS@ije,sr_YU@ije -Slovak sk_SK.UTF-8,sk_SK -Slovenian sl_SI.UTF-8,sl_SI -Spanish es_ES.UTF-8,es_ES @@ -77,36 +80,43 @@ -Walloon wa_BE.UTF-8,wa_BE -Welsh cy_GB.UTF-8,cy_GB -Yiddish yi.UTF-8,yi -+Bulgarian bg_BG.UTF-8,bg_BG.CP1251 -+Chinese(simplified) zh_CN.UTF-8,zh_CN.EUC -+Chinese(traditional) zh_TW.UTF-8,zh_TW.Big5 -+Croatian hr_HR.UTF-8,hr_HR.ISO8859-2 -+Czech cs_CZ.UTF-8,cs_CZ.ISO8859-2 -+Danish da_DK.UTF-8,da_DK.ISO8859-1 -+Dutch nl_NL.UTF-8,nl_NL.ISO8859-15 -+Estonian et_EE.UTF-8,et_EE.ISO8859-15 -+English(American) en_US.UTF-8,en_US.ISO8859-1 -+English(Australian) en_AU.UTF-8,en_AU.ISO8859-1 -+English(British) en_GB.UTF-8,en_GB.ISO8859-1 -+Finnish fi_FI.UTF-8,fi_FI.ISO8859-15 -+French fr_FR.UTF-8,fr_FR.ISO8859-15 -+German de_DE.UTF-8,de_DE.ISO8859-15 -+Greek el_GR.UTF-8,el_GR.ISO8859-7 -+Hungarian hu_HU.UTF-8,hu_HU.ISO8859-2 -+Icelandic is_IS.UTF-8,is_IS.ISO8859-1 -+Italian it_IT.UTF-8,it_IT.ISO8859-15 -+Japanese ja_JP.UTF-8,ja_JP.EUC -+Korean ko_KR.UTF-8,ko_KR.EUC -+Lithuanian lt_LT.UTF-8,lt_LT.ISO8859-4 -+Norwegian(bokmal) no_NO.UTF-8,no_NO.ISO8859-1 -+Polish pl_PL.UTF-8,pl_PL.ISO8859-2 -+Portuguese pt_PT.UTF-8,pt_PT.ISO8859-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.ISO8859-5 -+Slovak sk_SK.UTF-8,sk_SK.ISO8859-2 -+Slovenian sl_SI.UTF-8,sl_SI.ISO8859-2 -+Spanish es_ES.UTF-8,es_ES.ISO8859-15 -+Swedish sv_SE.UTF-8,sv_SE.ISO8859-1 -+Turkish tr_TR.UTF-8,tr_TR.ISO8859-9 -+Ukrainian uk_UA.UTF-8,uk_UA.ISO8859-5 ++Afrikaans af_ZA.ISO8859-15,af_ZA.ISO8859-1 ++Amharic am_ET.UTF-8 ++Byelorussian be_BY.CP1131,be_BY.CP1251,be_BY.ISO8859-5 ++Bulgarian bg_BG.CP1251 ++Catalan ca_ES.ISO8859-15,ca_ES.ISO8859-1 ++Chinese(simplified) zh_CN.EUC,zh_CN.eucCN ++Chinese(traditional) zh_TW.Big5 ++Croatian hr_HR.ISO8859-2 ++Czech cs_CZ.ISO8859-2 ++Danish da_DK.ISO8859-15,da_DK.ISO8859-1 ++Dutch nl_NL.ISO8859-15,nl_NL.ISO8859-1 ++English(American) en_US.ISO8859-1,en_US.ISO8859-15 ++English(Australian) en_AU.ISO8859-1,en_AU.ISO8859-15 ++English(British) en_GB.ISO8859-1,en_GB.ISO8859-15 ++English(Canadian) en_CA.ISO8859-1,en_CA.ISO8859-15 ++Estonian et_EE.ISO8859-15 ++Finnish fi_FI.ISO8859-15,fi_FI.ISO8859-1 ++French fr_FR.ISO8859-15,fr_FR.ISO8859-1 ++German de_DE.ISO8859-15,de_DE.ISO8859-1 ++Greek el_GR.ISO8859-7 ++Hindi hi_IN.ISCII-DEV ++Hungarian hu_HU.ISO8859-2 ++Icelandic is_IS.ISO8859-1,is_IS.ISO8859-15 ++Italian it_IT.ISO8859-15,it_IT.ISO8859-1 ++Italian(Swiss) it_CH.ISO8859-15,it_CH.ISO8859-1 ++Japanese ja_JP.EUC,ja_JP.eucJP ++Korean ko_KR.EUC,ko_KR.eucKR ++Lithuanian lt_LT.ISO8859-4,lt_LT.ISO8859-13 ++Norwegian(bokmal) no_NO.ISO8859-1,no_NO.ISO8859-15 ++Polish pl_PL.ISO8859-2 ++Portuguese pt_PT.ISO8859-15,pt_PT.ISO8859-1 ++Portuguese(Brazilian) pt_BR.ISO8859-1 ++Romanian ro_RO.ISO8859-2 ++Russian ru_RU.ISO8859-5 ++Slovak sk_SK.ISO8859-2 ++Slovenian sl_SI.ISO8859-2 ++Spanish es_ES.ISO8859-15,es_ES.ISO8859-1 ++Swedish sv_SE.ISO8859-1 ++Turkish tr_TR.ISO8859-9 ++Ukrainian uk_UA.ISO8859-5 diff --git a/x11/gdm2/pkg-descr b/x11/gdm2/pkg-descr index 85c150c4c6f2..2485dadfecef 100644 --- a/x11/gdm2/pkg-descr +++ b/x11/gdm2/pkg-descr @@ -1,3 +1,2 @@ -The GNOME 2.0 version of the xdm display manager. It has support for -face pixmaps, multiple sessions plus clean shutdowns from the login -menu. +The GNOME 2.0 version of the xdm display manager. It supports user +icons, multiple sessions, and clean system shutdowns. diff --git a/x11/gdm2/pkg-install b/x11/gdm2/pkg-install index b8f29b328edf..13e26f4bfba2 100644 --- a/x11/gdm2/pkg-install +++ b/x11/gdm2/pkg-install @@ -1,10 +1,7 @@ #!/bin/sh -if [ -n "${PACKAGE_BUILDING}" ]; then - exit 0 -fi - -if [ "$2" = "POST-INSTALL" ]; then +case $2 in +POST-INSTALL) USER=gdm GROUP=${USER} UID=92 @@ -39,4 +36,5 @@ if [ "$2" = "POST-INSTALL" ]; then ${CHOWN} -R ${USER}:${GROUP} ${PKG_PREFIX}/share/gnome/gdm ${PKG_PREFIX}/etc/gdm ${CHMOD} 0750 ${PKG_PREFIX}/share/gnome/gdm exit 0 -fi + ;; +esac diff --git a/x11/gdm2/pkg-message b/x11/gdm2/pkg-message index 03665d14d573..b2e15c7ab690 100644 --- a/x11/gdm2/pkg-message +++ b/x11/gdm2/pkg-message @@ -1,25 +1,26 @@ GDM is installed. -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. +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 in +%%PREFIX%%/etc/rc.d. 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 +the GNOME 2 fontencoding. This file is located in +%%PREFIX%%/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 do not feel comfortable with this, edit this file according to your preferences. -If you are running 5.x and you are running 5.1-RELEASE or earlier, GDM will +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: # 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. +4.X. diff --git a/x11/gdm2/pkg-plist b/x11/gdm2/pkg-plist index d585f33133d2..0c5d3bcc764c 100644 --- a/x11/gdm2/pkg-plist +++ b/x11/gdm2/pkg-plist @@ -9,7 +9,6 @@ bin/gdmlogin bin/gdmphotosetup bin/gdmsetup bin/gdmthemetester -etc/dm/Sessions/default.desktop etc/gdm/Init/Default etc/gdm/PostLogin/Default.sample etc/gdm/PostSession/Default @@ -39,8 +38,16 @@ share/gnome/applications/gdmflexiserver-xnest.desktop share/gnome/applications/gdmflexiserver.desktop share/gnome/applications/gdmsetup.desktop share/gnome/capplets/gdmphotosetup.desktop +share/gnome/gdm/BuiltInSessions/default.desktop share/gnome/gdm/gdmchooser.glade share/gnome/gdm/gdmsetup.glade +share/gnome/gdm/themes/circles/GdmGreeterTheme.desktop +share/gnome/gdm/themes/circles/background.svg +share/gnome/gdm/themes/circles/circles.xml +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/gdm/themes/happygnome-list/GdmGreeterTheme.desktop share/gnome/gdm/themes/happygnome-list/background.svg share/gnome/gdm/themes/happygnome-list/disconnect.png @@ -59,17 +66,60 @@ share/gnome/gdm/themes/happygnome/options.png share/gnome/gdm/themes/happygnome/screenshot.png share/gnome/gdm/themes/happygnome/session.png share/gnome/gdm/themes/happygnome/system.png -share/gnome/gdm/themes/circles/GdmGreeterTheme.desktop -share/gnome/gdm/themes/circles/background.svg -share/gnome/gdm/themes/circles/circles.xml -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/help/gdm/de/figures/gdm_window.png +share/gnome/help/gdm/de/gdm.xml +share/gnome/help/gdm/de/legal.xml +share/gnome/help/gdm/es/figures/gdm_window.png +share/gnome/help/gdm/es/gdm.xml +share/gnome/help/gdm/es/legal.xml +share/gnome/help/gdm/fr/figures/gdm_window.png +share/gnome/help/gdm/fr/gdm.xml +share/gnome/help/gdm/fr/legal.xml +share/gnome/help/gdm/it/figures/gdm_window.png +share/gnome/help/gdm/it/gdm.xml +share/gnome/help/gdm/it/legal.xml +share/gnome/help/gdm/ja/figures/gdm_window.png +share/gnome/help/gdm/ja/gdm.xml +share/gnome/help/gdm/ja/legal.xml +share/gnome/help/gdm/ko/figures/gdm_window.png +share/gnome/help/gdm/ko/gdm.xml +share/gnome/help/gdm/ko/legal.xml +share/gnome/help/gdm/sv/figures/gdm_window.png +share/gnome/help/gdm/sv/gdm.xml +share/gnome/help/gdm/sv/legal.xml +share/gnome/help/gdm/zh_CN/figures/gdm_window.png +share/gnome/help/gdm/zh_CN/gdm.xml +share/gnome/help/gdm/zh_CN/legal.xml +share/gnome/help/gdm/zh_HK/figures/gdm_window.png +share/gnome/help/gdm/zh_HK/gdm.xml +share/gnome/help/gdm/zh_HK/legal.xml +share/gnome/help/gdm/zh_TW/figures/gdm_window.png +share/gnome/help/gdm/zh_TW/gdm.xml +share/gnome/help/gdm/zh_TW/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/omf/gdm/gdm-de.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gdm/gdm-de.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gdm/gdm-es.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gdm/gdm-es.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gdm/gdm-fr.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gdm/gdm-fr.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gdm/gdm-it.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gdm/gdm-it.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gdm/gdm-ja.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gdm/gdm-ja.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gdm/gdm-ko.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gdm/gdm-ko.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gdm/gdm-sv.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gdm/gdm-sv.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gdm/gdm-zh_CN.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gdm/gdm-zh_CN.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gdm/gdm-zh_HK.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gdm/gdm-zh_HK.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gdm/gdm-zh_TW.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gdm/gdm-zh_TW.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 @@ -88,6 +138,7 @@ 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 +share/locale/en_CA/LC_MESSAGES/gdm-2.4.mo share/locale/es/LC_MESSAGES/gdm-2.4.mo share/locale/et/LC_MESSAGES/gdm-2.4.mo share/locale/eu/LC_MESSAGES/gdm-2.4.mo @@ -98,6 +149,7 @@ share/locale/ga/LC_MESSAGES/gdm-2.4.mo share/locale/gl/LC_MESSAGES/gdm-2.4.mo share/locale/he/LC_MESSAGES/gdm-2.4.mo share/locale/hi/LC_MESSAGES/gdm-2.4.mo +share/locale/hr/LC_MESSAGES/gdm-2.4.mo share/locale/hu/LC_MESSAGES/gdm-2.4.mo share/locale/id/LC_MESSAGES/gdm-2.4.mo share/locale/is/LC_MESSAGES/gdm-2.4.mo @@ -134,15 +186,48 @@ share/locale/zh_CN/LC_MESSAGES/gdm-2.4.mo share/locale/zh_TW/LC_MESSAGES/gdm-2.4.mo @dirrm share/gnome/xsessions @dirrm share/gnome/omf/gdm +@dirrm share/gnome/help/gdm/zh_TW/figures +@dirrm share/gnome/help/gdm/zh_TW +@dirrm share/gnome/help/gdm/zh_HK/figures +@dirrm share/gnome/help/gdm/zh_HK +@dirrm share/gnome/help/gdm/zh_CN/figures +@dirrm share/gnome/help/gdm/zh_CN +@dirrm share/gnome/help/gdm/sv/figures +@dirrm share/gnome/help/gdm/sv +@dirrm share/gnome/help/gdm/ko/figures +@dirrm share/gnome/help/gdm/ko +@dirrm share/gnome/help/gdm/ja/figures +@dirrm share/gnome/help/gdm/ja +@dirrm share/gnome/help/gdm/it/figures +@dirrm share/gnome/help/gdm/it +@dirrm share/gnome/help/gdm/fr/figures +@dirrm share/gnome/help/gdm/fr +@dirrm share/gnome/help/gdm/es/figures +@dirrm share/gnome/help/gdm/es +@dirrm share/gnome/help/gdm/de/figures +@dirrm share/gnome/help/gdm/de @dirrm share/gnome/help/gdm/C @dirrm share/gnome/help/gdm @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 share/gnome/gdm/BuiltInSessions @dirrm etc/pam.d @dirrm etc/gdm/modules @dirrm etc/gdm/PostLogin @unexec /bin/rmdir %D/etc/dm/Sessions 2>/dev/null || /usr/bin/true @unexec /bin/rmdir %D/etc/dm 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/gnome/log/gdm 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/gnome/log 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gdm/gdm-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gdm/gdm-de.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gdm/gdm-es.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gdm/gdm-fr.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gdm/gdm-it.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gdm/gdm-ja.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gdm/gdm-ko.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gdm/gdm-sv.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gdm/gdm-zh_CN.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gdm/gdm-zh_HK.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gdm/gdm-zh_TW.omf 2>/dev/null || /usr/bin/true diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile index ca1d3573a6ff..d8acc579f014 100644 --- a/x11/gnome-applets/Makefile +++ b/x11/gnome-applets/Makefile @@ -6,24 +6,25 @@ # PORTNAME= gnomeapplets2 -PORTVERSION= 2.4.2 -PORTREVISION= 1 +PORTVERSION= 2.6.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-applets/2.4 +MASTER_SITE_SUBDIR= sources/gnome-applets/2.6 DISTNAME= gnome-applets-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Applets components for the Gnome 2 Desktop Environment -LIB_DEPENDS= gtop-2.0:${PORTSDIR}/devel/libgtop2 +LIB_DEPENDS= gtop-2.0:${PORTSDIR}/devel/libgtop2 \ + xklavier.8:${PORTSDIR}/x11/libxklavier USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes +USE_REINPLACE= yes GNOME_DESKTOP_VERSION=2 -USE_GNOME= gnomehier gnomeprefix gnomehack gnomepanel gail +USE_GNOME= gnomehier gnomeprefix gnomehack intlhack lthack gnomepanel gail USE_LIBTOOL_VER=13 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" @@ -31,9 +32,10 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ .include <bsd.port.pre.mk> .if ${ARCH} != "i386" -PLIST_SUB= BATTERY="@comment " +CONFIGURE_ENV+= CFLAGS="${CFLAGS} -fPIC" +PLIST_SUB= BATTERY="@comment " .else -PLIST_SUB= BATTERY="" +PLIST_SUB= BATTERY="" .endif .include <bsd.port.post.mk> diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo index f42065cf1b1e..aa222f7bdcb0 100644 --- a/x11/gnome-applets/distinfo +++ b/x11/gnome-applets/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-applets-2.4.2.tar.bz2) = 3a59c7f5b452e4f9675dfce44a2b3433 -SIZE (gnome2/gnome-applets-2.4.2.tar.bz2) = 4057266 +MD5 (gnome2/gnome-applets-2.6.0.tar.bz2) = 9c2dcde8fc94dd43f8aa7be52ca9c103 +SIZE (gnome2/gnome-applets-2.6.0.tar.bz2) = 4643605 diff --git a/x11/gnome-applets/files/patch-aa b/x11/gnome-applets/files/patch-aa index 6638e387efc9..73b0823ce82e 100644 --- a/x11/gnome-applets/files/patch-aa +++ b/x11/gnome-applets/files/patch-aa @@ -1,14 +1,6 @@ ---- configure.orig Mon Sep 8 20:00:28 2003 -+++ configure Wed Sep 24 23:29:28 2003 -@@ -8250,6 +8250,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' -@@ -11792,6 +11793,7 @@ +--- configure.orig Sun Feb 22 19:22:49 2004 ++++ configure Sun Feb 22 19:24:33 2004 +@@ -22912,6 +22912,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,16 +8,16 @@ *solaris*) CDROM_HOST=solaris;cd_device_path="/vol/dev/aliases/cdrom0";cdplayer_type_sun=true;; esac case "$host" in -@@ -11856,7 +11858,7 @@ +@@ -23034,7 +23035,7 @@ ;; - # list of supported OS cores -- *-*-linux*|*-*-freebsd*|*-*-openbsd*) -+ *-*-linux*|i386-*-freebsd*|*-*-openbsd*) - echo "$as_me:$LINENO: checking for apm_read in -lapm" >&5 - echo $ECHO_N "checking for apm_read in -lapm... $ECHO_C" >&6 - if test "${ac_cv_lib_apm_apm_read+set}" = set; then -@@ -13646,14 +13648,14 @@ + # list of supported OS cores that do not use libapm +- *-*-freebsd*|*-*-netbsd*|*-*-openbsd*) ++ i386-*-freebsd*|*-*-netbsd*|*-*-openbsd*) + ;; + *) + echo "warning: ${host} is not supported by battstat_applet, not building" >&2 +@@ -24905,14 +24906,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 deleted file mode 100644 index 6ddfc03c3b07..000000000000 --- a/x11/gnome-applets/files/patch-battstat_Makefile.in +++ /dev/null @@ -1,27 +0,0 @@ ---- battstat/Makefile.in.orig Tue Sep 23 00:11:20 2003 -+++ battstat/Makefile.in Tue Sep 23 00:14:03 2003 -@@ -154,11 +154,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@APMDIR = --@HAVE_LIBAPM_FALSE@APMDIR = @HAVE_LIBAPM_FALSE@apmlib -+@HAVE_LIBAPM_FALSE@APMDIR = - @HAVE_LIBAPM_TRUE@APMINC = --@HAVE_LIBAPM_FALSE@APMINC = @HAVE_LIBAPM_FALSE@-Iapmlib/ -+@HAVE_LIBAPM_FALSE@APMINC = - - SUBDIRS = docs sounds $(APMDIR) - -@@ -230,8 +230,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 = \ --@HAVE_LIBAPM_FALSE@$(top_builddir)/screen-exec/libscreen-exec.la \ --@HAVE_LIBAPM_FALSE@apmlib/libapm.a -+@HAVE_LIBAPM_FALSE@$(top_builddir)/screen-exec/libscreen-exec.la - battstat_applet_2_LDFLAGS = - CFLAGS = @CFLAGS@ - COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) diff --git a/x11/gnome-applets/files/patch-multiload::linux-proc.c b/x11/gnome-applets/files/patch-multiload::linux-proc.c deleted file mode 100644 index 9eb916f2b59f..000000000000 --- a/x11/gnome-applets/files/patch-multiload::linux-proc.c +++ /dev/null @@ -1,84 +0,0 @@ ---- multiload/linux-proc.c.orig Thu Jul 10 04:26:58 2003 -+++ multiload/linux-proc.c Mon Nov 17 23:54:38 2003 -@@ -5,12 +5,17 @@ - #include <fcntl.h> - #include <unistd.h> - #include <assert.h> -+#ifdef __FreeBSD__ -+#include <sys/socket.h> -+#include <net/if.h> -+#endif - - #include <glibtop.h> - #include <glibtop/cpu.h> - #include <glibtop/mem.h> - #include <glibtop/swap.h> - #include <glibtop/loadavg.h> -+#include <glibtop/netload.h> - - #include "linux-proc.h" - -@@ -33,6 +38,10 @@ - static unsigned needed_loadavg_flags = - (1 << GLIBTOP_LOADAVG_LOADAVG); - -+static unsigned needed_netload_flags = -+(1 << GLIBTOP_NETLOAD_IF_FLAGS) + -+(1 << GLIBTOP_NETLOAD_BYTES_TOTAL); -+ - void - GetLoad (int Maximum, int data [4], LoadGraph *g) - { -@@ -236,6 +245,44 @@ - int delta[COUNT_TYPES], i; - static int ticks = 0; - static gulong past[COUNT_TYPES] = {0}; -+#ifdef __FreeBSD__ -+ struct if_nameindex *ifindex, *ifptr; -+ static int max = 500; -+ -+ ifindex = if_nameindex(); -+ if (!ifindex) -+ return; -+ -+ memset(present, 0, sizeof (present)); -+ -+ for (ifptr = ifindex; ifptr->if_index && ifptr->if_name; ifptr++) -+ { -+ int index; -+ glibtop_netload netload; -+ -+ glibtop_get_netload(&netload, ifptr->if_name); -+ if (!netload.flags) -+ continue; -+ -+ assert ((netload.flags & needed_netload_flags) == needed_netload_flags); -+ -+ if (!(netload.if_flags & (1L << GLIBTOP_IF_FLAGS_UP))) -+ continue; -+ if (netload.if_flags & (1L << GLIBTOP_IF_FLAGS_LOOPBACK)) -+ continue; -+ -+ if (netload.if_flags & (1L << GLIBTOP_IF_FLAGS_POINTOPOINT)) { -+ index = strncmp(ifptr->if_name, "sl", 2) ? PPP_COUNT : SLIP_COUNT; -+ } else { -+ index = ETH_COUNT; -+ } -+ -+ present[index] += netload.bytes_total; -+ } -+ -+ if_freenameindex(ifindex); -+ -+#else - static char *netdevfmt = NULL; - char *cp, buffer[256]; - FILE *fp; -@@ -317,6 +364,7 @@ - } - - fclose(fp); -+#endif - - for (i = 0; i < 5; i++) - data[i] = 0; diff --git a/x11/gnome-applets/files/patch-stickynotes_Makefile.in b/x11/gnome-applets/files/patch-stickynotes_Makefile.in deleted file mode 100644 index 973b7e342c3e..000000000000 --- a/x11/gnome-applets/files/patch-stickynotes_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 1f1af0974a9d..650c4694ad35 100644 --- a/x11/gnome-applets/files/patch-wireless_wireless-applet.c +++ b/x11/gnome-applets/files/patch-wireless_wireless-applet.c @@ -1,5 +1,5 @@ ---- wireless/wireless-applet.c.orig Mon Oct 27 15:52:14 2003 -+++ wireless/wireless-applet.c Fri Jan 16 16:47:14 2004 +--- wireless/wireless-applet.c.orig Tue Oct 21 19:06:53 2003 ++++ wireless/wireless-applet.c Sat Jan 3 19:26:43 2004 @@ -30,6 +30,15 @@ #include <math.h> #include <dirent.h> @@ -72,7 +72,7 @@ wireless_applet_draw (applet, percent); } -@@ -235,22 +260,180 @@ +@@ -235,22 +260,179 @@ } } @@ -116,7 +116,7 @@ +static void +get_wi_data (WirelessApplet *applet, char *device, long int *level) +{ -+ struct wi_req wreq; ++ struct wi_req wreq; + long int signal_strength; + + bzero((char *)&wreq, sizeof(wreq)); @@ -156,9 +156,9 @@ + + if (ioctl(s, SIOCGAIRONET, &ifr) == -1) { + gtk_tooltips_set_tip (applet->tips, -+ GTK_WIDGET (applet), -+ "ioctl Error", -+ NULL); ++ GTK_WIDGET (applet), ++ "ioctl Error", ++ NULL); + return 0; + } + @@ -169,7 +169,7 @@ +static void +get_an_data (WirelessApplet *applet, char *device, long int *level) +{ -+ struct an_req areq; ++ struct an_req areq; + struct an_ltv_status *sts; +#ifdef AN_RID_RSSI_MAP + struct an_ltv_rssi_map an_rssimap; @@ -192,13 +192,13 @@ +#ifdef AN_RID_RSSI_MAP + if (rssimap_valid) + signal_strength = (long int)(an_rssimap.an_entries[ -+ sts->an_normalized_strength].an_rss_pct); ++ sts->an_normalized_strength].an_rss_pct); + else + signal_strength = (long int)(sts->an_normalized_strength); +#else + signal_strength = (long int)(sts->an_normalized_rssi); +#endif -+ ++ + memcpy(level, &signal_strength, sizeof(level)); +} +#endif @@ -230,14 +230,14 @@ /* Here we begin to suck... */ do { +#ifdef __FreeBSD__ -+ if (ifs == NULL || ifs->if_name == NULL) { ++ if (ifs == NULL || ifs->if_name == NULL) { + break; + } -+ strlcpy(device, ifs->if_name, 6); ++ strlcpy(device, ifs->if_name, 6); + if (g_strncasecmp(device, "an", 2)==0) { + applet->devices = g_list_prepend (applet->devices, g_strdup (device)); + if (g_strcasecmp(applet->device, device)==0) { -+ get_an_data(applet, device, &level); ++ get_an_data(applet, device, &level); + wireless_applet_update_state (applet, device, 0, level, 0); + } + } @@ -245,17 +245,16 @@ + if (g_strncasecmp(device, "wi", 2)==0 || g_strncasecmp(device, "ath", 3)==0) { + applet->devices = g_list_prepend (applet->devices, g_strdup (device)); + if (g_strcasecmp(applet->device, device)==0) { -+ get_wi_data(applet, device, &level); ++ get_wi_data(applet, device, &level); + wireless_applet_update_state (applet, device, 0, level, 0); + } + } + ifs++; +#else -+ char *ptr; fgets (line, 256, applet->file); -@@ -283,6 +466,7 @@ +@@ -283,6 +465,7 @@ wireless_applet_update_state (applet, device, link, level, noise); } } @@ -263,7 +262,7 @@ } while (1); if (g_list_length (applet->devices)==1) { -@@ -294,17 +478,23 @@ +@@ -294,17 +477,23 @@ } /* rewind the /proc/net/wireless file */ @@ -287,7 +286,7 @@ wireless_applet_read_device_state (applet); -@@ -351,6 +541,7 @@ +@@ -351,6 +540,7 @@ static void start_file_read (WirelessApplet *applet) { @@ -295,7 +294,7 @@ applet->file = fopen ("/proc/net/wireless", "rt"); if (applet->file == NULL) { gtk_tooltips_set_tip (applet->tips, -@@ -359,6 +550,7 @@ +@@ -359,6 +549,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.")); } @@ -303,7 +302,7 @@ } static void -@@ -646,8 +838,10 @@ +@@ -646,8 +837,10 @@ applet->prefs = NULL; } diff --git a/x11/gnome-applets/pkg-descr b/x11/gnome-applets/pkg-descr index c93d4bc89a04..5f715cf9a438 100644 --- a/x11/gnome-applets/pkg-descr +++ b/x11/gnome-applets/pkg-descr @@ -1,3 +1,3 @@ -Applets components for the Gnome 2.0 Desktop Environment +Panel applets for the Gnome 2.0 Desktop Environment. WWW: http://www.gnome.org/ diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist index f673803f1995..119fd3e38b2f 100644 --- a/x11/gnome-applets/pkg-plist +++ b/x11/gnome-applets/pkg-plist @@ -1,5 +1,8 @@ bin/gkb_xmmap bin/gnome-keyboard-layout +bin/gswitchit-plugins-capplet +etc/gconf/gconf.xml.defaults/apps/gswitchit/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gswitchit/Applet/%gconf.xml 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 @@ -15,6 +18,8 @@ etc/gconf/gconf.xml.defaults/schemas/apps/geyes/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/geyes/prefs/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gkb-applet/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gkb-applet/prefs/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gswitchit/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gswitchit/Applet/%gconf.xml 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 @@ -38,6 +43,7 @@ etc/gconf/schemas/charpick.schemas etc/gconf/schemas/drivemount.schemas etc/gconf/schemas/geyes.schemas etc/gconf/schemas/gkb.schemas +etc/gconf/schemas/gswitchit.schemas etc/gconf/schemas/gtik.schemas etc/gconf/schemas/gweather.schemas etc/gconf/schemas/mailcheck.schemas @@ -48,15 +54,17 @@ etc/gconf/schemas/multiload.schemas etc/gconf/schemas/stickynotes.schemas %%BATTERY%%etc/sound/events/battstat_applet.soundlist etc/sound/events/mailcheck.soundlist +include/libgswitchit/gswitchit_plugin.h +include/libgswitchit/gswitchit_xkb_config.h libdata/bonobo/servers/GNOME_AccessxStatusApplet.server -%%BATTERY%%libdata/bonobo/servers/GNOME_BattstatApplet.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 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_KeyboardApplet.server libdata/bonobo/servers/GNOME_MailcheckApplet_Factory.server libdata/bonobo/servers/GNOME_MiniCommanderApplet.server libdata/bonobo/servers/GNOME_MixerApplet.server @@ -64,14 +72,15 @@ 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 +libdata/pkgconfig/gswitchit.pc libexec/accessx-status-applet %%BATTERY%%libexec/battstat-applet-2 libexec/cdplayer_applet2 libexec/charpick_applet2 libexec/drivemount_applet2 libexec/geyes_applet2 -libexec/gkb-applet-2 libexec/gnome-applets/mc-install-default-macros +libexec/gnome-keyboard-applet libexec/gtik2_applet2 libexec/gweather-applet-2 libexec/mailcheck-applet @@ -231,10 +240,11 @@ share/gnome/gkb/YU_Serbo-Croatian_x.keyprop share/gnome/gkb/Yugoslav.keyprop share/gnome/gkb/presets.xml share/gnome/gnome-2.0/ui/GNOME_AccessxApplet.xml -%%BATTERY%%share/gnome/gnome-2.0/ui/GNOME_BattstatApplet.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 +share/gnome/gnome-2.0/ui/GNOME_GSwitchItApplet.xml 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 @@ -246,20 +256,144 @@ 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/gswitchit/gswitchit-plugins.glade +share/gnome/gswitchit/gswitchit-properties.glade 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/ac_small.png +%%BATTERY%%share/gnome/help/battstat/C/figures/batt_green.png +%%BATTERY%%share/gnome/help/battstat/C/figures/batt_orange.png +%%BATTERY%%share/gnome/help/battstat/C/figures/batt_red.png +%%BATTERY%%share/gnome/help/battstat/C/figures/batt_yellow.png +%%BATTERY%%share/gnome/help/battstat/C/figures/battery_small.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/figures/battstat-applet_window.png +%%BATTERY%%share/gnome/help/battstat/C/figures/flash_small.png +%%BATTERY%%share/gnome/help/battstat/C/figures/warning_small.png %%BATTERY%%share/gnome/help/battstat/C/legal.xml +%%BATTERY%%share/gnome/help/battstat/de/battstat.xml +%%BATTERY%%share/gnome/help/battstat/de/figures/ac_small.png +%%BATTERY%%share/gnome/help/battstat/de/figures/batt_green.png +%%BATTERY%%share/gnome/help/battstat/de/figures/batt_orange.png +%%BATTERY%%share/gnome/help/battstat/de/figures/batt_red.png +%%BATTERY%%share/gnome/help/battstat/de/figures/batt_yellow.png +%%BATTERY%%share/gnome/help/battstat/de/figures/battery_small.png +%%BATTERY%%share/gnome/help/battstat/de/figures/battstat-applet.png +%%BATTERY%%share/gnome/help/battstat/de/figures/battstat-applet_window.png +%%BATTERY%%share/gnome/help/battstat/de/figures/flash_small.png +%%BATTERY%%share/gnome/help/battstat/de/figures/warning_small.png +%%BATTERY%%share/gnome/help/battstat/de/legal.xml +%%BATTERY%%share/gnome/help/battstat/es/battstat.xml +%%BATTERY%%share/gnome/help/battstat/es/figures/ac_small.png +%%BATTERY%%share/gnome/help/battstat/es/figures/batt_green.png +%%BATTERY%%share/gnome/help/battstat/es/figures/batt_orange.png +%%BATTERY%%share/gnome/help/battstat/es/figures/batt_red.png +%%BATTERY%%share/gnome/help/battstat/es/figures/batt_yellow.png +%%BATTERY%%share/gnome/help/battstat/es/figures/battery_small.png +%%BATTERY%%share/gnome/help/battstat/es/figures/battstat-applet.png +%%BATTERY%%share/gnome/help/battstat/es/figures/battstat-applet_window.png +%%BATTERY%%share/gnome/help/battstat/es/figures/flash_small.png +%%BATTERY%%share/gnome/help/battstat/es/figures/warning_small.png +%%BATTERY%%share/gnome/help/battstat/es/legal.xml +%%BATTERY%%share/gnome/help/battstat/fr/battstat.xml +%%BATTERY%%share/gnome/help/battstat/fr/figures/ac_small.png +%%BATTERY%%share/gnome/help/battstat/fr/figures/batt_green.png +%%BATTERY%%share/gnome/help/battstat/fr/figures/batt_orange.png +%%BATTERY%%share/gnome/help/battstat/fr/figures/batt_red.png +%%BATTERY%%share/gnome/help/battstat/fr/figures/batt_yellow.png +%%BATTERY%%share/gnome/help/battstat/fr/figures/battery_small.png +%%BATTERY%%share/gnome/help/battstat/fr/figures/battstat-applet.png +%%BATTERY%%share/gnome/help/battstat/fr/figures/battstat-applet_window.png +%%BATTERY%%share/gnome/help/battstat/fr/figures/flash_small.png +%%BATTERY%%share/gnome/help/battstat/fr/figures/warning_small.png +%%BATTERY%%share/gnome/help/battstat/fr/legal.xml +%%BATTERY%%share/gnome/help/battstat/it/battstat.xml +%%BATTERY%%share/gnome/help/battstat/it/figures/ac_small.png +%%BATTERY%%share/gnome/help/battstat/it/figures/batt_green.png +%%BATTERY%%share/gnome/help/battstat/it/figures/batt_orange.png +%%BATTERY%%share/gnome/help/battstat/it/figures/batt_red.png +%%BATTERY%%share/gnome/help/battstat/it/figures/batt_yellow.png +%%BATTERY%%share/gnome/help/battstat/it/figures/battery_small.png +%%BATTERY%%share/gnome/help/battstat/it/figures/battstat-applet.png +%%BATTERY%%share/gnome/help/battstat/it/figures/battstat-applet_window.png +%%BATTERY%%share/gnome/help/battstat/it/figures/flash_small.png +%%BATTERY%%share/gnome/help/battstat/it/figures/warning_small.png +%%BATTERY%%share/gnome/help/battstat/it/legal.xml %%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/ac_small.png +%%BATTERY%%share/gnome/help/battstat/ja/figures/batt_green.png +%%BATTERY%%share/gnome/help/battstat/ja/figures/batt_orange.png +%%BATTERY%%share/gnome/help/battstat/ja/figures/batt_red.png +%%BATTERY%%share/gnome/help/battstat/ja/figures/batt_yellow.png +%%BATTERY%%share/gnome/help/battstat/ja/figures/battery_small.png %%BATTERY%%share/gnome/help/battstat/ja/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/ja/figures/battstat-general.png +%%BATTERY%%share/gnome/help/battstat/ja/figures/battstat-applet_window.png +%%BATTERY%%share/gnome/help/battstat/ja/figures/flash_small.png +%%BATTERY%%share/gnome/help/battstat/ja/figures/warning_small.png %%BATTERY%%share/gnome/help/battstat/ja/legal.xml +%%BATTERY%%share/gnome/help/battstat/ko/battstat.xml +%%BATTERY%%share/gnome/help/battstat/ko/figures/ac_small.png +%%BATTERY%%share/gnome/help/battstat/ko/figures/batt_green.png +%%BATTERY%%share/gnome/help/battstat/ko/figures/batt_orange.png +%%BATTERY%%share/gnome/help/battstat/ko/figures/batt_red.png +%%BATTERY%%share/gnome/help/battstat/ko/figures/batt_yellow.png +%%BATTERY%%share/gnome/help/battstat/ko/figures/battery_small.png +%%BATTERY%%share/gnome/help/battstat/ko/figures/battstat-applet.png +%%BATTERY%%share/gnome/help/battstat/ko/figures/battstat-applet_window.png +%%BATTERY%%share/gnome/help/battstat/ko/figures/flash_small.png +%%BATTERY%%share/gnome/help/battstat/ko/figures/warning_small.png +%%BATTERY%%share/gnome/help/battstat/ko/legal.xml +%%BATTERY%%share/gnome/help/battstat/sv/battstat.xml +%%BATTERY%%share/gnome/help/battstat/sv/figures/ac_small.png +%%BATTERY%%share/gnome/help/battstat/sv/figures/batt_green.png +%%BATTERY%%share/gnome/help/battstat/sv/figures/batt_orange.png +%%BATTERY%%share/gnome/help/battstat/sv/figures/batt_red.png +%%BATTERY%%share/gnome/help/battstat/sv/figures/batt_yellow.png +%%BATTERY%%share/gnome/help/battstat/sv/figures/battery_small.png +%%BATTERY%%share/gnome/help/battstat/sv/figures/battstat-applet.png +%%BATTERY%%share/gnome/help/battstat/sv/figures/battstat-applet_window.png +%%BATTERY%%share/gnome/help/battstat/sv/figures/flash_small.png +%%BATTERY%%share/gnome/help/battstat/sv/figures/warning_small.png +%%BATTERY%%share/gnome/help/battstat/sv/legal.xml +%%BATTERY%%share/gnome/help/battstat/zh_CN/battstat.xml +%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/ac_small.png +%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/batt_green.png +%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/batt_orange.png +%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/batt_red.png +%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/batt_yellow.png +%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/battery_small.png +%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/battstat-applet.png +%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/battstat-applet_window.png +%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/flash_small.png +%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/warning_small.png +%%BATTERY%%share/gnome/help/battstat/zh_CN/legal.xml +%%BATTERY%%share/gnome/help/battstat/zh_HK/battstat.xml +%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/ac_small.png +%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/batt_green.png +%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/batt_orange.png +%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/batt_red.png +%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/batt_yellow.png +%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/battery_small.png +%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/battstat-applet.png +%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/battstat-applet_window.png +%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/flash_small.png +%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/warning_small.png +%%BATTERY%%share/gnome/help/battstat/zh_HK/legal.xml +%%BATTERY%%share/gnome/help/battstat/zh_TW/battstat.xml +%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/ac_small.png +%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/batt_green.png +%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/batt_orange.png +%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/batt_red.png +%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/batt_yellow.png +%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/battery_small.png +%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/battstat-applet.png +%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/battstat-applet_window.png +%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/flash_small.png +%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/warning_small.png +%%BATTERY%%share/gnome/help/battstat/zh_TW/legal.xml 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 @@ -276,6 +410,9 @@ 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 share/gnome/help/cdplayer/de/figures/cdplayer_applet_nexttrack.png +share/gnome/help/cdplayer/de/figures/cdplayer_applet_pause.png +share/gnome/help/cdplayer/de/figures/cdplayer_applet_play.png +share/gnome/help/cdplayer/de/figures/cdplayer_applet_playafterpause.png share/gnome/help/cdplayer/de/figures/cdplayer_applet_playing.png share/gnome/help/cdplayer/de/figures/cdplayer_applet_playpause.png share/gnome/help/cdplayer/de/figures/cdplayer_applet_prevtrack.png @@ -285,6 +422,9 @@ share/gnome/help/cdplayer/es/cdplayer.xml share/gnome/help/cdplayer/es/figures/cdplayer_applet.png share/gnome/help/cdplayer/es/figures/cdplayer_applet_eject.png share/gnome/help/cdplayer/es/figures/cdplayer_applet_nexttrack.png +share/gnome/help/cdplayer/es/figures/cdplayer_applet_pause.png +share/gnome/help/cdplayer/es/figures/cdplayer_applet_play.png +share/gnome/help/cdplayer/es/figures/cdplayer_applet_playafterpause.png share/gnome/help/cdplayer/es/figures/cdplayer_applet_playing.png share/gnome/help/cdplayer/es/figures/cdplayer_applet_playpause.png share/gnome/help/cdplayer/es/figures/cdplayer_applet_prevtrack.png @@ -294,6 +434,9 @@ 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 share/gnome/help/cdplayer/fr/figures/cdplayer_applet_nexttrack.png +share/gnome/help/cdplayer/fr/figures/cdplayer_applet_pause.png +share/gnome/help/cdplayer/fr/figures/cdplayer_applet_play.png +share/gnome/help/cdplayer/fr/figures/cdplayer_applet_playafterpause.png share/gnome/help/cdplayer/fr/figures/cdplayer_applet_playing.png share/gnome/help/cdplayer/fr/figures/cdplayer_applet_playpause.png share/gnome/help/cdplayer/fr/figures/cdplayer_applet_prevtrack.png @@ -303,6 +446,9 @@ share/gnome/help/cdplayer/it/cdplayer.xml share/gnome/help/cdplayer/it/figures/cdplayer_applet.png share/gnome/help/cdplayer/it/figures/cdplayer_applet_eject.png share/gnome/help/cdplayer/it/figures/cdplayer_applet_nexttrack.png +share/gnome/help/cdplayer/it/figures/cdplayer_applet_pause.png +share/gnome/help/cdplayer/it/figures/cdplayer_applet_play.png +share/gnome/help/cdplayer/it/figures/cdplayer_applet_playafterpause.png share/gnome/help/cdplayer/it/figures/cdplayer_applet_playing.png share/gnome/help/cdplayer/it/figures/cdplayer_applet_playpause.png share/gnome/help/cdplayer/it/figures/cdplayer_applet_prevtrack.png @@ -324,6 +470,9 @@ 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 share/gnome/help/cdplayer/ko/figures/cdplayer_applet_nexttrack.png +share/gnome/help/cdplayer/ko/figures/cdplayer_applet_pause.png +share/gnome/help/cdplayer/ko/figures/cdplayer_applet_play.png +share/gnome/help/cdplayer/ko/figures/cdplayer_applet_playafterpause.png share/gnome/help/cdplayer/ko/figures/cdplayer_applet_playing.png share/gnome/help/cdplayer/ko/figures/cdplayer_applet_playpause.png share/gnome/help/cdplayer/ko/figures/cdplayer_applet_prevtrack.png @@ -333,6 +482,9 @@ share/gnome/help/cdplayer/sv/cdplayer.xml share/gnome/help/cdplayer/sv/figures/cdplayer_applet.png share/gnome/help/cdplayer/sv/figures/cdplayer_applet_eject.png share/gnome/help/cdplayer/sv/figures/cdplayer_applet_nexttrack.png +share/gnome/help/cdplayer/sv/figures/cdplayer_applet_pause.png +share/gnome/help/cdplayer/sv/figures/cdplayer_applet_play.png +share/gnome/help/cdplayer/sv/figures/cdplayer_applet_playafterpause.png share/gnome/help/cdplayer/sv/figures/cdplayer_applet_playing.png share/gnome/help/cdplayer/sv/figures/cdplayer_applet_playpause.png share/gnome/help/cdplayer/sv/figures/cdplayer_applet_prevtrack.png @@ -342,15 +494,33 @@ share/gnome/help/cdplayer/zh_CN/cdplayer.xml share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet.png share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_eject.png share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_nexttrack.png +share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_pause.png +share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_play.png +share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_playafterpause.png share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_playing.png share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_playpause.png share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_prevtrack.png share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_stop.png share/gnome/help/cdplayer/zh_CN/legal.xml +share/gnome/help/cdplayer/zh_HK/cdplayer.xml +share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet.png +share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_eject.png +share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_nexttrack.png +share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_pause.png +share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_play.png +share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_playafterpause.png +share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_playing.png +share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_playpause.png +share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_prevtrack.png +share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_stop.png +share/gnome/help/cdplayer/zh_HK/legal.xml share/gnome/help/cdplayer/zh_TW/cdplayer.xml share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet.png share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_eject.png share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_nexttrack.png +share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_pause.png +share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_play.png +share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_playafterpause.png share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_playing.png share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_playpause.png share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_prevtrack.png @@ -389,13 +559,6 @@ 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 @@ -417,6 +580,10 @@ 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_HK/char-palette.xml +share/gnome/help/char-palette/zh_HK/figures/charpalette_applet.png +share/gnome/help/char-palette/zh_HK/figures/charpalette_chargroup.png +share/gnome/help/char-palette/zh_HK/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 @@ -451,15 +618,89 @@ share/gnome/help/command-line/sv/legal.xml share/gnome/help/command-line/zh_CN/command-line.xml share/gnome/help/command-line/zh_CN/figures/command-line.png share/gnome/help/command-line/zh_CN/legal.xml +share/gnome/help/command-line/zh_HK/command-line.xml +share/gnome/help/command-line/zh_HK/figures/command-line.png +share/gnome/help/command-line/zh_HK/legal.xml share/gnome/help/command-line/zh_TW/command-line.xml share/gnome/help/command-line/zh_TW/figures/command-line.png share/gnome/help/command-line/zh_TW/legal.xml share/gnome/help/drivemount/C/drivemount.xml +share/gnome/help/drivemount/C/figures/drivemount-applet_window.png share/gnome/help/drivemount/C/figures/drivemount_applet_all.png share/gnome/help/drivemount/C/figures/drivemount_applet_floppy.png share/gnome/help/drivemount/C/figures/drivemount_applet_settings.png share/gnome/help/drivemount/C/figures/drivemount_applet_tooltip.png share/gnome/help/drivemount/C/legal.xml +share/gnome/help/drivemount/de/drivemount.xml +share/gnome/help/drivemount/de/figures/drivemount-applet_window.png +share/gnome/help/drivemount/de/figures/drivemount_applet_all.png +share/gnome/help/drivemount/de/figures/drivemount_applet_floppy.png +share/gnome/help/drivemount/de/figures/drivemount_applet_settings.png +share/gnome/help/drivemount/de/figures/drivemount_applet_tooltip.png +share/gnome/help/drivemount/de/legal.xml +share/gnome/help/drivemount/es/drivemount.xml +share/gnome/help/drivemount/es/figures/drivemount-applet_window.png +share/gnome/help/drivemount/es/figures/drivemount_applet_all.png +share/gnome/help/drivemount/es/figures/drivemount_applet_floppy.png +share/gnome/help/drivemount/es/figures/drivemount_applet_settings.png +share/gnome/help/drivemount/es/figures/drivemount_applet_tooltip.png +share/gnome/help/drivemount/es/legal.xml +share/gnome/help/drivemount/fr/drivemount.xml +share/gnome/help/drivemount/fr/figures/drivemount-applet_window.png +share/gnome/help/drivemount/fr/figures/drivemount_applet_all.png +share/gnome/help/drivemount/fr/figures/drivemount_applet_floppy.png +share/gnome/help/drivemount/fr/figures/drivemount_applet_settings.png +share/gnome/help/drivemount/fr/figures/drivemount_applet_tooltip.png +share/gnome/help/drivemount/fr/legal.xml +share/gnome/help/drivemount/it/drivemount.xml +share/gnome/help/drivemount/it/figures/drivemount-applet_window.png +share/gnome/help/drivemount/it/figures/drivemount_applet_all.png +share/gnome/help/drivemount/it/figures/drivemount_applet_floppy.png +share/gnome/help/drivemount/it/figures/drivemount_applet_settings.png +share/gnome/help/drivemount/it/figures/drivemount_applet_tooltip.png +share/gnome/help/drivemount/it/legal.xml +share/gnome/help/drivemount/ja/drivemount.xml +share/gnome/help/drivemount/ja/figures/drivemount-applet_window.png +share/gnome/help/drivemount/ja/figures/drivemount_applet_all.png +share/gnome/help/drivemount/ja/figures/drivemount_applet_floppy.png +share/gnome/help/drivemount/ja/figures/drivemount_applet_settings.png +share/gnome/help/drivemount/ja/figures/drivemount_applet_tooltip.png +share/gnome/help/drivemount/ja/legal.xml +share/gnome/help/drivemount/ko/drivemount.xml +share/gnome/help/drivemount/ko/figures/drivemount-applet_window.png +share/gnome/help/drivemount/ko/figures/drivemount_applet_all.png +share/gnome/help/drivemount/ko/figures/drivemount_applet_floppy.png +share/gnome/help/drivemount/ko/figures/drivemount_applet_settings.png +share/gnome/help/drivemount/ko/figures/drivemount_applet_tooltip.png +share/gnome/help/drivemount/ko/legal.xml +share/gnome/help/drivemount/sv/drivemount.xml +share/gnome/help/drivemount/sv/figures/drivemount-applet_window.png +share/gnome/help/drivemount/sv/figures/drivemount_applet_all.png +share/gnome/help/drivemount/sv/figures/drivemount_applet_floppy.png +share/gnome/help/drivemount/sv/figures/drivemount_applet_settings.png +share/gnome/help/drivemount/sv/figures/drivemount_applet_tooltip.png +share/gnome/help/drivemount/sv/legal.xml +share/gnome/help/drivemount/zh_CN/drivemount.xml +share/gnome/help/drivemount/zh_CN/figures/drivemount-applet_window.png +share/gnome/help/drivemount/zh_CN/figures/drivemount_applet_all.png +share/gnome/help/drivemount/zh_CN/figures/drivemount_applet_floppy.png +share/gnome/help/drivemount/zh_CN/figures/drivemount_applet_settings.png +share/gnome/help/drivemount/zh_CN/figures/drivemount_applet_tooltip.png +share/gnome/help/drivemount/zh_CN/legal.xml +share/gnome/help/drivemount/zh_HK/drivemount.xml +share/gnome/help/drivemount/zh_HK/figures/drivemount-applet_window.png +share/gnome/help/drivemount/zh_HK/figures/drivemount_applet_all.png +share/gnome/help/drivemount/zh_HK/figures/drivemount_applet_floppy.png +share/gnome/help/drivemount/zh_HK/figures/drivemount_applet_settings.png +share/gnome/help/drivemount/zh_HK/figures/drivemount_applet_tooltip.png +share/gnome/help/drivemount/zh_HK/legal.xml +share/gnome/help/drivemount/zh_TW/drivemount.xml +share/gnome/help/drivemount/zh_TW/figures/drivemount-applet_window.png +share/gnome/help/drivemount/zh_TW/figures/drivemount_applet_all.png +share/gnome/help/drivemount/zh_TW/figures/drivemount_applet_floppy.png +share/gnome/help/drivemount/zh_TW/figures/drivemount_applet_settings.png +share/gnome/help/drivemount/zh_TW/figures/drivemount_applet_tooltip.png +share/gnome/help/drivemount/zh_TW/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 @@ -495,6 +736,9 @@ 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_HK/figures/geyes_applet.png +share/gnome/help/geyes/zh_HK/geyes.xml +share/gnome/help/geyes/zh_HK/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 @@ -526,6 +770,9 @@ share/gnome/help/gkb/sv/legal.xml share/gnome/help/gkb/zh_CN/figures/gkb_applet.png share/gnome/help/gkb/zh_CN/gkb.xml share/gnome/help/gkb/zh_CN/legal.xml +share/gnome/help/gkb/zh_HK/figures/gkb_applet.png +share/gnome/help/gkb/zh_HK/gkb.xml +share/gnome/help/gkb/zh_HK/legal.xml share/gnome/help/gkb/zh_TW/figures/gkb_applet.png share/gnome/help/gkb/zh_TW/gkb.xml share/gnome/help/gkb/zh_TW/legal.xml @@ -556,6 +803,9 @@ share/gnome/help/gtik2_applet2/sv/legal.xml share/gnome/help/gtik2_applet2/zh_CN/figures/gtik_applet.png share/gnome/help/gtik2_applet2/zh_CN/gtik2_applet2.xml share/gnome/help/gtik2_applet2/zh_CN/legal.xml +share/gnome/help/gtik2_applet2/zh_HK/figures/gtik_applet.png +share/gnome/help/gtik2_applet2/zh_HK/gtik2_applet2.xml +share/gnome/help/gtik2_applet2/zh_HK/legal.xml 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 @@ -604,6 +854,11 @@ 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_HK/figures/gweather_applet.png +share/gnome/help/gweather/zh_HK/figures/gweather_settings.png +share/gnome/help/gweather/zh_HK/figures/gweather_weather.png +share/gnome/help/gweather/zh_HK/gweather.xml +share/gnome/help/gweather/zh_HK/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 @@ -636,6 +891,11 @@ 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/charpalette_applet.png +share/gnome/help/mailcheck/ja/figures/charpalette_chargroup.png +share/gnome/help/mailcheck/ja/figures/charpick_applet.png +share/gnome/help/mailcheck/ja/figures/charpick_characters.png +share/gnome/help/mailcheck/ja/figures/charpick_chargroup.png share/gnome/help/mailcheck/ja/figures/mailcheck_applet.png share/gnome/help/mailcheck/ja/legal.xml share/gnome/help/mailcheck/ja/mailcheck.xml @@ -657,6 +917,9 @@ 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_HK/figures/mailcheck_applet.png +share/gnome/help/mailcheck/zh_HK/legal.xml +share/gnome/help/mailcheck/zh_HK/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 @@ -678,6 +941,10 @@ 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/it/figures/mixer_applet.png +share/gnome/help/mixer_applet2/it/figures/volumecontrol_applet.png +share/gnome/help/mixer_applet2/it/legal.xml +share/gnome/help/mixer_applet2/it/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 @@ -694,6 +961,9 @@ 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_HK/figures/volumecontrol_applet.png +share/gnome/help/mixer_applet2/zh_HK/legal.xml +share/gnome/help/mixer_applet2/zh_HK/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 @@ -718,16 +988,139 @@ 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/multiload/C/figures/system-monitor-applet_window.png +share/gnome/help/multiload/C/figures/system_monitor.png +share/gnome/help/multiload/C/figures/system_monitor_prefs.png +share/gnome/help/multiload/C/legal.xml +share/gnome/help/multiload/C/multiload.xml +share/gnome/help/multiload/de/figures/system-monitor-applet_window.png +share/gnome/help/multiload/de/legal.xml +share/gnome/help/multiload/de/multiload.xml +share/gnome/help/multiload/es/figures/system-monitor-applet_window.png +share/gnome/help/multiload/es/legal.xml +share/gnome/help/multiload/es/multiload.xml +share/gnome/help/multiload/fr/figures/system-monitor-applet_window.png +share/gnome/help/multiload/fr/legal.xml +share/gnome/help/multiload/fr/multiload.xml +share/gnome/help/multiload/it/figures/system-monitor-applet_window.png +share/gnome/help/multiload/it/legal.xml +share/gnome/help/multiload/it/multiload.xml +share/gnome/help/multiload/ja/figures/system-monitor-applet_window.png +share/gnome/help/multiload/ja/legal.xml +share/gnome/help/multiload/ja/multiload.xml +share/gnome/help/multiload/ko/figures/system-monitor-applet_window.png +share/gnome/help/multiload/ko/legal.xml +share/gnome/help/multiload/ko/multiload.xml +share/gnome/help/multiload/sv/figures/system-monitor-applet_window.png +share/gnome/help/multiload/sv/legal.xml +share/gnome/help/multiload/sv/multiload.xml +share/gnome/help/multiload/zh_CN/figures/system-monitor-applet_window.png +share/gnome/help/multiload/zh_CN/legal.xml +share/gnome/help/multiload/zh_CN/multiload.xml +share/gnome/help/multiload/zh_HK/figures/system-monitor-applet_window.png +share/gnome/help/multiload/zh_HK/legal.xml +share/gnome/help/multiload/zh_HK/multiload.xml +share/gnome/help/multiload/zh_TW/figures/system-monitor-applet_window.png +share/gnome/help/multiload/zh_TW/legal.xml +share/gnome/help/multiload/zh_TW/multiload.xml share/gnome/help/stickynotes_applet/C/legal.xml share/gnome/help/stickynotes_applet/C/stickynotes_applet.xml +share/gnome/help/stickynotes_applet/de/figures/stickynotes_applet.png +share/gnome/help/stickynotes_applet/de/legal.xml +share/gnome/help/stickynotes_applet/de/stickynotes_applet.xml +share/gnome/help/stickynotes_applet/es/figures/stickynotes_applet.png +share/gnome/help/stickynotes_applet/es/legal.xml +share/gnome/help/stickynotes_applet/es/stickynotes_applet.xml +share/gnome/help/stickynotes_applet/fr/figures/stickynotes_applet.png +share/gnome/help/stickynotes_applet/fr/legal.xml +share/gnome/help/stickynotes_applet/fr/stickynotes_applet.xml +share/gnome/help/stickynotes_applet/it/figures/stickynotes_applet.png +share/gnome/help/stickynotes_applet/it/legal.xml +share/gnome/help/stickynotes_applet/it/stickynotes_applet.xml +share/gnome/help/stickynotes_applet/ja/figures/stickynotes_applet.png +share/gnome/help/stickynotes_applet/ja/legal.xml +share/gnome/help/stickynotes_applet/ja/stickynotes_applet.xml +share/gnome/help/stickynotes_applet/ko/figures/stickynotes_applet.png +share/gnome/help/stickynotes_applet/ko/legal.xml +share/gnome/help/stickynotes_applet/ko/stickynotes_applet.xml +share/gnome/help/stickynotes_applet/sv/figures/stickynotes_applet.png +share/gnome/help/stickynotes_applet/sv/legal.xml +share/gnome/help/stickynotes_applet/sv/stickynotes_applet.xml +share/gnome/help/stickynotes_applet/zh_CN/figures/stickynotes_applet.png +share/gnome/help/stickynotes_applet/zh_CN/legal.xml +share/gnome/help/stickynotes_applet/zh_CN/stickynotes_applet.xml +share/gnome/help/stickynotes_applet/zh_HK/figures/stickynotes_applet.png +share/gnome/help/stickynotes_applet/zh_HK/legal.xml +share/gnome/help/stickynotes_applet/zh_HK/stickynotes_applet.xml +share/gnome/help/stickynotes_applet/zh_TW/figures/stickynotes_applet.png +share/gnome/help/stickynotes_applet/zh_TW/legal.xml +share/gnome/help/stickynotes_applet/zh_TW/stickynotes_applet.xml share/gnome/help/wireless/C/legal.xml share/gnome/help/wireless/C/wireless.xml +share/gnome/help/wireless/de/figures/wireless_applet_conn.png +share/gnome/help/wireless/de/figures/wireless_applet_no_conn.png +share/gnome/help/wireless/de/legal.xml +share/gnome/help/wireless/de/wireless.xml +share/gnome/help/wireless/es/figures/wireless_applet_conn.png +share/gnome/help/wireless/es/figures/wireless_applet_no_conn.png +share/gnome/help/wireless/es/legal.xml +share/gnome/help/wireless/es/wireless.xml +share/gnome/help/wireless/fr/figures/wireless_applet_conn.png +share/gnome/help/wireless/fr/figures/wireless_applet_no_conn.png +share/gnome/help/wireless/fr/legal.xml +share/gnome/help/wireless/fr/wireless.xml +share/gnome/help/wireless/it/figures/wireless_applet_conn.png +share/gnome/help/wireless/it/figures/wireless_applet_no_conn.png +share/gnome/help/wireless/it/legal.xml +share/gnome/help/wireless/it/wireless.xml +share/gnome/help/wireless/ja/figures/wireless_applet_conn.png +share/gnome/help/wireless/ja/figures/wireless_applet_no_conn.png +share/gnome/help/wireless/ja/legal.xml +share/gnome/help/wireless/ja/wireless.xml +share/gnome/help/wireless/ko/figures/wireless_applet_conn.png +share/gnome/help/wireless/ko/figures/wireless_applet_no_conn.png +share/gnome/help/wireless/ko/legal.xml +share/gnome/help/wireless/ko/wireless.xml +share/gnome/help/wireless/sv/figures/wireless_applet_conn.png +share/gnome/help/wireless/sv/figures/wireless_applet_no_conn.png +share/gnome/help/wireless/sv/legal.xml +share/gnome/help/wireless/sv/wireless.xml +share/gnome/help/wireless/zh_CN/figures/wireless_applet_conn.png +share/gnome/help/wireless/zh_CN/figures/wireless_applet_no_conn.png +share/gnome/help/wireless/zh_CN/legal.xml +share/gnome/help/wireless/zh_CN/wireless.xml +share/gnome/help/wireless/zh_HK/figures/wireless_applet_conn.png +share/gnome/help/wireless/zh_HK/figures/wireless_applet_no_conn.png +share/gnome/help/wireless/zh_HK/legal.xml +share/gnome/help/wireless/zh_HK/wireless.xml +share/gnome/help/wireless/zh_TW/figures/wireless_applet_conn.png +share/gnome/help/wireless/zh_TW/figures/wireless_applet_no_conn.png +share/gnome/help/wireless/zh_TW/legal.xml +share/gnome/help/wireless/zh_TW/wireless.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 %%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-de.omf +%%BATTERY%%@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/battstat-de.omf 2>/dev/null || /usr/bin/true +%%BATTERY%%share/gnome/omf/gnome-applets/battstat-es.omf +%%BATTERY%%@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/battstat-es.omf 2>/dev/null || /usr/bin/true +%%BATTERY%%share/gnome/omf/gnome-applets/battstat-fr.omf +%%BATTERY%%@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/battstat-fr.omf 2>/dev/null || /usr/bin/true +%%BATTERY%%share/gnome/omf/gnome-applets/battstat-it.omf +%%BATTERY%%@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/battstat-it.omf 2>/dev/null || /usr/bin/true %%BATTERY%%share/gnome/omf/gnome-applets/battstat-ja.omf %%BATTERY%%@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/battstat-ja.omf 2>/dev/null || /usr/bin/true +%%BATTERY%%share/gnome/omf/gnome-applets/battstat-ko.omf +%%BATTERY%%@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/battstat-ko.omf 2>/dev/null || /usr/bin/true +%%BATTERY%%share/gnome/omf/gnome-applets/battstat-sv.omf +%%BATTERY%%@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/battstat-sv.omf 2>/dev/null || /usr/bin/true +%%BATTERY%%share/gnome/omf/gnome-applets/battstat-zh_CN.omf +%%BATTERY%%@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/battstat-zh_CN.omf 2>/dev/null || /usr/bin/true +%%BATTERY%%share/gnome/omf/gnome-applets/battstat-zh_HK.omf +%%BATTERY%%@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/battstat-zh_HK.omf 2>/dev/null || /usr/bin/true +%%BATTERY%%share/gnome/omf/gnome-applets/battstat-zh_TW.omf +%%BATTERY%%@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/battstat-zh_TW.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 @@ -746,6 +1139,8 @@ share/gnome/omf/gnome-applets/cdplayer-sv.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/cdplayer-sv.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/cdplayer-zh_CN.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/cdplayer-zh_CN.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/cdplayer-zh_HK.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/cdplayer-zh_HK.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/cdplayer-zh_TW.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/cdplayer-zh_TW.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/char-palette-C.omf @@ -758,14 +1153,14 @@ share/gnome/omf/gnome-applets/char-palette-fr.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/char-palette-fr.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/char-palette-it.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/char-palette-it.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-applets/char-palette-ja.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/char-palette-ja.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/char-palette-ko.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/char-palette-ko.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/char-palette-sv.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/char-palette-sv.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/char-palette-zh_CN.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/char-palette-zh_CN.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/char-palette-zh_HK.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/char-palette-zh_HK.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/char-palette-zh_TW.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/char-palette-zh_TW.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/command-line-C.omf @@ -786,10 +1181,32 @@ share/gnome/omf/gnome-applets/command-line-sv.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/command-line-sv.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/command-line-zh_CN.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/command-line-zh_CN.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/command-line-zh_HK.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/command-line-zh_HK.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/command-line-zh_TW.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/command-line-zh_TW.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/drivemount-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/drivemount-C.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/drivemount-de.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/drivemount-de.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/drivemount-es.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/drivemount-es.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/drivemount-fr.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/drivemount-fr.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/drivemount-it.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/drivemount-it.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/drivemount-ja.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/drivemount-ja.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/drivemount-ko.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/drivemount-ko.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/drivemount-sv.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/drivemount-sv.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/drivemount-zh_CN.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/drivemount-zh_CN.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/drivemount-zh_HK.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/drivemount-zh_HK.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/drivemount-zh_TW.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/drivemount-zh_TW.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/geyes-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/geyes-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/geyes-de.omf @@ -808,6 +1225,8 @@ share/gnome/omf/gnome-applets/geyes-sv.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/geyes-sv.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/geyes-zh_CN.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/geyes-zh_CN.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/geyes-zh_HK.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/geyes-zh_HK.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/geyes-zh_TW.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/geyes-zh_TW.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/gkb-C.omf @@ -828,6 +1247,8 @@ share/gnome/omf/gnome-applets/gkb-sv.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gkb-sv.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/gkb-zh_CN.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gkb-zh_CN.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/gkb-zh_HK.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gkb-zh_HK.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/gkb-zh_TW.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gkb-zh_TW.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/gtik2_applet2-C.omf @@ -848,6 +1269,8 @@ share/gnome/omf/gnome-applets/gtik2_applet2-sv.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-sv.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/gtik2_applet2-zh_CN.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-zh_CN.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/gtik2_applet2-zh_HK.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-zh_HK.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/gtik2_applet2-zh_TW.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-zh_TW.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/gweather-C.omf @@ -868,6 +1291,8 @@ share/gnome/omf/gnome-applets/gweather-sv.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gweather-sv.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/gweather-zh_CN.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gweather-zh_CN.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/gweather-zh_HK.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gweather-zh_HK.omf 2>/dev/null || /usr/bin/true 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/mailcheck-C.omf @@ -888,6 +1313,8 @@ 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_HK.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mailcheck-zh_HK.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 @@ -898,6 +1325,8 @@ share/gnome/omf/gnome-applets/mixer_applet2-es.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mixer_applet2-es.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/mixer_applet2-fr.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mixer_applet2-fr.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/mixer_applet2-it.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mixer_applet2-it.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/mixer_applet2-ja.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mixer_applet2-ja.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/mixer_applet2-ko.omf @@ -906,14 +1335,78 @@ share/gnome/omf/gnome-applets/mixer_applet2-sv.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mixer_applet2-sv.omf 2>/dev/null || /usr/bin/true 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_HK.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mixer_applet2-zh_HK.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/multiload-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/multiload-C.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/multiload-de.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/multiload-de.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/multiload-es.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/multiload-es.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/multiload-fr.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/multiload-fr.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/multiload-it.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/multiload-it.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/multiload-ja.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/multiload-ja.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/multiload-ko.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/multiload-ko.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/multiload-sv.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/multiload-sv.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/multiload-zh_CN.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/multiload-zh_CN.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/multiload-zh_HK.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/multiload-zh_HK.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/multiload-zh_TW.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/multiload-zh_TW.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/omf/gnome-applets/stickynotes_applet-de.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-de.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/stickynotes_applet-es.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-es.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/stickynotes_applet-fr.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-fr.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/stickynotes_applet-it.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-it.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/stickynotes_applet-ja.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-ja.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/stickynotes_applet-ko.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-ko.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/stickynotes_applet-sv.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-sv.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/stickynotes_applet-zh_CN.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-zh_CN.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/stickynotes_applet-zh_HK.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-zh_HK.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/stickynotes_applet-zh_TW.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-zh_TW.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/wireless-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/wireless-C.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/wireless-de.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/wireless-de.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/wireless-es.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/wireless-es.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/wireless-fr.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/wireless-fr.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/wireless-it.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/wireless-it.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/wireless-ja.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/wireless-ja.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/wireless-ko.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/wireless-ko.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/wireless-sv.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/wireless-sv.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/wireless-zh_CN.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/wireless-zh_CN.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/wireless-zh_HK.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/wireless-zh_HK.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/wireless-zh_TW.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/wireless-zh_TW.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 @@ -1031,11 +1524,11 @@ share/gnome/pixmaps/gkb/uy.png share/gnome/pixmaps/gkb/vn.png share/gnome/pixmaps/gkb/ye.png share/gnome/pixmaps/gkb/yu.png -share/gnome/pixmaps/gnome-cdplayer-icon.png 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/gswitchit-applet.png +share/gnome/pixmaps/gswitchit-properties-capplet.png share/gnome/pixmaps/mailcheck/eclouds.png share/gnome/pixmaps/mailcheck/email-e.png share/gnome/pixmaps/mailcheck/email-eclouds.png @@ -1163,6 +1656,7 @@ 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 +share/locale/en_CA/LC_MESSAGES/gnome-applets-2.0.mo share/locale/en_GB/LC_MESSAGES/gnome-applets-2.0.mo share/locale/es/LC_MESSAGES/gnome-applets-2.0.mo share/locale/et/LC_MESSAGES/gnome-applets-2.0.mo @@ -1174,6 +1668,7 @@ share/locale/ga/LC_MESSAGES/gnome-applets-2.0.mo 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/hr/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 @@ -1195,10 +1690,12 @@ share/locale/ro/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ru/LC_MESSAGES/gnome-applets-2.0.mo share/locale/sk/LC_MESSAGES/gnome-applets-2.0.mo share/locale/sl/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/sq/LC_MESSAGES/gnome-applets-2.0.mo share/locale/sr/LC_MESSAGES/gnome-applets-2.0.mo share/locale/sr@Latn/LC_MESSAGES/gnome-applets-2.0.mo share/locale/sv/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ta/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/th/LC_MESSAGES/gnome-applets-2.0.mo share/locale/tr/LC_MESSAGES/gnome-applets-2.0.mo share/locale/uk/LC_MESSAGES/gnome-applets-2.0.mo share/locale/vi/LC_MESSAGES/gnome-applets-2.0.mo @@ -1211,15 +1708,80 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/pixmaps/stickynotes @dirrm share/gnome/pixmaps/mixer @dirrm share/gnome/pixmaps/accessx-status-applet +@dirrm share/gnome/help/wireless/zh_TW/figures +@dirrm share/gnome/help/wireless/zh_TW +@dirrm share/gnome/help/wireless/zh_HK/figures +@dirrm share/gnome/help/wireless/zh_HK +@dirrm share/gnome/help/wireless/zh_CN/figures +@dirrm share/gnome/help/wireless/zh_CN +@dirrm share/gnome/help/wireless/sv/figures +@dirrm share/gnome/help/wireless/sv +@dirrm share/gnome/help/wireless/ko/figures +@dirrm share/gnome/help/wireless/ko +@dirrm share/gnome/help/wireless/ja/figures +@dirrm share/gnome/help/wireless/ja +@dirrm share/gnome/help/wireless/it/figures +@dirrm share/gnome/help/wireless/it +@dirrm share/gnome/help/wireless/fr/figures +@dirrm share/gnome/help/wireless/fr +@dirrm share/gnome/help/wireless/es/figures +@dirrm share/gnome/help/wireless/es +@dirrm share/gnome/help/wireless/de/figures +@dirrm share/gnome/help/wireless/de @dirrm share/gnome/help/wireless/C @dirrm share/gnome/help/wireless +@dirrm share/gnome/help/stickynotes_applet/zh_TW/figures +@dirrm share/gnome/help/stickynotes_applet/zh_TW +@dirrm share/gnome/help/stickynotes_applet/zh_HK/figures +@dirrm share/gnome/help/stickynotes_applet/zh_HK +@dirrm share/gnome/help/stickynotes_applet/zh_CN/figures +@dirrm share/gnome/help/stickynotes_applet/zh_CN +@dirrm share/gnome/help/stickynotes_applet/sv/figures +@dirrm share/gnome/help/stickynotes_applet/sv +@dirrm share/gnome/help/stickynotes_applet/ko/figures +@dirrm share/gnome/help/stickynotes_applet/ko +@dirrm share/gnome/help/stickynotes_applet/ja/figures +@dirrm share/gnome/help/stickynotes_applet/ja +@dirrm share/gnome/help/stickynotes_applet/it/figures +@dirrm share/gnome/help/stickynotes_applet/it +@dirrm share/gnome/help/stickynotes_applet/fr/figures +@dirrm share/gnome/help/stickynotes_applet/fr +@dirrm share/gnome/help/stickynotes_applet/es/figures +@dirrm share/gnome/help/stickynotes_applet/es +@dirrm share/gnome/help/stickynotes_applet/de/figures +@dirrm share/gnome/help/stickynotes_applet/de @dirrm share/gnome/help/stickynotes_applet/C @dirrm share/gnome/help/stickynotes_applet +@dirrm share/gnome/help/multiload/zh_TW/figures +@dirrm share/gnome/help/multiload/zh_TW +@dirrm share/gnome/help/multiload/zh_HK/figures +@dirrm share/gnome/help/multiload/zh_HK +@dirrm share/gnome/help/multiload/zh_CN/figures +@dirrm share/gnome/help/multiload/zh_CN +@dirrm share/gnome/help/multiload/sv/figures +@dirrm share/gnome/help/multiload/sv +@dirrm share/gnome/help/multiload/ko/figures +@dirrm share/gnome/help/multiload/ko +@dirrm share/gnome/help/multiload/ja/figures +@dirrm share/gnome/help/multiload/ja +@dirrm share/gnome/help/multiload/it/figures +@dirrm share/gnome/help/multiload/it +@dirrm share/gnome/help/multiload/fr/figures +@dirrm share/gnome/help/multiload/fr +@dirrm share/gnome/help/multiload/es/figures +@dirrm share/gnome/help/multiload/es +@dirrm share/gnome/help/multiload/de/figures +@dirrm share/gnome/help/multiload/de +@dirrm share/gnome/help/multiload/C/figures +@dirrm share/gnome/help/multiload/C +@dirrm share/gnome/help/multiload @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_HK/figures +@dirrm share/gnome/help/mixer_applet2/zh_HK @dirrm share/gnome/help/mixer_applet2/zh_CN/figures @dirrm share/gnome/help/mixer_applet2/zh_CN @dirrm share/gnome/help/mixer_applet2/sv/figures @@ -1228,6 +1790,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/mixer_applet2/ko @dirrm share/gnome/help/mixer_applet2/ja/figures @dirrm share/gnome/help/mixer_applet2/ja +@dirrm share/gnome/help/mixer_applet2/it/figures +@dirrm share/gnome/help/mixer_applet2/it @dirrm share/gnome/help/mixer_applet2/fr/figures @dirrm share/gnome/help/mixer_applet2/fr @dirrm share/gnome/help/mixer_applet2/es/figures @@ -1239,6 +1803,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/mixer_applet2 @dirrm share/gnome/help/mailcheck/zh_TW/figures @dirrm share/gnome/help/mailcheck/zh_TW +@dirrm share/gnome/help/mailcheck/zh_HK/figures +@dirrm share/gnome/help/mailcheck/zh_HK @dirrm share/gnome/help/mailcheck/zh_CN/figures @dirrm share/gnome/help/mailcheck/zh_CN @dirrm share/gnome/help/mailcheck/sv/figures @@ -1260,6 +1826,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @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_HK/figures +@dirrm share/gnome/help/gweather/zh_HK @dirrm share/gnome/help/gweather/zh_CN/figures @dirrm share/gnome/help/gweather/zh_CN @dirrm share/gnome/help/gweather/sv/figures @@ -1281,6 +1849,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/gweather @dirrm share/gnome/help/gtik2_applet2/zh_TW/figures @dirrm share/gnome/help/gtik2_applet2/zh_TW +@dirrm share/gnome/help/gtik2_applet2/zh_HK/figures +@dirrm share/gnome/help/gtik2_applet2/zh_HK @dirrm share/gnome/help/gtik2_applet2/zh_CN/figures @dirrm share/gnome/help/gtik2_applet2/zh_CN @dirrm share/gnome/help/gtik2_applet2/sv/figures @@ -1302,6 +1872,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/gtik2_applet2 @dirrm share/gnome/help/gkb/zh_TW/figures @dirrm share/gnome/help/gkb/zh_TW +@dirrm share/gnome/help/gkb/zh_HK/figures +@dirrm share/gnome/help/gkb/zh_HK @dirrm share/gnome/help/gkb/zh_CN/figures @dirrm share/gnome/help/gkb/zh_CN @dirrm share/gnome/help/gkb/sv/figures @@ -1323,6 +1895,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/gkb @dirrm share/gnome/help/geyes/zh_TW/figures @dirrm share/gnome/help/geyes/zh_TW +@dirrm share/gnome/help/geyes/zh_HK/figures +@dirrm share/gnome/help/geyes/zh_HK @dirrm share/gnome/help/geyes/zh_CN/figures @dirrm share/gnome/help/geyes/zh_CN @dirrm share/gnome/help/geyes/sv/figures @@ -1342,11 +1916,33 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/geyes/C/figures @dirrm share/gnome/help/geyes/C @dirrm share/gnome/help/geyes +@dirrm share/gnome/help/drivemount/zh_TW/figures +@dirrm share/gnome/help/drivemount/zh_TW +@dirrm share/gnome/help/drivemount/zh_HK/figures +@dirrm share/gnome/help/drivemount/zh_HK +@dirrm share/gnome/help/drivemount/zh_CN/figures +@dirrm share/gnome/help/drivemount/zh_CN +@dirrm share/gnome/help/drivemount/sv/figures +@dirrm share/gnome/help/drivemount/sv +@dirrm share/gnome/help/drivemount/ko/figures +@dirrm share/gnome/help/drivemount/ko +@dirrm share/gnome/help/drivemount/ja/figures +@dirrm share/gnome/help/drivemount/ja +@dirrm share/gnome/help/drivemount/it/figures +@dirrm share/gnome/help/drivemount/it +@dirrm share/gnome/help/drivemount/fr/figures +@dirrm share/gnome/help/drivemount/fr +@dirrm share/gnome/help/drivemount/es/figures +@dirrm share/gnome/help/drivemount/es +@dirrm share/gnome/help/drivemount/de/figures +@dirrm share/gnome/help/drivemount/de @dirrm share/gnome/help/drivemount/C/figures @dirrm share/gnome/help/drivemount/C @dirrm share/gnome/help/drivemount @dirrm share/gnome/help/command-line/zh_TW/figures @dirrm share/gnome/help/command-line/zh_TW +@dirrm share/gnome/help/command-line/zh_HK/figures +@dirrm share/gnome/help/command-line/zh_HK @dirrm share/gnome/help/command-line/zh_CN/figures @dirrm share/gnome/help/command-line/zh_CN @dirrm share/gnome/help/command-line/sv/figures @@ -1368,14 +1964,14 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/command-line @dirrm share/gnome/help/char-palette/zh_TW/figures @dirrm share/gnome/help/char-palette/zh_TW +@dirrm share/gnome/help/char-palette/zh_HK/figures +@dirrm share/gnome/help/char-palette/zh_HK @dirrm share/gnome/help/char-palette/zh_CN/figures @dirrm share/gnome/help/char-palette/zh_CN @dirrm share/gnome/help/char-palette/sv/figures @dirrm share/gnome/help/char-palette/sv @dirrm share/gnome/help/char-palette/ko/figures @dirrm share/gnome/help/char-palette/ko -@dirrm share/gnome/help/char-palette/ja/figures -@dirrm share/gnome/help/char-palette/ja @dirrm share/gnome/help/char-palette/it/figures @dirrm share/gnome/help/char-palette/it @dirrm share/gnome/help/char-palette/fr/figures @@ -1389,6 +1985,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/char-palette @dirrm share/gnome/help/cdplayer/zh_TW/figures @dirrm share/gnome/help/cdplayer/zh_TW +@dirrm share/gnome/help/cdplayer/zh_HK/figures +@dirrm share/gnome/help/cdplayer/zh_HK @dirrm share/gnome/help/cdplayer/zh_CN/figures @dirrm share/gnome/help/cdplayer/zh_CN @dirrm share/gnome/help/cdplayer/sv/figures @@ -1408,17 +2006,42 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/cdplayer/C/figures @dirrm share/gnome/help/cdplayer/C @dirrm share/gnome/help/cdplayer +%%BATTERY%%@dirrm share/gnome/help/battstat/zh_TW/figures +%%BATTERY%%@dirrm share/gnome/help/battstat/zh_TW +%%BATTERY%%@dirrm share/gnome/help/battstat/zh_HK/figures +%%BATTERY%%@dirrm share/gnome/help/battstat/zh_HK +%%BATTERY%%@dirrm share/gnome/help/battstat/zh_CN/figures +%%BATTERY%%@dirrm share/gnome/help/battstat/zh_CN +%%BATTERY%%@dirrm share/gnome/help/battstat/sv/figures +%%BATTERY%%@dirrm share/gnome/help/battstat/sv +%%BATTERY%%@dirrm share/gnome/help/battstat/ko/figures +%%BATTERY%%@dirrm share/gnome/help/battstat/ko %%BATTERY%%@dirrm share/gnome/help/battstat/ja/figures %%BATTERY%%@dirrm share/gnome/help/battstat/ja +%%BATTERY%%@dirrm share/gnome/help/battstat/it/figures +%%BATTERY%%@dirrm share/gnome/help/battstat/it +%%BATTERY%%@dirrm share/gnome/help/battstat/fr/figures +%%BATTERY%%@dirrm share/gnome/help/battstat/fr +%%BATTERY%%@dirrm share/gnome/help/battstat/es/figures +%%BATTERY%%@dirrm share/gnome/help/battstat/es +%%BATTERY%%@dirrm share/gnome/help/battstat/de/figures +%%BATTERY%%@dirrm share/gnome/help/battstat/de %%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 +@dirrm share/gnome/gswitchit +@dirrm share/gnome/geyes/Horrid +@dirrm share/gnome/geyes/Default-tiny +@dirrm share/gnome/geyes/Default +@dirrm share/gnome/geyes/Bloodshot +@dirrm share/gnome/geyes/Bizarre @dirrm share/gnome/gen_util %%BATTERY%%@dirrm share/gnome/battstat_applet @dirrm libexec/gnome-applets +@dirrm include/libgswitchit @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 @@ -1436,6 +2059,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gweather @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gtik/prefs @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gtik +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gswitchit/Applet +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gswitchit @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gkb-applet/prefs @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gkb-applet @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/geyes/prefs @@ -1451,9 +2076,20 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @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 +@dirrm etc/gconf/gconf.xml.defaults/apps/gswitchit/Applet +@dirrm etc/gconf/gconf.xml.defaults/apps/gswitchit @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-de.omf 2>/dev/null || /usr/bin/true +%%BATTERY%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/battstat-es.omf 2>/dev/null || /usr/bin/true +%%BATTERY%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/battstat-fr.omf 2>/dev/null || /usr/bin/true +%%BATTERY%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/battstat-it.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 +%%BATTERY%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/battstat-ko.omf 2>/dev/null || /usr/bin/true +%%BATTERY%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/battstat-sv.omf 2>/dev/null || /usr/bin/true +%%BATTERY%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/battstat-zh_CN.omf 2>/dev/null || /usr/bin/true +%%BATTERY%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/battstat-zh_HK.omf 2>/dev/null || /usr/bin/true +%%BATTERY%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/battstat-zh_TW.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 @@ -1463,16 +2099,17 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/cdplayer-ko.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/cdplayer-sv.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/cdplayer-zh_CN.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/cdplayer-zh_HK.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/cdplayer-zh_TW.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-de.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-es.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-fr.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-it.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-ja.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-ko.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-sv.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-zh_CN.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-zh_HK.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-zh_TW.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/command-line-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/command-line-de.omf 2>/dev/null || /usr/bin/true @@ -1483,8 +2120,19 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/command-line-ko.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/command-line-sv.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/command-line-zh_CN.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/command-line-zh_HK.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/command-line-zh_TW.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/drivemount-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/drivemount-de.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/drivemount-es.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/drivemount-fr.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/drivemount-it.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/drivemount-ja.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/drivemount-ko.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/drivemount-sv.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/drivemount-zh_CN.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/drivemount-zh_HK.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/drivemount-zh_TW.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/geyes-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/geyes-de.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/geyes-es.omf 2>/dev/null || /usr/bin/true @@ -1494,6 +2142,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/geyes-ko.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/geyes-sv.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/geyes-zh_CN.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/geyes-zh_HK.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/geyes-zh_TW.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gkb-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gkb-de.omf 2>/dev/null || /usr/bin/true @@ -1504,6 +2153,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gkb-ko.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gkb-sv.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gkb-zh_CN.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gkb-zh_HK.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gkb-zh_TW.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-de.omf 2>/dev/null || /usr/bin/true @@ -1514,6 +2164,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-ko.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-sv.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-zh_CN.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-zh_HK.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-zh_TW.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gweather-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gweather-de.omf 2>/dev/null || /usr/bin/true @@ -1524,6 +2175,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gweather-ko.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gweather-sv.omf 2>/dev/null || /usr/bin/true @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_HK.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/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 @@ -1534,16 +2186,50 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @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_HK.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 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-fr.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-it.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-ja.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-ko.omf 2>/dev/null || /usr/bin/true @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_HK.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/multiload-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/multiload-de.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/multiload-es.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/multiload-fr.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/multiload-it.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/multiload-ja.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/multiload-ko.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/multiload-sv.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/multiload-zh_CN.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/multiload-zh_HK.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/multiload-zh_TW.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 +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-de.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-es.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-fr.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-it.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-ja.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-ko.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-sv.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-zh_CN.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-zh_HK.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-zh_TW.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/wireless-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/wireless-de.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/wireless-es.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/wireless-fr.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/wireless-it.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/wireless-ja.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/wireless-ko.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/wireless-sv.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/wireless-zh_CN.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/wireless-zh_HK.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/wireless-zh_TW.omf 2>/dev/null || /usr/bin/true diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile index bfd82d8dd2ec..e27e91a8da7d 100644 --- a/x11/gnome-desktop/Makefile +++ b/x11/gnome-desktop/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomedesktop -PORTVERSION= 2.4.1.1 -PORTREVISION= 2 +PORTVERSION= 2.6.0.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-desktop/2.4 +MASTER_SITE_SUBDIR= sources/gnome-desktop/2.6 DISTNAME= gnome-desktop-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -20,7 +19,8 @@ COMMENT= Additional UI API for GNOME 2 USE_BZIP2= yes USE_X_PREFIX= yes USE_XPM= yes -USE_GNOME= gnomeprefix gnomehack gnomehier libgnomeui +USE_REINPLACE= yes +USE_GNOME= gnomeprefix gnomehack intlhack lthack gnomehier libgnomeui GNOME_DESKTOP_VERSION=2 USE_GMAKE= yes USE_BISON= yes diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo index 886b1521819b..213352fd1c8d 100644 --- a/x11/gnome-desktop/distinfo +++ b/x11/gnome-desktop/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-desktop-2.4.1.1.tar.bz2) = c85489c7befc79b5cc9bda1b2006cacc -SIZE (gnome2/gnome-desktop-2.4.1.1.tar.bz2) = 1054097 +MD5 (gnome2/gnome-desktop-2.6.0.1.tar.bz2) = 2d40b7d7a15f23770265246979529327 +SIZE (gnome2/gnome-desktop-2.6.0.1.tar.bz2) = 1077853 diff --git a/x11/gnome-desktop/files/patch-configure b/x11/gnome-desktop/files/patch-configure deleted file mode 100644 index caf5b493a9eb..000000000000 --- a/x11/gnome-desktop/files/patch-configure +++ /dev/null @@ -1,10 +0,0 @@ ---- 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" -+$ac_aux_dir/ltconfig $LIBTOOL_DEPS - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' diff --git a/x11/gnome-desktop/pkg-descr b/x11/gnome-desktop/pkg-descr index 500857a54f14..bda4df7913d6 100644 --- a/x11/gnome-desktop/pkg-descr +++ b/x11/gnome-desktop/pkg-descr @@ -1,4 +1,3 @@ -This is a collection of APIs not included in libgnomeui as they have -not undergone sufficient testing. +This is a collection of APIs not included in libgnomeui. WWW: http://www.gnome.org/ diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist index a3384f7d3a88..9a87be2a25b4 100644 --- a/x11/gnome-desktop/pkg-plist +++ b/x11/gnome-desktop/pkg-plist @@ -21,6 +21,14 @@ 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/omf/gnome-desktop/fdl-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-desktop/fdl-C.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-desktop/gnome-feedback-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-desktop/gnome-feedback-C.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-desktop/gpl-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-desktop/gpl-C.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-desktop/lgpl-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-desktop/lgpl-C.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/advanced-directory.png share/gnome/pixmaps/apple-green.png share/gnome/pixmaps/apple-red.png @@ -117,6 +125,7 @@ share/gnome/vfolders/Other.directory share/gnome/vfolders/Root.directory share/gnome/vfolders/Settings.directory share/gnome/vfolders/System.directory +share/locale/af/LC_MESSAGES/gnome-desktop-2.0.mo 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 @@ -131,6 +140,7 @@ 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 +share/locale/en_CA/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/en_GB/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/eo/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/es/LC_MESSAGES/gnome-desktop-2.0.mo @@ -143,6 +153,7 @@ share/locale/ga/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/gl/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/he/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/hi/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/hr/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/hu/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/id/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/is/LC_MESSAGES/gnome-desktop-2.0.mo @@ -162,6 +173,7 @@ 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 +share/locale/pa/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/pl/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/pt/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/pt_BR/LC_MESSAGES/gnome-desktop-2.0.mo @@ -175,6 +187,7 @@ share/locale/sr@Latn/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/sv/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ta/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/th/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/tk/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/tr/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/uk/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/vi/LC_MESSAGES/gnome-desktop-2.0.mo @@ -182,13 +195,21 @@ share/locale/wa/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/yi/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo -@dirrm share/gnome/help/lgpl/C/figures -@dirrm share/gnome/help/gpl/C/figures -@dirrm share/gnome/help/gnome-feedback/C/figures +@dirrm share/gnome/omf/gnome-desktop +@dirrm share/gnome/help/lgpl/C +@dirrm share/gnome/help/lgpl +@dirrm share/gnome/help/gpl/C +@dirrm share/gnome/help/gpl @dirrm share/gnome/help/gnome-feedback/C @dirrm share/gnome/help/gnome-feedback -@dirrm share/gnome/help/fdl/C/figures +@dirrm share/gnome/help/fdl/C +@dirrm share/gnome/help/fdl @dirrm share/gnome/gnome-about/headers +@dirrm share/gnome/gnome-about @dirrm include/gnome-desktop-2.0/libgnomeui @dirrm include/gnome-desktop-2.0/libgnome @dirrm include/gnome-desktop-2.0 +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-desktop/fdl-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-desktop/gnome-feedback-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-desktop/gpl-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-desktop/lgpl-C.omf 2>/dev/null || /usr/bin/true diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index 56398c8c4dd0..36c2fefb4f95 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomepanel -PORTVERSION= 2.4.2 -PORTREVISION= 1 +PORTVERSION= 2.6.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-panel/2.4 +MASTER_SITE_SUBDIR= sources/gnome-panel/2.6 DISTNAME= gnome-panel-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -20,8 +19,9 @@ COMMENT= Panel component for the GNOME 2 Desktop USE_BZIP2= yes INSTALLS_SHLIB= yes USE_X_PREFIX= yes -USE_GNOME= gnomeprefix gnomehack gnomehier gnomedesktop libwnck lthack \ - intlhack +USE_REINPLACE= yes +USE_GNOME= gnomeprefix gnomehack gnomehier intlhack lthack gnomedesktop \ + libwnck GNOME_DESKTOP_VERSION=2 USE_GMAKE= yes USE_LIBTOOL_VER=13 @@ -32,4 +32,9 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ MAN1= gnome-panel.1 gnome-panel-preferences.1 +post-patch: +.for po in da.po it.po zh_TW.po + @${REINPLACE_CMD} -e 's|%-|%|g' ${WRKSRC}/po/${po} +.endfor + .include <bsd.port.mk> diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo index 2e18221ce043..922d7c3b0c78 100644 --- a/x11/gnome-panel/distinfo +++ b/x11/gnome-panel/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-panel-2.4.2.tar.bz2) = d62da1f6cb129f65206a945d93a2fa85 -SIZE (gnome2/gnome-panel-2.4.2.tar.bz2) = 2662404 +MD5 (gnome2/gnome-panel-2.6.0.tar.bz2) = 9e0ad03c9266d342b99837ca4e947b55 +SIZE (gnome2/gnome-panel-2.6.0.tar.bz2) = 2933581 diff --git a/x11/gnome-panel/files/patch-applets_clock_clock.c b/x11/gnome-panel/files/patch-applets_clock_clock.c index 976764570ff1..ccf5378b135f 100644 --- a/x11/gnome-panel/files/patch-applets_clock_clock.c +++ b/x11/gnome-panel/files/patch-applets_clock_clock.c @@ -1,9 +1,6 @@ - -$FreeBSD$ - ---- 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 @@ +--- applets/clock/clock.c.orig Tue Jan 13 11:55:58 2004 ++++ applets/clock/clock.c Wed Jan 14 15:43:39 2004 +@@ -47,7 +47,9 @@ #include <dirent.h> #include <string.h> #include <time.h> @@ -13,15 +10,15 @@ $FreeBSD$ #include <panel-applet.h> #include <panel-applet-gconf.h> -@@ -684,7 +686,11 @@ - cd->hourformat = panel_applet_gconf_get_int (applet, KEY_HOUR_FORMAT, &error); - if (error || (cd->hourformat != 12 && cd->hourformat != 24)) { - /* if value is not valid, set it according to locale */ +@@ -539,7 +541,11 @@ + { + const char *am; + +#ifdef HAVE_LANGINFO_H - const char *am = nl_langinfo (AM_STR); + am = nl_langinfo (AM_STR); +#else -+ const char *am = "AM"; ++ am = "AM"; +#endif - cd->hourformat = (am[0] == '\0') ? 24 : 12; + return (am[0] == '\0') ? CLOCK_FORMAT_24 : CLOCK_FORMAT_12; + } - if (error) diff --git a/x11/gnome-panel/files/patch-configure b/x11/gnome-panel/files/patch-configure new file mode 100644 index 000000000000..732f3a86022c --- /dev/null +++ b/x11/gnome-panel/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig Wed Jan 14 15:54:42 2004 ++++ configure Wed Jan 14 15:55:13 2004 +@@ -5536,7 +5536,7 @@ + + + for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ +- inttypes.h stdint.h unistd.h ++ inttypes.h stdint.h unistd.h langinfo.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` + echo "$as_me:$LINENO: checking for $ac_header" >&5 diff --git a/x11/gnome-panel/files/patch-po_da.po b/x11/gnome-panel/files/patch-po_da.po deleted file mode 100644 index 96bfea954001..000000000000 --- a/x11/gnome-panel/files/patch-po_da.po +++ /dev/null @@ -1,29 +0,0 @@ ---- po/da.po.orig Wed Oct 1 15:54:18 2003 -+++ po/da.po Wed Oct 1 15:56:23 2003 -@@ -48,7 +48,7 @@ - - #: applets/clock/clock.c:227 - msgid "%a %b %d" --msgstr "%a %-d. %b" -+msgstr "%a %d. %b" - - #. translators: reverse the order of these arguments - #. * if the time should come before the -@@ -75,7 +75,7 @@ - #. Show date in tooltip - #: applets/clock/clock.c:344 - msgid "%A %B %d" --msgstr "%A den %-d. %B" -+msgstr "%A den %d. %B" - - #: applets/clock/clock.c:472 - msgid "Calendar" -@@ -95,7 +95,7 @@ - - #: applets/clock/clock.c:809 - msgid "%A, %B %d %Y" --msgstr "%A, %-d. %B %Y" -+msgstr "%A, %d. %B %Y" - - #: applets/clock/clock.c:850 - #, c-format diff --git a/x11/gnome-panel/files/patch-po_it.po b/x11/gnome-panel/files/patch-po_it.po deleted file mode 100644 index 00118bd344bc..000000000000 --- a/x11/gnome-panel/files/patch-po_it.po +++ /dev/null @@ -1,59 +0,0 @@ ---- po/it.po.orig Wed Oct 1 15:55:34 2003 -+++ po/it.po Wed Oct 1 15:56:12 2003 -@@ -17,23 +17,23 @@ - - #: applets/clock/clock.c:219 - msgid "%l:%M:%S %p" --msgstr "%-I.%M.%S %p" -+msgstr "%I.%M.%S %p" - - #: applets/clock/clock.c:219 - msgid "%l:%M %p" --msgstr "%-I.%M %p" -+msgstr "%I.%M %p" - - #: applets/clock/clock.c:221 applets/clock/clock.c:773 - msgid "%H:%M:%S" --msgstr "%-H.%M.%S" -+msgstr "%H.%M.%S" - - #: applets/clock/clock.c:221 applets/clock/clock.c:775 - msgid "%H:%M" --msgstr "%-H.%M" -+msgstr "%H.%M" - - #: applets/clock/clock.c:227 - msgid "%a %b %d" --msgstr "%a %-d %b" -+msgstr "%a %d %b" - - #. translators: reverse the order of these arguments - #. * if the time should come before the -@@ -60,7 +60,7 @@ - #. Show date in tooltip - #: applets/clock/clock.c:344 - msgid "%A %B %d" --msgstr "%A %-d %B" -+msgstr "%A %d %B" - - #: applets/clock/clock.c:472 - msgid "Calendar" -@@ -72,15 +72,15 @@ - - #: applets/clock/clock.c:768 - msgid "%I:%M:%S %p" --msgstr "%-I.%M.%S %p" -+msgstr "%I.%M.%S %p" - - #: applets/clock/clock.c:770 - msgid "%I:%M %p" --msgstr "%-I.%M %p" -+msgstr "%I.%M %p" - - #: applets/clock/clock.c:809 - msgid "%A, %B %d %Y" --msgstr "%A, %-d %B %Y" -+msgstr "%A, %d %B %Y" - - #: applets/clock/clock.c:850 - #, c-format diff --git a/x11/gnome-panel/files/patch-po_zh_TW.po b/x11/gnome-panel/files/patch-po_zh_TW.po deleted file mode 100644 index 3e7e16c45ddb..000000000000 --- a/x11/gnome-panel/files/patch-po_zh_TW.po +++ /dev/null @@ -1,20 +0,0 @@ ---- po/zh_TW.po.orig Wed Oct 1 15:57:10 2003 -+++ po/zh_TW.po Wed Oct 1 15:57:19 2003 -@@ -40,7 +40,7 @@ - - #: applets/clock/clock.c:227 - msgid "%a %b %d" --msgstr "%-m月%-d日(%a)" -+msgstr "%m月%d日(%a)" - - #. translators: reverse the order of these arguments - #. * if the time should come before the -@@ -67,7 +67,7 @@ - #. Show date in tooltip - #: applets/clock/clock.c:344 - msgid "%A %B %d" --msgstr "%-m月%-d日(%A)" -+msgstr "%m月%d日(%A)" - - #: applets/clock/clock.c:472 - msgid "Calendar" diff --git a/x11/gnome-panel/pkg-descr b/x11/gnome-panel/pkg-descr index 5e73398913a9..263044b5e130 100644 --- a/x11/gnome-panel/pkg-descr +++ b/x11/gnome-panel/pkg-descr @@ -1,3 +1,3 @@ -Panel component for the GNOME 2 Desktop. +This drives the GNOME 2 panel. WWW: http://www.gnome.org/ diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist index f10b99a60775..e691400d6c7d 100644 --- a/x11/gnome-panel/pkg-plist +++ b/x11/gnome-panel/pkg-plist @@ -64,9 +64,9 @@ 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-enums.h include/panel-2.0/panel-applet-gconf.h include/panel-2.0/panel-applet.h -lib/libclock-applet-2.so lib/libpanel-applet-2.a lib/libpanel-applet-2.so lib/libpanel-applet-2.so.0 @@ -76,21 +76,27 @@ 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/clock-applet libexec/fish-applet-2 libexec/notification-area-applet libexec/wnck-applet +share/doc/panel-applet/PanelApplet.html 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/home.png +share/doc/panel-applet/index.html share/doc/panel-applet/index.sgml -share/doc/panel-applet/libpanel-applet.html +share/doc/panel-applet/left.png share/doc/panel-applet/multi-applets.html -share/doc/panel-applet/panel-applet-panel-applet-gconf-utilities.html +share/doc/panel-applet/panel-applet-Panel-Applet-GConf-Utilities.html +share/doc/panel-applet/panel-applet.devhelp share/doc/panel-applet/panel-applet.html share/doc/panel-applet/panel-signals.html -share/doc/panel-applet/panelapplet.html +share/doc/panel-applet/right.png share/doc/panel-applet/server-files.html share/doc/panel-applet/session-saving.html +share/doc/panel-applet/up.png share/gnome/control-center-2.0/capplets/gnome-panel-preferences.desktop share/gnome/gnome-2.0/ui/GNOME_ClockApplet.xml share/gnome/gnome-2.0/ui/GNOME_FishApplet.xml @@ -129,9 +135,6 @@ share/gnome/help/clock/ko/legal.xml share/gnome/help/clock/sv/clock.xml share/gnome/help/clock/sv/figures/clock_applet.png share/gnome/help/clock/sv/legal.xml -share/gnome/help/clock/uk/clock.xml -share/gnome/help/clock/uk/figures/clock_applet.png -share/gnome/help/clock/uk/legal.xml share/gnome/help/clock/zh_CN/clock.xml share/gnome/help/clock/zh_CN/figures/clock_applet.png share/gnome/help/clock/zh_CN/legal.xml @@ -168,9 +171,6 @@ share/gnome/help/fish-applet-2/sv/figures/fish_applet.png share/gnome/help/fish-applet-2/sv/figures/fish_settings.png share/gnome/help/fish-applet-2/sv/fish-applet-2.xml share/gnome/help/fish-applet-2/sv/legal.xml -share/gnome/help/fish-applet-2/uk/figures/fish_applet.png -share/gnome/help/fish-applet-2/uk/fish-applet-2.xml -share/gnome/help/fish-applet-2/uk/legal.xml share/gnome/help/fish-applet-2/zh_CN/figures/fish_applet.png share/gnome/help/fish-applet-2/zh_CN/figures/fish_settings.png share/gnome/help/fish-applet-2/zh_CN/fish-applet-2.xml @@ -217,10 +217,6 @@ share/gnome/help/window-list/sv/figures/window_list_group.png share/gnome/help/window-list/sv/figures/window_list_group_applet.png share/gnome/help/window-list/sv/legal.xml share/gnome/help/window-list/sv/window-list.xml -share/gnome/help/window-list/uk/figures/window_list_applet.png -share/gnome/help/window-list/uk/figures/window_list_group_applet.png -share/gnome/help/window-list/uk/legal.xml -share/gnome/help/window-list/uk/window-list.xml share/gnome/help/window-list/zh_CN/figures/window_list_applet.png share/gnome/help/window-list/zh_CN/figures/window_list_group.png share/gnome/help/window-list/zh_CN/figures/window_list_group_applet.png @@ -261,9 +257,6 @@ share/gnome/help/workspace-switcher/sv/figures/workspace_switcher_applet.png share/gnome/help/workspace-switcher/sv/figures/workspacelist_applet.png share/gnome/help/workspace-switcher/sv/legal.xml share/gnome/help/workspace-switcher/sv/workspace-switcher.xml -share/gnome/help/workspace-switcher/uk/figures/workspace_switcher_applet.png -share/gnome/help/workspace-switcher/uk/legal.xml -share/gnome/help/workspace-switcher/uk/workspace-switcher.xml share/gnome/help/workspace-switcher/zh_CN/figures/workspace_switcher_applet.png share/gnome/help/workspace-switcher/zh_CN/figures/workspacelist_applet.png share/gnome/help/workspace-switcher/zh_CN/legal.xml @@ -289,8 +282,6 @@ share/gnome/omf/gnome-panel/clock-ko.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/clock-ko.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-panel/clock-sv.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/clock-sv.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-panel/clock-uk.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/clock-uk.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-panel/clock-zh_CN.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/clock-zh_CN.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-panel/clock-zh_TW.omf @@ -311,8 +302,6 @@ share/gnome/omf/gnome-panel/fish-applet-2-ko.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-ko.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-panel/fish-applet-2-sv.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-sv.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-panel/fish-applet-2-uk.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-uk.omf 2>/dev/null || /usr/bin/true 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 @@ -333,8 +322,6 @@ share/gnome/omf/gnome-panel/window-list-ko.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-ko.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-panel/window-list-sv.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-sv.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-panel/window-list-uk.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-uk.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-panel/window-list-zh_CN.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-zh_CN.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-panel/window-list-zh_TW.omf @@ -355,8 +342,6 @@ share/gnome/omf/gnome-panel/workspace-switcher-ko.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-ko.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-panel/workspace-switcher-sv.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-sv.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-panel/workspace-switcher-uk.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-uk.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-panel/workspace-switcher-zh_CN.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-zh_CN.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf @@ -385,7 +370,6 @@ 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/panel-drawer.png share/gnome/pixmaps/panel-force-quit.png share/locale/am/LC_MESSAGES/gnome-panel-2.0.mo @@ -400,6 +384,7 @@ share/locale/cy/LC_MESSAGES/gnome-panel-2.0.mo share/locale/da/LC_MESSAGES/gnome-panel-2.0.mo share/locale/de/LC_MESSAGES/gnome-panel-2.0.mo share/locale/el/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/en_CA/LC_MESSAGES/gnome-panel-2.0.mo share/locale/en_GB/LC_MESSAGES/gnome-panel-2.0.mo share/locale/eo/LC_MESSAGES/gnome-panel-2.0.mo share/locale/es/LC_MESSAGES/gnome-panel-2.0.mo @@ -412,6 +397,7 @@ share/locale/ga/LC_MESSAGES/gnome-panel-2.0.mo share/locale/gl/LC_MESSAGES/gnome-panel-2.0.mo share/locale/he/LC_MESSAGES/gnome-panel-2.0.mo share/locale/hi/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/hr/LC_MESSAGES/gnome-panel-2.0.mo share/locale/hu/LC_MESSAGES/gnome-panel-2.0.mo share/locale/id/LC_MESSAGES/gnome-panel-2.0.mo share/locale/it/LC_MESSAGES/gnome-panel-2.0.mo @@ -423,10 +409,12 @@ share/locale/lv/LC_MESSAGES/gnome-panel-2.0.mo share/locale/mk/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ml/LC_MESSAGES/gnome-panel-2.0.mo share/locale/mn/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/mr/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ms/LC_MESSAGES/gnome-panel-2.0.mo share/locale/nl/LC_MESSAGES/gnome-panel-2.0.mo share/locale/nn/LC_MESSAGES/gnome-panel-2.0.mo share/locale/no/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/pa/LC_MESSAGES/gnome-panel-2.0.mo share/locale/pl/LC_MESSAGES/gnome-panel-2.0.mo share/locale/pt/LC_MESSAGES/gnome-panel-2.0.mo share/locale/pt_BR/LC_MESSAGES/gnome-panel-2.0.mo @@ -437,8 +425,10 @@ share/locale/sl/LC_MESSAGES/gnome-panel-2.0.mo share/locale/sq/LC_MESSAGES/gnome-panel-2.0.mo share/locale/sr/LC_MESSAGES/gnome-panel-2.0.mo share/locale/sr@Latn/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/sr@ije/LC_MESSAGES/gnome-panel-2.0.mo share/locale/sv/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ta/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/th/LC_MESSAGES/gnome-panel-2.0.mo share/locale/tr/LC_MESSAGES/gnome-panel-2.0.mo share/locale/uk/LC_MESSAGES/gnome-panel-2.0.mo share/locale/vi/LC_MESSAGES/gnome-panel-2.0.mo @@ -452,8 +442,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo @dirrm share/gnome/help/workspace-switcher/zh_TW @dirrm share/gnome/help/workspace-switcher/zh_CN/figures @dirrm share/gnome/help/workspace-switcher/zh_CN -@dirrm share/gnome/help/workspace-switcher/uk/figures -@dirrm share/gnome/help/workspace-switcher/uk @dirrm share/gnome/help/workspace-switcher/sv/figures @dirrm share/gnome/help/workspace-switcher/sv @dirrm share/gnome/help/workspace-switcher/ko/figures @@ -475,8 +463,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo @dirrm share/gnome/help/window-list/zh_TW @dirrm share/gnome/help/window-list/zh_CN/figures @dirrm share/gnome/help/window-list/zh_CN -@dirrm share/gnome/help/window-list/uk/figures -@dirrm share/gnome/help/window-list/uk @dirrm share/gnome/help/window-list/sv/figures @dirrm share/gnome/help/window-list/sv @dirrm share/gnome/help/window-list/ko/figures @@ -498,8 +484,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo @dirrm share/gnome/help/fish-applet-2/zh_TW @dirrm share/gnome/help/fish-applet-2/zh_CN/figures @dirrm share/gnome/help/fish-applet-2/zh_CN -@dirrm share/gnome/help/fish-applet-2/uk/figures -@dirrm share/gnome/help/fish-applet-2/uk @dirrm share/gnome/help/fish-applet-2/sv/figures @dirrm share/gnome/help/fish-applet-2/sv @dirrm share/gnome/help/fish-applet-2/ko/figures @@ -521,8 +505,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo @dirrm share/gnome/help/clock/zh_TW @dirrm share/gnome/help/clock/zh_CN/figures @dirrm share/gnome/help/clock/zh_CN -@dirrm share/gnome/help/clock/uk/figures -@dirrm share/gnome/help/clock/uk @dirrm share/gnome/help/clock/sv/figures @dirrm share/gnome/help/clock/sv @dirrm share/gnome/help/clock/ko/figures @@ -601,7 +583,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-ja.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-ko.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-sv.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-uk.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-zh_CN.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-zh_TW.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-C.omf 2>/dev/null || /usr/bin/true @@ -612,7 +593,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-ja.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-ko.omf 2>/dev/null || /usr/bin/true @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-uk.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/window-list-C.omf 2>/dev/null || /usr/bin/true @@ -623,7 +603,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-ja.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-ko.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-sv.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-uk.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-zh_CN.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-zh_TW.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-C.omf 2>/dev/null || /usr/bin/true @@ -634,6 +613,5 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-ja.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-ko.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-sv.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-uk.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-zh_CN.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf 2>/dev/null || /usr/bin/true diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile index 6dbda489a1a5..857eaa4af5c1 100644 --- a/x11/gnome-session/Makefile +++ b/x11/gnome-session/Makefile @@ -6,16 +6,16 @@ # PORTNAME= gnomesession -PORTVERSION= 2.4.2 -PORTREVISION= 1 +PORTVERSION= 2.6.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} \ + http://people.FreeBSD.org/~marcus/:local \ ${MASTER_SITE_LOCAL:S/$/:local/} -MASTER_SITE_SUBDIR= sources/gnome-session/2.4 \ +MASTER_SITE_SUBDIR= sources/gnome-session/2.6 \ marcus/:local DISTNAME= gnome-session-${PORTVERSION} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - splash.png:local + ${SPLASH_IMG}:local DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -23,7 +23,7 @@ COMMENT= Session component for the GNOME 2 desktop USE_BZIP2= yes USE_X_PREFIX= yes -USE_GNOME= gnomeprefix gnomehack intlhack gnomehier libgnomeui +USE_GNOME= gnomeprefix gnomehack gnomehier intlhack lthack libgnomeui USE_GMAKE= yes USE_LIBTOOL_VER=13 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ @@ -33,11 +33,13 @@ MAN1= gnome-session.1 gnome-smproxy.1 gnome-wm.1 session-properties.1 \ gnome-session-save.1 MAN5= default.session.5 +SPLASH_IMG= gnome-splash04-12.png + post-extract: - @${CP} ${DISTDIR}/${DIST_SUBDIR}/splash.png ${WRKDIR} + @${CP} ${DISTDIR}/${DIST_SUBDIR}/${SPLASH_IMG} ${WRKDIR} post-install: - ${INSTALL_DATA} ${WRKDIR}/splash.png \ + ${INSTALL_DATA} ${WRKDIR}/${SPLASH_IMG} \ ${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 0a06b2a8ed0e..56764710a045 100644 --- a/x11/gnome-session/distinfo +++ b/x11/gnome-session/distinfo @@ -1,4 +1,4 @@ -MD5 (gnome2/gnome-session-2.4.2.tar.bz2) = fc2e6d9c71b4d1fe08ec329d7e03684e -SIZE (gnome2/gnome-session-2.4.2.tar.bz2) = 911570 -MD5 (gnome2/splash.png) = bd73a8a1f0c97aac669045f6b9b1fe02 -SIZE (gnome2/splash.png) = 59161 +MD5 (gnome2/gnome-session-2.6.0.tar.bz2) = 42018f3e5f201a4f449de444c600ce29 +SIZE (gnome2/gnome-session-2.6.0.tar.bz2) = 836172 +MD5 (gnome2/gnome-splash04-12.png) = a26cafb0ccffd5e173d7255e683faafd +SIZE (gnome2/gnome-splash04-12.png) = 75841 diff --git a/x11/gnome-session/files/patch-configure b/x11/gnome-session/files/patch-configure deleted file mode 100644 index 61084626cb14..000000000000 --- a/x11/gnome-session/files/patch-configure +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.orig Wed May 8 14:27:04 2002 -+++ configure Wed May 8 14:27:23 2002 -@@ -7232,6 +7232,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' diff --git a/x11/gnome-session/files/patch-gnome-session_gnome-session.schemas.in.in b/x11/gnome-session/files/patch-gnome-session_gnome-session.schemas.in.in deleted file mode 100644 index 9bd6c9a2cf68..000000000000 --- a/x11/gnome-session/files/patch-gnome-session_gnome-session.schemas.in.in +++ /dev/null @@ -1,11 +0,0 @@ ---- gnome-session/gnome-session.schemas.in.in.orig Mon Oct 14 17:18:15 2002 -+++ gnome-session/gnome-session.schemas.in.in Mon Oct 14 17:17:44 2002 -@@ -50,7 +50,7 @@ - <applyto>/apps/gnome-session/options/splash_image</applyto> - <owner>gnome</owner> - <type>string</type> -- <default>@prefix@/share/pixmaps/splash/gnome-splash.png</default> -+ <default>@datadir@/pixmaps/splash/gnome-splash.png</default> - <locale name="C"> - <short>Splash Screen Image</short> - <long>Preferred Image to use for the splash screen when logging in to the GNOME Desktop</long> diff --git a/x11/gnome-session/pkg-descr b/x11/gnome-session/pkg-descr index e0a6dd0276ff..50986ef910b2 100644 --- a/x11/gnome-session/pkg-descr +++ b/x11/gnome-session/pkg-descr @@ -1,2 +1,2 @@ -Session component for the GNOME 2.0 desktop. This package contains the -commands needed to start GNOME 2.0. +This provides session management for the GNOME 2 desktop, and +provides the tools used to start the desktop. diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist index d4fc0ded7788..355893a4e9d8 100644 --- a/x11/gnome-session/pkg-plist +++ b/x11/gnome-session/pkg-plist @@ -26,6 +26,7 @@ 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_CA/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 @@ -38,6 +39,7 @@ share/locale/ga/LC_MESSAGES/gnome-session-2.0.mo share/locale/gl/LC_MESSAGES/gnome-session-2.0.mo share/locale/he/LC_MESSAGES/gnome-session-2.0.mo share/locale/hi/LC_MESSAGES/gnome-session-2.0.mo +share/locale/hr/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 @@ -50,10 +52,12 @@ share/locale/lv/LC_MESSAGES/gnome-session-2.0.mo share/locale/mk/LC_MESSAGES/gnome-session-2.0.mo share/locale/ml/LC_MESSAGES/gnome-session-2.0.mo share/locale/mn/LC_MESSAGES/gnome-session-2.0.mo +share/locale/mr/LC_MESSAGES/gnome-session-2.0.mo share/locale/ms/LC_MESSAGES/gnome-session-2.0.mo share/locale/nl/LC_MESSAGES/gnome-session-2.0.mo share/locale/nn/LC_MESSAGES/gnome-session-2.0.mo share/locale/no/LC_MESSAGES/gnome-session-2.0.mo +share/locale/pa/LC_MESSAGES/gnome-session-2.0.mo share/locale/pl/LC_MESSAGES/gnome-session-2.0.mo share/locale/pt/LC_MESSAGES/gnome-session-2.0.mo share/locale/pt_BR/LC_MESSAGES/gnome-session-2.0.mo diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile index d9e6311b68f2..377dc9186d6b 100644 --- a/x11/gnome-terminal/Makefile +++ b/x11/gnome-terminal/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnometerminal -PORTVERSION= 2.4.2 -PORTREVISION= 1 +PORTVERSION= 2.6.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-terminal/2.4 +MASTER_SITE_SUBDIR= sources/gnome-terminal/2.6 DISTNAME= gnome-terminal-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -19,8 +18,9 @@ COMMENT= Terminal component for the GNOME 2 Desktop USE_BZIP2= yes USE_X_PREFIX= yes +USE_REINPLACE= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack gnomehier libgnomeui vte +USE_GNOME= gnomeprefix gnomehack intlhack lthack gnomehier libgnomeui vte USE_LIBTOOL_VER=13 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11/gnome-terminal/distinfo b/x11/gnome-terminal/distinfo index 44e6dc6d5d8b..c497086810d0 100644 --- a/x11/gnome-terminal/distinfo +++ b/x11/gnome-terminal/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-terminal-2.4.2.tar.bz2) = ce7e5a207eb48c5ef23325c406536c33 -SIZE (gnome2/gnome-terminal-2.4.2.tar.bz2) = 1658743 +MD5 (gnome2/gnome-terminal-2.6.0.tar.bz2) = bbb9d4d6bddaec8611d4c002842ec5b8 +SIZE (gnome2/gnome-terminal-2.6.0.tar.bz2) = 1911916 diff --git a/x11/gnome-terminal/files/patch-configure b/x11/gnome-terminal/files/patch-configure deleted file mode 100644 index b393b3039c70..000000000000 --- a/x11/gnome-terminal/files/patch-configure +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.orig Thu May 2 00:36:18 2002 -+++ configure Thu May 2 00:37:15 2002 -@@ -6414,6 +6414,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' diff --git a/x11/gnome-terminal/pkg-descr b/x11/gnome-terminal/pkg-descr index eca945789b32..1193c30f736a 100644 --- a/x11/gnome-terminal/pkg-descr +++ b/x11/gnome-terminal/pkg-descr @@ -1,3 +1,3 @@ -Terminal component for the GNOME 2.0 Desktop. +Default terminal emulator for the GNOME 2.0 Desktop. WWW: http://www.gnome.org/ diff --git a/x11/gnome-terminal/pkg-plist b/x11/gnome-terminal/pkg-plist index 43c24a4f2676..d3648bdea305 100644 --- a/x11/gnome-terminal/pkg-plist +++ b/x11/gnome-terminal/pkg-plist @@ -104,6 +104,7 @@ 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 +share/locale/en_CA/LC_MESSAGES/gnome-terminal.mo share/locale/en_GB/LC_MESSAGES/gnome-terminal.mo share/locale/es/LC_MESSAGES/gnome-terminal.mo share/locale/et/LC_MESSAGES/gnome-terminal.mo @@ -114,6 +115,7 @@ 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/hr/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 @@ -126,6 +128,7 @@ share/locale/ml/LC_MESSAGES/gnome-terminal.mo share/locale/mn/LC_MESSAGES/gnome-terminal.mo share/locale/ms/LC_MESSAGES/gnome-terminal.mo share/locale/nl/LC_MESSAGES/gnome-terminal.mo +share/locale/nn/LC_MESSAGES/gnome-terminal.mo share/locale/no/LC_MESSAGES/gnome-terminal.mo share/locale/pl/LC_MESSAGES/gnome-terminal.mo share/locale/pt/LC_MESSAGES/gnome-terminal.mo @@ -139,6 +142,7 @@ 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/th/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 diff --git a/x11/gnome2-fifth-toe/Makefile b/x11/gnome2-fifth-toe/Makefile index 0da63b4583d6..d26cdc2ac887 100644 --- a/x11/gnome2-fifth-toe/Makefile +++ b/x11/gnome2-fifth-toe/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnome2-fifth-toe -PORTVERSION= 2.4.2 +PORTVERSION= 2.6.0 CATEGORIES= x11 gnome MASTER_SITES= # empty DISTFILES= # empty @@ -25,16 +25,17 @@ RUN_DEPENDS= pan:${PORTSDIR}/news/pan2 \ tsclient:${PORTSDIR}/net/tsclient \ galeon:${PORTSDIR}/www/galeon2 \ seahorse:${PORTSDIR}/security/seahorse \ - ${X11BASE}/lib/gtk-2.0/2.2.0/engines/libindustrial.so:${PORTSDIR}/x11-toolkits/gnome-themes-extras \ + ${X11BASE}/lib/gtk-2.0/2.4.0/engines/libindustrial.so:${PORTSDIR}/x11-toolkits/gnome-themes-extras \ bluefish:${PORTSDIR}/www/bluefish-devel \ gossip:${PORTSDIR}/net/gossip \ inkscape:${PORTSDIR}/graphics/inkscape \ straw:${PORTSDIR}/net/straw \ liferea:${PORTSDIR}/net/liferea \ - rhythmbox:${PORTSDIR}/audio/rhythmbox \ - jamboree:${PORTSDIR}/audio/jamboree \ + gnotime:${PORTSDIR}/deskutils/gnotime \ sound-juicer:${PORTSDIR}/audio/sound-juicer \ - gnotime:${PORTSDIR}/deskutils/gnotime + rhythmbox:${PORTSDIR}/audio/rhythmbox +# not yet buildable under GNOME 2.5 +# jamboree:${PORTSDIR}/audio/jamboree .if !defined(PACKAGE_BUILDING) && !defined(PARALLEL_PACKAGE_BUILD) RUN_DEPENDS+= totem:${PORTSDIR}/multimedia/totem diff --git a/x11/gnome2-fifth-toe/pkg-descr b/x11/gnome2-fifth-toe/pkg-descr index 0de4441563e8..afa6e891d983 100644 --- a/x11/gnome2-fifth-toe/pkg-descr +++ b/x11/gnome2-fifth-toe/pkg-descr @@ -1,7 +1,8 @@ GNOME 2 "Fifth Toe" The Fifth Toe is a collection of stable GNOME 2 applications that -many users expect to be part of a usable desktop. This includes image -manipulation programs, chat applications, music and multimedia players, etc. +many users expect to be part of a usable desktop. Included are image +manipulation programs, chat applications, music and multimedia players, +much more. WWW: http://www.FreeBSD.org/gnome/ diff --git a/x11/gnome2-lite/Makefile b/x11/gnome2-lite/Makefile index f691b5ee1c35..23389eccc204 100644 --- a/x11/gnome2-lite/Makefile +++ b/x11/gnome2-lite/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnome2 -PORTVERSION= 2.4.2 +PORTVERSION= 2.6.0 CATEGORIES= x11 gnome MASTER_SITES= # empty PKGNAMESUFFIX= -lite @@ -36,7 +36,8 @@ RUN_DEPENDS= ${X11BASE}/libexec/cdplayer_applet2:${PORTSDIR}/x11/gnomeapplets2 \ gcalctool:${PORTSDIR}/math/gcalctool \ gucharmap:${PORTSDIR}/deskutils/gucharmap \ 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 \ + gconf-editor:${PORTSDIR}/sysutils/gconf-editor NO_BUILD= yes diff --git a/x11/gnome2-lite/pkg-descr b/x11/gnome2-lite/pkg-descr index 4fd87114cf26..1c85098c16ff 100644 --- a/x11/gnome2-lite/pkg-descr +++ b/x11/gnome2-lite/pkg-descr @@ -1,8 +1,15 @@ GNU Network Object Model Environment -This package does not contain anything by itself -- it is a -"meta-port" that depends on other GNOME packages. Its sole purpose is -to require dependencies so users can install the basic set of -components necessary to start a GNOME 2 desktop session. +This metaport installs the pieces of the GNOME 2 desktop that +are needed to provide a functional desktop. x11/gnome2 +contains the full version of the GNOME 2 desktop environment. + +Other popular GNOME applications can be installed from the other +GNOME 2 metaports: + + * x11/gnome2-fifth-toe + * x11/gnome2-power-tools + * editors/gnome2-office + * devel/gnome2-hacker-tools WWW: http://www.FreeBSD.org/gnome/ diff --git a/x11/gnome2-lite/pkg-install b/x11/gnome2-lite/pkg-install index 892e5ee4c4cd..2480ec6099a7 100644 --- a/x11/gnome2-lite/pkg-install +++ b/x11/gnome2-lite/pkg-install @@ -1,9 +1,5 @@ #!/bin/sh -if [ -n "${PACKAGE_BUILDING}" ]; then - exit 0 -fi - PATH=/bin:/usr/bin:/sbin:/usr/sbin:${PATH} export PATH diff --git a/x11/gnome2-power-tools/Makefile b/x11/gnome2-power-tools/Makefile index 022b1cb72b16..7a17343ca01d 100644 --- a/x11/gnome2-power-tools/Makefile +++ b/x11/gnome2-power-tools/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnome2-power-tools -PORTVERSION= 2.4.2 +PORTVERSION= 2.6.0 CATEGORIES= x11 gnome MASTER_SITES= # empty DISTFILES= # empty @@ -15,18 +15,14 @@ EXTRACT_ONLY= # empty MAINTAINER= gnome@FreeBSD.org COMMENT= "Geektoys" for the GNOME 2 power user -RUN_DEPENDS= ${X11BASE}/lib/gnome-vfs-2.0/modules/libsmb.so:${PORTSDIR}/devel/gnomevfs-extras \ +RUN_DEPENDS= ${X11BASE}/lib/epiphany/extensions/libgesturesextension.so:${PORTSDIR}/www/epiphany-extensions \ gnome-pkgview:${PORTSDIR}/sysutils/gnome-pkgview \ - ${X11BASE}/lib/libquicklounge-applet.so:${PORTSDIR}/misc/quick-lounge-applet \ - gswitchit-plugins-capplet:${PORTSDIR}/x11/gswitchit \ - dasher:${PORTSDIR}/accessibility/dasher \ + ${X11BASE}/libexec/quick-lounge-applet:${PORTSDIR}/misc/quick-lounge-applet \ ${X11BASE}/libexec/netspeed_applet2:${PORTSDIR}/net/netspeed_applet \ - ${X11BASE}/lib/gedit-2/plugins/libasciitable.so:${PORTSDIR}/editors/gedit-plugins \ - gdesklets:${PORTSDIR}/deskutils/gdesklets \ ${LOCALBASE}/sbin/gkrellmd:${PORTSDIR}/sysutils/gkrellm2 \ - ${X11BASE}/libexec/gnome-netstatus-applet:${PORTSDIR}/net/gnomenetstatus \ splashsetter:${PORTSDIR}/deskutils/splashsetter \ - gnome-netinfo:${PORTSDIR}/net/gnomenetwork + gnome-netinfo:${PORTSDIR}/net/gnomenetwork \ + gdesklets:${PORTSDIR}/deskutils/gdesklets NO_BUILD= yes diff --git a/x11/gnome2-power-tools/pkg-descr b/x11/gnome2-power-tools/pkg-descr index a5e962aa0cbb..041e159b9219 100644 --- a/x11/gnome2-power-tools/pkg-descr +++ b/x11/gnome2-power-tools/pkg-descr @@ -1,11 +1,11 @@ GNOME 2 Power Tools Power Tools is every GNOME geek's Batbelt. It fills the gap between the -core GNOME Desktop, which tries to be a relevant set of modules for all users; -and the Fifth Toe, which is the collection of the coolest and most useful -GNOME applications. +core GNOME Desktop, which tries to be a relevant set of modules for all +users; and the Fifth Toe, which is the collection of the coolest and most +useful GNOME applications. -This collection consists of utilities and applets for the technically minded +This collection consists of utilities and applets for the technically-minded GNOME user. It also contains many useful add-on utilities for some of the applications found in the Desktop and Fifth Toe. diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile index 1e53eaad346c..87f504646fc9 100644 --- a/x11/gnome2/Makefile +++ b/x11/gnome2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnome2 -PORTVERSION= 2.4.2 +PORTVERSION= 2.6.0 CATEGORIES= x11 gnome MASTER_SITES= # empty DISTFILES= # empty @@ -37,7 +37,6 @@ RUN_DEPENDS= ${X11BASE}/libexec/cdplayer_applet2:${PORTSDIR}/x11/gnomeapplets2 \ file-roller:${PORTSDIR}/archivers/fileroller \ ${X11BASE}/share/themes/HighContrast/gtk-2.0/gtkrc:${PORTSDIR}/x11-toolkits/gnome-themes \ ggv:${PORTSDIR}/print/ggv2 \ - acme:${PORTSDIR}/multimedia/acme \ gok:${PORTSDIR}/accessibility/gok \ gpdf:${PORTSDIR}/graphics/gpdf \ nautilus-cd-burner:${PORTSDIR}/sysutils/nautilus-cd-burner \ @@ -46,14 +45,14 @@ RUN_DEPENDS= ${X11BASE}/libexec/cdplayer_applet2:${PORTSDIR}/x11/gnomeapplets2 \ zenity:${PORTSDIR}/x11/zenity \ gst-thumbnail:${PORTSDIR}/multimedia/nautilus-media \ ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \ - gnopernicus:${PORTSDIR}/accessibility/gnopernicus + gnopernicus:${PORTSDIR}/accessibility/gnopernicus \ + ${X11BASE}/libexec/gnome-netstatus-applet:${PORTSDIR}/net/gnomenetstatus \ + dasher:${PORTSDIR}/accessibility/dasher NO_BUILD= yes USE_PYTHON= yes -CONFLICTS= gnome2-lite* - .if !defined(BATCH) && !defined(PACKAGE_BUILDING) pre-configure: @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL @@ -63,12 +62,12 @@ do-install: # empty .include <bsd.port.pre.mk> -.if ${ARCH} != "amd64" && ( ${ARCH} == "i386" || ${OSVERSION} > 500035 ) +.if ${ARCH} == "i386" || ${OSVERSION} > 500035 RUN_DEPENDS+= epiphany:${PORTSDIR}/www/epiphany .endif -#.if ${ARCH} == "i386" +.if ${ARCH} == "i386" #RUN_DEPENDS+= gnomemeeting:${PORTSDIR}/net/gnomemeeting -#.endif +.endif .include <bsd.port.post.mk> diff --git a/x11/gnome2/pkg-descr b/x11/gnome2/pkg-descr index 8632de99722e..a7051fc7b5cd 100644 --- a/x11/gnome2/pkg-descr +++ b/x11/gnome2/pkg-descr @@ -1,9 +1,12 @@ GNU Network Object Model Environment -This package does not contain anything by itself -- it is a -"meta-port" that depends on other GNOME packages. Its sole purpose is -to require dependencies so users can install this package only and -have all the GNOME 2 stuff pulled in by the port/package dependency -mechanism. +This metaport installs the entire GNOME 2 desktop, including +the the most common user applications. Other popular GNOME +applications can be installed from the other GNOME 2 metaports: + + * x11/gnome2-fifth-toe + * x11/gnome2-power-tools + * editors/gnome2-office + * devel/gnome2-hacker-tools WWW: http://www.FreeBSD.org/gnome/ diff --git a/x11/gnome2/pkg-install b/x11/gnome2/pkg-install index 1324bb12a5b0..870432d238a3 100644 --- a/x11/gnome2/pkg-install +++ b/x11/gnome2/pkg-install @@ -1,9 +1,5 @@ #!/bin/sh -if [ -n "${PACKAGE_BUILDING}" ]; then - exit 0 -fi - PATH=/bin:/usr/bin:/sbin:/usr/sbin:${PATH} export PATH diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile index ca1d3573a6ff..d8acc579f014 100644 --- a/x11/gnomeapplets2/Makefile +++ b/x11/gnomeapplets2/Makefile @@ -6,24 +6,25 @@ # PORTNAME= gnomeapplets2 -PORTVERSION= 2.4.2 -PORTREVISION= 1 +PORTVERSION= 2.6.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-applets/2.4 +MASTER_SITE_SUBDIR= sources/gnome-applets/2.6 DISTNAME= gnome-applets-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Applets components for the Gnome 2 Desktop Environment -LIB_DEPENDS= gtop-2.0:${PORTSDIR}/devel/libgtop2 +LIB_DEPENDS= gtop-2.0:${PORTSDIR}/devel/libgtop2 \ + xklavier.8:${PORTSDIR}/x11/libxklavier USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes +USE_REINPLACE= yes GNOME_DESKTOP_VERSION=2 -USE_GNOME= gnomehier gnomeprefix gnomehack gnomepanel gail +USE_GNOME= gnomehier gnomeprefix gnomehack intlhack lthack gnomepanel gail USE_LIBTOOL_VER=13 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" @@ -31,9 +32,10 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ .include <bsd.port.pre.mk> .if ${ARCH} != "i386" -PLIST_SUB= BATTERY="@comment " +CONFIGURE_ENV+= CFLAGS="${CFLAGS} -fPIC" +PLIST_SUB= BATTERY="@comment " .else -PLIST_SUB= BATTERY="" +PLIST_SUB= BATTERY="" .endif .include <bsd.port.post.mk> diff --git a/x11/gnomeapplets2/distinfo b/x11/gnomeapplets2/distinfo index f42065cf1b1e..aa222f7bdcb0 100644 --- a/x11/gnomeapplets2/distinfo +++ b/x11/gnomeapplets2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-applets-2.4.2.tar.bz2) = 3a59c7f5b452e4f9675dfce44a2b3433 -SIZE (gnome2/gnome-applets-2.4.2.tar.bz2) = 4057266 +MD5 (gnome2/gnome-applets-2.6.0.tar.bz2) = 9c2dcde8fc94dd43f8aa7be52ca9c103 +SIZE (gnome2/gnome-applets-2.6.0.tar.bz2) = 4643605 diff --git a/x11/gnomeapplets2/files/patch-aa b/x11/gnomeapplets2/files/patch-aa index 6638e387efc9..73b0823ce82e 100644 --- a/x11/gnomeapplets2/files/patch-aa +++ b/x11/gnomeapplets2/files/patch-aa @@ -1,14 +1,6 @@ ---- configure.orig Mon Sep 8 20:00:28 2003 -+++ configure Wed Sep 24 23:29:28 2003 -@@ -8250,6 +8250,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' -@@ -11792,6 +11793,7 @@ +--- configure.orig Sun Feb 22 19:22:49 2004 ++++ configure Sun Feb 22 19:24:33 2004 +@@ -22912,6 +22912,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,16 +8,16 @@ *solaris*) CDROM_HOST=solaris;cd_device_path="/vol/dev/aliases/cdrom0";cdplayer_type_sun=true;; esac case "$host" in -@@ -11856,7 +11858,7 @@ +@@ -23034,7 +23035,7 @@ ;; - # list of supported OS cores -- *-*-linux*|*-*-freebsd*|*-*-openbsd*) -+ *-*-linux*|i386-*-freebsd*|*-*-openbsd*) - echo "$as_me:$LINENO: checking for apm_read in -lapm" >&5 - echo $ECHO_N "checking for apm_read in -lapm... $ECHO_C" >&6 - if test "${ac_cv_lib_apm_apm_read+set}" = set; then -@@ -13646,14 +13648,14 @@ + # list of supported OS cores that do not use libapm +- *-*-freebsd*|*-*-netbsd*|*-*-openbsd*) ++ i386-*-freebsd*|*-*-netbsd*|*-*-openbsd*) + ;; + *) + echo "warning: ${host} is not supported by battstat_applet, not building" >&2 +@@ -24905,14 +24906,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 deleted file mode 100644 index 6ddfc03c3b07..000000000000 --- a/x11/gnomeapplets2/files/patch-battstat_Makefile.in +++ /dev/null @@ -1,27 +0,0 @@ ---- battstat/Makefile.in.orig Tue Sep 23 00:11:20 2003 -+++ battstat/Makefile.in Tue Sep 23 00:14:03 2003 -@@ -154,11 +154,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@APMDIR = --@HAVE_LIBAPM_FALSE@APMDIR = @HAVE_LIBAPM_FALSE@apmlib -+@HAVE_LIBAPM_FALSE@APMDIR = - @HAVE_LIBAPM_TRUE@APMINC = --@HAVE_LIBAPM_FALSE@APMINC = @HAVE_LIBAPM_FALSE@-Iapmlib/ -+@HAVE_LIBAPM_FALSE@APMINC = - - SUBDIRS = docs sounds $(APMDIR) - -@@ -230,8 +230,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 = \ --@HAVE_LIBAPM_FALSE@$(top_builddir)/screen-exec/libscreen-exec.la \ --@HAVE_LIBAPM_FALSE@apmlib/libapm.a -+@HAVE_LIBAPM_FALSE@$(top_builddir)/screen-exec/libscreen-exec.la - battstat_applet_2_LDFLAGS = - CFLAGS = @CFLAGS@ - COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) diff --git a/x11/gnomeapplets2/files/patch-multiload::linux-proc.c b/x11/gnomeapplets2/files/patch-multiload::linux-proc.c deleted file mode 100644 index 9eb916f2b59f..000000000000 --- a/x11/gnomeapplets2/files/patch-multiload::linux-proc.c +++ /dev/null @@ -1,84 +0,0 @@ ---- multiload/linux-proc.c.orig Thu Jul 10 04:26:58 2003 -+++ multiload/linux-proc.c Mon Nov 17 23:54:38 2003 -@@ -5,12 +5,17 @@ - #include <fcntl.h> - #include <unistd.h> - #include <assert.h> -+#ifdef __FreeBSD__ -+#include <sys/socket.h> -+#include <net/if.h> -+#endif - - #include <glibtop.h> - #include <glibtop/cpu.h> - #include <glibtop/mem.h> - #include <glibtop/swap.h> - #include <glibtop/loadavg.h> -+#include <glibtop/netload.h> - - #include "linux-proc.h" - -@@ -33,6 +38,10 @@ - static unsigned needed_loadavg_flags = - (1 << GLIBTOP_LOADAVG_LOADAVG); - -+static unsigned needed_netload_flags = -+(1 << GLIBTOP_NETLOAD_IF_FLAGS) + -+(1 << GLIBTOP_NETLOAD_BYTES_TOTAL); -+ - void - GetLoad (int Maximum, int data [4], LoadGraph *g) - { -@@ -236,6 +245,44 @@ - int delta[COUNT_TYPES], i; - static int ticks = 0; - static gulong past[COUNT_TYPES] = {0}; -+#ifdef __FreeBSD__ -+ struct if_nameindex *ifindex, *ifptr; -+ static int max = 500; -+ -+ ifindex = if_nameindex(); -+ if (!ifindex) -+ return; -+ -+ memset(present, 0, sizeof (present)); -+ -+ for (ifptr = ifindex; ifptr->if_index && ifptr->if_name; ifptr++) -+ { -+ int index; -+ glibtop_netload netload; -+ -+ glibtop_get_netload(&netload, ifptr->if_name); -+ if (!netload.flags) -+ continue; -+ -+ assert ((netload.flags & needed_netload_flags) == needed_netload_flags); -+ -+ if (!(netload.if_flags & (1L << GLIBTOP_IF_FLAGS_UP))) -+ continue; -+ if (netload.if_flags & (1L << GLIBTOP_IF_FLAGS_LOOPBACK)) -+ continue; -+ -+ if (netload.if_flags & (1L << GLIBTOP_IF_FLAGS_POINTOPOINT)) { -+ index = strncmp(ifptr->if_name, "sl", 2) ? PPP_COUNT : SLIP_COUNT; -+ } else { -+ index = ETH_COUNT; -+ } -+ -+ present[index] += netload.bytes_total; -+ } -+ -+ if_freenameindex(ifindex); -+ -+#else - static char *netdevfmt = NULL; - char *cp, buffer[256]; - FILE *fp; -@@ -317,6 +364,7 @@ - } - - fclose(fp); -+#endif - - for (i = 0; i < 5; i++) - data[i] = 0; diff --git a/x11/gnomeapplets2/files/patch-stickynotes_Makefile.in b/x11/gnomeapplets2/files/patch-stickynotes_Makefile.in deleted file mode 100644 index 973b7e342c3e..000000000000 --- a/x11/gnomeapplets2/files/patch-stickynotes_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 1f1af0974a9d..650c4694ad35 100644 --- a/x11/gnomeapplets2/files/patch-wireless_wireless-applet.c +++ b/x11/gnomeapplets2/files/patch-wireless_wireless-applet.c @@ -1,5 +1,5 @@ ---- wireless/wireless-applet.c.orig Mon Oct 27 15:52:14 2003 -+++ wireless/wireless-applet.c Fri Jan 16 16:47:14 2004 +--- wireless/wireless-applet.c.orig Tue Oct 21 19:06:53 2003 ++++ wireless/wireless-applet.c Sat Jan 3 19:26:43 2004 @@ -30,6 +30,15 @@ #include <math.h> #include <dirent.h> @@ -72,7 +72,7 @@ wireless_applet_draw (applet, percent); } -@@ -235,22 +260,180 @@ +@@ -235,22 +260,179 @@ } } @@ -116,7 +116,7 @@ +static void +get_wi_data (WirelessApplet *applet, char *device, long int *level) +{ -+ struct wi_req wreq; ++ struct wi_req wreq; + long int signal_strength; + + bzero((char *)&wreq, sizeof(wreq)); @@ -156,9 +156,9 @@ + + if (ioctl(s, SIOCGAIRONET, &ifr) == -1) { + gtk_tooltips_set_tip (applet->tips, -+ GTK_WIDGET (applet), -+ "ioctl Error", -+ NULL); ++ GTK_WIDGET (applet), ++ "ioctl Error", ++ NULL); + return 0; + } + @@ -169,7 +169,7 @@ +static void +get_an_data (WirelessApplet *applet, char *device, long int *level) +{ -+ struct an_req areq; ++ struct an_req areq; + struct an_ltv_status *sts; +#ifdef AN_RID_RSSI_MAP + struct an_ltv_rssi_map an_rssimap; @@ -192,13 +192,13 @@ +#ifdef AN_RID_RSSI_MAP + if (rssimap_valid) + signal_strength = (long int)(an_rssimap.an_entries[ -+ sts->an_normalized_strength].an_rss_pct); ++ sts->an_normalized_strength].an_rss_pct); + else + signal_strength = (long int)(sts->an_normalized_strength); +#else + signal_strength = (long int)(sts->an_normalized_rssi); +#endif -+ ++ + memcpy(level, &signal_strength, sizeof(level)); +} +#endif @@ -230,14 +230,14 @@ /* Here we begin to suck... */ do { +#ifdef __FreeBSD__ -+ if (ifs == NULL || ifs->if_name == NULL) { ++ if (ifs == NULL || ifs->if_name == NULL) { + break; + } -+ strlcpy(device, ifs->if_name, 6); ++ strlcpy(device, ifs->if_name, 6); + if (g_strncasecmp(device, "an", 2)==0) { + applet->devices = g_list_prepend (applet->devices, g_strdup (device)); + if (g_strcasecmp(applet->device, device)==0) { -+ get_an_data(applet, device, &level); ++ get_an_data(applet, device, &level); + wireless_applet_update_state (applet, device, 0, level, 0); + } + } @@ -245,17 +245,16 @@ + if (g_strncasecmp(device, "wi", 2)==0 || g_strncasecmp(device, "ath", 3)==0) { + applet->devices = g_list_prepend (applet->devices, g_strdup (device)); + if (g_strcasecmp(applet->device, device)==0) { -+ get_wi_data(applet, device, &level); ++ get_wi_data(applet, device, &level); + wireless_applet_update_state (applet, device, 0, level, 0); + } + } + ifs++; +#else -+ char *ptr; fgets (line, 256, applet->file); -@@ -283,6 +466,7 @@ +@@ -283,6 +465,7 @@ wireless_applet_update_state (applet, device, link, level, noise); } } @@ -263,7 +262,7 @@ } while (1); if (g_list_length (applet->devices)==1) { -@@ -294,17 +478,23 @@ +@@ -294,17 +477,23 @@ } /* rewind the /proc/net/wireless file */ @@ -287,7 +286,7 @@ wireless_applet_read_device_state (applet); -@@ -351,6 +541,7 @@ +@@ -351,6 +540,7 @@ static void start_file_read (WirelessApplet *applet) { @@ -295,7 +294,7 @@ applet->file = fopen ("/proc/net/wireless", "rt"); if (applet->file == NULL) { gtk_tooltips_set_tip (applet->tips, -@@ -359,6 +550,7 @@ +@@ -359,6 +549,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.")); } @@ -303,7 +302,7 @@ } static void -@@ -646,8 +838,10 @@ +@@ -646,8 +837,10 @@ applet->prefs = NULL; } diff --git a/x11/gnomeapplets2/pkg-descr b/x11/gnomeapplets2/pkg-descr index c93d4bc89a04..5f715cf9a438 100644 --- a/x11/gnomeapplets2/pkg-descr +++ b/x11/gnomeapplets2/pkg-descr @@ -1,3 +1,3 @@ -Applets components for the Gnome 2.0 Desktop Environment +Panel applets for the Gnome 2.0 Desktop Environment. WWW: http://www.gnome.org/ diff --git a/x11/gnomeapplets2/pkg-plist b/x11/gnomeapplets2/pkg-plist index f673803f1995..119fd3e38b2f 100644 --- a/x11/gnomeapplets2/pkg-plist +++ b/x11/gnomeapplets2/pkg-plist @@ -1,5 +1,8 @@ bin/gkb_xmmap bin/gnome-keyboard-layout +bin/gswitchit-plugins-capplet +etc/gconf/gconf.xml.defaults/apps/gswitchit/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gswitchit/Applet/%gconf.xml 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 @@ -15,6 +18,8 @@ etc/gconf/gconf.xml.defaults/schemas/apps/geyes/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/geyes/prefs/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gkb-applet/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gkb-applet/prefs/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gswitchit/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gswitchit/Applet/%gconf.xml 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 @@ -38,6 +43,7 @@ etc/gconf/schemas/charpick.schemas etc/gconf/schemas/drivemount.schemas etc/gconf/schemas/geyes.schemas etc/gconf/schemas/gkb.schemas +etc/gconf/schemas/gswitchit.schemas etc/gconf/schemas/gtik.schemas etc/gconf/schemas/gweather.schemas etc/gconf/schemas/mailcheck.schemas @@ -48,15 +54,17 @@ etc/gconf/schemas/multiload.schemas etc/gconf/schemas/stickynotes.schemas %%BATTERY%%etc/sound/events/battstat_applet.soundlist etc/sound/events/mailcheck.soundlist +include/libgswitchit/gswitchit_plugin.h +include/libgswitchit/gswitchit_xkb_config.h libdata/bonobo/servers/GNOME_AccessxStatusApplet.server -%%BATTERY%%libdata/bonobo/servers/GNOME_BattstatApplet.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 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_KeyboardApplet.server libdata/bonobo/servers/GNOME_MailcheckApplet_Factory.server libdata/bonobo/servers/GNOME_MiniCommanderApplet.server libdata/bonobo/servers/GNOME_MixerApplet.server @@ -64,14 +72,15 @@ 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 +libdata/pkgconfig/gswitchit.pc libexec/accessx-status-applet %%BATTERY%%libexec/battstat-applet-2 libexec/cdplayer_applet2 libexec/charpick_applet2 libexec/drivemount_applet2 libexec/geyes_applet2 -libexec/gkb-applet-2 libexec/gnome-applets/mc-install-default-macros +libexec/gnome-keyboard-applet libexec/gtik2_applet2 libexec/gweather-applet-2 libexec/mailcheck-applet @@ -231,10 +240,11 @@ share/gnome/gkb/YU_Serbo-Croatian_x.keyprop share/gnome/gkb/Yugoslav.keyprop share/gnome/gkb/presets.xml share/gnome/gnome-2.0/ui/GNOME_AccessxApplet.xml -%%BATTERY%%share/gnome/gnome-2.0/ui/GNOME_BattstatApplet.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 +share/gnome/gnome-2.0/ui/GNOME_GSwitchItApplet.xml 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 @@ -246,20 +256,144 @@ 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/gswitchit/gswitchit-plugins.glade +share/gnome/gswitchit/gswitchit-properties.glade 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/ac_small.png +%%BATTERY%%share/gnome/help/battstat/C/figures/batt_green.png +%%BATTERY%%share/gnome/help/battstat/C/figures/batt_orange.png +%%BATTERY%%share/gnome/help/battstat/C/figures/batt_red.png +%%BATTERY%%share/gnome/help/battstat/C/figures/batt_yellow.png +%%BATTERY%%share/gnome/help/battstat/C/figures/battery_small.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/figures/battstat-applet_window.png +%%BATTERY%%share/gnome/help/battstat/C/figures/flash_small.png +%%BATTERY%%share/gnome/help/battstat/C/figures/warning_small.png %%BATTERY%%share/gnome/help/battstat/C/legal.xml +%%BATTERY%%share/gnome/help/battstat/de/battstat.xml +%%BATTERY%%share/gnome/help/battstat/de/figures/ac_small.png +%%BATTERY%%share/gnome/help/battstat/de/figures/batt_green.png +%%BATTERY%%share/gnome/help/battstat/de/figures/batt_orange.png +%%BATTERY%%share/gnome/help/battstat/de/figures/batt_red.png +%%BATTERY%%share/gnome/help/battstat/de/figures/batt_yellow.png +%%BATTERY%%share/gnome/help/battstat/de/figures/battery_small.png +%%BATTERY%%share/gnome/help/battstat/de/figures/battstat-applet.png +%%BATTERY%%share/gnome/help/battstat/de/figures/battstat-applet_window.png +%%BATTERY%%share/gnome/help/battstat/de/figures/flash_small.png +%%BATTERY%%share/gnome/help/battstat/de/figures/warning_small.png +%%BATTERY%%share/gnome/help/battstat/de/legal.xml +%%BATTERY%%share/gnome/help/battstat/es/battstat.xml +%%BATTERY%%share/gnome/help/battstat/es/figures/ac_small.png +%%BATTERY%%share/gnome/help/battstat/es/figures/batt_green.png +%%BATTERY%%share/gnome/help/battstat/es/figures/batt_orange.png +%%BATTERY%%share/gnome/help/battstat/es/figures/batt_red.png +%%BATTERY%%share/gnome/help/battstat/es/figures/batt_yellow.png +%%BATTERY%%share/gnome/help/battstat/es/figures/battery_small.png +%%BATTERY%%share/gnome/help/battstat/es/figures/battstat-applet.png +%%BATTERY%%share/gnome/help/battstat/es/figures/battstat-applet_window.png +%%BATTERY%%share/gnome/help/battstat/es/figures/flash_small.png +%%BATTERY%%share/gnome/help/battstat/es/figures/warning_small.png +%%BATTERY%%share/gnome/help/battstat/es/legal.xml +%%BATTERY%%share/gnome/help/battstat/fr/battstat.xml +%%BATTERY%%share/gnome/help/battstat/fr/figures/ac_small.png +%%BATTERY%%share/gnome/help/battstat/fr/figures/batt_green.png +%%BATTERY%%share/gnome/help/battstat/fr/figures/batt_orange.png +%%BATTERY%%share/gnome/help/battstat/fr/figures/batt_red.png +%%BATTERY%%share/gnome/help/battstat/fr/figures/batt_yellow.png +%%BATTERY%%share/gnome/help/battstat/fr/figures/battery_small.png +%%BATTERY%%share/gnome/help/battstat/fr/figures/battstat-applet.png +%%BATTERY%%share/gnome/help/battstat/fr/figures/battstat-applet_window.png +%%BATTERY%%share/gnome/help/battstat/fr/figures/flash_small.png +%%BATTERY%%share/gnome/help/battstat/fr/figures/warning_small.png +%%BATTERY%%share/gnome/help/battstat/fr/legal.xml +%%BATTERY%%share/gnome/help/battstat/it/battstat.xml +%%BATTERY%%share/gnome/help/battstat/it/figures/ac_small.png +%%BATTERY%%share/gnome/help/battstat/it/figures/batt_green.png +%%BATTERY%%share/gnome/help/battstat/it/figures/batt_orange.png +%%BATTERY%%share/gnome/help/battstat/it/figures/batt_red.png +%%BATTERY%%share/gnome/help/battstat/it/figures/batt_yellow.png +%%BATTERY%%share/gnome/help/battstat/it/figures/battery_small.png +%%BATTERY%%share/gnome/help/battstat/it/figures/battstat-applet.png +%%BATTERY%%share/gnome/help/battstat/it/figures/battstat-applet_window.png +%%BATTERY%%share/gnome/help/battstat/it/figures/flash_small.png +%%BATTERY%%share/gnome/help/battstat/it/figures/warning_small.png +%%BATTERY%%share/gnome/help/battstat/it/legal.xml %%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/ac_small.png +%%BATTERY%%share/gnome/help/battstat/ja/figures/batt_green.png +%%BATTERY%%share/gnome/help/battstat/ja/figures/batt_orange.png +%%BATTERY%%share/gnome/help/battstat/ja/figures/batt_red.png +%%BATTERY%%share/gnome/help/battstat/ja/figures/batt_yellow.png +%%BATTERY%%share/gnome/help/battstat/ja/figures/battery_small.png %%BATTERY%%share/gnome/help/battstat/ja/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/ja/figures/battstat-general.png +%%BATTERY%%share/gnome/help/battstat/ja/figures/battstat-applet_window.png +%%BATTERY%%share/gnome/help/battstat/ja/figures/flash_small.png +%%BATTERY%%share/gnome/help/battstat/ja/figures/warning_small.png %%BATTERY%%share/gnome/help/battstat/ja/legal.xml +%%BATTERY%%share/gnome/help/battstat/ko/battstat.xml +%%BATTERY%%share/gnome/help/battstat/ko/figures/ac_small.png +%%BATTERY%%share/gnome/help/battstat/ko/figures/batt_green.png +%%BATTERY%%share/gnome/help/battstat/ko/figures/batt_orange.png +%%BATTERY%%share/gnome/help/battstat/ko/figures/batt_red.png +%%BATTERY%%share/gnome/help/battstat/ko/figures/batt_yellow.png +%%BATTERY%%share/gnome/help/battstat/ko/figures/battery_small.png +%%BATTERY%%share/gnome/help/battstat/ko/figures/battstat-applet.png +%%BATTERY%%share/gnome/help/battstat/ko/figures/battstat-applet_window.png +%%BATTERY%%share/gnome/help/battstat/ko/figures/flash_small.png +%%BATTERY%%share/gnome/help/battstat/ko/figures/warning_small.png +%%BATTERY%%share/gnome/help/battstat/ko/legal.xml +%%BATTERY%%share/gnome/help/battstat/sv/battstat.xml +%%BATTERY%%share/gnome/help/battstat/sv/figures/ac_small.png +%%BATTERY%%share/gnome/help/battstat/sv/figures/batt_green.png +%%BATTERY%%share/gnome/help/battstat/sv/figures/batt_orange.png +%%BATTERY%%share/gnome/help/battstat/sv/figures/batt_red.png +%%BATTERY%%share/gnome/help/battstat/sv/figures/batt_yellow.png +%%BATTERY%%share/gnome/help/battstat/sv/figures/battery_small.png +%%BATTERY%%share/gnome/help/battstat/sv/figures/battstat-applet.png +%%BATTERY%%share/gnome/help/battstat/sv/figures/battstat-applet_window.png +%%BATTERY%%share/gnome/help/battstat/sv/figures/flash_small.png +%%BATTERY%%share/gnome/help/battstat/sv/figures/warning_small.png +%%BATTERY%%share/gnome/help/battstat/sv/legal.xml +%%BATTERY%%share/gnome/help/battstat/zh_CN/battstat.xml +%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/ac_small.png +%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/batt_green.png +%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/batt_orange.png +%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/batt_red.png +%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/batt_yellow.png +%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/battery_small.png +%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/battstat-applet.png +%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/battstat-applet_window.png +%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/flash_small.png +%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/warning_small.png +%%BATTERY%%share/gnome/help/battstat/zh_CN/legal.xml +%%BATTERY%%share/gnome/help/battstat/zh_HK/battstat.xml +%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/ac_small.png +%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/batt_green.png +%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/batt_orange.png +%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/batt_red.png +%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/batt_yellow.png +%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/battery_small.png +%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/battstat-applet.png +%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/battstat-applet_window.png +%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/flash_small.png +%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/warning_small.png +%%BATTERY%%share/gnome/help/battstat/zh_HK/legal.xml +%%BATTERY%%share/gnome/help/battstat/zh_TW/battstat.xml +%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/ac_small.png +%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/batt_green.png +%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/batt_orange.png +%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/batt_red.png +%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/batt_yellow.png +%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/battery_small.png +%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/battstat-applet.png +%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/battstat-applet_window.png +%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/flash_small.png +%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/warning_small.png +%%BATTERY%%share/gnome/help/battstat/zh_TW/legal.xml 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 @@ -276,6 +410,9 @@ 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 share/gnome/help/cdplayer/de/figures/cdplayer_applet_nexttrack.png +share/gnome/help/cdplayer/de/figures/cdplayer_applet_pause.png +share/gnome/help/cdplayer/de/figures/cdplayer_applet_play.png +share/gnome/help/cdplayer/de/figures/cdplayer_applet_playafterpause.png share/gnome/help/cdplayer/de/figures/cdplayer_applet_playing.png share/gnome/help/cdplayer/de/figures/cdplayer_applet_playpause.png share/gnome/help/cdplayer/de/figures/cdplayer_applet_prevtrack.png @@ -285,6 +422,9 @@ share/gnome/help/cdplayer/es/cdplayer.xml share/gnome/help/cdplayer/es/figures/cdplayer_applet.png share/gnome/help/cdplayer/es/figures/cdplayer_applet_eject.png share/gnome/help/cdplayer/es/figures/cdplayer_applet_nexttrack.png +share/gnome/help/cdplayer/es/figures/cdplayer_applet_pause.png +share/gnome/help/cdplayer/es/figures/cdplayer_applet_play.png +share/gnome/help/cdplayer/es/figures/cdplayer_applet_playafterpause.png share/gnome/help/cdplayer/es/figures/cdplayer_applet_playing.png share/gnome/help/cdplayer/es/figures/cdplayer_applet_playpause.png share/gnome/help/cdplayer/es/figures/cdplayer_applet_prevtrack.png @@ -294,6 +434,9 @@ 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 share/gnome/help/cdplayer/fr/figures/cdplayer_applet_nexttrack.png +share/gnome/help/cdplayer/fr/figures/cdplayer_applet_pause.png +share/gnome/help/cdplayer/fr/figures/cdplayer_applet_play.png +share/gnome/help/cdplayer/fr/figures/cdplayer_applet_playafterpause.png share/gnome/help/cdplayer/fr/figures/cdplayer_applet_playing.png share/gnome/help/cdplayer/fr/figures/cdplayer_applet_playpause.png share/gnome/help/cdplayer/fr/figures/cdplayer_applet_prevtrack.png @@ -303,6 +446,9 @@ share/gnome/help/cdplayer/it/cdplayer.xml share/gnome/help/cdplayer/it/figures/cdplayer_applet.png share/gnome/help/cdplayer/it/figures/cdplayer_applet_eject.png share/gnome/help/cdplayer/it/figures/cdplayer_applet_nexttrack.png +share/gnome/help/cdplayer/it/figures/cdplayer_applet_pause.png +share/gnome/help/cdplayer/it/figures/cdplayer_applet_play.png +share/gnome/help/cdplayer/it/figures/cdplayer_applet_playafterpause.png share/gnome/help/cdplayer/it/figures/cdplayer_applet_playing.png share/gnome/help/cdplayer/it/figures/cdplayer_applet_playpause.png share/gnome/help/cdplayer/it/figures/cdplayer_applet_prevtrack.png @@ -324,6 +470,9 @@ 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 share/gnome/help/cdplayer/ko/figures/cdplayer_applet_nexttrack.png +share/gnome/help/cdplayer/ko/figures/cdplayer_applet_pause.png +share/gnome/help/cdplayer/ko/figures/cdplayer_applet_play.png +share/gnome/help/cdplayer/ko/figures/cdplayer_applet_playafterpause.png share/gnome/help/cdplayer/ko/figures/cdplayer_applet_playing.png share/gnome/help/cdplayer/ko/figures/cdplayer_applet_playpause.png share/gnome/help/cdplayer/ko/figures/cdplayer_applet_prevtrack.png @@ -333,6 +482,9 @@ share/gnome/help/cdplayer/sv/cdplayer.xml share/gnome/help/cdplayer/sv/figures/cdplayer_applet.png share/gnome/help/cdplayer/sv/figures/cdplayer_applet_eject.png share/gnome/help/cdplayer/sv/figures/cdplayer_applet_nexttrack.png +share/gnome/help/cdplayer/sv/figures/cdplayer_applet_pause.png +share/gnome/help/cdplayer/sv/figures/cdplayer_applet_play.png +share/gnome/help/cdplayer/sv/figures/cdplayer_applet_playafterpause.png share/gnome/help/cdplayer/sv/figures/cdplayer_applet_playing.png share/gnome/help/cdplayer/sv/figures/cdplayer_applet_playpause.png share/gnome/help/cdplayer/sv/figures/cdplayer_applet_prevtrack.png @@ -342,15 +494,33 @@ share/gnome/help/cdplayer/zh_CN/cdplayer.xml share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet.png share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_eject.png share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_nexttrack.png +share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_pause.png +share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_play.png +share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_playafterpause.png share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_playing.png share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_playpause.png share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_prevtrack.png share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_stop.png share/gnome/help/cdplayer/zh_CN/legal.xml +share/gnome/help/cdplayer/zh_HK/cdplayer.xml +share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet.png +share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_eject.png +share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_nexttrack.png +share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_pause.png +share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_play.png +share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_playafterpause.png +share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_playing.png +share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_playpause.png +share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_prevtrack.png +share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_stop.png +share/gnome/help/cdplayer/zh_HK/legal.xml share/gnome/help/cdplayer/zh_TW/cdplayer.xml share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet.png share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_eject.png share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_nexttrack.png +share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_pause.png +share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_play.png +share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_playafterpause.png share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_playing.png share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_playpause.png share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_prevtrack.png @@ -389,13 +559,6 @@ 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 @@ -417,6 +580,10 @@ 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_HK/char-palette.xml +share/gnome/help/char-palette/zh_HK/figures/charpalette_applet.png +share/gnome/help/char-palette/zh_HK/figures/charpalette_chargroup.png +share/gnome/help/char-palette/zh_HK/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 @@ -451,15 +618,89 @@ share/gnome/help/command-line/sv/legal.xml share/gnome/help/command-line/zh_CN/command-line.xml share/gnome/help/command-line/zh_CN/figures/command-line.png share/gnome/help/command-line/zh_CN/legal.xml +share/gnome/help/command-line/zh_HK/command-line.xml +share/gnome/help/command-line/zh_HK/figures/command-line.png +share/gnome/help/command-line/zh_HK/legal.xml share/gnome/help/command-line/zh_TW/command-line.xml share/gnome/help/command-line/zh_TW/figures/command-line.png share/gnome/help/command-line/zh_TW/legal.xml share/gnome/help/drivemount/C/drivemount.xml +share/gnome/help/drivemount/C/figures/drivemount-applet_window.png share/gnome/help/drivemount/C/figures/drivemount_applet_all.png share/gnome/help/drivemount/C/figures/drivemount_applet_floppy.png share/gnome/help/drivemount/C/figures/drivemount_applet_settings.png share/gnome/help/drivemount/C/figures/drivemount_applet_tooltip.png share/gnome/help/drivemount/C/legal.xml +share/gnome/help/drivemount/de/drivemount.xml +share/gnome/help/drivemount/de/figures/drivemount-applet_window.png +share/gnome/help/drivemount/de/figures/drivemount_applet_all.png +share/gnome/help/drivemount/de/figures/drivemount_applet_floppy.png +share/gnome/help/drivemount/de/figures/drivemount_applet_settings.png +share/gnome/help/drivemount/de/figures/drivemount_applet_tooltip.png +share/gnome/help/drivemount/de/legal.xml +share/gnome/help/drivemount/es/drivemount.xml +share/gnome/help/drivemount/es/figures/drivemount-applet_window.png +share/gnome/help/drivemount/es/figures/drivemount_applet_all.png +share/gnome/help/drivemount/es/figures/drivemount_applet_floppy.png +share/gnome/help/drivemount/es/figures/drivemount_applet_settings.png +share/gnome/help/drivemount/es/figures/drivemount_applet_tooltip.png +share/gnome/help/drivemount/es/legal.xml +share/gnome/help/drivemount/fr/drivemount.xml +share/gnome/help/drivemount/fr/figures/drivemount-applet_window.png +share/gnome/help/drivemount/fr/figures/drivemount_applet_all.png +share/gnome/help/drivemount/fr/figures/drivemount_applet_floppy.png +share/gnome/help/drivemount/fr/figures/drivemount_applet_settings.png +share/gnome/help/drivemount/fr/figures/drivemount_applet_tooltip.png +share/gnome/help/drivemount/fr/legal.xml +share/gnome/help/drivemount/it/drivemount.xml +share/gnome/help/drivemount/it/figures/drivemount-applet_window.png +share/gnome/help/drivemount/it/figures/drivemount_applet_all.png +share/gnome/help/drivemount/it/figures/drivemount_applet_floppy.png +share/gnome/help/drivemount/it/figures/drivemount_applet_settings.png +share/gnome/help/drivemount/it/figures/drivemount_applet_tooltip.png +share/gnome/help/drivemount/it/legal.xml +share/gnome/help/drivemount/ja/drivemount.xml +share/gnome/help/drivemount/ja/figures/drivemount-applet_window.png +share/gnome/help/drivemount/ja/figures/drivemount_applet_all.png +share/gnome/help/drivemount/ja/figures/drivemount_applet_floppy.png +share/gnome/help/drivemount/ja/figures/drivemount_applet_settings.png +share/gnome/help/drivemount/ja/figures/drivemount_applet_tooltip.png +share/gnome/help/drivemount/ja/legal.xml +share/gnome/help/drivemount/ko/drivemount.xml +share/gnome/help/drivemount/ko/figures/drivemount-applet_window.png +share/gnome/help/drivemount/ko/figures/drivemount_applet_all.png +share/gnome/help/drivemount/ko/figures/drivemount_applet_floppy.png +share/gnome/help/drivemount/ko/figures/drivemount_applet_settings.png +share/gnome/help/drivemount/ko/figures/drivemount_applet_tooltip.png +share/gnome/help/drivemount/ko/legal.xml +share/gnome/help/drivemount/sv/drivemount.xml +share/gnome/help/drivemount/sv/figures/drivemount-applet_window.png +share/gnome/help/drivemount/sv/figures/drivemount_applet_all.png +share/gnome/help/drivemount/sv/figures/drivemount_applet_floppy.png +share/gnome/help/drivemount/sv/figures/drivemount_applet_settings.png +share/gnome/help/drivemount/sv/figures/drivemount_applet_tooltip.png +share/gnome/help/drivemount/sv/legal.xml +share/gnome/help/drivemount/zh_CN/drivemount.xml +share/gnome/help/drivemount/zh_CN/figures/drivemount-applet_window.png +share/gnome/help/drivemount/zh_CN/figures/drivemount_applet_all.png +share/gnome/help/drivemount/zh_CN/figures/drivemount_applet_floppy.png +share/gnome/help/drivemount/zh_CN/figures/drivemount_applet_settings.png +share/gnome/help/drivemount/zh_CN/figures/drivemount_applet_tooltip.png +share/gnome/help/drivemount/zh_CN/legal.xml +share/gnome/help/drivemount/zh_HK/drivemount.xml +share/gnome/help/drivemount/zh_HK/figures/drivemount-applet_window.png +share/gnome/help/drivemount/zh_HK/figures/drivemount_applet_all.png +share/gnome/help/drivemount/zh_HK/figures/drivemount_applet_floppy.png +share/gnome/help/drivemount/zh_HK/figures/drivemount_applet_settings.png +share/gnome/help/drivemount/zh_HK/figures/drivemount_applet_tooltip.png +share/gnome/help/drivemount/zh_HK/legal.xml +share/gnome/help/drivemount/zh_TW/drivemount.xml +share/gnome/help/drivemount/zh_TW/figures/drivemount-applet_window.png +share/gnome/help/drivemount/zh_TW/figures/drivemount_applet_all.png +share/gnome/help/drivemount/zh_TW/figures/drivemount_applet_floppy.png +share/gnome/help/drivemount/zh_TW/figures/drivemount_applet_settings.png +share/gnome/help/drivemount/zh_TW/figures/drivemount_applet_tooltip.png +share/gnome/help/drivemount/zh_TW/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 @@ -495,6 +736,9 @@ 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_HK/figures/geyes_applet.png +share/gnome/help/geyes/zh_HK/geyes.xml +share/gnome/help/geyes/zh_HK/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 @@ -526,6 +770,9 @@ share/gnome/help/gkb/sv/legal.xml share/gnome/help/gkb/zh_CN/figures/gkb_applet.png share/gnome/help/gkb/zh_CN/gkb.xml share/gnome/help/gkb/zh_CN/legal.xml +share/gnome/help/gkb/zh_HK/figures/gkb_applet.png +share/gnome/help/gkb/zh_HK/gkb.xml +share/gnome/help/gkb/zh_HK/legal.xml share/gnome/help/gkb/zh_TW/figures/gkb_applet.png share/gnome/help/gkb/zh_TW/gkb.xml share/gnome/help/gkb/zh_TW/legal.xml @@ -556,6 +803,9 @@ share/gnome/help/gtik2_applet2/sv/legal.xml share/gnome/help/gtik2_applet2/zh_CN/figures/gtik_applet.png share/gnome/help/gtik2_applet2/zh_CN/gtik2_applet2.xml share/gnome/help/gtik2_applet2/zh_CN/legal.xml +share/gnome/help/gtik2_applet2/zh_HK/figures/gtik_applet.png +share/gnome/help/gtik2_applet2/zh_HK/gtik2_applet2.xml +share/gnome/help/gtik2_applet2/zh_HK/legal.xml 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 @@ -604,6 +854,11 @@ 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_HK/figures/gweather_applet.png +share/gnome/help/gweather/zh_HK/figures/gweather_settings.png +share/gnome/help/gweather/zh_HK/figures/gweather_weather.png +share/gnome/help/gweather/zh_HK/gweather.xml +share/gnome/help/gweather/zh_HK/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 @@ -636,6 +891,11 @@ 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/charpalette_applet.png +share/gnome/help/mailcheck/ja/figures/charpalette_chargroup.png +share/gnome/help/mailcheck/ja/figures/charpick_applet.png +share/gnome/help/mailcheck/ja/figures/charpick_characters.png +share/gnome/help/mailcheck/ja/figures/charpick_chargroup.png share/gnome/help/mailcheck/ja/figures/mailcheck_applet.png share/gnome/help/mailcheck/ja/legal.xml share/gnome/help/mailcheck/ja/mailcheck.xml @@ -657,6 +917,9 @@ 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_HK/figures/mailcheck_applet.png +share/gnome/help/mailcheck/zh_HK/legal.xml +share/gnome/help/mailcheck/zh_HK/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 @@ -678,6 +941,10 @@ 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/it/figures/mixer_applet.png +share/gnome/help/mixer_applet2/it/figures/volumecontrol_applet.png +share/gnome/help/mixer_applet2/it/legal.xml +share/gnome/help/mixer_applet2/it/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 @@ -694,6 +961,9 @@ 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_HK/figures/volumecontrol_applet.png +share/gnome/help/mixer_applet2/zh_HK/legal.xml +share/gnome/help/mixer_applet2/zh_HK/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 @@ -718,16 +988,139 @@ 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/multiload/C/figures/system-monitor-applet_window.png +share/gnome/help/multiload/C/figures/system_monitor.png +share/gnome/help/multiload/C/figures/system_monitor_prefs.png +share/gnome/help/multiload/C/legal.xml +share/gnome/help/multiload/C/multiload.xml +share/gnome/help/multiload/de/figures/system-monitor-applet_window.png +share/gnome/help/multiload/de/legal.xml +share/gnome/help/multiload/de/multiload.xml +share/gnome/help/multiload/es/figures/system-monitor-applet_window.png +share/gnome/help/multiload/es/legal.xml +share/gnome/help/multiload/es/multiload.xml +share/gnome/help/multiload/fr/figures/system-monitor-applet_window.png +share/gnome/help/multiload/fr/legal.xml +share/gnome/help/multiload/fr/multiload.xml +share/gnome/help/multiload/it/figures/system-monitor-applet_window.png +share/gnome/help/multiload/it/legal.xml +share/gnome/help/multiload/it/multiload.xml +share/gnome/help/multiload/ja/figures/system-monitor-applet_window.png +share/gnome/help/multiload/ja/legal.xml +share/gnome/help/multiload/ja/multiload.xml +share/gnome/help/multiload/ko/figures/system-monitor-applet_window.png +share/gnome/help/multiload/ko/legal.xml +share/gnome/help/multiload/ko/multiload.xml +share/gnome/help/multiload/sv/figures/system-monitor-applet_window.png +share/gnome/help/multiload/sv/legal.xml +share/gnome/help/multiload/sv/multiload.xml +share/gnome/help/multiload/zh_CN/figures/system-monitor-applet_window.png +share/gnome/help/multiload/zh_CN/legal.xml +share/gnome/help/multiload/zh_CN/multiload.xml +share/gnome/help/multiload/zh_HK/figures/system-monitor-applet_window.png +share/gnome/help/multiload/zh_HK/legal.xml +share/gnome/help/multiload/zh_HK/multiload.xml +share/gnome/help/multiload/zh_TW/figures/system-monitor-applet_window.png +share/gnome/help/multiload/zh_TW/legal.xml +share/gnome/help/multiload/zh_TW/multiload.xml share/gnome/help/stickynotes_applet/C/legal.xml share/gnome/help/stickynotes_applet/C/stickynotes_applet.xml +share/gnome/help/stickynotes_applet/de/figures/stickynotes_applet.png +share/gnome/help/stickynotes_applet/de/legal.xml +share/gnome/help/stickynotes_applet/de/stickynotes_applet.xml +share/gnome/help/stickynotes_applet/es/figures/stickynotes_applet.png +share/gnome/help/stickynotes_applet/es/legal.xml +share/gnome/help/stickynotes_applet/es/stickynotes_applet.xml +share/gnome/help/stickynotes_applet/fr/figures/stickynotes_applet.png +share/gnome/help/stickynotes_applet/fr/legal.xml +share/gnome/help/stickynotes_applet/fr/stickynotes_applet.xml +share/gnome/help/stickynotes_applet/it/figures/stickynotes_applet.png +share/gnome/help/stickynotes_applet/it/legal.xml +share/gnome/help/stickynotes_applet/it/stickynotes_applet.xml +share/gnome/help/stickynotes_applet/ja/figures/stickynotes_applet.png +share/gnome/help/stickynotes_applet/ja/legal.xml +share/gnome/help/stickynotes_applet/ja/stickynotes_applet.xml +share/gnome/help/stickynotes_applet/ko/figures/stickynotes_applet.png +share/gnome/help/stickynotes_applet/ko/legal.xml +share/gnome/help/stickynotes_applet/ko/stickynotes_applet.xml +share/gnome/help/stickynotes_applet/sv/figures/stickynotes_applet.png +share/gnome/help/stickynotes_applet/sv/legal.xml +share/gnome/help/stickynotes_applet/sv/stickynotes_applet.xml +share/gnome/help/stickynotes_applet/zh_CN/figures/stickynotes_applet.png +share/gnome/help/stickynotes_applet/zh_CN/legal.xml +share/gnome/help/stickynotes_applet/zh_CN/stickynotes_applet.xml +share/gnome/help/stickynotes_applet/zh_HK/figures/stickynotes_applet.png +share/gnome/help/stickynotes_applet/zh_HK/legal.xml +share/gnome/help/stickynotes_applet/zh_HK/stickynotes_applet.xml +share/gnome/help/stickynotes_applet/zh_TW/figures/stickynotes_applet.png +share/gnome/help/stickynotes_applet/zh_TW/legal.xml +share/gnome/help/stickynotes_applet/zh_TW/stickynotes_applet.xml share/gnome/help/wireless/C/legal.xml share/gnome/help/wireless/C/wireless.xml +share/gnome/help/wireless/de/figures/wireless_applet_conn.png +share/gnome/help/wireless/de/figures/wireless_applet_no_conn.png +share/gnome/help/wireless/de/legal.xml +share/gnome/help/wireless/de/wireless.xml +share/gnome/help/wireless/es/figures/wireless_applet_conn.png +share/gnome/help/wireless/es/figures/wireless_applet_no_conn.png +share/gnome/help/wireless/es/legal.xml +share/gnome/help/wireless/es/wireless.xml +share/gnome/help/wireless/fr/figures/wireless_applet_conn.png +share/gnome/help/wireless/fr/figures/wireless_applet_no_conn.png +share/gnome/help/wireless/fr/legal.xml +share/gnome/help/wireless/fr/wireless.xml +share/gnome/help/wireless/it/figures/wireless_applet_conn.png +share/gnome/help/wireless/it/figures/wireless_applet_no_conn.png +share/gnome/help/wireless/it/legal.xml +share/gnome/help/wireless/it/wireless.xml +share/gnome/help/wireless/ja/figures/wireless_applet_conn.png +share/gnome/help/wireless/ja/figures/wireless_applet_no_conn.png +share/gnome/help/wireless/ja/legal.xml +share/gnome/help/wireless/ja/wireless.xml +share/gnome/help/wireless/ko/figures/wireless_applet_conn.png +share/gnome/help/wireless/ko/figures/wireless_applet_no_conn.png +share/gnome/help/wireless/ko/legal.xml +share/gnome/help/wireless/ko/wireless.xml +share/gnome/help/wireless/sv/figures/wireless_applet_conn.png +share/gnome/help/wireless/sv/figures/wireless_applet_no_conn.png +share/gnome/help/wireless/sv/legal.xml +share/gnome/help/wireless/sv/wireless.xml +share/gnome/help/wireless/zh_CN/figures/wireless_applet_conn.png +share/gnome/help/wireless/zh_CN/figures/wireless_applet_no_conn.png +share/gnome/help/wireless/zh_CN/legal.xml +share/gnome/help/wireless/zh_CN/wireless.xml +share/gnome/help/wireless/zh_HK/figures/wireless_applet_conn.png +share/gnome/help/wireless/zh_HK/figures/wireless_applet_no_conn.png +share/gnome/help/wireless/zh_HK/legal.xml +share/gnome/help/wireless/zh_HK/wireless.xml +share/gnome/help/wireless/zh_TW/figures/wireless_applet_conn.png +share/gnome/help/wireless/zh_TW/figures/wireless_applet_no_conn.png +share/gnome/help/wireless/zh_TW/legal.xml +share/gnome/help/wireless/zh_TW/wireless.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 %%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-de.omf +%%BATTERY%%@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/battstat-de.omf 2>/dev/null || /usr/bin/true +%%BATTERY%%share/gnome/omf/gnome-applets/battstat-es.omf +%%BATTERY%%@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/battstat-es.omf 2>/dev/null || /usr/bin/true +%%BATTERY%%share/gnome/omf/gnome-applets/battstat-fr.omf +%%BATTERY%%@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/battstat-fr.omf 2>/dev/null || /usr/bin/true +%%BATTERY%%share/gnome/omf/gnome-applets/battstat-it.omf +%%BATTERY%%@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/battstat-it.omf 2>/dev/null || /usr/bin/true %%BATTERY%%share/gnome/omf/gnome-applets/battstat-ja.omf %%BATTERY%%@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/battstat-ja.omf 2>/dev/null || /usr/bin/true +%%BATTERY%%share/gnome/omf/gnome-applets/battstat-ko.omf +%%BATTERY%%@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/battstat-ko.omf 2>/dev/null || /usr/bin/true +%%BATTERY%%share/gnome/omf/gnome-applets/battstat-sv.omf +%%BATTERY%%@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/battstat-sv.omf 2>/dev/null || /usr/bin/true +%%BATTERY%%share/gnome/omf/gnome-applets/battstat-zh_CN.omf +%%BATTERY%%@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/battstat-zh_CN.omf 2>/dev/null || /usr/bin/true +%%BATTERY%%share/gnome/omf/gnome-applets/battstat-zh_HK.omf +%%BATTERY%%@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/battstat-zh_HK.omf 2>/dev/null || /usr/bin/true +%%BATTERY%%share/gnome/omf/gnome-applets/battstat-zh_TW.omf +%%BATTERY%%@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/battstat-zh_TW.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 @@ -746,6 +1139,8 @@ share/gnome/omf/gnome-applets/cdplayer-sv.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/cdplayer-sv.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/cdplayer-zh_CN.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/cdplayer-zh_CN.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/cdplayer-zh_HK.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/cdplayer-zh_HK.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/cdplayer-zh_TW.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/cdplayer-zh_TW.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/char-palette-C.omf @@ -758,14 +1153,14 @@ share/gnome/omf/gnome-applets/char-palette-fr.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/char-palette-fr.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/char-palette-it.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/char-palette-it.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-applets/char-palette-ja.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/char-palette-ja.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/char-palette-ko.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/char-palette-ko.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/char-palette-sv.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/char-palette-sv.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/char-palette-zh_CN.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/char-palette-zh_CN.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/char-palette-zh_HK.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/char-palette-zh_HK.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/char-palette-zh_TW.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/char-palette-zh_TW.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/command-line-C.omf @@ -786,10 +1181,32 @@ share/gnome/omf/gnome-applets/command-line-sv.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/command-line-sv.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/command-line-zh_CN.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/command-line-zh_CN.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/command-line-zh_HK.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/command-line-zh_HK.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/command-line-zh_TW.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/command-line-zh_TW.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/drivemount-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/drivemount-C.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/drivemount-de.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/drivemount-de.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/drivemount-es.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/drivemount-es.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/drivemount-fr.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/drivemount-fr.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/drivemount-it.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/drivemount-it.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/drivemount-ja.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/drivemount-ja.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/drivemount-ko.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/drivemount-ko.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/drivemount-sv.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/drivemount-sv.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/drivemount-zh_CN.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/drivemount-zh_CN.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/drivemount-zh_HK.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/drivemount-zh_HK.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/drivemount-zh_TW.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/drivemount-zh_TW.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/geyes-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/geyes-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/geyes-de.omf @@ -808,6 +1225,8 @@ share/gnome/omf/gnome-applets/geyes-sv.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/geyes-sv.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/geyes-zh_CN.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/geyes-zh_CN.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/geyes-zh_HK.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/geyes-zh_HK.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/geyes-zh_TW.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/geyes-zh_TW.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/gkb-C.omf @@ -828,6 +1247,8 @@ share/gnome/omf/gnome-applets/gkb-sv.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gkb-sv.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/gkb-zh_CN.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gkb-zh_CN.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/gkb-zh_HK.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gkb-zh_HK.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/gkb-zh_TW.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gkb-zh_TW.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/gtik2_applet2-C.omf @@ -848,6 +1269,8 @@ share/gnome/omf/gnome-applets/gtik2_applet2-sv.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-sv.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/gtik2_applet2-zh_CN.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-zh_CN.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/gtik2_applet2-zh_HK.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-zh_HK.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/gtik2_applet2-zh_TW.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-zh_TW.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/gweather-C.omf @@ -868,6 +1291,8 @@ share/gnome/omf/gnome-applets/gweather-sv.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gweather-sv.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/gweather-zh_CN.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gweather-zh_CN.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/gweather-zh_HK.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gweather-zh_HK.omf 2>/dev/null || /usr/bin/true 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/mailcheck-C.omf @@ -888,6 +1313,8 @@ 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_HK.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mailcheck-zh_HK.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 @@ -898,6 +1325,8 @@ share/gnome/omf/gnome-applets/mixer_applet2-es.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mixer_applet2-es.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/mixer_applet2-fr.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mixer_applet2-fr.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/mixer_applet2-it.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mixer_applet2-it.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/mixer_applet2-ja.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mixer_applet2-ja.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/mixer_applet2-ko.omf @@ -906,14 +1335,78 @@ share/gnome/omf/gnome-applets/mixer_applet2-sv.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mixer_applet2-sv.omf 2>/dev/null || /usr/bin/true 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_HK.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mixer_applet2-zh_HK.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/multiload-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/multiload-C.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/multiload-de.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/multiload-de.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/multiload-es.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/multiload-es.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/multiload-fr.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/multiload-fr.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/multiload-it.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/multiload-it.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/multiload-ja.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/multiload-ja.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/multiload-ko.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/multiload-ko.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/multiload-sv.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/multiload-sv.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/multiload-zh_CN.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/multiload-zh_CN.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/multiload-zh_HK.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/multiload-zh_HK.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/multiload-zh_TW.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/multiload-zh_TW.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/omf/gnome-applets/stickynotes_applet-de.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-de.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/stickynotes_applet-es.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-es.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/stickynotes_applet-fr.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-fr.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/stickynotes_applet-it.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-it.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/stickynotes_applet-ja.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-ja.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/stickynotes_applet-ko.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-ko.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/stickynotes_applet-sv.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-sv.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/stickynotes_applet-zh_CN.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-zh_CN.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/stickynotes_applet-zh_HK.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-zh_HK.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/stickynotes_applet-zh_TW.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-zh_TW.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/wireless-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/wireless-C.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/wireless-de.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/wireless-de.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/wireless-es.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/wireless-es.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/wireless-fr.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/wireless-fr.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/wireless-it.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/wireless-it.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/wireless-ja.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/wireless-ja.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/wireless-ko.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/wireless-ko.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/wireless-sv.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/wireless-sv.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/wireless-zh_CN.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/wireless-zh_CN.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/wireless-zh_HK.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/wireless-zh_HK.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/wireless-zh_TW.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/wireless-zh_TW.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 @@ -1031,11 +1524,11 @@ share/gnome/pixmaps/gkb/uy.png share/gnome/pixmaps/gkb/vn.png share/gnome/pixmaps/gkb/ye.png share/gnome/pixmaps/gkb/yu.png -share/gnome/pixmaps/gnome-cdplayer-icon.png 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/gswitchit-applet.png +share/gnome/pixmaps/gswitchit-properties-capplet.png share/gnome/pixmaps/mailcheck/eclouds.png share/gnome/pixmaps/mailcheck/email-e.png share/gnome/pixmaps/mailcheck/email-eclouds.png @@ -1163,6 +1656,7 @@ 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 +share/locale/en_CA/LC_MESSAGES/gnome-applets-2.0.mo share/locale/en_GB/LC_MESSAGES/gnome-applets-2.0.mo share/locale/es/LC_MESSAGES/gnome-applets-2.0.mo share/locale/et/LC_MESSAGES/gnome-applets-2.0.mo @@ -1174,6 +1668,7 @@ share/locale/ga/LC_MESSAGES/gnome-applets-2.0.mo 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/hr/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 @@ -1195,10 +1690,12 @@ share/locale/ro/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ru/LC_MESSAGES/gnome-applets-2.0.mo share/locale/sk/LC_MESSAGES/gnome-applets-2.0.mo share/locale/sl/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/sq/LC_MESSAGES/gnome-applets-2.0.mo share/locale/sr/LC_MESSAGES/gnome-applets-2.0.mo share/locale/sr@Latn/LC_MESSAGES/gnome-applets-2.0.mo share/locale/sv/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ta/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/th/LC_MESSAGES/gnome-applets-2.0.mo share/locale/tr/LC_MESSAGES/gnome-applets-2.0.mo share/locale/uk/LC_MESSAGES/gnome-applets-2.0.mo share/locale/vi/LC_MESSAGES/gnome-applets-2.0.mo @@ -1211,15 +1708,80 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/pixmaps/stickynotes @dirrm share/gnome/pixmaps/mixer @dirrm share/gnome/pixmaps/accessx-status-applet +@dirrm share/gnome/help/wireless/zh_TW/figures +@dirrm share/gnome/help/wireless/zh_TW +@dirrm share/gnome/help/wireless/zh_HK/figures +@dirrm share/gnome/help/wireless/zh_HK +@dirrm share/gnome/help/wireless/zh_CN/figures +@dirrm share/gnome/help/wireless/zh_CN +@dirrm share/gnome/help/wireless/sv/figures +@dirrm share/gnome/help/wireless/sv +@dirrm share/gnome/help/wireless/ko/figures +@dirrm share/gnome/help/wireless/ko +@dirrm share/gnome/help/wireless/ja/figures +@dirrm share/gnome/help/wireless/ja +@dirrm share/gnome/help/wireless/it/figures +@dirrm share/gnome/help/wireless/it +@dirrm share/gnome/help/wireless/fr/figures +@dirrm share/gnome/help/wireless/fr +@dirrm share/gnome/help/wireless/es/figures +@dirrm share/gnome/help/wireless/es +@dirrm share/gnome/help/wireless/de/figures +@dirrm share/gnome/help/wireless/de @dirrm share/gnome/help/wireless/C @dirrm share/gnome/help/wireless +@dirrm share/gnome/help/stickynotes_applet/zh_TW/figures +@dirrm share/gnome/help/stickynotes_applet/zh_TW +@dirrm share/gnome/help/stickynotes_applet/zh_HK/figures +@dirrm share/gnome/help/stickynotes_applet/zh_HK +@dirrm share/gnome/help/stickynotes_applet/zh_CN/figures +@dirrm share/gnome/help/stickynotes_applet/zh_CN +@dirrm share/gnome/help/stickynotes_applet/sv/figures +@dirrm share/gnome/help/stickynotes_applet/sv +@dirrm share/gnome/help/stickynotes_applet/ko/figures +@dirrm share/gnome/help/stickynotes_applet/ko +@dirrm share/gnome/help/stickynotes_applet/ja/figures +@dirrm share/gnome/help/stickynotes_applet/ja +@dirrm share/gnome/help/stickynotes_applet/it/figures +@dirrm share/gnome/help/stickynotes_applet/it +@dirrm share/gnome/help/stickynotes_applet/fr/figures +@dirrm share/gnome/help/stickynotes_applet/fr +@dirrm share/gnome/help/stickynotes_applet/es/figures +@dirrm share/gnome/help/stickynotes_applet/es +@dirrm share/gnome/help/stickynotes_applet/de/figures +@dirrm share/gnome/help/stickynotes_applet/de @dirrm share/gnome/help/stickynotes_applet/C @dirrm share/gnome/help/stickynotes_applet +@dirrm share/gnome/help/multiload/zh_TW/figures +@dirrm share/gnome/help/multiload/zh_TW +@dirrm share/gnome/help/multiload/zh_HK/figures +@dirrm share/gnome/help/multiload/zh_HK +@dirrm share/gnome/help/multiload/zh_CN/figures +@dirrm share/gnome/help/multiload/zh_CN +@dirrm share/gnome/help/multiload/sv/figures +@dirrm share/gnome/help/multiload/sv +@dirrm share/gnome/help/multiload/ko/figures +@dirrm share/gnome/help/multiload/ko +@dirrm share/gnome/help/multiload/ja/figures +@dirrm share/gnome/help/multiload/ja +@dirrm share/gnome/help/multiload/it/figures +@dirrm share/gnome/help/multiload/it +@dirrm share/gnome/help/multiload/fr/figures +@dirrm share/gnome/help/multiload/fr +@dirrm share/gnome/help/multiload/es/figures +@dirrm share/gnome/help/multiload/es +@dirrm share/gnome/help/multiload/de/figures +@dirrm share/gnome/help/multiload/de +@dirrm share/gnome/help/multiload/C/figures +@dirrm share/gnome/help/multiload/C +@dirrm share/gnome/help/multiload @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_HK/figures +@dirrm share/gnome/help/mixer_applet2/zh_HK @dirrm share/gnome/help/mixer_applet2/zh_CN/figures @dirrm share/gnome/help/mixer_applet2/zh_CN @dirrm share/gnome/help/mixer_applet2/sv/figures @@ -1228,6 +1790,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/mixer_applet2/ko @dirrm share/gnome/help/mixer_applet2/ja/figures @dirrm share/gnome/help/mixer_applet2/ja +@dirrm share/gnome/help/mixer_applet2/it/figures +@dirrm share/gnome/help/mixer_applet2/it @dirrm share/gnome/help/mixer_applet2/fr/figures @dirrm share/gnome/help/mixer_applet2/fr @dirrm share/gnome/help/mixer_applet2/es/figures @@ -1239,6 +1803,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/mixer_applet2 @dirrm share/gnome/help/mailcheck/zh_TW/figures @dirrm share/gnome/help/mailcheck/zh_TW +@dirrm share/gnome/help/mailcheck/zh_HK/figures +@dirrm share/gnome/help/mailcheck/zh_HK @dirrm share/gnome/help/mailcheck/zh_CN/figures @dirrm share/gnome/help/mailcheck/zh_CN @dirrm share/gnome/help/mailcheck/sv/figures @@ -1260,6 +1826,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @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_HK/figures +@dirrm share/gnome/help/gweather/zh_HK @dirrm share/gnome/help/gweather/zh_CN/figures @dirrm share/gnome/help/gweather/zh_CN @dirrm share/gnome/help/gweather/sv/figures @@ -1281,6 +1849,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/gweather @dirrm share/gnome/help/gtik2_applet2/zh_TW/figures @dirrm share/gnome/help/gtik2_applet2/zh_TW +@dirrm share/gnome/help/gtik2_applet2/zh_HK/figures +@dirrm share/gnome/help/gtik2_applet2/zh_HK @dirrm share/gnome/help/gtik2_applet2/zh_CN/figures @dirrm share/gnome/help/gtik2_applet2/zh_CN @dirrm share/gnome/help/gtik2_applet2/sv/figures @@ -1302,6 +1872,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/gtik2_applet2 @dirrm share/gnome/help/gkb/zh_TW/figures @dirrm share/gnome/help/gkb/zh_TW +@dirrm share/gnome/help/gkb/zh_HK/figures +@dirrm share/gnome/help/gkb/zh_HK @dirrm share/gnome/help/gkb/zh_CN/figures @dirrm share/gnome/help/gkb/zh_CN @dirrm share/gnome/help/gkb/sv/figures @@ -1323,6 +1895,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/gkb @dirrm share/gnome/help/geyes/zh_TW/figures @dirrm share/gnome/help/geyes/zh_TW +@dirrm share/gnome/help/geyes/zh_HK/figures +@dirrm share/gnome/help/geyes/zh_HK @dirrm share/gnome/help/geyes/zh_CN/figures @dirrm share/gnome/help/geyes/zh_CN @dirrm share/gnome/help/geyes/sv/figures @@ -1342,11 +1916,33 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/geyes/C/figures @dirrm share/gnome/help/geyes/C @dirrm share/gnome/help/geyes +@dirrm share/gnome/help/drivemount/zh_TW/figures +@dirrm share/gnome/help/drivemount/zh_TW +@dirrm share/gnome/help/drivemount/zh_HK/figures +@dirrm share/gnome/help/drivemount/zh_HK +@dirrm share/gnome/help/drivemount/zh_CN/figures +@dirrm share/gnome/help/drivemount/zh_CN +@dirrm share/gnome/help/drivemount/sv/figures +@dirrm share/gnome/help/drivemount/sv +@dirrm share/gnome/help/drivemount/ko/figures +@dirrm share/gnome/help/drivemount/ko +@dirrm share/gnome/help/drivemount/ja/figures +@dirrm share/gnome/help/drivemount/ja +@dirrm share/gnome/help/drivemount/it/figures +@dirrm share/gnome/help/drivemount/it +@dirrm share/gnome/help/drivemount/fr/figures +@dirrm share/gnome/help/drivemount/fr +@dirrm share/gnome/help/drivemount/es/figures +@dirrm share/gnome/help/drivemount/es +@dirrm share/gnome/help/drivemount/de/figures +@dirrm share/gnome/help/drivemount/de @dirrm share/gnome/help/drivemount/C/figures @dirrm share/gnome/help/drivemount/C @dirrm share/gnome/help/drivemount @dirrm share/gnome/help/command-line/zh_TW/figures @dirrm share/gnome/help/command-line/zh_TW +@dirrm share/gnome/help/command-line/zh_HK/figures +@dirrm share/gnome/help/command-line/zh_HK @dirrm share/gnome/help/command-line/zh_CN/figures @dirrm share/gnome/help/command-line/zh_CN @dirrm share/gnome/help/command-line/sv/figures @@ -1368,14 +1964,14 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/command-line @dirrm share/gnome/help/char-palette/zh_TW/figures @dirrm share/gnome/help/char-palette/zh_TW +@dirrm share/gnome/help/char-palette/zh_HK/figures +@dirrm share/gnome/help/char-palette/zh_HK @dirrm share/gnome/help/char-palette/zh_CN/figures @dirrm share/gnome/help/char-palette/zh_CN @dirrm share/gnome/help/char-palette/sv/figures @dirrm share/gnome/help/char-palette/sv @dirrm share/gnome/help/char-palette/ko/figures @dirrm share/gnome/help/char-palette/ko -@dirrm share/gnome/help/char-palette/ja/figures -@dirrm share/gnome/help/char-palette/ja @dirrm share/gnome/help/char-palette/it/figures @dirrm share/gnome/help/char-palette/it @dirrm share/gnome/help/char-palette/fr/figures @@ -1389,6 +1985,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/char-palette @dirrm share/gnome/help/cdplayer/zh_TW/figures @dirrm share/gnome/help/cdplayer/zh_TW +@dirrm share/gnome/help/cdplayer/zh_HK/figures +@dirrm share/gnome/help/cdplayer/zh_HK @dirrm share/gnome/help/cdplayer/zh_CN/figures @dirrm share/gnome/help/cdplayer/zh_CN @dirrm share/gnome/help/cdplayer/sv/figures @@ -1408,17 +2006,42 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/cdplayer/C/figures @dirrm share/gnome/help/cdplayer/C @dirrm share/gnome/help/cdplayer +%%BATTERY%%@dirrm share/gnome/help/battstat/zh_TW/figures +%%BATTERY%%@dirrm share/gnome/help/battstat/zh_TW +%%BATTERY%%@dirrm share/gnome/help/battstat/zh_HK/figures +%%BATTERY%%@dirrm share/gnome/help/battstat/zh_HK +%%BATTERY%%@dirrm share/gnome/help/battstat/zh_CN/figures +%%BATTERY%%@dirrm share/gnome/help/battstat/zh_CN +%%BATTERY%%@dirrm share/gnome/help/battstat/sv/figures +%%BATTERY%%@dirrm share/gnome/help/battstat/sv +%%BATTERY%%@dirrm share/gnome/help/battstat/ko/figures +%%BATTERY%%@dirrm share/gnome/help/battstat/ko %%BATTERY%%@dirrm share/gnome/help/battstat/ja/figures %%BATTERY%%@dirrm share/gnome/help/battstat/ja +%%BATTERY%%@dirrm share/gnome/help/battstat/it/figures +%%BATTERY%%@dirrm share/gnome/help/battstat/it +%%BATTERY%%@dirrm share/gnome/help/battstat/fr/figures +%%BATTERY%%@dirrm share/gnome/help/battstat/fr +%%BATTERY%%@dirrm share/gnome/help/battstat/es/figures +%%BATTERY%%@dirrm share/gnome/help/battstat/es +%%BATTERY%%@dirrm share/gnome/help/battstat/de/figures +%%BATTERY%%@dirrm share/gnome/help/battstat/de %%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 +@dirrm share/gnome/gswitchit +@dirrm share/gnome/geyes/Horrid +@dirrm share/gnome/geyes/Default-tiny +@dirrm share/gnome/geyes/Default +@dirrm share/gnome/geyes/Bloodshot +@dirrm share/gnome/geyes/Bizarre @dirrm share/gnome/gen_util %%BATTERY%%@dirrm share/gnome/battstat_applet @dirrm libexec/gnome-applets +@dirrm include/libgswitchit @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 @@ -1436,6 +2059,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gweather @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gtik/prefs @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gtik +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gswitchit/Applet +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gswitchit @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gkb-applet/prefs @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gkb-applet @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/geyes/prefs @@ -1451,9 +2076,20 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @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 +@dirrm etc/gconf/gconf.xml.defaults/apps/gswitchit/Applet +@dirrm etc/gconf/gconf.xml.defaults/apps/gswitchit @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-de.omf 2>/dev/null || /usr/bin/true +%%BATTERY%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/battstat-es.omf 2>/dev/null || /usr/bin/true +%%BATTERY%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/battstat-fr.omf 2>/dev/null || /usr/bin/true +%%BATTERY%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/battstat-it.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 +%%BATTERY%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/battstat-ko.omf 2>/dev/null || /usr/bin/true +%%BATTERY%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/battstat-sv.omf 2>/dev/null || /usr/bin/true +%%BATTERY%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/battstat-zh_CN.omf 2>/dev/null || /usr/bin/true +%%BATTERY%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/battstat-zh_HK.omf 2>/dev/null || /usr/bin/true +%%BATTERY%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/battstat-zh_TW.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 @@ -1463,16 +2099,17 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/cdplayer-ko.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/cdplayer-sv.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/cdplayer-zh_CN.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/cdplayer-zh_HK.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/cdplayer-zh_TW.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-de.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-es.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-fr.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-it.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-ja.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-ko.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-sv.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-zh_CN.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-zh_HK.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-zh_TW.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/command-line-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/command-line-de.omf 2>/dev/null || /usr/bin/true @@ -1483,8 +2120,19 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/command-line-ko.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/command-line-sv.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/command-line-zh_CN.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/command-line-zh_HK.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/command-line-zh_TW.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/drivemount-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/drivemount-de.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/drivemount-es.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/drivemount-fr.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/drivemount-it.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/drivemount-ja.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/drivemount-ko.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/drivemount-sv.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/drivemount-zh_CN.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/drivemount-zh_HK.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/drivemount-zh_TW.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/geyes-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/geyes-de.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/geyes-es.omf 2>/dev/null || /usr/bin/true @@ -1494,6 +2142,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/geyes-ko.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/geyes-sv.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/geyes-zh_CN.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/geyes-zh_HK.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/geyes-zh_TW.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gkb-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gkb-de.omf 2>/dev/null || /usr/bin/true @@ -1504,6 +2153,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gkb-ko.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gkb-sv.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gkb-zh_CN.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gkb-zh_HK.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gkb-zh_TW.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-de.omf 2>/dev/null || /usr/bin/true @@ -1514,6 +2164,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-ko.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-sv.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-zh_CN.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-zh_HK.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-zh_TW.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gweather-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gweather-de.omf 2>/dev/null || /usr/bin/true @@ -1524,6 +2175,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gweather-ko.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gweather-sv.omf 2>/dev/null || /usr/bin/true @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_HK.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/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 @@ -1534,16 +2186,50 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @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_HK.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 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-fr.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-it.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-ja.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-ko.omf 2>/dev/null || /usr/bin/true @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_HK.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/multiload-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/multiload-de.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/multiload-es.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/multiload-fr.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/multiload-it.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/multiload-ja.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/multiload-ko.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/multiload-sv.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/multiload-zh_CN.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/multiload-zh_HK.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/multiload-zh_TW.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 +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-de.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-es.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-fr.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-it.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-ja.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-ko.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-sv.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-zh_CN.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-zh_HK.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-zh_TW.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/wireless-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/wireless-de.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/wireless-es.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/wireless-fr.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/wireless-it.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/wireless-ja.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/wireless-ko.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/wireless-sv.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/wireless-zh_CN.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/wireless-zh_HK.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/wireless-zh_TW.omf 2>/dev/null || /usr/bin/true diff --git a/x11/gnomedesktop/Makefile b/x11/gnomedesktop/Makefile index bfd82d8dd2ec..e27e91a8da7d 100644 --- a/x11/gnomedesktop/Makefile +++ b/x11/gnomedesktop/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomedesktop -PORTVERSION= 2.4.1.1 -PORTREVISION= 2 +PORTVERSION= 2.6.0.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-desktop/2.4 +MASTER_SITE_SUBDIR= sources/gnome-desktop/2.6 DISTNAME= gnome-desktop-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -20,7 +19,8 @@ COMMENT= Additional UI API for GNOME 2 USE_BZIP2= yes USE_X_PREFIX= yes USE_XPM= yes -USE_GNOME= gnomeprefix gnomehack gnomehier libgnomeui +USE_REINPLACE= yes +USE_GNOME= gnomeprefix gnomehack intlhack lthack gnomehier libgnomeui GNOME_DESKTOP_VERSION=2 USE_GMAKE= yes USE_BISON= yes diff --git a/x11/gnomedesktop/distinfo b/x11/gnomedesktop/distinfo index 886b1521819b..213352fd1c8d 100644 --- a/x11/gnomedesktop/distinfo +++ b/x11/gnomedesktop/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-desktop-2.4.1.1.tar.bz2) = c85489c7befc79b5cc9bda1b2006cacc -SIZE (gnome2/gnome-desktop-2.4.1.1.tar.bz2) = 1054097 +MD5 (gnome2/gnome-desktop-2.6.0.1.tar.bz2) = 2d40b7d7a15f23770265246979529327 +SIZE (gnome2/gnome-desktop-2.6.0.1.tar.bz2) = 1077853 diff --git a/x11/gnomedesktop/files/patch-configure b/x11/gnomedesktop/files/patch-configure deleted file mode 100644 index caf5b493a9eb..000000000000 --- a/x11/gnomedesktop/files/patch-configure +++ /dev/null @@ -1,10 +0,0 @@ ---- 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" -+$ac_aux_dir/ltconfig $LIBTOOL_DEPS - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' diff --git a/x11/gnomedesktop/pkg-descr b/x11/gnomedesktop/pkg-descr index 500857a54f14..bda4df7913d6 100644 --- a/x11/gnomedesktop/pkg-descr +++ b/x11/gnomedesktop/pkg-descr @@ -1,4 +1,3 @@ -This is a collection of APIs not included in libgnomeui as they have -not undergone sufficient testing. +This is a collection of APIs not included in libgnomeui. WWW: http://www.gnome.org/ diff --git a/x11/gnomedesktop/pkg-plist b/x11/gnomedesktop/pkg-plist index a3384f7d3a88..9a87be2a25b4 100644 --- a/x11/gnomedesktop/pkg-plist +++ b/x11/gnomedesktop/pkg-plist @@ -21,6 +21,14 @@ 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/omf/gnome-desktop/fdl-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-desktop/fdl-C.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-desktop/gnome-feedback-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-desktop/gnome-feedback-C.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-desktop/gpl-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-desktop/gpl-C.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-desktop/lgpl-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-desktop/lgpl-C.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/advanced-directory.png share/gnome/pixmaps/apple-green.png share/gnome/pixmaps/apple-red.png @@ -117,6 +125,7 @@ share/gnome/vfolders/Other.directory share/gnome/vfolders/Root.directory share/gnome/vfolders/Settings.directory share/gnome/vfolders/System.directory +share/locale/af/LC_MESSAGES/gnome-desktop-2.0.mo 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 @@ -131,6 +140,7 @@ 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 +share/locale/en_CA/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/en_GB/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/eo/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/es/LC_MESSAGES/gnome-desktop-2.0.mo @@ -143,6 +153,7 @@ share/locale/ga/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/gl/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/he/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/hi/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/hr/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/hu/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/id/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/is/LC_MESSAGES/gnome-desktop-2.0.mo @@ -162,6 +173,7 @@ 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 +share/locale/pa/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/pl/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/pt/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/pt_BR/LC_MESSAGES/gnome-desktop-2.0.mo @@ -175,6 +187,7 @@ share/locale/sr@Latn/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/sv/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ta/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/th/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/tk/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/tr/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/uk/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/vi/LC_MESSAGES/gnome-desktop-2.0.mo @@ -182,13 +195,21 @@ share/locale/wa/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/yi/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo -@dirrm share/gnome/help/lgpl/C/figures -@dirrm share/gnome/help/gpl/C/figures -@dirrm share/gnome/help/gnome-feedback/C/figures +@dirrm share/gnome/omf/gnome-desktop +@dirrm share/gnome/help/lgpl/C +@dirrm share/gnome/help/lgpl +@dirrm share/gnome/help/gpl/C +@dirrm share/gnome/help/gpl @dirrm share/gnome/help/gnome-feedback/C @dirrm share/gnome/help/gnome-feedback -@dirrm share/gnome/help/fdl/C/figures +@dirrm share/gnome/help/fdl/C +@dirrm share/gnome/help/fdl @dirrm share/gnome/gnome-about/headers +@dirrm share/gnome/gnome-about @dirrm include/gnome-desktop-2.0/libgnomeui @dirrm include/gnome-desktop-2.0/libgnome @dirrm include/gnome-desktop-2.0 +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-desktop/fdl-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-desktop/gnome-feedback-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-desktop/gpl-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-desktop/lgpl-C.omf 2>/dev/null || /usr/bin/true diff --git a/x11/gnomepanel/Makefile b/x11/gnomepanel/Makefile index 56398c8c4dd0..36c2fefb4f95 100644 --- a/x11/gnomepanel/Makefile +++ b/x11/gnomepanel/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomepanel -PORTVERSION= 2.4.2 -PORTREVISION= 1 +PORTVERSION= 2.6.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-panel/2.4 +MASTER_SITE_SUBDIR= sources/gnome-panel/2.6 DISTNAME= gnome-panel-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -20,8 +19,9 @@ COMMENT= Panel component for the GNOME 2 Desktop USE_BZIP2= yes INSTALLS_SHLIB= yes USE_X_PREFIX= yes -USE_GNOME= gnomeprefix gnomehack gnomehier gnomedesktop libwnck lthack \ - intlhack +USE_REINPLACE= yes +USE_GNOME= gnomeprefix gnomehack gnomehier intlhack lthack gnomedesktop \ + libwnck GNOME_DESKTOP_VERSION=2 USE_GMAKE= yes USE_LIBTOOL_VER=13 @@ -32,4 +32,9 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ MAN1= gnome-panel.1 gnome-panel-preferences.1 +post-patch: +.for po in da.po it.po zh_TW.po + @${REINPLACE_CMD} -e 's|%-|%|g' ${WRKSRC}/po/${po} +.endfor + .include <bsd.port.mk> diff --git a/x11/gnomepanel/distinfo b/x11/gnomepanel/distinfo index 2e18221ce043..922d7c3b0c78 100644 --- a/x11/gnomepanel/distinfo +++ b/x11/gnomepanel/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-panel-2.4.2.tar.bz2) = d62da1f6cb129f65206a945d93a2fa85 -SIZE (gnome2/gnome-panel-2.4.2.tar.bz2) = 2662404 +MD5 (gnome2/gnome-panel-2.6.0.tar.bz2) = 9e0ad03c9266d342b99837ca4e947b55 +SIZE (gnome2/gnome-panel-2.6.0.tar.bz2) = 2933581 diff --git a/x11/gnomepanel/files/patch-applets_clock_clock.c b/x11/gnomepanel/files/patch-applets_clock_clock.c index 976764570ff1..ccf5378b135f 100644 --- a/x11/gnomepanel/files/patch-applets_clock_clock.c +++ b/x11/gnomepanel/files/patch-applets_clock_clock.c @@ -1,9 +1,6 @@ - -$FreeBSD$ - ---- 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 @@ +--- applets/clock/clock.c.orig Tue Jan 13 11:55:58 2004 ++++ applets/clock/clock.c Wed Jan 14 15:43:39 2004 +@@ -47,7 +47,9 @@ #include <dirent.h> #include <string.h> #include <time.h> @@ -13,15 +10,15 @@ $FreeBSD$ #include <panel-applet.h> #include <panel-applet-gconf.h> -@@ -684,7 +686,11 @@ - cd->hourformat = panel_applet_gconf_get_int (applet, KEY_HOUR_FORMAT, &error); - if (error || (cd->hourformat != 12 && cd->hourformat != 24)) { - /* if value is not valid, set it according to locale */ +@@ -539,7 +541,11 @@ + { + const char *am; + +#ifdef HAVE_LANGINFO_H - const char *am = nl_langinfo (AM_STR); + am = nl_langinfo (AM_STR); +#else -+ const char *am = "AM"; ++ am = "AM"; +#endif - cd->hourformat = (am[0] == '\0') ? 24 : 12; + return (am[0] == '\0') ? CLOCK_FORMAT_24 : CLOCK_FORMAT_12; + } - if (error) diff --git a/x11/gnomepanel/files/patch-configure b/x11/gnomepanel/files/patch-configure new file mode 100644 index 000000000000..732f3a86022c --- /dev/null +++ b/x11/gnomepanel/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig Wed Jan 14 15:54:42 2004 ++++ configure Wed Jan 14 15:55:13 2004 +@@ -5536,7 +5536,7 @@ + + + for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ +- inttypes.h stdint.h unistd.h ++ inttypes.h stdint.h unistd.h langinfo.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` + echo "$as_me:$LINENO: checking for $ac_header" >&5 diff --git a/x11/gnomepanel/files/patch-po_da.po b/x11/gnomepanel/files/patch-po_da.po deleted file mode 100644 index 96bfea954001..000000000000 --- a/x11/gnomepanel/files/patch-po_da.po +++ /dev/null @@ -1,29 +0,0 @@ ---- po/da.po.orig Wed Oct 1 15:54:18 2003 -+++ po/da.po Wed Oct 1 15:56:23 2003 -@@ -48,7 +48,7 @@ - - #: applets/clock/clock.c:227 - msgid "%a %b %d" --msgstr "%a %-d. %b" -+msgstr "%a %d. %b" - - #. translators: reverse the order of these arguments - #. * if the time should come before the -@@ -75,7 +75,7 @@ - #. Show date in tooltip - #: applets/clock/clock.c:344 - msgid "%A %B %d" --msgstr "%A den %-d. %B" -+msgstr "%A den %d. %B" - - #: applets/clock/clock.c:472 - msgid "Calendar" -@@ -95,7 +95,7 @@ - - #: applets/clock/clock.c:809 - msgid "%A, %B %d %Y" --msgstr "%A, %-d. %B %Y" -+msgstr "%A, %d. %B %Y" - - #: applets/clock/clock.c:850 - #, c-format diff --git a/x11/gnomepanel/files/patch-po_it.po b/x11/gnomepanel/files/patch-po_it.po deleted file mode 100644 index 00118bd344bc..000000000000 --- a/x11/gnomepanel/files/patch-po_it.po +++ /dev/null @@ -1,59 +0,0 @@ ---- po/it.po.orig Wed Oct 1 15:55:34 2003 -+++ po/it.po Wed Oct 1 15:56:12 2003 -@@ -17,23 +17,23 @@ - - #: applets/clock/clock.c:219 - msgid "%l:%M:%S %p" --msgstr "%-I.%M.%S %p" -+msgstr "%I.%M.%S %p" - - #: applets/clock/clock.c:219 - msgid "%l:%M %p" --msgstr "%-I.%M %p" -+msgstr "%I.%M %p" - - #: applets/clock/clock.c:221 applets/clock/clock.c:773 - msgid "%H:%M:%S" --msgstr "%-H.%M.%S" -+msgstr "%H.%M.%S" - - #: applets/clock/clock.c:221 applets/clock/clock.c:775 - msgid "%H:%M" --msgstr "%-H.%M" -+msgstr "%H.%M" - - #: applets/clock/clock.c:227 - msgid "%a %b %d" --msgstr "%a %-d %b" -+msgstr "%a %d %b" - - #. translators: reverse the order of these arguments - #. * if the time should come before the -@@ -60,7 +60,7 @@ - #. Show date in tooltip - #: applets/clock/clock.c:344 - msgid "%A %B %d" --msgstr "%A %-d %B" -+msgstr "%A %d %B" - - #: applets/clock/clock.c:472 - msgid "Calendar" -@@ -72,15 +72,15 @@ - - #: applets/clock/clock.c:768 - msgid "%I:%M:%S %p" --msgstr "%-I.%M.%S %p" -+msgstr "%I.%M.%S %p" - - #: applets/clock/clock.c:770 - msgid "%I:%M %p" --msgstr "%-I.%M %p" -+msgstr "%I.%M %p" - - #: applets/clock/clock.c:809 - msgid "%A, %B %d %Y" --msgstr "%A, %-d %B %Y" -+msgstr "%A, %d %B %Y" - - #: applets/clock/clock.c:850 - #, c-format diff --git a/x11/gnomepanel/files/patch-po_zh_TW.po b/x11/gnomepanel/files/patch-po_zh_TW.po deleted file mode 100644 index 3e7e16c45ddb..000000000000 --- a/x11/gnomepanel/files/patch-po_zh_TW.po +++ /dev/null @@ -1,20 +0,0 @@ ---- po/zh_TW.po.orig Wed Oct 1 15:57:10 2003 -+++ po/zh_TW.po Wed Oct 1 15:57:19 2003 -@@ -40,7 +40,7 @@ - - #: applets/clock/clock.c:227 - msgid "%a %b %d" --msgstr "%-m月%-d日(%a)" -+msgstr "%m月%d日(%a)" - - #. translators: reverse the order of these arguments - #. * if the time should come before the -@@ -67,7 +67,7 @@ - #. Show date in tooltip - #: applets/clock/clock.c:344 - msgid "%A %B %d" --msgstr "%-m月%-d日(%A)" -+msgstr "%m月%d日(%A)" - - #: applets/clock/clock.c:472 - msgid "Calendar" diff --git a/x11/gnomepanel/pkg-descr b/x11/gnomepanel/pkg-descr index 5e73398913a9..263044b5e130 100644 --- a/x11/gnomepanel/pkg-descr +++ b/x11/gnomepanel/pkg-descr @@ -1,3 +1,3 @@ -Panel component for the GNOME 2 Desktop. +This drives the GNOME 2 panel. WWW: http://www.gnome.org/ diff --git a/x11/gnomepanel/pkg-plist b/x11/gnomepanel/pkg-plist index f10b99a60775..e691400d6c7d 100644 --- a/x11/gnomepanel/pkg-plist +++ b/x11/gnomepanel/pkg-plist @@ -64,9 +64,9 @@ 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-enums.h include/panel-2.0/panel-applet-gconf.h include/panel-2.0/panel-applet.h -lib/libclock-applet-2.so lib/libpanel-applet-2.a lib/libpanel-applet-2.so lib/libpanel-applet-2.so.0 @@ -76,21 +76,27 @@ 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/clock-applet libexec/fish-applet-2 libexec/notification-area-applet libexec/wnck-applet +share/doc/panel-applet/PanelApplet.html 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/home.png +share/doc/panel-applet/index.html share/doc/panel-applet/index.sgml -share/doc/panel-applet/libpanel-applet.html +share/doc/panel-applet/left.png share/doc/panel-applet/multi-applets.html -share/doc/panel-applet/panel-applet-panel-applet-gconf-utilities.html +share/doc/panel-applet/panel-applet-Panel-Applet-GConf-Utilities.html +share/doc/panel-applet/panel-applet.devhelp share/doc/panel-applet/panel-applet.html share/doc/panel-applet/panel-signals.html -share/doc/panel-applet/panelapplet.html +share/doc/panel-applet/right.png share/doc/panel-applet/server-files.html share/doc/panel-applet/session-saving.html +share/doc/panel-applet/up.png share/gnome/control-center-2.0/capplets/gnome-panel-preferences.desktop share/gnome/gnome-2.0/ui/GNOME_ClockApplet.xml share/gnome/gnome-2.0/ui/GNOME_FishApplet.xml @@ -129,9 +135,6 @@ share/gnome/help/clock/ko/legal.xml share/gnome/help/clock/sv/clock.xml share/gnome/help/clock/sv/figures/clock_applet.png share/gnome/help/clock/sv/legal.xml -share/gnome/help/clock/uk/clock.xml -share/gnome/help/clock/uk/figures/clock_applet.png -share/gnome/help/clock/uk/legal.xml share/gnome/help/clock/zh_CN/clock.xml share/gnome/help/clock/zh_CN/figures/clock_applet.png share/gnome/help/clock/zh_CN/legal.xml @@ -168,9 +171,6 @@ share/gnome/help/fish-applet-2/sv/figures/fish_applet.png share/gnome/help/fish-applet-2/sv/figures/fish_settings.png share/gnome/help/fish-applet-2/sv/fish-applet-2.xml share/gnome/help/fish-applet-2/sv/legal.xml -share/gnome/help/fish-applet-2/uk/figures/fish_applet.png -share/gnome/help/fish-applet-2/uk/fish-applet-2.xml -share/gnome/help/fish-applet-2/uk/legal.xml share/gnome/help/fish-applet-2/zh_CN/figures/fish_applet.png share/gnome/help/fish-applet-2/zh_CN/figures/fish_settings.png share/gnome/help/fish-applet-2/zh_CN/fish-applet-2.xml @@ -217,10 +217,6 @@ share/gnome/help/window-list/sv/figures/window_list_group.png share/gnome/help/window-list/sv/figures/window_list_group_applet.png share/gnome/help/window-list/sv/legal.xml share/gnome/help/window-list/sv/window-list.xml -share/gnome/help/window-list/uk/figures/window_list_applet.png -share/gnome/help/window-list/uk/figures/window_list_group_applet.png -share/gnome/help/window-list/uk/legal.xml -share/gnome/help/window-list/uk/window-list.xml share/gnome/help/window-list/zh_CN/figures/window_list_applet.png share/gnome/help/window-list/zh_CN/figures/window_list_group.png share/gnome/help/window-list/zh_CN/figures/window_list_group_applet.png @@ -261,9 +257,6 @@ share/gnome/help/workspace-switcher/sv/figures/workspace_switcher_applet.png share/gnome/help/workspace-switcher/sv/figures/workspacelist_applet.png share/gnome/help/workspace-switcher/sv/legal.xml share/gnome/help/workspace-switcher/sv/workspace-switcher.xml -share/gnome/help/workspace-switcher/uk/figures/workspace_switcher_applet.png -share/gnome/help/workspace-switcher/uk/legal.xml -share/gnome/help/workspace-switcher/uk/workspace-switcher.xml share/gnome/help/workspace-switcher/zh_CN/figures/workspace_switcher_applet.png share/gnome/help/workspace-switcher/zh_CN/figures/workspacelist_applet.png share/gnome/help/workspace-switcher/zh_CN/legal.xml @@ -289,8 +282,6 @@ share/gnome/omf/gnome-panel/clock-ko.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/clock-ko.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-panel/clock-sv.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/clock-sv.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-panel/clock-uk.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/clock-uk.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-panel/clock-zh_CN.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/clock-zh_CN.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-panel/clock-zh_TW.omf @@ -311,8 +302,6 @@ share/gnome/omf/gnome-panel/fish-applet-2-ko.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-ko.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-panel/fish-applet-2-sv.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-sv.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-panel/fish-applet-2-uk.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-uk.omf 2>/dev/null || /usr/bin/true 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 @@ -333,8 +322,6 @@ share/gnome/omf/gnome-panel/window-list-ko.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-ko.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-panel/window-list-sv.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-sv.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-panel/window-list-uk.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-uk.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-panel/window-list-zh_CN.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-zh_CN.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-panel/window-list-zh_TW.omf @@ -355,8 +342,6 @@ share/gnome/omf/gnome-panel/workspace-switcher-ko.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-ko.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-panel/workspace-switcher-sv.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-sv.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnome-panel/workspace-switcher-uk.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-uk.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-panel/workspace-switcher-zh_CN.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-zh_CN.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf @@ -385,7 +370,6 @@ 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/panel-drawer.png share/gnome/pixmaps/panel-force-quit.png share/locale/am/LC_MESSAGES/gnome-panel-2.0.mo @@ -400,6 +384,7 @@ share/locale/cy/LC_MESSAGES/gnome-panel-2.0.mo share/locale/da/LC_MESSAGES/gnome-panel-2.0.mo share/locale/de/LC_MESSAGES/gnome-panel-2.0.mo share/locale/el/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/en_CA/LC_MESSAGES/gnome-panel-2.0.mo share/locale/en_GB/LC_MESSAGES/gnome-panel-2.0.mo share/locale/eo/LC_MESSAGES/gnome-panel-2.0.mo share/locale/es/LC_MESSAGES/gnome-panel-2.0.mo @@ -412,6 +397,7 @@ share/locale/ga/LC_MESSAGES/gnome-panel-2.0.mo share/locale/gl/LC_MESSAGES/gnome-panel-2.0.mo share/locale/he/LC_MESSAGES/gnome-panel-2.0.mo share/locale/hi/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/hr/LC_MESSAGES/gnome-panel-2.0.mo share/locale/hu/LC_MESSAGES/gnome-panel-2.0.mo share/locale/id/LC_MESSAGES/gnome-panel-2.0.mo share/locale/it/LC_MESSAGES/gnome-panel-2.0.mo @@ -423,10 +409,12 @@ share/locale/lv/LC_MESSAGES/gnome-panel-2.0.mo share/locale/mk/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ml/LC_MESSAGES/gnome-panel-2.0.mo share/locale/mn/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/mr/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ms/LC_MESSAGES/gnome-panel-2.0.mo share/locale/nl/LC_MESSAGES/gnome-panel-2.0.mo share/locale/nn/LC_MESSAGES/gnome-panel-2.0.mo share/locale/no/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/pa/LC_MESSAGES/gnome-panel-2.0.mo share/locale/pl/LC_MESSAGES/gnome-panel-2.0.mo share/locale/pt/LC_MESSAGES/gnome-panel-2.0.mo share/locale/pt_BR/LC_MESSAGES/gnome-panel-2.0.mo @@ -437,8 +425,10 @@ share/locale/sl/LC_MESSAGES/gnome-panel-2.0.mo share/locale/sq/LC_MESSAGES/gnome-panel-2.0.mo share/locale/sr/LC_MESSAGES/gnome-panel-2.0.mo share/locale/sr@Latn/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/sr@ije/LC_MESSAGES/gnome-panel-2.0.mo share/locale/sv/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ta/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/th/LC_MESSAGES/gnome-panel-2.0.mo share/locale/tr/LC_MESSAGES/gnome-panel-2.0.mo share/locale/uk/LC_MESSAGES/gnome-panel-2.0.mo share/locale/vi/LC_MESSAGES/gnome-panel-2.0.mo @@ -452,8 +442,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo @dirrm share/gnome/help/workspace-switcher/zh_TW @dirrm share/gnome/help/workspace-switcher/zh_CN/figures @dirrm share/gnome/help/workspace-switcher/zh_CN -@dirrm share/gnome/help/workspace-switcher/uk/figures -@dirrm share/gnome/help/workspace-switcher/uk @dirrm share/gnome/help/workspace-switcher/sv/figures @dirrm share/gnome/help/workspace-switcher/sv @dirrm share/gnome/help/workspace-switcher/ko/figures @@ -475,8 +463,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo @dirrm share/gnome/help/window-list/zh_TW @dirrm share/gnome/help/window-list/zh_CN/figures @dirrm share/gnome/help/window-list/zh_CN -@dirrm share/gnome/help/window-list/uk/figures -@dirrm share/gnome/help/window-list/uk @dirrm share/gnome/help/window-list/sv/figures @dirrm share/gnome/help/window-list/sv @dirrm share/gnome/help/window-list/ko/figures @@ -498,8 +484,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo @dirrm share/gnome/help/fish-applet-2/zh_TW @dirrm share/gnome/help/fish-applet-2/zh_CN/figures @dirrm share/gnome/help/fish-applet-2/zh_CN -@dirrm share/gnome/help/fish-applet-2/uk/figures -@dirrm share/gnome/help/fish-applet-2/uk @dirrm share/gnome/help/fish-applet-2/sv/figures @dirrm share/gnome/help/fish-applet-2/sv @dirrm share/gnome/help/fish-applet-2/ko/figures @@ -521,8 +505,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo @dirrm share/gnome/help/clock/zh_TW @dirrm share/gnome/help/clock/zh_CN/figures @dirrm share/gnome/help/clock/zh_CN -@dirrm share/gnome/help/clock/uk/figures -@dirrm share/gnome/help/clock/uk @dirrm share/gnome/help/clock/sv/figures @dirrm share/gnome/help/clock/sv @dirrm share/gnome/help/clock/ko/figures @@ -601,7 +583,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-ja.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-ko.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-sv.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-uk.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-zh_CN.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-zh_TW.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-C.omf 2>/dev/null || /usr/bin/true @@ -612,7 +593,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-ja.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-ko.omf 2>/dev/null || /usr/bin/true @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-uk.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/window-list-C.omf 2>/dev/null || /usr/bin/true @@ -623,7 +603,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-ja.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-ko.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-sv.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-uk.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-zh_CN.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-zh_TW.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-C.omf 2>/dev/null || /usr/bin/true @@ -634,6 +613,5 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-ja.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-ko.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-sv.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-uk.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-zh_CN.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf 2>/dev/null || /usr/bin/true diff --git a/x11/gnomesession/Makefile b/x11/gnomesession/Makefile index 6dbda489a1a5..857eaa4af5c1 100644 --- a/x11/gnomesession/Makefile +++ b/x11/gnomesession/Makefile @@ -6,16 +6,16 @@ # PORTNAME= gnomesession -PORTVERSION= 2.4.2 -PORTREVISION= 1 +PORTVERSION= 2.6.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} \ + http://people.FreeBSD.org/~marcus/:local \ ${MASTER_SITE_LOCAL:S/$/:local/} -MASTER_SITE_SUBDIR= sources/gnome-session/2.4 \ +MASTER_SITE_SUBDIR= sources/gnome-session/2.6 \ marcus/:local DISTNAME= gnome-session-${PORTVERSION} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - splash.png:local + ${SPLASH_IMG}:local DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -23,7 +23,7 @@ COMMENT= Session component for the GNOME 2 desktop USE_BZIP2= yes USE_X_PREFIX= yes -USE_GNOME= gnomeprefix gnomehack intlhack gnomehier libgnomeui +USE_GNOME= gnomeprefix gnomehack gnomehier intlhack lthack libgnomeui USE_GMAKE= yes USE_LIBTOOL_VER=13 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ @@ -33,11 +33,13 @@ MAN1= gnome-session.1 gnome-smproxy.1 gnome-wm.1 session-properties.1 \ gnome-session-save.1 MAN5= default.session.5 +SPLASH_IMG= gnome-splash04-12.png + post-extract: - @${CP} ${DISTDIR}/${DIST_SUBDIR}/splash.png ${WRKDIR} + @${CP} ${DISTDIR}/${DIST_SUBDIR}/${SPLASH_IMG} ${WRKDIR} post-install: - ${INSTALL_DATA} ${WRKDIR}/splash.png \ + ${INSTALL_DATA} ${WRKDIR}/${SPLASH_IMG} \ ${PREFIX}/share/gnome/pixmaps/splash/gnome-splash.png .include <bsd.port.mk> diff --git a/x11/gnomesession/distinfo b/x11/gnomesession/distinfo index 0a06b2a8ed0e..56764710a045 100644 --- a/x11/gnomesession/distinfo +++ b/x11/gnomesession/distinfo @@ -1,4 +1,4 @@ -MD5 (gnome2/gnome-session-2.4.2.tar.bz2) = fc2e6d9c71b4d1fe08ec329d7e03684e -SIZE (gnome2/gnome-session-2.4.2.tar.bz2) = 911570 -MD5 (gnome2/splash.png) = bd73a8a1f0c97aac669045f6b9b1fe02 -SIZE (gnome2/splash.png) = 59161 +MD5 (gnome2/gnome-session-2.6.0.tar.bz2) = 42018f3e5f201a4f449de444c600ce29 +SIZE (gnome2/gnome-session-2.6.0.tar.bz2) = 836172 +MD5 (gnome2/gnome-splash04-12.png) = a26cafb0ccffd5e173d7255e683faafd +SIZE (gnome2/gnome-splash04-12.png) = 75841 diff --git a/x11/gnomesession/files/patch-configure b/x11/gnomesession/files/patch-configure deleted file mode 100644 index 61084626cb14..000000000000 --- a/x11/gnomesession/files/patch-configure +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.orig Wed May 8 14:27:04 2002 -+++ configure Wed May 8 14:27:23 2002 -@@ -7232,6 +7232,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' diff --git a/x11/gnomesession/files/patch-gnome-session_gnome-session.schemas.in.in b/x11/gnomesession/files/patch-gnome-session_gnome-session.schemas.in.in deleted file mode 100644 index 9bd6c9a2cf68..000000000000 --- a/x11/gnomesession/files/patch-gnome-session_gnome-session.schemas.in.in +++ /dev/null @@ -1,11 +0,0 @@ ---- gnome-session/gnome-session.schemas.in.in.orig Mon Oct 14 17:18:15 2002 -+++ gnome-session/gnome-session.schemas.in.in Mon Oct 14 17:17:44 2002 -@@ -50,7 +50,7 @@ - <applyto>/apps/gnome-session/options/splash_image</applyto> - <owner>gnome</owner> - <type>string</type> -- <default>@prefix@/share/pixmaps/splash/gnome-splash.png</default> -+ <default>@datadir@/pixmaps/splash/gnome-splash.png</default> - <locale name="C"> - <short>Splash Screen Image</short> - <long>Preferred Image to use for the splash screen when logging in to the GNOME Desktop</long> diff --git a/x11/gnomesession/pkg-descr b/x11/gnomesession/pkg-descr index e0a6dd0276ff..50986ef910b2 100644 --- a/x11/gnomesession/pkg-descr +++ b/x11/gnomesession/pkg-descr @@ -1,2 +1,2 @@ -Session component for the GNOME 2.0 desktop. This package contains the -commands needed to start GNOME 2.0. +This provides session management for the GNOME 2 desktop, and +provides the tools used to start the desktop. diff --git a/x11/gnomesession/pkg-plist b/x11/gnomesession/pkg-plist index d4fc0ded7788..355893a4e9d8 100644 --- a/x11/gnomesession/pkg-plist +++ b/x11/gnomesession/pkg-plist @@ -26,6 +26,7 @@ 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_CA/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 @@ -38,6 +39,7 @@ share/locale/ga/LC_MESSAGES/gnome-session-2.0.mo share/locale/gl/LC_MESSAGES/gnome-session-2.0.mo share/locale/he/LC_MESSAGES/gnome-session-2.0.mo share/locale/hi/LC_MESSAGES/gnome-session-2.0.mo +share/locale/hr/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 @@ -50,10 +52,12 @@ share/locale/lv/LC_MESSAGES/gnome-session-2.0.mo share/locale/mk/LC_MESSAGES/gnome-session-2.0.mo share/locale/ml/LC_MESSAGES/gnome-session-2.0.mo share/locale/mn/LC_MESSAGES/gnome-session-2.0.mo +share/locale/mr/LC_MESSAGES/gnome-session-2.0.mo share/locale/ms/LC_MESSAGES/gnome-session-2.0.mo share/locale/nl/LC_MESSAGES/gnome-session-2.0.mo share/locale/nn/LC_MESSAGES/gnome-session-2.0.mo share/locale/no/LC_MESSAGES/gnome-session-2.0.mo +share/locale/pa/LC_MESSAGES/gnome-session-2.0.mo share/locale/pl/LC_MESSAGES/gnome-session-2.0.mo share/locale/pt/LC_MESSAGES/gnome-session-2.0.mo share/locale/pt_BR/LC_MESSAGES/gnome-session-2.0.mo diff --git a/x11/gnometerminal/Makefile b/x11/gnometerminal/Makefile index d9e6311b68f2..377dc9186d6b 100644 --- a/x11/gnometerminal/Makefile +++ b/x11/gnometerminal/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnometerminal -PORTVERSION= 2.4.2 -PORTREVISION= 1 +PORTVERSION= 2.6.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-terminal/2.4 +MASTER_SITE_SUBDIR= sources/gnome-terminal/2.6 DISTNAME= gnome-terminal-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -19,8 +18,9 @@ COMMENT= Terminal component for the GNOME 2 Desktop USE_BZIP2= yes USE_X_PREFIX= yes +USE_REINPLACE= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack gnomehier libgnomeui vte +USE_GNOME= gnomeprefix gnomehack intlhack lthack gnomehier libgnomeui vte USE_LIBTOOL_VER=13 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11/gnometerminal/distinfo b/x11/gnometerminal/distinfo index 44e6dc6d5d8b..c497086810d0 100644 --- a/x11/gnometerminal/distinfo +++ b/x11/gnometerminal/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-terminal-2.4.2.tar.bz2) = ce7e5a207eb48c5ef23325c406536c33 -SIZE (gnome2/gnome-terminal-2.4.2.tar.bz2) = 1658743 +MD5 (gnome2/gnome-terminal-2.6.0.tar.bz2) = bbb9d4d6bddaec8611d4c002842ec5b8 +SIZE (gnome2/gnome-terminal-2.6.0.tar.bz2) = 1911916 diff --git a/x11/gnometerminal/files/patch-configure b/x11/gnometerminal/files/patch-configure deleted file mode 100644 index b393b3039c70..000000000000 --- a/x11/gnometerminal/files/patch-configure +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.orig Thu May 2 00:36:18 2002 -+++ configure Thu May 2 00:37:15 2002 -@@ -6414,6 +6414,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' diff --git a/x11/gnometerminal/pkg-descr b/x11/gnometerminal/pkg-descr index eca945789b32..1193c30f736a 100644 --- a/x11/gnometerminal/pkg-descr +++ b/x11/gnometerminal/pkg-descr @@ -1,3 +1,3 @@ -Terminal component for the GNOME 2.0 Desktop. +Default terminal emulator for the GNOME 2.0 Desktop. WWW: http://www.gnome.org/ diff --git a/x11/gnometerminal/pkg-plist b/x11/gnometerminal/pkg-plist index 43c24a4f2676..d3648bdea305 100644 --- a/x11/gnometerminal/pkg-plist +++ b/x11/gnometerminal/pkg-plist @@ -104,6 +104,7 @@ 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 +share/locale/en_CA/LC_MESSAGES/gnome-terminal.mo share/locale/en_GB/LC_MESSAGES/gnome-terminal.mo share/locale/es/LC_MESSAGES/gnome-terminal.mo share/locale/et/LC_MESSAGES/gnome-terminal.mo @@ -114,6 +115,7 @@ 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/hr/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 @@ -126,6 +128,7 @@ share/locale/ml/LC_MESSAGES/gnome-terminal.mo share/locale/mn/LC_MESSAGES/gnome-terminal.mo share/locale/ms/LC_MESSAGES/gnome-terminal.mo share/locale/nl/LC_MESSAGES/gnome-terminal.mo +share/locale/nn/LC_MESSAGES/gnome-terminal.mo share/locale/no/LC_MESSAGES/gnome-terminal.mo share/locale/pl/LC_MESSAGES/gnome-terminal.mo share/locale/pt/LC_MESSAGES/gnome-terminal.mo @@ -139,6 +142,7 @@ 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/th/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 diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile index db28208248d6..7db61fe4291d 100644 --- a/x11/libgnome/Makefile +++ b/x11/libgnome/Makefile @@ -6,11 +6,10 @@ # PORTNAME= libgnome -PORTVERSION= 2.4.0 -PORTREVISION= 4 +PORTVERSION= 2.6.0 CATEGORIES?= x11 gnome 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 @@ -23,7 +22,8 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_XPM= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack gnomehier esound gnomevfs2 libxslt +USE_GNOME= gnomeprefix gnomehack gnomehier intlhack esound gnomevfs2 \ + libxslt USE_BISON= yes INSTALLS_SHLIB= yes USE_LIBTOOL_VER=13 diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo index fdfafd2acacb..7c8c192bb53a 100644 --- a/x11/libgnome/distinfo +++ b/x11/libgnome/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libgnome-2.4.0.tar.bz2) = caec1e12d64b98a2925a4317ac16429f -SIZE (gnome2/libgnome-2.4.0.tar.bz2) = 964070 +MD5 (gnome2/libgnome-2.6.0.tar.bz2) = c3fd920119581ba1da531222ed69a5e0 +SIZE (gnome2/libgnome-2.6.0.tar.bz2) = 1070613 diff --git a/x11/libgnome/files/patch-libgnome::Makefile.in b/x11/libgnome/files/patch-libgnome::Makefile.in index 4a73422b2c2e..a3e14ed9e902 100644 --- a/x11/libgnome/files/patch-libgnome::Makefile.in +++ b/x11/libgnome/files/patch-libgnome::Makefile.in @@ -1,11 +1,12 @@ ---- libgnome/Makefile.in.orig Sat Jun 14 05:07:39 2003 -+++ libgnome/Makefile.in Sat Jun 14 05:10:06 2003 -@@ -156,7 +156,7 @@ - +--- libgnome/Makefile.in.orig Wed Feb 25 01:17:58 2004 ++++ libgnome/Makefile.in Wed Feb 25 01:20:59 2004 +@@ -159,6 +159,9 @@ libgnomeincludedir = $(includedir)/libgnome-2.0/libgnome --INCLUDES = -I.. -I$(srcdir)/.. $(WARN_CFLAGS) $(LIBGNOME_CFLAGS) -DG_DISABLE_DEPRECATED -DLIBGNOME_PREFIX=\""$(prefix)"\" -DLIBGNOME_LIBDIR=\""$(libdir)"\" -DLIBGNOME_DATADIR=\""$(datadir)"\" -DLIBGNOME_BINDIR=\""$(bindir)"\" -DLIBGNOME_LOCALSTATEDIR=\""$(localstatedir)"\" -DLIBGNOME_LOCALEDIR=\""$(gnomelocaledir)"\" -DLIBGNOME_SYSCONFDIR=\""$(sysconfdir)"\" -DVERSION=\""$(VERSION)"\" -DGNOMEVFSVERSION=\"$(GNOME_VFS_VERSION)\" -DG_LOG_DOMAIN=\"Gnome\" -+INCLUDES = -DPREFIX=\""$(PREFIX)"\" -DLOCALBASE=\""$(LOCALBASE)"\" -DX11BASE=\""$(X11BASE)"\" -I.. -I$(srcdir)/.. $(WARN_CFLAGS) $(LIBGNOME_CFLAGS) -DG_DISABLE_DEPRECATED -DLIBGNOME_PREFIX=\""$(prefix)"\" -DLIBGNOME_LIBDIR=\""$(libdir)"\" -DLIBGNOME_DATADIR=\""$(datadir)"\" -DLIBGNOME_BINDIR=\""$(bindir)"\" -DLIBGNOME_LOCALSTATEDIR=\""$(localstatedir)"\" -DLIBGNOME_LOCALEDIR=\""$(gnomelocaledir)"\" -DLIBGNOME_SYSCONFDIR=\""$(sysconfdir)"\" -DVERSION=\""$(VERSION)"\" -DGNOMEVFSVERSION=\"$(GNOME_VFS_VERSION)\" -DG_LOG_DOMAIN=\"Gnome\" - - - libgnome_2_la_SOURCES = libgnometypebuiltins.h libgnometypebuiltins.c gnome-config.c gnome-sound.c gnome-triggers.c gnome-triggersP.h gnome-program.c gnome-help.c gnome-exec.c gnome-gconf.c gnome-gconfP.h gnome-i18n.c gnome-i18nP.h gnome-url.c gnome-util.c gnome-score.c gnome-init.c + INCLUDES = \ ++ -DPREFIX=\""$(PREFIX)"\" \ ++ -DLOCALBASE=\""$(LOCALBASE)"\" \ ++ -DX11BASE=\""$(X11BASE)"\" \ + -I.. \ + -I$(srcdir)/.. \ + $(WARN_CFLAGS) \ diff --git a/x11/libgnome/pkg-descr b/x11/libgnome/pkg-descr index f7f15642367f..b78aaf2ccde6 100644 --- a/x11/libgnome/pkg-descr +++ b/x11/libgnome/pkg-descr @@ -1,3 +1,3 @@ -Libraries for GNOME, a GNU desktop environment +LibGnome provides the non-GUI backend for the GNOME environment. WWW: http://www.gnome.org/ diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist index 109fc1e85184..3f2d20d23f62 100644 --- a/x11/libgnome/pkg-plist +++ b/x11/libgnome/pkg-plist @@ -10,19 +10,13 @@ etc/gconf/gconf.xml.defaults/desktop/gnome/applications/window_manager/%gconf.xm etc/gconf/gconf.xml.defaults/desktop/gnome/background/%gconf.xml etc/gconf/gconf.xml.defaults/desktop/gnome/file_views/%gconf.xml etc/gconf/gconf.xml.defaults/desktop/gnome/interface/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/gnome/lockdown/%gconf.xml etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/%gconf.xml etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/keyboard/%gconf.xml etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/mouse/%gconf.xml etc/gconf/gconf.xml.defaults/desktop/gnome/sound/%gconf.xml etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/%gconf.xml etc/gconf/gconf.xml.defaults/desktop/gnome/typing_break/%gconf.xml -etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/%gconf.xml -etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/ghelp/%gconf.xml -etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/http/%gconf.xml -etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/https/%gconf.xml -etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/info/%gconf.xml -etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/man/%gconf.xml -etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/trash/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/accessibility/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/accessibility/keyboard/%gconf.xml @@ -35,19 +29,13 @@ etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/window_manager/% etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/background/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/file-views/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/interface/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/lockdown/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/keyboard/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/mouse/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/sound/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/typing_break/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/ghelp/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/http/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/https/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/info/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/man/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/trash/%gconf.xml etc/gconf/schemas/desktop_gnome_accessibility_keyboard.schemas etc/gconf/schemas/desktop_gnome_accessibility_startup.schemas etc/gconf/schemas/desktop_gnome_applications_browser.schemas @@ -57,12 +45,12 @@ etc/gconf/schemas/desktop_gnome_applications_window_manager.schemas etc/gconf/schemas/desktop_gnome_background.schemas etc/gconf/schemas/desktop_gnome_file_views.schemas etc/gconf/schemas/desktop_gnome_interface.schemas +etc/gconf/schemas/desktop_gnome_lockdown.schemas etc/gconf/schemas/desktop_gnome_peripherals_keyboard.schemas etc/gconf/schemas/desktop_gnome_peripherals_mouse.schemas etc/gconf/schemas/desktop_gnome_sound.schemas etc/gconf/schemas/desktop_gnome_thumbnailers.schemas etc/gconf/schemas/desktop_gnome_typing_break.schemas -etc/gconf/schemas/desktop_gnome_url_handlers.schemas etc/sound/events/gnome-2.soundlist etc/sound/events/gtk-events-2.soundlist include/libgnome-2.0/libgnome/gnome-config.h @@ -83,7 +71,7 @@ include/libgnome-2.0/libgnome/libgnometypebuiltins.h lib/bonobo/monikers/libmoniker_extra_2.so lib/libgnome-2.a lib/libgnome-2.so -lib/libgnome-2.so.400 +lib/libgnome-2.so.600 libdata/bonobo/servers/GNOME_Moniker_std.server libdata/pkgconfig/libgnome-2.0.pc share/doc/libgnome/ch01s02.html @@ -94,6 +82,7 @@ share/doc/libgnome/home.png share/doc/libgnome/index.html share/doc/libgnome/index.sgml share/doc/libgnome/left.png +share/doc/libgnome/libgnome.html share/doc/libgnome/libgnome-gnome-config.html share/doc/libgnome/libgnome-gnome-exec.html share/doc/libgnome/libgnome-gnome-gconf.html @@ -108,7 +97,6 @@ share/doc/libgnome/libgnome-gnome-url.html share/doc/libgnome/libgnome-gnome-util.html share/doc/libgnome/libgnome-libgnometypebuiltins.html share/doc/libgnome/libgnome.devhelp -share/doc/libgnome/libgnome.html share/doc/libgnome/right.png share/doc/libgnome/up.png share/locale/am/LC_MESSAGES/libgnome-2.0.mo @@ -124,6 +112,7 @@ share/locale/cy/LC_MESSAGES/libgnome-2.0.mo share/locale/da/LC_MESSAGES/libgnome-2.0.mo share/locale/de/LC_MESSAGES/libgnome-2.0.mo share/locale/el/LC_MESSAGES/libgnome-2.0.mo +share/locale/en_CA/LC_MESSAGES/libgnome-2.0.mo share/locale/en_GB/LC_MESSAGES/libgnome-2.0.mo share/locale/es/LC_MESSAGES/libgnome-2.0.mo share/locale/et/LC_MESSAGES/libgnome-2.0.mo @@ -135,6 +124,7 @@ share/locale/ga/LC_MESSAGES/libgnome-2.0.mo share/locale/gl/LC_MESSAGES/libgnome-2.0.mo share/locale/he/LC_MESSAGES/libgnome-2.0.mo share/locale/hi/LC_MESSAGES/libgnome-2.0.mo +share/locale/hr/LC_MESSAGES/libgnome-2.0.mo share/locale/hu/LC_MESSAGES/libgnome-2.0.mo share/locale/id/LC_MESSAGES/libgnome-2.0.mo share/locale/is/LC_MESSAGES/libgnome-2.0.mo @@ -159,6 +149,7 @@ share/locale/sk/LC_MESSAGES/libgnome-2.0.mo share/locale/sl/LC_MESSAGES/libgnome-2.0.mo share/locale/sq/LC_MESSAGES/libgnome-2.0.mo share/locale/sr/LC_MESSAGES/libgnome-2.0.mo +share/locale/sr@ije/LC_MESSAGES/libgnome-2.0.mo share/locale/sr@Latn/LC_MESSAGES/libgnome-2.0.mo share/locale/sv/LC_MESSAGES/libgnome-2.0.mo share/locale/ta/LC_MESSAGES/libgnome-2.0.mo @@ -173,19 +164,13 @@ share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo @dirrm share/doc/libgnome @dirrm include/libgnome-2.0/libgnome @dirrm include/libgnome-2.0 -@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/trash -@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/man -@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/info -@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/https -@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/http -@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/ghelp -@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/typing_break @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/sound @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/mouse @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/keyboard @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals +@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/lockdown @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/interface @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/file-views @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/background @@ -193,23 +178,16 @@ share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/terminal @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/help_viewer @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/browser -@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/accessibility/startup @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/accessibility/keyboard @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/accessibility -@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/trash -@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/man -@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/info -@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/https -@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/http -@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/ghelp -@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/typing_break @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/sound @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/mouse @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/keyboard @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals +@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/lockdown @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/interface @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/file_views @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/background @@ -217,7 +195,10 @@ share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications/terminal @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications/help_viewer @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications/browser -@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/accessibility/startup @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/accessibility/keyboard @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/accessibility +etc/gconf/gconf.xml.defaults/schemas/desktop/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/gnome/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/%gconf.xml diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile index 2f0e35f6b2f9..1ce158f366fe 100644 --- a/x11/libxklavier/Makefile +++ b/x11/libxklavier/Makefile @@ -6,8 +6,7 @@ # PORTNAME= libxklavier -PORTVERSION= 0.96 -PORTREVISION= 1 +PORTVERSION= 1.00 PORTEPOCH= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} diff --git a/x11/libxklavier/distinfo b/x11/libxklavier/distinfo index 9ee97d4cfbac..342f10e681e1 100644 --- a/x11/libxklavier/distinfo +++ b/x11/libxklavier/distinfo @@ -1,2 +1,2 @@ -MD5 (libxklavier-0.96.tar.gz) = e95baf323e145403a1cd4f9405da60da -SIZE (libxklavier-0.96.tar.gz) = 395211 +MD5 (libxklavier-1.00.tar.gz) = 38b5d5589aeeda0a1d8f2e43ff798a6a +SIZE (libxklavier-1.00.tar.gz) = 408974 diff --git a/x11/libxklavier/pkg-descr b/x11/libxklavier/pkg-descr index 89144da3c35c..d5000e3ad156 100644 --- a/x11/libxklavier/pkg-descr +++ b/x11/libxklavier/pkg-descr @@ -1,3 +1,4 @@ -Libxklavier is an utility to make XKB stuff easier. +Libxklavier is a utility to simplify setting and changing +keyboard layouts. WWW: http://gswitchit.sourceforge.net/ diff --git a/x11/libxklavier/pkg-plist b/x11/libxklavier/pkg-plist index f80dbc6dea38..d58809c9513d 100644 --- a/x11/libxklavier/pkg-plist +++ b/x11/libxklavier/pkg-plist @@ -2,43 +2,8 @@ include/libxklavier/xklavier.h include/libxklavier/xklavier_config.h lib/libxklavier.a lib/libxklavier.so -lib/libxklavier.so.7 +lib/libxklavier.so.8 libdata/pkgconfig/libxklavier.pc -share/doc/libxklavier-%%VERSION%%/html/annotated.html -share/doc/libxklavier-%%VERSION%%/html/doxygen.css -share/doc/libxklavier-%%VERSION%%/html/doxygen.png -share/doc/libxklavier-%%VERSION%%/html/files.html -share/doc/libxklavier-%%VERSION%%/html/functions.html -share/doc/libxklavier-%%VERSION%%/html/globals.html -share/doc/libxklavier-%%VERSION%%/html/group__activation.html -share/doc/libxklavier-%%VERSION%%/html/group__callbacks.html -share/doc/libxklavier-%%VERSION%%/html/group__currents.html -share/doc/libxklavier-%%VERSION%%/html/group__debugerr.html -share/doc/libxklavier-%%VERSION%%/html/group__enum.html -share/doc/libxklavier-%%VERSION%%/html/group__lookup.html -share/doc/libxklavier-%%VERSION%%/html/group__props.html -share/doc/libxklavier-%%VERSION%%/html/group__settings.html -share/doc/libxklavier-%%VERSION%%/html/group__wininfo.html -share/doc/libxklavier-%%VERSION%%/html/group__xkbevents.html -share/doc/libxklavier-%%VERSION%%/html/group__xkbgroup.html -share/doc/libxklavier-%%VERSION%%/html/group__xkbinfo.html -share/doc/libxklavier-%%VERSION%%/html/group__xklconfig.html -share/doc/libxklavier-%%VERSION%%/html/group__xklconfiginitterm.html -share/doc/libxklavier-%%VERSION%%/html/group__xklinitterm.html -share/doc/libxklavier-%%VERSION%%/html/index.html -share/doc/libxklavier-%%VERSION%%/html/modules.html -share/doc/libxklavier-%%VERSION%%/html/structXklState-members.html -share/doc/libxklavier-%%VERSION%%/html/structXklState.html -share/doc/libxklavier-%%VERSION%%/html/struct__XklConfigItem-members.html -share/doc/libxklavier-%%VERSION%%/html/struct__XklConfigItem.html -share/doc/libxklavier-%%VERSION%%/html/struct__XklConfigRec-members.html -share/doc/libxklavier-%%VERSION%%/html/struct__XklConfigRec.html -share/doc/libxklavier-%%VERSION%%/html/xklavier_8h-source.html -share/doc/libxklavier-%%VERSION%%/html/xklavier_8h.html -share/doc/libxklavier-%%VERSION%%/html/xklavier__config_8h-source.html -share/doc/libxklavier-%%VERSION%%/html/xklavier__config_8h.html share/libxklavier/xfree86.xml @dirrm share/libxklavier -@dirrm share/doc/libxklavier-%%VERSION%%/html -@dirrm share/doc/libxklavier-%%VERSION%% @dirrm include/libxklavier diff --git a/x11/startup-notification/Makefile b/x11/startup-notification/Makefile index 247dbd8a1c07..35166f2afb4e 100644 --- a/x11/startup-notification/Makefile +++ b/x11/startup-notification/Makefile @@ -6,11 +6,10 @@ # PORTNAME= startup-notification -PORTVERSION= 0.5 -PORTREVISION= 2 +PORTVERSION= 0.6 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.5 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.6 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -19,11 +18,10 @@ COMMENT= Library that supports startup notification spec from freedesktop.org USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack gnomehier pkgconfig +USE_GNOME= gnomeprefix gnomehack gnomehier lthack gnometarget pkgconfig USE_LIBTOOL_VER=13 INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" -CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} + LDFLAGS="-L${LOCALBASE}/lib" .include <bsd.port.mk> diff --git a/x11/startup-notification/distinfo b/x11/startup-notification/distinfo index 134f0107e7f6..6521f3f222e3 100644 --- a/x11/startup-notification/distinfo +++ b/x11/startup-notification/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/startup-notification-0.5.tar.bz2) = 193cde48ed7ceaf346bd65590acc101c -SIZE (gnome2/startup-notification-0.5.tar.bz2) = 156294 +MD5 (gnome2/startup-notification-0.6.tar.bz2) = d53172f761ea974e5d5f73f9b785294c +SIZE (gnome2/startup-notification-0.6.tar.bz2) = 206341 diff --git a/x11/startup-notification/files/patch-configure b/x11/startup-notification/files/patch-configure deleted file mode 100644 index 18ddad392e1e..000000000000 --- a/x11/startup-notification/files/patch-configure +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.orig Thu Nov 14 13:11:13 2002 -+++ configure Thu Nov 14 13:11:36 2002 -@@ -7203,6 +7203,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' diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile index 297cb3c6887c..458e5b649072 100644 --- a/x11/yelp/Makefile +++ b/x11/yelp/Makefile @@ -6,11 +6,10 @@ # PORTNAME= yelp -PORTVERSION= 2.4.2 -PORTREVISION= 2 +PORTVERSION= 2.6.0 CATEGORIES= x11 gnome 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 @@ -20,14 +19,10 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes USE_REINPLACE= yes -USE_GNOME= gnomeprefix gnomehack libgnomeui libgtkhtml +USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui libgtkhtml lthack USE_LIBTOOL_VER=13 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" MAKE_ENV= G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias" -post-patch: - @${REINPLACE_CMD} -e 's|\@prefix\@/share|\@datadir\@|g' \ - ${WRKSRC}/stylesheets/docbook/catalog.in - .include <bsd.port.mk> diff --git a/x11/yelp/distinfo b/x11/yelp/distinfo index 0f194b313fb0..bf1c70bc7d94 100644 --- a/x11/yelp/distinfo +++ b/x11/yelp/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/yelp-2.4.2.tar.bz2) = ee89f4d0886f7c3be1b9f6894a57ec1b -SIZE (gnome2/yelp-2.4.2.tar.bz2) = 598274 +MD5 (gnome2/yelp-2.6.0.tar.bz2) = 50c7684b0239f3841e022603a15e4bfa +SIZE (gnome2/yelp-2.6.0.tar.bz2) = 512061 diff --git a/x11/yelp/files/patch-configure b/x11/yelp/files/patch-configure index 20702046e4a8..7e0c0705f738 100644 --- a/x11/yelp/files/patch-configure +++ b/x11/yelp/files/patch-configure @@ -1,25 +1,11 @@ ---- 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" -+$ac_aux_dir/ltconfig $LIBTOOL_DEPS - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -20408,12 +20409,12 @@ +--- configure.orig Mon Mar 22 19:14:23 2004 ++++ configure Mon Mar 22 19:14:23 2004 +@@ -9879,7 +9879,7 @@ 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 '`" - - - - case $host in -- *-linux-gnu | *-irix6*) -+ *-linux-gnu | *-irix6* | *-freebsd*) - cat >>confdefs.h <<\_ACEOF - #define HAVE_MAN_WHEREIS 1 - _ACEOF +-idl_dirs="`$PKG_CONFIG --variable=idldir gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0 bonobo-activation-2.0`" ++idl_dirs="`$PKG_CONFIG --variable=idldir libgtkhtml-2.0 gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0 bonobo-activation-2.0`" + for ac_prog in gsed sed + do + # Extract the first word of "$ac_prog", so it can be a program name with args. diff --git a/x11/yelp/files/patch-src_man2html_yelp-man2html.c b/x11/yelp/files/patch-src_man2html_yelp-man2html.c deleted file mode 100644 index e30c81ba0d7e..000000000000 --- a/x11/yelp/files/patch-src_man2html_yelp-man2html.c +++ /dev/null @@ -1,55 +0,0 @@ ---- 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/files/patch-stylesheets_yelp-custom.xml b/x11/yelp/files/patch-stylesheets_yelp-custom.xml deleted file mode 100644 index e753d3632e2f..000000000000 --- a/x11/yelp/files/patch-stylesheets_yelp-custom.xml +++ /dev/null @@ -1,9 +0,0 @@ ---- stylesheets/yelp-custom.xsl.orig Mon Jan 5 22:58:54 2004 -+++ stylesheets/yelp-custom.xsl Mon Jan 5 22:59:07 2004 -@@ -1,5 +1,6 @@ - <?xml version='1.0'?> - <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" -+ xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" - version='1.0' - xmlns="http://www.w3.org/TR/xhtml1/transitional" - exclude-result-prefixes="#default"> diff --git a/x11/yelp/pkg-descr b/x11/yelp/pkg-descr index 5267ad53bb4e..d38af5629561 100644 --- a/x11/yelp/pkg-descr +++ b/x11/yelp/pkg-descr @@ -1,4 +1,4 @@ -Yelp is a help browser for GNOME 2.0. The name Yelp was suggested by Daniel -Lundin. Yelp is pronounced the same as the swedish word for 'help'. +Yelp is a help browser for GNOME 2.0 that displays GNOME +help documents, info pages, manpages, and more. WWW: http://www.gnome.org/ diff --git a/x11/yelp/pkg-plist b/x11/yelp/pkg-plist index 5f47bf1e90d8..e17bc9e4f42e 100644 --- a/x11/yelp/pkg-plist +++ b/x11/yelp/pkg-plist @@ -1,147 +1,47 @@ 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 -share/gnome/images/yelp/gnome2-button.png -share/gnome/sgml/docbook/yelp/docbook/VERSION -share/gnome/sgml/docbook/yelp/docbook/common/af.xml -share/gnome/sgml/docbook/yelp/docbook/common/ca.xml -share/gnome/sgml/docbook/yelp/docbook/common/common.xsl -share/gnome/sgml/docbook/yelp/docbook/common/cs.xml -share/gnome/sgml/docbook/yelp/docbook/common/da.xml -share/gnome/sgml/docbook/yelp/docbook/common/de.xml -share/gnome/sgml/docbook/yelp/docbook/common/el.xml -share/gnome/sgml/docbook/yelp/docbook/common/en.xml -share/gnome/sgml/docbook/yelp/docbook/common/es.xml -share/gnome/sgml/docbook/yelp/docbook/common/et.xml -share/gnome/sgml/docbook/yelp/docbook/common/eu.xml -share/gnome/sgml/docbook/yelp/docbook/common/fi.xml -share/gnome/sgml/docbook/yelp/docbook/common/fr.xml -share/gnome/sgml/docbook/yelp/docbook/common/gentext.xsl -share/gnome/sgml/docbook/yelp/docbook/common/hu.xml -share/gnome/sgml/docbook/yelp/docbook/common/id.xml -share/gnome/sgml/docbook/yelp/docbook/common/it.xml -share/gnome/sgml/docbook/yelp/docbook/common/ja.xml -share/gnome/sgml/docbook/yelp/docbook/common/ko.xml -share/gnome/sgml/docbook/yelp/docbook/common/l10n.dtd -share/gnome/sgml/docbook/yelp/docbook/common/l10n.xml -share/gnome/sgml/docbook/yelp/docbook/common/l10n.xsl -share/gnome/sgml/docbook/yelp/docbook/common/labels.xsl -share/gnome/sgml/docbook/yelp/docbook/common/nl.xml -share/gnome/sgml/docbook/yelp/docbook/common/nn.xml -share/gnome/sgml/docbook/yelp/docbook/common/no.xml -share/gnome/sgml/docbook/yelp/docbook/common/pl.xml -share/gnome/sgml/docbook/yelp/docbook/common/pt.xml -share/gnome/sgml/docbook/yelp/docbook/common/pt_br.xml -share/gnome/sgml/docbook/yelp/docbook/common/ro.xml -share/gnome/sgml/docbook/yelp/docbook/common/ru.xml -share/gnome/sgml/docbook/yelp/docbook/common/sk.xml -share/gnome/sgml/docbook/yelp/docbook/common/sl.xml -share/gnome/sgml/docbook/yelp/docbook/common/sr.xml -share/gnome/sgml/docbook/yelp/docbook/common/subtitles.xsl -share/gnome/sgml/docbook/yelp/docbook/common/sv.xml -share/gnome/sgml/docbook/yelp/docbook/common/table.xsl -share/gnome/sgml/docbook/yelp/docbook/common/th.xml -share/gnome/sgml/docbook/yelp/docbook/common/titles.xsl -share/gnome/sgml/docbook/yelp/docbook/common/tr.xml -share/gnome/sgml/docbook/yelp/docbook/common/uk.xml -share/gnome/sgml/docbook/yelp/docbook/common/xh.xml -share/gnome/sgml/docbook/yelp/docbook/common/zh_cn.xml -share/gnome/sgml/docbook/yelp/docbook/common/zh_tw.xml -share/gnome/sgml/docbook/yelp/docbook/dtd/calstblx.dtd -share/gnome/sgml/docbook/yelp/docbook/dtd/catalog -share/gnome/sgml/docbook/yelp/docbook/dtd/dbcentx.mod -share/gnome/sgml/docbook/yelp/docbook/dtd/dbgenent.mod -share/gnome/sgml/docbook/yelp/docbook/dtd/dbhierx.mod -share/gnome/sgml/docbook/yelp/docbook/dtd/dbnotnx.mod -share/gnome/sgml/docbook/yelp/docbook/dtd/dbpoolx.mod -share/gnome/sgml/docbook/yelp/docbook/dtd/docbookx.dtd -share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-amsa.ent -share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-amsb.ent -share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-amsc.ent -share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-amsn.ent -share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-amso.ent -share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-amsr.ent -share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-box.ent -share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-cyr1.ent -share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-cyr2.ent -share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-dia.ent -share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-grk1.ent -share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-grk2.ent -share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-grk3.ent -share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-grk4.ent -share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-lat1.ent -share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-lat2.ent -share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-num.ent -share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-pub.ent -share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-tech.ent -share/gnome/sgml/docbook/yelp/docbook/dtd/soextblx.dtd -share/gnome/sgml/docbook/yelp/docbook/html/admon.xsl -share/gnome/sgml/docbook/yelp/docbook/html/autoidx.xsl -share/gnome/sgml/docbook/yelp/docbook/html/autotoc.xsl -share/gnome/sgml/docbook/yelp/docbook/html/biblio.xsl -share/gnome/sgml/docbook/yelp/docbook/html/block.xsl -share/gnome/sgml/docbook/yelp/docbook/html/calc-chunks.xsl -share/gnome/sgml/docbook/yelp/docbook/html/callout.xsl -share/gnome/sgml/docbook/yelp/docbook/html/changebars.xsl -share/gnome/sgml/docbook/yelp/docbook/html/chunk-experimental.xsl -share/gnome/sgml/docbook/yelp/docbook/html/chunk.xsl -share/gnome/sgml/docbook/yelp/docbook/html/chunker.xsl -share/gnome/sgml/docbook/yelp/docbook/html/component.xsl -share/gnome/sgml/docbook/yelp/docbook/html/division.xsl -share/gnome/sgml/docbook/yelp/docbook/html/docbook.xsl -share/gnome/sgml/docbook/yelp/docbook/html/ebnf.xsl -share/gnome/sgml/docbook/yelp/docbook/html/expchunk.xsl -share/gnome/sgml/docbook/yelp/docbook/html/footnote.xsl -share/gnome/sgml/docbook/yelp/docbook/html/formal.xsl -share/gnome/sgml/docbook/yelp/docbook/html/glossary.xsl -share/gnome/sgml/docbook/yelp/docbook/html/graphics.xsl -share/gnome/sgml/docbook/yelp/docbook/html/html.xsl -share/gnome/sgml/docbook/yelp/docbook/html/index.xsl -share/gnome/sgml/docbook/yelp/docbook/html/info.xsl -share/gnome/sgml/docbook/yelp/docbook/html/inline.xsl -share/gnome/sgml/docbook/yelp/docbook/html/keywords.xsl -share/gnome/sgml/docbook/yelp/docbook/html/lists.xsl -share/gnome/sgml/docbook/yelp/docbook/html/math.xsl -share/gnome/sgml/docbook/yelp/docbook/html/oldchunker.xsl -share/gnome/sgml/docbook/yelp/docbook/html/onechunk.xsl -share/gnome/sgml/docbook/yelp/docbook/html/param.xml -share/gnome/sgml/docbook/yelp/docbook/html/param.xsl -share/gnome/sgml/docbook/yelp/docbook/html/pi.xsl -share/gnome/sgml/docbook/yelp/docbook/html/qandaset.xsl -share/gnome/sgml/docbook/yelp/docbook/html/refentry.xsl -share/gnome/sgml/docbook/yelp/docbook/html/sections.xsl -share/gnome/sgml/docbook/yelp/docbook/html/synop.xsl -share/gnome/sgml/docbook/yelp/docbook/html/table.xsl -share/gnome/sgml/docbook/yelp/docbook/html/titlepage.templates.xml -share/gnome/sgml/docbook/yelp/docbook/html/titlepage.templates.xsl -share/gnome/sgml/docbook/yelp/docbook/html/titlepage.xsl -share/gnome/sgml/docbook/yelp/docbook/html/toc.xsl -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/db2html-admon.xsl +share/gnome/sgml/docbook/yelp/db2html-biblio.xsl +share/gnome/sgml/docbook/yelp/db2html-block.xsl +share/gnome/sgml/docbook/yelp/db2html-callout.xsl +share/gnome/sgml/docbook/yelp/db2html-chunk.xsl +share/gnome/sgml/docbook/yelp/db2html-common.xsl +share/gnome/sgml/docbook/yelp/db2html-division.xsl +share/gnome/sgml/docbook/yelp/db2html-ebnf.xsl +share/gnome/sgml/docbook/yelp/db2html-footnote.xsl +share/gnome/sgml/docbook/yelp/db2html-glossary.xsl +share/gnome/sgml/docbook/yelp/db2html-header.xsl +share/gnome/sgml/docbook/yelp/db2html-html.xsl +share/gnome/sgml/docbook/yelp/db2html-index.xsl +share/gnome/sgml/docbook/yelp/db2html-inline.xsl +share/gnome/sgml/docbook/yelp/db2html-list.xsl +share/gnome/sgml/docbook/yelp/db2html-math.xsl +share/gnome/sgml/docbook/yelp/db2html-media.xsl +share/gnome/sgml/docbook/yelp/db2html-navbar.xsl +share/gnome/sgml/docbook/yelp/db2html-param.xsl +share/gnome/sgml/docbook/yelp/db2html-qanda.xsl +share/gnome/sgml/docbook/yelp/db2html-refentry.xsl +share/gnome/sgml/docbook/yelp/db2html-suppressed.xsl +share/gnome/sgml/docbook/yelp/db2html-synopsis.xsl +share/gnome/sgml/docbook/yelp/db2html-table.xsl +share/gnome/sgml/docbook/yelp/db2html-title.xsl +share/gnome/sgml/docbook/yelp/db2html-titlepage.xsl +share/gnome/sgml/docbook/yelp/db2html-toc.xsl +share/gnome/sgml/docbook/yelp/db2html-xref.xsl +share/gnome/sgml/docbook/yelp/db2html.xsl +share/gnome/sgml/docbook/yelp/gettext.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/sgml/docbook/yelp/man2html.xsl +share/gnome/yelp/default.css +share/gnome/yelp/icons/caution.png +share/gnome/yelp/icons/important.png +share/gnome/yelp/icons/note.png +share/gnome/yelp/icons/tip.png +share/gnome/yelp/icons/warning.png share/gnome/yelp/important_docs.xml +share/gnome/yelp/toc.xml share/gnome/yelp/ui/yelp.glade share/locale/am/LC_MESSAGES/yelp.mo share/locale/ar/LC_MESSAGES/yelp.mo @@ -155,6 +55,8 @@ 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 +share/locale/en_CA/LC_MESSAGES/yelp.mo +share/locale/en_GB/LC_MESSAGES/yelp.mo share/locale/eo/LC_MESSAGES/yelp.mo share/locale/es/LC_MESSAGES/yelp.mo share/locale/et/LC_MESSAGES/yelp.mo @@ -165,6 +67,7 @@ share/locale/ga/LC_MESSAGES/yelp.mo share/locale/gl/LC_MESSAGES/yelp.mo share/locale/he/LC_MESSAGES/yelp.mo share/locale/hi/LC_MESSAGES/yelp.mo +share/locale/hr/LC_MESSAGES/yelp.mo share/locale/hu/LC_MESSAGES/yelp.mo share/locale/id/LC_MESSAGES/yelp.mo share/locale/is/LC_MESSAGES/yelp.mo @@ -184,6 +87,7 @@ 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 +share/locale/pa/LC_MESSAGES/yelp.mo share/locale/pl/LC_MESSAGES/yelp.mo share/locale/pt/LC_MESSAGES/yelp.mo share/locale/pt_BR/LC_MESSAGES/yelp.mo @@ -204,13 +108,8 @@ share/locale/wa/LC_MESSAGES/yelp.mo share/locale/zh_CN/LC_MESSAGES/yelp.mo share/locale/zh_TW/LC_MESSAGES/yelp.mo @dirrm share/gnome/yelp/ui +@dirrm share/gnome/yelp/icons @dirrm share/gnome/yelp -@dirrm share/gnome/sgml/docbook/yelp/docbook/lib -@dirrm share/gnome/sgml/docbook/yelp/docbook/images -@dirrm share/gnome/sgml/docbook/yelp/docbook/html -@dirrm share/gnome/sgml/docbook/yelp/docbook/dtd/ent -@dirrm share/gnome/sgml/docbook/yelp/docbook/dtd -@dirrm share/gnome/sgml/docbook/yelp/docbook/common -@dirrm share/gnome/sgml/docbook/yelp/docbook @dirrm share/gnome/sgml/docbook/yelp -@dirrm share/gnome/images/yelp +@dirrm share/gnome/sgml/docbook +@dirrm share/gnome/sgml diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile index 8e3f85bd910d..101c9a7fc002 100644 --- a/x11/zenity/Makefile +++ b/x11/zenity/Makefile @@ -6,12 +6,11 @@ # PORTNAME= zenity -PORTVERSION= 1.8 -PORTREVISION= 1 +PORTVERSION= 2.6.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION} -DIST_SUBDIR= gnome2 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.6 +DIST_SUBDIR= gnome2 MAINTAINER= klammer@webonaut.com COMMENT= Display GNOME dialogs from the command line @@ -33,8 +32,6 @@ MAN1= zenity.1 CONFLICTS= gtkada-1.2.* -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" - pre-configure: @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \ 's|@DATADIRNAME@|share|' diff --git a/x11/zenity/distinfo b/x11/zenity/distinfo index 23099319f87d..e799a4fb343f 100644 --- a/x11/zenity/distinfo +++ b/x11/zenity/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/zenity-1.8.tar.bz2) = 28dc31137f8eb983a26b198b3d93e2d4 -SIZE (gnome2/zenity-1.8.tar.bz2) = 440948 +MD5 (gnome2/zenity-2.6.0.tar.bz2) = 4799af349c692f6a421d751711a81331 +SIZE (gnome2/zenity-2.6.0.tar.bz2) = 611617 diff --git a/x11/zenity/pkg-descr b/x11/zenity/pkg-descr index 34a2188c0603..384c19680d45 100644 --- a/x11/zenity/pkg-descr +++ b/x11/zenity/pkg-descr @@ -1,4 +1,3 @@ -This is zenity - a rewrite of gdialog, the GNOME port of dialog -which allows you to display dialog boxes from the commandline -and shell scripts. If you understand, things are just as they -are. If you don't understand, things are just as they are. +Zenity allows dialog boxes to be created and displayed from the +commandline. This provides a simple way to create a GUI for +a shell script. diff --git a/x11/zenity/pkg-plist b/x11/zenity/pkg-plist index b6d62fb390ac..7f585be8ab44 100644 --- a/x11/zenity/pkg-plist +++ b/x11/zenity/pkg-plist @@ -1,7 +1,5 @@ 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 share/gnome/help/zenity/C/figures/zenity-calendar-screenshot.png share/gnome/help/zenity/C/figures/zenity-entry-screenshot.png share/gnome/help/zenity/C/figures/zenity-error-screenshot.png @@ -14,6 +12,22 @@ share/gnome/help/zenity/C/figures/zenity-text-screenshot.png share/gnome/help/zenity/C/figures/zenity-warning-screenshot.png share/gnome/help/zenity/C/legal.xml share/gnome/help/zenity/C/zenity.xml +share/gnome/help/zenity/sr/figures/zenity-calendar-screenshot.png +share/gnome/help/zenity/sr/figures/zenity-entry-screenshot.png +share/gnome/help/zenity/sr/figures/zenity-error-screenshot.png +share/gnome/help/zenity/sr/figures/zenity-fileselection-screenshot.png +share/gnome/help/zenity/sr/figures/zenity-information-screenshot.png +share/gnome/help/zenity/sr/figures/zenity-list-screenshot.png +share/gnome/help/zenity/sr/figures/zenity-progress-screenshot.png +share/gnome/help/zenity/sr/figures/zenity-question-screenshot.png +share/gnome/help/zenity/sr/figures/zenity-text-screenshot.png +share/gnome/help/zenity/sr/figures/zenity-warning-screenshot.png +share/gnome/help/zenity/sr/legal.xml +share/gnome/help/zenity/sr/zenity.xml +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 +share/gnome/omf/zenity/zenity-sr.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/zenity/zenity-sr.omf 2>/dev/null || /usr/bin/true share/gnome/zenity/clothes/gnome-tshirt.png share/gnome/zenity/clothes/hawaii-shirt.png share/gnome/zenity/clothes/monk.png @@ -27,10 +41,65 @@ share/gnome/zenity/zenity-progress.png share/gnome/zenity/zenity-text.png share/gnome/zenity/zenity.glade share/gnome/zenity/zenity.png +share/locale/am/LC_MESSAGES/zenity-0.1.mo +share/locale/ar/LC_MESSAGES/zenity-0.1.mo +share/locale/az/LC_MESSAGES/zenity-0.1.mo +share/locale/be/LC_MESSAGES/zenity-0.1.mo +share/locale/bn/LC_MESSAGES/zenity-0.1.mo +share/locale/ca/LC_MESSAGES/zenity-0.1.mo +share/locale/cs/LC_MESSAGES/zenity-0.1.mo +share/locale/cy/LC_MESSAGES/zenity-0.1.mo +share/locale/da/LC_MESSAGES/zenity-0.1.mo +share/locale/de/LC_MESSAGES/zenity-0.1.mo +share/locale/el/LC_MESSAGES/zenity-0.1.mo +share/locale/en_GB/LC_MESSAGES/zenity-0.1.mo +share/locale/es/LC_MESSAGES/zenity-0.1.mo +share/locale/et/LC_MESSAGES/zenity-0.1.mo +share/locale/eu/LC_MESSAGES/zenity-0.1.mo +share/locale/fa/LC_MESSAGES/zenity-0.1.mo +share/locale/fi/LC_MESSAGES/zenity-0.1.mo +share/locale/fr/LC_MESSAGES/zenity-0.1.mo +share/locale/ga/LC_MESSAGES/zenity-0.1.mo +share/locale/hi/LC_MESSAGES/zenity-0.1.mo +share/locale/hr/LC_MESSAGES/zenity-0.1.mo +share/locale/hu/LC_MESSAGES/zenity-0.1.mo +share/locale/is/LC_MESSAGES/zenity-0.1.mo +share/locale/it/LC_MESSAGES/zenity-0.1.mo +share/locale/ja/LC_MESSAGES/zenity-0.1.mo +share/locale/ko/LC_MESSAGES/zenity-0.1.mo +share/locale/lt/LC_MESSAGES/zenity-0.1.mo +share/locale/ml/LC_MESSAGES/zenity-0.1.mo +share/locale/mn/LC_MESSAGES/zenity-0.1.mo +share/locale/ms/LC_MESSAGES/zenity-0.1.mo +share/locale/ne/LC_MESSAGES/zenity-0.1.mo +share/locale/nl/LC_MESSAGES/zenity-0.1.mo +share/locale/nn/LC_MESSAGES/zenity-0.1.mo +share/locale/no/LC_MESSAGES/zenity-0.1.mo +share/locale/pa/LC_MESSAGES/zenity-0.1.mo +share/locale/pl/LC_MESSAGES/zenity-0.1.mo +share/locale/pt/LC_MESSAGES/zenity-0.1.mo +share/locale/pt_BR/LC_MESSAGES/zenity-0.1.mo +share/locale/ro/LC_MESSAGES/zenity-0.1.mo +share/locale/ru/LC_MESSAGES/zenity-0.1.mo +share/locale/sk/LC_MESSAGES/zenity-0.1.mo +share/locale/sl/LC_MESSAGES/zenity-0.1.mo +share/locale/sq/LC_MESSAGES/zenity-0.1.mo +share/locale/sr/LC_MESSAGES/zenity-0.1.mo +share/locale/sr@Latn/LC_MESSAGES/zenity-0.1.mo +share/locale/sv/LC_MESSAGES/zenity-0.1.mo +share/locale/ta/LC_MESSAGES/zenity-0.1.mo +share/locale/th/LC_MESSAGES/zenity-0.1.mo +share/locale/uk/LC_MESSAGES/zenity-0.1.mo +share/locale/vi/LC_MESSAGES/zenity-0.1.mo +share/locale/zh_CN/LC_MESSAGES/zenity-0.1.mo +share/locale/zh_TW/LC_MESSAGES/zenity-0.1.mo @dirrm share/gnome/omf/zenity @dirrm share/gnome/help/zenity/C/figures @dirrm share/gnome/help/zenity/C +@dirrm share/gnome/help/zenity/sr/figures +@dirrm share/gnome/help/zenity/sr @dirrm share/gnome/help/zenity @dirrm share/gnome/zenity/clothes @dirrm share/gnome/zenity @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/zenity/zenity-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/zenity/zenity-sr.omf 2>/dev/null || /usr/bin/true |