From owner-svn-ports-head@freebsd.org Thu Jun 23 16:31:59 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7A15AB73507; Thu, 23 Jun 2016 16:31:59 +0000 (UTC) (envelope-from pawel@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 398EE228F; Thu, 23 Jun 2016 16:31:59 +0000 (UTC) (envelope-from pawel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5NGVwBI037423; Thu, 23 Jun 2016 16:31:58 GMT (envelope-from pawel@FreeBSD.org) Received: (from pawel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5NGVwRW037418; Thu, 23 Jun 2016 16:31:58 GMT (envelope-from pawel@FreeBSD.org) Message-Id: <201606231631.u5NGVwRW037418@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pawel set sender to pawel@FreeBSD.org using -f From: Pawel Pekala Date: Thu, 23 Jun 2016 16:31:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r417386 - in head/net/olsrd: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Jun 2016 16:31:59 -0000 Author: pawel Date: Thu Jun 23 16:31:57 2016 New Revision: 417386 URL: https://svnweb.freebsd.org/changeset/ports/417386 Log: - 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 Added: head/net/olsrd/files/patch-src_bsd_net.c (contents, props changed) Modified: head/net/olsrd/Makefile head/net/olsrd/distinfo head/net/olsrd/files/patch-Makefile head/net/olsrd/pkg-plist Modified: head/net/olsrd/Makefile ============================================================================== --- head/net/olsrd/Makefile Thu Jun 23 16:27:32 2016 (r417385) +++ head/net/olsrd/Makefile Thu Jun 23 16:31:57 2016 (r417386) @@ -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 s MULTI_IF_LIB_DEPENDS= libnet.so:net/libnet MULTI_IF_MAKE_ARGS= LIBNET=1 -.include - -.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 +.include Modified: head/net/olsrd/distinfo ============================================================================== --- head/net/olsrd/distinfo Thu Jun 23 16:27:32 2016 (r417385) +++ head/net/olsrd/distinfo Thu Jun 23 16:31:57 2016 (r417386) @@ -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 Modified: head/net/olsrd/files/patch-Makefile ============================================================================== --- head/net/olsrd/files/patch-Makefile Thu Jun 23 16:27:32 2016 (r417385) +++ head/net/olsrd/files/patch-Makefile Thu Jun 23 16:31:57 2016 (r417386) @@ -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: Added: head/net/olsrd/files/patch-src_bsd_net.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/olsrd/files/patch-src_bsd_net.c Thu Jun 23 16:31:57 2016 (r417386) @@ -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 + ++#include "olsr_random.h" ++ + static int ignore_redir; + static int send_redir; + static int gateway; Modified: head/net/olsrd/pkg-plist ============================================================================== --- head/net/olsrd/pkg-plist Thu Jun 23 16:27:32 2016 (r417385) +++ head/net/olsrd/pkg-plist Thu Jun 23 16:31:57 2016 (r417386) @@ -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