From owner-svn-ports-head@freebsd.org Fri Nov 27 11:26:27 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id ED8EEA39FF0; Fri, 27 Nov 2015 11:26:26 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AA4EA1E93; Fri, 27 Nov 2015 11:26:26 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tARBQPiI001059; Fri, 27 Nov 2015 11:26:25 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tARBQP5D001056; Fri, 27 Nov 2015 11:26:25 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201511271126.tARBQP5D001056@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Fri, 27 Nov 2015 11:26:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r402482 - in head/net/olsrd: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Nov 2015 11:26:27 -0000 Author: amdmi3 Date: Fri Nov 27 11:26:25 2015 New Revision: 402482 URL: https://svnweb.freebsd.org/changeset/ports/402482 Log: - Remove unneeded MAKE_ARGS - Fix makefile patch to use DESTDIR instead of STAGEDIR - Strip libraries - Move message to pkg-message Added: head/net/olsrd/pkg-message (contents, props changed) Modified: head/net/olsrd/Makefile head/net/olsrd/files/patch-Makefile Modified: head/net/olsrd/Makefile ============================================================================== --- head/net/olsrd/Makefile Fri Nov 27 11:26:12 2015 (r402481) +++ head/net/olsrd/Makefile Fri Nov 27 11:26:25 2015 (r402482) @@ -3,7 +3,7 @@ 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/ @@ -26,11 +26,6 @@ MULTI_IF_DESC= IPv4 multiple interface s 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" @@ -41,8 +36,7 @@ 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 Modified: head/net/olsrd/files/patch-Makefile ============================================================================== --- head/net/olsrd/files/patch-Makefile Fri Nov 27 11:26:12 2015 (r402481) +++ head/net/olsrd/files/patch-Makefile Fri Nov 27 11:26:25 2015 (r402482) @@ -7,19 +7,19 @@ - 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 @@ -46,11 +46,11 @@ - 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 ------------------------------------------- @@ -60,10 +60,10 @@ - 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 @@ -72,7 +72,7 @@ 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 Added: head/net/olsrd/pkg-message ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/olsrd/pkg-message Fri Nov 27 11:26:25 2015 (r402482) @@ -0,0 +1,3 @@ + +Set olsrd_enable="YES" in /etc/rc.conf to enable +