head 1.8; access; symbols pkgsrc-2026Q1:1.8.0.112 pkgsrc-2026Q1-base:1.8 pkgsrc-2025Q4:1.8.0.110 pkgsrc-2025Q4-base:1.8 pkgsrc-2025Q3:1.8.0.108 pkgsrc-2025Q3-base:1.8 pkgsrc-2025Q2:1.8.0.106 pkgsrc-2025Q2-base:1.8 pkgsrc-2025Q1:1.8.0.104 pkgsrc-2025Q1-base:1.8 pkgsrc-2024Q4:1.8.0.102 pkgsrc-2024Q4-base:1.8 pkgsrc-2024Q3:1.8.0.100 pkgsrc-2024Q3-base:1.8 pkgsrc-2024Q2:1.8.0.98 pkgsrc-2024Q2-base:1.8 pkgsrc-2024Q1:1.8.0.96 pkgsrc-2024Q1-base:1.8 pkgsrc-2023Q4:1.8.0.94 pkgsrc-2023Q4-base:1.8 pkgsrc-2023Q3:1.8.0.92 pkgsrc-2023Q3-base:1.8 pkgsrc-2023Q2:1.8.0.90 pkgsrc-2023Q2-base:1.8 pkgsrc-2023Q1:1.8.0.88 pkgsrc-2023Q1-base:1.8 pkgsrc-2022Q4:1.8.0.86 pkgsrc-2022Q4-base:1.8 pkgsrc-2022Q3:1.8.0.84 pkgsrc-2022Q3-base:1.8 pkgsrc-2022Q2:1.8.0.82 pkgsrc-2022Q2-base:1.8 pkgsrc-2022Q1:1.8.0.80 pkgsrc-2022Q1-base:1.8 pkgsrc-2021Q4:1.8.0.78 pkgsrc-2021Q4-base:1.8 pkgsrc-2021Q3:1.8.0.76 pkgsrc-2021Q3-base:1.8 pkgsrc-2021Q2:1.8.0.74 pkgsrc-2021Q2-base:1.8 pkgsrc-2021Q1:1.8.0.72 pkgsrc-2021Q1-base:1.8 pkgsrc-2020Q4:1.8.0.70 pkgsrc-2020Q4-base:1.8 pkgsrc-2020Q3:1.8.0.68 pkgsrc-2020Q3-base:1.8 pkgsrc-2020Q2:1.8.0.64 pkgsrc-2020Q2-base:1.8 pkgsrc-2020Q1:1.8.0.44 pkgsrc-2020Q1-base:1.8 pkgsrc-2019Q4:1.8.0.66 pkgsrc-2019Q4-base:1.8 pkgsrc-2019Q3:1.8.0.62 pkgsrc-2019Q3-base:1.8 pkgsrc-2019Q2:1.8.0.60 pkgsrc-2019Q2-base:1.8 pkgsrc-2019Q1:1.8.0.58 pkgsrc-2019Q1-base:1.8 pkgsrc-2018Q4:1.8.0.56 pkgsrc-2018Q4-base:1.8 pkgsrc-2018Q3:1.8.0.54 pkgsrc-2018Q3-base:1.8 pkgsrc-2018Q2:1.8.0.52 pkgsrc-2018Q2-base:1.8 pkgsrc-2018Q1:1.8.0.50 pkgsrc-2018Q1-base:1.8 pkgsrc-2017Q4:1.8.0.48 pkgsrc-2017Q4-base:1.8 pkgsrc-2017Q3:1.8.0.46 pkgsrc-2017Q3-base:1.8 pkgsrc-2017Q2:1.8.0.42 pkgsrc-2017Q2-base:1.8 pkgsrc-2017Q1:1.8.0.40 pkgsrc-2017Q1-base:1.8 pkgsrc-2016Q4:1.8.0.38 pkgsrc-2016Q4-base:1.8 pkgsrc-2016Q3:1.8.0.36 pkgsrc-2016Q3-base:1.8 pkgsrc-2016Q2:1.8.0.34 pkgsrc-2016Q2-base:1.8 pkgsrc-2016Q1:1.8.0.32 pkgsrc-2016Q1-base:1.8 pkgsrc-2015Q4:1.8.0.30 pkgsrc-2015Q4-base:1.8 pkgsrc-2015Q3:1.8.0.28 pkgsrc-2015Q3-base:1.8 pkgsrc-2015Q2:1.8.0.26 pkgsrc-2015Q2-base:1.8 pkgsrc-2015Q1:1.8.0.24 pkgsrc-2015Q1-base:1.8 pkgsrc-2014Q4:1.8.0.22 pkgsrc-2014Q4-base:1.8 pkgsrc-2014Q3:1.8.0.20 pkgsrc-2014Q3-base:1.8 pkgsrc-2014Q2:1.8.0.18 pkgsrc-2014Q2-base:1.8 pkgsrc-2014Q1:1.8.0.16 pkgsrc-2014Q1-base:1.8 pkgsrc-2013Q4:1.8.0.14 pkgsrc-2013Q4-base:1.8 pkgsrc-2013Q3:1.8.0.12 pkgsrc-2013Q3-base:1.8 pkgsrc-2013Q2:1.8.0.10 pkgsrc-2013Q2-base:1.8 pkgsrc-2013Q1:1.8.0.8 pkgsrc-2013Q1-base:1.8 pkgsrc-2012Q4:1.8.0.6 pkgsrc-2012Q4-base:1.8 pkgsrc-2012Q3:1.8.0.4 pkgsrc-2012Q3-base:1.8 pkgsrc-2012Q2:1.8.0.2 pkgsrc-2012Q2-base:1.8 pkgsrc-2012Q1:1.7.0.54 pkgsrc-2012Q1-base:1.7 pkgsrc-2011Q4:1.7.0.52 pkgsrc-2011Q4-base:1.7 pkgsrc-2011Q3:1.7.0.50 pkgsrc-2011Q3-base:1.7 pkgsrc-2011Q2:1.7.0.48 pkgsrc-2011Q2-base:1.7 pkgsrc-2011Q1:1.7.0.46 pkgsrc-2011Q1-base:1.7 pkgsrc-2010Q4:1.7.0.44 pkgsrc-2010Q4-base:1.7 pkgsrc-2010Q3:1.7.0.42 pkgsrc-2010Q3-base:1.7 pkgsrc-2010Q2:1.7.0.40 pkgsrc-2010Q2-base:1.7 pkgsrc-2010Q1:1.7.0.38 pkgsrc-2010Q1-base:1.7 pkgsrc-2009Q4:1.7.0.36 pkgsrc-2009Q4-base:1.7 pkgsrc-2009Q3:1.7.0.34 pkgsrc-2009Q3-base:1.7 pkgsrc-2009Q2:1.7.0.32 pkgsrc-2009Q2-base:1.7 pkgsrc-2009Q1:1.7.0.30 pkgsrc-2009Q1-base:1.7 pkgsrc-2008Q4:1.7.0.28 pkgsrc-2008Q4-base:1.7 pkgsrc-2008Q3:1.7.0.26 pkgsrc-2008Q3-base:1.7 cube-native-xorg:1.7.0.24 cube-native-xorg-base:1.7 pkgsrc-2008Q2:1.7.0.22 pkgsrc-2008Q2-base:1.7 cwrapper:1.7.0.20 pkgsrc-2008Q1:1.7.0.18 pkgsrc-2008Q1-base:1.7 pkgsrc-2007Q4:1.7.0.16 pkgsrc-2007Q4-base:1.7 pkgsrc-2007Q3:1.7.0.14 pkgsrc-2007Q3-base:1.7 pkgsrc-2007Q2:1.7.0.12 pkgsrc-2007Q2-base:1.7 pkgsrc-2007Q1:1.7.0.10 pkgsrc-2007Q1-base:1.7 pkgsrc-2006Q4:1.7.0.8 pkgsrc-2006Q4-base:1.7 pkgsrc-2006Q3:1.7.0.6 pkgsrc-2006Q3-base:1.7 pkgsrc-2006Q2:1.7.0.4 pkgsrc-2006Q2-base:1.7 pkgsrc-2006Q1:1.7.0.2 pkgsrc-2006Q1-base:1.7 pkgsrc-2005Q4:1.6.0.2 pkgsrc-2005Q4-base:1.6 pkgsrc-2005Q3:1.5.0.6 pkgsrc-2005Q3-base:1.5 pkgsrc-2005Q2:1.5.0.4 pkgsrc-2005Q2-base:1.5 pkgsrc-2005Q1:1.5.0.2 pkgsrc-2005Q1-base:1.5 pkgsrc-2004Q4:1.4.0.18 pkgsrc-2004Q4-base:1.4 pkgsrc-2004Q3:1.4.0.16 pkgsrc-2004Q3-base:1.4 pkgsrc-2004Q2:1.4.0.14 pkgsrc-2004Q2-base:1.4 pkgsrc-2004Q1:1.4.0.12 pkgsrc-2004Q1-base:1.4 pkgsrc-2003Q4:1.4.0.10 pkgsrc-2003Q4-base:1.4 netbsd-1-6-1:1.4.0.6 netbsd-1-6-1-base:1.4 netbsd-1-6:1.4.0.8 netbsd-1-6-RELEASE-base:1.4 pkgviews:1.4.0.4 pkgviews-base:1.4 buildlink2:1.4.0.2 buildlink2-base:1.4 netbsd-1-5-PATCH003:1.4 netbsd-1-5-PATCH001:1.4 netbsd-1-5-RELEASE:1.4 netbsd-1-4-PATCH003:1.4 netbsd-1-4-PATCH002:1.2 comdex-fall-1999:1.2; locks; strict; comment @# @; 1.8 date 2012.06.23.22.27.11; author dholland; state Exp; branches; next 1.7; 1.7 date 2006.01.08.14.30.01; author tron; state Exp; branches; next 1.6; 1.6 date 2005.12.19.15.15.47; author joerg; state Exp; branches; next 1.5; 1.5 date 2005.03.15.03.59.38; author tv; state Exp; branches; next 1.4; 1.4 date 2000.09.06.12.31.50; author tron; state Exp; branches; next 1.3; 1.3 date 2000.07.08.12.47.05; author tron; state Exp; branches; next 1.2; 1.2 date 99.10.01.07.49.20; author simonb; state Exp; branches; next 1.1; 1.1 date 99.10.01.05.09.14; author simonb; state Exp; branches; next ; desc @@ 1.8 log @Instead of patching in a mess of machine-dependent logic for printing error messages, always use strerror. While here, also correct warnings about implicit declaration of malloc ... which turned out to arise because someone patched stdlib.h into all the right places years ago, but for some bizarre reason decided the change should be OS-specific. grmbl. @ text @$NetBSD: patch-af,v 1.7 2006/01/08 14:30:01 tron Exp $ - use strerror() - ...? --- compface/uncmain.c.orig 1991-10-24 02:28:07.000000000 +0000 +++ compface/uncmain.c @@@@ -18,6 +18,8 @@@@ #include #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,13 @@@@ char *cmdname; /* error handling definitions follow */ -extern int errno, sys_nerr; -extern char *sys_errlist[]; +#include +#include +#include extern void exit P((int)) ; -#define ERR ((errno < sys_nerr) ? sys_errlist[errno] : "") +#define ERR strerror(errno) #define INITERR(s) {(void)strcpy(fbuf, cmdname); (void)strcat(fbuf, ": ");\ (void)strcat(fbuf, (s));} #define ADDERR(s) (void)strcat(fbuf, (s)); @@@@ -60,6 +63,13 @@@@ char *argv[]; if (*((*argv)++) == '/') cmdname = *argv; /* find the command's basename */ + if (argc > 1 && !strcmp(argv[1], "-X")) + { + xbitmap++; + argc--; + argv++; + } + if (argc > 3) { INITERR("usage: ") @ 1.7 log @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. @ text @d1 1 a1 1 $NetBSD$ d3 5 a7 2 --- compface/uncmain.c.orig 1991-10-24 03:28:07.000000000 +0100 +++ compface/uncmain.c 2006-01-08 14:24:41.000000000 +0000 d17 1 a17 1 @@@@ -33,12 +35,21 @@@@ d22 1 d25 1 a25 5 + +#if !defined(__NetBSD__) && !defined(__INTERIX) && !defined(__DragonFly__) && !defined(__FreeBSD__) && !defined(__APPLE__) +extern int sys_nerr; extern char *sys_errlist[]; +#endif d29 1 a29 1 +#ifdef __INTERIX a30 3 +#else #define ERR ((errno < sys_nerr) ? sys_errlist[errno] : "") +#endif d34 1 a34 1 @@@@ -60,6 +71,13 @@@@ @ 1.6 log @Include errno.h on all platforms. Also include stdio.h, it provides sys_nerr and sys_errlist on DragonFly and FreeBSD. Only define it manually for platforms other than NetBSD, DragonFly, FreeBSD and Interix. @ text @d3 2 a4 2 --- compface/uncmain.c.orig 1991-10-24 02:28:07.000000000 +0000 +++ compface/uncmain.c d14 1 a14 1 @@@@ -33,12 +35,21 @@@@ char *cmdname; d22 1 a22 1 +#if !defined(__NetBSD__) && !defined(__INTERIX) && !defined(__DragonFly__) && !defined(__FreeBSD__) d37 1 a37 1 @@@@ -60,6 +71,13 @@@@ char *argv[]; @ 1.5 log @Make build on Interix. @ text @d3 1 a3 1 --- compface/uncmain.c.orig Wed Oct 23 22:28:07 1991 d14 1 a14 1 @@@@ -33,12 +35,20 @@@@ char *cmdname; d18 1 a18 1 +#if defined(__NetBSD__) || defined(__INTERIX) d20 4 a23 2 +#else extern int errno, sys_nerr; d37 1 a37 2 @@@@ -59,6 +69,13 @@@@ char *argv[]; while (**argv) d40 1 a40 1 + d47 1 a47 1 d50 1 @ 1.4 log @Include "errno.h" instead of defining "sys_errlist" manually to avoid link time warnings. @ text @d3 2 a4 2 --- compface/uncmain.c.orig Thu Oct 24 03:28:07 1991 +++ compface/uncmain.c Wed Sep 6 14:28:50 2000 d14 1 a14 1 @@@@ -33,8 +35,12 @@@@ d18 1 a18 1 +#ifdef __NetBSD__ d27 9 a35 1 @@@@ -59,6 +65,13 @@@@ @ 1.3 log @Replace "/usr/local" by "${LOCALBASE}". Fixes PR pkg/10360, pkg/10465 and pkg/10529. @ text @d4 1 a4 1 +++ compface/uncmain.c Sat Jul 8 14:25:27 2000 d14 14 a27 1 @@@@ -59,6 +61,13 @@@@ @ 1.2 log @Oops, forgot them RCS ids... @ text @d3 2 a4 3 diff -ur ../faces-DIST/compface/uncmain.c ./compface/uncmain.c --- ../faces-DIST/compface/uncmain.c Thu Oct 24 12:28:07 1991 +++ ./compface/uncmain.c Fri Oct 1 14:32:06 1999 @ 1.1 log @Spilt patches into one-file-per-patch-file, and make this work on the pmax (and other mips ports) - all the world is not IRIX... @ text @d1 2 @