Index: head/net/olsrd/Makefile =================================================================== --- head/net/olsrd/Makefile (revision 402481) +++ head/net/olsrd/Makefile (revision 402482) @@ -1,48 +1,42 @@ # Created by: dave@dogwood.com # $FreeBSD$ PORTNAME= olsrd DISTVERSION= 0.6.6.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://www.olsr.org/releases/0.6/ \ http://ftp2.za.freebsd.org/pub/mesh/pc/protocols/olsr/ MAINTAINER= ports@FreeBSD.org COMMENT= OLSR routing daemon BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend USES= bison gmake tar:bzip2 USE_LDCONFIG= yes USE_RC_SUBR= olsrd ALL_TARGET= build_all INSTALL_TARGET= install_all OPTIONS_DEFINE= MULTI_IF MULTI_IF_DESC= IPv4 multiple interface support MULTI_IF_LIB_DEPENDS= libnet.so:${PORTSDIR}/net/libnet MULTI_IF_MAKE_ARGS= LIBNET=1 -.if defined(PREFIX) -MAKE_ARGS+= PREFIX=${PREFIX} -.endif -MAKE_ARGS+= STAGEDIR=${STAGEDIR} - .include .if ${ARCH} == "amd64" || ${ARCH} == "ia64" CFLAGS+= -fPIC .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" - @${ECHO_MSG} "" + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/${PORTNAME} + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.* .include Index: head/net/olsrd/files/patch-Makefile =================================================================== --- head/net/olsrd/files/patch-Makefile (revision 402481) +++ head/net/olsrd/files/patch-Makefile (revision 402482) @@ -1,78 +1,78 @@ --- Makefile.orig 2014-06-02 12:15:27.000000000 +0200 +++ Makefile 2014-06-07 21:42:39.688352979 +0200 @@ -128,15 +128,15 @@ 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) ++ mkdir -p ${DESTDIR}$(SBINDIR) ++ install -m 755 $(EXENAME) ${DESTDIR}$(SBINDIR) ++ $(STRIP) ${DESTDIR}$(SBINDIR)/$(EXENAME) ifeq ($(SGW_SUPPORT),1) - $(MAKECMDPREFIX)if [ -e $(SBINDIR)/$(SGW_POLICY_SCRIPT) ]; then \ - cp -f files/$(SGW_POLICY_SCRIPT) $(SBINDIR)/$(SGW_POLICY_SCRIPT).new; \ - echo "Policy routing script was saved as $(SBINDIR)/$(SGW_POLICY_SCRIPT).new"; \ -+ $(MAKECMDPREFIX)if [ -e ${STAGEDIR}$(SBINDIR)/$(SGW_POLICY_SCRIPT) ]; then \ -+ cp -f files/$(SGW_POLICY_SCRIPT) ${STAGEDIR}$(SBINDIR)/$(SGW_POLICY_SCRIPT).new; \ -+ echo "Policy routing script was saved as ${STAGEDIR}$(SBINDIR)/$(SGW_POLICY_SCRIPT).new"; \ ++ $(MAKECMDPREFIX)if [ -e ${DESTDIR}$(SBINDIR)/$(SGW_POLICY_SCRIPT) ]; then \ ++ cp -f files/$(SGW_POLICY_SCRIPT) ${DESTDIR}$(SBINDIR)/$(SGW_POLICY_SCRIPT).new; \ ++ echo "Policy routing script was saved as ${DESTDIR}$(SBINDIR)/$(SGW_POLICY_SCRIPT).new"; \ else \ - cp -f files/$(SGW_POLICY_SCRIPT) $(SBINDIR)/$(SGW_POLICY_SCRIPT); \ -+ cp -f files/$(SGW_POLICY_SCRIPT) ${STAGEDIR}$(SBINDIR)/$(SGW_POLICY_SCRIPT); \ ++ cp -f files/$(SGW_POLICY_SCRIPT) ${DESTDIR}$(SBINDIR)/$(SGW_POLICY_SCRIPT); \ fi endif @@ -147,29 +147,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) - @echo a default configfile. A sample RFC-compliance aimed - @echo configfile can be found in olsrd.conf.default.rfc. - @echo However none of the larger OLSRD using networks use that - @echo so install a configfile with activated link quality exstensions - @echo per default. - @echo can be found at files/olsrd.conf.default.lq + @echo a default configfile. Sample config files are installed + @echo as $(CFGFILE).default.full, $(CFGFILE).default.rfc, + @echo $(CFGFILE).default.lq and $(CFGFILE).default.lq-fisheye + @echo copy and edit one of these to $(CFGFILE) + @echo If in doubt start with $(CFGFILE).default.lq @echo ========================================================== - 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 -+ 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 ++ mkdir -p ${DESTDIR}$(ETCDIR) ++ -cp files/olsrd.conf.default.full ${DESTDIR}$(CFGFILE).default.full ++ -cp files/olsrd.conf.default.rfc ${DESTDIR}$(CFGFILE).default.rfc ++ -cp files/olsrd.conf.default.lq ${DESTDIR}$(CFGFILE).default.lq ++ -cp files/olsrd.conf.default.lq-fisheye ${DESTDIR}$(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 ++ mkdir -p ${DESTDIR}$(MANDIR)/man8/ ++ cp files/olsrd.8.gz ${DESTDIR}$(MANDIR)/man8/$(EXENAME).8.gz ++ mkdir -p ${DESTDIR}$(MANDIR)/man5/ ++ cp files/olsrd.conf.5.gz ${DESTDIR}$(MANDIR)/man5/$(CFGNAME).5.gz endif uninstall_olsrd: uninstall_bin @@ -217,7 +214,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 ++ $(MAKECMDPREFIX)set -e;for dir in $(SUBDIRS);do $(MAKECMD) -C lib/$$dir LIBDIR=${DESTDIR}$(LIBDIR) install;done libs_uninstall uninstall_libs: $(MAKECMDPREFIX)set -e;for dir in $(SUBDIRS);do $(MAKECMD) -C lib/$$dir LIBDIR=$(LIBDIR) uninstall;done Index: head/net/olsrd/pkg-message =================================================================== --- head/net/olsrd/pkg-message (nonexistent) +++ head/net/olsrd/pkg-message (revision 402482) @@ -0,0 +1,3 @@ + +Set olsrd_enable="YES" in /etc/rc.conf to enable + Property changes on: head/net/olsrd/pkg-message ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property