4 files changed, 31 insertions, 33 deletions

diff --git a/x11-clocks/gdesklets-countdown/Makefile b/x11-clocks/gdesklets-countdown/Makefile
index 243c82027afc..3bf6cbcfae76 100644
--- a/x11-clocks/gdesklets-countdown/Makefile
+++ b/x11-clocks/gdesklets-countdown/Makefile
@@ -7,44 +7,42 @@
 
 PORTNAME=	countdown
 PORTVERSION=	0.8
-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=	Countdown-${PORTVERSION}
+DISTNAME=	juju-countdown-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Countdown the remaining time until a configurable date
 
 RUN_DEPENDS=	gdesklets:${PORTSDIR}/deskutils/gdesklets
 
-USE_BZIP2=	yes
-USE_XORG=	x11
+WRKSRC=		${WRKDIR}/juju-countdown
+
+NO_BUILD=	yes
 USE_PYTHON=	yes
 
-NAME=		Countdown
-DATADIR=	${PREFIX}/share
-PKGMESSAGE=	${WRKDIR}/pkg-message
+SUB_FILES=	pkg-message
+SUB_LIST=	NAME="${NAME}"
 
-do-build:
-	@${WRKSRC}/Install_${NAME}_Sensor.bin --nomsg ${WRKSRC}
-	@${WRKSRC}/Install_LTVFontSelector_Sensor.bin --nomsg ${WRKSRC}
-	@${FIND} ${WRKSRC} -name '*.orig' -delete
-	@${CAT} pkg-message | ${SED} -e 's|%%PREFIX%%|${PREFIX}|g' > ${PKGMESSAGE}
+DATADIR=	${PREFIX}/share/gdesklets
+NAME=		Countdown
 
 do-install:
-	@${MKDIR} ${DATADIR}/gdesklets/Displays/${NAME}/gfx
-	@${MKDIR} ${DATADIR}/gdesklets/Sensors/${NAME}
-	@${MKDIR} ${DATADIR}/gdesklets/Sensors/LTVFontSelector/
-	@${INSTALL_DATA} ${WRKSRC}/${NAME}/*.py ${DATADIR}/gdesklets/Sensors/${NAME}/
-	@${INSTALL_DATA} ${WRKSRC}/LTVFontSelector/*.py ${DATADIR}/gdesklets/Sensors/LTVFontSelector/
-	@${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}/
-	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${DATADIR}/gdesklets/Sensors/${NAME}
-	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${DATADIR}/gdesklets/Sensors/${NAME}
-	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${DATADIR}/gdesklets/Sensors/LTVFontSelector
-	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${DATADIR}/gdesklets/Sensors/LTVFontSelector
+	@${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
+	@${MKDIR} ${DATADIR}/Sensors/${NAME}
+	${INSTALL_DATA} ${WRKSRC}/Sensors/${NAME}/*.py ${DATADIR}/Sensors/${NAME}
+	@${MKDIR} ${DATADIR}/Sensors/LTVFontSelector
+	${INSTALL_DATA} ${WRKSRC}/Sensors/LTVFontSelector/*.py ${DATADIR}/Sensors/LTVFontSelector
+	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${DATADIR}/Sensors/${NAME}
+	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${DATADIR}/Sensors/${NAME}
+	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${DATADIR}/Sensors/LTVFontSelector
+	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${DATADIR}/Sensors/LTVFontSelector
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/x11-clocks/gdesklets-countdown/distinfo b/x11-clocks/gdesklets-countdown/distinfo
index d047b8218beb..6d74de0069fe 100644
--- a/x11-clocks/gdesklets-countdown/distinfo
+++ b/x11-clocks/gdesklets-countdown/distinfo
@@ -1,3 +1,3 @@
-MD5 (Countdown-0.8.tar.bz2) = b69ba353eb51342a24b1588190f08431
-SHA256 (Countdown-0.8.tar.bz2) = d7ce799f3fc95c772b2ad2033feacdd1fc1277f9f24201eb727b8e64c76772c1
-SIZE (Countdown-0.8.tar.bz2) = 31246
+MD5 (juju-countdown-0.8.tar.gz) = da1bfa66d18b2df1a91e8881e89872c7
+SHA256 (juju-countdown-0.8.tar.gz) = 86da89d14f1b10241872d3cbe3cf4ce84af006cd71d774a5656859d649243081
+SIZE (juju-countdown-0.8.tar.gz) = 31365
diff --git a/x11-clocks/gdesklets-countdown/pkg-message b/x11-clocks/gdesklets-countdown/files/pkg-message.in
index 9fd7bd2d6086..5424feb95d75 100644
--- a/x11-clocks/gdesklets-countdown/pkg-message
+++ b/x11-clocks/gdesklets-countdown/files/pkg-message.in
@@ -1,16 +1,16 @@
 ##
 To view the README:
 
-	cat %%PREFIX%%/share/gdesklets/Displays/Countdown/README
-	cat %%PREFIX%%/share/gdesklets/Sensors/Countdown/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
 
 To use those applets:
 
-	gdesklets open %%PREFIX%%/share/gdesklets/Displays/Countdown/Countdown.display
+	gdesklets open %%PREFIX%%/share/gdesklets/Displays/%%NAME%%/%%NAME%%.display
 
 NOTE: Be sure to login as your user when you use the gdesklets command,
       as the configuration will be stored in the ~/.gdesklets/ directory.
diff --git a/x11-clocks/gdesklets-countdown/pkg-descr b/x11-clocks/gdesklets-countdown/pkg-descr
index 49faaa72344c..e142d7456125 100644
--- a/x11-clocks/gdesklets-countdown/pkg-descr
+++ b/x11-clocks/gdesklets-countdown/pkg-descr
@@ -3,4 +3,4 @@ date. It then displays a victorious 'Hurrah!', or whatever you set.
 It also provides an increasing counter ('countup' feature), displaying
 the time elapsed from the specified date.
 
-WWW: http://gdesklets.gnomedesktop.org/
+WWW: http://archive.gdesklets.info/