Date: Tue, 2 Aug 2005 10:20:29 GMT From: Ulrich Spoerlein <q@galgenberg.net> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/84197: games/quake2forge cannot be built without X11 Message-ID: <200508021020.j72AKTUH096582@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/84197; it has been noted by GNATS.
From: Ulrich Spoerlein <q@galgenberg.net>
To: Volker Stolz <vs@freebsd.org>
Cc: bug-followup@freebsd.org, Ed Schouten <ed@fxq.nl>
Subject: Re: ports/84197: games/quake2forge cannot be built without X11
Date: Tue, 2 Aug 2005 12:18:02 +0200
--/unnNtmY43mpUSKx
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
On Mon, 01.08.2005 at 09:25:40 +0200, Volker Stolz wrote:
> Dear maintainer, please look into this issue!
Hello,
I (almost) approve the patch. But it is missing the SDL+GL case. Here is
my version of the patch (which fixes plist when building SDL+!X11).
Ulrich Spoerlein
--
PGP Key ID: F0DB9F44 Encrypted mail welcome!
Fingerprint: F1CE D062 0CA9 ADE3 349B 2FE8 980A C6B5 F0DB 9F44
Ok, which part of "Ph'nglui mglw'nafh Cthulhu R'lyeh wgah'nagl fhtagn."
didn't you understand?
--/unnNtmY43mpUSKx
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=patch
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/games/quake2forge/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- Makefile 13 May 2005 20:17:26 -0000 1.15
+++ Makefile 2 Aug 2005 10:12:04 -0000
@@ -19,7 +19,6 @@
USE_GMAKE= yes
USE_LIBTOOL_VER=15
USE_AUTOCONF_VER=259
-USE_XLIB= yes
USE_REINPLACE= yes
WANT_SDL= yes
@@ -58,6 +57,16 @@
PLIST_SUB+= SVGA:="@comment "
.endif
+.if !defined(WITHOUT_X11)
+USE_XLIB= yes
+CONFIGURE_ARGS+=--with-x
+PLIST_SUB+= X11:=""
+.else
+WITHOUT_GL= yes
+CONFIGURE_ARGS+=--without-x
+PLIST_SUB+= X11:="@comment "
+.endif
+
.if !defined(WITHOUT_GL)
CONFIGURE_ARGS+=--with-opengl=${X11BASE}
PLIST_SUB+= GL:=""
@@ -91,8 +100,11 @@
.if !defined(WITH_SDL)
@${ECHO_MSG} "Define WITH_SDL to use SDL"
.endif
+.if !defined(WITHOUT_X11)
+ @${ECHO_MSG} "Define WITHOUT_X11 to disable X11 and OpenGL support"
+.endif
.if !defined(WITHOUT_GL)
- @${ECHO_MSG} "Define WITHOUT_GL to disable GL"
+ @${ECHO_MSG} "Define WITHOUT_GL to disable OpenGL support"
.endif
.if ( ${OSVERSION} < 500000 )
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/games/quake2forge/pkg-plist,v
retrieving revision 1.5
diff -u -r1.5 pkg-plist
--- pkg-plist 11 Aug 2004 19:09:02 -0000 1.5
+++ pkg-plist 2 Aug 2005 10:12:04 -0000
@@ -4,7 +4,7 @@
%%SDLGL:%%lib/quake2/ref_sdlgl.so
%%GL:%%lib/quake2/ref_glx.so
%%SVGA:%%%%GL:%%lib/quake2/ref_tdfx.so
-lib/quake2/ref_softx.so
+%%X11:%%lib/quake2/ref_softx.so
lib/quake2/snd_oss.so
%%SDL:%%lib/quake2/snd_sdl.so
%%AO:%%lib/quake2/snd_ao.so
--/unnNtmY43mpUSKx--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200508021020.j72AKTUH096582>