pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

xonotic: Fix a bug w.r.t. 'make install'.



Module Name:	pkgsrc-wip
Committed By:	Charlotte Koch <cfkoch%edgebsd.org@localhost>
Pushed By:	cfkoch
Date:		Sun Jan 29 23:19:07 2017 -0800
Changeset:	fdc535e38cd391c59f1d0fc7e3f8ce139a2b6385

Modified Files:
	xonotic/Makefile
	xonotic/TODO
	xonotic/distinfo
	xonotic/patches/patch-Makefile

Log Message:
xonotic: Fix a bug w.r.t. 'make install'.

Also update the TODO; include instructions on how to actually get this thing
running.

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

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

diffstat:
 xonotic/Makefile               |  2 ++
 xonotic/TODO                   |  5 ++++-
 xonotic/distinfo               |  2 +-
 xonotic/patches/patch-Makefile | 13 +++++++++++--
 4 files changed, 18 insertions(+), 4 deletions(-)

diffs:
diff --git a/xonotic/Makefile b/xonotic/Makefile
index 5437384..b0a8b6b 100644
--- a/xonotic/Makefile
+++ b/xonotic/Makefile
@@ -15,6 +15,8 @@ USE_LANGUAGES+=	c c++
 
 WRKSRC=		${WRKDIR}/Xonotic
 BUILD_TARGET=	all-zip-source
+INSTALL_TARGET=	install-data-zip-source install-engine-zip-source install-links
+INSTALL_ENV+=	LIBDIR=$(PREFIX)/lib
 
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
diff --git a/xonotic/TODO b/xonotic/TODO
index 5d6553f..80e3ae5 100644
--- a/xonotic/TODO
+++ b/xonotic/TODO
@@ -1,2 +1,5 @@
 - I only have been testing with NetBSD so far
-- darkplaces-sdl builds and links OK except for some rpath strangeness
+
+- No proper installation yet, instead do this: 
+
+    $ cd ${WRKSRC} && ./source/darkplaces/darkplaces-sdl -xonotic
diff --git a/xonotic/distinfo b/xonotic/distinfo
index ca9da28..9ab4cd2 100644
--- a/xonotic/distinfo
+++ b/xonotic/distinfo
@@ -4,7 +4,7 @@ SHA1 (xonotic-0.8.1.zip) = 2f6d46caa35a6778845c0c927d889af57677f8d2
 RMD160 (xonotic-0.8.1.zip) = cf5d5c7535aca52877770e9abea8cdb79e6463dd
 SHA512 (xonotic-0.8.1.zip) = adfce546257bdc7cfebe94f53eaa9cc9b19eaa546c6405e31ed6af080e3948732c960a024126202e5853cb98b955daadeeb5a96c602a6d4d83e284d3540214a4
 Size (xonotic-0.8.1.zip) = 984854761 bytes
-SHA1 (patch-Makefile) = 5062b2e3366d3ce3aa060228c6121c30c63d7285
+SHA1 (patch-Makefile) = 356a04b77ee429c49847594a3ff7744ab82d1632
 SHA1 (patch-source_darkplaces_hmac.c) = 2fae84c009f8808c814e4b68ba8c5640a001f699
 SHA1 (patch-source_darkplaces_hmac.h) = 62e3c7a657b8bef5a0dbb7fb0367379bcaae6347
 SHA1 (patch-source_darkplaces_makefile.inc) = 15ce0ee293bb255cae90ec5682881c2ad9ecef3b
diff --git a/xonotic/patches/patch-Makefile b/xonotic/patches/patch-Makefile
index 6bd6323..abd3b86 100644
--- a/xonotic/patches/patch-Makefile
+++ b/xonotic/patches/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.old	2017-01-29 15:33:05.816238729 -0800
-+++ Makefile	2017-01-29 15:33:11.893156479 -0800
+--- ./Makefile.orig	2015-08-25 15:05:04.000000000 -0700
++++ ./Makefile	2017-01-29 22:14:53.212882308 -0800
 @@ -30,7 +30,7 @@
  	( cd source/d0_blind_id && ./configure --enable-static --disable-shared $(RIJNDAELDETECT_CONFIGURE) )
  	$(MAKE) -C source/d0_blind_id
@@ -9,3 +9,12 @@
  	$(MAKE) -C source/darkplaces sv-release DP_CRYPTO_STATIC_LIBDIR=$(CURDIR)/source/d0_blind_id/.libs
  	$(MAKE) -C source/darkplaces cl-release DP_CRYPTO_STATIC_LIBDIR=$(CURDIR)/source/d0_blind_id/.libs
  	$(MAKE) -C source/darkplaces sdl-release DP_CRYPTO_STATIC_LIBDIR=$(CURDIR)/source/d0_blind_id/.libs
+@@ -115,7 +115,7 @@
+ 
+ .PHONY: install-links
+ install-links:
+-	$(INSTALL) -d $(BINDIR)
++	$(INSTALL) -d $(DESTDIR)$(BINDIR)
+ 	$(LN) -snf $(LIBDIR)/xonotic-linux-sdl.sh $(DESTDIR)$(BINDIR)/xonotic-sdl
+ 	$(LN) -snf $(LIBDIR)/xonotic-linux-glx.sh $(DESTDIR)$(BINDIR)/xonotic-glx
+ 	$(LN) -snf $(LIBDIR)/xonotic-linux-dedicated.sh $(DESTDIR)$(BINDIR)/xonotic-dedicated


Home | Main Index | Thread Index | Old Index