Attachment #171715 for bug #210161




# Created by: dave@dogwood.com
# $FreeBSD$

PORTNAME=	olsrd
DISTVERSION=	0.9.0.3
PORTREVISION=	2
CATEGORIES=	net
MASTER_SITES=	http://www.olsr.org/releases/0.9/
		http://ftp2.za.freebsd.org/pub/mesh/pc/protocols/olsr/

MAINTAINER=	koue@chaosophia.net
COMMENT=	OLSR routing daemon

LICENSE=	BSD3CLAUSE

USES=		bison gmake tar:bzip2
USE_LDCONFIG=	yes

Lines 1-2 Link Here

(-)olsrd/distinfo (-2 / +2 lines)
1	SHA256 (olsrd-0.6.6.2.tar.bz2) = f24b506b19ee8bb2296dbe67a0ce6170c0f4309d4e78a39dab5452376b9953fc	1	SHA256 (olsrd-0.9.0.3.tar.bz2) = 1f038ed3ea72e4f73dfc9701de83de7313f5049161c8df17b9aaeba8e9711e92
2	SIZE (olsrd-0.6.6.2.tar.bz2) = 5414368	2	SIZE (olsrd-0.9.0.3.tar.bz2) = 5439699




--- Makefile.orig	2015-09-20 12:22:23 UTC
+++ Makefile
@@ -143,15 +143,15 @@ cfgparser_clean:
 		$(MAKECMDPREFIX)$(MAKECMD) -C $(CFGDIR) clean
 
 install_bin:
-		mkdir -p $(SBINDIR)

 		fi
 endif
 
@@ -162,29 +162,26 @@ uninstall_bin:
 install_olsrd:	install_bin
 		@echo ========= C O N F I G U R A T I O N - F I L E ============
 		@echo $(EXENAME) uses the configfile $(CFGFILE)

+		mkdir -p ${DESTDIR}$(MANDIR)/man5/
+		cp files/olsrd.conf.5.gz ${DESTDIR}$(MANDIR)/man5/$(CFGNAME).5.gz
 endif
 ifneq ($(RCDIR),)
 		cp $(RCFILE) $(RCDIR)/olsrd
