- Fix handling of the rc.d script

- Bump PORTREVISION

Reported by:	pointyhat (via kris)
Approved by:	erwin (mentor)

french/plgrenouille/Makefile

@@ -7,7 +7,7 @@
 
 PORTNAME=	plgrenouille
 PORTVERSION=	0.70.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	french net
 MASTER_SITES=	http://concept.free.free.fr/plgrenouille/beta/
 DISTNAME=	${PORTNAME}_${PORTVERSION:R}-${PORTVERSION:E}
@@ -37,8 +37,7 @@ SCRIPTS_ENV=	PKG_PREFIX=${PREFIX}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 PKGDEINSTALL=	${PKGINSTALL}
 PLIST_SUB=	LBIN_DIR="${LBIN_DIR:S,^${PREFIX}/,,}" \
-		CONF_DIR="${CONF_DIR:S,^${PREFIX}/,,}" \
-		RC_DIR="${RC_DIR:S,^${PREFIX}/,,}"
+		CONF_DIR="${CONF_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} \

french/plgrenouille/pkg-install

@@ -24,11 +24,6 @@ POST-INSTALL)
 	[ -f ${PKG_PREFIX}/etc/rc.d/plgrenouille.sh ] &&
 	sh ${PKG_PREFIX}/etc/rc.d/plgrenouille.sh configure
 	;;
-DEINSTALL)
-	if [ -f ${PKG_PREFIX}/etc/rc.d/plgrenouille.sh ]; then
-		sh ${PKG_PREFIX}/etc/rc.d/plgrenouille.sh stop
-	fi
-	;;
 POST-DEINSTALL)
 	if [ -d ${SPOOL_DIR} ]; then
 		rm -rf ${SPOOL_DIR}

french/plgrenouille/pkg-plist

@@ -1,8 +1,8 @@
 @comment $FreeBSD$
 @unexec if cmp -s %D/%%CONF_DIR%%/grenouillerc %D/%%CONF_DIR%%/grenouillerc.sample; then rm -f %D/%%CONF_DIR%%/grenouillerc; fi
+@unexec %%PREFIX%%/etc/rc.d/plgrenouille.sh stop
 %%CONF_DIR%%/grenouillerc.sample
 @comment no @exec: see pkg-install/+INSTALL for details.
-%%RC_DIR%%/plgrenouille.sh
 %%LBIN_DIR%%/plgrenouille
 %%SITE_PERL%%/Grenouille/Comm.pm
 %%SITE_PERL%%/Grenouille/Config.pm