o update to 0.4.1.

o change mantainer to Cyrille Lefevre <clefevre@citeweb.net>

PR:		30372
Submitted by:	Cyrille Lefevre <clefevre@citeweb.net> (new maintainer)
Reviewed by:	HIYAMA Takeshi <hym@cocoa.freemail.ne.jp> (previous maintainer)

8 files changed, 101 insertions, 71 deletions

diff --git a/astro/seti_applet/Makefile b/astro/seti_applet/Makefile
index a8f7a7b44007..f86e85f157bd 100644
--- a/astro/seti_applet/Makefile
+++ b/astro/seti_applet/Makefile
@@ -6,32 +6,63 @@
 #
 
 PORTNAME=	seti_applet
-PORTVERSION=	0.3.2
-PORTREVISION=	1
+PORTVERSION=	0.4.1
 CATEGORIES=	astro gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:S/_/-/}
 
-MAINTAINER=	hym@cocoa.freemail.ne.jp
+MAINTAINER=	clefevre@citeweb.net
 
-LIB_DEPENDS=	gtop.1:${PORTSDIR}/devel/libgtop
+# Global variables
+#
+
+LIB_DEPENDS=	gtop.1:${PORTSDIR}/devel/libgtop \
+		intl.1:${PORTSDIR}/devel/gettext
 RUN_DEPENDS=	setiathome:${PORTSDIR}/astro/setiathome
 
 USE_X_PREFIX=	yes
 USE_GNOME=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+# Local variables
+#
+
+MSG_FILE=	${PKGDIR}/pkg-message
+PKGMESSAGE=	${WRKDIR}/pkg-message
+
+FIND?=		find
+XARGS?=		xargs
+
+# Post-patch
+#
 
-pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+post-patch: patch-configure patch-makefiles-in \
+	    patch-seti_applet patch-message
+
+patch-configure:
+	@${PERL} -pi.fbsd -e 's|-lpthread|${PTHREAD_LIBS}|g; \
 		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