@@ -239,7 +236,7 @@ libs_clean clean_libs:
 		-for dir in $(SUBDIRS);do $(MAKECMD) -C lib/$$dir LIBDIR=$(LIBDIR) clean;rm -f lib/$$dir/*.so lib/$$dir/*.dll;done
 
 libs_install install_libs:

Line 0 Link Here

(-)olsrd/files/patch-src_bsd_net.c (+11 lines)
	1	--- src/bsd/net.c.orig 2016-06-22 12:04:33 UTC
	2	+++ src/bsd/net.c
	3	@@ -125,6 +125,8 @@
	4
	5	#include <sys/sysctl.h>
	6
	7	+#include "olsr_random.h"
	8	+
	9	static int ignore_redir;
	10	static int send_redir;
	11	static int gateway;

Lines 1-8 Link Here

(-)olsrd/pkg-plist (-4 / +3 lines)
1	sbin/olsrd	1	sbin/olsrd
2	etc/olsrd.conf.default.full	2	%%ETCDIR%%/olsrd.conf.default.full
3	etc/olsrd.conf.default.rfc	3	%%ETCDIR%%/olsrd.conf.default.rfc
4	etc/olsrd.conf.default.lq	4	%%ETCDIR%%/olsrd.conf.default.lq
5	etc/olsrd.conf.default.lq-fisheye
6	lib/olsrd_dot_draw.so.0.3	5	lib/olsrd_dot_draw.so.0.3
7	lib/olsrd_httpinfo.so.0.1	6	lib/olsrd_httpinfo.so.0.1
8	lib/olsrd_jsoninfo.so.0.0	7	lib/olsrd_jsoninfo.so.0.0

Return to bug 210161

Lines 1-17 Link Here

(-)olsrd/Makefile (-7 / +5 lines)
1	# Created by: dave@dogwood.com	1	# Created by: dave@dogwood.com
2	# $FreeBSD: head/net/olsrd/Makefile 412348 2016-04-01 14:17:44Z mat $	2	# $FreeBSD$
3		3
4	PORTNAME= olsrd	4	PORTNAME= olsrd
5	DISTVERSION= 0.6.6.2	5	DISTVERSION= 0.9.0.3
6	PORTREVISION= 2
7	CATEGORIES= net	6	CATEGORIES= net
8	MASTER_SITES= http://www.olsr.org/releases/0.6/ \	7	MASTER_SITES= http://www.olsr.org/releases/0.9/
9	http://ftp2.za.freebsd.org/pub/mesh/pc/protocols/olsr/
10		8
11	MAINTAINER= ports@FreeBSD.org	9	MAINTAINER= koue@chaosophia.net
12	COMMENT= OLSR routing daemon	10	COMMENT= OLSR routing daemon
13		11
14	BUILD_DEPENDS= makedepend:devel/makedepend	12	LICENSE= BSD3CLAUSE
15		13
16	USES= bison gmake tar:bzip2	14	USES= bison gmake tar:bzip2
17	USE_LDCONFIG= yes	15	USE_LDCONFIG= yes

Lines 1-7 Link Here

(-)olsrd/files/patch-Makefile (-8 / +8 lines)
1	--- Makefile.orig 2014-06-02 12:15:27.000000000 +0200	1	--- Makefile.orig 2015-09-20 12:22:23 UTC
2	+++ Makefile 2014-06-07 21:42:39.688352979 +0200	2	+++ Makefile
3	@@ -128,15 +128,15 @@	3	@@ -143,15 +143,15 @@ cfgparser_clean:
4	uninstall: uninstall_olsrd	4	$(MAKECMDPREFIX)$(MAKECMD) -C $(CFGDIR) clean
5		5
6	install_bin:	6	install_bin:
7	- mkdir -p $(SBINDIR)	7	- mkdir -p $(SBINDIR)
Lines 23-29 Link Here
23	fi	23	fi
24	endif	24	endif
25		25
26	@@ -147,29 +147,26 @@	26	@@ -162,29 +162,26 @@ uninstall_bin:
27	install_olsrd: install_bin	27	install_olsrd: install_bin
28	@echo ========= C O N F I G U R A T I O N - F I L E ============	28	@echo ========= C O N F I G U R A T I O N - F I L E ============
29	@echo $(EXENAME) uses the configfile $(CFGFILE)	29	@echo $(EXENAME) uses the configfile $(CFGFILE)
Lines 65-73 Link Here
65	+ mkdir -p ${DESTDIR}$(MANDIR)/man5/	65	+ mkdir -p ${DESTDIR}$(MANDIR)/man5/
66	+ cp files/olsrd.conf.5.gz ${DESTDIR}$(MANDIR)/man5/$(CFGNAME).5.gz	66	+ cp files/olsrd.conf.5.gz ${DESTDIR}$(MANDIR)/man5/$(CFGNAME).5.gz
67	endif	67	endif
68		68	ifneq ($(RCDIR),)
69	uninstall_olsrd: uninstall_bin	69	cp $(RCFILE) $(RCDIR)/olsrd
70	@@ -217,7 +214,7 @@	70	@@ -239,7 +236,7 @@ libs_clean clean_libs:
71	-for dir in $(SUBDIRS);do $(MAKECMD) -C lib/$$dir LIBDIR=$(LIBDIR) clean;rm -f lib/$$dir/.so lib/$$dir/.dll;done	71	-for dir in $(SUBDIRS);do $(MAKECMD) -C lib/$$dir LIBDIR=$(LIBDIR) clean;rm -f lib/$$dir/.so lib/$$dir/.dll;done
72		72
73	libs_install install_libs:	73	libs_install install_libs: