From owner-svn-ports-all@FreeBSD.ORG  Fri Nov  1 02:50:41 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 5328114C;
 Fri,  1 Nov 2013 02:50:41 +0000 (UTC)
 (envelope-from danilo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4090F2546;
 Fri,  1 Nov 2013 02:50:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA12ofcN080012;
 Fri, 1 Nov 2013 02:50:41 GMT (envelope-from danilo@svn.freebsd.org)
Received: (from danilo@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA12ofoH080011;
 Fri, 1 Nov 2013 02:50:41 GMT (envelope-from danilo@svn.freebsd.org)
Message-Id: <201311010250.rA12ofoH080011@svn.freebsd.org>
From: Danilo Egea Gondolfo <danilo@FreeBSD.org>
Date: Fri, 1 Nov 2013 02:50:41 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r332338 - head/games/d2x
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.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 01 Nov 2013 02:50:41 -0000

Author: danilo
Date: Fri Nov  1 02:50:40 2013
New Revision: 332338
URL: http://svnweb.freebsd.org/changeset/ports/332338

Log:
  - Add stage support
  - Add DOCS and OPENGL options
  - Use options helpers
  - Convert USE_GMAKE to USES

Modified:
  head/games/d2x/Makefile

Modified: head/games/d2x/Makefile
==============================================================================
--- head/games/d2x/Makefile	Fri Nov  1 02:30:54 2013	(r332337)
+++ head/games/d2x/Makefile	Fri Nov  1 02:50:40 2013	(r332338)
@@ -11,41 +11,35 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Unix port of Descent 2 Game
 
 GNU_CONFIGURE=	yes
+USES=		gmake
 USE_SDL=	sdl image
-USE_GMAKE=	yes
 
 CONFIGURE_ARGS=	--disable-network --disable-debug
 
 PORTDOCS=	README TODO NEWS AUTHORS readme.txt installation.txt
 PLIST_FILES=	bin/d2x
 
-.ifdef(WITH_OPENGL)
-USE_GL=		glut
-CONFIGURE_ARGS+=--with-opengl
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-.endif
+OPTIONS_DEFINE=	OPENGL DOCS
+
+OPENGL_CONFIGURE_WITH=	opengl
+OPENGL_CXXFLAGS=	-I${LOCALBASE}/include
+OPENGL_LDFLAGS=		-L${LOCALBASE}/lib
 
-NO_STAGE=	yes
-pre-everything::
-.ifndef(WITH_OPENGL)
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Define WITH_OPENGL to use OpenGL for 3D graphics"
-	@${ECHO_MSG} ""
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MOPENGL}
+USE_GL=		glut
 .endif
 
 do-install:
-.ifdef(WITH_OPENGL)
-		${INSTALL} ${WRKSRC}/d2x-gl  ${PREFIX}/bin/d2x
+.if ${PORT_OPTIONS:MOPENGL}
+		${INSTALL_PROGRAM} ${WRKSRC}/d2x-gl  ${STAGEDIR}${PREFIX}/bin/d2x
 .else
-		${INSTALL} ${WRKSRC}/d2x-sdl ${PREFIX}/bin/d2x
+		${INSTALL_PROGRAM} ${WRKSRC}/d2x-sdl ${STAGEDIR}${PREFIX}/bin/d2x
 .endif
-.if !defined(NOPORTDOCS)
-	        ${MKDIR} ${DOCSDIR}
+	        @${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${PORTDOCS}
-	        ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+	        ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
-	        ${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>