Because INN fails at many places when its binaries are not installed in

"${PREFIX}/bin" it gets installed to "${PREFIX}/inn" now. Only the
manual pages and the configuration file examples remain at the old
location.

5 files changed, 131 insertions, 129 deletions

diff --git a/news/inn/Makefile b/news/inn/Makefile
index b31b7a4c625..33c06936c8e 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1999/07/29 20:27:19 tron Exp $
+# $NetBSD: Makefile,v 1.9 1999/07/29 21:15:46 tron Exp $
 
 DISTNAME=		inn-2.2
 CATEGORIES=		news
@@ -17,8 +17,10 @@ INN_DATA_DIR?=		/var/news
 
 USE_PERL5=		yes
 USE_LIBTOOL=		yes
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-perl --with-tmp-path=/tmp \
+HAS_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--host=${MACHINE_GNU_PLATFORM} --prefix=${PREFIX}/inn \
+			--mandir=${PREFIX}/man \
+			--with-perl --with-tmp-path=/tmp \
 			--with-sendmail=/usr/sbin/sendmail \
 			--with-db-dir=${INN_DATA_DIR}/db \
 			--with-etc-dir=${INN_DATA_DIR}/etc \
@@ -41,10 +43,10 @@ post-build:
 .endfor
 
 pre-install:
-	${MKDIR} ${INN_DATA_DIR} ${PREFIX}/etc/nntp ${PREFIX}/libexec/inn
+	${MKDIR} ${INN_DATA_DIR} ${PREFIX}/etc/nntp ${PREFIX}/inn
 
 post-install:
-	${LN} -s ../libexec/inn/inews ${PREFIX}/bin/inews
+	${LN} -s ../inn/bin/inews ${PREFIX}/bin/inews
 	${MKDIR} ${PREFIX}/share/examples/inn
 	for FILE in `ls -1 ${WRKSRC}/samples/* | \
 		     ${EGREP} -v '\.(in|orig)$'`; do \
diff --git a/news/inn/files/innd.sh b/news/inn/files/innd.sh
index 9647b1dbb9d..aa6182a77cb 100644
--- a/news/inn/files/innd.sh
+++ b/news/inn/files/innd.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 #
-# $NetBSD: innd.sh,v 1.6 1999/07/29 20:27:20 tron Exp $
+# $NetBSD: innd.sh,v 1.7 1999/07/29 21:15:46 tron Exp $
 #
-if [ -x @@PREFIX@@/libexec/inn/rc.news -a -s @@INN_DATA_DIR@@/db/active ];
+if [ -x @@PREFIX@@/inn/bin/rc.news -a -s @@INN_DATA_DIR@@/db/active ];
 then
- su news -c @@PREFIX@@/libexec/inn/rc.news >/dev/null
+ su news -c @@PREFIX@@/inn/bin/rc.news >/dev/null
 
  if [ ! -f @@PREFIX@@/etc/nntp/server ]
  then
diff --git a/news/inn/files/patch-sum b/news/inn/files/patch-sum
index b59afa78e7a..72f596c09c5 100644
--- a/news/inn/files/patch-sum
+++ b/news/inn/files/patch-sum
@@ -1,11 +1,10 @@
-$NetBSD: patch-sum,v 1.5 1999/07/29 20:27:20 tron Exp $
+$NetBSD: patch-sum,v 1.6 1999/07/29 21:15:47 tron Exp $
 
 MD5 (patch-aa) = 2390c877da186d1501bfb499a9f27096
 MD5 (patch-ab) = 69a4b8bfa51950f4d1fac766e906cc97
-MD5 (patch-ac) = aa5f0ffcabeee1b314c4f62badf8fd8e
+MD5 (patch-ac) = f7a77956558d860d101e2efe7b3bf3d4
 MD5 (patch-ad) = 3eec593f7b8efe5ec284887f713d4ddd
 MD5 (patch-ae) = 084256092f1179105004da3f000ee33f
 MD5 (patch-af) = d8eac199c981d82eed4b454bc20115f7
 MD5 (patch-ag) = d6962b6d0159854f7e8bd11b32b285f7
 MD5 (patch-ah) = 3a87d8d980c0beab113268d18388ecb5
-MD5 (patch-ai) = 0f38345da719d59cd7da3e1861375413
diff --git a/news/inn/patches/patch-ac b/news/inn/patches/patch-ac
index 4b0f5eb3d37..77198f48498 100644
--- a/news/inn/patches/patch-ac
+++ b/news/inn/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 1999/07/29 20:27:20 tron Exp $
+$NetBSD: patch-ac,v 1.4 1999/07/29 21:15:47 tron Exp $
 
 --- Makefile.global.in.orig	Tue Oct 13 14:23:08 1998
 +++ Makefile.global.in	Thu Jul 29 21:18:18 1999
@@ -11,8 +11,7 @@ $NetBSD: patch-ac,v 1.3 1999/07/29 20:27:20 tron Exp $
  NEWSGROUP	= @NEWSGRP@
  
  PATHNEWS = @prefix@
