diff options
| author | gabor <gabor@FreeBSD.org> | 2007-01-14 06:57:06 +0800 |
|---|---|---|
| committer | gabor <gabor@FreeBSD.org> | 2007-01-14 06:57:06 +0800 |
| commit | 0b3a5899f08b91094d24fa3e13ac9f3e5eb5016b (patch) | |
| tree | 0eb6c7dc08da921c8b7bc92d5834344f20393401 /french | |
| parent | 1ca16f0fb2da80ae72a1b51854f93070ef7b70b0 (diff) | |
| download | freebsd-ports-gnome-0b3a5899f08b91094d24fa3e13ac9f3e5eb5016b.tar.gz freebsd-ports-gnome-0b3a5899f08b91094d24fa3e13ac9f3e5eb5016b.tar.zst freebsd-ports-gnome-0b3a5899f08b91094d24fa3e13ac9f3e5eb5016b.zip | |
- Fix handling of the rc.d script
- Bump PORTREVISION
Reported by: pointyhat (via kris)
Approved by: erwin (mentor)
Diffstat (limited to 'french')
| -rw-r--r-- | french/plgrenouille/Makefile | 5 | ||||
| -rw-r--r-- | french/plgrenouille/pkg-install | 5 | ||||
| -rw-r--r-- | french/plgrenouille/pkg-plist | 2 |
3 files changed, 3 insertions, 9 deletions
diff --git a/french/plgrenouille/Makefile b/french/plgrenouille/Makefile index 8329e63b3de3..8f74c074a0e4 100644 --- a/french/plgrenouille/Makefile +++ b/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} \ diff --git a/french/plgrenouille/pkg-install b/french/plgrenouille/pkg-install index 54414484c0c8..6cfb4ecc971b 100644 --- a/french/plgrenouille/pkg-install +++ b/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} diff --git a/french/plgrenouille/pkg-plist b/french/plgrenouille/pkg-plist index c8f24bd54e5f..c6435a4a682d 100644 --- a/french/plgrenouille/pkg-plist +++ b/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 |