Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 5 Jan 2010 03:30:28 +0900
From:      KATO Tsuguru <tkato432@yahoo.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/142319: Update port: x11-clocks/gdesklets-clock
Message-ID:  <20100105033028.54f4093f.tkato432@yahoo.com>
Resent-Message-ID: <201001041840.o04Ie3c1068432@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         142319
>Category:       ports
>Synopsis:       Update port: x11-clocks/gdesklets-clock
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 04 18:40:03 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.2-RELEASE-p5 i386
>Organization:
>Environment:
>Description:
- Update MASTER_SITES and WWW: line
- Utilize SUB_FILES

New file:
files/pkg-message.in

Remove file:
files/patch-Install_Clock_Sensor.bin
pkg-message

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/x11-clocks/gdesklets-clock/Makefile x11-clocks/gdesklets-clock/Makefile
--- /usr/ports/x11-clocks/gdesklets-clock/Makefile	2008-06-07 00:31:02.000000000 +0900
+++ x11-clocks/gdesklets-clock/Makefile	2009-12-29 23:14:00.000000000 +0900
@@ -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 @@
 
 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 -urN /usr/ports/x11-clocks/gdesklets-clock/distinfo x11-clocks/gdesklets-clock/distinfo
--- /usr/ports/x11-clocks/gdesklets-clock/distinfo	2005-11-26 19:33:55.000000000 +0900
+++ x11-clocks/gdesklets-clock/distinfo	2009-12-29 22:54:37.000000000 +0900
@@ -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 -urN /usr/ports/x11-clocks/gdesklets-clock/files/patch-Install_Clock_Sensor.bin x11-clocks/gdesklets-clock/files/patch-Install_Clock_Sensor.bin
--- /usr/ports/x11-clocks/gdesklets-clock/files/patch-Install_Clock_Sensor.bin	2003-09-26 20:07:42.000000000 +0900
+++ x11-clocks/gdesklets-clock/files/patch-Install_Clock_Sensor.bin	1970-01-01 09:00:00.000000000 +0900
@@ -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 -urN /usr/ports/x11-clocks/gdesklets-clock/files/pkg-message.in x11-clocks/gdesklets-clock/files/pkg-message.in
--- /usr/ports/x11-clocks/gdesklets-clock/files/pkg-message.in	1970-01-01 09:00:00.000000000 +0900
+++ x11-clocks/gdesklets-clock/files/pkg-message.in	2009-12-29 23:22:18.000000000 +0900
@@ -0,0 +1,19 @@
+##
+To view the README:
+
+	cat %%PREFIX%%/share/gdesklets/Displays/%%NAME%%/README
+	cat %%PREFIX%%/share/gdesklets/Sensors/%%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
+
+Replace ${name} with the correct name of the applets you want to use.
+
+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 -urN /usr/ports/x11-clocks/gdesklets-clock/pkg-descr x11-clocks/gdesklets-clock/pkg-descr
--- /usr/ports/x11-clocks/gdesklets-clock/pkg-descr	2003-09-26 20:07:42.000000000 +0900
+++ x11-clocks/gdesklets-clock/pkg-descr	2009-12-29 22:20:39.000000000 +0900
@@ -1,3 +1,3 @@
 The Clock sensor with various clock displays.
 
-WWW: http://gdesklets.gnomedesktop.org/
+WWW: http://archive.gdesklets.info/
diff -urN /usr/ports/x11-clocks/gdesklets-clock/pkg-message x11-clocks/gdesklets-clock/pkg-message
--- /usr/ports/x11-clocks/gdesklets-clock/pkg-message	2007-10-25 13:54:19.000000000 +0900
+++ x11-clocks/gdesklets-clock/pkg-message	1970-01-01 09:00:00.000000000 +0900
@@ -1,19 +0,0 @@
-##
-To view the README:
-
-	cat ${PREFIX}/share/gdesklets/Displays/${name}/README
-	cat ${PREFIX}/share/gdesklets/Sensors/${name}/README
-
-To view all installed applets:
-
-	ls ${PREFIX}/share/gdesklets/Displays
-
-To use those applets:
-
-	gdesklets open ${PREFIX}/share/gdesklets/Displays/${name}/${name}.display
-
-Replace ${name} with the correct name of the applets you want to use.
-
-NOTE: Be sure to login as your user when you use the gdesklets command,
-      as the configuration will be stored in the ~/.gdesklets/ directory.
-##
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100105033028.54f4093f.tkato432>