--PATHBIN = @prefix@/bin
-+PATHBIN = @prefix@/libexec/inn
+ PATHBIN = @prefix@/bin
  PATHETC = @ETCDIR@
  PATHLIB = @LIBDIR@
  PATHCONTROL = $(PATHBIN)/control
@@ -24,10 +23,10 @@ $NetBSD: patch-ac,v 1.3 1999/07/29 20:27:20 tron Exp $
 -MAN3    = @MANDIR@/man3
 -MAN5    = @MANDIR@/man5
 -MAN8    = @MANDIR@/man8
-+MAN1    = $(PREFIX)/man/man1
-+MAN3    = $(PREFIX)/man/man3
-+MAN5    = $(PREFIX)/man/man5
-+MAN8    = $(PREFIX)/man/man8
++MAN1    = $(LOCALBASE)/man/man1
++MAN3    = $(LOCALBASE)/man/man3
++MAN5    = $(LOCALBASE)/man/man5
++MAN8    = $(LOCALBASE)/man/man8
  
  LEX	= @LEX@ 
  YACC	= @YACC@
diff --git a/news/inn/pkg/PLIST b/news/inn/pkg/PLIST
index 4851417fecf..0da8e8b9b4f 100644
--- a/news/inn/pkg/PLIST
+++ b/news/inn/pkg/PLIST
@@ -1,113 +1,113 @@
-@comment $NetBSD: PLIST,v 1.5 1999/07/29 20:27:20 tron Exp $
+@comment $NetBSD: PLIST,v 1.6 1999/07/29 21:15:47 tron Exp $
 bin/inews
 etc/rc.d/innd.sh
 @exec mkdir -p %D/etc/nntp
 @unexec rm -rf %D/etc/nntp
