Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 1 Dec 2012 09:40:37 +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: r308069 - head/games/construo
Message-ID:  <201212010940.qB19ebLD076501@svn.freebsd.org>

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



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