[pkgsrc/trunk]: pkgsrc/news/inn cleaned up PLIST, fiddled with directory crea...

[spz <spz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/db150a58a9b8
branches:  trunk
changeset: 547461:db150a58a9b8
user:      spz <spz%pkgsrc.org@localhost>
date:      Tue Sep 16 23:06:19 2008 +0000

description:
cleaned up PLIST, fiddled with directory creation some more

diffstat:

 news/inn/Makefile |   36 +++--
 news/inn/PLIST    |  306 ++++++++++++++++++++++++++++-------------------------
 2 files changed, 185 insertions(+), 157 deletions(-)

diffs (truncated from 426 to 300 lines):

diff -r 0a44cb214d02 -r db150a58a9b8 news/inn/Makefile
--- a/news/inn/Makefile Tue Sep 16 22:51:20 2008 +0000
+++ b/news/inn/Makefile Tue Sep 16 23:06:19 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.91 2008/09/03 21:33:29 spz Exp $
+# $NetBSD: Makefile,v 1.92 2008/09/16 23:06:19 spz Exp $
 
 DISTNAME=              inn-2.4.5
 CATEGORIES=            news
@@ -72,24 +72,29 @@
 
 PKG_SYSCONFDIR.inn=    ${PREFIX}/etc/inn
 EXAMPLEDIR=            ${PREFIX}/share/examples/inn
-INN_DATADIRS=          log log/OLD run tmp
+INN_DATADIRS=          log log/OLD run tmp db spool
 INN_SPOOLDIRS=         archive articles overview incoming incoming/bad \
                        outgoing uniover innfeed
 
-OWN_DIRS+=             ${PREFIX}/etc/nntp
-OWN_DIRS+=             ${PREFIX}/etc/inn
-OWN_DIRS+=             ${INN_DATA_DIR}
-OWN_DIRS+=             ${INN_DATA_DIR}/db
-OWN_DIRS+=             ${INN_DATA_DIR}/spool
+MAKE_DIRS+=            ${PREFIX}/bin
+MAKE_DIRS+=            ${PREFIX}/sbin
+MAKE_DIRS+=            ${PREFIX}/lib
 
-.for dir in ${OWN_DIRS}
+INN_DIRS+=             ${PREFIX}/etc/nntp
+INN_DIRS+=             ${PREFIX}/etc/inn
+INN_DIRS+=             ${INN_DATA_DIR}
+
+OWN_DIRS+=             ${PREFIX}/${INN_PATHBIN}
+OWN_DIRS+=             ${EXAMPLEDIR}
+
+.for dir in ${INN_DIRS}
 OWN_DIRS_PERMS+=       ${dir}  ${INN_USER} ${INN_GROUP} 0775
 .endfor
 .for dir in ${INN_DATADIRS}
 MAKE_DIRS_PERMS+=      ${INN_DATA_DIR}/${dir}  ${INN_USER} ${INN_GROUP} 0775
 .endfor
 .for dir in ${INN_SPOOLDIRS}
-OWN_DIRS_PERMS+=       ${INN_DATA_DIR}/spool/${dir} \
+MAKE_DIRS_PERMS+=      ${INN_DATA_DIR}/spool/${dir} \
                                                ${INN_USER} ${INN_GROUP} 0775
 .endfor
 
@@ -129,21 +134,22 @@
        done
        # makedbz needs these earlier than pkgsrc will install them normally
        if [ ! -f ${PKG_SYSCONFDIR}/inn.conf ] ; then                   \
-               ${INSTALL_DATA} ${EXAMPLEDIR}/inn.conf                  \
+               ${INSTALL} ${COPY} -o ${INN_USER} -g ${INN_GROUP} -m 0664 \
+                               ${EXAMPLEDIR}/inn.conf                  \
                                ${PKG_SYSCONFDIR}/inn.conf ;            \
        fi
        if [ ! -d ${INN_DATA_DIR}/db ] ; then                           \
-               ${MKDIR} ${INN_DATA_DIR}/db ;           \
+               ${INSTALL} -d -o ${INN_USER} ${INN_DATA_DIR}/db ;       \
        fi
-       ${CHOWN} ${INN_USER} ${INN_DATA_DIR}/db
        
 
 post-install:
        for FILE in cnfsstat ctlinnd inndstart makehistory ; do         \
-               ${LN} -s ${PREFIX}/${INN_PATHBIN}/$$FILE ${PREFIX}/sbin/$$FILE ; \
+               ${INSTALL} -l rs ${PREFIX}/${INN_PATHBIN}/$$FILE     \
+                               ${PREFIX}/sbin/$$FILE ;                 \
        done
-       ${LN} -s ${PREFIX}/${INN_PATHBIN}/inews ${PREFIX}/bin/inews
-       ${LN} -s ${PREFIX}/${INN_PATHBIN}/rnews ${PREFIX}/bin/rnews
+       ${INSTALL} -l rs ${PREFIX}/${INN_PATHBIN}/inews ${PREFIX}/bin/inews
+       ${INSTALL} -l rs ${PREFIX}/${INN_PATHBIN}/rnews ${PREFIX}/bin/rnews
        for FILE in libinn.a libstorage.a libinnhist.a ; do             \
                ${CHMOD} 644 ${PREFIX}/lib/$$FILE ;                     \
        done
diff -r 0a44cb214d02 -r db150a58a9b8 news/inn/PLIST
--- a/news/inn/PLIST    Tue Sep 16 22:51:20 2008 +0000
+++ b/news/inn/PLIST    Tue Sep 16 23:06:19 2008 +0000
@@ -1,137 +1,31 @@
-@comment $NetBSD: PLIST,v 1.14 2008/09/03 21:33:29 spz Exp $
-include/inn/config.h
-include/inn/dbz.h
-include/inn/libinn.h
-include/inn/storage.h
-${INN_PATHBIN}/actmerge
-${INN_PATHBIN}/actsync
-${INN_PATHBIN}/actsyncd
-${INN_PATHBIN}/archive
-${INN_PATHBIN}/auth/passwd/auth_smb
-${INN_PATHBIN}/auth/passwd/ckpasswd
-${INN_PATHBIN}/auth/passwd/radius
-${INN_PATHBIN}/auth/resolv/domain
-${INN_PATHBIN}/auth/resolv/ident
-${INN_PATHBIN}/batcher
-${INN_PATHBIN}/buffchan
-${INN_PATHBIN}/cnfsheadconf
-${INN_PATHBIN}/cnfsstat
-sbin/cnfsstat
-${INN_PATHBIN}/control/checkgroups.pl
-${INN_PATHBIN}/control/ihave.pl
-${INN_PATHBIN}/control/newgroup.pl
-${INN_PATHBIN}/control/rmgroup.pl
-${INN_PATHBIN}/control/sendme.pl
-${INN_PATHBIN}/control/sendsys.pl
-${INN_PATHBIN}/control/senduuname.pl
-${INN_PATHBIN}/control/version.pl
-${INN_PATHBIN}/controlbatch
-${INN_PATHBIN}/controlchan
-${INN_PATHBIN}/convdate
-${INN_PATHBIN}/ctlinnd
-sbin/ctlinnd
-${INN_PATHBIN}/cvtbatch
-${INN_PATHBIN}/docheckgroups
-${INN_PATHBIN}/expire
-${INN_PATHBIN}/expireover
-${INN_PATHBIN}/expirerm
-${INN_PATHBIN}/fastrm
-${INN_PATHBIN}/filechan
-${INN_PATHBIN}/filter/INN.py
-${INN_PATHBIN}/filter/filter.tcl
-${INN_PATHBIN}/filter/filter_innd.pl
-${INN_PATHBIN}/filter/filter_innd.py
-${INN_PATHBIN}/filter/filter_nnrpd.pl
-${INN_PATHBIN}/filter/nnrpd_access.pl
-${INN_PATHBIN}/filter/nnrpd_auth.pl
-${INN_PATHBIN}/filter/nnrpd.py
-${INN_PATHBIN}/filter/nnrpd_access.py
-${INN_PATHBIN}/filter/nnrpd_auth.py
-${INN_PATHBIN}/filter/nnrpd_dynamic.py
-${INN_PATHBIN}/filter/startup.tcl
-${INN_PATHBIN}/filter/startup_innd.pl
-${INN_PATHBIN}/getlist
-${INN_PATHBIN}/gpgverify
-${INN_PATHBIN}/grephistory
-${INN_PATHBIN}/imapfeed
-${INN_PATHBIN}/inews
+@comment $NetBSD: PLIST,v 1.15 2008/09/16 23:06:19 spz Exp $
 bin/inews
-${INN_PATHBIN}/inncheck
-${INN_PATHBIN}/innconfval
-${INN_PATHBIN}/innd
-${INN_PATHBIN}/inndf
-${INN_PATHBIN}/inndstart
-sbin/inndstart
-${INN_PATHBIN}/innfeed
-${INN_PATHBIN}/innmail
-${INN_PATHBIN}/innreport
-${INN_PATHBIN}/innstat
-${INN_PATHBIN}/innupgrade
-${INN_PATHBIN}/innwatch
-${INN_PATHBIN}/innxbatch
-${INN_PATHBIN}/innxmit
-${INN_PATHBIN}/mailpost
-${INN_PATHBIN}/makedbz
-${INN_PATHBIN}/makehistory
-sbin/makehistory
-${INN_PATHBIN}/mod-active
-${INN_PATHBIN}/news.daily
-${INN_PATHBIN}/news2mail
-${INN_PATHBIN}/ninpaths
-${INN_PATHBIN}/nnrpd
-${INN_PATHBIN}/nntpget
-${INN_PATHBIN}/nntpsend
-${INN_PATHBIN}/ovdb_init
-${INN_PATHBIN}/ovdb_monitor
-${INN_PATHBIN}/ovdb_server
-${INN_PATHBIN}/ovdb_stat
-${INN_PATHBIN}/overchan
-${INN_PATHBIN}/perl-nocem
-${INN_PATHBIN}/pgpverify
-${INN_PATHBIN}/procbatch
-${INN_PATHBIN}/prunehistory
-${INN_PATHBIN}/pullnews
-${INN_PATHBIN}/rc.news
-${INN_PATHBIN}/rnews
 bin/rnews
-${INN_PATHBIN}/rnews.libexec/c7unbatch
-${INN_PATHBIN}/rnews.libexec/decode
-${INN_PATHBIN}/rnews.libexec/encode
-${INN_PATHBIN}/rnews.libexec/gunbatch
-${INN_PATHBIN}/scanlogs
-${INN_PATHBIN}/scanspool
-${INN_PATHBIN}/send-ihave
-${INN_PATHBIN}/send-nntp
-${INN_PATHBIN}/send-uucp
-${INN_PATHBIN}/sendinpaths
-${INN_PATHBIN}/sendxbatches
-${INN_PATHBIN}/shlock
-${INN_PATHBIN}/shrinkfile
-${INN_PATHBIN}/signcontrol
-${INN_PATHBIN}/simpleftp
-${INN_PATHBIN}/sm
-${INN_PATHBIN}/startinnfeed
-${INN_PATHBIN}/tally.control
-${INN_PATHBIN}/tdx-util
-${INN_PATHBIN}/writelog
-share/doc/inn/CONTRIBUTORS
-share/doc/inn/GPL
-share/doc/inn/HACKING
-share/doc/inn/INSTALL
-share/doc/inn/LICENSE
-share/doc/inn/NEWS
-share/doc/inn/README
-share/doc/inn/TODO
-share/doc/inn/compliance-nntp
-share/doc/inn/config-design
-share/doc/inn/config-semantics
-share/doc/inn/config-syntax
-share/doc/inn/external-auth
-share/doc/inn/history
-share/doc/inn/hook-perl
-share/doc/inn/hook-python
-share/doc/inn/hook-tcl
-share/doc/inn/sample-control
+etc/inn/actsync.cfg
+etc/inn/actsync.ign
+etc/inn/buffindexed.conf
+etc/inn/control.ctl
+etc/inn/cycbuff.conf
+etc/inn/distrib.pats
+etc/inn/expire.ctl
+etc/inn/incoming.conf
+etc/inn/inn.conf
+etc/inn/innfeed.conf
+etc/inn/innreport.conf
+etc/inn/innwatch.ctl
+etc/inn/moderators
+etc/inn/motd.news
+etc/inn/news2mail.cf
+etc/inn/newsfeeds
+etc/inn/nnrpd.track
+etc/inn/nntpsend.ctl
+etc/inn/ovdb.conf
+etc/inn/overview.fmt
+etc/inn/passwd.nntp
+etc/inn/radius.conf
+etc/inn/readers.conf
+etc/inn/sasl.conf
+etc/inn/storage.conf
 include/inn/conffile.h
 include/inn/config.h
 include/inn/dbz.h
@@ -166,6 +60,111 @@
 lib/libinn.a
 lib/libinnhist.a
 lib/libstorage.a
+${INN_PATHBIN}/actmerge
+${INN_PATHBIN}/actsync
+${INN_PATHBIN}/actsyncd
+${INN_PATHBIN}/archive
+${INN_PATHBIN}/auth/passwd/auth_smb
+${INN_PATHBIN}/auth/passwd/ckpasswd
+${INN_PATHBIN}/auth/passwd/radius
+${INN_PATHBIN}/auth/resolv/domain
+${INN_PATHBIN}/auth/resolv/ident
+${INN_PATHBIN}/batcher
+${INN_PATHBIN}/buffchan
+${INN_PATHBIN}/cnfsheadconf
+${INN_PATHBIN}/cnfsstat
+${INN_PATHBIN}/control/checkgroups.pl
+${INN_PATHBIN}/control/ihave.pl
+${INN_PATHBIN}/control/newgroup.pl
+${INN_PATHBIN}/control/rmgroup.pl
+${INN_PATHBIN}/control/sendme.pl
+${INN_PATHBIN}/control/sendsys.pl
+${INN_PATHBIN}/control/senduuname.pl
+${INN_PATHBIN}/control/version.pl
+${INN_PATHBIN}/controlbatch
+${INN_PATHBIN}/controlchan
+${INN_PATHBIN}/convdate
+${INN_PATHBIN}/ctlinnd
+${INN_PATHBIN}/cvtbatch
+${INN_PATHBIN}/docheckgroups
+${INN_PATHBIN}/expire
+${INN_PATHBIN}/expireover
+${INN_PATHBIN}/expirerm
+${INN_PATHBIN}/fastrm
+${INN_PATHBIN}/filechan
+${INN_PATHBIN}/filter/INN.py
+${INN_PATHBIN}/filter/filter.tcl
+${INN_PATHBIN}/filter/filter_innd.pl
+${INN_PATHBIN}/filter/filter_innd.py
+${INN_PATHBIN}/filter/filter_nnrpd.pl
+${INN_PATHBIN}/filter/nnrpd.py
+${INN_PATHBIN}/filter/nnrpd_access.pl
+${INN_PATHBIN}/filter/nnrpd_access.py
+${INN_PATHBIN}/filter/nnrpd_auth.pl
+${INN_PATHBIN}/filter/nnrpd_auth.py
+${INN_PATHBIN}/filter/nnrpd_dynamic.py
+${INN_PATHBIN}/filter/startup.tcl
+${INN_PATHBIN}/filter/startup_innd.pl
+${INN_PATHBIN}/getlist
+${INN_PATHBIN}/gpgverify
+${INN_PATHBIN}/grephistory
+${INN_PATHBIN}/imapfeed
+${INN_PATHBIN}/inews
+${INN_PATHBIN}/inncheck
+${INN_PATHBIN}/innconfval
+${INN_PATHBIN}/innd