-lib/docheckgroups
-lib/innreport_inn.pm
-lib/innshellvars
-lib/innshellvars.pl
-lib/innshellvars.tcl
-lib/libinn.a
-lib/libinn.so.2.0
-lib/libstorage.a
-lib/libstorage.so.2.0
-libexec/inn/actived
-libexec/inn/actmerge
-libexec/inn/actsync
-libexec/inn/actsyncd
-libexec/inn/archive
-@exec mkdir -p %D/libexec/inn/auth
-libexec/inn/batcher
-libexec/inn/buffchan
-libexec/inn/cnfsstat
-libexec/inn/control/checkgroups
-libexec/inn/control/checkgroups.pl
-libexec/inn/control/default
-libexec/inn/control/ihave
-libexec/inn/control/ihave.pl
-libexec/inn/control/newgroup
-libexec/inn/control/newgroup.pl
-libexec/inn/control/rmgroup
-libexec/inn/control/rmgroup.pl
-libexec/inn/control/sendme
-libexec/inn/control/sendme.pl
-libexec/inn/control/sendsys
-libexec/inn/control/sendsys.pl
-libexec/inn/control/senduuname
-libexec/inn/control/senduuname.pl
-libexec/inn/control/version
-libexec/inn/control/version.pl
-libexec/inn/controlbatch
-libexec/inn/controlchan
-libexec/inn/convdate
-libexec/inn/crosspost
-libexec/inn/ctlinnd
-libexec/inn/cvtbatch
-libexec/inn/expire
-libexec/inn/expireindex
-libexec/inn/expireover
-libexec/inn/expirerm
-libexec/inn/fastrm
-libexec/inn/filechan
-libexec/inn/filter/filter.tcl
-libexec/inn/filter/filter_innd.pl
-libexec/inn/filter/filter_nnrpd.pl
-libexec/inn/filter/nnrpd_auth.pl
-libexec/inn/filter/startup.tcl
-libexec/inn/filter/startup_innd.pl
-libexec/inn/getlist
-libexec/inn/grephistory
-libexec/inn/inews
-libexec/inn/inncheck
-libexec/inn/innconfval
-libexec/inn/innd
-libexec/inn/inndf
-libexec/inn/inndstart
-libexec/inn/innfeed
-libexec/inn/innfeed-convcfg
-libexec/inn/innmail
-libexec/inn/innreport
-libexec/inn/innstat
-libexec/inn/innwatch
-libexec/inn/innxbatch
-libexec/inn/innxmit
-libexec/inn/mailpost
-libexec/inn/makeactive
-libexec/inn/makehistory
-libexec/inn/mod-active
-libexec/inn/news.daily
-libexec/inn/news2mail
-libexec/inn/newsrequeue
-libexec/inn/nnrpd
-libexec/inn/nntpget
-libexec/inn/nntpsend
-libexec/inn/overchan
-libexec/inn/parsecontrol
-libexec/inn/pgpverify
-libexec/inn/procbatch
-libexec/inn/prunehistory
-libexec/inn/pullnews
-libexec/inn/rc.news
-libexec/inn/rnews
-libexec/inn/rnews.libexec/c7unbatch
-libexec/inn/rnews.libexec/decode
-libexec/inn/rnews.libexec/encode
-libexec/inn/rnews.libexec/gunbatch
-libexec/inn/scanlogs
-libexec/inn/scanspool
-libexec/inn/send-ihave
-libexec/inn/send-nntp
-libexec/inn/send-uucp
-libexec/inn/sendbatch
-libexec/inn/sendxbatches
-libexec/inn/shlock
-libexec/inn/shrinkfile
-libexec/inn/simpleftp
-libexec/inn/sm
-libexec/inn/startinnfeed
-libexec/inn/tally.control
-libexec/inn/writelog
+inn/bin/actived
+inn/bin/actmerge
+inn/bin/actsync
+inn/bin/actsyncd
+inn/bin/archive
+@exec mkdir -p %D/inn/bin/auth
+inn/bin/batcher
+inn/bin/buffchan
+inn/bin/cnfsstat
+inn/bin/control/checkgroups
+inn/bin/control/checkgroups.pl
+inn/bin/control/default
+inn/bin/control/ihave
+inn/bin/control/ihave.pl
+inn/bin/control/newgroup
+inn/bin/control/newgroup.pl
+inn/bin/control/rmgroup
+inn/bin/control/rmgroup.pl
+inn/bin/control/sendme
+inn/bin/control/sendme.pl
+inn/bin/control/sendsys
+inn/bin/control/sendsys.pl
+inn/bin/control/senduuname
+inn/bin/control/senduuname.pl
+inn/bin/control/version
+inn/bin/control/version.pl
+inn/bin/controlbatch
+inn/bin/controlchan
+inn/bin/convdate
+inn/bin/crosspost
+inn/bin/ctlinnd
+inn/bin/cvtbatch
+inn/bin/expire
+inn/bin/expireindex
+inn/bin/expireover
+inn/bin/expirerm
+inn/bin/fastrm
+inn/bin/filechan
+inn/bin/filter/filter.tcl
+inn/bin/filter/filter_innd.pl
+inn/bin/filter/filter_nnrpd.pl
+inn/bin/filter/nnrpd_auth.pl
+inn/bin/filter/startup.tcl
+inn/bin/filter/startup_innd.pl
+inn/bin/getlist
+inn/bin/grephistory
+inn/bin/inews
+inn/bin/inncheck
+inn/bin/innconfval
+inn/bin/innd
+inn/bin/inndf
+inn/bin/inndstart
+inn/bin/innfeed
+inn/bin/innfeed-convcfg
+inn/bin/innmail
+inn/bin/innreport
+inn/bin/innstat
+inn/bin/innwatch
+inn/bin/innxbatch
+inn/bin/innxmit
+inn/bin/mailpost
+inn/bin/makeactive
+inn/bin/makehistory
+inn/bin/mod-active
+inn/bin/news.daily
+inn/bin/news2mail
+inn/bin/newsrequeue
+inn/bin/nnrpd
+inn/bin/nntpget
+inn/bin/nntpsend
+inn/bin/overchan
+inn/bin/parsecontrol
+inn/bin/pgpverify
+inn/bin/procbatch
+inn/bin/prunehistory
+inn/bin/pullnews
+inn/bin/rc.news
+inn/bin/rnews
+inn/bin/rnews.libexec/c7unbatch
+inn/bin/rnews.libexec/decode
+inn/bin/rnews.libexec/encode
+inn/bin/rnews.libexec/gunbatch
+inn/bin/scanlogs
+inn/bin/scanspool
+inn/bin/send-ihave
+inn/bin/send-nntp
+inn/bin/send-uucp
+inn/bin/sendbatch
+inn/bin/sendxbatches
+inn/bin/shlock
+inn/bin/shrinkfile
+inn/bin/simpleftp
+inn/bin/sm
+inn/bin/startinnfeed
+inn/bin/tally.control
+inn/bin/writelog
+inn/lib/docheckgroups
+inn/lib/innreport_inn.pm
+inn/lib/innshellvars
+inn/lib/innshellvars.pl
+inn/lib/innshellvars.tcl
+inn/lib/libinn.a
+inn/lib/libinn.so.2.0
+inn/lib/libstorage.a
+inn/lib/libstorage.so.2.0
 man/man1/convdate.1
 man/man1/getlist.1
 man/man1/grephistory.1
@@ -277,8 +277,10 @@ share/examples/inn/version
 share/examples/inn/version.pl
 share/examples/inn/writelog
 @dirrm share/examples/inn
-@dirrm libexec/inn/rnews.libexec
-@dirrm libexec/inn/filter
-@dirrm libexec/inn/control
-@dirrm libexec/inn/auth
-@dirrm libexec/inn
+@dirrm inn/lib
+@dirrm inn/bin/rnews.libexec
+@dirrm inn/bin/filter
+@dirrm inn/bin/control
+@dirrm inn/bin/auth
+@dirrm inn/bin
+@dirrm inn