Install INN binaries to "${LOCALBASE}/libexec/inn". Only "inews" is

linked to "${LOCALBASE}/bin". Fixes PR pkg/8110 by Wolfgang Rupprecht.

5 files changed, 121 insertions, 112 deletions

diff --git a/news/inn/Makefile b/news/inn/Makefile
index 88d35165a88..b31b7a4c625 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1999/07/26 20:56:23 tron Exp $
+# $NetBSD: Makefile,v 1.8 1999/07/29 20:27:19 tron Exp $
 
 DISTNAME=		inn-2.2
 CATEGORIES=		news
@@ -41,9 +41,10 @@ post-build:
 .endfor
 
 pre-install:
-	${MKDIR} ${INN_DATA_DIR} ${PREFIX}/etc/nntp
+	${MKDIR} ${INN_DATA_DIR} ${PREFIX}/etc/nntp ${PREFIX}/libexec/inn
 
 post-install:
+	${LN} -s ../libexec/inn/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 4ee4fed891e..9647b1dbb9d 100644
--- a/news/inn/files/innd.sh
+++ b/news/inn/files/innd.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 #
-# $NetBSD: innd.sh,v 1.5 1999/07/26 20:56:24 tron Exp $
+# $NetBSD: innd.sh,v 1.6 1999/07/29 20:27:20 tron Exp $
 #
-if [ -x @@PREFIX@@/bin/rc.news -a -s @@INN_DATA_DIR@@/db/active ];
+if [ -x @@PREFIX@@/libexec/inn/rc.news -a -s @@INN_DATA_DIR@@/db/active ];
 then
- su news -c @@PREFIX@@/bin/rc.news >/dev/null
+ su news -c @@PREFIX@@/libexec/inn/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 f4dce11f945..b59afa78e7a 100644
--- a/news/inn/files/patch-sum
+++ b/news/inn/files/patch-sum
@@ -1,10 +1,11 @@
-$NetBSD: patch-sum,v 1.4 1999/07/21 22:29:37 tron Exp $
+$NetBSD: patch-sum,v 1.5 1999/07/29 20:27:20 tron Exp $
 
 MD5 (patch-aa) = 2390c877da186d1501bfb499a9f27096
 MD5 (patch-ab) = 69a4b8bfa51950f4d1fac766e906cc97
-MD5 (patch-ac) = f5aebc01ed0ec6a29bb40b343f308050
+MD5 (patch-ac) = aa5f0ffcabeee1b314c4f62badf8fd8e
 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 a5ed22c0b94..4b0f5eb3d37 100644
--- a/news/inn/patches/patch-ac
+++ b/news/inn/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 1999/07/18 23:34:13 tron Exp $
+$NetBSD: patch-ac,v 1.3 1999/07/29 20:27:20 tron Exp $
 
---- Makefile.global.in.orig	Fri Aug 28 12:34:15 1998
-+++ Makefile.global.in	Fri Aug 28 12:29:51 1998
-@@ -34,7 +34,7 @@
+--- Makefile.global.in.orig	Tue Oct 13 14:23:08 1998
++++ Makefile.global.in	Thu Jul 29 21:18:18 1999
+@@ -40,11 +40,11 @@
  EXTRA_SRC = @EXTRA_SRC@
  
  OWNER		= -O @NEWSUSER@ -G @NEWSGRP@
@@ -11,7 +11,12 @@ $NetBSD: patch-ac,v 1.2 1999/07/18 23:34:13 tron Exp $
  NEWSGROUP	= @NEWSGRP@
  
  PATHNEWS = @prefix@
-@@ -55,10 +55,10 @@
+-PATHBIN = @prefix@/bin
++PATHBIN = @prefix@/libexec/inn
+ PATHETC = @ETCDIR@
+ PATHLIB = @LIBDIR@
+ PATHCONTROL = $(PATHBIN)/control
+@@ -61,10 +61,10 @@
  
  # Pick on of SOURCE, NROFF-PACK or NROFF-PACK-SCO
  MANPAGESTYLE	= SOURCE
