Attachment #171228 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:




#!/bin/sh
#
# $FreeBSD: head/net/olsrd/files/olsrd.in 340872 2014-01-24 00:14:07Z mat $
#
# PROVIDE: olsrd
# REQUIRE: NETWORKING SERVERS

. /etc/rc.subr

name="olsrd"
rcvar=olsrd_enable

command=%%PREFIX%%/sbin/olsrd
command_args="-d 0"

olsrd_enable=${olsrd_enable:-"NO"}

load_rc_config $name
run_rc_command "$1"





--- Makefile.orig	2014-06-02 12:15:27.000000000 +0200
+++ Makefile	2014-06-07 21:42:39.688352979 +0200
@@ -128,15 +128,15 @@
 uninstall: uninstall_olsrd
 
 install_bin:
-		mkdir -p $(SBINDIR)
-		install -m 755 $(EXENAME) $(SBINDIR)
-		$(STRIP) $(SBINDIR)/$(EXENAME)
+		mkdir -p ${DESTDIR}$(SBINDIR)
+		install -m 755 $(EXENAME) ${DESTDIR}$(SBINDIR)
+		$(STRIP) ${DESTDIR}$(SBINDIR)/$(EXENAME)
 ifeq ($(SGW_SUPPORT),1)
-		$(MAKECMDPREFIX)if [ -e $(SBINDIR)/$(SGW_POLICY_SCRIPT) ]; then \
-			cp -f files/$(SGW_POLICY_SCRIPT) $(SBINDIR)/$(SGW_POLICY_SCRIPT).new; \
-			echo "Policy routing script was saved as $(SBINDIR)/$(SGW_POLICY_SCRIPT).new"; \
+		$(MAKECMDPREFIX)if [ -e ${DESTDIR}$(SBINDIR)/$(SGW_POLICY_SCRIPT) ]; then \
+			cp -f files/$(SGW_POLICY_SCRIPT) ${DESTDIR}$(SBINDIR)/$(SGW_POLICY_SCRIPT).new; \
+			echo "Policy routing script was saved as ${DESTDIR}$(SBINDIR)/$(SGW_POLICY_SCRIPT).new"; \
 		else \
-			cp -f files/$(SGW_POLICY_SCRIPT) $(SBINDIR)/$(SGW_POLICY_SCRIPT); \
+			cp -f files/$(SGW_POLICY_SCRIPT) ${DESTDIR}$(SBINDIR)/$(SGW_POLICY_SCRIPT); \
 		fi
 endif
 
@@ -147,29 +147,26 @@
 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)
-		@echo a default configfile. A sample RFC-compliance aimed
-		@echo configfile can be found in olsrd.conf.default.rfc.
-		@echo However none of the larger OLSRD using networks use that
-		@echo so install a configfile with activated link quality exstensions
-		@echo per default.
-		@echo can be found at files/olsrd.conf.default.lq
+		@echo a default configfile. Sample config files are installed
+		@echo as $(CFGFILE).default.full, $(CFGFILE).default.rfc,
+		@echo $(CFGFILE).default.lq and $(CFGFILE).default.lq-fisheye
+		@echo copy and edit one of these to $(CFGFILE)
+		@echo If in doubt start with $(CFGFILE).default.lq
 		@echo ==========================================================
-		mkdir -p $(ETCDIR)
-		$(MAKECMDPREFIX)if [ -e $(CFGFILE) ]; then \
-			cp -f files/olsrd.conf.default.lq $(CFGFILE).new; \
-			echo "Configuration file was saved as $(CFGFILE).new"; \
-		else \
-			cp -f files/olsrd.conf.default.lq $(CFGFILE); \
-		fi
+		mkdir -p ${DESTDIR}$(ETCDIR)
+		-cp files/olsrd.conf.default.full ${DESTDIR}$(CFGFILE).default.full
+		-cp files/olsrd.conf.default.rfc ${DESTDIR}$(CFGFILE).default.rfc
+		-cp files/olsrd.conf.default.lq ${DESTDIR}$(CFGFILE).default.lq
+		-cp files/olsrd.conf.default.lq-fisheye ${DESTDIR}$(CFGFILE).default.lq-fisheye
 		@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
