From 3f5e6367a0c849f7ce94bc89f4755db9569bb121 Mon Sep 17 00:00:00 2001
From: jhay <jhay@FreeBSD.org>
Date: Wed, 24 Oct 2007 15:51:10 +0000
Subject: Update to olsrd 0.5.4. This unbreaks it for gcc 4.2.

Approved by:	maintainer (dave@dogwood.com)
---
 net/olsrd/Makefile             | 13 +++++--------
 net/olsrd/distinfo             |  6 +++---
 net/olsrd/files/patch-Makefile | 12 ++++++------
 net/olsrd/pkg-plist            |  7 +++++--
 4 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'net/olsrd')

diff --git a/net/olsrd/Makefile b/net/olsrd/Makefile
index 43a61aa71d73..e26c75bb8a24 100644
--- a/net/olsrd/Makefile
+++ b/net/olsrd/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	olsrd
-PORTVERSION=	0.4.10
-PORTREVISION=	1
+PORTVERSION=	0.5.4
 CATEGORIES=	net
-MASTER_SITES=	http://www.olsr.org/releases/0.4/
+MASTER_SITES=	http://www.olsr.org/releases/0.5/ \
+		http://bernd.petrovitsch.priv.at/olsr-ng/
 
 MAINTAINER=	dave@dogwood.com
 COMMENT=	OLSR routing daemon
@@ -20,6 +20,7 @@ BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend
 BUILD_DEPENDS+=	libnet*>=1.1.2,1:${PORTSDIR}/net/libnet
 .endif
 
+USE_BZIP2=	yes
 USE_BISON=	build
 USE_GMAKE=	yes
 
@@ -35,15 +36,11 @@ INSTALL_TARGET=	install_all
 MAKE_ARGS+=	LIBNET=1
 .endif
 .if defined(PREFIX)
-MAKE_ARGS+=	INSTALL_PREFIX=${PREFIX}
+MAKE_ARGS+=	PREFIX=${PREFIX}
 .endif
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 700042
-BROKEN=		Does not compile with GCC 4.2
-.endif
-
 .if ${ARCH} == "amd64" || ${ARCH} == "ia64"
 CFLAGS+=	-fPIC
 .endif
diff --git a/net/olsrd/distinfo b/net/olsrd/distinfo
index aaf0465833ce..dc9344db8722 100644
--- a/net/olsrd/distinfo
+++ b/net/olsrd/distinfo
@@ -1,3 +1,3 @@
-MD5 (olsrd-0.4.10.tar.gz) = cb6313649d19b05e5d8d5eaf866bb98d
-SHA256 (olsrd-0.4.10.tar.gz) = 53fa52bf88a2fc12e3459b826f1fae56ed2b389eb6a3e465753f2bb547926e44
-SIZE (olsrd-0.4.10.tar.gz) = 596097
+MD5 (olsrd-0.5.4.tar.bz2) = 471d0d268fae388d18f925ea9dfe0150
+SHA256 (olsrd-0.5.4.tar.bz2) = 9a4215d52178bdd112739e3c8b46b6c72d2b63a16bad0f2bcdd9bb0d1965f34f
+SIZE (olsrd-0.5.4.tar.gz) = 495872
diff --git a/net/olsrd/files/patch-Makefile b/net/olsrd/files/patch-Makefile
index 2cc0b83fb98d..68a6defcff5b 100644
--- a/net/olsrd/files/patch-Makefile
+++ b/net/olsrd/files/patch-Makefile
@@ -1,22 +1,22 @@
---- Makefile.orig	Tue Jan  3 22:45:38 2006
-+++ Makefile	Tue Mar  7 19:25:12 2006
-@@ -90,13 +90,13 @@
- 
+--- Makefile.orig	2007-10-20 13:27:59.000000000 +0200
++++ Makefile	2007-10-20 18:58:02.000000000 +0200
+@@ -107,12 +107,14 @@
  install_olsrd:	install_bin
  		@echo ========= C O N F I G U R A T I O N - F I L E ============
--		@echo olsrd uses the configfile $(INSTALL_PREFIX)/etc/olsr.conf
+ 		@echo $(EXENAME) uses the configfile $(CFGFILE)
 -		@echo a default configfile. A sample RFC-compliance aimed
 -		@echo configfile can be installed. Note that a LQ-based configfile
 -		@echo can be found at files/olsrd.conf.default.lq
-+		@echo olsrd uses the configfile $(CFGFILE)
 +		@echo an RFC compliant version is installed as $(CFGFILE).rfc
 +		@echo an LQ version is installed as $(CFGFILE).lq
++		@echo an LQ fisheye version is installed as $(CFGFILE).lq-fisheye
 +		@echo copy and edit one of these to $(CFGFILE)
  		@echo ==========================================================
 -		mkdir -p $(ETCDIR)
 -		-cp -i files/olsrd.conf.default.rfc $(CFGFILE)
 +		-cp files/olsrd.conf.default.rfc $(CFGFILE).rfc
 +		-cp files/olsrd.conf.default.lq $(CFGFILE).lq
++		-cp files/olsrd.conf.default.lq-fisheye $(CFGFILE).lq-fisheye
  		@echo -------------------------------------------
  		@echo Edit $(CFGFILE) before running olsrd!!
  		@echo -------------------------------------------
diff --git a/net/olsrd/pkg-plist b/net/olsrd/pkg-plist
index ea7fec2feca7..85391c3e84f4 100644
--- a/net/olsrd/pkg-plist
+++ b/net/olsrd/pkg-plist
@@ -1,10 +1,13 @@
 sbin/olsrd
 etc/olsrd.conf.rfc
 etc/olsrd.conf.lq
+etc/olsrd.conf.lq-fisheye
 lib/olsrd_dot_draw.so.0.3
 lib/olsrd_dyn_gw.so.0.4
+lib/olsrd_dyn_gw_plain.so.0.4
 lib/olsrd_httpinfo.so.0.1
 lib/olsrd_mini.so.0.1
-lib/olsrd_nameservice.so.0.2
-lib/olsrd_power.so.0.3
+lib/olsrd_nameservice.so.0.3
+lib/olsrd_pgraph.so.1.1
 lib/olsrd_secure.so.0.5
+lib/olsrd_txtinfo.so.0.1
-- 
cgit