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

[John Hay]

Author: jhay
Date: Sun Jun  8 07:07:45 2014
New Revision: 356984
URL: http://svnweb.freebsd.org/changeset/ports/356984
QAT: https://qat.redports.org/buildarchive/r356984/

Log:
  Update to 0.6.6.2.

Modified:
  head/net/olsrd/Makefile
  head/net/olsrd/distinfo
  head/net/olsrd/files/patch-Makefile

Modified: head/net/olsrd/Makefile
==============================================================================
--- head/net/olsrd/Makefile	Sun Jun  8 07:02:48 2014	(r356983)
+++ head/net/olsrd/Makefile	Sun Jun  8 07:07:45 2014	(r356984)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	olsrd
-DISTVERSION=	0.6.5.2
+DISTVERSION=	0.6.6.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	Sun Jun  8 07:02:48 2014	(r356983)
+++ head/net/olsrd/distinfo	Sun Jun  8 07:07:45 2014	(r356984)
@@ -1,2 +1,2 @@
-SHA256 (olsrd-0.6.5.2.tar.bz2) = 754b727341b4e0ac370bfbd3a8def502425610a1482a34a8462bf5ba2e6cdc3f
-SIZE (olsrd-0.6.5.2.tar.bz2) = 5400271
+SHA256 (olsrd-0.6.6.2.tar.bz2) = f24b506b19ee8bb2296dbe67a0ce6170c0f4309d4e78a39dab5452376b9953fc
+SIZE (olsrd-0.6.6.2.tar.bz2) = 5414368

Modified: head/net/olsrd/files/patch-Makefile
==============================================================================
--- head/net/olsrd/files/patch-Makefile	Sun Jun  8 07:02:48 2014	(r356983)
+++ head/net/olsrd/files/patch-Makefile	Sun Jun  8 07:07:45 2014	(r356984)
@@ -1,6 +1,6 @@
---- Makefile.orig	2013-02-25 20:26:41.000000000 +0200
-+++ Makefile	2014-06-06 21:12:29.821585175 +0200
-@@ -119,9 +119,9 @@
+--- 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:
@@ -10,10 +10,20 @@
 +		mkdir -p ${STAGEDIR}$(SBINDIR)
 +		install -m 755 $(EXENAME) ${STAGEDIR}$(SBINDIR)
 +		$(STRIP) ${STAGEDIR}$(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 ${STAGEDIR}$(SBINDIR)/$(SGW_POLICY_SCRIPT) ]; then \
++			cp -f files/$(SGW_POLICY_SCRIPT) ${STAGEDIR}$(SBINDIR)/$(SGW_POLICY_SCRIPT).new; \
++			echo "Policy routing script was saved as ${STAGEDIR}$(SBINDIR)/$(SGW_POLICY_SCRIPT).new"; \
+ 		else \
+-			cp -f files/$(SGW_POLICY_SCRIPT) $(SBINDIR)/$(SGW_POLICY_SCRIPT); \
++			cp -f files/$(SGW_POLICY_SCRIPT) ${STAGEDIR}$(SBINDIR)/$(SGW_POLICY_SCRIPT); \
+ 		fi
+ endif
  
- uninstall_bin:
- 		rm -f $(SBINDIR)/$(EXENAME)
-@@ -130,29 +130,26 @@
+@@ -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)
@@ -57,7 +67,7 @@
  endif
  
  uninstall_olsrd:	uninstall_bin
-@@ -200,7 +197,7 @@
+@@ -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: