From owner-svn-ports-head@freebsd.org  Mon Jan  9 09:01:11 2017
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 A4557CA679B;
 Mon,  9 Jan 2017 09:01:11 +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 5B32711FE;
 Mon,  9 Jan 2017 09:01:11 +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 v0991AAX079171;
 Mon, 9 Jan 2017 09:01:10 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0991ASe079170;
 Mon, 9 Jan 2017 09:01:10 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201701090901.v0991ASe079170@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: Mon, 9 Jan 2017 09:01:10 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r430924 - head/net-im/coccinella
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.23
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: Mon, 09 Jan 2017 09:01:11 -0000

Author: amdmi3
Date: Mon Jan  9 09:01:10 2017
New Revision: 430924
URL: https://svnweb.freebsd.org/changeset/ports/430924

Log:
  - Add LICENSE_FILE
  - Add NO_ARCH
  - Switch to options helpers
  - Simplify documentation installation

Modified:
  head/net-im/coccinella/Makefile

Modified: head/net-im/coccinella/Makefile
==============================================================================
--- head/net-im/coccinella/Makefile	Mon Jan  9 08:58:09 2017	(r430923)
+++ head/net-im/coccinella/Makefile	Mon Jan  9 09:01:10 2017	(r430924)
@@ -12,6 +12,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Jabber client with whiteboard communication
 
 LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
 RUN_DEPENDS=	snack>=0:audio/snack \
 		tcltls>=0:devel/tcltls \
@@ -19,27 +20,19 @@ RUN_DEPENDS=	snack>=0:audio/snack \
 		tktray>=0:x11-toolkits/tktray \
 		tktreectrl>=0:x11-toolkits/tktreectrl
 
-NO_BUILD=	yes
 USES=		tk
+NO_BUILD=	yes
+NO_ARCH=	yes
 
 PORTDOCS=	*
 
-DOCSRCDIR1=	${WRKSRC}
-DOC_FILES1=	AUTHORS.txt CHANGES.txt README.txt
-
-DOCSRCDIR2=	${WRKSRC}/READMEs
-DOCSDIR2=	${DOCSDIR}/READMEs
-DOC_FILES2=	*
+DESKTOP_ENTRIES="Coccinella" "" "${PORTNAME}" \
+		"${PORTNAME}" "Network;InstantMessaging;" ""
 
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 NLS_USES=	gettext
 
-DESKTOP_ENTRIES="Coccinella" "" "${PORTNAME}" \
-		"${PORTNAME}" "Network;InstantMessaging;" ""
-
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e '1s|/usr/bin/env wish|${WISH}|' \
 		${WRKSRC}/Coccinella.tcl
@@ -52,20 +45,17 @@ do-install:
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} ${dir} ${STAGEDIR}${DATADIR})
 .endfor
 	${INSTALL_SCRIPT} ${WRKSRC}/Coccinella.tcl ${STAGEDIR}${DATADIR}
-	@${LN} -sf ${DATADIR}/Coccinella.tcl ${STAGEDIR}${PREFIX}/bin/coccinella
-
+	${LN} -sf ${DATADIR}/Coccinella.tcl ${STAGEDIR}${PREFIX}/bin/coccinella
 	${LN} -sf ${DATADIR}/themes/Oxygen/icons/64x64/${PORTNAME}.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/
 
-.if ${PORT_OPTIONS:MNLS}
+do-install-NLS-on:
 	@(cd ${WRKSRC}/po && ${CHMOD} 755 compile.tcl && \
 		./compile.tcl)
 	@(cd ${WRKSRC}/msgs && ${COPYTREE_SHARE} "*.msg" ${STAGEDIR}${DATADIR}/msgs)
-.endif
 
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR}
-	@${MKDIR} ${STAGEDIR}${DOCSDIR2}
-	${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR2}
+	cd ${WRKSRC} && ${COPYTREE_SHARE} "AUTHORS.txt CHANGES.txt README.txt READMEs" ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>