summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--x11/gnome2-applets/Makefile11
-rw-r--r--x11/gnome2-applets/PLIST28
-rw-r--r--x11/gnome2-applets/distinfo10
-rw-r--r--x11/gnome2-applets/patches/patch-aa10
-rw-r--r--x11/gnome2-applets/patches/patch-ad15
5 files changed, 49 insertions, 25 deletions
diff --git a/x11/gnome2-applets/Makefile b/x11/gnome2-applets/Makefile
index 8caaa503e44..be3e3d3e1ac 100644
--- a/x11/gnome2-applets/Makefile
+++ b/x11/gnome2-applets/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.32 2004/06/28 13:49:38 jmmv Exp $
+# $NetBSD: Makefile,v 1.33 2004/09/21 16:57:24 jmmv Exp $
#
-DISTNAME= gnome-applets-2.6.2
+DISTNAME= gnome-applets-2.8.0
CATEGORIES= x11 gnome
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-applets/2.6/}
+MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-applets/2.8/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= tech-pkg@NetBSD.org
@@ -20,7 +20,7 @@ USE_GNU_TOOLS+= make
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
-CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html
+CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
PKGCONFIG_OVERRIDE+= libgswitchit/gswitchit.pc.in
@@ -29,8 +29,7 @@ EGDIR= ${PREFIX}/share/examples/gnome-applets
CONF_FILES= ${EGDIR}/sound/events/mailcheck.soundlist \
${PKG_SYSCONFDIR}/sound/events/mailcheck.soundlist
-GCONF2_SCHEMAS= cdplayer.schemas
-GCONF2_SCHEMAS+= charpick.schemas
+GCONF2_SCHEMAS= charpick.schemas
GCONF2_SCHEMAS+= drivemount.schemas
GCONF2_SCHEMAS+= geyes.schemas
GCONF2_SCHEMAS+= gkb.schemas
diff --git a/x11/gnome2-applets/PLIST b/x11/gnome2-applets/PLIST
index 1661d9d59f8..3f7797ef89e 100644
--- a/x11/gnome2-applets/PLIST
+++ b/x11/gnome2-applets/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2004/06/28 13:49:38 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.7 2004/09/21 16:57:24 jmmv Exp $
bin/gkb_xmmap
bin/gnome-keyboard-layout
bin/gswitchit-plugins-capplet
@@ -42,7 +42,6 @@ ${BATTSTAT}share/battstat_applet/battstat_applet.glade
${BATTSTAT}share/examples/gnome-applets/sound/events/battstat_applet.soundlist
share/examples/gnome-applets/sound/events/mailcheck.soundlist
${BATTSTAT}share/gconf/schemas/battstat.schemas
-share/gconf/schemas/cdplayer.schemas
share/gconf/schemas/charpick.schemas
share/gconf/schemas/drivemount.schemas
share/gconf/schemas/geyes.schemas
@@ -182,6 +181,7 @@ share/gnome/gkb/SE_Swedish.keyprop
share/gnome/gkb/SE_Swedish_x.keyprop
share/gnome/gkb/SI_Slovenian.keyprop
share/gnome/gkb/SI_Slovenian_x.keyprop
+share/gnome/gkb/SK__x.keyprop
share/gnome/gkb/SR_Dutch.keyprop
share/gnome/gkb/Slovak.keyprop
share/gnome/gkb/Slovene.keyprop
@@ -546,6 +546,9 @@ 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/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
@@ -778,6 +781,8 @@ 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
+share/gnome/help/gswitchit/C/gswitchit.xml
+share/gnome/help/gswitchit/C/legal.xml
share/gnome/help/gtik2_applet2/C/figures/gtik_applet.png
share/gnome/help/gtik2_applet2/C/gtik2_applet2.xml
share/gnome/help/gtik2_applet2/C/legal.xml
@@ -904,11 +909,6 @@ 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
@@ -1144,13 +1144,14 @@ share/gnome/help/wireless/zh_TW/legal.xml
share/gnome/help/wireless/zh_TW/wireless.xml
share/gswitchit/gswitchit-plugins.glade
share/gswitchit/gswitchit-properties.glade
-share/gweather/Locations
+share/gweather/Locations.xml
${PKGLOCALEDIR}/locale/am/LC_MESSAGES/gnome-applets-2.0.mo
${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/gnome-applets-2.0.mo
${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gnome-applets-2.0.mo
${PKGLOCALEDIR}/locale/be/LC_MESSAGES/gnome-applets-2.0.mo
${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/gnome-applets-2.0.mo
${PKGLOCALEDIR}/locale/bn/LC_MESSAGES/gnome-applets-2.0.mo
+${PKGLOCALEDIR}/locale/bs/LC_MESSAGES/gnome-applets-2.0.mo
${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gnome-applets-2.0.mo
${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gnome-applets-2.0.mo
${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/gnome-applets-2.0.mo
@@ -1172,17 +1173,18 @@ ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/gnome-applets-2.0.mo
${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/gnome-applets-2.0.mo
${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/gnome-applets-2.0.mo
${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gnome-applets-2.0.mo
+${PKGLOCALEDIR}/locale/id/LC_MESSAGES/gnome-applets-2.0.mo
${PKGLOCALEDIR}/locale/is/LC_MESSAGES/gnome-applets-2.0.mo
${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gnome-applets-2.0.mo
${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gnome-applets-2.0.mo
${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gnome-applets-2.0.mo
${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gnome-applets-2.0.mo
${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/gnome-applets-2.0.mo
-${PKGLOCALEDIR}/locale/mi/LC_MESSAGES/gnome-applets-2.0.mo
${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/gnome-applets-2.0.mo
${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/gnome-applets-2.0.mo
${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/gnome-applets-2.0.mo
${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/gnome-applets-2.0.mo
+${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/gnome-applets-2.0.mo
${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gnome-applets-2.0.mo
${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gnome-applets-2.0.mo
${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gnome-applets-2.0.mo
@@ -1238,6 +1240,7 @@ share/omf/gnome-applets/char-palette-es.omf
share/omf/gnome-applets/char-palette-eu.omf
share/omf/gnome-applets/char-palette-fr.omf
share/omf/gnome-applets/char-palette-it.omf
+share/omf/gnome-applets/char-palette-ja.omf
share/omf/gnome-applets/char-palette-ko.omf
share/omf/gnome-applets/char-palette-sv.omf
share/omf/gnome-applets/char-palette-zh_CN.omf
@@ -1291,6 +1294,7 @@ share/omf/gnome-applets/gkb-sv.omf
share/omf/gnome-applets/gkb-zh_CN.omf
share/omf/gnome-applets/gkb-zh_HK.omf
share/omf/gnome-applets/gkb-zh_TW.omf
+share/omf/gnome-applets/gswitchit-C.omf
share/omf/gnome-applets/gtik2_applet2-C.omf
share/omf/gnome-applets/gtik2_applet2-de.omf
share/omf/gnome-applets/gtik2_applet2-es.omf
@@ -1497,6 +1501,7 @@ share/pixmaps/gkb/yu.png
share/pixmaps/gnome-cpu.png
share/pixmaps/gnome-eyes.png
share/pixmaps/gnome-mini-commander.png
+share/pixmaps/gnome-mixer-applet.png
share/pixmaps/gswitchit-applet.png
share/pixmaps/gswitchit-properties-capplet.png
share/pixmaps/mailcheck/eclouds.png
@@ -1507,7 +1512,6 @@ share/pixmaps/mailcheck/email.png
share/pixmaps/mailcheck/tux-anim.png
share/pixmaps/mini-commander/browser-mini.xpm
share/pixmaps/mini-commander/history-mini.xpm
-share/pixmaps/mixer/gnome-mixer-applet.png
share/pixmaps/mixer/volume-max.png
share/pixmaps/mixer/volume-medium.png
share/pixmaps/mixer/volume-min.png
@@ -1806,6 +1810,8 @@ share/xmodmap/xmodmap.yu
@dirrm share/gnome/help/gtik2_applet2/C/figures
@dirrm share/gnome/help/gtik2_applet2/C
@dirrm share/gnome/help/gtik2_applet2
+@dirrm share/gnome/help/gswitchit/C
+@dirrm share/gnome/help/gswitchit
@dirrm share/gnome/help/gkb/zh_TW/figures
@dirrm share/gnome/help/gkb/zh_TW
@dirrm share/gnome/help/gkb/zh_HK/figures
@@ -1916,6 +1922,8 @@ share/xmodmap/xmodmap.yu
@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
diff --git a/x11/gnome2-applets/distinfo b/x11/gnome2-applets/distinfo
index eaad0369cbe..7ef64e8b976 100644
--- a/x11/gnome2-applets/distinfo
+++ b/x11/gnome2-applets/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.6 2004/06/28 13:49:38 jmmv Exp $
+$NetBSD: distinfo,v 1.7 2004/09/21 16:57:24 jmmv Exp $
-SHA1 (gnome-applets-2.6.2.tar.bz2) = 6d673cd802398577294f47e7ffacf7dee40d0193
-Size (gnome-applets-2.6.2.tar.bz2) = 5600227 bytes
-SHA1 (patch-aa) = 411a9ce8a9bf11468853720fc0253f1c709bf941
+SHA1 (gnome-applets-2.8.0.tar.bz2) = 85f17fc9e33e4ca8eb50ed54178be4235db9d188
+Size (gnome-applets-2.8.0.tar.bz2) = 6399119 bytes
+SHA1 (patch-aa) = 1e5e78defaeae5c441ffdc27d3dce301f9745695
SHA1 (patch-ab) = 7a38278110675ebbb21f3441dd277209001768dc
+SHA1 (patch-ac) = 0801e8ed3b3a70643d990df30dc4b919ba6025d0
+SHA1 (patch-ad) = 43a3e0b6191ce07bcc0b7fc4af3a9878e059f16d
diff --git a/x11/gnome2-applets/patches/patch-aa b/x11/gnome2-applets/patches/patch-aa
index 65e6986c078..2f436d26e72 100644
--- a/x11/gnome2-applets/patches/patch-aa
+++ b/x11/gnome2-applets/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.5 2004/06/28 13:49:38 jmmv Exp $
+$NetBSD: patch-aa,v 1.6 2004/09/21 16:57:24 jmmv Exp $
---- battstat/sounds/Makefile.in.orig 2004-06-28 10:17:27.000000000 +0200
+--- battstat/sounds/Makefile.in.orig 2004-08-30 15:21:24.000000000 +0200
+++ battstat/sounds/Makefile.in
-@@ -236,7 +236,7 @@ sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+@@ -167,7 +167,7 @@ am__quote = @am__quote@
+ gnomelocaledir = @gnomelocaledir@
+ install_sh = @install_sh@
-soundlistdir = $(sysconfdir)/sound/events
+soundlistdir = $(datadir)/examples/gnome-applets/sound/events
diff --git a/x11/gnome2-applets/patches/patch-ad b/x11/gnome2-applets/patches/patch-ad
new file mode 100644
index 00000000000..582ee8597b4
--- /dev/null
+++ b/x11/gnome2-applets/patches/patch-ad
@@ -0,0 +1,15 @@
+$NetBSD: patch-ad,v 1.3 2004/09/21 16:57:24 jmmv Exp $
+
+http://bugzilla.gnome.org/show_bug.cgi?id=151834
+
+--- mixer/GNOME_MixerApplet.server.in.in.orig 2004-08-10 04:52:06.000000000 +0200
++++ mixer/GNOME_MixerApplet.server.in.in
+@@ -24,7 +24,7 @@
+ </oaf_attribute>
+ <oaf_attribute name="name" type="string" _value="Volume Control"/>
+ <oaf_attribute name="description" type="string" _value="Adjust the sound volume"/>
+- <oaf_attribute name="panel:icon" type="string" value="gnome-mixer-applet.png"/>
++ <oaf_attribute name="panel:icon" type="string" value="mixer/gnome-mixer-applet.png"/>
+ <oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
+ <oaf_attribute name="bugzilla:product" type="string" value="gnome-applets"/>
+ <oaf_attribute name="bugzilla:component" type="string" value="mixer"/>