From 7fe8dcf6a670a045fedff854c48c62704cddd7fc Mon Sep 17 00:00:00 2001 From: jschauma Date: Thu, 31 Jul 2003 22:40:26 +0000 Subject: Add the err.h header, so we can use it on systems that don't provide err.h (functionality already in the library, just the header was missing). Bumpt date to today. --- pkgtools/libnbcompat/Makefile | 4 +-- pkgtools/libnbcompat/PLIST | 3 ++- pkgtools/libnbcompat/files/Makefile.in | 3 ++- pkgtools/libnbcompat/files/err.h | 48 ++++++++++++++++++++++++++++++++++ pkgtools/libnbcompat/files/nbcompat.h | 5 +--- 5 files changed, 55 insertions(+), 8 deletions(-) create mode 100644 pkgtools/libnbcompat/files/err.h (limited to 'pkgtools') diff --git a/pkgtools/libnbcompat/Makefile b/pkgtools/libnbcompat/Makefile index 7beab45bf27..0bdc6f01152 100644 --- a/pkgtools/libnbcompat/Makefile +++ b/pkgtools/libnbcompat/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2003/07/19 03:05:39 grant Exp $ +# $NetBSD: Makefile,v 1.11 2003/07/31 22:40:26 jschauma Exp $ # -DISTNAME= libnbcompat-20030718 +DISTNAME= libnbcompat-20030731 CATEGORIES= pkgtools MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/libnbcompat/PLIST b/pkgtools/libnbcompat/PLIST index c0355fa97c8..ed9b148580b 100644 --- a/pkgtools/libnbcompat/PLIST +++ b/pkgtools/libnbcompat/PLIST @@ -1,5 +1,6 @@ -@comment $NetBSD: PLIST,v 1.2 2003/06/23 11:33:07 grant Exp $ +@comment $NetBSD: PLIST,v 1.3 2003/07/31 22:40:26 jschauma Exp $ include/libnbcompat/extern.h +include/libnbcompat/err.h include/libnbcompat/ftpglob.h include/libnbcompat/fts.h include/libnbcompat/getopt.h diff --git a/pkgtools/libnbcompat/files/Makefile.in b/pkgtools/libnbcompat/files/Makefile.in index 8186b552641..1991a415c41 100644 --- a/pkgtools/libnbcompat/files/Makefile.in +++ b/pkgtools/libnbcompat/files/Makefile.in @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.in,v 1.7 2003/07/17 19:36:43 grant Exp $ +# $NetBSD: Makefile.in,v 1.8 2003/07/31 22:40:27 jschauma Exp $ # srcdir = @srcdir@ @@ -47,6 +47,7 @@ install: ${RANLIB} ${prefix}/lib/${LIB} ${INSTALL} -m 755 -d ${prefix}/include/libnbcompat ${INSTALL} -m 444 extern.h ${prefix}/include/libnbcompat + ${INSTALL} -m 444 err.h ${prefix}/include/libnbcompat ${INSTALL} -m 444 ftpglob.h ${prefix}/include/libnbcompat ${INSTALL} -m 444 fts.h ${prefix}/include/libnbcompat ${INSTALL} -m 444 getopt.h ${prefix}/include/libnbcompat diff --git a/pkgtools/libnbcompat/files/err.h b/pkgtools/libnbcompat/files/err.h new file mode 100644 index 00000000000..139aeb766d6 --- /dev/null +++ b/pkgtools/libnbcompat/files/err.h @@ -0,0 +1,48 @@ +/* $NetBSD: err.h,v 1.1 2003/07/31 22:40:27 jschauma Exp $ */ + +/* + * Copyright (c) 1989, 1993 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * @(#)fts.h 8.3 (Berkeley) 8/14/94 + */ + +#ifndef _ERR_H_ +#define _ERR_H_ + +#ifndef HAVE_ERR +void err(int, const char *, ...); +void errx(int, const char *, ...); +void warn(const char *, ...); +void warnx(const char *, ...); +#endif + +#endif /* !_ERR_H_ */ diff --git a/pkgtools/libnbcompat/files/nbcompat.h b/pkgtools/libnbcompat/files/nbcompat.h index 442c6b21be7..97e6a954e10 100644 --- a/pkgtools/libnbcompat/files/nbcompat.h +++ b/pkgtools/libnbcompat/files/nbcompat.h @@ -256,10 +256,7 @@ int pclose(FILE *); #endif #ifndef HAVE_ERR -void err(int, const char *, ...); -void errx(int, const char *, ...); -void warn(const char *, ...); -void warnx(const char *, ...); +#include "err.h" #endif #ifndef HAVE_FGETLN -- cgit v1.2.3