diff --git a/news/inn/pkg/PLIST b/news/inn/pkg/PLIST
index 9e168020d05..4851417fecf 100644
--- a/news/inn/pkg/PLIST
+++ b/news/inn/pkg/PLIST
@@ -1,100 +1,5 @@
-@comment $NetBSD: PLIST,v 1.4 1999/07/26 20:56:24 tron Exp $
-bin/actived
-bin/actmerge
-bin/actsync
-bin/actsyncd
-bin/archive
-@exec mkdir -p %D/bin/auth
-bin/batcher
-bin/buffchan
-bin/cnfsstat
-bin/control/checkgroups
-bin/control/checkgroups.pl
-bin/control/default
-bin/control/ihave
-bin/control/ihave.pl
-bin/control/newgroup
-bin/control/newgroup.pl
-bin/control/rmgroup
-bin/control/rmgroup.pl
-bin/control/sendme
-bin/control/sendme.pl
-bin/control/sendsys
-bin/control/sendsys.pl
-bin/control/senduuname
-bin/control/senduuname.pl
-bin/control/version
-bin/control/version.pl
-bin/controlbatch
-bin/controlchan
-bin/convdate
-bin/crosspost
-bin/ctlinnd
-bin/cvtbatch
-bin/expire
-bin/expireindex
-bin/expireover
-bin/expirerm
-bin/fastrm
-bin/filechan
-bin/filter/filter.tcl
-bin/filter/filter_innd.pl
-bin/filter/filter_nnrpd.pl
-bin/filter/nnrpd_auth.pl
-bin/filter/startup.tcl
-bin/filter/startup_innd.pl
-bin/getlist
-bin/grephistory
+@comment $NetBSD: PLIST,v 1.5 1999/07/29 20:27:20 tron Exp $
 bin/inews
-bin/inncheck
-bin/innconfval
-bin/innd
-bin/inndf
-bin/inndstart
-bin/innfeed
-bin/innfeed-convcfg
-bin/innmail
-bin/innreport
-bin/innstat
-bin/innwatch
-bin/innxbatch
-bin/innxmit
-bin/mailpost
-bin/makeactive
-bin/makehistory
-bin/mod-active
-bin/news.daily
-bin/news2mail
-bin/newsrequeue
-bin/nnrpd
-bin/nntpget
-bin/nntpsend
-bin/overchan
-bin/parsecontrol
-bin/pgpverify
-bin/procbatch
-bin/prunehistory
-bin/pullnews
-bin/rc.news
-bin/rnews
-bin/rnews.libexec/c7unbatch
-bin/rnews.libexec/decode
-bin/rnews.libexec/encode
-bin/rnews.libexec/gunbatch
-bin/scanlogs
-bin/scanspool
-bin/send-ihave
-bin/send-nntp
-bin/send-uucp
-bin/sendbatch
-bin/sendxbatches
-bin/shlock
-bin/shrinkfile
-bin/simpleftp
-bin/sm
-bin/startinnfeed
-bin/tally.control
-bin/writelog
 etc/rc.d/innd.sh
 @exec mkdir -p %D/etc/nntp
 @unexec rm -rf %D/etc/nntp
@@ -107,6 +12,102 @@ 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
 man/man1/convdate.1
 man/man1/getlist.1
 man/man1/grephistory.1
@@ -276,7 +277,8 @@ share/examples/inn/version
 share/examples/inn/version.pl
 share/examples/inn/writelog
 @dirrm share/examples/inn
-@dirrm bin/rnews.libexec
-@dirrm bin/filter
-@dirrm bin/control
-@dirrm bin/auth
+@dirrm libexec/inn/rnews.libexec
+@dirrm libexec/inn/filter
+@dirrm libexec/inn/control
+@dirrm libexec/inn/auth
+@dirrm libexec/inn