From owner-svn-ports-head@freebsd.org  Fri Mar 11 10:34:29 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
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 30791ACB951;
 Fri, 11 Mar 2016 10:34:29 +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 01AE2C62;
 Fri, 11 Mar 2016 10:34:28 +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 u2BAYSZJ067527;
 Fri, 11 Mar 2016 10:34:28 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2BAYS24067526;
 Fri, 11 Mar 2016 10:34:28 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201603111034.u2BAYS24067526@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Fri, 11 Mar 2016 10:34:28 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r410818 - head/databases/rrdmerge
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.21
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 11 Mar 2016 10:34:29 -0000

Author: amdmi3
Date: Fri Mar 11 10:34:27 2016
New Revision: 410818
URL: https://svnweb.freebsd.org/changeset/ports/410818

Log:
  - Add LICENSE
  - Switch to USES=tar:tbz2
  - Add NO_ARCH
  - Switch to options helpers
  
  Approved by:	portmgr blanket

Modified:
  head/databases/rrdmerge/Makefile

Modified: head/databases/rrdmerge/Makefile
==============================================================================
--- head/databases/rrdmerge/Makefile	Fri Mar 11 09:26:05 2016	(r410817)
+++ head/databases/rrdmerge/Makefile	Fri Mar 11 10:34:27 2016	(r410818)
@@ -7,18 +7,20 @@ PORTVERSION=	0.0.1
 CATEGORIES=	databases
 MASTER_SITES=	http://download.sippysoft.com/thirdparty/
 DISTNAME=	${PORTNAME}-${GITREVISION}
-EXTRACT_SUFX=	.tbz2
 
 MAINTAINER=	sobomax@FreeBSD.org
 COMMENT=	Utility to merge existing RRD data from backups into new RRD files
 
+LICENSE=	GPLv3+
+
 RUN_DEPENDS=	rrdtool:${PORTSDIR}/databases/rrdtool
 
-USES=		tar:bzip2 shebangfix python
+USES=		python shebangfix tar:tbz2
 SHEBANG_FILES=	rrdmergetree
 GITREVISION=	b05d69bfac64
 bash_CMD=	/bin/sh
 NO_BUILD=	yes
+NO_ARCH=	yes
 PLIST_FILES=	bin/${PORTNAME} bin/${PORTNAME}tree
 
 PORTDOCS=	*
@@ -28,7 +30,9 @@ OPTIONS_DEFINE=	DOCS
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/rrdmerge ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/rrdmergetree ${STAGEDIR}${PREFIX}/bin
-	${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/${PORTNAME}
-	${INSTALL_MAN} ${WRKSRC}/README.rst ${STAGEDIR}${PREFIX}/share/doc/${PORTNAME}
+
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/README.rst ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>