From owner-svn-ports-all@FreeBSD.ORG Tue Jun 17 22:57:41 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D273FCF; Tue, 17 Jun 2014 22:57:41 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 B2F82286A; Tue, 17 Jun 2014 22:57:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5HMvfI5053231; Tue, 17 Jun 2014 22:57:41 GMT (envelope-from feld@svn.freebsd.org) Received: (from feld@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5HMvfaT053230; Tue, 17 Jun 2014 22:57:41 GMT (envelope-from feld@svn.freebsd.org) Message-Id: <201406172257.s5HMvfaT053230@svn.freebsd.org> From: Mark Felder Date: Tue, 17 Jun 2014 22:57:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r358191 - head/net/vnstat X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Jun 2014 22:57:42 -0000 Author: feld Date: Tue Jun 17 22:57:41 2014 New Revision: 358191 URL: http://svnweb.freebsd.org/changeset/ports/358191 QAT: https://qat.redports.org/buildarchive/r358191/ Log: Take maintainership Support STAGE Modified: head/net/vnstat/Makefile Modified: head/net/vnstat/Makefile ============================================================================== --- head/net/vnstat/Makefile Tue Jun 17 22:19:39 2014 (r358190) +++ head/net/vnstat/Makefile Tue Jun 17 22:57:41 2014 (r358191) @@ -8,7 +8,7 @@ CATEGORIES= net MASTER_SITES= http://humdi.net/vnstat/ \ http://mirror.mcx2.org/ -MAINTAINER= dhn@FreeBSD.org +MAINTAINER= feld@FreeBSD.org COMMENT= A console-based network traffic monitor MAKE_ARGS= CC="${CC}" CFLAGS="-I${LOCALBASE}/include" \ @@ -20,9 +20,6 @@ USE_RC_SUBR= vnstat USERS= vnstat GROUPS= vnstat -MAN1= vnstat.1 vnstatd.1 -MAN5= vnstat.conf.5 -MANCOMPRESSED= yes PORTDOCS= README INSTALL_BSD UPGRADE vnstat-cron SUB_FILES= pkg-message SUB_LIST= USERS=${USERS} \ @@ -33,18 +30,11 @@ OPTIONS_DEFINE= GUI DOCS OPTIONS_DEFAULT= GUI GUI_DESC= Build with graphics/gd dependency -NO_STAGE= yes .include -PLIST_FILES= bin/vnstat \ - sbin/vnstatd \ - %%GUI%%bin/vnstati \ - etc/vnstat.conf.sample - .if ${PORT_OPTIONS:MGUI} -LIB_DEPENDS+= gd:${PORTSDIR}/graphics/gd +LIB_DEPENDS+= libgd.so:${PORTSDIR}/graphics/gd PLIST_SUB+= GUI="" -MAN1+= vnstati.1 .else ALL_TARGET="vnstat" PLIST_SUB+= GUI="@comment " @@ -52,23 +42,30 @@ PLIST_SUB+= GUI="@comment " post-extract: @cd ${WRKSRC} && ${CP} examples/vnstat.cron vnstat-cron - @cd ${WRKSRC} && ${CP} cfg/vnstat.conf cfg/vnstat.conf.sample @${REINPLACE_CMD} -e 's|/usr/bin|/usr/local/bin|g' \ -e 's|ls /var/lib|ls -l /var/db|g' ${WRKSRC}/vnstat-cron post-patch: - @${REINPLACE_CMD} -e 's|$$(DESTDIR)|${PREFIX}|g' \ - -e 's|cfg/vnstat.conf|cfg/vnstat.conf.sample|g' \ - -e 's|etc/vnstat.conf|etc/vnstat.conf.sample|g' \ - -e 's|install -D|install|g' ${WRKSRC}/Makefile @${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' \ ${WRKSRC}/src/cfg.c +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/src/vnstat ${STAGEDIR}/${PREFIX}/bin/vnstat + ${INSTALL_PROGRAM} ${WRKSRC}/src/vnstatd ${STAGEDIR}/${PREFIX}/sbin/vnstatd + ${INSTALL_DATA} ${WRKSRC}/cfg/vnstat.conf ${STAGEDIR}/${PREFIX}/etc/vnstat.conf.sample + ${INSTALL_MAN} ${WRKSRC}/man/vnstat.1 ${STAGEDIR}/${MANPREFIX}/man/man1/vnstat.1 + ${INSTALL_MAN} ${WRKSRC}/man/vnstatd.1 ${STAGEDIR}/${MANPREFIX}/man/man1/vnstatd.1 + ${INSTALL_MAN} ${WRKSRC}/man/vnstat.conf.5 ${STAGEDIR}/${MANPREFIX}/man/man5/vnstat.conf.5 +.if ${PORT_OPTIONS:MGUI} + ${INSTALL_PROGRAM} ${WRKSRC}/src/vnstati ${STAGEDIR}/${PREFIX}/bin/vnstati + ${INSTALL_MAN} ${WRKSRC}/man/vnstati.1 ${STAGEDIR}/${MANPREFIX}/man/man1/vnstati.1 +.endif + post-install: .if ${PORT_OPTIONS:MDOCS} @${ECHO_MSG} "installing additional documentation to ${DOCSDIR}" - @${MKDIR} ${DOCSDIR} - @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}/${DOCSDIR} + @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}/${DOCSDIR} .endif @${ECHO_MSG} ""