update to olsrd-0.6.0, adding two subpackages -gui and -plugins

general OK from MAINTAINER, after cleanup, OK from landry@ and sthen@

net/olsrd/Makefile

@@ -1,13 +1,18 @@
-# $OpenBSD: Makefile,v 1.7 2010/04/15 14:58:24 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.8 2010/06/14 12:36:34 sebastia Exp $
 
-COMMENT=	OLSR routing daemon
+COMMENT-main=		OLSR routing daemon
+COMMENT-gui=		OLSR routing daemon GUI
+COMMENT-plugins=	OLSR routing daemon plugins
 
-DISTNAME=	olsrd-0.5.6-r8
-PKGNAME=	${DISTNAME:S/-r/r/}p0
-CATEGORIES=     net
+VERSION=		0.6.0
+DISTNAME=		olsrd-${VERSION}
+PKGNAME-main=		olsrd-${VERSION}
+PKGNAME-gui=		olsrd-gui-${VERSION}
+PKGNAME-plugins=	olsrd-plugins-${VERSION}
+CATEGORIES=     	net
 
 HOMEPAGE=	http://www.olsr.org/
-MASTER_SITES=	http://www.olsr.org/releases/0.5/
+MASTER_SITES=	http://www.olsr.org/releases/0.6/
 
 MAINTAINER=	Martin Reindl <martin@openbsd.org>
 
@@ -16,16 +21,49 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=	c
+
+MULTI_PACKAGES= -main -gui -plugins
+WANTLIB-main=	c
+WANTLIB-gui += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
+WANTLIB-gui += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig
+WANTLIB-gui += freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0
+WANTLIB-gui += gthread-2.0 iconv intl m pango-1.0 pangocairo-1.0 pangoft2-1.0
+WANTLIB-gui += pixman-1 png pthread pthread-stubs xcb xcb-render xcb-render-util
+WANTLIB-gui += z
+LIB_DEPENDS-gui= gtk-x11-2.0.,gdk-x11-2.0.,gdk_pixbuf-2.0.::x11/gtk+2
+RUN_DEPENDS-plugins=	::net/olsrd
 
 USE_GMAKE=	Yes
-
 NO_REGRESS=	Yes
-
 BUILD_DEPENDS=	::devel/bison
 
