Make pid dir configurable.

3 files changed, 28 insertions, 4 deletions

diff --git a/net/spread/Makefile b/net/spread/Makefile
index c595d8d2b8d..d4cdd4af18e 100644
--- a/net/spread/Makefile
+++ b/net/spread/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2013/07/12 10:45:00 jperkin Exp $
+# $NetBSD: Makefile,v 1.28 2013/08/26 15:00:33 fhajny Exp $
 #
 
 DISTNAME=	spread-src-3.17.3
@@ -15,22 +15,25 @@ WRKSRC=		${WRKDIR}/${DISTNAME}
 USE_TOOLS+=	perl
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=	--includedir=${PREFIX:Q}/include/spread
+CONFIGURE_ARGS+=	--with-pid-dir=${RUNTIME_DIR:Q}
 MAKE_FLAGS+=	LD=${CC:Q}
 
+BUILD_DEFS+=	SPREAD_DIR
+
 PKG_GROUPS_VARS+=	SPREAD_GROUP
 PKG_USERS_VARS+=	SPREAD_USER
 
 SPREAD_USER=	spread
 SPREAD_GROUP=	spread
+SPREAD_DIR?=	${VARBASE}/run/spread
 
 FILES_SUBST+=	SPREAD_USER=${SPREAD_USER:Q}
 FILES_SUBST+=	SPREAD_GROUP=${SPREAD_GROUP:Q}
 FILES_SUBST+=	RUNTIME_DIR=${RUNTIME_DIR:Q}
 
-INCLUDEDIR=	${PREFIX}/include/spread
 DOCSDIR=	${PREFIX}/share/doc/spread
 EXAMPLEDIR=	${PREFIX}/share/examples/spread
-RUNTIME_DIR=	${VARBASE}/run/spread
+RUNTIME_DIR=	${SPREAD_DIR}
 
 RCD_SCRIPTS=	spread
 PKG_GROUPS=	${SPREAD_USER}
diff --git a/net/spread/distinfo b/net/spread/distinfo
index 735969965fc..ab405ff807e 100644
--- a/net/spread/distinfo
+++ b/net/spread/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2005/02/24 12:14:04 agc Exp $
+$NetBSD: distinfo,v 1.9 2013/08/26 15:00:33 fhajny Exp $
 
 SHA1 (spread-src-3.17.3.tar.gz) = a3085dd225264a4223eff3346b6b5de64ac2dfc6
 RMD160 (spread-src-3.17.3.tar.gz) = 92def613d602d743d4f7c433f70f0b234bf47feb
@@ -6,3 +6,4 @@ Size (spread-src-3.17.3.tar.gz) = 299975 bytes
 SHA1 (patch-ba) = 795938504e97da34e83e9e66b8b81ff894cbb5b4
 SHA1 (patch-bb) = 6b2e9ef29802c6f60776d7be4046087f96b8ffcb
 SHA1 (patch-bd) = d39aed08e98e81bca572a429c511ffb400b020c3
+SHA1 (patch-configure) = fb86443e2afe2c17206e73bcdbd2b872397e9d4a
diff --git a/net/spread/patches/patch-configure b/net/spread/patches/patch-configure
new file mode 100644
index 00000000000..bd0e1d480ea
--- /dev/null
+++ b/net/spread/patches/patch-configure
@@ -0,0 +1,20 @@
+$NetBSD: patch-configure,v 1.1 2013/08/26 15:00:33 fhajny Exp $
+
+Make piddir configurable.
+--- configure.orig	2013-08-26 14:49:35.051354307 +0000
++++ configure
+@@ -3397,14 +3397,6 @@ if test "${with_pid_dir+set}" = set; the
+ fi
+ 
+ 
+-# make sure the directory exists
+-if test ! -d $piddir ; then	
+-	piddir=`eval echo ${sysconfdir}`
+-	case $piddir in
+- 		NONE/*) piddir=`echo $piddir | sed "s~NONE~$ac_default_prefix~"` ;;
+-	esac
+-fi
+-
+ cat >> confdefs.h <<EOF
+ #define _PATH_SPREAD_PIDDIR "$piddir"
+ EOF