diff options
author | clement <clement@FreeBSD.org> | 2004-02-27 00:20:51 +0800 |
---|---|---|
committer | clement <clement@FreeBSD.org> | 2004-02-27 00:20:51 +0800 |
commit | 9336081b168c8a647185b46c7965cd31a8edb5bb (patch) | |
tree | 45406ac06126bd8bc2efc39bb15ec4080b081037 /news/inn-stable | |
parent | 79f6f72735eadd4a59448fdcb9b99b85885a83b2 (diff) | |
download | freebsd-ports-gnome-9336081b168c8a647185b46c7965cd31a8edb5bb.tar.gz freebsd-ports-gnome-9336081b168c8a647185b46c7965cd31a8edb5bb.tar.zst freebsd-ports-gnome-9336081b168c8a647185b46c7965cd31a8edb5bb.zip |
- Add WITH_STANDARD_ETC knob
If you define WITH_STANDARD_ETC inn config files are put
in ${PREFIX}/etc/inn
Requested by: Jochen Gensch <incmc@gmx.de> (PR 61974)
Diffstat (limited to 'news/inn-stable')
-rw-r--r-- | news/inn-stable/Makefile | 13 | ||||
-rw-r--r-- | news/inn-stable/pkg-install | 4 | ||||
-rw-r--r-- | news/inn-stable/pkg-plist | 106 |
3 files changed, 66 insertions, 57 deletions
diff --git a/news/inn-stable/Makefile b/news/inn-stable/Makefile index e73e4792e921..df7da01ed9f6 100644 --- a/news/inn-stable/Makefile +++ b/news/inn-stable/Makefile @@ -45,7 +45,8 @@ CONFIGURE_ARGS+= --mandir=${PREFIX}/man \ --with-perl \ --with-tmp-dir=${INN_NEWSSPOOL}/tmp \ --with-openssl=${OPENSSLBASE} \ - --enable-ipv6 + --enable-ipv6 \ + --with-etc-dir=${ETC_DIR} .if defined(WITH_BERKELEYDB) CONFIGURE_ARGS+= --with-berkeleydb=${LOCABASE} @@ -126,6 +127,14 @@ MAN8= actsync.8 actsyncd.8 archive.8 auth_smb.8 batcher.8 buffchan.8 \ .include <bsd.port.pre.mk> +.if defined(WITH_STANDARD_ETC) +ETC_DIR= ${PREFIX}/etc/inn +PLIST_SUB+= ETCDIR=etc/inn +.else +ETC_DIR= ${PREFIX}/news/etc +PLIST_SUB+= ETCDIR=news/etc +.endif + post-patch: .if defined(WITH_TCL) @${REINPLACE_CMD} -e 's!<tcl.h>!<tcl8.3/tcl.h>!' ${WRKSRC}/innd/innd.h @@ -150,7 +159,7 @@ post-install: s+!!PREFIX!!+${PREFIX}+g && ${CHMOD} +x ${PREFIX}/etc/rc.d/innd.sh @${CHOWN} root:news ${PREFIX}/news/bin/auth/passwd/ckpasswd @${CHMOD} 4755 ${PREFIX}/news/bin/auth/passwd/ckpasswd - @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} CHECK-CONF + @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} CHECK-CONF ${ETC_DIR} @(if [ ! -f ${PREFIX}/news/db/history ] ; then \ ${ECHO} 'Creating empty history database...' ; \ cd ${PREFIX}/news/db ; \ diff --git a/news/inn-stable/pkg-install b/news/inn-stable/pkg-install index fa27dc71c03b..d351162bd33d 100644 --- a/news/inn-stable/pkg-install +++ b/news/inn-stable/pkg-install @@ -8,9 +8,9 @@ case $2 in PRE-INSTALL) ;; CHECK-CONF) - NEWSBASE=${PKG_PREFIX}/news + ETC_DIR=${3} echo "Checking for configuration files" - for f in $(find ${NEWSBASE}/etc/ -name "*.dist" -type f) + for f in $(find ${ETC_DIR} -name "*.dist" -type f) do REALFILE=${f%%.dist} echo -n "Checking if ${REALFILE} exists: " diff --git a/news/inn-stable/pkg-plist b/news/inn-stable/pkg-plist index 628e8b5db37f..f36753f4ea83 100644 --- a/news/inn-stable/pkg-plist +++ b/news/inn-stable/pkg-plist @@ -127,83 +127,83 @@ news/doc/hook-perl news/doc/hook-python news/doc/hook-tcl news/doc/sample-control -@unexec if cmp -s %D/news/etc/actsync.cfg %D/news/etc/actsync.cfg.dist; then rm -f %D/news/etc/actsync.cfg ; fi -news/etc/actsync.cfg.dist +@unexec if cmp -s %D/%%ETCDIR%%/actsync.cfg %D/%%ETCDIR%%/actsync.cfg.dist; then rm -f %D/%%ETCDIR%%/actsync.cfg ; fi +%%ETCDIR%%/actsync.cfg.dist @exec [ -f %B/actsync.cfg ] || cp -f %B/%f %B/actsync.cfg -@unexec if cmp -s %D/news/etc/actsync.ign %D/news/etc/actsync.ign.dist; then rm -f %D/news/etc/actsync.ign ; fi -news/etc/actsync.ign.dist +@unexec if cmp -s %D/%%ETCDIR%%/actsync.ign %D/%%ETCDIR%%/actsync.ign.dist; then rm -f %D/%%ETCDIR%%/actsync.ign ; fi +%%ETCDIR%%/actsync.ign.dist @exec [ -f %B/actsync.ign ] || cp -f %B/%f %B/actsync.ign -@unexec if cmp -s %D/news/etc/buffindexed.conf %D/news/etc/buffindexed.conf.dist; then rm -f %D/news/etc/buffindexed.conf ; fi -news/etc/buffindexed.conf.dist +@unexec if cmp -s %D/%%ETCDIR%%/buffindexed.conf %D/%%ETCDIR%%/buffindexed.conf.dist; then rm -f %D/%%ETCDIR%%/buffindexed.conf ; fi +%%ETCDIR%%/buffindexed.conf.dist @exec [ -f %B/buffindexed.conf ] || cp -f %B%/%f %B/buffindexed.conf -@unexec if cmp -s %D/news/etc/control.ctl %D/news/etc/control.ctl.dist; then rm -f %D/news/etc/control.ctl ; fi -news/etc/control.ctl.dist +@unexec if cmp -s %D/%%ETCDIR%%/control.ctl %D/%%ETCDIR%%/control.ctl.dist; then rm -f %D/%%ETCDIR%%/control.ctl ; fi +%%ETCDIR%%/control.ctl.dist @exec [ -f %B/control.ctl ] || cp -f %B/%f %B/control.ctl -@unexec if cmp -s %D/news/etc/cycbuff.conf %D/news/etc/cycbuff.conf.dist; then rm -f %D/news/etc/cycbuff.conf ; fi -news/etc/cycbuff.conf.dist +@unexec if cmp -s %D/%%ETCDIR%%/cycbuff.conf %D/%%ETCDIR%%/cycbuff.conf.dist; then rm -f %D/%%ETCDIR%%/cycbuff.conf ; fi +%%ETCDIR%%/cycbuff.conf.dist @exec [ -f %B/cycbuff.conf ] || cp -f %B/%f %B/cycbuff.conf -@unexec if cmp -s %D/news/etc/distrib.pats %D/news/etc/distrib.pats.dist; then rm -f %D/news/etc/distrib.pats ; fi -news/etc/distrib.pats.dist +@unexec if cmp -s %D/%%ETCDIR%%/distrib.pats %D/%%ETCDIR%%/distrib.pats.dist; then rm -f %D/%%ETCDIR%%/distrib.pats ; fi +%%ETCDIR%%/distrib.pats.dist @exec [ -f %B/distrib.pats ] || cp -f %B/%f %B/distrib.pats -@unexec if cmp -s %D/news/etc/expire.ctl %D/news/etc/expire.ctl.dist; then rm -f %D/news/etc/expire.ctl ; fi -news/etc/expire.ctl.dist +@unexec if cmp -s %D/%%ETCDIR%%/expire.ctl %D/%%ETCDIR%%/expire.ctl.dist; then rm -f %D/%%ETCDIR%%/expire.ctl ; fi +%%ETCDIR%%/expire.ctl.dist @exec [ -f %B/expire.ctl ] || cp -f %B/%f %B/expire.ctl -@unexec if cmp -s %D/news/etc/incoming.conf %D/news/etc/incoming.conf.dist; then rm -f %D/news/etc/incoming.conf ; fi -news/etc/incoming.conf.dist +@unexec if cmp -s %D/%%ETCDIR%%/incoming.conf %D/%%ETCDIR%%/incoming.conf.dist; then rm -f %D/%%ETCDIR%%/incoming.conf ; fi +%%ETCDIR%%/incoming.conf.dist @exec [ -f %B/incoming ] || cp -f %B/%f %B/incoming.conf -@unexec if cmp -s %D/news/etc/inn.conf %D/news/etc/inn.conf.dist; then rm -f %D/news/etc/inn.conf ; fi -news/etc/inn.conf.dist +@unexec if cmp -s %D/%%ETCDIR%%/inn.conf %D/%%ETCDIR%%/inn.conf.dist; then rm -f %D/%%ETCDIR%%/inn.conf ; fi +%%ETCDIR%%/inn.conf.dist @exec [ -f %B/inn.conf ] || cp -f %B/%f %B/inn.conf -@unexec if cmp -s %D/news/etc/innfeed.conf %D/news/etc/innfeed.conf.dist; then rm -f %D/news/etc/innfeed.conf ; fi -news/etc/innfeed.conf.dist +@unexec if cmp -s %D/%%ETCDIR%%/innfeed.conf %D/%%ETCDIR%%/innfeed.conf.dist; then rm -f %D/%%ETCDIR%%/innfeed.conf ; fi +%%ETCDIR%%/innfeed.conf.dist @exec [ -f %B/innfeed.conf.dist ] || cp -f %B/%f %B/innfeed.conf.dist -@unexec if cmp -s %D/news/etc/innreport.conf %D/news/etc/innreport.conf.dist; then rm -f %D/news/etc/innreport.conf ; fi -news/etc/innreport.conf.dist +@unexec if cmp -s %D/%%ETCDIR%%/innreport.conf %D/%%ETCDIR%%/innreport.conf.dist; then rm -f %D/%%ETCDIR%%/innreport.conf ; fi +%%ETCDIR%%/innreport.conf.dist @exec [ -f %B/innreport.conf ] || cp -f %B/%f %B/innreport.conf -@unexec if cmp -s %D/news/etc/innwatch.ctl %D/news/etc/innwatch.ctl.dist; then rm -f %D/news/etc/innwatch.ctl ; fi -news/etc/innwatch.ctl.dist +@unexec if cmp -s %D/%%ETCDIR%%/innwatch.ctl %D/%%ETCDIR%%/innwatch.ctl.dist; then rm -f %D/%%ETCDIR%%/innwatch.ctl ; fi +%%ETCDIR%%/innwatch.ctl.dist @exec [ -f %B/innwatch.ctl ] || cp -f %B/%f %B/innwatch.ctl -@unexec if cmp -s %D/news/etc/moderators %D/news/etc/moderators.dist; then rm -f %D/news/etc/moderators ; fi -news/etc/moderators.dist +@unexec if cmp -s %D/%%ETCDIR%%/moderators %D/%%ETCDIR%%/moderators.dist; then rm -f %D/%%ETCDIR%%/moderators ; fi +%%ETCDIR%%/moderators.dist @exec [ -f %B/moderators ] || cp -f %B/%f %B/moderators -@unexec if cmp -s %D/news/etc/motd.news %D/news/etc/motd.news.dist; then rm -f %D/news/etc/motd.news ; fi -news/etc/motd.news.dist +@unexec if cmp -s %D/%%ETCDIR%%/motd.news %D/%%ETCDIR%%/motd.news.dist; then rm -f %D/%%ETCDIR%%/motd.news ; fi +%%ETCDIR%%/motd.news.dist @exec [ -f %B/motd.news ] || cp -f %B/%f %B/motd.news -@unexec if cmp -s %D/news/etc/news2mail.cf %D/news/etc/news2mail.cf.dist; then rm -f %D/news/etc/news2mail.cf ; fi -news/etc/news2mail.cf.dist +@unexec if cmp -s %D/%%ETCDIR%%/news2mail.cf %D/%%ETCDIR%%/news2mail.cf.dist; then rm -f %D/%%ETCDIR%%/news2mail.cf ; fi +%%ETCDIR%%/news2mail.cf.dist @exec [ -f %B/news2mail.cf ] || cp -f %B/%f %B/news2mail.cf -@unexec if cmp -s %D/news/etc/newsfeeds %D/news/etc/newsfeeds.dist; then rm -f %D/news/etc/newsfeeds ; fi -news/etc/newsfeeds.dist +@unexec if cmp -s %D/%%ETCDIR%%/newsfeeds %D/%%ETCDIR%%/newsfeeds.dist; then rm -f %D/%%ETCDIR%%/newsfeeds ; fi +%%ETCDIR%%/newsfeeds.dist @exec [ -f %B/newsfeeds ] || cp -f %B/%f %B/newsfeeds -@unexec if cmp -s %D/news/etc/nnrpd.track %D/news/etc/nnrpd.track.dist; then rm -f %D/news/etc/nnrpd.track ; fi -news/etc/nnrpd.track.dist +@unexec if cmp -s %D/%%ETCDIR%%/nnrpd.track %D/%%ETCDIR%%/nnrpd.track.dist; then rm -f %D/%%ETCDIR%%/nnrpd.track ; fi +%%ETCDIR%%/nnrpd.track.dist @exec [ -f %B/nnrpd.track ] || cp -f %B/%f %B/nnrpd.track -@unexec if cmp -s %D/news/etc/nntpsend.ctl %D/news/etc/nntpsend.ctl.dist; then rm -f %D/news/etc/nntpsend.ctl ; fi -news/etc/nntpsend.ctl.dist +@unexec if cmp -s %D/%%ETCDIR%%/nntpsend.ctl %D/%%ETCDIR%%/nntpsend.ctl.dist; then rm -f %D/%%ETCDIR%%/nntpsend.ctl ; fi +%%ETCDIR%%/nntpsend.ctl.dist @exec [ -f %B/nntpsend.ctl ] || cp -f %B/%f %B/nntpsend.ctl -@unexec if cmp -s %D/news/etc/ovdb.conf %D/news/etc/ovdb.conf.dist; then rm -f %D/news/etc/ovdb.conf ; fi -news/etc/ovdb.conf.dist +@unexec if cmp -s %D/%%ETCDIR%%/ovdb.conf %D/%%ETCDIR%%/ovdb.conf.dist; then rm -f %D/%%ETCDIR%%/ovdb.conf ; fi +%%ETCDIR%%/ovdb.conf.dist @exec [ -f %B/ovdb.conf ] || cp -f %B/%f %B/ovdb.conf -@unexec if cmp -s %D/news/etc/overview.fmt %D/news/etc/overview.fmt.dist; then rm -f %D/news/etc/overview.fmt ; fi -news/etc/overview.fmt.dist +@unexec if cmp -s %D/%%ETCDIR%%/overview.fmt %D/%%ETCDIR%%/overview.fmt.dist; then rm -f %D/%%ETCDIR%%/overview.fmt ; fi +%%ETCDIR%%/overview.fmt.dist @exec [ -f %B/overview.fmt ] || cp -f %B/%f %B/overview.fmt -@unexec if cmp -s %D/news/etc/passwd.nntp %D/news/etc/passwd.nntp.dist; then rm -f %D/news/etc/passwd.nntp ; fi -news/etc/passwd.nntp.dist +@unexec if cmp -s %D/%%ETCDIR%%/passwd.nntp %D/%%ETCDIR%%/passwd.nntp.dist; then rm -f %D/%%ETCDIR%%/passwd.nntp ; fi +%%ETCDIR%%/passwd.nntp.dist @exec [ -f %B/passwd.nntp ] || cp -f %B/%f %B/passwd.nntp -@unexec if cmp -s %D/news/etc/radius.conf %D/news/etc/radius.conf.dist; then rm -f %D/news/etc/radius.conf ; fi -news/etc/radius.conf.dist +@unexec if cmp -s %D/%%ETCDIR%%/radius.conf %D/%%ETCDIR%%/radius.conf.dist; then rm -f %D/%%ETCDIR%%/radius.conf ; fi +%%ETCDIR%%/radius.conf.dist @exec [ -f %B/radius.conf ] || cp -f %B/%f %B/radius.conf -@unexec if cmp -s %D/news/etc/readers.conf %D/news/etc/readers.conf.dist; then rm -f %D/news/etc/readers.conf; fi -news/etc/readers.conf.dist +@unexec if cmp -s %D/%%ETCDIR%%/readers.conf %D/%%ETCDIR%%/readers.conf.dist; then rm -f %D/%%ETCDIR%%/readers.conf; fi +%%ETCDIR%%/readers.conf.dist @exec [ -f %B/readers.conf ] || cp -f %B/%f %B/readers.conf -@unexec if cmp -s %D/news/etc/sasl.conf %D/news/etc/sasl.conf.dist; then rm -f %D/news/etc/sasl.conf ; fi -news/etc/sasl.conf.dist +@unexec if cmp -s %D/%%ETCDIR%%/sasl.conf %D/%%ETCDIR%%/sasl.conf.dist; then rm -f %D/%%ETCDIR%%/sasl.conf ; fi +%%ETCDIR%%/sasl.conf.dist @exec [ -f %B/sasl.conf ] || cp -f %B/%f %B/sasl.conf -@unexec if cmp -s %D/news/etc/storage.conf %D/news/etc/storage.conf.dist; then rm -f %D/news/etc/storage.conf ; fi -news/etc/storage.conf.dist +@unexec if cmp -s %D/%%ETCDIR%%/storage.conf %D/%%ETCDIR%%/storage.conf.dist; then rm -f %D/%%ETCDIR%%/storage.conf ; fi +%%ETCDIR%%/storage.conf.dist @exec [ -f %B/storage.conf ] || cp -f %B/%f %B/storage.conf -@unexec if cmp -s %D/news/etc/subscriptions %D/news/etc/subscriptions.dist; then rm -f %D/news/etc/subscriptions ; fi -news/etc/subscriptions.dist +@unexec if cmp -s %D/%%ETCDIR%%/subscriptions %D/%%ETCDIR%%/subscriptions.dist; then rm -f %D/%%ETCDIR%%/subscriptions ; fi +%%ETCDIR%%/subscriptions.dist @exec [ -f %B/subscriptions ] || cp -f %B/%f %B/subscriptions news/include/clibrary.h news/include/conffile.h @@ -263,7 +263,7 @@ news/lib/libstorage.a @dirrm news/lib @dirrm news/include/inn @dirrm news/include -@unexec rmdir %D/news/etc 2>/dev/null || true +@unexec rmdir %D/%%ETCDIR%% 2>/dev/null || true @dirrm news/doc @unexec rmdir %D/news/db 2>/dev/null || true @dirrm news/bin/rnews.libexec |