ports/64543: Fix port: deskutils/gdesklets-ltvariations

[Tim Bishop]

>Number:         64543
>Category:       ports
>Synopsis:       Fix port: deskutils/gdesklets-ltvariations
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Mar 21 10:10:20 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Tim Bishop
>Release:        FreeBSD 5.2.1-RELEASE-p1 i386
>Organization:
>Environment:
System: FreeBSD pendennis.ukc.ac.uk 5.2.1-RELEASE-p1 FreeBSD 5.2.1-RELEASE-p1 #1: Thu Mar 4 00:16:43 GMT 2004 tdb at pendennis.ukc.ac.uk:/usr/obj/usr/src/sys/PENDENNIS i386

>Description:
	Fix a couple of problems:

	- Add dependency on astro/gdesklets-weather
	- Fix processor display to not show a uname error

	Pointed out by: Adam Weinberger

>How-To-Repeat:
>Fix:
	Apply patch below.

--- gdesklets-ltvariations-0.26-fix.diff begins here ---
diff -ruN gdesklets-ltvariations.bak/Makefile gdesklets-ltvariations/Makefile
--- gdesklets-ltvariations.bak/Makefile	Sun Mar 21 14:46:14 2004
+++ gdesklets-ltvariations/Makefile	Sun Mar 21 17:50:33 2004
@@ -15,7 +15,8 @@
 MAINTAINER=	tim at bishnet.net
 COMMENT=	A collection of sensors and displays
 
-RUN_DEPENDS=	${X11BASE}/libdata/pkgconfig/gdesklets-core.pc:${PORTSDIR}/deskutils/gdesklets
+RUN_DEPENDS=	${X11BASE}/libdata/pkgconfig/gdesklets-core.pc:${PORTSDIR}/deskutils/gdesklets \
+		${X11BASE}/share/gnome/gdesklets/Sensors/Weather/__init__.py:${PORTSDIR}/astro/gdesklets-weather
 
 USE_PYTHON=	yes
 USE_X_PREFIX=	yes
@@ -32,6 +33,7 @@
 .for ii in ${SENSORS}
 	@${WRKSRC}/Sensors/Install_${ii}_Sensor.bin --nomsg ${WRKSRC}
 .endfor
+	@${PATCH} ${WRKSRC}/LTVUptime/__init__.py < ${FILESDIR}/LTVUptime::__init__.py
 	@${CAT} pkg-message | ${SED} -e 's|%%PREFIX%%|${PREFIX}|g ; s|%%DISPLAY%%|${DISPLAY}|g' > ${PKGMESSAGE}
 
 do-install:
diff -ruN gdesklets-ltvariations.bak/files/LTVUptime::__init__.py gdesklets-ltvariations/files/LTVUptime::__init__.py
--- gdesklets-ltvariations.bak/files/LTVUptime::__init__.py	Thu Jan  1 01:00:00 1970
+++ gdesklets-ltvariations/files/LTVUptime::__init__.py	Sun Mar 21 17:42:15 2004
@@ -0,0 +1,11 @@
+--- __init__.py.bak	Sun Mar 21 17:40:07 2004
++++ __init__.py	Sun Mar 21 17:41:40 2004
+@@ -21,7 +21,7 @@
+ 		self._set_config_type("update", TYPE_INT, int(interval))
+ 		self._set_config_type("format", TYPE_STRING, format)
+ 		self._set_config_type("host", TYPE_STRING, commands.getoutput("uname -n"))
+-		self._set_config_type("os", TYPE_STRING, commands.getoutput("uname -o"))
++		self._set_config_type("os", TYPE_STRING, commands.getoutput("uname -s"))
+ 		self._set_config_type("kernel", TYPE_STRING, commands.getoutput("uname -s"))
+ 		self._set_config_type("version", TYPE_STRING, commands.getoutput("uname -r"))
+ 		self._set_config_type("processor", TYPE_STRING, commands.getoutput("uname -p"))
--- gdesklets-ltvariations-0.26-fix.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: