pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

freevrrpd: Fix PREFIX, VARBASE, PKG_SYSCONFDIR paths



Module Name:	pkgsrc-wip
Committed By:	Hauke Fath <hauke%NetBSD.org@localhost>
Pushed By:	hauke
Date:		Wed Mar 15 13:18:16 2017 +0100
Changeset:	a5dda4bef1fdd7900c77c72a2c700c98c958a300

Modified Files:
	freevrrpd/Makefile
	freevrrpd/distinfo
	freevrrpd/files/freevrrpd.sh
Added Files:
	freevrrpd/patches/patch-freevrrpd.8

Log Message:
freevrrpd: Fix PREFIX, VARBASE, PKG_SYSCONFDIR paths

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a5dda4bef1fdd7900c77c72a2c700c98c958a300

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 freevrrpd/Makefile                  |  6 ++++++
 freevrrpd/distinfo                  |  1 +
 freevrrpd/files/freevrrpd.sh        |  6 +++---
 freevrrpd/patches/patch-freevrrpd.8 | 24 ++++++++++++++++++++++++
 4 files changed, 34 insertions(+), 3 deletions(-)

diffs:
diff --git a/freevrrpd/Makefile b/freevrrpd/Makefile
index 811c68ba0b..d6e2f74f9c 100644
--- a/freevrrpd/Makefile
+++ b/freevrrpd/Makefile
@@ -21,6 +21,12 @@ CONF_FILES=	${PREFIX}/${EGDIR}/freevrrpd.conf ${PKG_SYSCONFDIR}/freevrrpd.conf
 RCD_SCRIPTS=			freevrrpd
 RCD_SCRIPT_SRC.freevrrpd=	${FILESDIR}/freevrrpd.sh
 
+SUBST_CLASSES+=			fix-paths
+SUBST_STAGE.fix-paths=		pre-configure
+SUBST_MESSAGE.fix-paths=	Fixing absolute paths
+SUBST_FILES.fix-paths=		freevrrpd.8
+SUBST_VARS.fix-paths+=		PREFIX PKG_SYSCONFDIR
+
 INSTALLATION_DIRS=		sbin ${PKGMANDIR}/man8 ${EGDIR} ${DOCDIR}
 
 do-install:
diff --git a/freevrrpd/distinfo b/freevrrpd/distinfo
index 13a95f76a0..1f140b6293 100644
--- a/freevrrpd/distinfo
+++ b/freevrrpd/distinfo
@@ -5,6 +5,7 @@ RMD160 (freevrrpd-1.1.tar.gz) = 899bd069e08aa7958d5c1e8f045037a27ea9bbd7
 SHA512 (freevrrpd-1.1.tar.gz) = 342203c766678aca6b211c7f7ca4fa1189efec4fa7bd26fdf1999b8f824274ec0302cb2b2570a24ea1a3ed561f152fb1c886ecb16fa794b5dcd29799906e4f05
 Size (freevrrpd-1.1.tar.gz) = 41852 bytes
 SHA1 (patch-Makefile) = e4a0bcdacaa874dca97da6d8698bff6dc0ab8223
+SHA1 (patch-freevrrpd.8) = 04bbdf53ed3820054d48b1731bde65cfe6908de0
 SHA1 (patch-vrrp_ah.h) = 976f5e210d35afbfe80714f1988a4e4a8e11124e
 SHA1 (patch-vrrp_conf.c) = 191f41ad809e8ec34429a0721780e4458279a1c2
 SHA1 (patch-vrrp_interface.c) = a0eabdc0a30ab5b6249740a0efddc7410dc9cd84
diff --git a/freevrrpd/files/freevrrpd.sh b/freevrrpd/files/freevrrpd.sh
index 05ba819a20..aeeb0ffc18 100755
--- a/freevrrpd/files/freevrrpd.sh
+++ b/freevrrpd/files/freevrrpd.sh
@@ -16,10 +16,10 @@ fi
 
 name="freevrrpd"
 rcvar=${name}
-required_files="%SYSCONFDIR%/freevrrpd.conf"
-command="%PREFIX%/sbin/${name}"
+required_files="@PKG_SYSCONFDIR@/freevrrpd.conf"
+command="@PREFIX@/sbin/${name}"
 command_args="-f ${required_files}"
-pidfile="%VARBASE%/run/${name}.pid"
+pidfile="@VARBASE@/run/${name}.pid"
 extra_commands="reload"
 
 if [ -f /etc/rc.subr ]; then
diff --git a/freevrrpd/patches/patch-freevrrpd.8 b/freevrrpd/patches/patch-freevrrpd.8
new file mode 100644
index 0000000000..0143446566
--- /dev/null
+++ b/freevrrpd/patches/patch-freevrrpd.8
@@ -0,0 +1,24 @@
+$NetBSD$
+
+Insert correct path to config file.
+
+--- freevrrpd.8.orig	2015-02-04 00:39:49.000000000 +0000
++++ freevrrpd.8
+@@ -21,7 +21,7 @@ developed.
+ .Pp
+ When
+ .Nm freevrrpd 
+-start, it reads /usr/local/etc/freevrrpd.conf file and then daemonizes
++start, it reads @PKG_SYSCONFDIR@/freevrrpd.conf file and then daemonizes
+ itself.  All of the options are defined in the config file. 
+ .Pp
+ .Nm freevrrpd is compatible with FreeBSD.
+@@ -50,7 +50,7 @@ Support of netmasks for virtual IP addre
+ .Sh CONFIGURATION
+ .Pp
+ .Nm freevrrpd
+-reads its configuration data from /usr/local/etc/freevrrpd.conf, or
++reads its configuration data from @PKG_SYSCONFDIR@/freevrrpd.conf, or
+ the file specified with -f on the command line. The config file
+ contains keyword-argument pairs, one per line. Each VRID definition is
+ define by the [VRID] keyword. Lines statring with '#' and empty lines


Home | Main Index | Thread Index | Old Index