4 files changed, 158 insertions, 28 deletions

diff --git a/misc/quick-lounge-applet/Makefile b/misc/quick-lounge-applet/Makefile
index fbad4806674e..00ddd5eac0d9 100644
--- a/misc/quick-lounge-applet/Makefile
+++ b/misc/quick-lounge-applet/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	quick-lounge-applet
-PORTVERSION=	2.0.2
-PORTREVISION=	1
+PORTVERSION=	2.1.1
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.0
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.1
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	marcus@FreeBSD.org
@@ -19,14 +18,9 @@ COMMENT=	Applet to orginize your preferred applications on the GNOME Panel
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomepanel
+USE_GNOME=	gnomeprefix gnomehack intlhack lthack gnomepanel
 USE_LIBTOOL_VER=13
-INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-post-patch:
-	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
-		"s/-D.*_DISABLE_DEPRECATED//g"
-
 .include <bsd.port.mk>
diff --git a/misc/quick-lounge-applet/distinfo b/misc/quick-lounge-applet/distinfo
index 62d4bbcf07ca..ef1cff3ccf1d 100644
--- a/misc/quick-lounge-applet/distinfo
+++ b/misc/quick-lounge-applet/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/quick-lounge-applet-2.0.2.tar.bz2) = 687fff819c1c7f8564c7a80ef2649b71
-SIZE (gnome2/quick-lounge-applet-2.0.2.tar.bz2) = 238367
+MD5 (gnome2/quick-lounge-applet-2.1.1.tar.bz2) = 770f25870d0fd8e40d69e5001e6f57d3
+SIZE (gnome2/quick-lounge-applet-2.1.1.tar.bz2) = 318343
diff --git a/misc/quick-lounge-applet/files/patch-configure b/misc/quick-lounge-applet/files/patch-configure
deleted file mode 100644
index f195f07b43c6..000000000000
--- a/misc/quick-lounge-applet/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Wed Dec 11 18:31:51 2002
-+++ configure	Thu Dec 12 12:07:17 2002
-@@ -7414,6 +7414,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/misc/quick-lounge-applet/pkg-plist b/misc/quick-lounge-applet/pkg-plist
index b29fd6e5e1c1..556710d1c280 100644
--- a/misc/quick-lounge-applet/pkg-plist
+++ b/misc/quick-lounge-applet/pkg-plist
@@ -1,19 +1,128 @@
-etc/gconf/gconf.xml.defaults/schemas/apps/quick_lounge_applet/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/quick_lounge_applet/prefs/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/quick-lounge-applet/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/quick-lounge-applet/prefs/%gconf.xml
 etc/gconf/schemas/quick-lounge.schemas
-lib/libquicklounge-applet.a
-lib/libquicklounge-applet.so
-lib/libquicklounge-applet.so.0
 libdata/bonobo/servers/GNOME_QuickLoungeApplet_Factory.server
+libexec/quick-lounge-applet
 share/gnome/gnome-2.0/ui/GNOME_QuickLoungeApplet.xml
