ninpaths updated

[Russ Allbery]

Olaf Titz <olaf at bigred.inka.de> writes:

> I've put up a new version of ninpaths, with a few code cleanups and the
> portability fixes recently suggested. I think this is suitable for
> inclusion into the contrib section of INN.

> The URL is changed; moved to the "stable" section of the webserver and
> converted to tar.gz.
> <URL:http://sites.inka.de/~bigred/sw/ninpaths-3.1.1.tar.gz>

I'd like to make a few changes to make it easier for people to build this
out of INN with hopefully not interfering with our ability to apply
patches from newer versions.  Does the following sound okay to you?  If
so, I'll go ahead and commit the above distribution with the following
modifications to CVS.

Unfortunately, they're not really suitable for a stand-alone package,
which means that what's in INN will be slightly different than your
package.  But I think the differences are minimal enough that this won't
cause problems in pulling in newer versions.

 * Rename ninpaths.README to README (I'm trying to semi-standardize on
   README files in directories that need some explanation, although INN
   needs a good bit of work in this area).

 * Remove Checksums since it doesn't work anyway after the following
   modifications.

 * Rename sendinpaths to sendinpaths.in and apply the following patch:

--- inn/contrib/ninpaths/sendinpaths.in.orig	Tue Jan  9 14:35:16 2001
+++ inn/contrib/ninpaths/sendinpaths.in	Sun Jan 14 04:03:07 2001
@@ -1,11 +1,11 @@
 #!/bin/sh
+# fixscript will replace this line with code to load innshellvars
 #
 # Submit path statistics based on ninpaths
 # $Id: sendinpaths,v 1.4 2001/01/09 22:35:16 olaf Exp $
 
 # Assuming the ninpaths dump files are in ${MOST_LOGS}/path/inpaths.%d
 
-. /var/lib/news/innshellvars
 cd ${MOST_LOGS}/path
 ME=`innconfval pathhost`
 report=30

 * Apply the following patch to the Makefile (which changes it quite a
   bit):

--- inn/contrib/ninpaths/Makefile.orig	Wed Jan 10 15:25:46 2001
+++ inn/contrib/ninpaths/Makefile	Sun Jan 14 04:04:14 2001
@@ -1,29 +1,20 @@
-VERSION=3.1.1
+include ../../Makefile.global
+
+CFLAGS=$(GCFLAGS)
 
-CC=gcc
+VERSION=3.1.1
 DEFS=-DVERSION=\"$(VERSION)\"
-CFLAGS=-pipe -Wall -W -Wstrict-prototypes -pedantic -g -O3 $(DEFS)
 
-all: ninpaths
+all: ninpaths sendinpaths
 
 ninpaths: ninpaths.o
 	$(CC) $(CFLAGS) -o $@ $<
 
 ninpaths.o: ninpaths.c
-	$(CC) $(CFLAGS) -o $@ -c $<
+	$(CC) $(LDLAGS) -o $@ -c $<
+
+sendinpaths: sendinpaths.in
+	$(UPFIXSCRIPT) sendinpaths
 
 clean:
 	rm -f ninpaths *.o *.out core
-
-FILES = ninpaths.README ninpaths.c sendinpaths Makefile
-AFILES = $(FILES) Checksums
-
-Checksums: $(FILES)
-	makechecksums $(FILES) > Checksums
-
-shar: $(AFILES)
-	shar $(AFILES) | cat Blurb - > ninpaths.shar
-
-tgz: $(AFILES)
-	(cd ..; ln -sf ninpaths ninpaths-$(VERSION); \
-	 tar czf ninpaths-$(VERSION).tar.gz $(AFILES:%=ninpaths-$(VERSION)/%))

-- 
Russ Allbery (rra at stanford.edu)             <http://www.eyrie.org/~eagle/>