Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 29 Oct 2016 15:35:16 +0000 (UTC)
From:      Mark Felder <feld@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r424918 - branches/2016Q4/net/vnstat
Message-ID:  <201610291535.u9TFZGaw055457@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: feld
Date: Sat Oct 29 15:35:16 2016
New Revision: 424918
URL: https://svnweb.freebsd.org/changeset/ports/424918

Log:
  MFH: r424917
  
  net/vnstat: Update to 1.15
  
  PR:		213840
  
  Approved by:	ports-secteam (with hat)

Modified:
  branches/2016Q4/net/vnstat/Makefile
  branches/2016Q4/net/vnstat/distinfo
Directory Properties:
  branches/2016Q4/   (props changed)

Modified: branches/2016Q4/net/vnstat/Makefile
==============================================================================
--- branches/2016Q4/net/vnstat/Makefile	Sat Oct 29 15:28:58 2016	(r424917)
+++ branches/2016Q4/net/vnstat/Makefile	Sat Oct 29 15:35:16 2016	(r424918)
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	vnstat
-PORTVERSION=	1.14
-PORTREVISION=	1
+PORTVERSION=	1.15
+PORTREVISION=	0
 CATEGORIES=	net
 MASTER_SITES=	http://humdi.net/vnstat/ \
 		http://mirror.mcx2.org/
@@ -13,54 +13,39 @@ COMMENT=	Console-based network traffic m
 
 LICENSE=	GPLv2
 
-MAKE_ARGS=	CC="${CC}" CFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-INSTALL_TARGET=	bsdinstall
-
 USE_RC_SUBR=	vnstat
 
+CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+GNU_CONFIGURE=	yes
+
 USES=	gmake
 USERS=	vnstat
 GROUPS=	vnstat
 
-BIN_BSD=	${PREFIX}/bin
-SBIN_BSD=	${PREFIX}/sbin
-MAN_BSD=	${MANDIRS}
-ETC_BSD=	${PREFIX}/etc
-
 PORTDOCS=	README INSTALL_BSD UPGRADE
 SUB_FILES=	pkg-message
 SUB_LIST=	USERS=${USERS} \
 		GROUPS=${GROUPS}
 
-# will compile with image output
 OPTIONS_DEFINE=	GUI DOCS
 OPTIONS_DEFAULT=	GUI
+OPTIONS_SUB=	yes
 GUI_DESC=	Build with graphics/gd dependency
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MGUI}
-LIB_DEPENDS+=	libgd.so:graphics/gd
-PLIST_SUB+=	GUI=""
-.else
-ALL_TARGET="vnstat"
-PLIST_SUB+=	GUI="@comment "
-.endif
+GUI_LIB_DEPENDS+=	libgd.so:${PORTSDIR}/graphics/gd
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' \
-		${WRKSRC}/src/cfg.c
+.include <bsd.port.options.mk>
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/vnstat ${STAGEDIR}/${PREFIX}/bin/vnstat
-	${INSTALL_PROGRAM} ${WRKSRC}/src/vnstatd ${STAGEDIR}/${PREFIX}/sbin/vnstatd
+	${INSTALL_PROGRAM} ${WRKSRC}/vnstat ${STAGEDIR}/${PREFIX}/bin/vnstat
+	${INSTALL_PROGRAM} ${WRKSRC}/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_PROGRAM} ${WRKSRC}/vnstati ${STAGEDIR}/${PREFIX}/bin/vnstati
 	${INSTALL_MAN} ${WRKSRC}/man/vnstati.1 ${STAGEDIR}/${MANPREFIX}/man/man1/vnstati.1
 .endif
 

Modified: branches/2016Q4/net/vnstat/distinfo
==============================================================================
--- branches/2016Q4/net/vnstat/distinfo	Sat Oct 29 15:28:58 2016	(r424917)
+++ branches/2016Q4/net/vnstat/distinfo	Sat Oct 29 15:35:16 2016	(r424918)
@@ -1,2 +1,3 @@
-SHA256 (vnstat-1.14.tar.gz) = f8462a47d85d0890493dc9eaeafbc725ae631aa5b103fb7f8af4ddb2314e8386
-SIZE (vnstat-1.14.tar.gz) = 103281
+TIMESTAMP = 1477754840
+SHA256 (vnstat-1.15.tar.gz) = c3814b5baa8b627198a8debfe1dce4b4346a342523818cc8668a5497971dbc39
+SIZE (vnstat-1.15.tar.gz) = 207712



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610291535.u9TFZGaw055457>