/etc -> ${SYSCONFDIR}; Jolan Luff <jolan@pellaeon.com> and me

net/oidentd/Makefile

@@ -1,14 +1,14 @@
-# $OpenBSD: Makefile,v 1.4 2002/06/07 18:47:43 wilfried Exp $
+# $OpenBSD: Makefile,v 1.5 2002/08/04 17:32:28 naddy Exp $
 
 COMMENT=	"ident daemon with custom responses and NAT support"
 DISTNAME=	oidentd-2.0.3
-PKGNAME=	${DISTNAME}p1
+PKGNAME=	${DISTNAME}p2
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ojnk/}
 
-HOMEPAGE=	http://ojnk.sourceforge.net
+HOMEPAGE=	http://ojnk.sourceforge.net/
 
-MAINTAINER=	Jolan Luff <jolan@enteract.com>
+MAINTAINER=	Jolan Luff <jolan@pellaeon.com>
 
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
@@ -18,4 +18,10 @@ PERMIT_DISTFILES_FTP=	Yes
 
 CONFIGURE_STYLE= gnu
 
+post-install:
+	perl -pi -e 's:%%SYSCONFDIR%%:${SYSCONFDIR}:' \
+		${PREFIX}/man/man5/oidentd_masq.conf.5 \
+		${PREFIX}/man/man5/oidentd.conf.5 \
+		${PREFIX}/man/man8/oidentd.8
+
 .include <bsd.port.mk>

net/oidentd/patches/patch-doc_oidentd_8

@@ -0,0 +1,35 @@
+$OpenBSD: patch-doc_oidentd_8,v 1.1 2002/08/04 17:32:28 naddy Exp $
+--- doc/oidentd.8.orig	Sat Dec 29 10:23:02 2001
++++ doc/oidentd.8	Fri Aug  2 15:10:24 2002
+@@ -64,7 +64,7 @@ Use the specified alternate charset.
+ .TP
+ .B "\-C or \-\-config=<config file>"
+ Use the specified file as the configuration file.  The default
+-location of the configuration file is \fB/etc/oidentd.conf\fP.
++location of the configuration file is \fB%%SYSCONFDIR%%/oidentd.conf\fP.
+ 
+ .TP
+ .B "\-d or \-\-debug"
+@@ -82,7 +82,7 @@ unnecessary information to remote client
+ When IP masquerading support is enabled, forward requests for machines that
+ masquerade through us to those machines on the specified port. If a port is not given, oidentd
+ will use the default port for the ident service ("auth" or port 113). If the forwarded
+-request fails, \fBoidentd\fP will fall back to reading the \fB/etc/oident_masq.conf\fP file.
++request fails, \fBoidentd\fP will fall back to reading the \fB%%SYSCONFDIR%%/oident_masq.conf\fP file.
+ In order for forwarding to work, the machine to which the connection is forwarded must also
+ be running oidentd, and oidentd must be run with the -P switch specifying the host that is
+ forwarding the connections.  If the ident daemon on the host to which the connection is forwarded
+@@ -162,11 +162,11 @@ Display options and exit.
+ 
+ .SH FILES
+ .TP
+-.B /etc/oidentd.conf
++.B %%SYSCONFDIR%%/oidentd.conf
+ System-wide configuration file.
+ 
+ .TP
+-.B /etc/oidentd_masq.conf
++.B %%SYSCONFDIR%%/oidentd_masq.conf
+ IP masquerading mappings.
+ 
+ .TP

net/oidentd/patches/patch-doc_oidentd_conf_5

