4 files changed, 110 insertions, 105 deletions

diff --git a/deskutils/gdesklets-starterbar/Makefile b/deskutils/gdesklets-starterbar/Makefile
index 0e3d1c696655..bc843f64051a 100644
--- a/deskutils/gdesklets-starterbar/Makefile
+++ b/deskutils/gdesklets-starterbar/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	starterbar
-PORTVERSION=	0.31.2
-PORTREVISION=	8
+PORTVERSION=	0.31.3
 CATEGORIES=	deskutils gnome
-MASTER_SITES=	http://gdesklets.gnomedesktop.org/files/
+MASTER_SITES=	http://www.gdesklets.info/archive/
 PKGNAMEPREFIX=	gdesklets-
 DISTNAME=	starterbar-desklet-${PORTVERSION}
 
@@ -19,41 +18,41 @@ COMMENT=	An icon bar for GNOME 2.x where you can put starters into
 RUN_DEPENDS=	gdesklets:${PORTSDIR}/deskutils/gdesklets \
 		${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py-xdg
 
-USE_BZIP2=	yes
 USE_PYTHON=	yes
 
+SUB_FILES=	pkg-message
+SUB_LIST=	NAME="${NAME}"
+
+DATADIR=	${PREFIX}/share/gdesklets
 NAME=		StarterBar
-DATADIR=	${PREFIX}/share
-PKGMESSAGE=	${WRKDIR}/pkg-message
-LANG=		ca cs de es fr hr nl pt pt_BR sq sr sr@Latn sv
+
+LANG=		ca cs de en_CA en_GB es fr hr nl pt pt_BR sq sr sr@Latn sv
 
 do-build:
 	@${WRKSRC}/Install_${NAME}_Sensor.bin --nomsg ${WRKSRC}
-	@${FIND} ${WRKSRC} -name '*.orig' -delete
-	@${FIND} ${WRKSRC} -name '*.bak' -delete
 
 do-install:
-	@${MKDIR} ${DATADIR}/gdesklets/Displays/${NAME}/gfx
+	@${MKDIR} ${DATADIR}/Displays/${NAME}
+	${INSTALL_DATA} ${WRKSRC}/README ${DATADIR}/Displays/${NAME}
+	${INSTALL_DATA} ${WRKSRC}/*.display ${DATADIR}/Displays/${NAME}
+	@${MKDIR} ${DATADIR}/Displays/${NAME}/gfx
+	${INSTALL_DATA} ${WRKSRC}/gfx/*.png ${DATADIR}/Displays/${NAME}/gfx
+	@${MKDIR} ${DATADIR}/Sensors/${NAME}
+	${INSTALL_DATA} ${WRKSRC}/${NAME}/ChangeLog ${DATADIR}/Sensors/${NAME}
+	${INSTALL_DATA} ${WRKSRC}/${NAME}/*.desktop ${DATADIR}/Sensors/${NAME}
+	${INSTALL_DATA} ${WRKSRC}/${NAME}/*.py ${DATADIR}/Sensors/${NAME}
+	@${CP} ${WRKSRC}/${NAME}/.order ${DATADIR}/Sensors/${NAME}
 .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/
+	@${MKDIR} ${DATADIR}/Sensors/${NAME}/locale/${ii}/LC_MESSAGES
+	${INSTALL_DATA} ${WRKSRC}/${NAME}/locale/${ii}/LC_MESSAGES/*.mo \
+		${DATADIR}/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
+	@${LN} -s ${DATADIR}/Displays/${NAME}/README \
+		${DATADIR}/Sensors/${NAME}/README
 
 post-install:
-	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${DATADIR}/gdesklets/Sensors/${NAME}
-	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${DATADIR}/gdesklets/Sensors/${NAME}
-	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g ; s|%%NAME%%|${NAME}|g' \
-		${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
+	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${DATADIR}/Sensors/${NAME}
+	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${DATADIR}/Sensors/${NAME}
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/deskutils/gdesklets-starterbar/distinfo b/deskutils/gdesklets-starterbar/distinfo
index 535beb5b2fb6..6146a5cd5ff5 100644
--- a/deskutils/gdesklets-starterbar/distinfo
+++ b/deskutils/gdesklets-starterbar/distinfo
@@ -1,3 +1,3 @@
-MD5 (starterbar-desklet-0.31.2.tar.bz2) = 02c63fb470780ccc4841103fe72a0680
-SHA256 (starterbar-desklet-0.31.2.tar.bz2) = b0026e11a4e7f05d0b22e87b9e9b4b7305b6c9ebdaa24855e40a79aaccd4979f
-SIZE (starterbar-desklet-0.31.2.tar.bz2) = 71887
+MD5 (starterbar-desklet-0.31.3.tar.gz) = fee42cc50af5ac9fc4957719d6e7e1f0
+SHA256 (starterbar-desklet-0.31.3.tar.gz) = 113cc14df9009b264a93c5fdb03691109917fcb948315805b6449d90b8ffdc85
+SIZE (starterbar-desklet-0.31.3.tar.gz) = 92908
diff --git a/deskutils/gdesklets-starterbar/pkg-descr b/deskutils/gdesklets-starterbar/pkg-descr
index e97f62ac6e21..caad8bbbbb16 100644
--- a/deskutils/gdesklets-starterbar/pkg-descr
+++ b/deskutils/gdesklets-starterbar/pkg-descr
@@ -1,4 +1,4 @@
 An icon bar for GNOME where you can put starters into. Yes, you can do the
 same with the GNOME panel, but this one is pure eye candy!
 
-WWW: http://gdesklets.gnomedesktop.org
+WWW: http://archive.gdesklets.info/
diff --git a/deskutils/gdesklets-starterbar/pkg-plist b/deskutils/gdesklets-starterbar/pkg-plist
index 4c5636c9090c..f5e439b8b52a 100644
--- a/deskutils/gdesklets-starterbar/pkg-plist
+++ b/deskutils/gdesklets-starterbar/pkg-plist
@@ -1,75 +1,81 @@
-share/gdesklets/Displays/StarterBar/README
-share/gdesklets/Displays/StarterBar/gfx/bg-e.png
-share/gdesklets/Displays/StarterBar/gfx/bg-n.png
-share/gdesklets/Displays/StarterBar/gfx/bg-ne.png
-share/gdesklets/Displays/StarterBar/gfx/bg-nw.png
-share/gdesklets/Displays/StarterBar/gfx/bg-s.png
-share/gdesklets/Displays/StarterBar/gfx/bg-se.png
-share/gdesklets/Displays/StarterBar/gfx/bg-sw.png
-share/gdesklets/Displays/StarterBar/gfx/bg-w.png
-share/gdesklets/Displays/StarterBar/gfx/bg.png
-share/gdesklets/Displays/StarterBar/gfx/preview.png
-share/gdesklets/Displays/StarterBar/gfx/waterbath.png
-share/gdesklets/Displays/StarterBar/starterbar.display
-share/gdesklets/Sensors/StarterBar/.order
-share/gdesklets/Sensors/StarterBar/ChangeLog
-share/gdesklets/Sensors/StarterBar/FileWatcher.py
-share/gdesklets/Sensors/StarterBar/FileWatcher.pyc
-share/gdesklets/Sensors/StarterBar/FileWatcher.pyo
-share/gdesklets/Sensors/StarterBar/GConfWatcher.py
-share/gdesklets/Sensors/StarterBar/GConfWatcher.pyc
-share/gdesklets/Sensors/StarterBar/GConfWatcher.pyo
-share/gdesklets/Sensors/StarterBar/Icon.py
-share/gdesklets/Sensors/StarterBar/Icon.pyc
-share/gdesklets/Sensors/StarterBar/Icon.pyo
-share/gdesklets/Sensors/StarterBar/IconSet.py
-share/gdesklets/Sensors/StarterBar/IconSet.pyc
-share/gdesklets/Sensors/StarterBar/IconSet.pyo
-share/gdesklets/Sensors/StarterBar/README
-share/gdesklets/Sensors/StarterBar/__init__.py
-share/gdesklets/Sensors/StarterBar/__init__.pyc
-share/gdesklets/Sensors/StarterBar/__init__.pyo
-share/gdesklets/Sensors/StarterBar/home.desktop
-share/gdesklets/Sensors/StarterBar/locale/ca/LC_MESSAGES/gdesklets.mo
-share/gdesklets/Sensors/StarterBar/locale/cs/LC_MESSAGES/gdesklets.mo
-share/gdesklets/Sensors/StarterBar/locale/de/LC_MESSAGES/gdesklets.mo
-share/gdesklets/Sensors/StarterBar/locale/es/LC_MESSAGES/gdesklets.mo
-share/gdesklets/Sensors/StarterBar/locale/fr/LC_MESSAGES/gdesklets.mo
-share/gdesklets/Sensors/StarterBar/locale/hr/LC_MESSAGES/gdesklets.mo
-share/gdesklets/Sensors/StarterBar/locale/nl/LC_MESSAGES/gdesklets.mo
-share/gdesklets/Sensors/StarterBar/locale/pt/LC_MESSAGES/gdesklets.mo
-share/gdesklets/Sensors/StarterBar/locale/pt_BR/LC_MESSAGES/gdesklets.mo
-share/gdesklets/Sensors/StarterBar/locale/sq/LC_MESSAGES/gdesklets.mo
-share/gdesklets/Sensors/StarterBar/locale/sr/LC_MESSAGES/gdesklets.mo
-share/gdesklets/Sensors/StarterBar/locale/sr@Latn/LC_MESSAGES/gdesklets.mo
-share/gdesklets/Sensors/StarterBar/locale/sv/LC_MESSAGES/gdesklets.mo
-@dirrm share/gdesklets/Sensors/StarterBar/locale/sv/LC_MESSAGES
-@dirrm share/gdesklets/Sensors/StarterBar/locale/sv
-@dirrm share/gdesklets/Sensors/StarterBar/locale/sr@Latn/LC_MESSAGES
-@dirrm share/gdesklets/Sensors/StarterBar/locale/sr@Latn
-@dirrm share/gdesklets/Sensors/StarterBar/locale/sr/LC_MESSAGES
-@dirrm share/gdesklets/Sensors/StarterBar/locale/sr
-@dirrm share/gdesklets/Sensors/StarterBar/locale/sq/LC_MESSAGES
-@dirrm share/gdesklets/Sensors/StarterBar/locale/sq
-@dirrm share/gdesklets/Sensors/StarterBar/locale/pt_BR/LC_MESSAGES
-@dirrm share/gdesklets/Sensors/StarterBar/locale/pt_BR
-@dirrm share/gdesklets/Sensors/StarterBar/locale/pt/LC_MESSAGES
-@dirrm share/gdesklets/Sensors/StarterBar/locale/pt
-@dirrm share/gdesklets/Sensors/StarterBar/locale/nl/LC_MESSAGES
-@dirrm share/gdesklets/Sensors/StarterBar/locale/nl
-@dirrm share/gdesklets/Sensors/StarterBar/locale/hr/LC_MESSAGES
-@dirrm share/gdesklets/Sensors/StarterBar/locale/hr
-@dirrm share/gdesklets/Sensors/StarterBar/locale/fr/LC_MESSAGES
-@dirrm share/gdesklets/Sensors/StarterBar/locale/fr
-@dirrm share/gdesklets/Sensors/StarterBar/locale/es/LC_MESSAGES
-@dirrm share/gdesklets/Sensors/StarterBar/locale/es
-@dirrm share/gdesklets/Sensors/StarterBar/locale/de/LC_MESSAGES
-@dirrm share/gdesklets/Sensors/StarterBar/locale/de
-@dirrm share/gdesklets/Sensors/StarterBar/locale/cs/LC_MESSAGES
-@dirrm share/gdesklets/Sensors/StarterBar/locale/cs
-@dirrm share/gdesklets/Sensors/StarterBar/locale/ca/LC_MESSAGES
-@dirrm share/gdesklets/Sensors/StarterBar/locale/ca
-@dirrm share/gdesklets/Sensors/StarterBar/locale
-@dirrm share/gdesklets/Sensors/StarterBar
-@dirrm share/gdesklets/Displays/StarterBar/gfx
-@dirrm share/gdesklets/Displays/StarterBar
+%%DATADIR%%/Displays/StarterBar/README
+%%DATADIR%%/Displays/StarterBar/gfx/bg-e.png
+%%DATADIR%%/Displays/StarterBar/gfx/bg-n.png
+%%DATADIR%%/Displays/StarterBar/gfx/bg-ne.png
+%%DATADIR%%/Displays/StarterBar/gfx/bg-nw.png
+%%DATADIR%%/Displays/StarterBar/gfx/bg-s.png
+%%DATADIR%%/Displays/StarterBar/gfx/bg-se.png
+%%DATADIR%%/Displays/StarterBar/gfx/bg-sw.png
+%%DATADIR%%/Displays/StarterBar/gfx/bg-w.png
+%%DATADIR%%/Displays/StarterBar/gfx/bg.png
+%%DATADIR%%/Displays/StarterBar/gfx/preview.png
+%%DATADIR%%/Displays/StarterBar/gfx/waterbath.png
+%%DATADIR%%/Displays/StarterBar/starterbar.display
+%%DATADIR%%/Sensors/StarterBar/.order
+%%DATADIR%%/Sensors/StarterBar/ChangeLog
+%%DATADIR%%/Sensors/StarterBar/FileWatcher.py
+%%DATADIR%%/Sensors/StarterBar/FileWatcher.pyc
+%%DATADIR%%/Sensors/StarterBar/FileWatcher.pyo
+%%DATADIR%%/Sensors/StarterBar/GConfWatcher.py
+%%DATADIR%%/Sensors/StarterBar/GConfWatcher.pyc
+%%DATADIR%%/Sensors/StarterBar/GConfWatcher.pyo
+%%DATADIR%%/Sensors/StarterBar/Icon.py
+%%DATADIR%%/Sensors/StarterBar/Icon.pyc
+%%DATADIR%%/Sensors/StarterBar/Icon.pyo
+%%DATADIR%%/Sensors/StarterBar/IconSet.py
+%%DATADIR%%/Sensors/StarterBar/IconSet.pyc
+%%DATADIR%%/Sensors/StarterBar/IconSet.pyo
+%%DATADIR%%/Sensors/StarterBar/README
+%%DATADIR%%/Sensors/StarterBar/__init__.py
+%%DATADIR%%/Sensors/StarterBar/__init__.pyc
+%%DATADIR%%/Sensors/StarterBar/__init__.pyo
+%%DATADIR%%/Sensors/StarterBar/home.desktop
+%%DATADIR%%/Sensors/StarterBar/locale/ca/LC_MESSAGES/gdesklets.mo
+%%DATADIR%%/Sensors/StarterBar/locale/cs/LC_MESSAGES/gdesklets.mo
+%%DATADIR%%/Sensors/StarterBar/locale/de/LC_MESSAGES/gdesklets.mo
+%%DATADIR%%/Sensors/StarterBar/locale/en_CA/LC_MESSAGES/gdesklets.mo
+%%DATADIR%%/Sensors/StarterBar/locale/en_GB/LC_MESSAGES/gdesklets.mo
+%%DATADIR%%/Sensors/StarterBar/locale/es/LC_MESSAGES/gdesklets.mo
+%%DATADIR%%/Sensors/StarterBar/locale/fr/LC_MESSAGES/gdesklets.mo
+%%DATADIR%%/Sensors/StarterBar/locale/hr/LC_MESSAGES/gdesklets.mo
+%%DATADIR%%/Sensors/StarterBar/locale/nl/LC_MESSAGES/gdesklets.mo
+%%DATADIR%%/Sensors/StarterBar/locale/pt/LC_MESSAGES/gdesklets.mo
+%%DATADIR%%/Sensors/StarterBar/locale/pt_BR/LC_MESSAGES/gdesklets.mo
+%%DATADIR%%/Sensors/StarterBar/locale/sq/LC_MESSAGES/gdesklets.mo
+%%DATADIR%%/Sensors/StarterBar/locale/sr/LC_MESSAGES/gdesklets.mo
+%%DATADIR%%/Sensors/StarterBar/locale/sr@Latn/LC_MESSAGES/gdesklets.mo
+%%DATADIR%%/Sensors/StarterBar/locale/sv/LC_MESSAGES/gdesklets.mo
+@dirrm %%DATADIR%%/Sensors/StarterBar/locale/sv/LC_MESSAGES
+@dirrm %%DATADIR%%/Sensors/StarterBar/locale/sv
+@dirrm %%DATADIR%%/Sensors/StarterBar/locale/sr@Latn/LC_MESSAGES
+@dirrm %%DATADIR%%/Sensors/StarterBar/locale/sr@Latn
+@dirrm %%DATADIR%%/Sensors/StarterBar/locale/sr/LC_MESSAGES
+@dirrm %%DATADIR%%/Sensors/StarterBar/locale/sr
+@dirrm %%DATADIR%%/Sensors/StarterBar/locale/sq/LC_MESSAGES
+@dirrm %%DATADIR%%/Sensors/StarterBar/locale/sq
+@dirrm %%DATADIR%%/Sensors/StarterBar/locale/pt_BR/LC_MESSAGES
+@dirrm %%DATADIR%%/Sensors/StarterBar/locale/pt_BR
+@dirrm %%DATADIR%%/Sensors/StarterBar/locale/pt/LC_MESSAGES
+@dirrm %%DATADIR%%/Sensors/StarterBar/locale/pt
+@dirrm %%DATADIR%%/Sensors/StarterBar/locale/nl/LC_MESSAGES
+@dirrm %%DATADIR%%/Sensors/StarterBar/locale/nl
+@dirrm %%DATADIR%%/Sensors/StarterBar/locale/hr/LC_MESSAGES
+@dirrm %%DATADIR%%/Sensors/StarterBar/locale/hr
+@dirrm %%DATADIR%%/Sensors/StarterBar/locale/fr/LC_MESSAGES
+@dirrm %%DATADIR%%/Sensors/StarterBar/locale/fr
+@dirrm %%DATADIR%%/Sensors/StarterBar/locale/es/LC_MESSAGES
+@dirrm %%DATADIR%%/Sensors/StarterBar/locale/es
+@dirrm %%DATADIR%%/Sensors/StarterBar/locale/en_GB/LC_MESSAGES
+@dirrm %%DATADIR%%/Sensors/StarterBar/locale/en_GB
+@dirrm %%DATADIR%%/Sensors/StarterBar/locale/en_CA/LC_MESSAGES
+@dirrm %%DATADIR%%/Sensors/StarterBar/locale/en_CA
+@dirrm %%DATADIR%%/Sensors/StarterBar/locale/de/LC_MESSAGES
+@dirrm %%DATADIR%%/Sensors/StarterBar/locale/de
+@dirrm %%DATADIR%%/Sensors/StarterBar/locale/cs/LC_MESSAGES
+@dirrm %%DATADIR%%/Sensors/StarterBar/locale/cs
+@dirrm %%DATADIR%%/Sensors/StarterBar/locale/ca/LC_MESSAGES
+@dirrm %%DATADIR%%/Sensors/StarterBar/locale/ca
+@dirrm %%DATADIR%%/Sensors/StarterBar/locale
+@dirrm %%DATADIR%%/Sensors/StarterBar
+@dirrm %%DATADIR%%/Displays/StarterBar/gfx
+@dirrm %%DATADIR%%/Displays/StarterBar