Revert last change. Using GNU make under Darwin didn't fix the problem,

it only masked it. Switch back to BSD make and fix real problems. This
results in a complete installation of the package under Darwin.

5 files changed, 20 insertions, 22 deletions

diff --git a/mail/faces/Makefile b/mail/faces/Makefile
index 4e8fc3b9ec1..bc0ff5b04df 100644
--- a/mail/faces/Makefile
+++ b/mail/faces/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2006/01/07 23:31:46 tron Exp $
+# $NetBSD: Makefile,v 1.48 2006/01/08 14:30:01 tron Exp $
 
 DISTNAME=	faces-1.6.1
 PKGREVISION=	3
@@ -33,8 +33,6 @@ MAKE_ENV+=	SVR4LIBS="-lnsl -lsocket -lgen"
 MAKE_ENV+=	SYSV=-DSYSV32
 MAKE_ENV+=	CC=gcc
 MAKE_ENV+=	CPPFLAGS=
-.elif ${OPSYS} == "Darwin"
-USE_TOOLS+=	gmake
 .endif
 
 .if ${OPSYS} != "Interix"
diff --git a/mail/faces/distinfo b/mail/faces/distinfo
index 26880cf0c6a..db901a07948 100644
--- a/mail/faces/distinfo
+++ b/mail/faces/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.11 2005/12/19 15:15:47 joerg Exp $
+$NetBSD: distinfo,v 1.12 2006/01/08 14:30:01 tron Exp $
 
 SHA1 (faces-1.6.1.tar.Z) = 8402a74e43e78345c23a975a417c2407322db65f
 RMD160 (faces-1.6.1.tar.Z) = fdf0d1eca4d094b0b50c00c627082c78ae5dd195
 Size (faces-1.6.1.tar.Z) = 249469 bytes
 SHA1 (patch-aa) = 99012a91d3ac39bdd0ad8b5ab454812ace346dbb
-SHA1 (patch-ab) = 2cd5dc0291d690060ad24aafa85d69fd9c8a4dee
+SHA1 (patch-ab) = d7f35df34ab4e584ce8d0edcdcf60c45bf30fa4f
 SHA1 (patch-ac) = adb2718262027b4ba68425ffd4bef37192ff6d0c
 SHA1 (patch-ad) = 8383d81ea922122c5fc1fa23fd44c4a45b376c68
 SHA1 (patch-ae) = 0a7e57277e0e8133c81997258ef7f7a656834088
-SHA1 (patch-af) = 280a41d41911ddbd7be1c35849d58e67e9b8b34b
+SHA1 (patch-af) = 28eca0e38e04aef8b51d596d00f19d329f7570ec
 SHA1 (patch-ag) = df1e715582dd8f76fabed97ceb994d77d6d14ab7
 SHA1 (patch-ah) = 0333bb755c9fb3f71bc17c963eaa9c0b1322a6d6
 SHA1 (patch-ai) = 37ac5631b842794f5f6d24f33fad44573a186114
@@ -24,7 +24,7 @@ SHA1 (patch-ar) = 0a21b5fa5e8f200e8873286a128aed62e1edd5b9
 SHA1 (patch-as) = 3751bb0603637db885263d49a50769c7d6c39377
 SHA1 (patch-at) = ee84e7a191c0db0f278be753562ba086050a7f8c
 SHA1 (patch-au) = 582e9ad10b44e2e8af10c5c5e8682a7bfe508318
-SHA1 (patch-av) = de7097291d730f08a3c41e7a3fbe9fb474dcdcdc
+SHA1 (patch-av) = 0167d89f23dcc997af9a9b9ab78439d5840e0724
 SHA1 (patch-aw) = a53df4bc5b1eb696bc9416f7109d152d735b76f7
 SHA1 (patch-ax) = d815d247fbbfe9a0553bd3c2187d842269d36000
 SHA1 (patch-ay) = 47cfbfb581fcfb9a781c76dd9dfdcd410ce39a93
diff --git a/mail/faces/patches/patch-ab b/mail/faces/patches/patch-ab
index 2db34fbc978..0cdc2062bb4 100644
--- a/mail/faces/patches/patch-ab
+++ b/mail/faces/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.12 2005/03/15 03:59:38 tv Exp $
+$NetBSD: patch-ab,v 1.13 2006/01/08 14:30:01 tron Exp $
 
---- Makefile.dist.orig	Sun Nov 24 18:55:28 1991
-+++ Makefile.dist
+--- Makefile.dist.orig	1991-11-24 23:55:28.000000000 +0000
++++ Makefile.dist	2006-01-08 14:13:23.000000000 +0000
 @@ -22,15 +22,18 @@
  #  uncommented and set accordingly, if needed.
  #
