Package olsrd 0.6.8

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: Package olsrd 0.6.8
From: Pierre Pronchery <khorben%defora.org@localhost>
Date: Thu, 22 Oct 2015 22:39:31 +0000
Module Name:	pkgsrc-wip
Committed By:	Pierre Pronchery <khorben%defora.org@localhost>
Pushed By:	khorben
Date:		Fri Oct 23 00:39:31 2015 +0200
Changeset:	b0f9721c6cbe7b49d9e8fa7440a76d478da2642f

Modified Files:
	olsrd/Makefile
	olsrd/PLIST
	olsrd/distinfo
	olsrd/patches/patch-ad
	olsrd/patches/patch-src_cfgparser_local.mk
Removed Files:
	olsrd/patches/patch-ab
	olsrd/patches/patch-ac

Log Message:
Package olsrd 0.6.8

The CHANGELOG is very big, and a lot happened since then too.

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

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

diffstat:
 olsrd/Makefile                             | 10 +++++++---
 olsrd/PLIST                                |  6 +++---
 olsrd/distinfo                             | 13 ++++++-------
 olsrd/patches/patch-ab                     | 23 -----------------------
 olsrd/patches/patch-ac                     | 26 --------------------------
 olsrd/patches/patch-ad                     | 14 +++++++-------
 olsrd/patches/patch-src_cfgparser_local.mk |  6 +++---
 7 files changed, 26 insertions(+), 72 deletions(-)

diffs:
diff --git a/olsrd/Makefile b/olsrd/Makefile
index 195eca7..8f1b6ce 100644
--- a/olsrd/Makefile
+++ b/olsrd/Makefile
@@ -1,8 +1,7 @@
 # $NetBSD: Makefile,v 1.6 2012/10/03 21:32:46 asau Exp $
 #
 
-DISTNAME=	olsrd-0.6.1
-PKGREVISION=	1
+DISTNAME=	olsrd-0.6.8
 CATEGORIES=	net
 MASTER_SITES=	http://www.olsr.org/releases/0.6/
 
@@ -16,15 +15,20 @@ USE_TOOLS+=	bison
 USE_TOOLS+=	flex
 USE_TOOLS+=	gmake
 
+.include "../../mk/bsd.prefs.mk"
+
 MAKE_FLAGS+=ETCDIR=${DESTDIR}${PREFIX}/etc
+MAKE_FLAGS+=MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}
+MAKE_FLAGS+=SBINDIR=${DESTDIR}${PREFIX}/sbin
 MAKE_FLAGS+=EXTRA_CPPFLAGS=-DETCDIR=\\\"${PREFIX}/etc\\\"
 
 EGDIR=	${PREFIX}/share/examples/olsrd
-CONF_FILES=	${EGDIR}/olsrd.conf ${PREFIX}/etc/olsrd.conf
+CONF_FILES=	${EGDIR}/olsrd.conf ${PREFIX}/etc/olsrd/olsrd.conf
 INSTALLATION_DIRS=	${EGDIR}
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/files/olsrd.conf.default.lq		\
 		${DESTDIR}${EGDIR}/olsrd.conf
+	${RM} ${DESTDIR}${PREFIX}/etc/olsrd.conf
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/olsrd/PLIST b/olsrd/PLIST
index 2fbb2ad..3f23dec 100644
--- a/olsrd/PLIST
+++ b/olsrd/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.6 2012/09/28 22:44:11 khorben Exp $
-man/man5/olsrd.conf.5.gz
-man/man8/olsrd.8.gz
+@comment $NetBSD$
+man/man5/olsrd.conf.5
+man/man8/olsrd.8
 sbin/olsrd
 share/examples/olsrd/olsrd.conf
diff --git a/olsrd/distinfo b/olsrd/distinfo
index f7393b5..bcf764c 100644
--- a/olsrd/distinfo
+++ b/olsrd/distinfo
@@ -1,9 +1,8 @@
 $NetBSD: distinfo,v 1.6 2012/09/28 22:44:11 khorben Exp $
 