+MODULES=	gcc3
+MODGCC3_ARCHES=	sparc
+
+
+ALL_TARGET= all libs
+pre-configure:
+	${SUBST_CMD} ${WRKSRC}/src/plugin_loader.c
+
+post-build:
+	@cd ${WRKSRC}/gui/linux-gtk; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
+
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/olsrd ${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/gui/linux-gtk/olsrd-gui ${PREFIX}/sbin
+	@mkdir -p ${PREFIX}/lib/olsrd-plugins
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/dot_draw/olsrd_dot_draw.so ${PREFIX}/lib/olsrd-plugins
+	${INSTALL_SCRIPT} ${WRKSRC}/lib/dot_draw/olsr-topology-view.pl ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/dyn_gw/olsrd_dyn_gw.so ${PREFIX}/lib/olsrd-plugins
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/dyn_gw_plain/olsrd_dyn_gw_plain.so ${PREFIX}/lib/olsrd-plugins
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/httpinfo/olsrd_httpinfo.so ${PREFIX}/lib/olsrd-plugins
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/mini/olsrd_mini.so ${PREFIX}/lib/olsrd-plugins
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/nameservice/olsrd_nameservice.so ${PREFIX}/lib/olsrd-plugins
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/pgraph/olsrd_pgraph.so ${PREFIX}/lib/olsrd-plugins
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/secure/olsrd_secure.so ${PREFIX}/lib/olsrd-plugins
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/txtinfo/olsrd_txtinfo.so ${PREFIX}/lib/olsrd-plugins
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/watchdog/olsrd_watchdog.so ${PREFIX}/lib/olsrd-plugins
 	@cd ${WRKSRC}/files  && ${GUNZIP_CMD} olsrd.conf.5.gz olsrd.8.gz
 	${INSTALL_MAN} ${WRKSRC}/files/olsrd.conf.5 ${PREFIX}/man/man5
 	${INSTALL_MAN} ${WRKSRC}/files/olsrd.8 ${PREFIX}/man/man8

net/olsrd/distinfo

@@ -1,5 +1,5 @@
-MD5 (olsrd-0.5.6-r8.tar.gz) = g4MQqtTXLTKsCnlur+c+7Q==
-RMD160 (olsrd-0.5.6-r8.tar.gz) = el2O4Q0lrsdlhiVsVUxglYoUtZ8=
-SHA1 (olsrd-0.5.6-r8.tar.gz) = HV5K2ZpRp2y+zK8diAAfRYSnxt8=
-SHA256 (olsrd-0.5.6-r8.tar.gz) = b0RdQWOrEIJztF/wBMKioGd9M6KQwYQqC0Pt7/aLZwk=
-SIZE (olsrd-0.5.6-r8.tar.gz) = 911824
+MD5 (olsrd-0.6.0.tar.gz) = hOkpVFfKtQU593YRiTmzQw==
+RMD160 (olsrd-0.6.0.tar.gz) = Afm2/ug+baxrXvW23wkWaD0jxw4=
+SHA1 (olsrd-0.6.0.tar.gz) = ggaEiEB83+LVOtWfYmkAOlFBihc=
+SHA256 (olsrd-0.6.0.tar.gz) = qKJNqwCVxz1SSD7bX+aLtbS7dj+bKnp7idz10nXTtEI=
+SIZE (olsrd-0.6.0.tar.gz) = 742138

net/olsrd/patches/patch-Makefile_inc

@@ -0,0 +1,12 @@
+$OpenBSD: patch-Makefile_inc,v 1.1 2010/06/14 12:36:34 sebastia Exp $
+--- Makefile.inc.orig	Sat Jun  5 18:44:09 2010
++++ Makefile.inc	Sat Jun  5 18:44:18 2010
+@@ -5,7 +5,7 @@
+ #
+ 
+ # activate debugging with 1 or deactivate with 0
+-DEBUG ?= 1
++DEBUG ?= 0
+ 
+ # compile OLSR_PRINTF out
+ NO_DEBUG_MESSAGES ?= 0

net/olsrd/patches/patch-make_Makefile_obsd

@@ -0,0 +1,24 @@
+$OpenBSD: patch-make_Makefile_obsd,v 1.1 2010/06/14 12:36:34 sebastia Exp $
+--- make/Makefile.obsd.orig	Wed Mar 31 19:03:53 2010
++++ make/Makefile.obsd	Sun Jun 13 13:42:51 2010
+@@ -3,7 +3,7 @@
+ #
+ 
+ DESTDIR ?=
+-LIBDIR =	$(DESTDIR)/usr/lib
++LIBDIR =	$(DESTDIR)/usr/lib/olsrd-plugins
+ 
+ SRCS +=		$(wildcard src/bsd/*.c src/unix/*.c)
+ HDRS +=		$(wildcard src/bsd/*.h src/unix/*.h)
+@@ -11,9 +11,8 @@ HDRS +=		$(wildcard src/bsd/*.h src/unix/*.h)
+ CPPFLAGS +=	-D__OpenBSD__
+ LIBS +=		
+ 
+-PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER)
+-INSTALL_LIB =	install -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME); \
+-		/sbin/ldconfig
++PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so
++INSTALL_LIB =	install -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME); 
+ 
+ ifdef OLSRD_PLUGIN
+ CFLAGS +=	-fPIC

net/olsrd/patches/patch-src_plugin_loader_c

@@ -0,0 +1,26 @@
+$OpenBSD: patch-src_plugin_loader_c,v 1.1 2010/06/14 12:36:34 sebastia Exp $
+the plugins get installed to $LOCALBASE/lib/olsrd-plugins, so load them from there.
+--- src/plugin_loader.c.orig	Tue Jun  1 09:42:27 2010
++++ src/plugin_loader.c	Tue Jun  1 09:43:13 2010
+@@ -87,20 +87,14 @@ olsr_load_plugins(void)
+ static int
+ olsr_load_dl(char *libname, struct plugin_param *params)
+ {
+-#if TESTLIB_PATH
+-  char path[256] = "/usr/testlib/";
+-#endif
++  char path[256] = "${LOCALBASE}/lib/olsrd-plugins/";
+   struct olsr_plugin *plugin = olsr_malloc(sizeof(struct olsr_plugin), "Plugin entry");
+   int rv;
+ 
+   OLSR_PRINTF(0, "---------- LOADING LIBRARY %s ----------\n", libname);
+ 
+-#if TESTLIB_PATH
+   strcat(path, libname);
+   plugin->dlhandle = dlopen(path, RTLD_NOW);
+-#else
+-  plugin->dlhandle = dlopen(libname, RTLD_NOW);
+-#endif
+   if (plugin->dlhandle == NULL) {
+     const int save_errno = errno;
+     OLSR_PRINTF(0, "DL loading failed: \"%s\"!\n", dlerror());

net/olsrd/pkg/DESCR-gui

@@ -0,0 +1,2 @@
+The olsr.org OLSR routing daemon GUI to monitor what is going
+on with the running olsrd.

net/olsrd/pkg/DESCR-plugins

@@ -0,0 +1,11 @@
+Plugins for the olsrd routing daemon:
+txtinfo: provides text status informations about the olsrd
+dyn_gw and dyn_gw_plain: automatically detects whether a uplink
+			is available and announces it in the net
+httpinfo: provides status information about the running olsrd 
+			in html format
+mini: minimal example plugin
+nameservice: this plugin distributes DNS via the network
+pgraph: allows any host to connect to the network
+secure: allows to use a shared secret in the network
+watchdog: a watchdog for the olsrd via extenal tools

net/olsrd/pkg/PFRAG.shared-plugins

@@ -0,0 +1,11 @@
+@comment $OpenBSD: PFRAG.shared-plugins,v 1.1 2010/06/14 12:36:34 sebastia Exp $
+lib/olsrd-plugins/olsrd_dot_draw.so
+lib/olsrd-plugins/olsrd_dyn_gw.so
+lib/olsrd-plugins/olsrd_dyn_gw_plain.so
+lib/olsrd-plugins/olsrd_httpinfo.so
+lib/olsrd-plugins/olsrd_mini.so
+lib/olsrd-plugins/olsrd_nameservice.so
+lib/olsrd-plugins/olsrd_pgraph.so
+lib/olsrd-plugins/olsrd_secure.so
+lib/olsrd-plugins/olsrd_txtinfo.so
+lib/olsrd-plugins/olsrd_watchdog.so

net/olsrd/pkg/PLIST-gui

@@ -0,0 +1,2 @@
+@comment $OpenBSD: PLIST-gui,v 1.1 2010/06/14 12:36:34 sebastia Exp $
+@bin sbin/olsrd-gui

net/olsrd/pkg/PLIST-main

@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.3 2008/09/04 08:52:29 martin Exp $
+@comment $OpenBSD: PLIST-main,v 1.1 2010/06/14 12:36:34 sebastia Exp $
+@pkgpath net/olsrd
 @man man/man5/olsrd.conf.5
 @man man/man8/olsrd.8
 @bin sbin/olsrd
@@ -8,6 +9,7 @@ share/doc/olsrd/README
 share/doc/olsrd/README-Link-Quality-Fish-Eye.txt
 share/doc/olsrd/README-Link-Quality.html
 share/examples/olsrd/
+share/examples/olsrd/olsrd.conf.default.full
 share/examples/olsrd/olsrd.conf.default.lq
 share/examples/olsrd/olsrd.conf.default.lq-fisheye
 share/examples/olsrd/olsrd.conf.default.rfc

net/olsrd/pkg/PLIST-plugins

@@ -0,0 +1,4 @@
+@comment $OpenBSD: PLIST-plugins,v 1.1 2010/06/14 12:36:34 sebastia Exp $
+%%SHARED%%
+bin/olsr-topology-view.pl
+lib/olsrd-plugins/