Hello Holger, is there a specific reason why the olsrd port does not build and install plugins that are provided along with the olsrd source distribution?
The only plugin that does not compile is the 'tas' plugin.
It prints a message saying it will only build on Linux, that's all.
It does not break the build.
I need the httpinfo plugin, and it works just fine.
I've not tested any other plugins but they compile fine.
The patch below updates the port to include all plugins
except the 'tas' one.
I've also removed an @ from a command in do-install to make it
visible which imho is useful in case it errors out.
Not sure why the @ was there in the first place. Is there
a particular policy about that?
diff -urN olsrd.orig/Makefile olsrd/Makefile
--- olsrd.orig/Makefile Fri May 11 14:42:46 2007
+++ olsrd/Makefile Fri May 11 15:11:23 2007
@@ -3,6 +3,7 @@
COMMENT= "OLSR routing daemon"
DISTNAME= olsrd-0.4.10
+PKGNAME= ${DISTNAME}p0
CATEGORIES= net
HOMEPAGE= http://www.olsr.org/
@@ -21,6 +22,11 @@
NO_REGRESS= Yes
+# Build plugins as well as the olsrd daemon.
+# Note that the 'tas' plugin will not be built as it's Linux-only.
+ALL_TARGET= build_all
+MAKE_ENV+= "LIBDIR=${PREFIX}/lib"
+
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/olsrd ${PREFIX}/sbin
@cd ${WRKSRC}/files && ${GUNZIP_CMD} olsrd.conf.5.gz olsrd.8.gz
@@ -30,8 +36,17 @@
${INSTALL_DATA} ${WRKSRC}/files/olsrd.conf.default.* \
${PREFIX}/share/examples/olsrd
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/olsrd
- @for i in CHANGELOG README README-Link-Quality*; do \
+ for i in CHANGELOG README README-Link-Quality*; do \
${INSTALL_DATA} ${WRKSRC}/$$i ${PREFIX}/share/doc/olsrd; \
done
+ for l in dot_draw/olsrd_dot_draw.so.0.3 \
+ dyn_gw/olsrd_dyn_gw.so.0.4 \
+ httpinfo/olsrd_httpinfo.so.0.1 \
+ mini/olsrd_mini.so.0.1 \
+ nameservice/olsrd_nameservice.so.0.2 \
+ powerinfo/olsrd_power.so.0.3 \
+ secure/olsrd_secure.so.0.5; do \
+ ${INSTALL_PROGRAM} ${WRKSRC}/lib/$$l ${PREFIX}/lib; \
+ done
.include <bsd.port.mk>
diff -urN olsrd.orig/pkg/PLIST olsrd/pkg/PLIST
--- olsrd.orig/pkg/PLIST Fri May 11 14:42:46 2007
+++ olsrd/pkg/PLIST Fri May 11 15:02:13 2007
@@ -11,4 +11,11 @@
share/examples/olsrd/olsrd.conf.default.lq
share/examples/olsrd/olsrd.conf.default.lq-fisheye
share/examples/olsrd/olsrd.conf.default.rfc
+lib/olsrd_dot_draw.so.0.3
+lib/olsrd_dyn_gw.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_secure.so.0.5
@sample ${SYSCONFDIR}/olsrd.conf
--
stefan
http://stsp.name PGP Key: 0xF59D25F0
pgp9uLf2xDOLy.pgp
Description: PGP signature