@@ -0,0 +1,39 @@
+$OpenBSD: patch-doc_oidentd_conf_5,v 1.1 2002/08/04 17:32:28 naddy Exp $
+--- doc/oidentd.conf.5.orig	Sat Dec 29 10:23:02 2001
++++ doc/oidentd.conf.5	Fri Aug  2 15:11:01 2002
+@@ -21,7 +21,7 @@ successful lookups of connections owned 
+ .PP
+ The \fB$HOME/.oidentd.conf\fP file is used to specify, by the user,
+ what ident response will be returned for specific connections.
+-.SH /etc/oidentd.conf SYNTAX
++.SH %%SYSCONFDIR%%/oidentd.conf SYNTAX
+ .TP
+ .B USER DIRECTIVE
+ The \fBoidentd\fP configuration file consists of 0 or more \fIuser\fP
+@@ -143,7 +143,7 @@ and infinitely many times, however it do
+ manner.
+ 
+ The range directive has the same syntax and semantics as the range directive
+-in the \fB/etc/oidentd.conf\fP file.  See above for a description.
++in the \fB%%SYSCONFDIR%%/oidentd.conf\fP file.  See above for a description.
+ 
+ Valid capabilities are \fIreply\fP, \fIrandom\fP, \fInumeric\fP,
+ \fIrandom_numeric\fP and \fIhide\fP.  Descriptions can be found below.
+@@ -175,7 +175,7 @@ randomly.
+ In a user's \fB$HOME/.oidentd.conf\fP file, up to 20 strings may be specified
+ for a \fBreply\fP statement.
+ 
+-In the \fB/etc/oidentd.conf\fP file, there is no limitation on the number
++In the \fB%%SYSCONFDIR%%/oidentd.conf\fP file, there is no limitation on the number
+ of strings that may be specified.
+ 
+ The strings may be an ordinary string or a quoted string (e.g. string vs.
+@@ -236,7 +236,7 @@ Reply to successful ident lookups with t
+ .B random_numeric
+ Reply to successful with a randomly generated ident response of the form userN,
+ where N is a random number between 0 and 100000.
+-.SH EXAMPLE /etc/oidentd.conf FILE
++.SH EXAMPLE %%SYSCONFDIR%%/oidentd.conf FILE
+ .nf
+ default {
+ 	default {

net/oidentd/patches/patch-doc_oidentd_masq_conf_5

@@ -0,0 +1,12 @@
+$OpenBSD: patch-doc_oidentd_masq_conf_5,v 1.1 2002/08/04 17:32:28 naddy Exp $
+--- doc/oidentd_masq.conf.5.orig	Sat Dec 29 10:23:02 2001
++++ doc/oidentd_masq.conf.5	Fri Aug  2 15:11:18 2002
+@@ -19,7 +19,7 @@ If you are using IP masquerading or NAT,
+ username for connections from other machines.  Support for
+ this is specified by calling
+ \fBoidentd\fP with the \-m (or \-\-masq) flag and by creating an
+-\fB/etc/oidentd_masq.conf\fP file.
++\fB%%SYSCONFDIR%%/oidentd_masq.conf\fP file.
+ .PP
+ \fBoidentd\fP can also forward requests for an IP masqueraded connection to the
+ machine from which connection originates by way of the -f option.  This

net/oidentd/patches/patch-src_Makefile_in

@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_Makefile_in,v 1.1 2002/08/04 17:32:28 naddy Exp $
+--- src/Makefile.in.orig	Sun Aug  4 19:17:49 2002
++++ src/Makefile.in	Sun Aug  4 19:18:37 2002
+@@ -129,7 +129,7 @@ oidentd_LDFLAGS =
+ 
+ DEFS = @DEFS@
+ DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+-CPPFLAGS = @CPPFLAGS@
++CPPFLAGS = @CPPFLAGS@ -DSYSCONFDIR=\"$(sysconfdir)\"
+ LDFLAGS = @LDFLAGS@
+ LIBS = @LIBS@
+ depcomp = $(SHELL) $(top_srcdir)/depcomp

net/oidentd/patches/patch-src_kernel_openbsd30_c

@@ -1,6 +1,6 @@
-$OpenBSD: patch-oidentd_openbsd30_c,v 1.1 2002/05/14 01:01:48 naddy Exp $
---- src/kernel/openbsd30.c.orig	Sat Dec 29 17:30:25 2001
-+++ src/kernel/openbsd30.c	Tue May 14 02:46:30 2002
+$OpenBSD: patch-src_kernel_openbsd30_c,v 1.1 2002/08/04 17:32:28 naddy Exp $
+--- src/kernel/openbsd30.c.orig	Sat Dec 29 10:30:25 2001
++++ src/kernel/openbsd30.c	Fri Aug  2 16:10:36 2002
 @@ -42,6 +42,7 @@
  #include <netinet/ip_var.h>
  #include <netinet/tcp_timer.h>

net/oidentd/patches/patch-src_oidentd_h

@@ -0,0 +1,21 @@
+$OpenBSD: patch-src_oidentd_h,v 1.1 2002/08/04 17:32:28 naddy Exp $
+--- src/oidentd.h.orig	Sun Aug  4 19:06:54 2002
++++ src/oidentd.h	Sun Aug  4 19:07:32 2002
+@@ -26,7 +26,7 @@
+ ** us.
+ */
+ 
+-#define MASQ_MAP		"/etc/oidentd_masq.conf"
++#define MASQ_MAP		SYSCONFDIR "/oidentd_masq.conf"
+ 
+ /*
+ ** String prepended to a random number when the -r flag is specified
+@@ -38,7 +38,7 @@
+ ** System-wide configuration file.
+ */
+ 
+-#define CONFFILE		"/etc/oidentd.conf"
++#define CONFFILE		SYSCONFDIR "/oidentd.conf"
+ 
+ /*
+ ** Per-user configuration file.  This file is relative to the user's

net/oidentd/pkg/DEINSTALL

@@ -3,14 +3,17 @@
 set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
+CONFFILE=${SYSCONFDIR}/oidentd.conf
+MASQFILE=${SYSCONFDIR}/oidentd_masq.conf
 
-if [ -f /etc/oidentd.conf -o -f /etc/oidentd_masq.conf ]; then
+if [ -f ${CONFFILE} -o -f ${MASQFILE} ];
+then
     echo
     echo "+---------------"
     echo "| To completely deinstall the $1 package you need to perform"
     echo "| this step as root:"
     echo "|"
-    echo "|           rm -rf /etc/oidentd*"
+    echo "|         rm -f ${CONFFILE} ${MASQFILE}
     echo "|"
     echo "| Do not do this if you plan on re-installing $1"
     echo "| at some future time."

net/oidentd/pkg/MESSAGE

@@ -1,6 +1,14 @@
 
-NOTES FOR OPENBSD OIDENTD INSTALLATION
---------------------------------------
-See oidentd(8), oidentd.conf(5), and oidentd_masq.conf(5) for information on
-setting up oidentd.
+Installing Ojnk's Identd on OpenBSD
+-----------------------------------
+
+See oidentd(8), oidentd.conf(5), and oidentd_masq.conf(5) for
+information on configuring oidentd.
+
+Additionally, you may wish to start oidentd at system start-up
+via the /etc/rc.local script:
+
+if [ -x ${PREFIX}/sbin/oidentd ]; then
+        echo -n ' oidentd';	${PREFIX}/sbin/oidentd -m
+fi