xonotic: More successful linking.

[Charlotte Koch <cfkoch%edgebsd.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Charlotte Koch <cfkoch%edgebsd.org@localhost>
Pushed By:	cfkoch
Date:		Sun Jan 29 21:29:41 2017 -0800
Changeset:	62ae94a059a4448745ee2266d9480ea4f2eb103e

Modified Files:
	xonotic/Makefile
	xonotic/distinfo
	xonotic/patches/patch-source_darkplaces_makefile.inc

Log Message:
xonotic: More successful linking.

In particular, add some more needed buildlinks. Merci, Chips

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=62ae94a059a4448745ee2266d9480ea4f2eb103e

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 xonotic/Makefile                                     |  4 +++-
 xonotic/distinfo                                     |  2 +-
 xonotic/patches/patch-source_darkplaces_makefile.inc | 18 +++++++++++++++---
 3 files changed, 19 insertions(+), 5 deletions(-)

diffs:
diff --git a/xonotic/Makefile b/xonotic/Makefile
index 9d83384..5437384 100644
--- a/xonotic/Makefile
+++ b/xonotic/Makefile
@@ -16,8 +16,10 @@ USE_LANGUAGES+=	c c++
 WRKSRC=		${WRKDIR}/Xonotic
 BUILD_TARGET=	all-zip-source
 
-.include "../../devel/gmp/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
+.include "../../devel/gmp/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/xonotic/distinfo b/xonotic/distinfo
index 1d62415..ca9da28 100644
--- a/xonotic/distinfo
+++ b/xonotic/distinfo
@@ -7,6 +7,6 @@ Size (xonotic-0.8.1.zip) = 984854761 bytes
 SHA1 (patch-Makefile) = 5062b2e3366d3ce3aa060228c6121c30c63d7285
 SHA1 (patch-source_darkplaces_hmac.c) = 2fae84c009f8808c814e4b68ba8c5640a001f699
 SHA1 (patch-source_darkplaces_hmac.h) = 62e3c7a657b8bef5a0dbb7fb0367379bcaae6347
-SHA1 (patch-source_darkplaces_makefile.inc) = e6b145ac7bd945a4cb957a3cc6a8a0eefc35b980
+SHA1 (patch-source_darkplaces_makefile.inc) = 15ce0ee293bb255cae90ec5682881c2ad9ecef3b
 SHA1 (patch-source_gmqcc_Makefile) = 40716c8fd9b46307bf7996300151822a704e6c48
 SHA1 (patch-source_gmqcc_gmqcc.h) = 1703136b3022637885bfa51a3e08ec8a86d20b05
diff --git a/xonotic/patches/patch-source_darkplaces_makefile.inc b/xonotic/patches/patch-source_darkplaces_makefile.inc
index 73f51c8..defa7d2 100644
--- a/xonotic/patches/patch-source_darkplaces_makefile.inc
+++ b/xonotic/patches/patch-source_darkplaces_makefile.inc
@@ -1,11 +1,23 @@
---- ./source/darkplaces/makefile.inc.old	2017-01-29 16:01:20.020748344 -0800
-+++ ./source/darkplaces/makefile.inc	2017-01-29 16:01:52.502349209 -0800
+--- ./source/darkplaces/makefile.inc.orig	2015-08-25 15:10:24.000000000 -0700
++++ ./source/darkplaces/makefile.inc	2017-01-29 21:11:21.384400446 -0800
+@@ -30,9 +30,9 @@
+ SDLCONFIG_UNIXCFLAGS?=`$(SDL_CONFIG) --cflags`
+ SDLCONFIG_UNIXCFLAGS_X11?=
+ SDLCONFIG_UNIXLIBS?=`$(SDL_CONFIG) --libs`
+-SDLCONFIG_UNIXLIBS_X11?=-lX11
++SDLCONFIG_UNIXLIBS_X11?=
+ SDLCONFIG_UNIXSTATICLIBS?=`$(SDL_CONFIG) --static-libs`
+-SDLCONFIG_UNIXSTATICLIBS_X11?=-lX11
++SDLCONFIG_UNIXSTATICLIBS_X11?=
+ SDLCONFIG_MACOSXCFLAGS=-I/Library/Frameworks/SDL.framework/Headers -I$(HOME)/Library/Frameworks/SDL.framework/Headers
+ SDLCONFIG_MACOSXLIBS=-F$(HOME)/Library/Frameworks/ -framework SDL -framework Cocoa $(SDLCONFIG_MACOSXCFLAGS)
+ SDLCONFIG_MACOSXSTATICLIBS=-F$(HOME)/Library/Frameworks/ -framework SDL -framework Cocoa $(SDLCONFIG_MACOSXCFLAGS)
 @@ -205,7 +205,7 @@
  
  OBJ_GLX= builddate.c sys_linux.o vid_glx.o thread_pthread.o keysym2ucs.o $(OBJ_MENU) $(OBJ_SOUND) $(OBJ_CD) $(OBJ_VIDEO_CAPTURE) $(OBJ_COMMON)
  
 -LDFLAGS_UNIXCOMMON=-lm $(LIB_ODE) $(LIB_Z) $(LIB_JPEG) $(LIB_CRYPTO) $(LIB_CRYPTO_RIJNDAEL)
-+LDFLAGS_UNIXCOMMON=-lm $(LIB_ODE) $(LIB_Z) $(LIB_JPEG) $(LIB_CRYPTO) $(LIB_CRYPTO_RIJNDAEL) -L${PREFIX}/lib
++LDFLAGS_UNIXCOMMON=-lm $(LIB_ODE) $(LIB_Z) $(LIB_JPEG) $(LIB_CRYPTO) $(LIB_CRYPTO_RIJNDAEL) -L$(PREFIX)/lib -Wl,-rpath,/usr/X11R7/lib
  LDFLAGS_UNIXCL=-L$(UNIX_X11LIBPATH) -lX11 -lXpm -lXext -lXxf86vm -pthread $(LIB_SOUND)
  LDFLAGS_UNIXCL_PRELOAD=-lz -ljpeg -lpng -logg -ltheora -lvorbis -lvorbisenc -lvorbisfile -lcurl
  LDFLAGS_UNIXSV_PRELOAD=-lz -ljpeg -lpng -lcurl