-		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
-		s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 
-post-install:
-	${SED} "s|%%LOCALBASE%%|${LOCALBASE}|g" ${PKGMESSAGE}
+patch-makefiles-in:
+	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${PERL} -pi.fbsd -e \
+		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g;\
+		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
+
+patch-seti_applet:
+	@${PERL} -pi.fbsd -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+		${WRKSRC}/src/seti_applet.c
+
+patch-message:
+	@${SED} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${MSG_FILE} > ${PKGMESSAGE}
+
+# Post-install
+#
+
+post-install: display-message
+
+display-message:
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/astro/seti_applet/distinfo b/astro/seti_applet/distinfo
index 13f0dfed3146..0957438b20c9 100644
--- a/astro/seti_applet/distinfo
+++ b/astro/seti_applet/distinfo
@@ -1 +1 @@
-MD5 (seti_applet-0.3.2.tar.gz) = 5811a1d41d596eb9ae17ae37568a3a7c
+MD5 (seti_applet-0.4.1.tar.gz) = dbd7b73c857a39cf26e563e962050053
diff --git a/astro/seti_applet/files/patch-aa b/astro/seti_applet/files/patch-aa
index 4b54e9547e1c..62c27c11a22f 100644
--- a/astro/seti_applet/files/patch-aa
+++ b/astro/seti_applet/files/patch-aa
@@ -1,24 +1,28 @@
---- src/seti_applet.c.orig	Tue Oct  3 11:05:06 2000
-+++ src/seti_applet.c	Tue Oct  3 11:06:23 2000
-@@ -1442,7 +1442,7 @@
- 		g_free ( sa.seti_dir );
- 	}
- 	gnome_config_push_prefix ( path );
--	sa.seti_dir = gnome_config_get_string ( "setiapplet/setidir=/usr/local/seti" );
-+	sa.seti_dir = gnome_config_get_string ( "setiapplet/setidir=/var/db/setiathome" );
- 	sa.update_interval = gnome_config_get_int ( "setiapplet/updateinterval=3" );
- 	sa.file_update_interval = gnome_config_get_int ( "setiapplet/fileupdateinterval=120" );
- 
-@@ -1460,10 +1460,10 @@
- 		g_free ( sa.extra_params );
- 	}
- 	sa.extra_params = gnome_config_get_string ( "setiapplet/extraparams=");
--	sa.separate_exe_dir = gnome_config_get_int ( "setiapplet/separateexedir=0" );
-+	sa.separate_exe_dir = gnome_config_get_int ( "setiapplet/separateexedir=1" );
- 	if ( sa.separate_exe_dir == TRUE )
+--- src/seti_applet.c.orig	Thu Jun 28 05:00:48 2001
++++ src/seti_applet.c	Wed Aug 22 03:33:19 2001
+@@ -2046,7 +2046,7 @@
+     }
+   gnome_config_push_prefix (path);
+   sa.seti_dir =
+-    gnome_config_get_string ("setiapplet/setidir=/usr/local/seti");
++    gnome_config_get_string ("setiapplet/setidir=/var/db/setiathome");
+   sa.update_interval = gnome_config_get_int ("setiapplet/updateinterval=3");
+   sa.file_update_interval =
+     gnome_config_get_int ("setiapplet/fileupdateinterval=120");
+@@ -2075,14 +2075,14 @@
+       g_free (sa.extra_params);
+     }
+   sa.extra_params = gnome_config_get_string ("setiapplet/extraparams=");
+-  sa.separate_exe_dir = gnome_config_get_int ("setiapplet/separateexedir=0");
++  sa.separate_exe_dir = gnome_config_get_int ("setiapplet/separateexedir=1");
+   if (sa.separate_exe_dir != 0)
+     {
+       if (sa.seti_exe_dir != NULL)
  	{
--		sa.seti_exe_dir = gnome_config_get_string ( "setiapplet/setiexedir" );
-+		sa.seti_exe_dir = gnome_config_get_string ( "setiapplet/setiexedir=/usr/local/sbin" );
+ 	  g_free (sa.seti_exe_dir);
  	}
- 	sa.launch_on_start = gnome_config_get_int ( "setiapplet/launchonstart=0" );
- 	gnome_config_pop_prefix();
+-      sa.seti_exe_dir = gnome_config_get_string ("setiapplet/setiexedir");
++      sa.seti_exe_dir = gnome_config_get_string ("setiapplet/setiexedir=%%LOCALBASE%%/sbin");
+     }
+   sa.launch_on_start = gnome_config_get_int ("setiapplet/launchonstart=0");
+   gnome_config_pop_prefix ();
diff --git a/astro/seti_applet/files/patch-ac b/astro/seti_applet/files/patch-ac
deleted file mode 100644
index 35f25c84f6da..000000000000
--- a/astro/seti_applet/files/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.orig	Fri May 12 15:55:34 2000
-+++ configure	Thu Jul 13 13:35:47 2000
-@@ -4538,8 +4538,8 @@
- 	< $srcdir/po/POTFILES.in > po/POTFILES
-   
- 
--CFLAGS=`$CFLAGS $GNOME_CONFIG --cflags gnome gtk glib applets`
--LDFLAGS=`$LDFLAGS $GNOME_CONFIG --libs gnome gtk glib applets`
-+CFLAGS="$CFLAGS `$GNOME_CONFIG --cflags gnome gtk glib applets`"
-+LDFLAGS="$LDFLAGS `$GNOME_CONFIG --libs gnome gtk glib applets`"
- 
- 
- 
diff --git a/astro/seti_applet/files/patch-ad b/astro/seti_applet/files/patch-ad
deleted file mode 100644
index 3358f09c1730..000000000000
--- a/astro/seti_applet/files/patch-ad
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/seti_control.c.orig	Thu Oct 12 16:29:42 2000
-+++ src/seti_control.c	Thu Oct 12 16:29:53 2000
-@@ -20,6 +20,7 @@
- #include <unistd.h>
- #include <signal.h>
- #include <stdlib.h>
-+#include <fcntl.h>
- 
- #include <glibtop.h>
- #include <glibtop/procstate.h>
diff --git a/astro/seti_applet/pkg-descr b/astro/seti_applet/pkg-descr
index 9096b9d15711..763255f81c88 100644
--- a/astro/seti_applet/pkg-descr
+++ b/astro/seti_applet/pkg-descr
@@ -1,4 +1,9 @@
-Displays in an applet the current status of
-any seti@home client running.
+This applet displays the progress of the seti@home client in a
+panel applet. Currently can display the percentage complete, the
+best spike, best gaussian, units completed and total CPU time spent
+running the seti@home client.
+
+Once installed, this applet should appear under Monitors->Seti Applet
+in the 'Add Applet' menu on the panel.
 
 WWW: http://seti-applet.sourceforge.net/
diff --git a/astro/seti_applet/pkg-message b/astro/seti_applet/pkg-message
index b51dca12b132..4b60d7ed00bf 100644
--- a/astro/seti_applet/pkg-message
+++ b/astro/seti_applet/pkg-message
@@ -1,10 +1,19 @@
-	To enable start/stop seti@home client,
-	please run "setiathome" as your login name.
-	If you installed "setiathome" by ports or package,
-	change the line 9 of %%LOCALBASE%%/etc/rc.d/setiathome.sh
-		seti_user=nobody
-			  ^^^^^^
-	to your login name before setting up working directory.
-	If you already done this as nobody, do
-		%%LOCALBASE%%/etc/rc.d/setiathome.sh stop
-		chown -R "YOUR LOGIN NAME" /var/db/setiathome
+****  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
diff --git a/astro/seti_applet/pkg-plist b/astro/seti_applet/pkg-plist
index a95a78c43d76..e4a2df694937 100644
--- a/astro/seti_applet/pkg-plist
+++ b/astro/seti_applet/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 bin/seti_applet
 etc/CORBA/servers/seti_applet.gnorba
 share/gnome/applets/Monitors/seti_applet.desktop
@@ -5,6 +6,9 @@ share/gnome/help/seti_applet/C/configuration.html
 share/gnome/help/seti_applet/C/docbook.css
 share/gnome/help/seti_applet/C/images/adv_prop.gif
 share/gnome/help/seti_applet/C/images/basic_prop.gif
+share/gnome/help/seti_applet/C/images/new_user_details_large.gif
+share/gnome/help/seti_applet/C/images/new_user_details_small.gif
+share/gnome/help/seti_applet/C/images/new_user_detected.gif
 share/gnome/help/seti_applet/C/index.html
 share/gnome/help/seti_applet/C/operation.html
 share/gnome/help/seti_applet/C/startingsetiprocess.html