From tkato432@yahoo.com  Wed Jan 12 17:01:01 2005
Return-Path: <tkato432@yahoo.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 7BE2216A55B
	for <FreeBSD-gnats-submit@FreeBSD.org>; Wed, 12 Jan 2005 17:01:01 +0000 (GMT)
Received: from hfep05.dion.ne.jp (hfep05.dion.ne.jp [203.181.105.71])
	by mx1.FreeBSD.org (Postfix) with ESMTP id EC55B43D31
	for <FreeBSD-gnats-submit@FreeBSD.org>; Wed, 12 Jan 2005 17:00:59 +0000 (GMT)
	(envelope-from tkato432@yahoo.com)
Received: from localhost ([61.204.125.179]) by hfep05.dion.ne.jp with SMTP
          id <20050112170054254.WMKS@hfep05.dion.ne.jp>
          for <FreeBSD-gnats-submit@FreeBSD.org>;
          Thu, 13 Jan 2005 02:00:54 +0900
Message-Id: <20050113020011.102287cc.tkato432@yahoo.com>
Date: Thu, 13 Jan 2005 02:00:11 +0900
From: KATO Tsuguru <tkato432@yahoo.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: Update port: astro/seti_applet

>Number:         76157
>Category:       ports
>Synopsis:       Update port: astro/seti_applet
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    krion
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jan 12 17:10:30 GMT 2005
>Closed-Date:    Wed Jan 12 19:48:43 GMT 2005
>Last-Modified:  Wed Jan 12 19:48:43 GMT 2005
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.10-RELEASE-p5 i386
>Organization:
>Environment:
>Description:
- Fix build on -current
- Support GCONF_SCHEMAS
- Support SUB_LIST

New file:
files/patch-src::seti_applet.c
files/pkg-message.in

Remove file:
pkg-message

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/astro/seti_applet/Makefile astro/seti_applet/Makefile
--- /usr/ports/astro/seti_applet/Makefile	Wed Dec 22 10:04:46 2004
+++ astro/seti_applet/Makefile	Wed Jan 12 22:51:05 2005
@@ -17,42 +17,23 @@
 LIB_DEPENDS=	gtop-2.0:${PORTSDIR}/devel/libgtop2
 RUN_DEPENDS=	${LOCALBASE}/sbin/setiathome:${PORTSDIR}/astro/setiathome
 
-USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
+USE_GNOME=	gnomehack gnomepanel gnomeprefix 
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomepanel
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=	15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-# Local variables
-#
-
-MSG_FILE=	${PKGDIR}/pkg-message
-PKGMESSAGE=	${WRKDIR}/pkg-message
-
-REINPLACE_SUB=	LOCALBASE=${LOCALBASE}
-PKGMESSAGE_SUB=	LOCALBASE=${LOCALBASE}
+GCONF_SCHEMAS=	seti_applet.schemas
 
-# Post-patch
-#
+SUB_FILES=	pkg-message
 
