From a13e234b930929d67cc402485d3421dde2954f44 Mon Sep 17 00:00:00 2001
From: martin <martin@openbsd.org>
Date: Thu, 4 Sep 2008 08:52:29 +0000
Subject: [PATCH] - update to 0.5.6 - take over maintainership

help and ok sthen@
---
 net/olsrd/Makefile                            | 10 ++++++----
 net/olsrd/distinfo                            | 10 +++++-----
 .../patches/patch-src_cfgparser_Makefile      | 19 +++++++++++--------
 net/olsrd/pkg/PLIST                           |  4 ++--
 4 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/net/olsrd/Makefile b/net/olsrd/Makefile
index 913a1ee85dc..403c809707d 100644
--- a/net/olsrd/Makefile
+++ b/net/olsrd/Makefile
@@ -1,14 +1,14 @@
-# $OpenBSD: Makefile,v 1.3 2007/09/15 22:36:56 merdely Exp $
+# $OpenBSD: Makefile,v 1.4 2008/09/04 08:52:29 martin Exp $
 
 COMMENT=	OLSR routing daemon
 
-DISTNAME=	olsrd-0.4.10
+DISTNAME=	olsrd-0.5.6
 CATEGORIES=     net
 
 HOMEPAGE=	http://www.olsr.org/
-MASTER_SITES=	http://www.olsr.org/releases/0.4/
+MASTER_SITES=	http://www.olsr.org/releases/0.5/
 
-MAINTAINER=	Holger Mauermann <holger@mauermann.org>
+MAINTAINER=	Martin Reindl <martin@openbsd.org>
 
 # BSD
 PERMIT_PACKAGE_CDROM=	Yes
@@ -21,6 +21,8 @@ USE_GMAKE=	Yes
 
 NO_REGRESS=	Yes
 
+BUILD_DEPENDS=	::devel/bison
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/olsrd ${PREFIX}/sbin
 	@cd ${WRKSRC}/files  && ${GUNZIP_CMD} olsrd.conf.5.gz olsrd.8.gz
diff --git a/net/olsrd/distinfo b/net/olsrd/distinfo
index bce69b12027..8e118ead3d6 100644
--- a/net/olsrd/distinfo
+++ b/net/olsrd/distinfo
@@ -1,5 +1,5 @@
-MD5 (olsrd-0.4.10.tar.gz) = y2MTZJ0ZsF5djV6vhmu5jQ==
-RMD160 (olsrd-0.4.10.tar.gz) = AkFVqiSWCEs2ljodwygqm86gA+M=
-SHA1 (olsrd-0.4.10.tar.gz) = 8nI/0oO8pPJLoDUQ/5uN8Ns79J8=
-SHA256 (olsrd-0.4.10.tar.gz) = U/pSv4ii/BLjRZuCbx+uVu0rOJ62o+RldT8rtUeSbkQ=
-SIZE (olsrd-0.4.10.tar.gz) = 596097
+MD5 (olsrd-0.5.6.tar.gz) = CLKzGv2V0cx2L+IA4fy60g==
+RMD160 (olsrd-0.5.6.tar.gz) = ufdEp4oT/sJiVbxLn5Sj+wZ41XQ=
+SHA1 (olsrd-0.5.6.tar.gz) = 5iCbld6pehwF+o1y4TYcVZF5/dA=
+SHA256 (olsrd-0.5.6.tar.gz) = rxr5qeLTIihqtA5MQHJMEYXjb4hyxxJER0mQd7UZqkA=
+SIZE (olsrd-0.5.6.tar.gz) = 649878
diff --git a/net/olsrd/patches/patch-src_cfgparser_Makefile b/net/olsrd/patches/patch-src_cfgparser_Makefile
index f86f9009157..9035699760a 100644
--- a/net/olsrd/patches/patch-src_cfgparser_Makefile
+++ b/net/olsrd/patches/patch-src_cfgparser_Makefile
@@ -1,16 +1,19 @@
-$OpenBSD: patch-src_cfgparser_Makefile,v 1.3 2006/02/14 23:48:10 pvalchev Exp $
---- src/cfgparser/Makefile.orig	Tue Feb 14 16:21:49 2006
-+++ src/cfgparser/Makefile	Tue Feb 14 16:23:10 2006
-@@ -71,10 +71,10 @@ else 
+$OpenBSD: patch-src_cfgparser_Makefile,v 1.4 2008/09/04 08:52:29 martin Exp $
+--- src/cfgparser/Makefile.orig	Wed Aug 27 12:54:24 2008
++++ src/cfgparser/Makefile	Wed Aug 27 12:56:52 2008
+@@ -71,13 +71,14 @@ else 
  ifeq (${OS}, osx)
- LDFLAGS += -dynamiclib -single_module
+ LDFLAGS +=	-dynamiclib -single_module
  else
 -LDFLAGS +=	-shared -Wl,-soname,$(LIBNAME)
 +LDFLAGS +=	-shared -fPIC -Wl,-soname,$(LIBNAME)
  endif
  
--CFLAGS +=	-DMAKELIB
-+CFLAGS +=	-DMAKELIB -fPIC
+ ifeq (${OS}, win32)
+ LDFLAGS +=	-Wl,--out-implib=libolsrd_cfgparser.a -Wl,--export-all-symbols
+ endif
+ 
++CFLAGS +=	-fPIC
+ CPPFLAGS +=	-DMAKELIB
  NAME =		$(LIBNAME)
  
- endif
diff --git a/net/olsrd/pkg/PLIST b/net/olsrd/pkg/PLIST
index 2e7d487d1a7..aa7b9bec21d 100644
--- a/net/olsrd/pkg/PLIST
+++ b/net/olsrd/pkg/PLIST
@@ -1,7 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.2 2006/01/21 11:34:04 alek Exp $
+@comment $OpenBSD: PLIST,v 1.3 2008/09/04 08:52:29 martin Exp $
 @man man/man5/olsrd.conf.5
 @man man/man8/olsrd.8
-sbin/olsrd
+@bin sbin/olsrd
 share/doc/olsrd/
 share/doc/olsrd/CHANGELOG
 share/doc/olsrd/README