cleaned up PLIST, fiddled with directory creation some more

2 files changed, 114 insertions, 86 deletions

diff --git a/news/inn/Makefile b/news/inn/Makefile
index 20de1fdb32e..654d13932e6 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -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_SHELL.${INN_USER}=	${SH}
 
 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 @@ pre-install:
 	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 --git a/news/inn/PLIST b/news/inn/PLIST
index 3a5b0c0540f..95ddd18fa5b 100644
--- a/news/inn/PLIST
+++ b/news/inn/PLIST
@@ -1,8 +1,65 @@
-@comment $NetBSD: PLIST,v 1.14 2008/09/03 21:33:29 spz Exp $
+@comment $NetBSD: PLIST,v 1.15 2008/09/16 23:06:19 spz Exp $
+bin/inews
+bin/rnews
+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
+include/inn/inn/buffer.h
+include/inn/inn/confparse.h
+include/inn/inn/defines.h
+include/inn/inn/hashtab.h
+include/inn/inn/history.h
+include/inn/inn/innconf.h
+include/inn/inn/list.h
+include/inn/inn/md5.h
+include/inn/inn/messages.h
+include/inn/inn/mmap.h
+include/inn/inn/qio.h
+include/inn/inn/sequence.h
+include/inn/inn/system.h
+include/inn/inn/timer.h
+include/inn/inn/tst.h
+include/inn/inn/vector.h
+include/inn/inn/version.h
+include/inn/inn/wire.h
+include/inn/inndcomm.h
 include/inn/libinn.h
+include/inn/nntp.h
+include/inn/ov.h
+include/inn/paths.h
 include/inn/storage.h
+lib/innreport_inn.pm
+lib/innshellvars
+lib/innshellvars.pl
+lib/innshellvars.tcl
+lib/libinn.a
+lib/libinnhist.a
+lib/libstorage.a
 ${INN_PATHBIN}/actmerge
 ${INN_PATHBIN}/actsync
 ${INN_PATHBIN}/actsyncd
@@ -16,7 +73,6 @@ ${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
@@ -29,7 +85,6 @@ ${INN_PATHBIN}/controlbatch
 ${INN_PATHBIN}/controlchan
 ${INN_PATHBIN}/convdate
 ${INN_PATHBIN}/ctlinnd
-sbin/ctlinnd
 ${INN_PATHBIN}/cvtbatch
 ${INN_PATHBIN}/docheckgroups
 ${INN_PATHBIN}/expire
@@ -42,10 +97,10 @@ ${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.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
@@ -55,13 +110,11 @@ ${INN_PATHBIN}/gpgverify
 ${INN_PATHBIN}/grephistory
 ${INN_PATHBIN}/imapfeed
 ${INN_PATHBIN}/inews
-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
@@ -73,7 +126,6 @@ ${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
@@ -93,7 +145,6 @@ ${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
@@ -114,58 +165,6 @@ ${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
-include/inn/conffile.h
-include/inn/config.h
-include/inn/dbz.h
-include/inn/inn/buffer.h
-include/inn/inn/confparse.h
-include/inn/inn/defines.h
-include/inn/inn/hashtab.h
-include/inn/inn/history.h
-include/inn/inn/innconf.h
-include/inn/inn/list.h
-include/inn/inn/md5.h
-include/inn/inn/messages.h
-include/inn/inn/mmap.h
-include/inn/inn/qio.h
-include/inn/inn/sequence.h
-include/inn/inn/system.h
-include/inn/inn/timer.h
-include/inn/inn/tst.h
-include/inn/inn/vector.h
-include/inn/inn/version.h
-include/inn/inn/wire.h
-include/inn/inndcomm.h
-include/inn/libinn.h
-include/inn/nntp.h
-include/inn/ov.h
-include/inn/paths.h
-include/inn/storage.h
-lib/innreport_inn.pm
-lib/innshellvars
-lib/innshellvars.pl
-lib/innshellvars.tcl
-lib/libinn.a
-lib/libinnhist.a
-lib/libstorage.a
 man/man1/convdate.1
 man/man1/fastrm.1
 man/man1/getlist.1
@@ -274,6 +273,28 @@ man/man8/sendinpaths.8
 man/man8/tally.control.8
 man/man8/tdx-util.8
 man/man8/writelog.8
+sbin/cnfsstat
+sbin/ctlinnd
+sbin/inndstart
+sbin/makehistory
+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
 share/examples/inn/INN.py
 share/examples/inn/active.minimal
 share/examples/inn/actsync.cfg
@@ -298,16 +319,16 @@ share/examples/inn/news2mail.cf
 share/examples/inn/newsfeeds
 share/examples/inn/newsgroups.minimal
 share/examples/inn/nnrpd.py
-share/examples/inn/nnrpd_access.py
-share/examples/inn/nnrpd_dynamic.py
 share/examples/inn/nnrpd.track
 share/examples/inn/nnrpd_access.pl
+share/examples/inn/nnrpd_access.py
 share/examples/inn/nnrpd_access_wrapper.pl
 share/examples/inn/nnrpd_access_wrapper.py
 share/examples/inn/nnrpd_auth.pl
 share/examples/inn/nnrpd_auth.py
 share/examples/inn/nnrpd_auth_wrapper.pl
 share/examples/inn/nnrpd_auth_wrapper.py
+share/examples/inn/nnrpd_dynamic.py
 share/examples/inn/nnrpd_dynamic_wrapper.py
 share/examples/inn/nntpsend.ctl
 share/examples/inn/ovdb.conf
@@ -322,13 +343,14 @@ share/examples/inn/storage.conf
 share/examples/inn/subscriptions
 share/examples/rc.d/innd
 @dirrm share/examples/inn
+@dirrm share/doc/inn
+@dirrm ${INN_PATHBIN}/rnews.libexec
+@dirrm ${INN_PATHBIN}/filter
+@dirrm ${INN_PATHBIN}/control
+@dirrm ${INN_PATHBIN}/auth/resolv
+@dirrm ${INN_PATHBIN}/auth/passwd
+@dirrm ${INN_PATHBIN}/auth
+@dirrm ${INN_PATHBIN}
 @dirrm include/inn/inn
 @dirrm include/inn
-@dirrm share/doc/inn
-@dirrm libexec/inn/rnews.libexec
-@dirrm libexec/inn/filter
-@dirrm libexec/inn/control
-@dirrm libexec/inn/auth/resolv
-@dirrm libexec/inn/auth/passwd
-@dirrm libexec/inn/auth
-@dirrm libexec/inn
+@dirrm etc/inn