summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorespie <espie@openbsd.org>2017-05-24 19:19:22 (GMT)
committerespie <espie@openbsd.org>2017-05-24 19:19:22 (GMT)
commit5cfa4d30f98830b8a26dff15f9e0322deb11b52f (patch)
treeb724de20fed22e71bf973ea1847fa4f7e19259af
parent79e7cba2848204ece4f491fbec7408c1a75ce918 (diff)
downloadopenbsd-ports-5cfa4d30f98830b8a26dff15f9e0322deb11b52f.tar.gz
openbsd-ports-5cfa4d30f98830b8a26dff15f9e0322deb11b52f.tar.xz
let it build with clang, as-needed nonsensical for end program
-rw-r--r--games/warmux/patches/patch-lib_fixedpoint_fixed_class_h14
-rw-r--r--games/warmux/patches/patch-src_Makefile_in14
-rw-r--r--games/warmux/patches/patch-src_tool_string_tools_h14
-rw-r--r--games/warmux/patches/patch-tools_list_games_Makefile_in14
-rw-r--r--games/warmux/patches/patch-tools_servers_game_server_Makefile_in16
-rw-r--r--games/warmux/patches/patch-tools_servers_index_server_Makefile_in14
-rw-r--r--games/warmux/patches/patch-tools_servers_index_server_server_h13
7 files changed, 96 insertions, 3 deletions
diff --git a/games/warmux/patches/patch-lib_fixedpoint_fixed_class_h b/games/warmux/patches/patch-lib_fixedpoint_fixed_class_h
new file mode 100644
index 0000000..08cf88d
--- /dev/null
+++ b/games/warmux/patches/patch-lib_fixedpoint_fixed_class_h
@@ -0,0 +1,14 @@
+$OpenBSD: patch-lib_fixedpoint_fixed_class_h,v 1.1 2017/05/24 19:19:22 espie Exp $
+
+Index: lib/fixedpoint/fixed_class.h
+--- lib/fixedpoint/fixed_class.h.orig
++++ lib/fixedpoint/fixed_class.h
+@@ -214,7 +214,7 @@ inline int uround(const fixed_point<16>& r)
+ }
+
+ namespace detail {
+- static bool isDigit(int c) {
++ static inline bool isDigit(int c) {
+ return c >= '0' && c <= '9';
+ }
+ }
diff --git a/games/warmux/patches/patch-src_Makefile_in b/games/warmux/patches/patch-src_Makefile_in
new file mode 100644
index 0000000..cc2741a
--- /dev/null
+++ b/games/warmux/patches/patch-src_Makefile_in
@@ -0,0 +1,14 @@
+$OpenBSD: patch-src_Makefile_in,v 1.1 2017/05/24 19:19:22 espie Exp $
+
+Index: src/Makefile.in
+--- src/Makefile.in.orig
++++ src/Makefile.in
+@@ -666,7 +666,7 @@ warmux_SOURCES = ai/ai_command.cpp ai/ai_command.h ai/
+ weapon/weapon_launcher.h weapon/weapon_strength_bar.cpp \
+ weapon/weapon_strength_bar.h weapon/weapons_list.cpp \
+ weapon/weapons_list.h $(am__append_1) $(am__append_2)
+-warmux_LDFLAGS = -Wl,--as-needed
++warmux_LDFLAGS =
+ AM_CXXFLAGS = -I $(top_srcdir)/src -DINSTALL_DATADIR=\"@DATADIR@\" \
+ -DINSTALL_LOCALEDIR=\"@LOCALEDIR@\" -DFONT_FILE=\"@FONTFILE@\" \
+ -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" @LIBCURL_CPPFLAGS@ \
diff --git a/games/warmux/patches/patch-src_tool_string_tools_h b/games/warmux/patches/patch-src_tool_string_tools_h
new file mode 100644
index 0000000..6268c8b
--- /dev/null
+++ b/games/warmux/patches/patch-src_tool_string_tools_h
@@ -0,0 +1,14 @@
+$OpenBSD: patch-src_tool_string_tools_h,v 1.1 2017/05/24 19:19:22 espie Exp $
+
+Index: src/tool/string_tools.h
+--- src/tool/string_tools.h.orig
++++ src/tool/string_tools.h
+@@ -20,7 +20,7 @@
+ *****************************************************************************/
+
+ #ifndef STRING_TOOLS_H
+-#define STRING_TOOLS__H
++#define STRING_TOOLS_H
+
+ #include <WARMUX_base.h>
+ #include <string>
diff --git a/games/warmux/patches/patch-tools_list_games_Makefile_in b/games/warmux/patches/patch-tools_list_games_Makefile_in
new file mode 100644
index 0000000..b9963bd
--- /dev/null
+++ b/games/warmux/patches/patch-tools_list_games_Makefile_in
@@ -0,0 +1,14 @@
+$OpenBSD: patch-tools_list_games_Makefile_in,v 1.1 2017/05/24 19:19:22 espie Exp $
+
+Index: tools/list_games/Makefile.in
+--- tools/list_games/Makefile.in.orig
++++ tools/list_games/Makefile.in
+@@ -257,7 +257,7 @@ SUBDIRS = .
+ warmux_list_games_SOURCES = \
+ main.cpp
+
+-warmux_list_games_LDFLAGS = -Wl,--as-needed
++warmux_list_games_LDFLAGS =
+ AM_CXXFLAGS = -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" \
+ @LIBCURL_CPPFLAGS@ -I$(top_srcdir)/lib/warmux-server/include \
+ -I$(top_srcdir)/lib/warmux/include \
diff --git a/games/warmux/patches/patch-tools_servers_game_server_Makefile_in b/games/warmux/patches/patch-tools_servers_game_server_Makefile_in
index c7150d7..ff018e5 100644
--- a/games/warmux/patches/patch-tools_servers_game_server_Makefile_in
+++ b/games/warmux/patches/patch-tools_servers_game_server_Makefile_in
@@ -1,6 +1,7 @@
-$OpenBSD: patch-tools_servers_game_server_Makefile_in,v 1.1 2016/11/04 10:27:27 naddy Exp $
---- tools/servers/game_server/Makefile.in.orig Thu Apr 28 21:08:19 2011
-+++ tools/servers/game_server/Makefile.in Fri Nov 4 11:19:16 2016
+$OpenBSD: patch-tools_servers_game_server_Makefile_in,v 1.2 2017/05/24 19:19:22 espie Exp $
+Index: tools/servers/game_server/Makefile.in
+--- tools/servers/game_server/Makefile.in.orig
++++ tools/servers/game_server/Makefile.in
@@ -164,7 +164,7 @@ LIBINTL = @LIBINTL@
LIBOBJS = @LIBOBJS@
LIBPNG_CFLAGS = @LIBPNG_CFLAGS@
@@ -10,3 +11,12 @@ $OpenBSD: patch-tools_servers_game_server_Makefile_in,v 1.1 2016/11/04 10:27:27
LIBXML2_CFLAGS = @LIBXML2_CFLAGS@
LIBXML2_LIBS = @LIBXML2_LIBS@
LOCALEDIR = @LOCALEDIR@
+@@ -268,7 +268,7 @@ warmux_server_SOURCES = \
+ server.h server.cpp \
+ main.cpp
+
+-warmux_server_LDFLAGS = -Wl,--as-needed
++warmux_server_LDFLAGS =
+ AM_CXXFLAGS = -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" \
+ @LIBCURL_CPPFLAGS@ -I$(top_srcdir)/lib/warmux-server/include \
+ -I$(top_srcdir)/lib/warmux/include \
diff --git a/games/warmux/patches/patch-tools_servers_index_server_Makefile_in b/games/warmux/patches/patch-tools_servers_index_server_Makefile_in
new file mode 100644
index 0000000..7d77488
--- /dev/null
+++ b/games/warmux/patches/patch-tools_servers_index_server_Makefile_in
@@ -0,0 +1,14 @@
+$OpenBSD: patch-tools_servers_index_server_Makefile_in,v 1.1 2017/05/24 19:19:22 espie Exp $
+
+Index: tools/servers/index_server/Makefile.in
+--- tools/servers/index_server/Makefile.in.orig
++++ tools/servers/index_server/Makefile.in
+@@ -273,7 +273,7 @@ warmux_index_server_SOURCES = \
+ stat.h stat.cpp \
+ sync_slave.h sync_slave.cpp
+
+-warmux_index_server_LDFLAGS = -Wl,--as-needed
++warmux_index_server_LDFLAGS =
+ AM_CXXFLAGS = -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" \
+ @LIBCURL_CPPFLAGS@ -I$(top_srcdir)/lib/warmux-server/include \
+ -I$(top_srcdir)/lib/fixedpoint
diff --git a/games/warmux/patches/patch-tools_servers_index_server_server_h b/games/warmux/patches/patch-tools_servers_index_server_server_h
new file mode 100644
index 0000000..ab3a335
--- /dev/null
+++ b/games/warmux/patches/patch-tools_servers_index_server_server_h
@@ -0,0 +1,13 @@
+$OpenBSD: patch-tools_servers_index_server_server_h,v 1.1 2017/05/24 19:19:22 espie Exp $
+
+Index: tools/servers/index_server/server.h
+--- tools/servers/index_server/server.h.orig
++++ tools/servers/index_server/server.h
+@@ -21,6 +21,7 @@
+ #define SERVER_H
+ #include <netinet/in.h>
+ #include <stdio.h>
++#include <sys/select.h>
+
+ class Client;
+