From owner-svn-ports-head@FreeBSD.ORG  Thu Jun 13 12:46:13 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 79616532;
 Thu, 13 Jun 2013 12:46:13 +0000 (UTC)
 (envelope-from bsam@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 6A71F1B05;
 Thu, 13 Jun 2013 12:46:13 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5DCkD8c051763;
 Thu, 13 Jun 2013 12:46:13 GMT (envelope-from bsam@svn.freebsd.org)
Received: (from bsam@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5DCkDbr051762;
 Thu, 13 Jun 2013 12:46:13 GMT (envelope-from bsam@svn.freebsd.org)
Message-Id: <201306131246.r5DCkDbr051762@svn.freebsd.org>
From: Boris Samorodov <bsam@FreeBSD.org>
Date: Thu, 13 Jun 2013 12:46:13 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r320797 - head/net-mgmt/netmond
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.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Jun 2013 12:46:13 -0000

Author: bsam
Date: Thu Jun 13 12:46:12 2013
New Revision: 320797
URL: http://svnweb.freebsd.org/changeset/ports/320797

Log:
  . fix build with clang (CFLAGS+=-Wno-return-type);
  . convert to PORT_OPTIONS;
  . remove some space lines.

Modified:
  head/net-mgmt/netmond/Makefile

Modified: head/net-mgmt/netmond/Makefile
==============================================================================
--- head/net-mgmt/netmond/Makefile	Thu Jun 13 12:44:44 2013	(r320796)
+++ head/net-mgmt/netmond/Makefile	Thu Jun 13 12:46:12 2013	(r320797)
@@ -24,14 +24,9 @@ GROUPS=	${USERS}
 #MK_IFGRAPH=	yes
 PATCHDIR=	${WRKDIR}/patches
 
-.if defined(MK_IFGRAPH)
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
-.else
-CONFIGURE_ARGS=	--without-ifgraph
-.endif
-
 GNU_CONFIGURE=	yes
 USES=		bison
+CFLAGS+=	-Wno-return-type
 
 BINOWN=		root
 BINGRP=		netmon
@@ -39,16 +34,21 @@ BINMODE=	0550
 
 PLIST_FILES=	sbin/netmond sbin/netmond_watchdog sbin/netmondctl \
 		etc/netmond.conf.sample
-.if defined(MK_IFGRAPH)
-PLIST_FILES+=	sbin/ifgraph
-.endif
-
 USE_RC_SUBR=	netmond
-
 SUB_FILES+=	pkg-message netmond_watchdog netmondctl
-
 PORTDOCS=	README README.ru CHANGES README.port.eng README.port.ru index.html netmond.css en/ ru/
 
+OPTIONS_DEFINE=	DOCS GD
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MGD}
+LIB_DEPENDS=	gd:${PORTSDIR}/graphics/gd
+PLIST_FILES+=	sbin/ifgraph
+.else
+CONFIGURE_ARGS=	--without-ifgraph
+.endif
+
 post-extract:
 	${MKDIR} ${PATCHDIR}
 	${TAR} -zxf ${DISTDIR}/${DISTNAME}.patch${PATCH_VERSION}${EXTRACT_SUFX} -C ${PATCHDIR}
@@ -63,8 +63,8 @@ do-install:
 	${INSTALL_SCRIPT}   ${WRKDIR}/netmondctl ${PREFIX}/sbin/netmondctl
 	${INSTALL_DATA} ${WRKSRC}/netmon.conf.sample ${PREFIX}/etc/netmond.conf.sample
 	${CHMOD} u+s ${PREFIX}/sbin/netmond
-.if !defined(NOPORTDOCS)
-	${MKDIR}  ${DOCSDIR}
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR}  ${DOCSDIR}
 	${CHMOD} 755 ${DOCSDIR}
 	${TAR}  -zxf ${DISTDIR}/${DISTNAME}.docs${EXTRACT_SUFX} -C ${DOCSDIR}
 .endif