Update to 0.22.1.

Submitted by:	maintainer

7 files changed, 66 insertions, 55 deletions

diff --git a/deskutils/gdesklets-starterbar/Makefile b/deskutils/gdesklets-starterbar/Makefile
index 04bfab66d6ea..b9e678890e20 100644
--- a/deskutils/gdesklets-starterbar/Makefile
+++ b/deskutils/gdesklets-starterbar/Makefile
@@ -5,8 +5,9 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gdesklets-starterbar
-PORTVERSION=	0.20
+PORTNAME=	starterbar
+PKGNAMEPREFIX= gdesklets-
+PORTVERSION=	0.22.1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://gdesklets.gnomedesktop.org/files/
 DISTNAME=	starterbar-desklet-${PORTVERSION}
@@ -18,7 +19,11 @@ RUN_DEPENDS=	${X11BASE}/libdata/pkgconfig/gdesklets-core.pc:${PORTSDIR}/deskutil
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
+USE_REINPLACE=	yes
+
 NAME=		StarterBar
+LANG=		de fr pt sq sr sr@Latn sv
+DATADIR=	${PREFIX}/share/gnome
 
 .include <bsd.port.pre.mk>
 
@@ -29,17 +34,29 @@ IGNORE=		"Requires FreeBSD 5.0 or later, because of uuidgen command first appear
 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
 	@${FIND} ${WRKSRC} -name '*.orig' -delete
