From owner-svn-ports-branches@FreeBSD.ORG Sat Jan 25 22:31:46 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E60EE7FD; Sat, 25 Jan 2014 22:31:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B73BE1E1F; Sat, 25 Jan 2014 22:31:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0PMVkkp056915; Sat, 25 Jan 2014 22:31:46 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PMVkGL056913; Sat, 25 Jan 2014 22:31:46 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201401252231.s0PMVkGL056913@svn.freebsd.org> From: Raphael Kubo da Costa Date: Sat, 25 Jan 2014 22:31:46 +0000 (UTC) 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 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Jan 2014 22:31:47 -0000 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 in [1]. - While here, convert USE_GMAKE=yes to USES=gmake. PR: ports/185033 [1] Submitted by: Jan Henrik Sylvester [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