Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 8 Jan 2016 14:22:15 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r405556 - head/misc/metalink-editor
Message-ID:  <201601081422.u08EMFre062699@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601081422.u08EMFre062699>