darwin fixes (-lmx for additional math functions, malloc.h->stdlib.h,

and change the Imakefile to use a "NoMan" rule since the patch to fake
out the man page build on NetBSD doesn't work with darwin's Imake
man-page-building rule)

4 files changed, 41 insertions, 17 deletions

diff --git a/x11/xscribble/Makefile b/x11/xscribble/Makefile
index e7244b1276e..cfe0b6ed984 100644
--- a/x11/xscribble/Makefile
+++ b/x11/xscribble/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 22:57:03 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/05/23 18:31:27 danw Exp $
 
 DISTNAME=	xscribble
 PKGNAME=	xscribble-20000616
@@ -13,6 +13,13 @@ COMMENT=	Handwriting recognition (like graffiti)
 USE_IMAKE=	YES
 NO_INSTALL_MANPAGES=	YES
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "Darwin"
+SYS_LIBRARIES=	-lmx
+MAKE_ENV+=	SYS_LIBRARIES="${SYS_LIBRARIES}"
+.endif
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/xscribble
 	${INSTALL_DATA} ${WRKSRC}/classifiers/*.cl ${PREFIX}/share/examples/xscribble
diff --git a/x11/xscribble/distinfo b/x11/xscribble/distinfo
index 2c999c69a9f..80e50de3c43 100644
--- a/x11/xscribble/distinfo
+++ b/x11/xscribble/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2001/06/01 11:26:43 agc Exp $
+$NetBSD: distinfo,v 1.4 2004/05/23 18:31:27 danw Exp $
 
 SHA1 (xscribble.tgz) = 9983577533c6b6f482e2bfe863f54604337562c7
 Size (xscribble.tgz) = 164379 bytes
-SHA1 (patch-aa) = a9624489e56f0196ed3ac3a6f82d41c7f5a586e3
-SHA1 (patch-ab) = 1ef6a33d9e2d580b7c6243b6324cbe9530747dde
+SHA1 (patch-aa) = eaab5d05c9ced68dda8848df5360afc990e58b6d
+SHA1 (patch-ab) = 6da2e1ba900c05d428de74b44e369c0e0c242190
 SHA1 (patch-ac) = 0a6352bf35e79db51b25e195a5bed88661672987
 SHA1 (patch-ad) = 9fe0ce4f137975cd380280e13ccfa1543016b5b7
diff --git a/x11/xscribble/patches/patch-aa b/x11/xscribble/patches/patch-aa
index c98b81521fb..b9ea100e756 100644
--- a/x11/xscribble/patches/patch-aa
+++ b/x11/xscribble/patches/patch-aa
@@ -1,8 +1,19 @@
-$NetBSD: patch-aa,v 1.2 2001/01/01 14:30:25 itojun Exp $
+$NetBSD: patch-aa,v 1.3 2004/05/23 18:31:27 danw Exp $
 
---- lirec/li_recognizer.c.orig	Tue Jun 13 07:20:13 2000
-+++ lirec/li_recognizer.c	Mon Jan  1 22:41:28 2001
-@@ -55,5 +55,5 @@
+--- lirec/li_recognizer.c.orig	Mon Jun 12 18:20:13 2000
++++ lirec/li_recognizer.c
+@@ -21,7 +21,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #ifndef ELX
+-#include <malloc.h>
++#include <stdlib.h>
+ #endif
+ #include <math.h>
+ #include <locale.h>
+@@ -53,9 +53,9 @@ static char *lialg_recognize_stroke(rCla
+ char* li_err_msg = NULL;
+ char _zdebug_flag[128];
  
 -#define bcopy(s1,s2,n) memcpy(s2,s1,n)
 +/*#define bcopy(s1,s2,n) memcpy(s2,s1,n)*/
@@ -10,9 +21,15 @@ $NetBSD: patch-aa,v 1.2 2001/01/01 14:30:25 itojun Exp $
 -#ifdef mips
 +#if 0
  char *strdup(char* from) {
-@@ -925,3 +925,4 @@
+    char* to;
+    int len = strlen(from) + 1;
+@@ -923,7 +923,8 @@ RECOGNIZER_FINALIZE(r)
+ ************************************************** */
+ 
  /*#include <assert.h>*/
 -#include <values.h>
 +#include <sys/param.h>
 +#define MAXINT	INT_MAX
  #include <sys/time.h>
+ 
+ #ifdef	__ultrix
diff --git a/x11/xscribble/patches/patch-ab b/x11/xscribble/patches/patch-ab
index fb92d9543aa..d32b05a0b1d 100644
--- a/x11/xscribble/patches/patch-ab
+++ b/x11/xscribble/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2001/06/01 11:26:44 agc Exp $
+$NetBSD: patch-ab,v 1.3 2004/05/23 18:31:27 danw Exp $
 
---- Imakefile.orig	Mon Jun 12 23:20:11 2000
-+++ Imakefile	Fri Jun  1 12:19:53 2001
-@@ -9,7 +9,7 @@
+--- Imakefile.orig	Mon Jun 12 18:20:11 2000
++++ Imakefile
+@@ -9,11 +9,10 @@ LOCAL_LIBRARIES = XkbClientLibs XawClien
             SRCS = xscribble.c Scribble.c
             OBJS = xscribble.o Scribble.o
          HEADERS = ScribbleP.h Scribble.h
@@ -11,8 +11,8 @@ $NetBSD: patch-ab,v 1.2 2001/06/01 11:26:44 agc Exp $
         INCLUDES = -Ilirec -Irecman
  
  MakeSubdirs($(SUBDIRS))
-@@ -17,3 +17,4 @@
+ DependSubdirs($(SUBDIRS))
  
- ComplexProgramTarget(xscribble)
- 
-+xscribble.man::
+-ComplexProgramTarget(xscribble)
+-
++ComplexProgramTargetNoMan(xscribble)