-Update to 0.30.

-Give the maintainership to michael johnson <ahze@ahze.net>.

PR:		ports/68333
Submitted by:	michael johnson <ahze@ahze.net>

6 files changed, 41 insertions, 60 deletions

diff --git a/deskutils/gdesklets-starterbar/Makefile b/deskutils/gdesklets-starterbar/Makefile
index c7dd3aa25a8e..ec0cbe8ead3b 100644
--- a/deskutils/gdesklets-starterbar/Makefile
+++ b/deskutils/gdesklets-starterbar/Makefile
@@ -6,17 +6,17 @@
 #
 
 PORTNAME=	starterbar
-PORTVERSION=	0.22.1
-PORTREVISION=	2
+PORTVERSION=	0.30
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://gdesklets.gnomedesktop.org/files/
 PKGNAMEPREFIX=	gdesklets-
 DISTNAME=	starterbar-desklet-${PORTVERSION}
 
-MAINTAINER=	mezz@FreeBSD.org
+MAINTAINER=	ahze@ahze.net
 COMMENT=	An icon bar for GNOME 2.x where you can put starters into
 
-RUN_DEPENDS=	${X11BASE}/libdata/pkgconfig/gdesklets-core.pc:${PORTSDIR}/deskutils/gdesklets
+RUN_DEPENDS=	${X11BASE}/libdata/pkgconfig/gdesklets-core.pc:${PORTSDIR}/deskutils/gdesklets \
+		${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py-xdg
 
 USE_BZIP2=	yes
 USE_PYTHON=	yes
@@ -26,7 +26,7 @@ USE_REINPLACE=	yes
 NAME=		StarterBar
 DATADIR=	${PREFIX}/share/gnome
 PKGMESSAGE=	${WRKDIR}/pkg-message
-LANG=		de fr pt sq sr sr@Latn sv
+LANG=		ca cs de es fr hr nl pt pt_BR sq sr sr@Latn sv
 
 .include <bsd.port.pre.mk>
 
@@ -37,10 +37,7 @@ RUN_DEPENDS+=	uuid:${PORTSDIR}/misc/ossp-uuid
 do-build:
 	@${WRKSRC}/Install_${NAME}_Sensor.bin --nomsg ${WRKSRC}
 	@${PATCH} ${WRKSRC}/${NAME}/Icon.py < ${FILESDIR}/${NAME}::Icon.py
-	@${PATCH} ${WRKSRC}/${NAME}/IconTheme.py < ${FILESDIR}/${NAME}::IconTheme.py
 	@${PATCH} ${WRKSRC}/${NAME}/__init__.py < ${FILESDIR}/${NAME}::__init__.py
-	@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' \
-		${WRKSRC}/${NAME}/IconTheme.py
 .if ${OSVERSION} < 500000
 	@${REINPLACE_CMD} -e 's|uuidgen|uuid|g' \
 		${WRKSRC}/${NAME}/IconSet.py
diff --git a/deskutils/gdesklets-starterbar/distinfo b/deskutils/gdesklets-starterbar/distinfo
index b7d39d663338..12622cea2a7e 100644
--- a/deskutils/gdesklets-starterbar/distinfo
+++ b/deskutils/gdesklets-starterbar/distinfo
@@ -1,2 +1,2 @@
-MD5 (starterbar-desklet-0.22.1.tar.bz2) = 061f147e979dff9860025bfc6c48de9a
-SIZE (starterbar-desklet-0.22.1.tar.bz2) = 67715
+MD5 (starterbar-desklet-0.30.tar.bz2) = 1e91b7096c8b04a70038fbc1b86e47e7
+SIZE (starterbar-desklet-0.30.tar.bz2) = 72519
diff --git a/deskutils/gdesklets-starterbar/files/StarterBar::Icon.py b/deskutils/gdesklets-starterbar/files/StarterBar::Icon.py
index 5476d4cf80c1..a82c11039089 100644
--- a/deskutils/gdesklets-starterbar/files/StarterBar::Icon.py
+++ b/deskutils/gdesklets-starterbar/files/StarterBar::Icon.py
@@ -1,25 +1,11 @@
---- StarterBar/Icon.py.orig	Sun Nov  9 16:13:33 2003
-+++ StarterBar/Icon.py	Sun Nov  9 16:14:28 2003
+--- StarterBar/Icon.py.orig	Fri Jun 25 00:28:42 2004
++++ StarterBar/Icon.py	Fri Jun 25 00:29:44 2004
 @@ -11,7 +11,7 @@
-     __GNOME_PIXMAP_DIR = \
-       os.path.join(
-         commands.getoutput("dirname `which gnome-desktop-item-edit`"),
--        "..", "share", "pixmaps")
-+        "..", "share", "gnome", "pixmaps")
+     "..", "share", "icons"))
+ IconTheme.icondirs.append(os.path.join(
+     commands.getoutput("dirname `which gnome-desktop-item-edit`"),
+-    "..", "share", "pixmaps"))
++    "..", "share", "gnome", "pixmaps"))
  
