added fixes for Darwin

6 files changed, 57 insertions, 5 deletions

diff --git a/www/amaya/Makefile b/www/amaya/Makefile
index c23c1e71751..19561847017 100644
--- a/www/amaya/Makefile
+++ b/www/amaya/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2006/04/20 22:54:53 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2006/10/07 19:16:57 schwarz Exp $
 
 DISTNAME=	amaya-fullsrc-9.2.1
 PKGNAME=	${DISTNAME:S/-fullsrc//}
@@ -29,6 +29,13 @@ LIBS+=			${COMPILER_RPATH_FLAG}${LOCALBASE}/lib
 FONTS_DIRS.ttf+=	${PREFIX}/share/Amaya/fonts
 REQD_DIRS+=		${PREFIX}/share/Amaya ${PREFIX}/share/Amaya/fonts
 
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "Linux"
+PLIST_SUBST+=	LINUX=
+.else
+PLIST_SUBST+=	LINUX="@comment "
+.endif
+
 post-extract:
 	${MKDIR} ${WRKSRC}
 
@@ -39,6 +46,7 @@ post-configure:
 .include "../../graphics/imlib/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/amaya/PLIST b/www/amaya/PLIST
index 754aa419ac5..3881d8831d4 100644
--- a/www/amaya/PLIST
+++ b/www/amaya/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2006/02/21 22:43:38 wiz Exp $
+@comment $NetBSD: PLIST,v 1.11 2006/10/07 19:16:57 schwarz Exp $
 bin/amaya
 bin/amaya-gtk
 share/Amaya/amaya/Amaya.svg
@@ -1419,8 +1419,8 @@ share/Amaya/resources/xrc/TextDlgWX.xrc
 share/Amaya/resources/xrc/TitleDlgWX.xrc
 share/Amaya/resources/xrc/Toolbar.xrc
 share/Amaya/resources/xrc/WinPrintDlgWX.xrc
-share/applications/amaya-8.8.1.desktop
-share/pixmaps/amaya-8.8.1.png
+${LINUX}share/applications/amaya-8.8.1.desktop
+${LINUX}share/pixmaps/amaya-8.8.1.png
 @dirrm share/Amaya/resources/xrc
 @dirrm share/Amaya/resources/icons/misc
 @dirrm share/Amaya/resources/icons/22x22
diff --git a/www/amaya/distinfo b/www/amaya/distinfo
index ea3bee14bf2..0b24f808284 100644
--- a/www/amaya/distinfo
+++ b/www/amaya/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2006/04/20 22:54:53 wiz Exp $
+$NetBSD: distinfo,v 1.18 2006/10/07 19:16:57 schwarz Exp $
 
 SHA1 (amaya-fullsrc-9.2.1.tgz) = 1736bc9a7ad997b128fa435bc99594f9f4b60b05
 RMD160 (amaya-fullsrc-9.2.1.tgz) = 74b8ce30c6c85c05b0ab94b6f950f214cbe0f512
@@ -8,4 +8,7 @@ SHA1 (patch-ab) = 942957562f8b607227812d8b377b4be61685af32
 SHA1 (patch-ac) = 5d9df3fc894f06c981b26d82f216ff223a821954
 SHA1 (patch-ad) = 405499e719944030e131c0815e4472efeed5df64
 SHA1 (patch-ae) = e479ca874e3c2f33545e692997743f85956d9aa6
+SHA1 (patch-af) = f8a60d26788fddd66d65331105e6bfd5fe2873b6
+SHA1 (patch-ag) = fc437e97392f91d26309da3b977add6485b9656c
 SHA1 (patch-ah) = a0ea86df77bc1afa1db9e4f012f25d5c84c2b093
+SHA1 (patch-ai) = cea93adfb159c1a3ddd603d0052cb7a8e46d0365
diff --git a/www/amaya/patches/patch-af b/www/amaya/patches/patch-af
new file mode 100644
index 00000000000..f4db67257a1
--- /dev/null
+++ b/www/amaya/patches/patch-af
@@ -0,0 +1,14 @@
+$NetBSD: patch-af,v 1.7 2006/10/07 19:16:57 schwarz Exp $
+
+--- ../thotlib/view/tesse.c.orig	2006-10-06 21:36:50.000000000 +0200
++++ ../thotlib/view/tesse.c	2006-10-06 21:37:08.000000000 +0200
+@@ -11,7 +11,9 @@
+  */
+ 
+ #include <stdio.h>
++#ifndef _MACOS
+ #include <malloc.h>
++#endif
+ #include <string.h>
+ 
+ #ifdef _WINGUI
diff --git a/www/amaya/patches/patch-ag b/www/amaya/patches/patch-ag
new file mode 100644
index 00000000000..d486b8d502d
--- /dev/null
+++ b/www/amaya/patches/patch-ag
@@ -0,0 +1,14 @@
+$NetBSD: patch-ag,v 1.6 2006/10/07 19:16:57 schwarz Exp $
+
+--- ../tools/cextract-1.7/xtract.h.orig	2006-10-07 20:26:18.000000000 +0200
++++ ../tools/cextract-1.7/xtract.h	2006-10-07 20:29:52.000000000 +0200
+@@ -15,7 +15,8 @@
+ #include <stdio.h>
+ #include <ctype.h>
+ #include <time.h>
+-#ifdef _POSIX_SOURCE
++#if defined(_POSIX_SOURCE) || defined(__APPLE__)
++/* Darwin defines malloc() in stdlib.h. */
+ #include <stdlib.h>
+ #endif /* _POSIX_SOURCE_ */
+ #if __STDC__ 
diff --git a/www/amaya/patches/patch-ai b/www/amaya/patches/patch-ai
new file mode 100644
index 00000000000..cd281c4ecd3
--- /dev/null
+++ b/www/amaya/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2006/10/07 19:16:57 schwarz Exp $
+
+--- ../amaya/Makefile.in.orig	2006-10-07 20:38:11.000000000 +0200
++++ ../amaya/Makefile.in	2006-10-07 20:38:40.000000000 +0200
+@@ -615,7 +615,7 @@
+ 	fi)
+ 
+ # MACOSX bundelization
+-	@(if test $(AMAYAOS) = "MACOSX" ; then \
++	@(if test $(AMAYAOS) = "XXXXXX" ; then \
+ 			$(RM) -r $(prefix)/Amaya.app ; \
+ 			$(MKDIR) $(prefix)/Amaya.app ; \
+ 			$(MKDIR) $(prefix)/Amaya.app/Contents ; \