Index: head/net/olsrd/Makefile =================================================================== --- head/net/olsrd/Makefile (revision 417385) +++ head/net/olsrd/Makefile (revision 417386) @@ -1,42 +1,38 @@ # Created by: dave@dogwood.com # $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 USE_RC_SUBR= olsrd ALL_TARGET= build_all INSTALL_TARGET= install_all OPTIONS_DEFINE= MULTI_IF MULTI_IF_DESC= IPv4 multiple interface support MULTI_IF_LIB_DEPENDS= libnet.so:net/libnet MULTI_IF_MAKE_ARGS= LIBNET=1 -.include +CFLAGS_ia64= -fPIC +CFLAGS_amd64= -fPIC -.if ${ARCH} == "amd64" || ${ARCH} == "ia64" -CFLAGS+= -fPIC -.endif - post-patch: @${REINPLACE_CMD} -e 's|/sbin/ldconfig|:|g' ${WRKSRC}/make/Makefile.fbsd post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/${PORTNAME} @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.* -.include +.include Index: head/net/olsrd/distinfo =================================================================== --- head/net/olsrd/distinfo (revision 417385) +++ head/net/olsrd/distinfo (revision 417386) @@ -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 Index: head/net/olsrd/files/patch-Makefile =================================================================== --- head/net/olsrd/files/patch-Makefile (revision 417385) +++ head/net/olsrd/files/patch-Makefile (revision 417386) @@ -1,78 +1,78 @@ ---- 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) - 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 @@ +@@ -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) - @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 @@ + 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: - $(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 Index: head/net/olsrd/files/patch-src_bsd_net.c =================================================================== --- head/net/olsrd/files/patch-src_bsd_net.c (nonexistent) +++ head/net/olsrd/files/patch-src_bsd_net.c (revision 417386) @@ -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; Property changes on: head/net/olsrd/files/patch-src_bsd_net.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/olsrd/pkg-plist =================================================================== --- head/net/olsrd/pkg-plist (revision 417385) +++ head/net/olsrd/pkg-plist (revision 417386) @@ -1,16 +1,15 @@ 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 lib/olsrd_mini.so.0.1 lib/olsrd_nameservice.so.0.3 lib/olsrd_pgraph.so.1.1 lib/olsrd_secure.so.0.6 lib/olsrd_txtinfo.so.0.1 lib/olsrd_watchdog.so.0.1 man/man5/olsrd.conf.5.gz man/man8/olsrd.8.gz