From 5af1fa2e5299f4b9634ab5426e1de5ee47641a7c Mon Sep 17 00:00:00 2001
From: "psyc://psyced.org/~lynX" <@>
Date: Sat, 30 Jan 2016 00:11:29 +0100
Subject: [PATCH] BSD tweaks

---
 src/autoconf/configure.in |  5 ++++-
 src/bytecode.h            | 14 ++++++++------
 src/version.sh            |  2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/autoconf/configure.in b/src/autoconf/configure.in
index 607ee95..ff9e413 100644
--- a/src/autoconf/configure.in
+++ b/src/autoconf/configure.in
@@ -1304,7 +1304,10 @@ if test -f /usr/sbin/iconvconfig; then
         lp_cv_has_broken_iconv="no"
     fi
 else
-  lp_cv_has_broken_iconv="no"
+    if test -f /usr/local/bin/iconv; then
+        lp_cv_has_broken_iconv="no"
+        lp_cv_has_iconv="yes"
+    fi
 fi
 echo "$as_me:$LINENO: result: $lp_cv_has_broken_iconv" >&5
 echo "${ECHO_T}$lp_cv_has_broken_iconv" >&6
diff --git a/src/bytecode.h b/src/bytecode.h
index 686bc19..72a2599 100644
--- a/src/bytecode.h
+++ b/src/bytecode.h
@@ -267,17 +267,19 @@ typedef bytecode_t    * bytecode_p;
 # define LOAD_INT32(d,p)  LOAD_4BYTE(d,p)
 # define STORE_INT32(p,d) STORE_4BYTE(p,d)
 #else
-# define GET_LONG(d,p)    GET_4BYTE(d,p)
-# define LOAD_LONG(d,p)   LOAD_4BYTE(d,p)
-# define PUT_LONG(p,d)    MACRO(unsigned long _us = (unsigned long)d; \
+# ifndef GET_LONG /* happens on BSD */
+#  define GET_LONG(d,p)    GET_4BYTE(d,p)
+#  define LOAD_LONG(d,p)   LOAD_4BYTE(d,p)
+#  define PUT_LONG(p,d)    MACRO(unsigned long _us = (unsigned long)d; \
                                 PUT_4BYTE(p,_us);)
-# define STORE_LONG(p,d)  MACRO(unsigned long _us = (unsigned long)d; \
+#  define STORE_LONG(p,d)  MACRO(unsigned long _us = (unsigned long)d; \
                                 STORE_4BYTE(p,_us);)
-# define RSTORE_LONG(p,d) MACRO(unsigned long _us = (unsigned long)d; \
+#  define RSTORE_LONG(p,d) MACRO(unsigned long _us = (unsigned long)d; \
                                 RSTORE_4BYTE(p,_us);)
   /* TODO: The above assumes sizeof(long) == 4. */
 
-# define LOAD_INT32(d,p) LOAD_2BYTE(d,p)
+#  define LOAD_INT32(d,p) LOAD_2BYTE(d,p)
+# endif
 #endif
 
 #endif /* CHAR_BIT */
diff --git a/src/version.sh b/src/version.sh
index 0cabba5..34552a7 100644
--- a/src/version.sh
+++ b/src/version.sh
@@ -17,7 +17,7 @@ version_longtype="stable"
 # A timestamp, to be used by bumpversion and other scripts.
 # It can be used, for example, to 'touch' this file on every build, thus
 # forcing revision control systems to add it on every checkin automatically.
-version_stamp="Fri Sep 27 22:12:45 CEST 2013"
+version_stamp="Wed Jan 28 16:33:10 CET 2015"
 
 # Okay, LDMUD is using 3.x.x so to avoid conflicts let's just use 4.x.x
 version_major=4