pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

0ad: add editor option (broken at the moment)



Module Name:	pkgsrc-wip
Committed By:	nikita <nikita%NetBSD.org@localhost>
Pushed By:	nikita
Date:		Thu May 4 09:00:50 2023 +0200
Changeset:	638d16fe8db44da9f94840d73f334dd24757f2ef

Modified Files:
	0ad/Makefile
	0ad/options.mk

Log Message:
0ad: add editor option (broken at the moment)

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=638d16fe8db44da9f94840d73f334dd24757f2ef

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 0ad/Makefile   | 13 +++++--------
 0ad/options.mk |  6 ++++++
 2 files changed, 11 insertions(+), 8 deletions(-)

diffs:
diff --git a/0ad/Makefile b/0ad/Makefile
index e7032947c8..9cbfe42349 100644
--- a/0ad/Makefile
+++ b/0ad/Makefile
@@ -49,10 +49,13 @@ SUBST_SED.mozjs2+=	-e "s|JS::PrepareZoneForGC(|JS::PrepareZoneForGC(m_cx, |g"
 
 DATADIR=	${PREFIX}/share/${PKGBASE}
 
+INSTALLATION_DIRS+=	bin
 INSTALLATION_DIRS+=	lib/${PKGBASE}
 INSTALLATION_DIRS+=	${DATADIR}
 INSTALLATION_DIRS+=	${DATADIR}/mods/public
 INSTALLATION_DIRS+=	${DATADIR}/mods/mod
+INSTALLATION_DIRS+=	share/applications
+INSTALLATION_DIRS+=	share/pixmaps
 
 .include "options.mk"
 
@@ -65,20 +68,14 @@ do-configure:
 		--with-system-premake5 \
 		--with-system-mozjs \
 		--without-pch \
-		--disable-atlas \
-		${CONFIGURE_TESTS}
+		${CONFIGURE_EDITOR} ${CONFIGURE_TESTS}
 
 # TODO: needs "wx"
 # nvtt, notes from gentoo:
 # Build bundled NVTT
 # nvtt is abandoned upstream and 0ad has forked it and added fixes.
 # Use their copy. bug #768930
-# --with-system-nvtt \
-# options:
-# tests:
-# --without-tests
-#  editor:
-# --disable-atlas
+# --with-system-nvtt
 
 do-build:
 	${RUN} cd ${WRKSRC} && \
diff --git a/0ad/options.mk b/0ad/options.mk
index 0028b5e000..83220e4bab 100644
--- a/0ad/options.mk
+++ b/0ad/options.mk
@@ -9,3 +9,9 @@ CONFIGURE_TESTS?=		--with-tests
 .else
 CONFIGURE_TESTS?=		--without-tests
 .endif
+
+.if ${PKG_OPTIONS:Meditor}
+CONFIGURE_EDITOR?=
+.else
+CONFIGURE_EDITOR?=		--disable-atlas
+.endif


Home | Main Index | Thread Index | Old Index