From ad882bc9c438874b1615518580d4bdc4e3af728d Mon Sep 17 00:00:00 2001 From: dholland Date: Sun, 27 Oct 2013 17:17:57 +0000 Subject: Make lua support optional. Leave it enabled right now, even though it doesn't build, in the hopes that somone will take it in hand; it needs to be updated to match the new lua version. --- misc/celestia/Makefile | 4 +--- misc/celestia/options.mk | 13 ++++++++++--- 2 files changed, 11 insertions(+), 6 deletions(-) (limited to 'misc/celestia') diff --git a/misc/celestia/Makefile b/misc/celestia/Makefile index e2590060916..3596a3cf2c4 100644 --- a/misc/celestia/Makefile +++ b/misc/celestia/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.54 2013/10/10 14:42:23 ryoon Exp $ +# $NetBSD: Makefile,v 1.55 2013/10/27 17:17:57 dholland Exp $ DISTNAME= celestia-1.4.1 PKGREVISION= 38 @@ -17,7 +17,6 @@ USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes USE_TOOLS+= gmake pkg-config GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-lua GCC_REQD+= 3.0 CXXFLAGS+= -DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\"" @@ -50,7 +49,6 @@ post-install: .include "../../graphics/glu/buildlink3.mk" .include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" -.include "../../lang/lua/buildlink3.mk" .include "../../x11/libXmu/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" diff --git a/misc/celestia/options.mk b/misc/celestia/options.mk index 83240a7e440..ecf85b21625 100644 --- a/misc/celestia/options.mk +++ b/misc/celestia/options.mk @@ -1,13 +1,20 @@ -# $NetBSD: options.mk,v 1.4 2009/07/22 09:01:36 wiz Exp $ +# $NetBSD: options.mk,v 1.5 2013/10/27 17:17:57 dholland Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.celestia -PKG_SUPPORTED_OPTIONS= # empty +PKG_SUPPORTED_OPTIONS= lua PKG_OPTIONS_OPTIONAL_GROUPS= gui PKG_OPTIONS_GROUP.gui= glut gnome gtk kde -PKG_SUGGESTED_OPTIONS= gtk +PKG_SUGGESTED_OPTIONS= gtk lua .include "../../mk/bsd.options.mk" +.if !empty(PKG_OPTIONS:Mlua) +CONFIGURE_ARGS+= --with-lua +. include "../../lang/lua/buildlink3.mk" +.else +CONFIGURE_ARGS+= --without-lua +.endif + .if !empty(PKG_OPTIONS:Mglut) CONFIGURE_ARGS+= --with-glut . include "../../graphics/glut/buildlink3.mk" -- cgit v1.2.3