pkgsrc-WIP-changes archive

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

fogleman-craft: Get it to compile on NetBSD



Module Name:	pkgsrc-wip
Committed By:	Charlotte Koch <cfkoch%edgebsd.org@localhost>
Pushed By:	cfkoch
Date:		Sun Feb 18 04:30:50 2018 -0800
Changeset:	d0e4176f8ccfb3f80314ee0932ccf7492c40d7a6

Modified Files:
	fogleman-craft/Makefile
	fogleman-craft/distinfo
Added Files:
	fogleman-craft/patches/patch-CMakeLists.txt
	fogleman-craft/patches/patch-src_client.c
Removed Files:
	fogleman-craft/TODO

Log Message:
fogleman-craft: Get it to compile on NetBSD

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

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

diffstat:
 fogleman-craft/Makefile                     |  5 +++--
 fogleman-craft/TODO                         |  2 --
 fogleman-craft/distinfo                     |  2 ++
 fogleman-craft/patches/patch-CMakeLists.txt | 19 +++++++++++++++++++
 fogleman-craft/patches/patch-src_client.c   | 12 ++++++++++++
 5 files changed, 36 insertions(+), 4 deletions(-)

diffs:
diff --git a/fogleman-craft/Makefile b/fogleman-craft/Makefile
index 748db2bd4d..181307c62f 100644
--- a/fogleman-craft/Makefile
+++ b/fogleman-craft/Makefile
@@ -1,9 +1,10 @@
 # $NetBSD$
 
-DISTNAME=	Craft-${GITHUB_TAG}
+DISTNAME=	${GITHUB_PROJECT}-${GITHUB_TAG}
 PKGNAME=	fogleman-craft-${VERSION}
 VERSION=	1.0
 GITHUB_TAG=	v${PKGVERSION_NOREV}
+GITHUB_PROJECT=	Craft
 MASTER_SITES=	${MASTER_SITE_GITHUB:=fogleman/}
 CATEGORIES=	games
 LICENSE=	mit
@@ -15,7 +16,7 @@ HOMEPAGE=	https://www.michaelfogleman.com/craft/
 USE_CMAKE=	yes
 USE_LANGUAGES+=	c c++
 
-WRKSRC=			${WRKDIR}/Craft-${VERSION}
+WRKSRC=			${WRKDIR}/${GITHUB_PROJECT}-${VERSION}
 INSTALLATION_DIRS=	bin
 
 # The default 'install' target wants to install the dependencies it
diff --git a/fogleman-craft/TODO b/fogleman-craft/TODO
deleted file mode 100644
index 8c8c45cc1a..0000000000
--- a/fogleman-craft/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-- Tested only on Darwin so far
-- Avoid building the built-in SQLite3 if possible
diff --git a/fogleman-craft/distinfo b/fogleman-craft/distinfo
index dc75000d24..32f937c7a2 100644
--- a/fogleman-craft/distinfo
+++ b/fogleman-craft/distinfo
@@ -4,3 +4,5 @@ SHA1 (Craft-v1.0.tar.gz) = 0e4f49d5d1a2f33204b98f76c5d34b30077babb1
 RMD160 (Craft-v1.0.tar.gz) = 6d86607f2a47ee43d952fb983e236e0a8d55615e
 SHA512 (Craft-v1.0.tar.gz) = ad02f874cff843138a83fa1ee21322da8cf63e1dfc09b94cacb92817b40814191c4f8cbf75ac494a4ea7474de845504ebf15b6ff47dde3968dcf4e1e124862b8
 Size (Craft-v1.0.tar.gz) = 2314437 bytes
+SHA1 (patch-CMakeLists.txt) = 618bd4ff00ca0c0bcd8ec8d98cd153c79a2cb410
+SHA1 (patch-src_client.c) = 1bc2032dafe11fc1afb69cf262a895a84f94ad6d
diff --git a/fogleman-craft/patches/patch-CMakeLists.txt b/fogleman-craft/patches/patch-CMakeLists.txt
new file mode 100644
index 0000000000..12bf8d05fa
--- /dev/null
+++ b/fogleman-craft/patches/patch-CMakeLists.txt
@@ -0,0 +1,19 @@
+$NetBSD$
+--- CMakeLists.txt.orig	2014-02-02 06:55:04.000000000 -0800
++++ CMakeLists.txt	2018-02-18 04:28:05.951626549 -0800
+@@ -38,9 +38,14 @@
+         ${GLFW_LIBRARIES} ${CURL_LIBRARIES})
+ endif()
+ 
++find_library(LIBDL dl)
++
+ if(UNIX)
+-    target_link_libraries(craft dl glfw
++    target_link_libraries(craft glfw
+         ${GLFW_LIBRARIES} ${CURL_LIBRARIES})
++    if (${LIBDL})
++        target_link_libraries(craft ${LIBDL})
++    endif()
+ endif()
+ 
+ if(MINGW)
diff --git a/fogleman-craft/patches/patch-src_client.c b/fogleman-craft/patches/patch-src_client.c
new file mode 100644
index 0000000000..722446849f
--- /dev/null
+++ b/fogleman-craft/patches/patch-src_client.c
@@ -0,0 +1,12 @@
+$NetBSD$
+--- src/client.c.orig	2018-02-18 04:15:26.483034514 -0800
++++ src/client.c	2018-02-18 04:15:40.067922408 -0800
+@@ -11,6 +11,8 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
+ #include "client.h"
+ #include "tinycthread.h"
+ 


Home | Main Index | Thread Index | Old Index