Date: Fri, 20 Dec 2013 15:58:03 GMT From: Jan Henrik Sylvester <me@janh.de> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/185033: [PATCH] games/sauerbraten fix build on 10.0 Message-ID: <201312201558.rBKFw3oC063869@oldred.freebsd.org> Resent-Message-ID: <201312201600.rBKG00Ce072492@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 185033
>Category: ports
>Synopsis: [PATCH] games/sauerbraten fix build on 10.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Fri Dec 20 16:00:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Jan Henrik Sylvester
>Release: 10.0-RC2 amd64
>Organization:
>Environment:
>Description:
[Patch sent to maintainer for comments on 2013-12-06 without response. Repeating it here for it not to get lost.]
games/sauerbraten fails on 10 due to loader changes.
>How-To-Repeat:
Try to build games/sauerbraten on 10.0-RC2/amd64.
>Fix:
With the patch attached, games/sauerbraten builds, packages, and runs on
10.0-RC2/amd64.
Moreover it still builds on 9.2-RELEASE with the only difference in the
package being libexec/sauer_client. The only difference from 'readelf
-a' on this file is the order of libX11.so.6 with respect to the other
libs. The patch seems save.
Patch attached with submission follows:
--- games/sauerbraten/files/patch-src_Makefile.orig 2013-03-24 19:11:38.000000000 +0000
+++ games/sauerbraten/files/patch-src_Makefile 2013-12-06 18:10:53.000000000 +0000
@@ -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 -lSDL_image -lSDL_mixer -lz -lGL -lX11
endif
ifeq ($(PLATFORM),Linux)
CLIENT_LIBS+= -lrt
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312201558.rBKFw3oC063869>