svn commit: r320555 - in head/net/olsrd: . files

[John Hay]

Author: jhay
Date: Tue Jun 11 12:45:15 2013
New Revision: 320555
URL: http://svnweb.freebsd.org/changeset/ports/320555

Log:
  Update to 0.6.5.2

Modified:
  head/net/olsrd/Makefile   (contents, props changed)
  head/net/olsrd/distinfo   (contents, props changed)
  head/net/olsrd/files/patch-Makefile   (contents, props changed)

Modified: head/net/olsrd/Makefile
==============================================================================
--- head/net/olsrd/Makefile	Tue Jun 11 12:27:28 2013	(r320554)
+++ head/net/olsrd/Makefile	Tue Jun 11 12:45:15 2013	(r320555)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	olsrd
-DISTVERSION=	0.6.3
+DISTVERSION=	0.6.5.2
 CATEGORIES=	net
 MASTER_SITES=	http://www.olsr.org/releases/0.6/ \
 		http://ftp2.za.freebsd.org/pub/mesh/pc/protocols/olsr/

Modified: head/net/olsrd/distinfo
==============================================================================
--- head/net/olsrd/distinfo	Tue Jun 11 12:27:28 2013	(r320554)
+++ head/net/olsrd/distinfo	Tue Jun 11 12:45:15 2013	(r320555)
@@ -1,2 +1,2 @@
-SHA256 (olsrd-0.6.3.tar.bz2) = ef31bb604859737437019e282650b8292515b7a4789b432aae6c42393ab7b9ca
-SIZE (olsrd-0.6.3.tar.bz2) = 5447995
+SHA256 (olsrd-0.6.5.2.tar.bz2) = 754b727341b4e0ac370bfbd3a8def502425610a1482a34a8462bf5ba2e6cdc3f
+SIZE (olsrd-0.6.5.2.tar.bz2) = 5400271

Modified: head/net/olsrd/files/patch-Makefile
==============================================================================
--- head/net/olsrd/files/patch-Makefile	Tue Jun 11 12:27:28 2013	(r320554)
+++ head/net/olsrd/files/patch-Makefile	Tue Jun 11 12:45:15 2013	(r320555)
@@ -1,6 +1,6 @@
---- Makefile.orig	2010-05-13 12:52:55.000000000 +0200
-+++ Makefile	2010-05-16 15:51:06.904944901 +0200
-@@ -109,15 +109,16 @@
+--- Makefile.orig	2013-02-25 20:26:41.000000000 +0200
++++ Makefile	2013-02-28 12:26:13.686994166 +0200
+@@ -130,20 +130,17 @@
  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)
@@ -14,9 +14,15 @@
 +		@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)
--		-cp -i files/olsrd.conf.default.lq $(CFGFILE)
+-		$(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
 +		-cp files/olsrd.conf.default.full $(CFGFILE).default.full
 +		-cp files/olsrd.conf.default.rfc $(CFGFILE).default.rfc
 +		-cp files/olsrd.conf.default.lq $(CFGFILE).default.lq