diff options
| author | thierry <thierry@FreeBSD.org> | 2012-02-26 03:33:24 +0800 |
|---|---|---|
| committer | thierry <thierry@FreeBSD.org> | 2012-02-26 03:33:24 +0800 |
| commit | 2cb8a68ffefeae5caed0f3e0e63da667ad93025d (patch) | |
| tree | aafa50af6231e61b79a95a9d6e128147d107814d /news/inn | |
| parent | 7d52d5e3addf750930f5bc58efabbeae1b7b6ca1 (diff) | |
| download | freebsd-ports-gnome-2cb8a68ffefeae5caed0f3e0e63da667ad93025d.tar.gz freebsd-ports-gnome-2cb8a68ffefeae5caed0f3e0e63da667ad93025d.tar.zst freebsd-ports-gnome-2cb8a68ffefeae5caed0f3e0e63da667ad93025d.zip | |
Fix rc script.
Since I'm there, clean plist.
PR: ports/164750
Submitted by: Joe Horn <joehorn (at) gmail.com>
Approved by: maintainer time-out
Diffstat (limited to 'news/inn')
| -rw-r--r-- | news/inn/Makefile | 2 | ||||
| -rw-r--r-- | news/inn/Makefile.layout | 2 | ||||
| -rw-r--r-- | news/inn/pkg-plist | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/news/inn/Makefile b/news/inn/Makefile index 2d5f0f62105a..9e7ad675f1db 100644 --- a/news/inn/Makefile +++ b/news/inn/Makefile @@ -7,7 +7,7 @@ PORTNAME?= inn PORTVERSION?= 2.4.6 -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES= news ipv6 # Master distribution broken #MASTER_SITES?= ${MASTER_SITE_ISC} diff --git a/news/inn/Makefile.layout b/news/inn/Makefile.layout index 93c7fa65bec5..1ad1f77469fb 100644 --- a/news/inn/Makefile.layout +++ b/news/inn/Makefile.layout @@ -54,7 +54,7 @@ INN_NEWSSPOOL?= ${PREFIX}/news/spool .for sub in NEWSBASE ETCDIR RUNDIR LOGDIR DBDIR TMPDIR NEWSSPOOL PLIST_SUB+= ${sub}="${INN_${sub}:C,^${PREFIX},%D,}" -SUB_LIST+= ${sub}="${INN_${sub}:C,^${PREFIX},\\$\\${PREFIX},}" +SUB_LIST+= ${sub}="${INN_${sub}:C,^${PREFIX},${PREFIX},}" .endfor PLIST_SUB+= CWDNEWSBASE="@cwd ${INN_NEWSBASE}" diff --git a/news/inn/pkg-plist b/news/inn/pkg-plist index b161b2608b02..95f56fbb9984 100644 --- a/news/inn/pkg-plist +++ b/news/inn/pkg-plist @@ -210,7 +210,7 @@ lib/libstorage.a %%EXAMPLESDIR%%/sasl.conf %%EXAMPLESDIR%%/storage.conf %%EXAMPLESDIR%%/subscriptions -@exec mkdir %%ETCDIR%% +@exec mkdir -p %%ETCDIR%% @exec for f in %%ETCFILES%%; do [ -f %%ETCDIR%%/${f} ] || cp -fp %D/%%EXAMPLESDIR%%/${f} %%ETCDIR%%/${f}; done @comment -------------------------------------------------------------- @dirrm %%EXAMPLESDIR%%/db @@ -231,7 +231,7 @@ lib/libstorage.a @unexec rm -R %%NEWSBASE%%/include @unexec rmdir %%ETCDIR%% 2>/dev/null || true @unexec rm -Rf %%NEWSBASE%%/doc -@unexec rmdir %%DBDIR%% +@unexec rmdir %%DBDIR%% 2>/dev/null || true @unexec rm -Rf %%NEWSBASE%%/bin/rnews.libexec @unexec rm -Rf %%NEWSBASE%%/bin/filter @unexec rm -Rf %%NEWSBASE%%/bin/control |