- replace famd.conf with fam.conf in man pages since it's what we use

- don't hardcode paths

discussed with and ok alek@

sysutils/fam/Makefile

@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.4 2007/05/09 06:12:27 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.5 2007/05/10 19:56:19 ajacoutot Exp $
 
 COMMENT=	"File Alteration Monitor"
 
 DISTNAME=	fam-2.7.0
-PKGNAME=	${DISTNAME}p1
+PKGNAME=	${DISTNAME}p2
 SHARED_LIBS +=	fam	0.0	# .0.0
 CATEGORIES=	sysutils
 
@@ -32,7 +32,10 @@ post-patch:
 	rm -f ${WRKSRC}/configure
 
 pre-configure:
+	@perl -pi -e 's,!!SYSCONFDIR!!,${SYSCONFDIR},g' \
+		${WRKSRC}/man/famd.conf.5 ${WRKSRC}/man/famd.8
 	cp ${FILESDIR}/*.* ${WRKSRC}/src
+	mv ${WRKSRC}/man/famd.conf.5 ${WRKSRC}/man/fam.conf.5
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/fam/

sysutils/fam/patches/patch-conf-fam_conf

@@ -1,6 +1,16 @@
-$OpenBSD: patch-conf-fam_conf,v 1.2 2007/05/09 06:12:27 ajacoutot Exp $
+$OpenBSD: patch-conf-fam_conf,v 1.3 2007/05/10 19:56:19 ajacoutot Exp $
 --- conf/fam.conf.orig	Sun Jan 19 13:20:52 2003
-+++ conf/fam.conf	Tue May  8 11:55:44 2007
++++ conf/fam.conf	Thu May 10 15:00:56 2007
+@@ -1,7 +1,7 @@
+-#  famd.conf
++#  fam.conf
+ #
+ #  For more information on the configuration options below, see the
+-#  famd.conf(5) man page.
++#  fam.conf(5) man page.
+ 
+ #
+ #  insecure_compatibility disables authentication.  This causes
 @@ -25,7 +25,7 @@ untrusted_user = nobody
  #
  #  The -L command-line argument overrides this option.

sysutils/fam/patches/patch-man_Makefile_in

@@ -0,0 +1,12 @@
+$OpenBSD: patch-man_Makefile_in,v 1.1 2007/05/10 19:56:19 ajacoutot Exp $
+--- man/Makefile.in.orig	Thu May 10 14:57:42 2007
++++ man/Makefile.in	Thu May 10 14:57:59 2007
+@@ -90,7 +90,7 @@ am__quote = @am__quote@
+ install_sh = @install_sh@
+ INCLUDES = @FAM_INC@ -DFAM_CONF=\"@FAM_CONF@\"
+ 
+-man_MANS = fam.3 famd.conf.5 famd.8
++man_MANS = fam.3 fam.conf.5 famd.8
+ 
+ EXTRA_DIST = $(man_MANS)
+ subdir = man

sysutils/fam/patches/patch-man_famd_8

@@ -0,0 +1,23 @@
+$OpenBSD: patch-man_famd_8,v 1.1 2007/05/10 19:56:19 ajacoutot Exp $
+--- man/famd.8.orig	Thu May 10 14:53:46 2007
++++ man/famd.8	Thu May 10 14:56:18 2007
+@@ -21,7 +21,7 @@ independently.  Only one instance of \fBfamd\fR can be
+ run at a time.
+ .P
+ \fBfamd\fR can be configured by editing the famd configuration
+-file (see \fIfamd.conf(5)\fR for further details) or by
++file (see \fIfam.conf(5)\fR for further details) or by
+ providing the following command line options:
+ .SH OPTIONS
+ .TP
+@@ -63,8 +63,8 @@ A value of 0 causes \fBfamd\fR to run forever.
+ files that the client can \fBstat\fR.
+ .SH FILES
+ .TP
+-\fI/usr/local/etc/famd.conf\fR
++\fI!!SYSCONFDIR!!/fam.conf\fR
+ Default \fBfamd\fR configuration file.
+ .SH "SEE ALSO"
+-fam(3), famd.conf(5), inetd(8), portmap(8), stat(1), xinetd(8)
++fam(3), fam.conf(5), inetd(8), portmap(8), stat(1), xinetd(8)
+ .SH BUGS

sysutils/fam/patches/patch-man_famd_conf_5

@@ -0,0 +1,17 @@
+$OpenBSD: patch-man_famd_conf_5,v 1.1 2007/05/10 19:56:19 ajacoutot Exp $
+--- man/famd.conf.5.orig	Thu May 10 14:54:06 2007
++++ man/famd.conf.5	Thu May 10 14:59:23 2007
+@@ -1,10 +1,10 @@
+-.TH FAMD.CONF "5" "January 19, 2003" "famd.conf (fam 2.6.10)" "SGI"
++.TH FAM.CONF "5" "January 19, 2003" "fam.conf (fam 2.6.10)" "SGI"
+ .SH NAME
+-famd.conf \- The File Alteration Monitor (FAM) configuration file
++fam.conf \- The File Alteration Monitor (FAM) configuration file
+ .SH SYNOPSIS
+ In addition to its command line options, \fBfamd\fR's behavior
+ can also be controlled through its configuration file.  By
+-default, this is \fI/usr/local/etc/fam.conf\fR.  The \fB\-c\fR
++default, this is \fI!!SYSCONFDIR!!/fam.conf\fR.  The \fB\-c\fR
+ command line option can be used to specify an alternate file.
+ .SH "FILE FORMAT"
+ Configuration lines are in the format \fBoption=value\fR.

sysutils/fam/pkg/PLIST

@@ -1,10 +1,10 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2007/04/27 22:00:55 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.2 2007/05/10 19:56:19 ajacoutot Exp $
 %%SHARED%%
 include/fam.h
 lib/libfam.a
 lib/libfam.la
 @man man/man3/fam.3
-@man man/man5/famd.conf.5
+@man man/man5/fam.conf.5
 @man man/man8/famd.8
 sbin/famd
 share/examples/fam/