Package olsrd 0.6.8.1

[Pierre Pronchery <khorben%defora.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Pierre Pronchery <khorben%defora.org@localhost>
Pushed By:	khorben
Date:		Fri Oct 23 00:57:19 2015 +0200
Changeset:	e4988f6f5bd980f947284e821495d4049dd0ce43

Modified Files:
	olsrd/Makefile
	olsrd/distinfo
	olsrd/patches/patch-ad

Log Message:
Package olsrd 0.6.8.1

The CHANGELOG says:

Ferry Huberts (4):
      pud: wireformat-java: improve java detection
      release: stricter matching of release tags
      autobuf: fix warning in Windows release builds
      neighbors: signal link changes when deleting a neighbor

Henning Rogge (4):
      Update version after release of v0.6.8
      tc: properly initialise the path_costs field in a new tc
      Handle interface broadcast/multicast address zero
      Release v0.6.8.1

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

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

diffstat:
 olsrd/Makefile         | 13 ++++++++-----
 olsrd/distinfo         | 12 ++++++------
 olsrd/patches/patch-ad |  2 +-
 3 files changed, 15 insertions(+), 12 deletions(-)

diffs:
diff --git a/olsrd/Makefile b/olsrd/Makefile
index 8f1b6ce..9bd2a22 100644
--- a/olsrd/Makefile
+++ b/olsrd/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.6 2012/10/03 21:32:46 asau Exp $
 #
 
-DISTNAME=	olsrd-0.6.8
+DISTNAME=	olsrd-0.6.8.1
 CATEGORIES=	net
 MASTER_SITES=	http://www.olsr.org/releases/0.6/
 
@@ -17,18 +17,21 @@ USE_TOOLS+=	gmake
 
 .include "../../mk/bsd.prefs.mk"
 
-MAKE_FLAGS+=ETCDIR=${DESTDIR}${PREFIX}/etc
+PKG_SYSCONFSUBDIR=olsrd
+
+MAKE_FLAGS+=ETCDIR=${DESTDIR}${PKG_SYSCONFDIR}
 MAKE_FLAGS+=MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}
 MAKE_FLAGS+=SBINDIR=${DESTDIR}${PREFIX}/sbin
-MAKE_FLAGS+=EXTRA_CPPFLAGS=-DETCDIR=\\\"${PREFIX}/etc\\\"
+MAKE_FLAGS+=EXTRA_CPPFLAGS=-DETCDIR=\\\"${PKG_SYSCONFDIR}\\\"
 
 EGDIR=	${PREFIX}/share/examples/olsrd
-CONF_FILES=	${EGDIR}/olsrd.conf ${PREFIX}/etc/olsrd/olsrd.conf
+CONF_FILES=	${EGDIR}/olsrd.conf ${PKG_SYSCONFDIR}/olsrd.conf
 INSTALLATION_DIRS=	${EGDIR}
+INSTALLATION_DIRS+=	${PKG_SYSCONFDIR}
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/files/olsrd.conf.default.lq		\
 		${DESTDIR}${EGDIR}/olsrd.conf
-	${RM} ${DESTDIR}${PREFIX}/etc/olsrd.conf
+	${RM} ${DESTDIR}${PKG_SYSCONFDIR}/olsrd.conf
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/olsrd/distinfo b/olsrd/distinfo
index bcf764c..29911e1 100644
--- a/olsrd/distinfo
+++ b/olsrd/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2012/09/28 22:44:11 khorben Exp $
+$NetBSD$
 
-SHA1 (olsrd-0.6.8.tar.gz) = e86fbadcef146f36b0b518b32a158ee48d429b59
-RMD160 (olsrd-0.6.8.tar.gz) = 2d2bebd16489cdbc978fc5f1e5d0fea4c4ad2018
-SHA512 (olsrd-0.6.8.tar.gz) = d7e449b6895c32fe32c730b0fc1ff14d6d09451429142579b0f43bd1011a180dc04a0952c2278ee043da0288c9752a5c85f521d7c7763d3a79571878744356a0
-Size (olsrd-0.6.8.tar.gz) = 5781409 bytes
-SHA1 (patch-ad) = 1d4ffb957bab96732e05e5f94cf8193995386998
+SHA1 (olsrd-0.6.8.1.tar.gz) = 85d1f895a1d6e0d1076f58ee65acf62e734760a4
+RMD160 (olsrd-0.6.8.1.tar.gz) = bfb4cb19f7c2ed40f010bd444bd5497ac24e9bfc
+SHA512 (olsrd-0.6.8.1.tar.gz) = f56cdd2a1d9d1870174762f9f3f83f208205c9dd1cf36d5103a1683636185e883ee38c79c1d4d8be71c5a0236fab8423f60f00be3c67665fb43380855749b871
+Size (olsrd-0.6.8.1.tar.gz) = 5781797 bytes
+SHA1 (patch-ad) = 4b1689568758116237d038e66f106253244ec0b1
 SHA1 (patch-src_cfgparser_local.mk) = 1c0e2454360a8071ecbbd16a8f0e242d47d1028c
diff --git a/olsrd/patches/patch-ad b/olsrd/patches/patch-ad
index 388ea38..d861cbe 100644
--- a/olsrd/patches/patch-ad
+++ b/olsrd/patches/patch-ad
@@ -15,7 +15,7 @@ Allowing the configuration files' directory to be re-defined
  #ifndef OLSRD_GLOBAL_CONF_FILE
  #define OLSRD_CONF_FILE_NAME	"olsrd.conf"
 -#define OLSRD_GLOBAL_CONF_FILE	"/etc/olsrd/" OLSRD_CONF_FILE_NAME
-+#define OLSRD_GLOBAL_CONF_FILE	ETCDIR "/olsrd/" OLSRD_CONF_FILE_NAME
++#define OLSRD_GLOBAL_CONF_FILE	ETCDIR "/" OLSRD_CONF_FILE_NAME
  #endif /* OLSRD_GLOBAL_CONF_FILE */
  
  #define	MAXMESSAGESIZE		1500    /* max broadcast size */