5 files changed, 35 insertions, 27 deletions

diff --git a/x11-clocks/gdesklets-ebichuclock/Makefile b/x11-clocks/gdesklets-ebichuclock/Makefile
index edd3908674cc..17a426ae654c 100644
--- a/x11-clocks/gdesklets-ebichuclock/Makefile
+++ b/x11-clocks/gdesklets-ebichuclock/Makefile
@@ -7,9 +7,9 @@
 
 PORTNAME=	ebichuclock
 PORTVERSION=	0.1.1
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	x11-clocks gnome
-MASTER_SITES=	http://gdesklets.gnomedesktop.org/files/
+MASTER_SITES=	http://www.gdesklets.info/archive/
 PKGNAMEPREFIX=	gdesklets-
 
 MAINTAINER=	ports@FreeBSD.org
@@ -18,22 +18,23 @@ COMMENT=	A very simple clock with a small Ebichu picture in it
 RUN_DEPENDS=	gdesklets:${PORTSDIR}/deskutils/gdesklets \
 		${LOCALBASE}/share/gdesklets/Sensors/Clock/__init__.py:${PORTSDIR}/x11-clocks/gdesklets-clock
 
-USE_BZIP2=	yes
-USE_XORG=	x11
-
-NAME=		ebichuclock
-DATADIR=	${PREFIX}/share
-PKGMESSAGE=	${WRKDIR}/pkg-message
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-do-build:
-	@${CAT} pkg-message | ${SED} -e 's|%%PREFIX%%|${PREFIX}|g ; s|%%NAME%%|${NAME}|g' > ${PKGMESSAGE}
+NO_BUILD=	yes
+USE_PYTHON=	yes
+
+SUB_FILES=	pkg-message
+SUB_LIST=	NAME="${NAME}"
+
+DATADIR=	${PREFIX}/share/gdesklets
+NAME=		ebichuclock
 
 do-install:
-	@${MKDIR} ${DATADIR}/gdesklets/Displays/${NAME}/gfx
-	@${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}/
+	@${MKDIR} ${DATADIR}/Displays/${NAME}
+	${INSTALL_DATA} ${WRKSRC}/*.display ${DATADIR}/Displays/${NAME}
+	@${MKDIR} ${DATADIR}/Displays/${NAME}/gfx
+	${INSTALL_DATA} ${WRKSRC}/gfx/*.png ${DATADIR}/Displays/${NAME}/gfx
+	${INSTALL_DATA} ${WRKSRC}/README ${DATADIR}/Displays/${NAME}
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/x11-clocks/gdesklets-ebichuclock/distinfo b/x11-clocks/gdesklets-ebichuclock/distinfo
index 13db6afc33ca..560ecd1512a2 100644
--- a/x11-clocks/gdesklets-ebichuclock/distinfo
+++ b/x11-clocks/gdesklets-ebichuclock/distinfo
@@ -1,3 +1,3 @@
-MD5 (ebichuclock-0.1.1.tar.bz2) = 2a977f8753a1651d22d6b49860d5b1c0
-SHA256 (ebichuclock-0.1.1.tar.bz2) = 202a38f25d8fd91eb0add84e4533020ed3cccec617f681a08495dc5679d9ef56
-SIZE (ebichuclock-0.1.1.tar.bz2) = 31481
+MD5 (ebichuclock-0.1.1.tar.gz) = 1137a1c4f6175a021ac02ed02e4d518d
+SHA256 (ebichuclock-0.1.1.tar.gz) = 5a5bc76859b1ff42425600d59e5e646dfdb1c324f2901f5d1e2988a70fd38e48
+SIZE (ebichuclock-0.1.1.tar.gz) = 30760
diff --git a/x11-clocks/gdesklets-ebichuclock/files/pkg-message.in b/x11-clocks/gdesklets-ebichuclock/files/pkg-message.in
new file mode 100644
index 000000000000..90821c5ebe1b
--- /dev/null
+++ b/x11-clocks/gdesklets-ebichuclock/files/pkg-message.in
@@ -0,0 +1,16 @@
+##
+To view the README:
+
+	cat %%PREFIX%%/share/gdesklets/Displays/%%NAME%%/README
+
+To view the installed applets:
+
+	ls %%PREFIX%%/share/gdesklets/Displays
+
+To use those applets:
+
+	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-ebichuclock/pkg-descr b/x11-clocks/gdesklets-ebichuclock/pkg-descr
index 5d26043d6c80..8a17ac38fd19 100644
--- a/x11-clocks/gdesklets-ebichuclock/pkg-descr
+++ b/x11-clocks/gdesklets-ebichuclock/pkg-descr
@@ -2,4 +2,4 @@ Ebichuclock is something like emiclock with Ebichu in it.
 Ofcourse the idea is based on our favorite hamster
 (and no i do not mean hamtaro :-)
 
-WWW: http://gdesklets.gnomedesktop.org/
+WWW: http://archive.gdesklets.info/
diff --git a/x11-clocks/gdesklets-ebichuclock/pkg-message b/x11-clocks/gdesklets-ebichuclock/pkg-message
deleted file mode 100644
index f1fd712ef551..000000000000
--- a/x11-clocks/gdesklets-ebichuclock/pkg-message
+++ /dev/null
@@ -1,9 +0,0 @@
-
-To list displays installed by this port:
-
-    ls %%PREFIX%%/share/gdesklets/Displays/%%NAME%%
-
-To add this desklet to your desktop:
-
-    gdesklets open %%PREFIX%%/share/gdesklets/Displays/%%NAME%%/<name>.display
-