From owner-svn-ports-all@freebsd.org  Wed Dec 13 09:00:30 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@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 9917BE96B88;
 Wed, 13 Dec 2017 09:00:30 +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 62CBA686F2;
 Wed, 13 Dec 2017 09:00:30 +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 vBD90T7I064304;
 Wed, 13 Dec 2017 09:00:29 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBD90TBV064302;
 Wed, 13 Dec 2017 09:00:29 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201712130900.vBD90TBV064302@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: Wed, 13 Dec 2017 09:00:29 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r456198 - head/sysutils/etcmerge
X-SVN-Group: ports-head
X-SVN-Commit-Author: amdmi3
X-SVN-Commit-Paths: head/sysutils/etcmerge
X-SVN-Commit-Revision: 456198
X-SVN-Commit-Repository: ports
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.25
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 13 Dec 2017 09:00:30 -0000

Author: amdmi3
Date: Wed Dec 13 09:00:29 2017
New Revision: 456198
URL: https://svnweb.freebsd.org/changeset/ports/456198

Log:
  - Add LICENSE
  - Add NO_ARCH
  - Use MANPREFIX
  - Update WWW
  
  Approved by:	portmgr blanket

Modified:
  head/sysutils/etcmerge/Makefile
  head/sysutils/etcmerge/pkg-descr

Modified: head/sysutils/etcmerge/Makefile
==============================================================================
--- head/sysutils/etcmerge/Makefile	Wed Dec 13 08:44:15 2017	(r456197)
+++ head/sysutils/etcmerge/Makefile	Wed Dec 13 09:00:29 2017	(r456198)
@@ -10,13 +10,16 @@ DISTFILES=	# none
 MAINTAINER=	portmaster@BSDforge.com
 COMMENT=	Automatic 3-way merge of /etc updates
 
+LICENSE=	NONE
+
 NO_BUILD=	yes
+NO_ARCH=	yes
 NO_WRKSUBDIR=	yes
 
 PLIST_FILES=	man/man8/${PORTNAME}.8.gz sbin/etcmerge
 
 do-install:
 	${INSTALL_SCRIPT} ${FILESDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/sbin/${PORTNAME}
-	${INSTALL_MAN} ${FILESDIR}/${PORTNAME}.8 ${STAGEDIR}${PREFIX}/man/man8
+	${INSTALL_MAN} ${FILESDIR}/${PORTNAME}.8 ${STAGEDIR}${MANPREFIX}/man/man8
 
 .include <bsd.port.mk>

Modified: head/sysutils/etcmerge/pkg-descr
==============================================================================
--- head/sysutils/etcmerge/pkg-descr	Wed Dec 13 08:44:15 2017	(r456197)
+++ head/sysutils/etcmerge/pkg-descr	Wed Dec 13 09:00:29 2017	(r456198)
@@ -4,4 +4,4 @@ The primary difference from mergemaster, is that etcme
 requires much less manual work than mergemaster, due to the
 use of a three way merge.
 
-WWW: http://BSDforge.com/projects/sysutils/etcmerge/
+WWW: https://BSDforge.com/projects/sysutils/etcmerge/