From 344492dad4ccdd761a6163cf9a11a10843cc16bf Mon Sep 17 00:00:00 2001
From: William Kendrick <wkendrick@users.sourceforge.net>
Date: Fri, 7 Dec 2007 00:05:45 +0000
Subject: [PATCH] BeOS updates.

---
 Makefile         |  7 ++++---
 docs/CHANGES.txt |  5 +++--
 magic/Makefile   | 11 ++++++++++-
 src/fonts.h      |  2 +-
 src/i18n.c       |  4 ++--
 src/i18n.h       |  2 +-
 src/im.c         |  3 +++
 src/tuxpaint.c   |  4 ++--
 8 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index 3d953f0ce..406c73fc4 100644
--- a/Makefile
+++ b/Makefile
@@ -463,7 +463,7 @@ install-beos:
 		CONFDIR=./src/ \
 		ICON_PREFIX=. \
 		X11_ICON_PREFIX=. \
-		LOCALE_PREFIX=/boot/home/config/share/locale \
+		LOCALE_PREFIX=./build/share/locale \
 		IM_PREFIX=./src \
 		SVG_LIB= SVG_CFLAGS= NOSVGFLAG=NOSVG \
 		NOPANGOFLAG=NO_SDLPANGO SDL_PANGO_LIB= \
@@ -472,7 +472,8 @@ install-beos:
 		MIMESET_CMD="mimeset -f tuxpaint" \
 		ARCH_LINKS="-lintl -lpng -lz -lbe" \
 		ARCH_HEADERS="src/BeOS_print.h" \
-		ARCH_LIBS="obj/BeOS_print.o"
+		ARCH_LIBS="obj/BeOS_print.o" \
+		MAGIC_PREFIX=./build/lib/tuxpaint/plugins
 
 # "make install-win32" installs Tux Paint, but using MinGW/MSYS settings
 # Suitable for development/testing in the MinGW/MSYS environment.
@@ -885,7 +886,7 @@ tuxpaint:	obj/tuxpaint.o obj/i18n.o obj/im.o obj/cursor.o obj/pixels.o \
 		$(SDL_LIBS) \
 		$(SVG_LIB) \
 		$(PAPER_LIB) \
-		-lm $(ARCH_LINKS)
+		$(ARCH_LINKS)
 	@$(RSRC_CMD)
 	@$(MIMESET_CMD)
 
diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index 1ab5ca571..debf5b2dc 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -9,7 +9,7 @@ http://www.tuxpaint.org/
 $Id$
 
 
-2007.December.4 (0.9.19)
+2007.December.6 (0.9.19)
   * Localization Updates:
     ---------------------
     * Danish translation
@@ -26,7 +26,8 @@ $Id$
 
   * Build System Improvements
     -------------------------
-    * Cleaned up some BeOS-related things; disabling SVG and Pango for BeOS.
+    * Brought BeOS building up-to-date.
+      Begasus <Begasus@skynet.be>
 
   * Bug Fixes
     ---------
diff --git a/magic/Makefile b/magic/Makefile
index 56d2bb8e3..de425672f 100644
--- a/magic/Makefile
+++ b/magic/Makefile
@@ -6,7 +6,7 @@
 # bill@newbreedsoftware.com
 # http://www.tuxpaint.org/
 
-# July 2007 - October 24, 2007
+# July 2007 - December 6, 2007
 
 
 SO_TYPE=so
@@ -59,6 +59,15 @@ clean:
 	@echo "Cleaning up the Magic plug-ins directory ($(PWD))"
 	@-rm -f *.$(SO_TYPE)
 
+
+# beos versions of the targets
+
+beos:
+	make \
+		SO_TYPE=so \
+		PLUGIN_LIBS="$(SDL_LIBS) $(ARCH_LINKS) $(SDL_CFLAGS) $(TP_MAGIC_CFLAGS)"
+
+
 # win32 versions of the targets
 
 cleanwin32:
diff --git a/src/fonts.h b/src/fonts.h
index 85263f823..00c7dee4d 100644
--- a/src/fonts.h
+++ b/src/fonts.h
@@ -8,7 +8,7 @@
 // plan to rip this out as soon as it is considered stable
 //#define THREADED_FONTS
 #define FORKED_FONTS
-#ifdef WIN32
+#if defined(WIN32) || defined(__BEOS__)
 #undef FORKED_FONTS
 #endif
 
diff --git a/src/i18n.c b/src/i18n.c
index 853e41218..e15b87b4a 100644
--- a/src/i18n.c
+++ b/src/i18n.c
@@ -25,7 +25,7 @@
 
   $Id$
 
-  June 14, 2002 - July 26, 2007
+  June 14, 2002 - December 6, 2007
 */
 
 #include <stdio.h>
@@ -54,7 +54,7 @@
 #define OLD_UPPERCASE_CODE
 #endif
 
-#ifndef OLD_UPPERCASE_CODE
+#if !defined(OLD_UPPERCASE_CODE) || defined(__BEOS__)
 #include <wctype.h>
 #endif
 
diff --git a/src/i18n.h b/src/i18n.h
index 11eb85347..d906fb44b 100644
--- a/src/i18n.h
+++ b/src/i18n.h
@@ -10,7 +10,7 @@
 
   $Id$
   
-  June 14, 2002 - October 14, 2007
+  June 14, 2002 - December 6, 2007
 */
 
 
diff --git a/src/im.c b/src/im.c
index f8ff4981a..f8558be2e 100644
--- a/src/im.c
+++ b/src/im.c
@@ -570,9 +570,12 @@ static int charmap_load(CHARMAP* cm, const char* path)
         if(charmap_add(cm, section, buf, unicode, flag)) {
           size_t i = 0;
 
+#ifndef __BEOS__
           fwprintf(stderr, L"Unable to add sequence '%ls', unicode ", buf);
           for(i = 0; i < wcslen(unicode); i++) fwprintf(stderr, L"%04X ", (int)unicode[i]);
           fwprintf(stderr, L"in section %d\n", section);
+#endif
+
           error_code = 1;
         }
     }
diff --git a/src/tuxpaint.c b/src/tuxpaint.c
index 7265bbb06..315a0c0c6 100644
--- a/src/tuxpaint.c
+++ b/src/tuxpaint.c
@@ -22,7 +22,7 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   (See COPYING.txt)
   
-  June 14, 2002 - December 4, 2007
+  June 14, 2002 - December 6, 2007
   $Id$
 */
 
@@ -221,7 +221,7 @@ char *strcasestr(const char *haystack, const char *needle)
 
 #include <locale.h>
 
-#ifndef OLD_UPPERCASE_CODE
+#if !defined(OLD_UPPERCASE_CODE) || defined(__BEOS__)
 #include <wctype.h>
 #endif