3 files changed, 50 insertions, 11 deletions

diff --git a/net/olsrd/Makefile b/net/olsrd/Makefile
index 58982e50077a..77c55a63f496 100644
--- a/net/olsrd/Makefile
+++ b/net/olsrd/Makefile
@@ -17,10 +17,8 @@ BUILD_DEPENDS+=	libnet*>=1.1.2,1:${PORTSDIR}/net/libnet
 .endif
 
 USES=		bison gmake tar:bzip2
+USE_LDCONFIG=	yes
 USE_RC_SUBR=	olsrd
-MAN8=		olsrd.8
-MAN5=		olsrd.conf.5
-MANCOMPRESSED=	yes
 
 ALL_TARGET=	build_all
 INSTALL_TARGET=	install_all
@@ -31,8 +29,8 @@ MAKE_ARGS+=	LIBNET=1
 .if defined(PREFIX)
 MAKE_ARGS+=	PREFIX=${PREFIX}
 .endif
+MAKE_ARGS+=     STAGEDIR=${STAGEDIR}
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64" || ${ARCH} == "ia64"
@@ -47,6 +45,9 @@ pre-everything::
 	@${ECHO_MSG}	""
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|/sbin/ldconfig|:|g' ${WRKSRC}/make/Makefile.fbsd
+
 post-install:
 	@${ECHO_MSG}	""
 	@${ECHO_MSG}	" Set olsrd_enable=\"YES\" in /etc/rc.conf to enable"
diff --git a/net/olsrd/files/patch-Makefile b/net/olsrd/files/patch-Makefile
index 9ccf67da1706..1025f0350cc5 100644
--- a/net/olsrd/files/patch-Makefile
+++ b/net/olsrd/files/patch-Makefile
@@ -1,6 +1,19 @@
 --- Makefile.orig	2013-02-25 20:26:41.000000000 +0200
-+++ Makefile	2013-02-28 12:26:13.686994166 +0200
-@@ -130,20 +130,17 @@
++++ Makefile	2014-06-06 21:12:29.821585175 +0200
+@@ -119,9 +119,9 @@
+ uninstall: uninstall_olsrd
+ 
+ install_bin:
+-		mkdir -p $(SBINDIR)
+-		install -m 755 $(EXENAME) $(SBINDIR)
+-		$(STRIP) $(SBINDIR)/$(EXENAME)
++		mkdir -p ${STAGEDIR}$(SBINDIR)
++		install -m 755 $(EXENAME) ${STAGEDIR}$(SBINDIR)
++		$(STRIP) ${STAGEDIR}$(SBINDIR)/$(EXENAME)
+ 
+ uninstall_bin:
+ 		rm -f $(SBINDIR)/$(EXENAME)
+@@ -130,29 +130,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)
@@ -16,17 +29,40 @@
 +		@echo copy and edit one of these to $(CFGFILE)
 +		@echo If in doubt start with $(CFGFILE).default.lq
  		@echo ==========================================================
- 		mkdir -p $(ETCDIR)
+-		mkdir -p $(ETCDIR)
 -		$(MAKECMDPREFIX)if [ -e $(CFGFILE) ]; then \
 -			cp -f files/olsrd.conf.default.lq $(CFGFILE).new; \
 -			echo "Configuration file was saved as $(CFGFILE).new"; \
 -		else \
 -			cp -f files/olsrd.conf.default.lq $(CFGFILE); \
 -		fi
-+		-cp files/olsrd.conf.default.full $(CFGFILE).default.full
-+		-cp files/olsrd.conf.default.rfc $(CFGFILE).default.rfc
-+		-cp files/olsrd.conf.default.lq $(CFGFILE).default.lq
-+		-cp files/olsrd.conf.default.lq-fisheye $(CFGFILE).default.lq-fisheye
++		mkdir -p ${STAGEDIR}$(ETCDIR)
++		-cp files/olsrd.conf.default.full ${STAGEDIR}$(CFGFILE).default.full
++		-cp files/olsrd.conf.default.rfc ${STAGEDIR}$(CFGFILE).default.rfc
++		-cp files/olsrd.conf.default.lq ${STAGEDIR}$(CFGFILE).default.lq
++		-cp files/olsrd.conf.default.lq-fisheye ${STAGEDIR}$(CFGFILE).default.lq-fisheye
  		@echo -------------------------------------------
  		@echo Edit $(CFGFILE) before running olsrd!!
  		@echo -------------------------------------------
+ 		@echo Installing manpages $(EXENAME)\(8\) and $(CFGNAME)\(5\)
+ ifneq ($(MANDIR),)
+-		mkdir -p $(MANDIR)/man8/
+-		cp files/olsrd.8.gz $(MANDIR)/man8/$(EXENAME).8.gz
+-		mkdir -p $(MANDIR)/man5/
+-		cp files/olsrd.conf.5.gz $(MANDIR)/man5/$(CFGNAME).5.gz
++		mkdir -p ${STAGEDIR}$(MANDIR)/man8/
++		cp files/olsrd.8.gz ${STAGEDIR}$(MANDIR)/man8/$(EXENAME).8.gz
++		mkdir -p ${STAGEDIR}$(MANDIR)/man5/
++		cp files/olsrd.conf.5.gz ${STAGEDIR}$(MANDIR)/man5/$(CFGNAME).5.gz
+ endif
+ 
+ uninstall_olsrd:	uninstall_bin
+@@ -200,7 +197,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:
+-		$(MAKECMDPREFIX)set -e;for dir in $(SUBDIRS);do $(MAKECMD) -C lib/$$dir LIBDIR=$(LIBDIR) install;done
++		$(MAKECMDPREFIX)set -e;for dir in $(SUBDIRS);do $(MAKECMD) -C lib/$$dir LIBDIR=${STAGEDIR}$(LIBDIR) install;done
+ 
+ libs_uninstall uninstall_libs:
+ 		$(MAKECMDPREFIX)set -e;for dir in $(SUBDIRS);do $(MAKECMD) -C lib/$$dir LIBDIR=$(LIBDIR) uninstall;done
diff --git a/net/olsrd/pkg-plist b/net/olsrd/pkg-plist
index 13926823cf6d..6d80656d27fc 100644
--- a/net/olsrd/pkg-plist
+++ b/net/olsrd/pkg-plist
@@ -14,3 +14,5 @@ lib/olsrd_pgraph.so.1.1
 lib/olsrd_secure.so.0.6
 lib/olsrd_txtinfo.so.0.1
 lib/olsrd_watchdog.so.0.1
+man/man5/olsrd.conf.5.gz
+man/man8/olsrd.8.gz