5 files changed, 30 insertions, 48 deletions

diff --git a/x11-clocks/gdesklets-clock/Makefile b/x11-clocks/gdesklets-clock/Makefile
index 1fc3d0cab3c2..0499d1863bbf 100644
--- a/x11-clocks/gdesklets-clock/Makefile
+++ b/x11-clocks/gdesklets-clock/Makefile
@@ -7,9 +7,9 @@
 
 PORTNAME=	clock
 PORTVERSION=	0.32
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	x11-clocks gnome
-MASTER_SITES=	http://gdesklets.gnomedesktop.org/files/
+MASTER_SITES=	http://www.gdesklets.info/archive/
 PKGNAMEPREFIX=	gdesklets-
 DISTNAME=	clock-desklet-${PORTVERSION}
 
@@ -18,36 +18,37 @@ COMMENT=	Various clock displays for Gnome 2.x
 
 RUN_DEPENDS=	gdesklets:${PORTSDIR}/deskutils/gdesklets
 
-USE_BZIP2=	yes
 USE_PYTHON=	yes
-USE_XORG=	x11
 
+SUB_FILES=	pkg-message
+SUB_LIST=	NAME="${NAME}"
+
+DATADIR=	${PREFIX}/share/gdesklets
 NAME=		Clock
-DATADIR=	${PREFIX}/share
+
 LANG=		de fr pt sq sr sr@Latn sv
 
 do-build:
 	@${WRKSRC}/Install_${NAME}_Sensor.bin --nomsg ${WRKSRC}
-	@${FIND} ${WRKSRC} -name '*.orig' -delete
 	@${PATCH} ${WRKSRC}/Clock/__init__.py < ${FILESDIR}/Clock::__init__.py
 
 do-install:
-	@${MKDIR} ${DATADIR}/gdesklets/Displays/${NAME}/gfx
+	@${MKDIR} ${DATADIR}/Displays/${NAME}
+	${INSTALL_DATA} ${WRKSRC}/*.display ${DATADIR}/Displays/${NAME}
+	${INSTALL_DATA} ${WRKSRC}/README ${DATADIR}/Displays/${NAME}
+	@${MKDIR} ${DATADIR}/Displays/${NAME}/gfx
+	${INSTALL_DATA} ${WRKSRC}/gfx/*.png ${DATADIR}/Displays/${NAME}/gfx
+	${INSTALL_DATA} ${WRKSRC}/gfx/*.xcf ${DATADIR}/Displays/${NAME}/gfx
+	@${MKDIR} ${DATADIR}/Sensors/${NAME}
+	${INSTALL_DATA} ${WRKSRC}/${NAME}/*.dat ${DATADIR}/Sensors/${NAME}
+	${INSTALL_DATA} ${WRKSRC}/${NAME}/*.py ${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}/*.dat ${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}/gfx/*.xcf ${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:
+	@${LN} -s ${DATADIR}/Displays/${NAME}/README \
+		${DATADIR}/Sensors/${NAME}/README
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/x11-clocks/gdesklets-clock/distinfo b/x11-clocks/gdesklets-clock/distinfo
index c01a4dba3ac8..8e1c22b91087 100644
--- a/x11-clocks/gdesklets-clock/distinfo
+++ b/x11-clocks/gdesklets-clock/distinfo
@@ -1,3 +1,3 @@
-MD5 (clock-desklet-0.32.tar.bz2) = d9b8a292e6e439ab62765143b6678df5
-SHA256 (clock-desklet-0.32.tar.bz2) = 83d50abf487f2e0f6d9e5a53e82d6f113bca33843dcb1cd46a7f38a23745635d
-SIZE (clock-desklet-0.32.tar.bz2) = 159655
+MD5 (clock-desklet-0.32.tar.gz) = 76e7d3dbad0808f5a86ade082db7741d
+SHA256 (clock-desklet-0.32.tar.gz) = 3fdf3e17104263454201f69709ec16bc00fd540ba8f20498876c7bee8b736072
+SIZE (clock-desklet-0.32.tar.gz) = 157407
diff --git a/x11-clocks/gdesklets-clock/files/patch-Install_Clock_Sensor.bin b/x11-clocks/gdesklets-clock/files/patch-Install_Clock_Sensor.bin
deleted file mode 100644
index 0de363c68faf..000000000000
--- a/x11-clocks/gdesklets-clock/files/patch-Install_Clock_Sensor.bin
+++ /dev/null
@@ -1,19 +0,0 @@
---- Install_Clock_Sensor.bin.orig	Wed Sep  3 12:51:06 2003
-+++ Install_Clock_Sensor.bin	Wed Sep  3 12:52:23 2003
-@@ -75,15 +75,9 @@
-     else:
-         cmd = "mkdir -p %(destination)s; cd %(destination)s; " \
-               "LANG=C tar -xzvf %(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/x11-clocks/gdesklets-clock/pkg-message b/x11-clocks/gdesklets-clock/files/pkg-message.in
index c9b65b336552..20688a163ff3 100644
--- a/x11-clocks/gdesklets-clock/pkg-message
+++ b/x11-clocks/gdesklets-clock/files/pkg-message.in
@@ -1,16 +1,16 @@
 ##
 To view the README:
 
-	cat ${PREFIX}/share/gdesklets/Displays/${name}/README
-	cat ${PREFIX}/share/gdesklets/Sensors/${name}/README
+	cat %%PREFIX%%/share/gdesklets/Displays/%%NAME%%/README
+	cat %%PREFIX%%/share/gdesklets/Sensors/%%NAME%%/README
 
-To view all installed applets:
+To view the installed applets:
 
-	ls ${PREFIX}/share/gdesklets/Displays
+	ls %%PREFIX%%/share/gdesklets/Displays
 
 To use those applets:
 
-	gdesklets open ${PREFIX}/share/gdesklets/Displays/${name}/${name}.display
+	gdesklets open %%PREFIX%%/share/gdesklets/Displays/%%NAME%%/${name}.display
 
 Replace ${name} with the correct name of the applets you want to use.
 
diff --git a/x11-clocks/gdesklets-clock/pkg-descr b/x11-clocks/gdesklets-clock/pkg-descr
index 539db54567ef..7b1846240f52 100644
--- a/x11-clocks/gdesklets-clock/pkg-descr
+++ b/x11-clocks/gdesklets-clock/pkg-descr
@@ -1,3 +1,3 @@
 The Clock sensor with various clock displays.
 
-WWW: http://gdesklets.gnomedesktop.org/
+WWW: http://archive.gdesklets.info/