Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 24 Aug 2015 00:04:53 +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: r395154 - head/games/magicor
Message-ID:  <201508240004.t7O04r2T096507@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Mon Aug 24 00:04:52 2015
New Revision: 395154
URL: https://svnweb.freebsd.org/changeset/ports/395154

Log:
  - Switch to options helpers
  - Fix editor depends

Modified:
  head/games/magicor/Makefile

Modified: head/games/magicor/Makefile
==============================================================================
--- head/games/magicor/Makefile	Mon Aug 24 00:00:30 2015	(r395153)
+++ head/games/magicor/Makefile	Mon Aug 24 00:04:52 2015	(r395154)
@@ -3,7 +3,7 @@
 
 PORTNAME=	magicor
 PORTVERSION=	1.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	games
 MASTER_SITES=	SF
 DISTFILES=	${PORTNAME}-source-${PORTVERSION}${EXTRACT_SUFX} \
@@ -37,9 +37,7 @@ OPTIONS_DEFAULT=EDITOR
 OPTIONS_SUB=	yes
 
 EDITOR_DESC=	Enable editor
-EDITOR_RUN_DEPEND=	${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolkits/py-gtk2
-
-.include <bsd.port.options.mk>
+EDITOR_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolkits/py-gtk2
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|###CONFIG_PATH###|${PREFIX}/etc/magicor/magicor.conf|' \
@@ -58,11 +56,13 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/Magicor.py ${STAGEDIR}${PREFIX}/bin/magicor
 	${INSTALL_DATA} ${WRKSRC}/etc/magicor.conf \
 		${STAGEDIR}${PREFIX}/etc/magicor/magicor.conf.dist
-.if ${PORT_OPTIONS:MEDITOR}
+
+do-install-EDITOR-on:
 	${INSTALL_SCRIPT} ${WRKSRC}/Magicor-LevelEditor.py ${STAGEDIR}${PREFIX}/bin/magicor-editor
 	${INSTALL_DATA} ${WRKSRC}/etc/magicor-editor.conf \
 		${STAGEDIR}${PREFIX}/etc/magicor/magicor-editor.conf.dist
-.endif
+
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/
 



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