- Update to version 0.9.0.3 [1]

- Add LICENSE [1]
- Transfer maintainership to submitter
- Use helpers for architecture specific CFLAGS

PR:		210161 [1]
Submitted by:	Nikola Kolev

5 files changed, 32 insertions, 26 deletions

diff --git a/net/olsrd/Makefile b/net/olsrd/Makefile
index 67e5f6272b5b..2fa011285a54 100644
--- a/net/olsrd/Makefile
+++ b/net/olsrd/Makefile
@@ -2,16 +2,15 @@
 # $FreeBSD$
 
 PORTNAME=	olsrd
-DISTVERSION=	0.6.6.2
-PORTREVISION=	2
+DISTVERSION=	0.9.0.3
 CATEGORIES=	net
-MASTER_SITES=	http://www.olsr.org/releases/0.6/ \
-		http://ftp2.za.freebsd.org/pub/mesh/pc/protocols/olsr/
+MASTER_SITES=	http://www.olsr.org/releases/0.9/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	koue@chaosophia.net
 COMMENT=	OLSR routing daemon
 
-BUILD_DEPENDS=	makedepend:devel/makedepend
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/license.txt
 
 USES=		bison gmake tar:bzip2
 USE_LDCONFIG=	yes
@@ -26,11 +25,8 @@ MULTI_IF_DESC=	IPv4 multiple interface support
 MULTI_IF_LIB_DEPENDS=	libnet.so:net/libnet
 MULTI_IF_MAKE_ARGS=	LIBNET=1
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "amd64" || ${ARCH} == "ia64"
-CFLAGS+=	-fPIC
-.endif
+CFLAGS_ia64=	-fPIC
+CFLAGS_amd64=	-fPIC
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/sbin/ldconfig|:|g' ${WRKSRC}/make/Makefile.fbsd
@@ -39,4 +35,4 @@ post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/${PORTNAME}
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.*
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/olsrd/distinfo b/net/olsrd/distinfo
index 0750625daef6..9c5c4a3a8230 100644
--- a/net/olsrd/distinfo
+++ b/net/olsrd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (olsrd-0.6.6.2.tar.bz2) = f24b506b19ee8bb2296dbe67a0ce6170c0f4309d4e78a39dab5452376b9953fc
-SIZE (olsrd-0.6.6.2.tar.bz2) = 5414368
+SHA256 (olsrd-0.9.0.3.tar.bz2) = 1f038ed3ea72e4f73dfc9701de83de7313f5049161c8df17b9aaeba8e9711e92
+SIZE (olsrd-0.9.0.3.tar.bz2) = 5439699
diff --git a/net/olsrd/files/patch-Makefile b/net/olsrd/files/patch-Makefile
index 9d15d0318245..6f27dade7769 100644
--- a/net/olsrd/files/patch-Makefile
+++ b/net/olsrd/files/patch-Makefile
@@ -1,7 +1,7 @@
---- 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
+--- 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)
@@ -23,7 +23,7 @@
  		fi
  endif
  
-@@ -147,29 +147,26 @@
+@@ -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)
@@ -65,9 +65,9 @@
 +		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 @@
+ 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:
diff --git a/net/olsrd/files/patch-src_bsd_net.c b/net/olsrd/files/patch-src_bsd_net.c
new file mode 100644
index 000000000000..6911e1d43ada
--- /dev/null
+++ b/net/olsrd/files/patch-src_bsd_net.c
@@ -0,0 +1,11 @@
+--- src/bsd/net.c.orig	2016-06-22 12:04:33 UTC
++++ src/bsd/net.c
+@@ -125,6 +125,8 @@
+ 
+ #include <sys/sysctl.h>
+ 
++#include "olsr_random.h"
++
+ static int ignore_redir;
+ static int send_redir;
+ static int gateway;
diff --git a/net/olsrd/pkg-plist b/net/olsrd/pkg-plist
index 8eae42067eda..5d0efbf569b4 100644
--- a/net/olsrd/pkg-plist
+++ b/net/olsrd/pkg-plist
@@ -1,8 +1,7 @@
 sbin/olsrd
-etc/olsrd.conf.default.full
-etc/olsrd.conf.default.rfc
-etc/olsrd.conf.default.lq
-etc/olsrd.conf.default.lq-fisheye
+%%ETCDIR%%/olsrd.conf.default.full
+%%ETCDIR%%/olsrd.conf.default.rfc
+%%ETCDIR%%/olsrd.conf.default.lq
 lib/olsrd_dot_draw.so.0.3
 lib/olsrd_httpinfo.so.0.1
 lib/olsrd_jsoninfo.so.0.0