+share/gnome/help/quick-lounge/C/figures/quick-lounge_down.png
+share/gnome/help/quick-lounge/C/figures/quick-lounge_end.png
+share/gnome/help/quick-lounge/C/figures/quick-lounge_start.png
+share/gnome/help/quick-lounge/C/figures/quick-lounge_up.png
+share/gnome/help/quick-lounge/C/figures/quick-lounge_window.png
+share/gnome/help/quick-lounge/C/legal.xml
+share/gnome/help/quick-lounge/C/quick-lounge.xml
+share/gnome/help/quick-lounge/de/figures/quick-lounge_down.png
+share/gnome/help/quick-lounge/de/figures/quick-lounge_end.png
+share/gnome/help/quick-lounge/de/figures/quick-lounge_more.png
+share/gnome/help/quick-lounge/de/figures/quick-lounge_start.png
+share/gnome/help/quick-lounge/de/figures/quick-lounge_up.png
+share/gnome/help/quick-lounge/de/figures/quick-lounge_window.png
+share/gnome/help/quick-lounge/de/legal.xml
+share/gnome/help/quick-lounge/de/quick-lounge.xml
+share/gnome/help/quick-lounge/es/figures/quick-lounge_down.png
+share/gnome/help/quick-lounge/es/figures/quick-lounge_end.png
+share/gnome/help/quick-lounge/es/figures/quick-lounge_more.png
+share/gnome/help/quick-lounge/es/figures/quick-lounge_start.png
+share/gnome/help/quick-lounge/es/figures/quick-lounge_up.png
+share/gnome/help/quick-lounge/es/figures/quick-lounge_window.png
+share/gnome/help/quick-lounge/es/legal.xml
+share/gnome/help/quick-lounge/es/quick-lounge.xml
+share/gnome/help/quick-lounge/fr/figures/quick-lounge_down.png
+share/gnome/help/quick-lounge/fr/figures/quick-lounge_end.png
+share/gnome/help/quick-lounge/fr/figures/quick-lounge_more.png
+share/gnome/help/quick-lounge/fr/figures/quick-lounge_start.png
+share/gnome/help/quick-lounge/fr/figures/quick-lounge_up.png
+share/gnome/help/quick-lounge/fr/figures/quick-lounge_window.png
+share/gnome/help/quick-lounge/fr/legal.xml
+share/gnome/help/quick-lounge/fr/quick-lounge.xml
+share/gnome/help/quick-lounge/it/figures/quick-lounge_down.png
+share/gnome/help/quick-lounge/it/figures/quick-lounge_end.png
+share/gnome/help/quick-lounge/it/figures/quick-lounge_more.png
+share/gnome/help/quick-lounge/it/figures/quick-lounge_start.png
+share/gnome/help/quick-lounge/it/figures/quick-lounge_up.png
+share/gnome/help/quick-lounge/it/figures/quick-lounge_window.png
+share/gnome/help/quick-lounge/it/legal.xml
+share/gnome/help/quick-lounge/it/quick-lounge.xml
+share/gnome/help/quick-lounge/ja/figures/quick-lounge_down.png
+share/gnome/help/quick-lounge/ja/figures/quick-lounge_end.png
+share/gnome/help/quick-lounge/ja/figures/quick-lounge_more.png
+share/gnome/help/quick-lounge/ja/figures/quick-lounge_start.png
+share/gnome/help/quick-lounge/ja/figures/quick-lounge_up.png
+share/gnome/help/quick-lounge/ja/figures/quick-lounge_window.png
+share/gnome/help/quick-lounge/ja/legal.xml
+share/gnome/help/quick-lounge/ja/quick-lounge.xml
+share/gnome/help/quick-lounge/ko/figures/quick-lounge_down.png
+share/gnome/help/quick-lounge/ko/figures/quick-lounge_end.png
+share/gnome/help/quick-lounge/ko/figures/quick-lounge_more.png
+share/gnome/help/quick-lounge/ko/figures/quick-lounge_start.png
+share/gnome/help/quick-lounge/ko/figures/quick-lounge_up.png
+share/gnome/help/quick-lounge/ko/figures/quick-lounge_window.png
+share/gnome/help/quick-lounge/ko/legal.xml
+share/gnome/help/quick-lounge/ko/quick-lounge.xml
+share/gnome/help/quick-lounge/sv/figures/quick-lounge_down.png
+share/gnome/help/quick-lounge/sv/figures/quick-lounge_end.png
+share/gnome/help/quick-lounge/sv/figures/quick-lounge_more.png
+share/gnome/help/quick-lounge/sv/figures/quick-lounge_start.png
+share/gnome/help/quick-lounge/sv/figures/quick-lounge_up.png
+share/gnome/help/quick-lounge/sv/figures/quick-lounge_window.png
+share/gnome/help/quick-lounge/sv/legal.xml
+share/gnome/help/quick-lounge/sv/quick-lounge.xml
+share/gnome/help/quick-lounge/zh_CN/figures/quick-lounge_down.png
+share/gnome/help/quick-lounge/zh_CN/figures/quick-lounge_end.png
+share/gnome/help/quick-lounge/zh_CN/figures/quick-lounge_more.png
+share/gnome/help/quick-lounge/zh_CN/figures/quick-lounge_start.png
+share/gnome/help/quick-lounge/zh_CN/figures/quick-lounge_up.png
+share/gnome/help/quick-lounge/zh_CN/figures/quick-lounge_window.png
+share/gnome/help/quick-lounge/zh_CN/legal.xml
+share/gnome/help/quick-lounge/zh_CN/quick-lounge.xml
+share/gnome/help/quick-lounge/zh_HK/figures/quick-lounge_down.png
+share/gnome/help/quick-lounge/zh_HK/figures/quick-lounge_end.png
+share/gnome/help/quick-lounge/zh_HK/figures/quick-lounge_more.png
+share/gnome/help/quick-lounge/zh_HK/figures/quick-lounge_start.png
+share/gnome/help/quick-lounge/zh_HK/figures/quick-lounge_up.png
+share/gnome/help/quick-lounge/zh_HK/figures/quick-lounge_window.png
+share/gnome/help/quick-lounge/zh_HK/legal.xml
+share/gnome/help/quick-lounge/zh_HK/quick-lounge.xml
+share/gnome/help/quick-lounge/zh_TW/figures/quick-lounge_down.png
+share/gnome/help/quick-lounge/zh_TW/figures/quick-lounge_end.png
+share/gnome/help/quick-lounge/zh_TW/figures/quick-lounge_more.png
+share/gnome/help/quick-lounge/zh_TW/figures/quick-lounge_start.png
+share/gnome/help/quick-lounge/zh_TW/figures/quick-lounge_up.png
+share/gnome/help/quick-lounge/zh_TW/figures/quick-lounge_window.png
+share/gnome/help/quick-lounge/zh_TW/legal.xml
+share/gnome/help/quick-lounge/zh_TW/quick-lounge.xml
+share/gnome/omf/quick-lounge-applet/quick-lounge-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/quick-lounge-applet/quick-lounge-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/quick-lounge-applet/quick-lounge-de.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/quick-lounge-applet/quick-lounge-de.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/quick-lounge-applet/quick-lounge-es.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/quick-lounge-applet/quick-lounge-es.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/quick-lounge-applet/quick-lounge-fr.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/quick-lounge-applet/quick-lounge-fr.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/quick-lounge-applet/quick-lounge-it.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/quick-lounge-applet/quick-lounge-it.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/quick-lounge-applet/quick-lounge-ja.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/quick-lounge-applet/quick-lounge-ja.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/quick-lounge-applet/quick-lounge-ko.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/quick-lounge-applet/quick-lounge-ko.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/quick-lounge-applet/quick-lounge-sv.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/quick-lounge-applet/quick-lounge-sv.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/quick-lounge-applet/quick-lounge-zh_CN.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/quick-lounge-applet/quick-lounge-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/quick-lounge-applet/quick-lounge-zh_HK.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/quick-lounge-applet/quick-lounge-zh_HK.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/quick-lounge-applet/quick-lounge-zh_TW.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/quick-lounge-applet/quick-lounge-zh_TW.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/quick-lounge-applet.png
 share/gnome/quick-lounge/glade/quick-lounge.glade
 share/locale/az/LC_MESSAGES/quick-lounge-applet.mo