-SHA1 (olsrd-0.6.1.tar.gz) = 9c2147bba8803e3265954f99e53a2a2255667ac8
-RMD160 (olsrd-0.6.1.tar.gz) = 5a5d721a6bcd369bb096e7a1dd796f7fa0b62d51
-Size (olsrd-0.6.1.tar.gz) = 783918 bytes
-SHA1 (patch-ab) = e26209d10d480c7e421fb9ff28b40fcad60d78fb
-SHA1 (patch-ac) = 594380f441b7e8b871bd37162eb92889b9d53668
-SHA1 (patch-ad) = 719d8eb1977583c473389786d60e61deb09eff42
-SHA1 (patch-src_cfgparser_local.mk) = 4c061c6c7d30b629f118aad5a7f2a25d30109c6a
+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 (patch-src_cfgparser_local.mk) = 1c0e2454360a8071ecbbd16a8f0e242d47d1028c
diff --git a/olsrd/patches/patch-ab b/olsrd/patches/patch-ab
deleted file mode 100644
index 49e730c..0000000
--- a/olsrd/patches/patch-ab
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2012/09/28 22:44:11 khorben Exp $
-
-Fixing the installation directories
-
---- Makefile.inc.orig	2010-06-08 12:49:01.000000000 +0000
-+++ Makefile.inc
-@@ -48,11 +48,12 @@ TAGCMD ?=	etags
- 
- # target directories and names
- DESTDIR ?=
--SBINDIR ?= $(DESTDIR)/usr/sbin
-+PREFIX  ?= /usr
-+SBINDIR ?= $(DESTDIR)$(PREFIX)/sbin
- ETCDIR  ?= $(DESTDIR)/etc
--LIBDIR  ?= $(DESTDIR)/usr/lib
--DOCDIR  ?= $(DESTDIR)/usr/share/doc
--MANDIR  ?= $(DESTDIR)/usr/share/man
-+LIBDIR  ?= $(DESTDIR)$(PREFIX)/lib
-+DOCDIR  ?= $(DESTDIR)$(PREFIX)/share/doc
-+MANDIR  ?= $(DESTDIR)$(PREFIX)/man
- EXENAME ?= olsrd
- CFGNAME ?= $(EXENAME).conf
- CFGFILE ?= $(ETCDIR)/$(CFGNAME)
diff --git a/olsrd/patches/patch-ac b/olsrd/patches/patch-ac
deleted file mode 100644
index 59cad53..0000000
--- a/olsrd/patches/patch-ac
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2012/09/28 22:44:11 khorben Exp $
-
-Fixing the installation permissions
-
---- Makefile.orig	2010-11-27 18:53:01.000000000 +0000
-+++ Makefile
-@@ -116,17 +116,15 @@ install_olsrd:	install_bin
- 		@echo per default.
- 		@echo can be found at files/olsrd.conf.default.lq
- 		@echo ==========================================================
--		mkdir -p $(ETCDIR)
--		-cp -i files/olsrd.conf.default.lq $(CFGFILE)
- 		@echo -------------------------------------------
- 		@echo Edit $(CFGFILE) before running olsrd!!
- 		@echo -------------------------------------------
- 		@echo Installing manpages $(EXENAME)\(8\) and $(CFGNAME)\(5\)
- ifneq ($(MANDIR),)
- 		mkdir -p $(MANDIR)/man8/
--		cp files/olsrd.8.gz $(MANDIR)/man8/$(EXENAME).8.gz
-+		install -m 644 files/olsrd.8.gz $(MANDIR)/man8/$(EXENAME).8.gz
- 		mkdir -p $(MANDIR)/man5/
--		cp files/olsrd.conf.5.gz $(MANDIR)/man5/$(CFGNAME).5.gz
-+		install -m 644 files/olsrd.conf.5.gz $(MANDIR)/man5/$(CFGNAME).5.gz
- endif
- 
- tags:
diff --git a/olsrd/patches/patch-ad b/olsrd/patches/patch-ad
index bda9cbf..388ea38 100644
--- a/olsrd/patches/patch-ad
+++ b/olsrd/patches/patch-ad
@@ -2,11 +2,11 @@ $NetBSD: patch-ad,v 1.3 2012/09/28 22:44:11 khorben Exp $
 
 Allowing the configuration files' directory to be re-defined
 
---- src/defs.h.orig	2010-04-08 12:50:26.000000000 +0000
+--- src/defs.h.orig	2014-12-29 11:17:09.000000000 +0000
 +++ src/defs.h
-@@ -60,9 +60,13 @@ extern const char olsrd_version[];
- extern const char build_date[];
- extern const char build_host[];
+@@ -60,9 +60,13 @@
+ #include "olsr_protocol.h"
+ #include "olsr_cfg.h"
  
 +#ifndef ETCDIR
 +#define ETCDIR "/etc"
@@ -14,8 +14,8 @@ 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_CONF_FILE_NAME
-+#define OLSRD_GLOBAL_CONF_FILE	ETCDIR "/" OLSRD_CONF_FILE_NAME
- #endif
+-#define OLSRD_GLOBAL_CONF_FILE	"/etc/olsrd/" OLSRD_CONF_FILE_NAME
++#define OLSRD_GLOBAL_CONF_FILE	ETCDIR "/olsrd/" OLSRD_CONF_FILE_NAME
+ #endif /* OLSRD_GLOBAL_CONF_FILE */
  
  #define	MAXMESSAGESIZE		1500    /* max broadcast size */
diff --git a/olsrd/patches/patch-src_cfgparser_local.mk b/olsrd/patches/patch-src_cfgparser_local.mk
index 24f62d9..692da6b 100644
--- a/olsrd/patches/patch-src_cfgparser_local.mk
+++ b/olsrd/patches/patch-src_cfgparser_local.mk
@@ -2,7 +2,7 @@ $NetBSD: patch-src_cfgparser_local.mk,v 1.1 2012/09/28 22:44:11 khorben Exp $
 
 Fixed invocation of flex
 
---- src/cfgparser/local.mk.orig	2010-03-31 17:03:53.000000000 +0000
+--- src/cfgparser/local.mk.orig	2014-12-29 11:17:09.000000000 +0000
 +++ src/cfgparser/local.mk
 @@ -45,6 +45,8 @@ SRCS += $(foreach file,olsrd_conf oparse
  OBJS += $(foreach file,olsrd_conf oparse oscan cfgfile_gen,$(C)$(file).o)
@@ -11,5 +11,5 @@ Fixed invocation of flex
 +FLEX ?= flex
 +
  $(C)oscan.c: $(C)oscan.lex $(C)Makefile
- 	$(FLEX) -Cem -o"$@-tmp" "$<"
- 	sed	-e '/^static/s/yy_get_next_buffer[\(][\)]/yy_get_next_buffer(void)/' \
+ ifeq ($(VERBOSE),0)
+ 	@echo "[FLEX] $@"
Prev by Date: sunxi-tools: remove, in pkgsrc now
Next by Date: Package olsrd 0.6.8.1
Previous by Thread: sunxi-tools: remove, in pkgsrc now
Next by Thread: Package olsrd 0.6.8.1
Indexes:
Home | Main Index | Thread Index | Old Index