From owner-svn-ports-head@FreeBSD.ORG  Sat Dec  1 09:40:38 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 3A0C75EB;
 Sat,  1 Dec 2012 09:40:38 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 060438FC0C;
 Sat,  1 Dec 2012 09:40:38 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qB19eb2j076502;
 Sat, 1 Dec 2012 09:40:37 GMT (envelope-from amdmi3@svn.freebsd.org)
Received: (from amdmi3@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB19ebLD076501;
 Sat, 1 Dec 2012 09:40:37 GMT (envelope-from amdmi3@svn.freebsd.org)
Message-Id: <201212010940.qB19ebLD076501@svn.freebsd.org>
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Sat, 1 Dec 2012 09:40:37 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r308069 - 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-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 01 Dec 2012 09:40:38 -0000

Author: amdmi3
Date: Sat Dec  1 09:40:37 2012
New Revision: 308069
URL: http://svnweb.freebsd.org/changeset/ports/308069

Log:
  - OptionsNG
  - Trim header
  - Fix build for WITHOUT_GLUT
  
  Feature safe:	yes

Modified:
  head/games/construo/Makefile

Modified: head/games/construo/Makefile
==============================================================================
--- head/games/construo/Makefile	Sat Dec  1 09:38:31 2012	(r308068)
+++ head/games/construo/Makefile	Sat Dec  1 09:40:37 2012	(r308069)
@@ -1,16 +1,11 @@
-# New ports collection makefile for:	construo
-# Date created:				24 Nov 2005
-# Whom:					Dmitry Marakasov <amdmi3@amdmi3.ru>
-#
+# Created by: Dmitry Marakasov <amdmi3@amdmi3.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	construo
 PORTVERSION=	0.2.2
 PORTREVISION=	5
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR=	construo
+MASTER_SITES=	SAVANNAH/construo
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	A fun construction toy
@@ -18,17 +13,20 @@ COMMENT=	A fun construction toy
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_XORG=	sm ice x11 xext xxf86vm
+USE_GL=		gl glu
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lGLU
 CONFIGURE_ARGS=	--bindir=${PREFIX}/bin --datadir=${DATADIR}
 
-OPTIONS=	GLUT "Use glut" on
+OPTIONS_DEFINE=	GLUT
+OPTIONS_DEFAULT=GLUT
+GLUT_DESC=	Use glut
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_GLUT)
-USE_GL=		glut
+.if ${PORT_OPTIONS:MGLUT}
+USE_GL+=	glut
 PLIST_SUB+=	GLUTBIN:=""
 .else
 PLIST_SUB+=	GLUTBIN:="@comment "
@@ -40,15 +38,15 @@ post-patch:
 	@${REINPLACE_CMD} '/stream/!s/std:://' ${WRKSRC}/vector.cxx
 	@${REINPLACE_CMD} 's|^\(#define CONSTRUO_DATADIR DATADIR\).*|\1|' ${WRKSRC}/construo.hxx
 	@${REINPLACE_CMD} 's|.*glut_1_3_glutMainLoop = yes.*|if false; then|' ${WRKSRC}/configure
-.if defined(WITHOUT_GLUT)
+.if ! ${PORT_OPTIONS:MGLUT}
 	@${REINPLACE_CMD} 's|.*glut_glutMainLoop = yes.*|if false; then|' ${WRKSRC}/configure
 .endif
 
 post-install:
-.if defined(WITH_GLUT)
+.if ${PORT_OPTIONS:MGLUT}
 	cd ${PREFIX}/bin && ${LN} -s ${PORTNAME}.glut ${PORTNAME}
 .else
 	cd ${PREFIX}/bin && ${LN} -s ${PORTNAME}.x11 ${PORTNAME}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>