From owner-svn-ports-all@freebsd.org  Fri Dec 15 17:08:57 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 F0387E86A27;
 Fri, 15 Dec 2017 17:08:57 +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 BD3547D4F8;
 Fri, 15 Dec 2017 17:08:57 +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 vBFH8u1k086023;
 Fri, 15 Dec 2017 17:08:56 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBFH8u37086022;
 Fri, 15 Dec 2017 17:08:56 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201712151708.vBFH8u37086022@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, 15 Dec 2017 17:08:56 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r456409 - head/graphics/darknock
X-SVN-Group: ports-head
X-SVN-Commit-Author: amdmi3
X-SVN-Commit-Paths: head/graphics/darknock
X-SVN-Commit-Revision: 456409
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: Fri, 15 Dec 2017 17:08:58 -0000

Author: amdmi3
Date: Fri Dec 15 17:08:56 2017
New Revision: 456409
URL: https://svnweb.freebsd.org/changeset/ports/456409

Log:
  - Fix whitespace
  - Switch to options helpers

Modified:
  head/graphics/darknock/Makefile

Modified: head/graphics/darknock/Makefile
==============================================================================
--- head/graphics/darknock/Makefile	Fri Dec 15 17:07:50 2017	(r456408)
+++ head/graphics/darknock/Makefile	Fri Dec 15 17:08:56 2017	(r456409)
@@ -20,22 +20,18 @@ USE_QT4=	gui linguisttools_build moc_build rcc_build u
 PORTDOCS=	changelog
 PLIST_FILES=	bin/darknock share/pixmaps/darknock.png
 
-DESKTOP_ENTRIES=	"${PORTNAME}" \
-			"${COMMENT}" \
-			"${PREFIX}/share/pixmaps/${PORTNAME}.png" \
-			"${PORTNAME}" \
-			"Graphics;Qt;" \
-			"true"
+DESKTOP_ENTRIES="${PORTNAME}" \
+		"" \
+		"${PREFIX}/share/pixmaps/${PORTNAME}.png" \
+		"${PORTNAME}" \
+		"Graphics;Qt;" \
+		"true"
 
 OPTIONS_DEFINE=	DOCS NLS
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
 .for lang in fr it pl ro sv tr
-PLIST_FILES+=	%%DATADIR%%/locale/darknock_${lang}.qm
+NLS_PLIST_FILES+=	%%DATADIR%%/locale/darknock_${lang}.qm
 .endfor
-.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/share/darknock|${DATADIR}|g' \
@@ -47,13 +43,13 @@ pre-configure:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/images/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps
-.if ${PORT_OPTIONS:MNLS}
+
+do-install-NLS-on:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/locale
 	${INSTALL_DATA} ${WRKSRC}/locale/*.qm ${STAGEDIR}${DATADIR}/locale
-.endif
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/changelog ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>