From 3430730aae5c1b9ece7d6862168952efddb4d571 Mon Sep 17 00:00:00 2001
From: frueauf <frueauf@pkgsrc.org>
Date: Sun, 18 Nov 2001 12:21:05 +0000
Subject: Don't use MAKE_FLAGS in MAKE_ENV, reported by Yuji Yamano in pr
 pkg/14536 and add patch to make skkserv build on Darwin, reported by
 yyamano@netbsd.org in pr pkg/14538.

---
 japanese/skkserv/Makefile         |  4 ++--
 japanese/skkserv/distinfo         |  3 ++-
 japanese/skkserv/patches/patch-ah | 13 +++++++++++++
 3 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 japanese/skkserv/patches/patch-ah

(limited to 'japanese/skkserv')

diff --git a/japanese/skkserv/Makefile b/japanese/skkserv/Makefile
index a03b91dfabd..00ba990bfe9 100644
--- a/japanese/skkserv/Makefile
+++ b/japanese/skkserv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/02/25 04:17:54 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 2001/11/18 12:21:05 frueauf Exp $
 
 DISTNAME=	skk9.6
 PKGNAME=	skkserv-3.9.4nb1
@@ -34,7 +34,7 @@ SKKSERV_GID?=	65534		# nogroup
 .endif
 SKKSERV_UID?=	32767		# nobody
 SKKSERV_GID?=	32766		# nogroup
-MAKE_ENV=	MAKE_FLAGS='SKKUID=${SKKSERV_UID} SKKGID=${SKKSERV_GID}'
+MAKE_ENV=	SKKUID=${SKKSERV_UID} SKKGID=${SKKSERV_GID}
 
 # tmp for building dictionary.  ~16MB required.  mfs would be much faster.
 TMPDIR?=	${WRKDIR}
diff --git a/japanese/skkserv/distinfo b/japanese/skkserv/distinfo
index e38ce5d0597..579b351c56b 100644
--- a/japanese/skkserv/distinfo
+++ b/japanese/skkserv/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 10:13:37 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/11/18 12:21:05 frueauf Exp $
 
 SHA1 (skk/skk9.6.tar.gz) = f462b4586dff6e36bfe331a526e054c3f6c3aad9
 Size (skk/skk9.6.tar.gz) = 2407653 bytes
@@ -11,5 +11,6 @@ SHA1 (patch-ad) = 27abe12b627e8e5c5de0a78fab3a5f4551f3c0f7
 SHA1 (patch-ae) = 356b3bab93365bb769a340b99979161f07f60de4
 SHA1 (patch-af) = 0ee1792a36a220096048801346c466c9e3ec2736
 SHA1 (patch-ag) = f60d3e410cfc1c438827fa498e5fa4bc4dc3ec46
+SHA1 (patch-ah) = 414fc705a685f0276ae3a66d2f2546e1e7767495
 SHA1 (patch-bsearch) = d753fe29c2d0301a9e7bbf8c2d1f624447761cad
 SHA1 (patch-jisyo) = 0711c55fb8df69648bd182de68ea6a69d42ac9af
diff --git a/japanese/skkserv/patches/patch-ah b/japanese/skkserv/patches/patch-ah
new file mode 100644
index 00000000000..9719473cef0
--- /dev/null
+++ b/japanese/skkserv/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2001/11/18 12:21:05 frueauf Exp $
+
+--- jisyo-tools/skkdic-sort.c-orig	Tue Dec 17 06:51:28 1996
++++ jisyo-tools/skkdic-sort.c	Sun Nov 18 13:01:23 2001
+@@ -22,7 +22,7 @@
+  */
+ 
+ #include <stdio.h>
+-#ifndef NO_MALLOC_H
++#ifdef HAVE_MALLOC_H
+ #include <malloc.h>
+ #endif
+ 
-- 
cgit v1.2.3