summaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2006-02-13 04:12:28 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2006-02-13 04:12:28 +0800
commite1ef929ee39b4f093a1017bf037488c7764fcb4f (patch)
treed6fda397682c8e1bdffd5a5aa5613ccfc9b4ae16 /x11
parentadcdc86cd969e20b133338e6aee8c9fdef66c89b (diff)
downloadmarcuscom-ports-e1ef929ee39b4f093a1017bf037488c7764fcb4f.tar
marcuscom-ports-e1ef929ee39b4f093a1017bf037488c7764fcb4f.tar.gz
marcuscom-ports-e1ef929ee39b4f093a1017bf037488c7764fcb4f.tar.bz2
marcuscom-ports-e1ef929ee39b4f093a1017bf037488c7764fcb4f.tar.lz
marcuscom-ports-e1ef929ee39b4f093a1017bf037488c7764fcb4f.tar.xz
marcuscom-ports-e1ef929ee39b4f093a1017bf037488c7764fcb4f.tar.zst
marcuscom-ports-e1ef929ee39b4f093a1017bf037488c7764fcb4f.zip
Update to 2.13.4.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5661 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11')
-rw-r--r--x11/gnome-applets/Makefile10
-rw-r--r--x11/gnome-applets/distinfo6
-rw-r--r--x11/gnome-applets/files/patch-aa32
-rw-r--r--x11/gnome-applets/pkg-plist44
-rw-r--r--x11/gnomeapplets2/Makefile10
-rw-r--r--x11/gnomeapplets2/distinfo6
-rw-r--r--x11/gnomeapplets2/files/patch-aa32
-rw-r--r--x11/gnomeapplets2/pkg-plist44
8 files changed, 52 insertions, 132 deletions
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 5f7814a69..aa4e947f7 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnomeapplets2/Makefile,v 1.100 2006/01/31 20:32:20 marcus Exp $
+# $MCom: ports/x11/gnomeapplets2/Makefile,v 1.101 2006/01/31 20:36:55 marcus Exp $
#
PORTNAME= gnomeapplets2
-PORTVERSION= 2.13.3
+PORTVERSION= 2.13.4
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-applets/2.13
@@ -39,7 +39,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
GCONF_SCHEMAS= charpick.schemas drivemount.schemas geyes.schemas \
gswitchit.schemas gtik.schemas gweather.schemas \
- mini-commander-global.schemas mini-commander.schemas \
mixer.schemas multiload.schemas \
stickynotes.schemas
@@ -47,6 +46,11 @@ FREEBSD_SYS?= /usr/src/sys
.include <bsd.port.pre.mk>
+.if exists(${LOCALBASE}/libdata/pkgconfig/libnotify.pc) || \
+ defined(WITH_LIBNOTIFY)
+LIB_DEPENDS+= notify:${PORTSDIR}/devel/libnotify
+.endif
+
.if ${ARCH} != "i386" && ${ARCH} != "amd64"
CONFIGURE_ENV+= CFLAGS="${CFLAGS} -fPIC"
PLIST_SUB= BATTERY="@comment "
diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo
index 5ed00167e..69f73da30 100644
--- a/x11/gnome-applets/distinfo
+++ b/x11/gnome-applets/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-applets-2.13.3.tar.bz2) = a21a38a13cafbf4bcd841210f3dbc228
-SHA256 (gnome2/gnome-applets-2.13.3.tar.bz2) = 8e5ae242aef144ded58aa3ec3b9162493d202b59ca7c4e62127a329b8ffb4c0d
-SIZE (gnome2/gnome-applets-2.13.3.tar.bz2) = 6290222
+MD5 (gnome2/gnome-applets-2.13.4.tar.bz2) = d45875668fd4e30d0863bf71ead44caa
+SHA256 (gnome2/gnome-applets-2.13.4.tar.bz2) = 1e6c87a1fb66f24e7758d73351f89a9291ff3d7a68d7d5d583811e363290a2cf
+SIZE (gnome2/gnome-applets-2.13.4.tar.bz2) = 6233728
diff --git a/x11/gnome-applets/files/patch-aa b/x11/gnome-applets/files/patch-aa
index f0f89b96c..a5233ffe0 100644
--- a/x11/gnome-applets/files/patch-aa
+++ b/x11/gnome-applets/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig Tue Jan 31 15:15:51 2006
-+++ configure Tue Jan 31 15:15:51 2006
-@@ -23356,8 +23356,7 @@
+--- configure.orig Sun Feb 12 14:11:21 2006
++++ configure Sun Feb 12 14:12:00 2006
+@@ -23361,8 +23361,7 @@
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -10,7 +10,7 @@
GNOMELOCALEDIR="$ac_define_dir"
-@@ -25387,7 +25386,7 @@
+@@ -25392,7 +25391,7 @@
;;
# list of supported OS cores that do not use libapm
@@ -19,16 +19,16 @@
if -n "${OS_SYS}" ; then
ACPIINC="-I${OS_SYS}"
else
-@@ -26442,7 +26441,7 @@
+@@ -26469,7 +26468,7 @@
fi
-if test "x$SU_TOOL" == "x" -o "x$HAVE_LIBUTIL" != "xtrue" -o "x$P_MODEMLIGHTS" != "xmodemlights"; then
+if test "x$SU_TOOL" = "x" -o "x$HAVE_LIBUTIL" != "xtrue" -o "x$P_MODEMLIGHTS" != "xmodemlights"; then
- { echo "$as_me:$LINENO: WARNING: *** \`modemlights' applet will not be built ***" >&5
- echo "$as_me: WARNING: *** \`modemlights' applet will not be built ***" >&2;}
+ { echo "$as_me:$LINENO: WARNING: *** modemlights applet will not be built ***" >&5
+ echo "$as_me: WARNING: *** modemlights applet will not be built ***" >&2;}
else
-@@ -26606,6 +26605,9 @@
+@@ -26633,6 +26632,9 @@
*linux*)
build_cpufreq_applet=yes
;;
@@ -38,7 +38,7 @@
*)
{ echo "$as_me:$LINENO: WARNING: ${host} is not supported by cpufreq applet, not building" >&5
echo "$as_me: WARNING: ${host} is not supported by cpufreq applet, not building" >&2;}
-@@ -27082,7 +27084,7 @@
+@@ -27109,7 +27111,7 @@
ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
@@ -47,7 +47,7 @@
pixmapsdir="${datadir}/pixmaps"
-@@ -27096,8 +27098,7 @@
+@@ -27123,8 +27125,7 @@
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -57,7 +57,7 @@
GNOME_ICONDIR="$ac_define_dir"
-@@ -27109,8 +27110,7 @@
+@@ -27136,8 +27137,7 @@
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -67,7 +67,7 @@
GNOME_PIXMAPSDIR="$ac_define_dir"
-@@ -27122,8 +27122,7 @@
+@@ -27149,8 +27149,7 @@
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -77,7 +77,7 @@
GNOME_GLADEDIR="$ac_define_dir"
-@@ -27135,8 +27134,7 @@
+@@ -27162,8 +27161,7 @@
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -87,7 +87,7 @@
DATADIR="$ac_define_dir"
-@@ -27148,8 +27146,7 @@
+@@ -27175,8 +27173,7 @@
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -97,7 +97,7 @@
SYSCONFDIR="$ac_define_dir"
-@@ -27161,8 +27158,7 @@
+@@ -27188,8 +27185,7 @@
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -107,7 +107,7 @@
LIBDIR="$ac_define_dir"
-@@ -27174,8 +27170,7 @@
+@@ -27201,8 +27197,7 @@
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist
index cafb0075b..208c5213c 100644
--- a/x11/gnome-applets/pkg-plist
+++ b/x11/gnome-applets/pkg-plist
@@ -36,11 +36,9 @@ libexec/charpick_applet2
%%CPUFREQ%%libexec/cpufreq-applet
libexec/drivemount_applet2
libexec/geyes_applet2
-libexec/gnome-applets/mc-install-default-macros
libexec/gnome-keyboard-applet
libexec/gtik2_applet2
libexec/gweather-applet-2
-libexec/mini_commander_applet
libexec/mixer_applet2
libexec/modem_applet
libexec/multiload-applet-2
@@ -56,7 +54,6 @@ 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
-share/gnome/gnome-2.0/ui/GNOME_MiniCommanderApplet.xml
share/gnome/gnome-2.0/ui/GNOME_MixerApplet.xml
share/gnome/gnome-2.0/ui/GNOME_ModemLights.xml
share/gnome/gnome-2.0/ui/GNOME_MultiloadApplet.xml
@@ -81,7 +78,6 @@ share/gnome/gnome-applets/geyes/Horrid/horrid_pupil.png
%%CPUFREQ%%share/gnome/gnome-applets/glade/cpufreq-preferences.glade
share/gnome/gnome-applets/glade/gswitchit-plugins.glade
share/gnome/gnome-applets/glade/gswitchit.glade
-share/gnome/gnome-applets/glade/mini-commander.glade
share/gnome/gnome-applets/glade/modemlights.glade
share/gnome/gnome-applets/glade/stickynotes.glade
share/gnome/gnome-applets/glade/trashapplet.glade
@@ -209,27 +205,6 @@ share/gnome/help/char-palette/uk/figures/charpalette_applet.png
share/gnome/help/char-palette/uk/figures/charpalette_chargroup.png
share/gnome/help/char-palette/uk/figures/charpick-preferences.png
share/gnome/help/char-palette/uk/figures/charpick_characters.png
-share/gnome/help/command-line/C/command-line.xml
-share/gnome/help/command-line/C/figures/command-line.png
-share/gnome/help/command-line/C/figures/prefs-macros.png
-share/gnome/help/command-line/C/figures/prefs.png
-share/gnome/help/command-line/C/legal.xml
-share/gnome/help/command-line/es/command-line.xml
-share/gnome/help/command-line/es/figures/command-line.png
-share/gnome/help/command-line/es/figures/prefs-macros.png
-share/gnome/help/command-line/es/figures/prefs.png
-share/gnome/help/command-line/fr/command-line.xml
-share/gnome/help/command-line/fr/figures/command-line.png
-share/gnome/help/command-line/fr/figures/prefs-macros.png
-share/gnome/help/command-line/fr/figures/prefs.png
-share/gnome/help/command-line/pt_BR/command-line.xml
-share/gnome/help/command-line/pt_BR/figures/command-line.png
-share/gnome/help/command-line/pt_BR/figures/prefs-macros.png
-share/gnome/help/command-line/pt_BR/figures/prefs.png
-share/gnome/help/command-line/uk/command-line.xml
-share/gnome/help/command-line/uk/figures/command-line.png
-share/gnome/help/command-line/uk/figures/prefs-macros.png
-share/gnome/help/command-line/uk/figures/prefs.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/cpufreq-applet.xml
%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-100.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-25.png
@@ -491,11 +466,6 @@ share/gnome/omf/char-palette/char-palette-it.omf
share/gnome/omf/char-palette/char-palette-nl.omf
share/gnome/omf/char-palette/char-palette-pt_BR.omf
share/gnome/omf/char-palette/char-palette-uk.omf
-share/gnome/omf/command-line/command-line-C.omf
-share/gnome/omf/command-line/command-line-es.omf
-share/gnome/omf/command-line/command-line-fr.omf
-share/gnome/omf/command-line/command-line-pt_BR.omf
-share/gnome/omf/command-line/command-line-uk.omf
%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-C.omf
%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-es.omf
%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-nl.omf
@@ -682,7 +652,6 @@ share/icons/hicolor/48x48/apps/ax-applet.png
share/icons/hicolor/48x48/apps/charpick.png
share/icons/hicolor/48x48/apps/gnome-cpu.png
share/icons/hicolor/48x48/apps/gnome-eyes.png
-share/icons/hicolor/48x48/apps/gnome-mini-commander.png
share/icons/hicolor/48x48/apps/gnome-modem.png
share/icons/hicolor/48x48/apps/gnome-money.png
share/icons/hicolor/48x48/apps/gswitchit-applet.png
@@ -789,7 +758,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/omf/geyes
@dirrm share/gnome/omf/drivemount
%%CPUFREQ%%@dirrm share/gnome/omf/cpufreq-applet
-@dirrm share/gnome/omf/command-line
@dirrm share/gnome/omf/char-palette
%%BATTERY%%@dirrm share/gnome/omf/battstat
@dirrm share/gnome/omf/accessx-status
@@ -893,17 +861,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/C/figures
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/C
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet
-@dirrm share/gnome/help/command-line/uk/figures
-@dirrm share/gnome/help/command-line/uk
-@dirrm share/gnome/help/command-line/pt_BR/figures
-@dirrm share/gnome/help/command-line/pt_BR
-@dirrm share/gnome/help/command-line/fr/figures
-@dirrm share/gnome/help/command-line/fr
-@dirrm share/gnome/help/command-line/es/figures
-@dirrm share/gnome/help/command-line/es
-@dirrm share/gnome/help/command-line/C/figures
-@dirrm share/gnome/help/command-line/C
-@dirrm share/gnome/help/command-line
@dirrm share/gnome/help/char-palette/uk/figures
@dirrm share/gnome/help/char-palette/uk
@dirrm share/gnome/help/char-palette/pt_BR/figures
@@ -948,6 +905,5 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/gnome-applets/geyes/Bizarre
@dirrm share/gnome/gnome-applets/geyes
@dirrm share/gnome/gnome-applets
-@dirrm libexec/gnome-applets
@dirrm include/libgswitchit
@dirrm include/libgweather
diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile
index 5f7814a69..aa4e947f7 100644
--- a/x11/gnomeapplets2/Makefile
+++ b/x11/gnomeapplets2/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnomeapplets2/Makefile,v 1.100 2006/01/31 20:32:20 marcus Exp $
+# $MCom: ports/x11/gnomeapplets2/Makefile,v 1.101 2006/01/31 20:36:55 marcus Exp $
#
PORTNAME= gnomeapplets2
-PORTVERSION= 2.13.3
+PORTVERSION= 2.13.4
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-applets/2.13
@@ -39,7 +39,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
GCONF_SCHEMAS= charpick.schemas drivemount.schemas geyes.schemas \
gswitchit.schemas gtik.schemas gweather.schemas \
- mini-commander-global.schemas mini-commander.schemas \
mixer.schemas multiload.schemas \
stickynotes.schemas
@@ -47,6 +46,11 @@ FREEBSD_SYS?= /usr/src/sys
.include <bsd.port.pre.mk>
+.if exists(${LOCALBASE}/libdata/pkgconfig/libnotify.pc) || \
+ defined(WITH_LIBNOTIFY)
+LIB_DEPENDS+= notify:${PORTSDIR}/devel/libnotify
+.endif
+
.if ${ARCH} != "i386" && ${ARCH} != "amd64"
CONFIGURE_ENV+= CFLAGS="${CFLAGS} -fPIC"
PLIST_SUB= BATTERY="@comment "
diff --git a/x11/gnomeapplets2/distinfo b/x11/gnomeapplets2/distinfo
index 5ed00167e..69f73da30 100644
--- a/x11/gnomeapplets2/distinfo
+++ b/x11/gnomeapplets2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-applets-2.13.3.tar.bz2) = a21a38a13cafbf4bcd841210f3dbc228
-SHA256 (gnome2/gnome-applets-2.13.3.tar.bz2) = 8e5ae242aef144ded58aa3ec3b9162493d202b59ca7c4e62127a329b8ffb4c0d
-SIZE (gnome2/gnome-applets-2.13.3.tar.bz2) = 6290222
+MD5 (gnome2/gnome-applets-2.13.4.tar.bz2) = d45875668fd4e30d0863bf71ead44caa
+SHA256 (gnome2/gnome-applets-2.13.4.tar.bz2) = 1e6c87a1fb66f24e7758d73351f89a9291ff3d7a68d7d5d583811e363290a2cf
+SIZE (gnome2/gnome-applets-2.13.4.tar.bz2) = 6233728
diff --git a/x11/gnomeapplets2/files/patch-aa b/x11/gnomeapplets2/files/patch-aa
index f0f89b96c..a5233ffe0 100644
--- a/x11/gnomeapplets2/files/patch-aa
+++ b/x11/gnomeapplets2/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig Tue Jan 31 15:15:51 2006
-+++ configure Tue Jan 31 15:15:51 2006
-@@ -23356,8 +23356,7 @@
+--- configure.orig Sun Feb 12 14:11:21 2006
++++ configure Sun Feb 12 14:12:00 2006
+@@ -23361,8 +23361,7 @@
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -10,7 +10,7 @@
GNOMELOCALEDIR="$ac_define_dir"
-@@ -25387,7 +25386,7 @@
+@@ -25392,7 +25391,7 @@
;;
# list of supported OS cores that do not use libapm
@@ -19,16 +19,16 @@
if -n "${OS_SYS}" ; then
ACPIINC="-I${OS_SYS}"
else
-@@ -26442,7 +26441,7 @@
+@@ -26469,7 +26468,7 @@
fi
-if test "x$SU_TOOL" == "x" -o "x$HAVE_LIBUTIL" != "xtrue" -o "x$P_MODEMLIGHTS" != "xmodemlights"; then
+if test "x$SU_TOOL" = "x" -o "x$HAVE_LIBUTIL" != "xtrue" -o "x$P_MODEMLIGHTS" != "xmodemlights"; then
- { echo "$as_me:$LINENO: WARNING: *** \`modemlights' applet will not be built ***" >&5
- echo "$as_me: WARNING: *** \`modemlights' applet will not be built ***" >&2;}
+ { echo "$as_me:$LINENO: WARNING: *** modemlights applet will not be built ***" >&5
+ echo "$as_me: WARNING: *** modemlights applet will not be built ***" >&2;}
else
-@@ -26606,6 +26605,9 @@
+@@ -26633,6 +26632,9 @@
*linux*)
build_cpufreq_applet=yes
;;
@@ -38,7 +38,7 @@
*)
{ echo "$as_me:$LINENO: WARNING: ${host} is not supported by cpufreq applet, not building" >&5
echo "$as_me: WARNING: ${host} is not supported by cpufreq applet, not building" >&2;}
-@@ -27082,7 +27084,7 @@
+@@ -27109,7 +27111,7 @@
ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
@@ -47,7 +47,7 @@
pixmapsdir="${datadir}/pixmaps"
-@@ -27096,8 +27098,7 @@
+@@ -27123,8 +27125,7 @@
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -57,7 +57,7 @@
GNOME_ICONDIR="$ac_define_dir"
-@@ -27109,8 +27110,7 @@
+@@ -27136,8 +27137,7 @@
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -67,7 +67,7 @@
GNOME_PIXMAPSDIR="$ac_define_dir"
-@@ -27122,8 +27122,7 @@
+@@ -27149,8 +27149,7 @@
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -77,7 +77,7 @@
GNOME_GLADEDIR="$ac_define_dir"
-@@ -27135,8 +27134,7 @@
+@@ -27162,8 +27161,7 @@
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -87,7 +87,7 @@
DATADIR="$ac_define_dir"
-@@ -27148,8 +27146,7 @@
+@@ -27175,8 +27173,7 @@
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -97,7 +97,7 @@
SYSCONFDIR="$ac_define_dir"
-@@ -27161,8 +27158,7 @@
+@@ -27188,8 +27185,7 @@
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -107,7 +107,7 @@
LIBDIR="$ac_define_dir"
-@@ -27174,8 +27170,7 @@
+@@ -27201,8 +27197,7 @@
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
diff --git a/x11/gnomeapplets2/pkg-plist b/x11/gnomeapplets2/pkg-plist
index cafb0075b..208c5213c 100644
--- a/x11/gnomeapplets2/pkg-plist
+++ b/x11/gnomeapplets2/pkg-plist
@@ -36,11 +36,9 @@ libexec/charpick_applet2
%%CPUFREQ%%libexec/cpufreq-applet
libexec/drivemount_applet2
libexec/geyes_applet2
-libexec/gnome-applets/mc-install-default-macros
libexec/gnome-keyboard-applet
libexec/gtik2_applet2
libexec/gweather-applet-2
-libexec/mini_commander_applet
libexec/mixer_applet2
libexec/modem_applet
libexec/multiload-applet-2
@@ -56,7 +54,6 @@ 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
-share/gnome/gnome-2.0/ui/GNOME_MiniCommanderApplet.xml
share/gnome/gnome-2.0/ui/GNOME_MixerApplet.xml
share/gnome/gnome-2.0/ui/GNOME_ModemLights.xml
share/gnome/gnome-2.0/ui/GNOME_MultiloadApplet.xml
@@ -81,7 +78,6 @@ share/gnome/gnome-applets/geyes/Horrid/horrid_pupil.png
%%CPUFREQ%%share/gnome/gnome-applets/glade/cpufreq-preferences.glade
share/gnome/gnome-applets/glade/gswitchit-plugins.glade
share/gnome/gnome-applets/glade/gswitchit.glade
-share/gnome/gnome-applets/glade/mini-commander.glade
share/gnome/gnome-applets/glade/modemlights.glade
share/gnome/gnome-applets/glade/stickynotes.glade
share/gnome/gnome-applets/glade/trashapplet.glade
@@ -209,27 +205,6 @@ share/gnome/help/char-palette/uk/figures/charpalette_applet.png
share/gnome/help/char-palette/uk/figures/charpalette_chargroup.png
share/gnome/help/char-palette/uk/figures/charpick-preferences.png
share/gnome/help/char-palette/uk/figures/charpick_characters.png
-share/gnome/help/command-line/C/command-line.xml
-share/gnome/help/command-line/C/figures/command-line.png
-share/gnome/help/command-line/C/figures/prefs-macros.png
-share/gnome/help/command-line/C/figures/prefs.png
-share/gnome/help/command-line/C/legal.xml
-share/gnome/help/command-line/es/command-line.xml
-share/gnome/help/command-line/es/figures/command-line.png
-share/gnome/help/command-line/es/figures/prefs-macros.png
-share/gnome/help/command-line/es/figures/prefs.png
-share/gnome/help/command-line/fr/command-line.xml
-share/gnome/help/command-line/fr/figures/command-line.png
-share/gnome/help/command-line/fr/figures/prefs-macros.png
-share/gnome/help/command-line/fr/figures/prefs.png
-share/gnome/help/command-line/pt_BR/command-line.xml
-share/gnome/help/command-line/pt_BR/figures/command-line.png
-share/gnome/help/command-line/pt_BR/figures/prefs-macros.png
-share/gnome/help/command-line/pt_BR/figures/prefs.png
-share/gnome/help/command-line/uk/command-line.xml
-share/gnome/help/command-line/uk/figures/command-line.png
-share/gnome/help/command-line/uk/figures/prefs-macros.png
-share/gnome/help/command-line/uk/figures/prefs.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/cpufreq-applet.xml
%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-100.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-25.png
@@ -491,11 +466,6 @@ share/gnome/omf/char-palette/char-palette-it.omf
share/gnome/omf/char-palette/char-palette-nl.omf
share/gnome/omf/char-palette/char-palette-pt_BR.omf
share/gnome/omf/char-palette/char-palette-uk.omf
-share/gnome/omf/command-line/command-line-C.omf
-share/gnome/omf/command-line/command-line-es.omf
-share/gnome/omf/command-line/command-line-fr.omf
-share/gnome/omf/command-line/command-line-pt_BR.omf
-share/gnome/omf/command-line/command-line-uk.omf
%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-C.omf
%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-es.omf
%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-nl.omf
@@ -682,7 +652,6 @@ share/icons/hicolor/48x48/apps/ax-applet.png
share/icons/hicolor/48x48/apps/charpick.png
share/icons/hicolor/48x48/apps/gnome-cpu.png
share/icons/hicolor/48x48/apps/gnome-eyes.png
-share/icons/hicolor/48x48/apps/gnome-mini-commander.png
share/icons/hicolor/48x48/apps/gnome-modem.png
share/icons/hicolor/48x48/apps/gnome-money.png
share/icons/hicolor/48x48/apps/gswitchit-applet.png
@@ -789,7 +758,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/omf/geyes
@dirrm share/gnome/omf/drivemount
%%CPUFREQ%%@dirrm share/gnome/omf/cpufreq-applet
-@dirrm share/gnome/omf/command-line
@dirrm share/gnome/omf/char-palette
%%BATTERY%%@dirrm share/gnome/omf/battstat
@dirrm share/gnome/omf/accessx-status
@@ -893,17 +861,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/C/figures
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/C
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet
-@dirrm share/gnome/help/command-line/uk/figures
-@dirrm share/gnome/help/command-line/uk
-@dirrm share/gnome/help/command-line/pt_BR/figures
-@dirrm share/gnome/help/command-line/pt_BR
-@dirrm share/gnome/help/command-line/fr/figures
-@dirrm share/gnome/help/command-line/fr
-@dirrm share/gnome/help/command-line/es/figures
-@dirrm share/gnome/help/command-line/es
-@dirrm share/gnome/help/command-line/C/figures
-@dirrm share/gnome/help/command-line/C
-@dirrm share/gnome/help/command-line
@dirrm share/gnome/help/char-palette/uk/figures
@dirrm share/gnome/help/char-palette/uk
@dirrm share/gnome/help/char-palette/pt_BR/figures
@@ -948,6 +905,5 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/gnome-applets/geyes/Bizarre
@dirrm share/gnome/gnome-applets/geyes
@dirrm share/gnome/gnome-applets
-@dirrm libexec/gnome-applets
@dirrm include/libgswitchit
@dirrm include/libgweather