-     # the unknown icon
-     __UNKNOWN_ICON = "gnome-unknown.png"
-@@ -34,9 +34,10 @@
-     def __load_icon(self, desktopfile):
-         
-         reader = DesktopReader(desktopfile)
--        iconname = reader.get_icon()
--        self.__pixmap = self.__icon_theme.lookup_icon(iconname)
--        if (not self.__pixmap):
-+        try:
-+            iconname = reader.get_icon()
-+            self.__pixmap = self.__icon_theme.lookup_icon(iconname)
-+        except:
-             self.__pixmap = self.__icon_theme.lookup_icon(self.__UNKNOWN_ICON)
  
-         try:
+ class Icon:
diff --git a/deskutils/gdesklets-starterbar/files/StarterBar::IconTheme.py b/deskutils/gdesklets-starterbar/files/StarterBar::IconTheme.py
deleted file mode 100644
index 0f68c1b62625..000000000000
--- a/deskutils/gdesklets-starterbar/files/StarterBar::IconTheme.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- StarterBar/IconTheme.py.orig	Sun Nov  9 16:15:19 2003
-+++ StarterBar/IconTheme.py	Sun Nov  9 16:15:54 2003
-@@ -145,7 +145,7 @@
-            commands.getstatusoutput(self.__PREFIX)
-         if (fail): prefix = "/usr"
- 
--        path = os.path.join(prefix, "share")
-+        path = os.path.join("%%X11BASE%%", "share")
- 
- 
-         dirs = [os.path.join(os.path.expanduser("~"), ".icons"),
diff --git a/deskutils/gdesklets-starterbar/files/StarterBar::__init__.py b/deskutils/gdesklets-starterbar/files/StarterBar::__init__.py
index 1642fefcfcf8..0e9e1f172ef3 100644
--- a/deskutils/gdesklets-starterbar/files/StarterBar::__init__.py
+++ b/deskutils/gdesklets-starterbar/files/StarterBar::__init__.py
@@ -1,11 +1,11 @@
---- StarterBar/__init__.py.orig	Sun Nov  9 16:16:45 2003
-+++ StarterBar/__init__.py	Sun Nov  9 16:16:59 2003
-@@ -413,7 +413,7 @@
+--- StarterBar/__init__.py.orig	Fri Jun 25 00:28:11 2004
++++ StarterBar/__init__.py	Fri Jun 25 00:31:02 2004
+@@ -572,7 +572,7 @@
          cmd = self.__icon_set.get_icon(index).get_command()
          cmd = cmd.replace("%U", file)
  
--        os.system("cd ~ && " + cmd + " & disown")
-+        os.system("cd ~ && " + cmd + " &")
-         self.__animator.unhilight()
-         if (self._get_config("animation")):
-             self.__animator.jump(index)
+-        os.system("cd ~ && exec " + cmd + " & disown")
++        os.system("cd ~ && exec " + cmd + " &")
+ 
+ 
+     #
diff --git a/deskutils/gdesklets-starterbar/pkg-plist b/deskutils/gdesklets-starterbar/pkg-plist
index d78283255c6e..a8280033315f 100644
--- a/deskutils/gdesklets-starterbar/pkg-plist
+++ b/deskutils/gdesklets-starterbar/pkg-plist
@@ -12,30 +12,27 @@ share/gnome/gdesklets/Displays/StarterBar/gfx/preview.png
 share/gnome/gdesklets/Displays/StarterBar/gfx/waterbath.png
 share/gnome/gdesklets/Displays/StarterBar/starterbar.display
 share/gnome/gdesklets/Sensors/StarterBar/.order
-share/gnome/gdesklets/Sensors/StarterBar/Animator.py
-share/gnome/gdesklets/Sensors/StarterBar/Animator.pyc
-share/gnome/gdesklets/Sensors/StarterBar/Animator.pyo
 share/gnome/gdesklets/Sensors/StarterBar/ChangeLog
-share/gnome/gdesklets/Sensors/StarterBar/DesktopReader.py
-share/gnome/gdesklets/Sensors/StarterBar/DesktopReader.pyc
-share/gnome/gdesklets/Sensors/StarterBar/DesktopReader.pyo
 share/gnome/gdesklets/Sensors/StarterBar/Icon.py
 share/gnome/gdesklets/Sensors/StarterBar/Icon.pyc
 share/gnome/gdesklets/Sensors/StarterBar/Icon.pyo
 share/gnome/gdesklets/Sensors/StarterBar/IconSet.py
 share/gnome/gdesklets/Sensors/StarterBar/IconSet.pyc
 share/gnome/gdesklets/Sensors/StarterBar/IconSet.pyo
-share/gnome/gdesklets/Sensors/StarterBar/IconTheme.py
-share/gnome/gdesklets/Sensors/StarterBar/IconTheme.pyc
-share/gnome/gdesklets/Sensors/StarterBar/IconTheme.pyo
 share/gnome/gdesklets/Sensors/StarterBar/README
 share/gnome/gdesklets/Sensors/StarterBar/__init__.py
 share/gnome/gdesklets/Sensors/StarterBar/__init__.pyc
 share/gnome/gdesklets/Sensors/StarterBar/__init__.pyo
 share/gnome/gdesklets/Sensors/StarterBar/home.desktop
+share/gnome/gdesklets/Sensors/StarterBar/locale/ca/LC_MESSAGES/gdesklets.mo
+share/gnome/gdesklets/Sensors/StarterBar/locale/cs/LC_MESSAGES/gdesklets.mo
 share/gnome/gdesklets/Sensors/StarterBar/locale/de/LC_MESSAGES/gdesklets.mo
+share/gnome/gdesklets/Sensors/StarterBar/locale/es/LC_MESSAGES/gdesklets.mo
 share/gnome/gdesklets/Sensors/StarterBar/locale/fr/LC_MESSAGES/gdesklets.mo
+share/gnome/gdesklets/Sensors/StarterBar/locale/hr/LC_MESSAGES/gdesklets.mo
+share/gnome/gdesklets/Sensors/StarterBar/locale/nl/LC_MESSAGES/gdesklets.mo
 share/gnome/gdesklets/Sensors/StarterBar/locale/pt/LC_MESSAGES/gdesklets.mo
+share/gnome/gdesklets/Sensors/StarterBar/locale/pt_BR/LC_MESSAGES/gdesklets.mo
 share/gnome/gdesklets/Sensors/StarterBar/locale/sq/LC_MESSAGES/gdesklets.mo
 share/gnome/gdesklets/Sensors/StarterBar/locale/sr/LC_MESSAGES/gdesklets.mo
 share/gnome/gdesklets/Sensors/StarterBar/locale/sr@Latn/LC_MESSAGES/gdesklets.mo
@@ -48,12 +45,24 @@ share/gnome/gdesklets/Sensors/StarterBar/locale/sv/LC_MESSAGES/gdesklets.mo
 @dirrm share/gnome/gdesklets/Sensors/StarterBar/locale/sr
 @dirrm share/gnome/gdesklets/Sensors/StarterBar/locale/sq/LC_MESSAGES
 @dirrm share/gnome/gdesklets/Sensors/StarterBar/locale/sq
+@dirrm share/gnome/gdesklets/Sensors/StarterBar/locale/pt_BR/LC_MESSAGES
+@dirrm share/gnome/gdesklets/Sensors/StarterBar/locale/pt_BR
 @dirrm share/gnome/gdesklets/Sensors/StarterBar/locale/pt/LC_MESSAGES
 @dirrm share/gnome/gdesklets/Sensors/StarterBar/locale/pt
+@dirrm share/gnome/gdesklets/Sensors/StarterBar/locale/nl/LC_MESSAGES
+@dirrm share/gnome/gdesklets/Sensors/StarterBar/locale/nl
+@dirrm share/gnome/gdesklets/Sensors/StarterBar/locale/hr/LC_MESSAGES
+@dirrm share/gnome/gdesklets/Sensors/StarterBar/locale/hr
 @dirrm share/gnome/gdesklets/Sensors/StarterBar/locale/fr/LC_MESSAGES
 @dirrm share/gnome/gdesklets/Sensors/StarterBar/locale/fr
+@dirrm share/gnome/gdesklets/Sensors/StarterBar/locale/es/LC_MESSAGES
+@dirrm share/gnome/gdesklets/Sensors/StarterBar/locale/es
 @dirrm share/gnome/gdesklets/Sensors/StarterBar/locale/de/LC_MESSAGES
 @dirrm share/gnome/gdesklets/Sensors/StarterBar/locale/de
+@dirrm share/gnome/gdesklets/Sensors/StarterBar/locale/cs/LC_MESSAGES
+@dirrm share/gnome/gdesklets/Sensors/StarterBar/locale/cs
+@dirrm share/gnome/gdesklets/Sensors/StarterBar/locale/ca/LC_MESSAGES
+@dirrm share/gnome/gdesklets/Sensors/StarterBar/locale/ca
 @dirrm share/gnome/gdesklets/Sensors/StarterBar/locale
 @dirrm share/gnome/gdesklets/Sensors/StarterBar
 @dirrm share/gnome/gdesklets/Displays/StarterBar/gfx