@@ -107,7 +107,7 @@ $NetBSD: patch-ab,v 1.12 2005/03/15 03:59:38 tv Exp $
  MAKEOPTS	= $(MFLAGS) BINDIR=$(BINDIR) LIBDIR=$(LIBDIR) \
 -			    MANDIR=$(MANDIR) CC=$(CC) \
 -			    NOINDEX=$(NOINDEX) SYSV=$(SYSV)
-+			    INCDIR=$(INCDIR) MANDIR=$(MANDIR) CC=$(CC) \
++			    INCDIR=$(INCDIR) MANDIR=$(MANDIR) CC="$(CC)" \
 +			    NOINDEX=$(NOINDEX) SYSV=$(SYSV) PREFIX=$(PREFIX) \
 +			    CCOMP="$(CCOMP)"
  
diff --git a/mail/faces/patches/patch-af b/mail/faces/patches/patch-af
index e3b885da410..cf7e468ec96 100644
--- a/mail/faces/patches/patch-af
+++ b/mail/faces/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.6 2005/12/19 15:15:47 joerg Exp $
+$NetBSD: patch-af,v 1.7 2006/01/08 14:30:01 tron Exp $
 
---- compface/uncmain.c.orig	1991-10-24 02:28:07.000000000 +0000
-+++ compface/uncmain.c
+--- compface/uncmain.c.orig	1991-10-24 03:28:07.000000000 +0100
++++ compface/uncmain.c	2006-01-08 14:24:41.000000000 +0000
 @@ -18,6 +18,8 @@
  #include <fcntl.h>
  #include "compface.h"
@@ -11,7 +11,7 @@ $NetBSD: patch-af,v 1.6 2005/12/19 15:15:47 joerg Exp $
  /* the buffer is longer than needed to handle sparse input formats */
  #define FACEBUFLEN 2048
  char fbuf[FACEBUFLEN];
-@@ -33,12 +35,21 @@ char *cmdname;
+@@ -33,12 +35,21 @@
  
  /* error handling definitions follow */
  
@@ -19,7 +19,7 @@ $NetBSD: patch-af,v 1.6 2005/12/19 15:15:47 joerg Exp $
 +#include <errno.h>
 +#include <stdio.h>
 +
-+#if !defined(__NetBSD__) && !defined(__INTERIX) && !defined(__DragonFly__) && !defined(__FreeBSD__)
++#if !defined(__NetBSD__) && !defined(__INTERIX) && !defined(__DragonFly__) && !defined(__FreeBSD__) && !defined(__APPLE__)
 +extern int sys_nerr;
  extern char *sys_errlist[];
 +#endif
@@ -34,7 +34,7 @@ $NetBSD: patch-af,v 1.6 2005/12/19 15:15:47 joerg Exp $
  #define INITERR(s) {(void)strcpy(fbuf, cmdname); (void)strcat(fbuf, ": ");\
  					(void)strcat(fbuf, (s));}
  #define ADDERR(s) (void)strcat(fbuf, (s));
-@@ -60,6 +71,13 @@ char *argv[];
+@@ -60,6 +71,13 @@
      if (*((*argv)++) == '/')
        cmdname = *argv;               /* find the command's basename */
  
diff --git a/mail/faces/patches/patch-av b/mail/faces/patches/patch-av
index 7995d7923e4..a5c5fad19d4 100644
--- a/mail/faces/patches/patch-av
+++ b/mail/faces/patches/patch-av
@@ -1,8 +1,8 @@
-$NetBSD: patch-av,v 1.3 2005/12/19 15:15:47 joerg Exp $
+$NetBSD: patch-av,v 1.4 2006/01/08 14:30:01 tron Exp $
 
---- compface/cmain.c.orig	1991-10-24 02:28:07.000000000 +0000
-+++ compface/cmain.c
-@@ -33,12 +33,21 @@ char *cmdname;
+--- compface/cmain.c.orig	1991-10-24 03:28:07.000000000 +0100
++++ compface/cmain.c	2006-01-08 14:19:04.000000000 +0000
+@@ -33,12 +33,21 @@
  
  /* error handling definitions follow */
  
@@ -10,7 +10,7 @@ $NetBSD: patch-av,v 1.3 2005/12/19 15:15:47 joerg Exp $
 +#include <errno.h>
 +#include <stdio.h>
 +
-+#if !defined(__NetBSD__) && !defined(__INTERIX) && !defined(__DragonFly__) && !defined(__FreeBSD__)
++#if !defined(__NetBSD__) && !defined(__INTERIX) && !defined(__DragonFly__) && !defined(__FreeBSD__) && !defined(__APPLE__)
 +extern int sys_nerr;
  extern char *sys_errlist[];
 +#endif