3ade13ff09
it only masked it. Switch back to BSD make and fix real problems. This results in a complete installation of the package under Darwin.
50 lines
1.3 KiB
Text
50 lines
1.3 KiB
Text
$NetBSD: patch-af,v 1.7 2006/01/08 14:30:01 tron Exp $
|
|
|
|
--- 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"
|
|
|
|
+extern int xbitmap;
|
|
+
|
|
/* the buffer is longer than needed to handle sparse input formats */
|
|
#define FACEBUFLEN 2048
|
|
char fbuf[FACEBUFLEN];
|
|
@@ -33,12 +35,21 @@
|
|
|
|
/* error handling definitions follow */
|
|
|
|
-extern int errno, sys_nerr;
|
|
+#include <errno.h>
|
|
+#include <stdio.h>
|
|
+
|
|
+#if !defined(__NetBSD__) && !defined(__INTERIX) && !defined(__DragonFly__) && !defined(__FreeBSD__) && !defined(__APPLE__)
|
|
+extern int sys_nerr;
|
|
extern char *sys_errlist[];
|
|
+#endif
|
|
|
|
extern void exit P((int)) ;
|
|
|
|
+#ifdef __INTERIX
|
|
+#define ERR strerror(errno)
|
|
+#else
|
|
#define ERR ((errno < sys_nerr) ? sys_errlist[errno] : "")
|
|
+#endif
|
|
#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 @@
|
|
if (*((*argv)++) == '/')
|
|
cmdname = *argv; /* find the command's basename */
|
|
|
|
+ if (argc > 1 && !strcmp(argv[1], "-X"))
|
|
+ {
|
|
+ xbitmap++;
|
|
+ argc--;
|
|
+ argv++;
|
|
+ }
|
|
+
|
|
if (argc > 3)
|
|
{
|
|
INITERR("usage: ")
|