-post-patch: patch-seti_applet patch-pkgmessage
-
-patch-seti_applet:
-	@${REINPLACE_CMD} ${REINPLACE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
+post-patch:
+	@${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/src/seti_applet.schemas
 
-patch-pkgmessage:
-	@${SED} ${REINPLACE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${MSG_FILE} > ${PKGMESSAGE}
-
-# Post-install
-#
-
-post-install: display-message
-
-display-message:
+post-install:
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff -urN /usr/ports/astro/seti_applet/files/patch-src::seti_applet.c astro/seti_applet/files/patch-src::seti_applet.c
--- /usr/ports/astro/seti_applet/files/patch-src::seti_applet.c	Thu Jan  1 09:00:00 1970
+++ astro/seti_applet/files/patch-src::seti_applet.c	Wed Jan 12 22:48:10 2005
@@ -0,0 +1,10 @@
+--- src/seti_applet.c.orig	Thu Mar  6 15:03:55 2003
++++ src/seti_applet.c	Wed Jan 12 22:47:00 2005
+@@ -177,6 +177,7 @@
+ static void setup_percent_canvas_item(setiapplet *);
+ static void setup_units_canvas_item(setiapplet *);
+ static void setup_cputime_canvas_item(setiapplet *);
++static void setup_cputime_current_canvas_item(setiapplet *);
+ static void applet_change_orient(PanelApplet *,
+                                  PanelAppletOrient,
+                                  gpointer);
diff -urN /usr/ports/astro/seti_applet/files/pkg-message.in astro/seti_applet/files/pkg-message.in
--- /usr/ports/astro/seti_applet/files/pkg-message.in	Thu Jan  1 09:00:00 1970
+++ astro/seti_applet/files/pkg-message.in	Wed Jan 12 22:14:08 2005
@@ -0,0 +1,23 @@
+****  To enable start/stop of the seti@home client, please run "setiathome"
+      as your login name.
+      If you installed "setiathome" by ports or package, add, change or
+      uncomment the seti_user variable in %%LOCALBASE%%/etc/rc.setiathome.conf
+      (or %%LOCALBASE%%/etc/setiathome.conf depending on the version currently
+      installed on your computer)
+            seti_user=nobody
+                      ^^^^^^
+      to your login name before setting up working directory, such as :
+            seti_user=<your_login_name>
+      If you already done this as nobody, do
+            %%LOCALBASE%%/etc/rc.d/setiathome.sh stop
+            chown -Rh <your_login_name> /var/db/setiathome
+            %%LOCALBASE%%/etc/rc.d/setiathome.sh start
+****  Known Bugs
+      For instance, default values have to be set manually using the panel
+      preferences (right-click):
+	set the value of "Basic->Directory containing the seti@home executable"
+	to /var/db/setiathome
+	check "Advanced->Use seti@home exe in a different directory"
+	and set it's value to %%LOCALBASE%%/sbin
+      Also, running xsetiathome by double-clicking the radar icon isn't
+      possible right now.
diff -urN /usr/ports/astro/seti_applet/pkg-message astro/seti_applet/pkg-message
--- /usr/ports/astro/seti_applet/pkg-message	Wed Dec 22 10:04:46 2004
+++ astro/seti_applet/pkg-message	Thu Jan  1 09:00:00 1970
@@ -1,23 +0,0 @@
-****  To enable start/stop of the seti@home client, please run "setiathome"
-      as your login name.
-      If you installed "setiathome" by ports or package, add, change or
-      uncomment the seti_user variable in %%LOCALBASE%%/etc/rc.setiathome.conf
-      (or %%LOCALBASE%%/etc/setiathome.conf depending on the version currently
-      installed on your computer)
-            seti_user=nobody
-                      ^^^^^^
-      to your login name before setting up working directory, such as :
-            seti_user=<your_login_name>
-      If you already done this as nobody, do
-            %%LOCALBASE%%/etc/rc.d/setiathome.sh stop
-            chown -Rh <your_login_name> /var/db/setiathome
-            %%LOCALBASE%%/etc/rc.d/setiathome.sh start
-****  Known Bugs
-      For instance, default values have to be set manually using the panel
-      preferences (right-click):
-	set the value of "Basic->Directory containing the seti@home executable"
-	to /var/db/setiathome
-	check "Advanced->Use seti@home exe in a different directory"
-	and set it's value to %%LOCALBASE%%/sbin
-      Also, running xsetiathome by double-clicking the radar icon isn't
-      possible right now.
diff -urN /usr/ports/astro/seti_applet/pkg-plist astro/seti_applet/pkg-plist
--- /usr/ports/astro/seti_applet/pkg-plist	Wed Dec 22 10:04:46 2004
+++ astro/seti_applet/pkg-plist	Wed Jan 12 22:21:24 2005
@@ -1,10 +1,5 @@
 @comment $FreeBSD: ports/astro/seti_applet/pkg-plist,v 1.6 2004/12/22 01:04:46 edwin Exp $
 bin/seti-applet-2
-@comment etc/gconf/gconf.xml.defaults/apps/seti_applet/%gconf.xml
-@comment etc/gconf/gconf.xml.defaults/apps/seti_applet/prefs/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/seti_applet/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/seti_applet/prefs/%gconf.xml
-etc/gconf/schemas/seti_applet.schemas
 libdata/bonobo/servers/GNOME_SetiApplet_Factory.server
 share/gnome/gnome-2.0/ui/GNOME_SetiApplet.xml
 share/gnome/help/seti_applet/C/configuration.html
@@ -35,5 +30,3 @@
 @dirrm share/gnome/help/seti_applet/C/images
 @dirrm share/gnome/help/seti_applet/C
 @dirrm share/gnome/help/seti_applet
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/seti_applet/prefs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/seti_applet
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->krion 
Responsible-Changed-By: krion 
Responsible-Changed-When: Wed Jan 12 18:22:51 GMT 2005 
Responsible-Changed-Why:  
Grab. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=76157 
State-Changed-From-To: open->closed 
State-Changed-By: krion 
State-Changed-When: Wed Jan 12 19:48:34 GMT 2005 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=76157 
>Unformatted:
