7 files changed, 192 insertions, 222 deletions

diff --git a/french/plgrenouille/Makefile b/french/plgrenouille/Makefile
index b656d962629f..ba14086732f3 100644
--- a/french/plgrenouille/Makefile
+++ b/french/plgrenouille/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	plgrenouille
-PORTVERSION=	0.61.7
+PORTVERSION=	0.70.6
 CATEGORIES=	french net
 MASTER_SITES=	ftp://blade.concept-micro.com/debian/
 DISTNAME=	${PORTNAME}_${PORTVERSION:R}-${PORTVERSION:E}
@@ -14,7 +14,10 @@ DISTNAME=	${PORTNAME}_${PORTVERSION:R}-${PORTVERSION:E}
 MAINTAINER=	cyrille.lefevre@laposte.net
 COMMENT=	Un client pour determiner votre bande passante a un raccordement large bande
 
-RUN_DEPENDS=	${SITE_PERL}/Net/FTP.pm:${PORTSDIR}/net/p5-Net
+LIB_DEPENDS=	netsnmp.6:${PORTSDIR}/net-mgmt/net-snmp
+RUN_DEPENDS=	${SITE_PERL}/Net/FTP.pm:${PORTSDIR}/net/p5-Net \
+		${SITE_PERL}/Net/SNMP.pm:${PORTSDIR}/net-mgmt/p5-Net-SNMP \
+		${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
 
 .if !defined(BATCH)
 IS_INTERACTIVE=	yes
@@ -23,41 +26,68 @@ IS_INTERACTIVE=	yes
 NO_BUILD=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
+USE_RC_SUBR=	yes
 SCRIPTS_ENV=	PKG_PREFIX=${PREFIX}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 MSG_FILE=	${PKGDIR}/pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 PKGDEINSTALL=	${PKGINSTALL}
+PLIST_SUB=	LBIN_DIR="${LBIN_DIR:S,^${PREFIX}/,,}" \
+		CONF_DIR="${CONF_DIR:S,^${PREFIX}/,,}" \
+		RC_DIR="${RC_DIR:S,^${PREFIX}/,,}"
+REINPLACE_SUB=	PREFIX=${PREFIX} PERL=${PERL} \
+		LBIN_DIR=${LBIN_DIR} CONF_DIR=${CONF_DIR} \
+		RUN_DIR=${RUN_DIR} LOG_DIR=${LOG_DIR} \
+		SPOOL_DIR=${SPOOL_DIR} SPOOL_USER=${SPOOL_USER}
+RCSCRIPTS_SUB=	${REINPLACE_SUB} RC_SUBR=${RC_SUBR}
+PKGMESSAGE_SUB=	PREFIX=${PREFIX}
 
 MAN1=		plgrenouille.1
 DOC_FILES=	FAQ README
+LBIN_DIR=	${PREFIX}/libexec
+MAN_DIR=	${MAN1PREFIX}/man/man1
+CONF_DIR=	${PREFIX}/etc
+RC_DIR=		${PREFIX}/etc/rc.d
 RUN_DIR=	/var/run
 LOG_DIR=	/var/log
 SPOOL_DIR=	/var/spool/${PORTNAME}
 SPOOL_USER=	daemon
 
-post-patch: patch-script patch-pkgmessage
+post-patch: patch-script patch-lib patch-rc patch-pkgmessage
 
 patch-script:
-	@${REINPLACE_CMD} -e 's|%%PERL%%|${PERL}|;s|%%PREFIX%%|${PREFIX}|' \
-		-e 's|%%RUN_DIR%%|${RUN_DIR}|;s|%%SPOOL_DIR%%|${SPOOL_DIR}|' \
-		-e 's|%%LOG_DIR%%|${LOG_DIR}|;s|%%SPOOL_USER%%|${SPOOL_USER}|' \
-		${WRKSRC}/plgrenouille.pl
+	@${REINPLACE_CMD} ${REINPLACE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
+		${WRKSRC}/plgrenouille.pl ${WRKSRC}/Grenouille/Vars.pm
+
+patch-lib:
+	@${REINPLACE_CMD} 's!swap_privileges!Grenouille::System::&!g' \
+		${WRKSRC}/Grenouille/Log.pm ${WRKSRC}/Grenouille/Preferences.pm
+
+patch-rc:
+	@${SED} ${RCSCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
+		${FILESDIR}/plgrenouille.sh > ${WRKDIR}/plgrenouille.sh
 
 patch-pkgmessage:
-	@${SED} 's|%%PREFIX%%|${PREFIX}|g' ${MSG_FILE} > ${PKGMESSAGE}
+	@${SED} ${PKGMESSAGE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
+		${MSG_FILE} > ${PKGMESSAGE}
 
-do-install: install-script install-man install-data install-doc install-rc
+do-install: install-script install-lib install-man \
+		install-data install-doc install-rc
 
 install-script:
 	@${INSTALL_SCRIPT} ${WRKSRC}/plgrenouille.pl \
-		${PREFIX}/libexec/plgrenouille
+		${LBIN_DIR}/plgrenouille
+
+install-lib:
+	@${MKDIR} ${SITE_PERL}/Grenouille
+	@${INSTALL_SCRIPT} ${WRKSRC}/Grenouille/*.pm \
+		${SITE_PERL}/Grenouille
 
 install-man:
-	@${INSTALL_MAN} ${WRKSRC}/plgrenouille.1 ${MAN1PREFIX}/man/man1
+	@${INSTALL_MAN} ${WRKSRC}/plgrenouille.1 ${MAN_DIR}
 
 install-data:
-	@${INSTALL_DATA} ${WRKSRC}/grenouillerc.sample ${PREFIX}/etc
+	@${INSTALL_DATA} ${WRKSRC}/grenouillerc.sample ${CONF_DIR}
 
 install-doc:
 .if !defined(NOPORTDOCS)
@@ -68,7 +98,7 @@ install-doc:
 .endif
 
 install-rc:
-	@${INSTALL_SCRIPT} ${FILESDIR}/plgrenouille.sh ${PREFIX}/etc/rc.d
+	@${INSTALL_SCRIPT} ${WRKDIR}/plgrenouille.sh ${RC_DIR}
 
 post-install: display-message configure-package
 
diff --git a/french/plgrenouille/distinfo b/french/plgrenouille/distinfo
index 50b1d40c231a..2b431c7f5512 100644
--- a/french/plgrenouille/distinfo
+++ b/french/plgrenouille/distinfo
@@ -1 +1,2 @@
-MD5 (plgrenouille_0.61-7.tar.gz) = 6dbeb8c7c9de4724f4fd4b809913f08b
+MD5 (plgrenouille_0.70-6.tar.gz) = a49fbe1187c8436ff788186b31c321c9
+SIZE (plgrenouille_0.70-6.tar.gz) = 38409
diff --git a/french/plgrenouille/files/patch-Grenouille::Preferences.pm b/french/plgrenouille/files/patch-Grenouille::Preferences.pm
new file mode 100644
index 000000000000..488385436f06
--- /dev/null
+++ b/french/plgrenouille/files/patch-Grenouille::Preferences.pm
@@ -0,0 +1,18 @@
+--- Grenouille/Preferences.pm.orig	Mon Mar 17 15:26:46 2003
++++ Grenouille/Preferences.pm	Thu Mar  4 03:55:34 2004
+@@ -15,6 +15,7 @@
+ %preferences = ();
+ 
+ sub load_preferences() {
++    swap_privileges();
+     eval {
+ 	if (open(CONFIG, "<$MYRC")) {
+ 	    while (<CONFIG>) {
+@@ -25,6 +26,7 @@
+ 	    close(CONFIG);
+ 	}
+     };
++    swap_privileges();
+     die if $@;
+ }
+ 
diff --git a/french/plgrenouille/files/patch-Grenouille::Vars.pm b/french/plgrenouille/files/patch-Grenouille::Vars.pm
new file mode 100644
index 000000000000..2f99c6965e06
--- /dev/null
+++ b/french/plgrenouille/files/patch-Grenouille::Vars.pm
@@ -0,0 +1,49 @@
+--- Grenouille/Vars.pm.orig	Wed Dec  5 23:42:30 2001
++++ Grenouille/Vars.pm	Thu Mar  4 03:59:13 2004
+@@ -8,6 +8,7 @@
+ use vars qw(@ISA @EXPORT_OK
+             $MYRC $DATAPATH $DOWNLOADFILE $UPLOADFILE $QUEUEFILE 
+             $LASTCONFIGFILE $LASTVERSIONFILE $PIDFILE $LOGFILE
++            $BEFOREFILE $AFTERFILE
+             $ASAP $SEC $MIN $HOUR $DAY @MONTHS
+             $USER
+             %VERSION %DEBUG
+@@ -15,6 +16,7 @@
+ @ISA=qw(Exporter);
+ @EXPORT_OK=qw($MYRC $DATAPATH $DOWNLOADFILE $UPLOADFILE $QUEUEFILE
+               $LASTCONFIGFILE $LASTVERSIONFILE $PIDFILE $LOGFILE 
++              $BEFOREFILE $AFTERFILE
+               $ASAP $SEC $MIN $HOUR $DAY @MONTHS
+               $USER
+               %VERSION %DEBUG
+@@ -30,15 +32,17 @@
+              'system' => ($^O eq 'win32' ? 'windows' : $^O) );
+ 
+ # Paths
+-$MYRC ||= '/etc/grenouillerc';
+-$DATAPATH ||= '/var/spool/plgrenouille';
++$MYRC ||= '%%PREFIX%%/etc/grenouillerc';
++$BEFOREFILE ||= '%%PREFIX%%/etc/plgrenouille-before';
++$AFTERFILE ||= '%%PREFIX%%/etc/plgrenouille-after';
++$DATAPATH ||= '%%SPOOL_DIR%%';
+ $DOWNLOADFILE ||= "$DATAPATH/downloadfile";
+ $UPLOADFILE ||= "$DATAPATH/uploadfile";
+ $QUEUEFILE ||= "$DATAPATH/queued_results.txt";
+ $LASTCONFIGFILE ||= "$DATAPATH/last_configuration.txt";
+ $LASTVERSIONFILE ||= "$DATAPATH/last_known_version.txt";
+-$PIDFILE ||= "/var/run/plgrenouille.pid";
+-$LOGFILE ||= "/var/log/plgrenouille.log";
++$PIDFILE ||= "%%RUN_DIR%%/plgrenouille.pid";
++$LOGFILE ||= "%%LOG_DIR%%/plgrenouille.log";
+ 
+ # Time constants
+ $ASAP ||= 0;
+@@ -48,7 +52,7 @@
+ $DAY ||= 24 * $HOUR;
+ @MONTHS = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
+ 
+-$USER ||= 'daemon';
++$USER ||= '%%SPOOL_USER%%';
+ 
+ # Debugging
+ # what features do we want to debug ?
diff --git a/french/plgrenouille/files/patch-plgrenouille.pl b/french/plgrenouille/files/patch-plgrenouille.pl
index 21fa10c77fe8..7ba891be311b 100644
--- a/french/plgrenouille/files/patch-plgrenouille.pl
+++ b/french/plgrenouille/files/patch-plgrenouille.pl
@@ -1,164 +1,53 @@
---- plgrenouille.pl.orig	Mon Mar 17 15:52:56 2003
-+++ plgrenouille.pl	Wed Apr 30 22:56:55 2003
+--- plgrenouille.pl.orig	Fri Oct  3 16:00:23 2003
++++ plgrenouille.pl	Thu Mar  4 15:58:57 2004
 @@ -1,4 +1,4 @@
 -#!/usr/bin/perl -Tw
 +#!%%PERL%% -Tw
- # plgrenouille 0.61
+ # plgrenouille 0.70       -- don't forget to update Grenouille::Vars
  # version 0.4 by momtchev, <momtchev@fil.univ-lille1.fr>
  # modified by Pierre Etchemaite, <petchema@concept-micro.com>
-@@ -18,7 +18,7 @@
- use Net::Ping qw();
- use Net::FTP qw();
+@@ -19,6 +19,7 @@
+ use Grenouille::Vars qw(%VERSION %DEBUG
+                         $MYRC $DATAPATH $DOWNLOADFILE $UPLOADFILE $QUEUEFILE
+                         $LASTCONFIGFILE $LASTVERSIONFILE $PIDFILE
++			$BEFOREFILE $AFTERFILE
+                         $ASAP $SEC $MIN $DAY
+                         %vars);
+ use Grenouille::Numbers qw(digits jitter);
+@@ -35,7 +36,7 @@
+ use Grenouille::System qw(init_privileges swap_privileges
+                           autodetect_interface get_traffic_counters);
  
 -$ENV{'PATH'} = '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin';
 +$ENV{'PATH'} = '%%PREFIX%%/sbin:%%PREFIX%%/bin:/usr/sbin:/usr/bin:/sbin:/bin';
  
- my(%VERSION) = ( 'client' => 'plgrenouille',
- 		 'version' => 0.61,
-@@ -28,17 +28,20 @@
- 		               # where anyone can fork his own version
- 		 'system' => $^O );
- 
--my $MYRC ||= '/etc/grenouillerc';
--my $DATAPATH ||= '/var/spool/plgrenouille';
-+my $PREFIX ||= '%%PREFIX%%';
-+my $MYRC ||= "$PREFIX/etc/grenouillerc";
-+my $DATAPATH ||= '%%SPOOL_DIR%%';
- my $DOWNLOADFILE ||= "$DATAPATH/downloadfile";
- my $UPLOADFILE ||= "$DATAPATH/uploadfile";
- my $QUEUEFILE ||= "$DATAPATH/queued_results.txt";
- my $LASTCONFIGFILE ||= "$DATAPATH/last_configuration.txt";
- my $LASTVERSIONFILE ||= "$DATAPATH/last_known_version.txt";
--my $PIDFILE ||= "/var/run/plgrenouille.pid";
--my $LOGFILE ||= "/var/log/plgrenouille.log";
-+my $PIDFILE ||= "%%RUN_DIR%%/plgrenouille.pid";
-+my $LOGFILE ||= "%%LOG_DIR%%/plgrenouille.log";
-+my $NETSTAT ||= '/usr/bin/netstat';
-+my $IFCONFIG ||= '/sbin/ifconfig';
- 
--my $USER ||= 'daemon';
-+my $USER ||= '%%SPOOL_USER%%';
- 
- # what features do we want to debug ?
- my(%DEBUG) = ( 'protocol' => 0, 'scheduler' => 0 );
-@@ -61,6 +64,7 @@
- 
- sub usage($) {
-     my($exitcode) = @_;
-+    display_version();
-     print <<"EOUSAGE";
- Usage: $VERSION{'client'} [-c|--configure] [-b|--background] [-h|-?|--help]
-               [[-l |--log=]priorité] [[-v |--verbose=]priorité]
-@@ -109,7 +113,7 @@
- 
- # for milliseconds; otherwise would use built-in time.
- 
--my $SYS_gettimeofday ||= 78;
-+my $SYS_gettimeofday ||= 116;
- 
- sub microtime() {
-     my ($timeval, $timezone, $sec, $usec);
-@@ -205,36 +209,21 @@
-   die "Priorité $level inconnue" unless $DISPLAY_LEVEL;
- }
- 
--# parse /proc/net/dev (Linux)
-+# parse netstat -ib (FreeBSD)
- sub get_traffic_counters($) {
-     my ($if_device) = @_;
-     
--    # Sometimes fails with EOVERFLOW ("Value too large for defined data type")
--    # on my box, maybe some LFS bug in /proc ? (kernel 2.4.5)
--    open(PROC_NET_DEV, '</proc/net/dev') or 
--	die "Can't read /proc/net/dev: $!";
--    while (<PROC_NET_DEV>) {
--	if (/^\s*$if_device:\s*(.*)$/) {
-+    open(NETSTAT_PIPE, '-|') or exec($NETSTAT, '-ib') or die "netstat: $!";
-+    while (<NETSTAT_PIPE>) {
-+	if (/^($if_device.*<Link.*)/) {
- 	    my(@counters) = split(/\s+/, $1);
--	    close(PROC_NET_DEV);
--	    if(scalar @counters == 16) {
--		# linux >2.1.90
--		return { 'rx' => $counters[0],
--			 'tx' => $counters[8] };
--	    }
--	    if(scalar @counters == 14) {
--		# linux 2.1.0..2.1.90
--		return { 'rx' => $counters[0],
--			 'tx' => $counters[6] };
--	    }
--	    if(scalar @counters == 11) {
--		die 'Désolé, les noyaux antérieurs à 2.1.0 ne sont pas supportés';
--	    }
--	    die 'Format de /proc/net/dev non reconnu, envoyer un exemple au mainteneur SVP';
-+	    close(NETSTAT_PIPE);
-+	    return { 'rx' => $counters[6],
-+		     'tx' => $counters[9] };
- 	}
+ # ---------------------------------------------------------------
+ 
+@@ -243,9 +244,9 @@
+ sub before_test() {
+ # stop or pause processes that could interfere with bandwidth measurements,
+ # etc.
+-    if(-x '/etc/plgrenouille-before') {
++    if(-x '$BEFOREFILE') {
+ 	eval {
+-	    system '/etc/plgrenouille-before';
++	    system '$BEFOREFILE';
+ 	};
+ 	display_and_log('ERROR', "plgrenouille-before: $@") if $@;
      }
-     
--    close(PROC_NET_DEV);
-+    close(NETSTAT_PIPE);
-     die "Pas d'interface $if_device ?";
- }
- 
-@@ -350,6 +339,7 @@
- }
- 
- sub load_preferences() {
-+    swap_privileges();
-     eval {
- 	if (open(CONFIG, "<$MYRC")) {
- 	    while (<CONFIG>) {
-@@ -360,6 +350,7 @@
- 	    close(CONFIG);
- 	}
-     };
-+    swap_privileges();
-     die if $@;
- }
- 
-@@ -442,7 +433,7 @@
- sub get_preferences() {
-     load_preferences();
-     
--    die "plgrenouille n'a pas été totalement paramétré, lancez plgrenouille --config ou modifiez /etc/grenouillerc" 
-+    die "plgrenouille n'a pas été totalement paramétré, lancez plgrenouille --config ou modifiez $MYRC"
- 	if not defined $preferences{'user'} or 
- 	   not defined $preferences{'pass'} or
- 	   not defined $preferences{'email'} or 
-@@ -456,20 +447,20 @@
- # plgrenouille uses the default route interface
- sub autodetect_interface() {
-     $vars{'ip'} = '';
--    open(ROUTE, '-|') or exec('/bin/netstat', '-r') or die "netstat: $!";
--    while (<ROUTE>) {
--	if (/^default.*((?:eth|ppp|sl)[0-9]+)$/) {
-+    open(ROUTE_PIPE, '-|') or exec($NETSTAT, '-r') or die "netstat: $!";
-+    while (<ROUTE_PIPE>) {
-+      if (/^default.* ([^ ]+[0-9]+)$/) {
- 	    $preferences{'interface'} = $1;
--	}
-+      }
+@@ -253,9 +254,9 @@
+ 
+ sub after_test() {
+ # revert anything done by before_test()
+-    if(-x '/etc/plgrenouille-after') {
++    if(-x '$AFTERFILE') {
+ 	eval {
+-	    system '/etc/plgrenouille-after';
++	    system '$AFTERFILE';
+ 	};
+ 	display_and_log('ERROR', "plgrenouille-after: $@") if $@;
      }
--    close(ROUTE);
--    open(IFCONFIG, '-|') or exec('/sbin/ifconfig', $preferences{'interface'}) or die "ifconfig: $!";
--    while(<IFCONFIG>) {
--	if (/inet add?r:([.0-9]+)/) {
-+    close(ROUTE_PIPE);
-+    open(IFCONFIG_PIPE, '-|') or exec($IFCONFIG, $preferences{'interface'}) or die "ifconfig: $!";
-+    while(<IFCONFIG_PIPE>) {
-+	if (/inet ([.0-9]+)/) {
- 	    $vars{'ip'} = $1;
- 	}
-     }
--    close IFCONFIG;
-+    close(IFCONFIG_PIPE);
-     
-     display_and_log('NOTICE', "$preferences{'interface'} sera utilisé pour les mesures") if $preferences{'interface'};
- }
-@@ -1182,8 +1173,6 @@
+@@ -620,8 +621,6 @@
  
  # --------------------------- MAIN ----------------------------
  
@@ -167,7 +56,7 @@
  Getopt::Long::Configure('bundling'); # 'no_ignore_case'
  eval {
    GetOptions(\%params,
-@@ -1191,6 +1180,7 @@
+@@ -629,6 +628,7 @@
               'verbose|v=s', \&set_verbose_level,
               'configure|setup|c',
               'background|b',
@@ -175,7 +64,7 @@
               'help|h|?');
  };
  if ($@) {
-@@ -1199,6 +1189,10 @@
+@@ -637,6 +637,10 @@
  }
  usage(1) if scalar @ARGV;
  usage(0) if $params{'help'};
diff --git a/french/plgrenouille/files/plgrenouille.sh b/french/plgrenouille/files/plgrenouille.sh
index 4e458634cfc0..38dd7c1705a9 100644
--- a/french/plgrenouille/files/plgrenouille.sh
+++ b/french/plgrenouille/files/plgrenouille.sh
@@ -2,58 +2,30 @@
 #
 # $FreeBSD$
 #
-# Start or stop portsentry.
+# PROVIDE: plgrenouille
+# REQUIRE: DAEMON
+# KEYWORD: FreeBSD
+#
+# Add the following line to /etc/rc.conf to enable upclient:
+#
+# plgrenouille_enable="YES"
 #
 
-rc_file=${0##*/}
-rc_arg=$1
-
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/${rc_file}\$"); then
-	echo "${rc_file}: Cannot determine PREFIX." >&2
-	echo "Please use the complete pathname." >&2
-	exit 64
-fi
+plgrenouille_enable=NO
+plgrenouille_flags=-b
 
-program_args=-b
-program_dir=${PREFIX}/libexec
-program_file=${rc_file%.sh}
-program_path=${program_dir}/${program_file}
+. %%RC_SUBR%%
 
-pid_dir=/var/run
-pid_file=${program_file}.pid
-pid_path=${pid_dir}/${pid_file}
+name=plgrenouille
+rcvar=$(set_rcvar)
 
-syslog_facility=daemon.err
+command=%%LBIN_DIR%%/${name}
+command_interpreter=%%PERL%%
+pidfile=%%RUN_DIR%%/${name}.pid
+logfile=%%LOG_DIR%%/${name}.log
+required_files=%%CONF_DIR%%/grenouillerc
+extra_commands=configure
+configure_cmd="${command} -c"
 
-case "$rc_arg" in
-start)
-	if [ ! -x ${program_path} ]; then
-		logger -sp ${syslog_facility} -t ${program_file} \
-			"unable to start: ${program_path} is missing."
-		exit 72
-	fi
-	${program_path} ${program_args} > /dev/null &&
-	echo -n " ${program_file}"
-	;;
-stop)
-	if [ -r ${pid_path} ]; then
-		kill $(cat ${pid_path}) 2> /dev/null
-	else
-		killall ${program_file} 2> /dev/null
-	fi
-	;;
-restart)
-	$0 stop
-	$0 start
-	;;
-status)
-	ps auxww | egrep ${program_file} | egrep -v "($0|egrep)"
-	;;
-configure)
-	${program_path} -c
-	;;
-*)
-	echo "usage: ${rc_file} {start|stop|restart|status}" >&2
-	exit 64
-	;;
-esac
+load_rc_config ${name}
+run_rc_command "$1"
diff --git a/french/plgrenouille/pkg-plist b/french/plgrenouille/pkg-plist
index ef25fc387d1e..c8f24bd54e5f 100644
--- a/french/plgrenouille/pkg-plist
+++ b/french/plgrenouille/pkg-plist
@@ -1,9 +1,20 @@
 @comment $FreeBSD$
-@unexec if cmp -s %D/etc/grenouillerc %D/etc/grenouillerc.sample; then rm -f %D/etc/grenouillerc; fi
-etc/grenouillerc.sample
+@unexec if cmp -s %D/%%CONF_DIR%%/grenouillerc %D/%%CONF_DIR%%/grenouillerc.sample; then rm -f %D/%%CONF_DIR%%/grenouillerc; fi
+%%CONF_DIR%%/grenouillerc.sample
 @comment no @exec: see pkg-install/+INSTALL for details.
-etc/rc.d/plgrenouille.sh
-libexec/plgrenouille
-%%PORTDOCS%%share/doc/plgrenouille/FAQ
-%%PORTDOCS%%share/doc/plgrenouille/README
-%%PORTDOCS%%@dirrm share/doc/plgrenouille
+%%RC_DIR%%/plgrenouille.sh
+%%LBIN_DIR%%/plgrenouille
+%%SITE_PERL%%/Grenouille/Comm.pm
+%%SITE_PERL%%/Grenouille/Config.pm
+%%SITE_PERL%%/Grenouille/Log.pm
+%%SITE_PERL%%/Grenouille/Numbers.pm
+%%SITE_PERL%%/Grenouille/Preferences.pm
+%%SITE_PERL%%/Grenouille/Queue.pm
+%%SITE_PERL%%/Grenouille/Scheduler.pm
+%%SITE_PERL%%/Grenouille/System.pm
+%%SITE_PERL%%/Grenouille/Vars.pm
+%%SITE_PERL%%/Grenouille/Version.pm
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%SITE_PERL%%/Grenouille