+share/locale/ca/LC_MESSAGES/quick-lounge-applet.mo
 share/locale/cs/LC_MESSAGES/quick-lounge-applet.mo
 share/locale/de/LC_MESSAGES/quick-lounge-applet.mo
 share/locale/el/LC_MESSAGES/quick-lounge-applet.mo
 share/locale/es/LC_MESSAGES/quick-lounge-applet.mo
 share/locale/fr/LC_MESSAGES/quick-lounge-applet.mo
+share/locale/hr/LC_MESSAGES/quick-lounge-applet.mo
 share/locale/it/LC_MESSAGES/quick-lounge-applet.mo
 share/locale/ja/LC_MESSAGES/quick-lounge-applet.mo
 share/locale/ko/LC_MESSAGES/quick-lounge-applet.mo
@@ -22,11 +131,48 @@ share/locale/nl/LC_MESSAGES/quick-lounge-applet.mo
 share/locale/no/LC_MESSAGES/quick-lounge-applet.mo
 share/locale/pl/LC_MESSAGES/quick-lounge-applet.mo
 share/locale/pt/LC_MESSAGES/quick-lounge-applet.mo
+share/locale/pt_BR/LC_MESSAGES/quick-lounge-applet.mo
+share/locale/sk/LC_MESSAGES/quick-lounge-applet.mo
 share/locale/sr/LC_MESSAGES/quick-lounge-applet.mo
 share/locale/sr@Latn/LC_MESSAGES/quick-lounge-applet.mo
 share/locale/sv/LC_MESSAGES/quick-lounge-applet.mo
 share/locale/zh_CN/LC_MESSAGES/quick-lounge-applet.mo
 @dirrm share/gnome/quick-lounge/glade
 @dirrm share/gnome/quick-lounge
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/quick_lounge_applet/prefs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/quick_lounge_applet
+@dirrm share/gnome/omf/quick-lounge-applet
+@dirrm share/gnome/help/quick-lounge/zh_TW/figures
+@dirrm share/gnome/help/quick-lounge/zh_TW
+@dirrm share/gnome/help/quick-lounge/zh_HK/figures
+@dirrm share/gnome/help/quick-lounge/zh_HK
+@dirrm share/gnome/help/quick-lounge/zh_CN/figures
+@dirrm share/gnome/help/quick-lounge/zh_CN
+@dirrm share/gnome/help/quick-lounge/sv/figures
+@dirrm share/gnome/help/quick-lounge/sv
+@dirrm share/gnome/help/quick-lounge/ko/figures
+@dirrm share/gnome/help/quick-lounge/ko
+@dirrm share/gnome/help/quick-lounge/ja/figures
+@dirrm share/gnome/help/quick-lounge/ja
+@dirrm share/gnome/help/quick-lounge/it/figures
+@dirrm share/gnome/help/quick-lounge/it
+@dirrm share/gnome/help/quick-lounge/fr/figures
+@dirrm share/gnome/help/quick-lounge/fr
+@dirrm share/gnome/help/quick-lounge/es/figures
+@dirrm share/gnome/help/quick-lounge/es
+@dirrm share/gnome/help/quick-lounge/de/figures
+@dirrm share/gnome/help/quick-lounge/de
+@dirrm share/gnome/help/quick-lounge/C/figures
+@dirrm share/gnome/help/quick-lounge/C
+@dirrm share/gnome/help/quick-lounge
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/quick-lounge-applet/prefs
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/quick-lounge-applet
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/quick-lounge-applet/quick-lounge-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/quick-lounge-applet/quick-lounge-de.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/quick-lounge-applet/quick-lounge-es.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/quick-lounge-applet/quick-lounge-fr.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/quick-lounge-applet/quick-lounge-it.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/quick-lounge-applet/quick-lounge-ja.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/quick-lounge-applet/quick-lounge-ko.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/quick-lounge-applet/quick-lounge-sv.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/quick-lounge-applet/quick-lounge-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/quick-lounge-applet/quick-lounge-zh_HK.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/quick-lounge-applet/quick-lounge-zh_TW.omf 2>/dev/null || /usr/bin/true