From owner-svn-ports-head@freebsd.org  Fri Jan  8 14:22:16 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 56DFDA67D90;
 Fri,  8 Jan 2016 14:22:16 +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 0E0DA1105;
 Fri,  8 Jan 2016 14:22:15 +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 u08EMFLN062700;
 Fri, 8 Jan 2016 14:22:15 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u08EMFre062699;
 Fri, 8 Jan 2016 14:22:15 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201601081422.u08EMFre062699@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, 8 Jan 2016 14:22:15 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r405556 - head/misc/metalink-editor
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.20
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, 08 Jan 2016 14:22:16 -0000

Author: amdmi3
Date: Fri Jan  8 14:22:14 2016
New Revision: 405556
URL: https://svnweb.freebsd.org/changeset/ports/405556

Log:
  - Clarify LICENSE
  - Add NO_ARCH
  - Switch to options helpers
  - Simplify docs handling

Modified:
  head/misc/metalink-editor/Makefile

Modified: head/misc/metalink-editor/Makefile
==============================================================================
--- head/misc/metalink-editor/Makefile	Fri Jan  8 14:20:21 2016	(r405555)
+++ head/misc/metalink-editor/Makefile	Fri Jan  8 14:22:14 2016	(r405556)
@@ -12,11 +12,9 @@ DISTNAME=	${PORTNAME}editor-${PORTVERSIO
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GUI editor to create and edit metalinks
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2 # or later
 LICENSE_FILE=	${WRKSRC}/license.txt
 
-OPTIONS_DEFINE=	DOCS
-
 USES=		dos2unix python zip
 DOS2UNIX_REGEX=	.*\.txt
 NO_WRKSUBDIR=	yes
@@ -24,23 +22,20 @@ USE_PYTHON=	distutils
 PYDISTUTILS_EGGINFO=	metalink_editor-${PORTVERSION}-py${PYTHON_VER}.egg-info
 USE_WX=		3.0+
 WX_COMPS=	python
+NO_ARCH=	yes
 
 DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
 
 DESKTOP_ENTRIES=	"Metalink editor" \
-			"GUI editor to create and edit metalinks" \
+			"" \
 			"${DATADIR}/metalink.png" \
 			"metalink_editor.py" \
 			"Network;FileTransfer;" \
 			true
 
-#
-# Documents to install
-#
-DOC_FILES=	\
-		readme.txt
-#
-PORTDOCS=	*
+PORTDOCS=	readme.txt
+
+OPTIONS_DEFINE=	DOCS
 
 post-extract:
 # Create a package to avoid namespace pollution
@@ -63,11 +58,6 @@ pre-configure:
 		> ${WRKSRC}/${PYSETUP}
 
 post-install:
-# docs
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for file in ${DOC_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
-.endfor
 # fix installation permissions for restritive umask(1)
 	@${FIND} \
 		${STAGEDIR}${DATADIR} \
@@ -75,4 +65,10 @@ post-install:
 		-type f -exec \
 		${CHMOD} ${SHAREMODE} {} \;
 
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for file in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
+.endfor
+
 .include <bsd.port.mk>