darwin fixes: use ${MAKE_FLAGS} as well as ${MAKE_ENV} in the post-configure

rule (qv bsd.pkg.mk rev 1.1425), rename a function that conflicts with
a system function, and change malloc.h to stdlib.h

4 files changed, 37 insertions, 9 deletions

diff --git a/graphics/magicpoint/Makefile b/graphics/magicpoint/Makefile
index 6656c6d5c06..2b4b0834d1d 100644
--- a/graphics/magicpoint/Makefile
+++ b/graphics/magicpoint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2004/05/09 20:19:44 snj Exp $
+# $NetBSD: Makefile,v 1.39 2004/05/25 01:30:22 danw Exp $
 
 DISTNAME=		magicpoint-1.10a
 PKGREVISION=		2
@@ -28,13 +28,13 @@ CONFIGURE_ENV+=		BUILDLINK_DIR=${BUILDLINK_DIR}
 XMKMF=			${XMKMF_CMD} ${XMKMF_FLAGS}
 
 post-configure:
-	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ctlwords.h
-	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} grammar.c
-	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} scanner.c
-	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} tokdefs.h
-	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} Makefiles
-	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} includes
-	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} depend
+	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} ctlwords.h
+	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} grammar.c
+	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} scanner.c
+	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} tokdefs.h
+	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} Makefiles
+	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} includes
+	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} depend
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mgp
diff --git a/graphics/magicpoint/distinfo b/graphics/magicpoint/distinfo
index c8c22dfe919..e4a6cc7b272 100644
--- a/graphics/magicpoint/distinfo
+++ b/graphics/magicpoint/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2004/04/27 15:42:58 adam Exp $
+$NetBSD: distinfo,v 1.11 2004/05/25 01:30:22 danw Exp $
 
 SHA1 (magicpoint-1.10a.tar.gz) = 7510ee965316cb52eac7a430f0e19a87a337fe5c
 Size (magicpoint-1.10a.tar.gz) = 843657 bytes
@@ -7,3 +7,5 @@ SHA1 (patch-ab) = 0553e8369f3337e53ecd8a8926ceeed9757953b8
 SHA1 (patch-ac) = 1b2de41c2a8da28c9023552eff676c40069630fe
 SHA1 (patch-ad) = d6dd11bee4091de4f1c8d5fffa61987d16a063e1
 SHA1 (patch-ae) = b8c48eddee83f78b24cd10e864e94c3dd39c552f
+SHA1 (patch-af) = b52455c3018d5de4ee7d20c42680df8978f15b55
+SHA1 (patch-ag) = 02e53e3e498b150d528349c9712978f164e8836f
diff --git a/graphics/magicpoint/patches/patch-af b/graphics/magicpoint/patches/patch-af
new file mode 100644
index 00000000000..f5419218202
--- /dev/null
+++ b/graphics/magicpoint/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2004/05/25 01:30:22 danw Exp $
+
+--- image/image.h.orig	Mon May 24 21:09:56 2004
++++ image/image.h
+@@ -182,6 +182,8 @@ unsigned long doMemToValLSB();
+ unsigned long doValToMemLSB();
+ void          flipBits();
+ 
++#define zopen mgp_zopen
++
+ ZFILE *zopen();
+ int    zread();
+ void   zreset();
diff --git a/graphics/magicpoint/patches/patch-ag b/graphics/magicpoint/patches/patch-ag
new file mode 100644
index 00000000000..29405757d4f
--- /dev/null
+++ b/graphics/magicpoint/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2004/05/25 01:30:22 danw Exp $
+
+--- image/new.c.orig	Mon Dec 28 03:23:13 1998
++++ image/new.c
+@@ -11,7 +11,7 @@
+ #include "copyright.h"
+ #include "image.h"
+ 
+-#include <malloc.h>
++#include <stdlib.h>
+ 
+ extern int _Xdebug;
+ extern void memoryExhausted(void);