-		mkdir -p $(MANDIR)/man5/
-		cp files/olsrd.conf.5.gz $(MANDIR)/man5/$(CFGNAME).5.gz
+		mkdir -p ${DESTDIR}$(MANDIR)/man8/
+		cp files/olsrd.8.gz ${DESTDIR}$(MANDIR)/man8/$(EXENAME).8.gz
+		mkdir -p ${DESTDIR}$(MANDIR)/man5/
+		cp files/olsrd.conf.5.gz ${DESTDIR}$(MANDIR)/man5/$(CFGNAME).5.gz
 endif
 
 uninstall_olsrd:	uninstall_bin
@@ -217,7 +214,7 @@
 		-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:
-		$(MAKECMDPREFIX)set -e;for dir in $(SUBDIRS);do $(MAKECMD) -C lib/$$dir LIBDIR=$(LIBDIR) install;done
+		$(MAKECMDPREFIX)set -e;for dir in $(SUBDIRS);do $(MAKECMD) -C lib/$$dir LIBDIR=${DESTDIR}$(LIBDIR) install;done
 
 libs_uninstall uninstall_libs:
 		$(MAKECMDPREFIX)set -e;for dir in $(SUBDIRS);do $(MAKECMD) -C lib/$$dir LIBDIR=$(LIBDIR) uninstall;done

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:

Line 0 Link Here

(-)olsrd/files.orig/olsrd.in (+20 lines)
	1	#!/bin/sh
	2	#
	3	# $FreeBSD: head/net/olsrd/files/olsrd.in 340872 2014-01-24 00:14:07Z mat $
	4	#
	5	# PROVIDE: olsrd
	6	# REQUIRE: NETWORKING SERVERS
	7
	8	. /etc/rc.subr
	9
	10	name="olsrd"
	11	rcvar=olsrd_enable
	12
	13	command=%%PREFIX%%/sbin/olsrd
	14	command_args="-d 0"
	15
	16	olsrd_enable=${olsrd_enable:-"NO"}
	17
	18	load_rc_config $name
	19	run_rc_command "$1"
	20

Line 0 Link Here