+	@${FIND} ${WRKSRC} -name '*.bak' -delete
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/gnome/gdesklets/Displays/${NAME}
-	@${CP} ${WRKSRC}/*.display ${PREFIX}/share/gnome/gdesklets/Displays/${NAME}/
-	@${CP} -Rp ${WRKSRC}/gfx ${PREFIX}/share/gnome/gdesklets/Displays/${NAME}/
-	@${CP} -Rp ${WRKSRC}/${NAME} ${PREFIX}/share/gnome/gdesklets/Sensors/
-	@${CP} ${WRKSRC}/README ${PREFIX}/share/gnome/gdesklets/Displays/${NAME}/
-	@${LN} -s ${PREFIX}/share/gnome/gdesklets/Displays/${NAME}/README \
-		${PREFIX}/share/gnome/gdesklets/Sensors/${NAME}/README
+	@${MKDIR} ${DATADIR}/gdesklets/Displays/${NAME}/gfx
+.for ii in ${LANG}
+	@${MKDIR} ${DATADIR}/gdesklets/Sensors/${NAME}/locale/${ii}/LC_MESSAGES
+	@${INSTALL_DATA} ${WRKSRC}/${NAME}/locale/${ii}/LC_MESSAGES/*.mo \
+		${DATADIR}/gdesklets/Sensors/${NAME}/locale/${ii}/LC_MESSAGES/
+.endfor
+	@${INSTALL_DATA} ${WRKSRC}/${NAME}/*.py ${DATADIR}/gdesklets/Sensors/${NAME}/
+	@${INSTALL_DATA} ${WRKSRC}/${NAME}/*.desktop ${DATADIR}/gdesklets/Sensors/${NAME}/
+	@${CP} ${WRKSRC}/${NAME}/.order ${DATADIR}/gdesklets/Sensors/${NAME}/
+	@${INSTALL_DATA} ${WRKSRC}/${NAME}/ChangeLog ${DATADIR}/gdesklets/Sensors/${NAME}/
+	@${INSTALL_DATA} ${WRKSRC}/*.display ${DATADIR}/gdesklets/Displays/${NAME}/
+	@${INSTALL_DATA} ${WRKSRC}/gfx/*.png ${DATADIR}/gdesklets/Displays/${NAME}/gfx/
+	@${INSTALL_DATA} ${WRKSRC}/README ${DATADIR}/gdesklets/Displays/${NAME}/
+	@${LN} -s ${DATADIR}/gdesklets/Displays/${NAME}/README \
+		${DATADIR}/gdesklets/Sensors/${NAME}/README
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/deskutils/gdesklets-starterbar/distinfo b/deskutils/gdesklets-starterbar/distinfo
index c0a5f8f51d4a..de80e1a54b24 100644
--- a/deskutils/gdesklets-starterbar/distinfo
+++ b/deskutils/gdesklets-starterbar/distinfo
@@ -1 +1 @@
-MD5 (starterbar-desklet-0.20.tar.bz2) = 5260e70daabcb97ca7c65ec2455959ca
+MD5 (starterbar-desklet-0.22.1.tar.bz2) = 061f147e979dff9860025bfc6c48de9a
diff --git a/deskutils/gdesklets-starterbar/files/StarterBar::Icon.py b/deskutils/gdesklets-starterbar/files/StarterBar::Icon.py
index fbe820f00c47..5476d4cf80c1 100644
--- a/deskutils/gdesklets-starterbar/files/StarterBar::Icon.py
+++ b/deskutils/gdesklets-starterbar/files/StarterBar::Icon.py
@@ -1,5 +1,5 @@
---- StarterBar/Icon.py.orig	Wed Sep 24 14:26:55 2003
-+++ StarterBar/Icon.py	Wed Sep 24 14:28:22 2003
+--- StarterBar/Icon.py.orig	Sun Nov  9 16:13:33 2003
++++ StarterBar/Icon.py	Sun Nov  9 16:14:28 2003
 @@ -11,7 +11,7 @@
      __GNOME_PIXMAP_DIR = \
        os.path.join(
@@ -9,15 +9,17 @@
  
      # the unknown icon
      __UNKNOWN_ICON = "gnome-unknown.png"
-@@ -61,7 +61,10 @@
-                 return os.path.join(self.__GNOME_PIXMAP_DIR, f)
-         #end for
- 
--        return os.path.join(self.__GNOME_PIXMAP_DIR, self.__UNKNOWN_ICON)
-+        return os.path.join(
-+                 commands.getoutput("dirname `which gnome-desktop-item-edit`"),
-+                 "..", "share", "icons", "gnome", "48x48", "apps",
-+                 self.__UNKNOWN_ICON)
- 
- 
+@@ -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:
diff --git a/deskutils/gdesklets-starterbar/files/StarterBar::IconTheme.py b/deskutils/gdesklets-starterbar/files/StarterBar::IconTheme.py
new file mode 100644
index 000000000000..0f68c1b62625
--- /dev/null
+++ b/deskutils/gdesklets-starterbar/files/StarterBar::IconTheme.py
@@ -0,0 +1,11 @@
+--- 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 26a938eb6348..1642fefcfcf8 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	Wed Sep 24 14:31:33 2003
-+++ StarterBar/__init__.py	Wed Sep 24 14:32:22 2003
-@@ -336,7 +336,7 @@
-             index = self.__current_index
-             if (self.__dragged_icon == -1 or self.__dragged_icon == index):
-                 cmd = self.__icon_set.get_icon(index).get_command()
--                os.system("cd ~ && " + cmd + " & disown")
-+                os.system("cd ~ && " + cmd + " &")
-                 self.__animator.unhilight()
-                 if (self._get_config("animation")):
-                     self.__animator.jump(index)
+--- 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 @@
+         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)
diff --git a/deskutils/gdesklets-starterbar/files/patch-Install_StarterBar_Sensor.bin b/deskutils/gdesklets-starterbar/files/patch-Install_StarterBar_Sensor.bin
deleted file mode 100644
index 3faccc9833a0..000000000000
--- a/deskutils/gdesklets-starterbar/files/patch-Install_StarterBar_Sensor.bin
+++ /dev/null
@@ -1,19 +0,0 @@
---- Install_StarterBar_Sensor.bin.orig	Wed Sep 24 14:24:12 2003
-+++ Install_StarterBar_Sensor.bin	Wed Sep 24 14:24:49 2003
-@@ -75,15 +75,9 @@
-     else:
-         cmd = "mkdir -p %(destination)s; cd %(destination)s; " \
-               "LANG=C tar -xzf %(tmp)s 2>&1"
--    fail, out = commands.getstatusoutput(cmd % vars())
-+    commands.getstatusoutput(cmd % vars())
-     os.unlink(tmp)
-     
--    if (fail):
--        if (no_message): print ERROR_TAR + out
--        else: message(ERROR_TAR + out, "error")
--        sys.exit(1)
--
--    print out
-     if (not list_only):
-         if (no_message): print SUCCESS
-         else: message(SUCCESS, "info")
diff --git a/deskutils/gdesklets-starterbar/pkg-plist b/deskutils/gdesklets-starterbar/pkg-plist
index 7b5ee82efed0..11de36a069d3 100644
--- a/deskutils/gdesklets-starterbar/pkg-plist
+++ b/deskutils/gdesklets-starterbar/pkg-plist
@@ -8,9 +8,9 @@ share/gnome/gdesklets/Displays/StarterBar/gfx/bg-se.png
 share/gnome/gdesklets/Displays/StarterBar/gfx/bg-sw.png
 share/gnome/gdesklets/Displays/StarterBar/gfx/bg-w.png
 share/gnome/gdesklets/Displays/StarterBar/gfx/bg.png
+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/.#ChangeLog.1.2
-share/gnome/gdesklets/Sensors/StarterBar/.#__init__.py.1.3
 share/gnome/gdesklets/Sensors/StarterBar/.order
 share/gnome/gdesklets/Sensors/StarterBar/Animator.py
 share/gnome/gdesklets/Sensors/StarterBar/ChangeLog