Substitute SPREAD_* variables in source and example configs.

Bump PKGREVISION.

4 files changed, 58 insertions, 3 deletions

diff --git a/net/spread/Makefile b/net/spread/Makefile
index d4cdd4af18e..23106b78d93 100644
--- a/net/spread/Makefile
+++ b/net/spread/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2013/08/26 15:00:33 fhajny Exp $
+# $NetBSD: Makefile,v 1.29 2013/11/01 13:26:53 jperkin Exp $
 #
 
 DISTNAME=	spread-src-3.17.3
 PKGNAME=	${DISTNAME:S/-src//}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	net
 MASTER_SITES=	http://www.cnds.jhu.edu/download/noformdown/
 
@@ -31,6 +31,12 @@ FILES_SUBST+=	SPREAD_USER=${SPREAD_USER:Q}
 FILES_SUBST+=	SPREAD_GROUP=${SPREAD_GROUP:Q}
 FILES_SUBST+=	RUNTIME_DIR=${RUNTIME_DIR:Q}
 
+SUBST_CLASSES+=		spread
+SUBST_STAGE.spread=	pre-configure
+SUBST_MESSAGE.spread=	Fix default config
+SUBST_FILES.spread=	sample.spread.conf spread_params.h
+SUBST_VARS.spread=	SPREAD_USER SPREAD_GROUP RUNTIME_DIR
+
 DOCSDIR=	${PREFIX}/share/doc/spread
 EXAMPLEDIR=	${PREFIX}/share/examples/spread
 RUNTIME_DIR=	${SPREAD_DIR}
diff --git a/net/spread/distinfo b/net/spread/distinfo
index ab405ff807e..7e9b322d125 100644
--- a/net/spread/distinfo
+++ b/net/spread/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2013/08/26 15:00:33 fhajny Exp $
+$NetBSD: distinfo,v 1.10 2013/11/01 13:26:53 jperkin Exp $
 
 SHA1 (spread-src-3.17.3.tar.gz) = a3085dd225264a4223eff3346b6b5de64ac2dfc6
 RMD160 (spread-src-3.17.3.tar.gz) = 92def613d602d743d4f7c433f70f0b234bf47feb
@@ -7,3 +7,5 @@ SHA1 (patch-ba) = 795938504e97da34e83e9e66b8b81ff894cbb5b4
 SHA1 (patch-bb) = 6b2e9ef29802c6f60776d7be4046087f96b8ffcb
 SHA1 (patch-bd) = d39aed08e98e81bca572a429c511ffb400b020c3
 SHA1 (patch-configure) = fb86443e2afe2c17206e73bcdbd2b872397e9d4a
+SHA1 (patch-sample.spread.conf) = 3aa9bc8733d9c32337819027cdea5d83f9af19fc
+SHA1 (patch-spread__params.h) = 7878d94ae55b72ab87eeb0ea43f737ec8ff5fd40
diff --git a/net/spread/patches/patch-sample.spread.conf b/net/spread/patches/patch-sample.spread.conf
new file mode 100644
index 00000000000..ed443ba8221
--- /dev/null
+++ b/net/spread/patches/patch-sample.spread.conf
@@ -0,0 +1,24 @@
+$NetBSD: patch-sample.spread.conf,v 1.1 2013/11/01 13:26:53 jperkin Exp $
+
+Make sure the runtime dir and user/group bits are passed on.
+
+--- sample.spread.conf.orig	2002-09-17 23:45:46.000000000 +0000
++++ sample.spread.conf
+@@ -91,14 +91,14 @@ Spread_Segment  127.0.0.255:4803 {
+ # compile-time preprocessor define SP_RUNTIME_DIR, which is generally
+ # "/var/run/spread".
+ 
+-#RuntimeDir = /var/run/spread
++#RuntimeDir = @RUNTIME_DIR@
+ 
+ #Sets the unix user that the Spread daemon runs as (when launched as
+ # the "root" user).  Not effective on a Windows system.  Defaults to
+ # the user and group "spread".
+ 
+-#DaemonUser = spread
+-#DaemonGroup = spread
++#DaemonUser = @SPREAD_USER@
++#DaemonGroup = @SPREAD_GROUP@
+ 
+ 
+ #Set the list of authentication methods that the daemon will allow
diff --git a/net/spread/patches/patch-spread__params.h b/net/spread/patches/patch-spread__params.h
new file mode 100644
index 00000000000..c5ed8f2de84
--- /dev/null
+++ b/net/spread/patches/patch-spread__params.h
@@ -0,0 +1,23 @@
+$NetBSD: patch-spread__params.h,v 1.1 2013/11/01 13:26:53 jperkin Exp $
+
+Make sure the runtime dir and user/group bits are passed on.
+
+--- spread_params.h.orig	2004-10-05 14:42:14.000000000 +0000
++++ spread_params.h
+@@ -43,13 +43,13 @@
+ #define		DEFAULT_SPREAD_PORT	4803
+ 
+ #ifndef SP_RUNTIME_DIR
+-#define         SP_RUNTIME_DIR          "/var/run/spread"
++#define         SP_RUNTIME_DIR          "@RUNTIME_DIR@"
+ #endif
+ #ifndef SP_GROUP
+-#define         SP_GROUP                "spread"
++#define         SP_GROUP                "@SPREAD_GROUP@"
+ #endif
+ #ifndef SP_USER
+-#define         SP_USER                 "spread"
++#define         SP_USER                 "@SPREAD_USER@"
+ #endif
+ 
+ #define		MAX_PROC_NAME		 20     /* including the null, so actually max 19, look for it if changed */