svn commit: r341119 - in head/games/sauerbraten: . files
Raphael Kubo da Costa
rakuco at FreeBSD.org
Sat Jan 25 22:02:51 UTC 2014
Author: rakuco
Date: Sat Jan 25 22:02:50 2014
New Revision: 341119
URL: http://svnweb.freebsd.org/changeset/ports/341119
QAT: https://qat.redports.org/buildarchive/r341119/
Log:
- Fix the build on 10 and beyond.
Since r253839 ld(1) behaves more strictly and does not pull in indirect
shared library dependencies (in this case, libX11.so). Upstream correctly
has -lX11 in the linker line, but r315151 removed this section in
patch-src_Makefile.
Based on a patch by Jan Henrik Sylvester <me at janh.de> in [1].
- While here, convert USE_GMAKE=yes to USES=gmake.
PR: ports/185033 [1]
Submitted by: Jan Henrik Sylvester <me at janh.de> [1]
Approved by: maintainer timeout (37 days)
MFH: 2014Q1
Modified:
head/games/sauerbraten/Makefile
head/games/sauerbraten/files/patch-src_Makefile
Modified: head/games/sauerbraten/Makefile
==============================================================================
--- head/games/sauerbraten/Makefile Sat Jan 25 21:58:31 2014 (r341118)
+++ head/games/sauerbraten/Makefile Sat Jan 25 22:02:50 2014 (r341119)
@@ -14,7 +14,7 @@ COMMENT= First person shooter based on C
LICENSE_COMB= multi
LICENSE= MIT ZLIB
-USE_GMAKE= yes
+USES= gmake
GNU_CONFIGURE= yes
USE_BZIP2= yes
CONFIGURE_ENV= ACLOCAL=true AUTOCONF=true AUTOMAKE=true
Modified: head/games/sauerbraten/files/patch-src_Makefile
==============================================================================
--- head/games/sauerbraten/files/patch-src_Makefile Sat Jan 25 21:58:31 2014 (r341118)
+++ head/games/sauerbraten/files/patch-src_Makefile Sat Jan 25 22:02:50 2014 (r341119)
@@ -17,7 +17,7 @@
-CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags`
-CLIENT_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib -lX11 `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL
+CLIENT_INCLUDES= $(INCLUDES) `${SDL_CONFIG} --cflags` -I${LOCALBASE}/include
-+CLIENT_LIBS= -Lenet/.libs -lenet `${SDL_CONFIG} --libs` -L${LOCALBASE}/lib -lSDL_image -lSDL_mixer -lz -lGL
++CLIENT_LIBS= -Lenet/.libs -lenet `${SDL_CONFIG} --libs` -L${LOCALBASE}/lib -lX11 -lSDL_image -lSDL_mixer -lz -lGL
endif
ifeq ($(PLATFORM),Linux)
CLIENT_LIBS+= -lrt
More information about the svn-ports-head
mailing list