From owner-svn-ports-all@freebsd.org  Fri Aug 21 17:35:55 2015
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 8E7E59BF9A7;
 Fri, 21 Aug 2015 17:35:55 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::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 7F1206E7;
 Fri, 21 Aug 2015 17:35:55 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7LHZt8Y094965;
 Fri, 21 Aug 2015 17:35:55 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7LHZt0o094964;
 Fri, 21 Aug 2015 17:35:55 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201508211735.t7LHZt0o094964@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, 21 Aug 2015 17:35:55 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r394989 - head/games/construo
X-SVN-Group: ports-head
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.20
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, 21 Aug 2015 17:35:55 -0000

Author: amdmi3
Date: Fri Aug 21 17:35:54 2015
New Revision: 394989
URL: https://svnweb.freebsd.org/changeset/ports/394989

Log:
  - Switch to options helpers

Modified:
  head/games/construo/Makefile

Modified: head/games/construo/Makefile
==============================================================================
--- head/games/construo/Makefile	Fri Aug 21 17:35:10 2015	(r394988)
+++ head/games/construo/Makefile	Fri Aug 21 17:35:54 2015	(r394989)
@@ -16,11 +16,10 @@ LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
 USE_GITHUB=	yes
 GH_ACCOUNT=	Construo
 
-GNU_CONFIGURE=	yes
 USES=		autoreconf gmake
 USE_XORG=	sm ice x11 xext xxf86vm
 USE_GL=		gl glu
-
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--bindir="${PREFIX}/bin" \
 		--datadir="${DATADIR}"
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -31,7 +30,7 @@ PLIST_FILES=	bin/${PORTNAME} \
 PORTDATA=	*
 
 DESKTOP_ENTRIES="Construo" \
-		"${COMMENT}" \
+		"" \
 		"" \
 		"${PORTNAME}" \
 		"Game;Simulation;" \
@@ -39,29 +38,24 @@ DESKTOP_ENTRIES="Construo" \
 
 OPTIONS_DEFINE=	GLUT
 OPTIONS_DEFAULT=GLUT
-GLUT_DESC=	Use glut
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MGLUT}
-USE_GL+=	glut
-PLIST_FILES+=	bin/${PORTNAME}.glut
-.endif
+GLUT_DESC=		Use glut
+GLUT_USE=		GL=glut
+GLUT_PLIST_FILES=	bin/${PORTNAME}.glut
 
 post-patch:
 	@${REINPLACE_CMD} -e '/bindir=/ d' ${WRKSRC}/src/Makefile.am
 	@${REINPLACE_CMD} '/(freeglut-1.3/ s|glutMainLoop|disabled_&|' \
 		${WRKSRC}/configure.ac
-.if ! ${PORT_OPTIONS:MGLUT}
+
+post-patch-GLUT-off:
 	@${REINPLACE_CMD} '/(glut/ s|glutMainLoop|disabled_&|' \
 		${WRKSRC}/configure.ac
-.endif
 
-post-install:
-.if ${PORT_OPTIONS:MGLUT}
+post-install-GLUT-on:
 	cd ${STAGEDIR}${PREFIX}/bin && ${LN} -s ${PORTNAME}.glut ${PORTNAME}
-.else
+
+post-install-GLUT-off:
 	cd ${STAGEDIR}${PREFIX}/bin && ${LN} -s ${PORTNAME}.x11 ${PORTNAME}
-.endif
 
 .include <bsd.port.mk>