aboutsummaryrefslogtreecommitdiffstats
path: root/games
diff options
context:
space:
mode:
Diffstat (limited to 'games')
-rw-r--r--games/allacrost/Makefile4
-rw-r--r--games/allacrost/files/patch-src-utils.cpp18
-rw-r--r--games/cuyo/files/patch-src__cuyointl.cpp11
-rw-r--r--games/hex-a-hop/Makefile3
-rw-r--r--games/hex-a-hop/files/patch-src-text.cpp11
-rw-r--r--games/ldmud/Makefile2
-rw-r--r--games/ldmud/files/patch-Makefile.in22
-rw-r--r--games/ldmud/files/patch-configure75
-rw-r--r--games/pokerth/files/patch-src-core-linux-convhelper.cpp23
-rw-r--r--games/valyriatear/files/patch-src-utils-ustring.cpp11
10 files changed, 117 insertions, 63 deletions
diff --git a/games/allacrost/Makefile b/games/allacrost/Makefile
index 07de47e9dca2..dd5d3d1a8f9f 100644
--- a/games/allacrost/Makefile
+++ b/games/allacrost/Makefile
@@ -3,7 +3,7 @@
PORTNAME= allacrost
PORTVERSION= 1.0.2
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-demo/${PORTVERSION}
DISTNAME= ${PORTNAME}_demo_source_${PORTVERSION}
@@ -20,7 +20,7 @@ LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \
LICENSE= GPLv2
GNU_CONFIGURE= yes
-USES= gettext gmake openal:al lua:51
+USES= gettext gmake iconv openal:al lua:51
USE_SDL= sdl ttf net
USE_GL= yes
USE_GCC= any # problems in luabind
diff --git a/games/allacrost/files/patch-src-utils.cpp b/games/allacrost/files/patch-src-utils.cpp
index 3a1966441815..7c076fa503bd 100644
--- a/games/allacrost/files/patch-src-utils.cpp
+++ b/games/allacrost/files/patch-src-utils.cpp
@@ -8,21 +8,3 @@
#include <pwd.h>
#endif
-@@ -337,7 +338,7 @@
- }
-
- const char *source_char = reinterpret_cast<const char *>(source);
-- #if (defined(_LIBICONV_VERSION) && _LIBICONV_VERSION == 0x0109)
-+ #if 1
- // We are using an iconv API that uses const char*
- const char *sourceChar = source_char;
- #else
-@@ -369,7 +370,7 @@
- return false;
- }
-
-- #if (defined(_LIBICONV_VERSION) && _LIBICONV_VERSION == 0x0109)
-+ #if 1
- // We are using an iconv API that uses const char*
- const char *sourceChar = source;
- #else
diff --git a/games/cuyo/files/patch-src__cuyointl.cpp b/games/cuyo/files/patch-src__cuyointl.cpp
deleted file mode 100644
index 9302f90edc19..000000000000
--- a/games/cuyo/files/patch-src__cuyointl.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/cuyointl.cpp.orig
-+++ src/cuyointl.cpp
-@@ -93,7 +93,7 @@
- return convert_error(ret,s,"Character conversion not possible.");
-
- while (*inpos) {
-- size_t res = iconv(handle,&inpos,&inleft,&outpos,&outleft);
-+ size_t res = iconv(handle,(const char **)&inpos,&inleft,&outpos,&outleft);
- if (res == (size_t) -1)
- /* An error occured */
- switch (errno) {
diff --git a/games/hex-a-hop/Makefile b/games/hex-a-hop/Makefile
index 2ec960f0efcc..512d351a25ed 100644
--- a/games/hex-a-hop/Makefile
+++ b/games/hex-a-hop/Makefile
@@ -3,13 +3,14 @@
PORTNAME= hex-a-hop
PORTVERSION= 1.1.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME:S/-//g}/${PORTVERSION}
MAINTAINER= makc@FreeBSD.org
COMMENT= Puzzle game based on hexagonal tiles
+USES= iconv
USE_SDL= sdl
GNU_CONFIGURE= yes
diff --git a/games/hex-a-hop/files/patch-src-text.cpp b/games/hex-a-hop/files/patch-src-text.cpp
deleted file mode 100644
index 8bfce50bf2dd..000000000000
--- a/games/hex-a-hop/files/patch-src-text.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/text.cpp~
-+++ src/text.cpp
-@@ -439,7 +439,7 @@ void ConvertToUTF8(const std::string &te
- errno = 0;
- static const char *locale_enc = gettext_init.GetEncoding();
- iconv_t cd = iconv_open("UTF-8", locale_enc);
-- char *in_buf = const_cast<char *>(&text_locally_encoded[0]);
-+ const char *in_buf = const_cast<char *>(&text_locally_encoded[0]);
- char *out_buf = &text_utf8[0];
- iconv(cd, &in_buf, &text_length, &out_buf, &text_utf8_length);
- iconv_close(cd);
diff --git a/games/ldmud/Makefile b/games/ldmud/Makefile
index 5cb716d12e23..bee0b0c0872e 100644
--- a/games/ldmud/Makefile
+++ b/games/ldmud/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ldmud
PORTVERSION= 3.3.720
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= games net
MASTER_SITES= http://www.bearnip.com/ftp/mud/ \
diff --git a/games/ldmud/files/patch-Makefile.in b/games/ldmud/files/patch-Makefile.in
index 5c043c2a5825..a79cd6647ff7 100644
--- a/games/ldmud/files/patch-Makefile.in
+++ b/games/ldmud/files/patch-Makefile.in
@@ -1,6 +1,22 @@
---- Makefile.in.orig 2013-12-29 15:19:34.000000000 +0100
-+++ Makefile.in 2013-12-29 15:20:35.000000000 +0100
-@@ -135,9 +135,9 @@ install: install-driver
+--- Makefile.in.orig 2011-02-26 21:05:08 UTC
++++ Makefile.in
+@@ -1,6 +1,5 @@
+ # TODO: Add some of the symbols in here to configure
+ # These lines are needed on some machines.
+-MAKE=make
+ SHELL=@CONFIG_SHELL@
+ INSTALL=@INSTALL@
+ mkinstalldirs=$(SHELL) @top_srcdir@/mkinstalldirs
+@@ -83,7 +82,7 @@ SFMT_FLAGS = -fno-strict-aliasing
+ #
+ MPATH=-DMUD_LIB='"$(MUD_LIB)"' -DBINDIR='"$(BINDIR)"' -DERQ_DIR='"$(ERQ_DIR)"'
+ #
+-CFLAGS= @EXTRA_CFLAGS@ $(OPTIMIZE) $(DEBUG) $(WARN) $(MPATH) $(PROFIL)
++CFLAGS= @CPPFLAGS@ @CFLAGS@ @EXTRA_CFLAGS@ $(DEBUG) $(WARN) $(MPATH) $(PROFIL)
+ #
+ LIBS=@LIBS@ @PKGLIBS@
+ #
+@@ -135,9 +134,9 @@ install: install-driver
@echo "To install everything in one go, use 'make install-all'."
install-driver: ldmud@EXEEXT@ docs
diff --git a/games/ldmud/files/patch-configure b/games/ldmud/files/patch-configure
new file mode 100644
index 000000000000..d54d1cf11ac1
--- /dev/null
+++ b/games/ldmud/files/patch-configure
@@ -0,0 +1,75 @@
+--- configure.orig 2011-02-26 21:05:08 UTC
++++ configure
+@@ -13600,7 +13600,7 @@ for TESTFLAG in -O; do
+ #the [e]grep option -v will not give a failure exit status on the atari
+ else
+ if eval $tcomp; then
+- CFLAGS=$TESTFLAG
++ LCFLAGS=$TESTFLAG
+ break
+ fi
+ fi
+@@ -13608,10 +13608,9 @@ for TESTFLAG in -O; do
+ done
+ for TESTFLAG in -g; do
+ if eval $tcomp; then
+- CFLAGS="$CFLAGS $TESTFLAG"
++ LCFLAGS="$LCFLAGS $TESTFLAG"
+ fi
+ done
+-LCFLAGS=$CFLAGS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LCFLAGS" >&5
+ $as_echo "$LCFLAGS" >&6; }
+
+@@ -13624,7 +13623,7 @@ for TESTFLAG in -O2 -O; do
+ #the [e]grep option -v will not give a failure exit status on the atari
+ else
+ if eval $tcomp; then
+- CFLAGS=$TESTFLAG
++ MCFLAGS=$TESTFLAG
+ break
+ fi
+ fi
+@@ -13633,10 +13632,9 @@ done
+ for TESTFLAG in -g; do
+ if eval $tcomp; then
+ OPTFLAGS="$OPTFLAGS $TESTFLAG"
+- CFLAGS="$CFLAGS $TESTFLAG"
++ MCFLAGS="$MCFLAGS $TESTFLAG"
+ fi
+ done
+-MCFLAGS=$CFLAGS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MCFLAGS" >&5
+ $as_echo "$MCFLAGS" >&6; }
+
+@@ -13649,7 +13647,7 @@ for TESTFLAG in -O4 -O3 -O2 -O; do
+ #the [e]grep option -v will not give a failure exit status on the atari
+ else
+ if eval $tcomp; then
+- CFLAGS=$TESTFLAG
++ OCFLAGS=$TESTFLAG
+ break
+ fi
+ fi
+@@ -13663,7 +13661,7 @@ if test "$ac_cv_c_compiler_gnu" = "no";
+ #the [e]grep option -v will not give a failure exit status on the atari
+ else
+ if eval $tcomp; then
+- CFLAGS="$CFLAGS $TESTFLAG"
++ OCFLAGS="$OCFLAGS $TESTFLAG"
+ break
+ fi
+ fi
+@@ -13673,10 +13671,10 @@ fi
+ # -funroll-all-loops causes some versions of gcc to produce buggy code
+ for TESTFLAG in -fomit-frame-pointer; do
+ if eval $tcomp; then
+- CFLAGS="$CFLAGS $TESTFLAG"
++ OCFLAGS="$OCFLAGS $TESTFLAG"
+ fi
+ done
+-OCFLAGS="$CFLAGS $OPTFLAGS"
++OCFLAGS="$OCFLAGS $OPTFLAGS"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCFLAGS" >&5
+ $as_echo "$OCFLAGS" >&6; }
+ if ${CC-cc} -g -c conftest.c ; then
diff --git a/games/pokerth/files/patch-src-core-linux-convhelper.cpp b/games/pokerth/files/patch-src-core-linux-convhelper.cpp
index d5e9c574809d..8b2958408e66 100644
--- a/games/pokerth/files/patch-src-core-linux-convhelper.cpp
+++ b/games/pokerth/files/patch-src-core-linux-convhelper.cpp
@@ -1,20 +1,11 @@
---- src/core/linux/convhelper.cpp.orig 2008-01-20 13:32:07.000000000 +0100
-+++ src/core/linux/convhelper.cpp 2008-01-20 12:56:03.000000000 +0100
-@@ -39,7 +39,7 @@
- #ifdef __APPLE__
- const char *inbuf = inStr.data();
- #else
-- char *inbuf = const_cast<char *>(inStr.data());
-+ const char *inbuf = const_cast<char *>(inStr.data());
+--- src/core/linux/convhelper.cpp.orig 2014-01-10 21:18:20 UTC
++++ src/core/linux/convhelper.cpp
+@@ -36,7 +36,7 @@
+ #error This file is not for Windows.
#endif
- const size_t c_outsize = insize * 6; // max size of utf-8 char is 6 per input char
-@@ -74,7 +74,7 @@
- #ifdef __APPLE__
- const char *inbuf = inStr.data();
- #else
-- char *inbuf = const_cast<char *>(inStr.data());
-+ const char *inbuf = const_cast<char *>(inStr.data());
+-#if defined(__FreeBSD__) || defined(__NetBSD__)
++#if defined(__NetBSD__)
+ #define HAVE_ICONV_CONST
#endif
- const size_t c_outsize = insize;
diff --git a/games/valyriatear/files/patch-src-utils-ustring.cpp b/games/valyriatear/files/patch-src-utils-ustring.cpp
new file mode 100644
index 000000000000..b88fe7019076
--- /dev/null
+++ b/games/valyriatear/files/patch-src-utils-ustring.cpp
@@ -0,0 +1,11 @@
+--- src/utils/ustring.cpp.orig 2013-09-24 11:33:12 UTC
++++ src/utils/ustring.cpp
+@@ -203,7 +203,7 @@ static bool UTF8ToUTF16(const char *sour
+ return false;
+ }
+
+-#if (defined(_LIBICONV_VERSION) && _LIBICONV_VERSION == 0x0109) || defined(__FreeBSD__)
++#if defined(_LIBICONV_VERSION) && _LIBICONV_VERSION == 0x0109
+ // We are using an iconv API that uses const char*
+ const char *sourceChar = source;
+ #else