(-)olsrd/files.orig/patch-Makefile (+78 lines)
		1	--- Makefile.orig 2014-06-02 12:15:27.000000000 +0200
		2	+++ Makefile 2014-06-07 21:42:39.688352979 +0200
		3	@@ -128,15 +128,15 @@
		4	uninstall: uninstall_olsrd
		5
		6	install_bin:
		7	- mkdir -p $(SBINDIR)
		8	- install -m 755 $(EXENAME) $(SBINDIR)
		9	- $(STRIP) $(SBINDIR)/$(EXENAME)
		10	+ mkdir -p ${DESTDIR}$(SBINDIR)
		11	+ install -m 755 $(EXENAME) ${DESTDIR}$(SBINDIR)
		12	+ $(STRIP) ${DESTDIR}$(SBINDIR)/$(EXENAME)
		13	ifeq ($(SGW_SUPPORT),1)
		14	- $(MAKECMDPREFIX)if [ -e $(SBINDIR)/$(SGW_POLICY_SCRIPT) ]; then \
		15	- cp -f files/$(SGW_POLICY_SCRIPT) $(SBINDIR)/$(SGW_POLICY_SCRIPT).new; \
		16	- echo "Policy routing script was saved as $(SBINDIR)/$(SGW_POLICY_SCRIPT).new"; \
		17	+ $(MAKECMDPREFIX)if [ -e ${DESTDIR}$(SBINDIR)/$(SGW_POLICY_SCRIPT) ]; then \
		18	+ cp -f files/$(SGW_POLICY_SCRIPT) ${DESTDIR}$(SBINDIR)/$(SGW_POLICY_SCRIPT).new; \
		19	+ echo "Policy routing script was saved as ${DESTDIR}$(SBINDIR)/$(SGW_POLICY_SCRIPT).new"; \
		20	else \
		21	- cp -f files/$(SGW_POLICY_SCRIPT) $(SBINDIR)/$(SGW_POLICY_SCRIPT); \
		22	+ cp -f files/$(SGW_POLICY_SCRIPT) ${DESTDIR}$(SBINDIR)/$(SGW_POLICY_SCRIPT); \
		23	fi
		24	endif
		25
		26	@@ -147,29 +147,26 @@
		27	install_olsrd: install_bin
		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)
		30	- @echo a default configfile. A sample RFC-compliance aimed
		31	- @echo configfile can be found in olsrd.conf.default.rfc.
		32	- @echo However none of the larger OLSRD using networks use that
		33	- @echo so install a configfile with activated link quality exstensions
		34	- @echo per default.
		35	- @echo can be found at files/olsrd.conf.default.lq
		36	+ @echo a default configfile. Sample config files are installed
		37	+ @echo as $(CFGFILE).default.full, $(CFGFILE).default.rfc,
		38	+ @echo $(CFGFILE).default.lq and $(CFGFILE).default.lq-fisheye
		39	+ @echo copy and edit one of these to $(CFGFILE)
		40	+ @echo If in doubt start with $(CFGFILE).default.lq
		41	@echo ==========================================================
		42	- mkdir -p $(ETCDIR)
		43	- $(MAKECMDPREFIX)if [ -e $(CFGFILE) ]; then \
		44	- cp -f files/olsrd.conf.default.lq $(CFGFILE).new; \
		45	- echo "Configuration file was saved as $(CFGFILE).new"; \
		46	- else \
		47	- cp -f files/olsrd.conf.default.lq $(CFGFILE); \
		48	- fi
		49	+ mkdir -p ${DESTDIR}$(ETCDIR)
		50	+ -cp files/olsrd.conf.default.full ${DESTDIR}$(CFGFILE).default.full
		51	+ -cp files/olsrd.conf.default.rfc ${DESTDIR}$(CFGFILE).default.rfc
		52	+ -cp files/olsrd.conf.default.lq ${DESTDIR}$(CFGFILE).default.lq
		53	+ -cp files/olsrd.conf.default.lq-fisheye ${DESTDIR}$(CFGFILE).default.lq-fisheye
		54	@echo -------------------------------------------
		55	@echo Edit $(CFGFILE) before running olsrd!!
		56	@echo -------------------------------------------
		57	@echo Installing manpages $(EXENAME)\(8\) and $(CFGNAME)\(5\)
		58	ifneq ($(MANDIR),)
		59	- mkdir -p $(MANDIR)/man8/
		60	- cp files/olsrd.8.gz $(MANDIR)/man8/$(EXENAME).8.gz
		61	- mkdir -p $(MANDIR)/man5/
		62	- cp files/olsrd.conf.5.gz $(MANDIR)/man5/$(CFGNAME).5.gz
		63	+ mkdir -p ${DESTDIR}$(MANDIR)/man8/
		64	+ cp files/olsrd.8.gz ${DESTDIR}$(MANDIR)/man8/$(EXENAME).8.gz
65	+ mkdir -p ${DESTDIR}$(MANDIR)/man5/
66	+ cp files/olsrd.conf.5.gz ${DESTDIR}$(MANDIR)/man5/$(CFGNAME).5.gz
67	endif
68
69	uninstall_olsrd: uninstall_bin
70	@@ -217,7 +214,7 @@
71	-for dir in $(SUBDIRS);do $(MAKECMD) -C lib/$$dir LIBDIR=$(LIBDIR) clean;rm -f lib/$$dir/.so lib/$$dir/.dll;done
72
73	libs_install install_libs:
74	- $(MAKECMDPREFIX)set -e;for dir in $(SUBDIRS);do $(MAKECMD) -C lib/$$dir LIBDIR=$(LIBDIR) install;done
75	+ $(MAKECMDPREFIX)set -e;for dir in $(SUBDIRS);do $(MAKECMD) -C lib/$$dir LIBDIR=${DESTDIR}$(LIBDIR) install;done
76
77	libs_uninstall uninstall_libs:
78	$(MAKECMDPREFIX)set -e;for dir in $(SUBDIRS);do $(MAKECMD) -C lib/$$dir LIBDIR=$(LIBDIR) uninstall;done