Date: Sat, 25 Jan 2014 22:31:46 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341130 - in branches/2014Q1/games/sauerbraten: . files Message-ID: <201401252231.s0PMVkGL056913@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Sat Jan 25 22:31:45 2014 New Revision: 341130 URL: http://svnweb.freebsd.org/changeset/ports/341130 QAT: https://qat.redports.org/buildarchive/r341130/ Log: MFH: r341119 - 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@janh.de> in [1]. - While here, convert USE_GMAKE=yes to USES=gmake. PR: ports/185033 [1] Submitted by: Jan Henrik Sylvester <me@janh.de> [1] Approved by: maintainer timeout (37 days) Approved by: portmgr (antoine) Modified: branches/2014Q1/games/sauerbraten/Makefile branches/2014Q1/games/sauerbraten/files/patch-src_Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/games/sauerbraten/Makefile ============================================================================== --- branches/2014Q1/games/sauerbraten/Makefile Sat Jan 25 22:30:09 2014 (r341129) +++ branches/2014Q1/games/sauerbraten/Makefile Sat Jan 25 22:31:45 2014 (r341130) @@ -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: branches/2014Q1/games/sauerbraten/files/patch-src_Makefile ============================================================================== --- branches/2014Q1/games/sauerbraten/files/patch-src_Makefile Sat Jan 25 22:30:09 2014 (r341129) +++ branches/2014Q1/games/sauerbraten/files/patch-src_Makefile Sat Jan 25 22:31:45 2014 (r341130) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401252231.s0PMVkGL056913>