pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Update pkgtools/libnbcompat to 20040822. Changes from...
details: https://anonhg.NetBSD.org/pkgsrc/rev/4e01706c77ef
branches: trunk
changeset: 479811:4e01706c77ef
user: jlam <jlam%pkgsrc.org@localhost>
date: Mon Aug 23 03:32:12 2004 +0000
description:
Update pkgtools/libnbcompat to 20040822. Changes from version 20040814
include:
* Rework the way that poll() is detected so that it more closely
follows how the rest of the replacement functions are detected.
* Split err*() and warn*() functions into separate err.c and warn.c
files so that we can more finely isolate the objects files pulled
in by the linker. This should fix building textproc/nbsed on Solaris.
* Move more definitions from nbcompat.h into nbcompat/*.h. This makes
it more clear which NetBSD headers are expected to provide which
function declarations and macro definitions.
* Clean out nbconfig.h by moving all of the relevant definitions into
the correct nbcompat/*.h files.
* Update all of the library functions to the latest from src HEAD.
Also change the way that sources are modified when imported -- we
now include <nbcompat.h> before the first system header, include
<nbcompat/*.h> versions of headers instead of system ones where
available, and "#if 0" the sections that make no sense when being
built outside of the NetBSD source tree. This should make future
updates from src HEAD, e.g. for security updates or bug fixes,
easier.
* Move all private headers into a subdirectory and include the headers
from the private directory. This avoids any nameclashes with system
headers with the same name.
diffstat:
doc/CHANGES | 3 +-
pkgtools/libnbcompat/Makefile | 4 +-
pkgtools/libnbcompat/PLIST | 11 +-
pkgtools/libnbcompat/buildlink3.mk | 4 +-
pkgtools/libnbcompat/files/Makefile.in | 15 +-
pkgtools/libnbcompat/files/README | 27 +-
pkgtools/libnbcompat/files/__fts13.c | 78 +-
pkgtools/libnbcompat/files/__glob13.c | 1040 +++++++++++++++++++++++
pkgtools/libnbcompat/files/__unsetenv13.c | 124 ++
pkgtools/libnbcompat/files/cclass.h | 104 --
pkgtools/libnbcompat/files/cname.h | 175 ---
pkgtools/libnbcompat/files/configure | 1040 +++++++++++++++-------
pkgtools/libnbcompat/files/configure.ac | 225 +---
pkgtools/libnbcompat/files/err.c | 89 +-
pkgtools/libnbcompat/files/fgetln.c | 37 +-
pkgtools/libnbcompat/files/findenv.c | 88 +
pkgtools/libnbcompat/files/fnmatch.c | 30 +-
pkgtools/libnbcompat/files/fparseln.c | 47 +-
pkgtools/libnbcompat/files/fts.c | 12 +
pkgtools/libnbcompat/files/getenv.c | 81 +-
pkgtools/libnbcompat/files/getopt_long.c | 49 +-
pkgtools/libnbcompat/files/gettemp.c | 180 +++
pkgtools/libnbcompat/files/glob.c | 882 +-------------------
pkgtools/libnbcompat/files/isblank.c | 51 +-
pkgtools/libnbcompat/files/lchflags.c | 9 +-
pkgtools/libnbcompat/files/lchmod.c | 9 +-
pkgtools/libnbcompat/files/lchown.c | 7 +-
pkgtools/libnbcompat/files/lutimes.c | 9 +-
pkgtools/libnbcompat/files/md5c.c | 43 +-
pkgtools/libnbcompat/files/md5hl.c | 122 +--
pkgtools/libnbcompat/files/mdXhl.c | 105 ++
pkgtools/libnbcompat/files/mkdtemp.c | 128 +-
pkgtools/libnbcompat/files/mkstemp.c | 127 +-
pkgtools/libnbcompat/files/nbcompat.h | 106 +-
pkgtools/libnbcompat/files/nbcompat/assert.h | 54 +
pkgtools/libnbcompat/files/nbcompat/cdefs.h | 95 ++
pkgtools/libnbcompat/files/nbcompat/config.h.in | 169 +--
pkgtools/libnbcompat/files/nbcompat/ctype.h | 54 +
pkgtools/libnbcompat/files/nbcompat/dirent.h | 65 +
pkgtools/libnbcompat/files/nbcompat/endian.h | 79 +
pkgtools/libnbcompat/files/nbcompat/err.h | 25 +-
pkgtools/libnbcompat/files/nbcompat/getopt.h | 11 +-
pkgtools/libnbcompat/files/nbcompat/limits.h | 6 +-
pkgtools/libnbcompat/files/nbcompat/param.h | 57 +
pkgtools/libnbcompat/files/nbcompat/regex.h | 10 +-
pkgtools/libnbcompat/files/nbcompat/stat.h | 6 +-
pkgtools/libnbcompat/files/nbcompat/statvfs.h | 11 +-
pkgtools/libnbcompat/files/nbcompat/stdlib.h | 8 +-
pkgtools/libnbcompat/files/nbcompat/termcap.h | 59 +
pkgtools/libnbcompat/files/nbcompat/types.h | 59 +
pkgtools/libnbcompat/files/nbcompat/unistd.h | 11 +-
pkgtools/libnbcompat/files/nbcompat/vis.h | 17 +-
pkgtools/libnbcompat/files/poll.c | 8 +-
pkgtools/libnbcompat/files/private/cclass.h | 104 ++
pkgtools/libnbcompat/files/private/cname.h | 175 +++
pkgtools/libnbcompat/files/private/pwcache.h | 72 +
pkgtools/libnbcompat/files/private/regex2.h | 209 ++++
pkgtools/libnbcompat/files/private/utils.h | 98 ++
pkgtools/libnbcompat/files/pwcache.c | 87 +-
pkgtools/libnbcompat/files/pwcache.h | 93 --
pkgtools/libnbcompat/files/regcomp.c | 59 +-
pkgtools/libnbcompat/files/regerror.c | 53 +-
pkgtools/libnbcompat/files/regex2.h | 209 ----
pkgtools/libnbcompat/files/regexec.c | 55 +-
pkgtools/libnbcompat/files/regfree.c | 43 +-
pkgtools/libnbcompat/files/rmd160.c | 52 +-
pkgtools/libnbcompat/files/rmd160hl.c | 34 +-
pkgtools/libnbcompat/files/setenv.c | 169 +-
pkgtools/libnbcompat/files/setgroupent.c | 11 +-
pkgtools/libnbcompat/files/setmode.c | 67 +-
pkgtools/libnbcompat/files/setpassent.c | 11 +-
pkgtools/libnbcompat/files/setprogname.c | 79 +-
pkgtools/libnbcompat/files/sha1.c | 43 +-
pkgtools/libnbcompat/files/sha1hl.c | 52 +-
pkgtools/libnbcompat/files/snprintf.c | 8 +-
pkgtools/libnbcompat/files/statvfs.c | 12 +-
pkgtools/libnbcompat/files/strdup.c | 34 +-
pkgtools/libnbcompat/files/strerror.c | 5 +-
pkgtools/libnbcompat/files/strlcat.c | 46 +-
pkgtools/libnbcompat/files/strlcpy.c | 71 +-
pkgtools/libnbcompat/files/strmode.c | 36 +-
pkgtools/libnbcompat/files/strsep.c | 34 +-
pkgtools/libnbcompat/files/strtoll.c | 51 +-
pkgtools/libnbcompat/files/unsetenv.c | 12 +
pkgtools/libnbcompat/files/unvis.c | 55 +-
pkgtools/libnbcompat/files/usleep.c | 8 +-
pkgtools/libnbcompat/files/utils.h | 100 --
pkgtools/libnbcompat/files/utimes.c | 9 +-
pkgtools/libnbcompat/files/vis.c | 197 ++--
pkgtools/libnbcompat/files/warn.c | 115 ++
90 files changed, 4927 insertions(+), 3506 deletions(-)
diffs (truncated from 10804 to 300 lines):
diff -r 174eb7677ea9 -r 4e01706c77ef doc/CHANGES
--- a/doc/CHANGES Mon Aug 23 03:31:51 2004 +0000
+++ b/doc/CHANGES Mon Aug 23 03:32:12 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.6976 2004/08/23 03:31:51 schmonz Exp $
+$NetBSD: CHANGES,v 1.6977 2004/08/23 03:32:57 jlam Exp $
Changes to the packages collection and infrastructure in 2004:
@@ -4024,3 +4024,4 @@
Added garmin-utils-2.1 [gson 2004-08-22]
Updated JMdict to 2004.02 [wiz 2004-08-23]
Updated qmail-qfilter to 1.5nb2 [schmonz 2004-08-23]
+ Updated libnbcompat to 20040822 [jlam 2004-08-23]
diff -r 174eb7677ea9 -r 4e01706c77ef pkgtools/libnbcompat/Makefile
--- a/pkgtools/libnbcompat/Makefile Mon Aug 23 03:31:51 2004 +0000
+++ b/pkgtools/libnbcompat/Makefile Mon Aug 23 03:32:12 2004 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.39 2004/08/16 17:24:56 jlam Exp $
+# $NetBSD: Makefile,v 1.40 2004/08/23 03:32:12 jlam Exp $
#
# NOTE: If you update this package, it is *mandatory* that you update
# pkgsrc/pkgtools/libnbcompat/files/README to reflect the actual
# list of tested and supported platforms.
#
-DISTNAME= libnbcompat-20040814
+DISTNAME= libnbcompat-20040822
CATEGORIES= pkgtools
MASTER_SITES= # empty
DISTFILES= # empty
diff -r 174eb7677ea9 -r 4e01706c77ef pkgtools/libnbcompat/PLIST
--- a/pkgtools/libnbcompat/PLIST Mon Aug 23 03:31:51 2004 +0000
+++ b/pkgtools/libnbcompat/PLIST Mon Aug 23 03:32:12 2004 +0000
@@ -1,5 +1,10 @@
-@comment $NetBSD: PLIST,v 1.12 2004/08/10 18:47:55 jlam Exp $
+@comment $NetBSD: PLIST,v 1.13 2004/08/23 03:32:12 jlam Exp $
include/nbcompat.h
+include/nbcompat/assert.h
+include/nbcompat/cdefs.h
+include/nbcompat/ctype.h
+include/nbcompat/dirent.h
+include/nbcompat/endian.h
include/nbcompat/err.h
include/nbcompat/fnmatch.h
include/nbcompat/fts.h
@@ -10,10 +15,12 @@
include/nbcompat/md5.h
include/nbcompat/nbconfig.h
include/nbcompat/nbtypes.h
+include/nbcompat/param.h
include/nbcompat/paths.h
include/nbcompat/poll.h
include/nbcompat/pwd.h
include/nbcompat/queue.h
+include/nbcompat/regex.h
include/nbcompat/rmd160.h
include/nbcompat/sha1.h
include/nbcompat/stat.h
@@ -21,7 +28,9 @@
include/nbcompat/stdio.h
include/nbcompat/stdlib.h
include/nbcompat/string.h
+include/nbcompat/termcap.h
include/nbcompat/time.h
+include/nbcompat/types.h
include/nbcompat/tzfile.h
include/nbcompat/unistd.h
include/nbcompat/util.h
diff -r 174eb7677ea9 -r 4e01706c77ef pkgtools/libnbcompat/buildlink3.mk
--- a/pkgtools/libnbcompat/buildlink3.mk Mon Aug 23 03:31:51 2004 +0000
+++ b/pkgtools/libnbcompat/buildlink3.mk Mon Aug 23 03:32:12 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2004/08/16 17:24:56 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2004/08/23 03:32:12 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBNBCOMPAT_BUILDLINK3_MK:= ${LIBNBCOMPAT_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@
BUILDLINK_PACKAGES+= libnbcompat
.if !empty(LIBNBCOMPAT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libnbcompat+= libnbcompat>=20040814
+BUILDLINK_DEPENDS.libnbcompat+= libnbcompat>=20040822
BUILDLINK_PKGSRCDIR.libnbcompat?= ../../pkgtools/libnbcompat
BUILDLINK_DEPMETHOD.libnbcompat?= build
BUILDLINK_LDADD.libnbcompat= -lnbcompat
diff -r 174eb7677ea9 -r 4e01706c77ef pkgtools/libnbcompat/files/Makefile.in
--- a/pkgtools/libnbcompat/files/Makefile.in Mon Aug 23 03:31:51 2004 +0000
+++ b/pkgtools/libnbcompat/files/Makefile.in Mon Aug 23 03:32:12 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.26 2004/08/21 06:36:13 jlam Exp $
+# $NetBSD: Makefile.in,v 1.27 2004/08/23 03:32:12 jlam Exp $
#
srcdir= @srcdir@
@@ -20,6 +20,11 @@
LIB= libnbcompat.a
INCS= nbcompat.h \
+ nbcompat/assert.h \
+ nbcompat/cdefs.h \
+ nbcompat/ctype.h \
+ nbcompat/dirent.h \
+ nbcompat/endian.h \
nbcompat/err.h \
nbcompat/fnmatch.h \
nbcompat/fts.h \
@@ -30,6 +35,7 @@
nbcompat/md5.h \
nbcompat/nbconfig.h \
nbcompat/nbtypes.h \
+ nbcompat/param.h \
nbcompat/paths.h \
nbcompat/poll.h \
nbcompat/pwd.h \
@@ -42,14 +48,15 @@
nbcompat/stdio.h \
nbcompat/stdlib.h \
nbcompat/string.h \
+ nbcompat/termcap.h \
nbcompat/time.h \
+ nbcompat/types.h \
nbcompat/tzfile.h \
nbcompat/unistd.h \
nbcompat/util.h \
nbcompat/vis.h
-# always use our local glob() implementation.
-OBJS= glob.o @LIBOBJS@
+OBJS= @LIBOBJS@
LINK= $(CCLD) $(CFLAGS) $(LDFLAGS) -o $@
COMPILE= $(CC) $(CPPFLAGS) $(CFLAGS)
@@ -70,7 +77,7 @@
./bits $@
bits: bits.c
- $(CC) -o bits bits.c
+ $(COMPILE) $(DEFS) -o bits bits.c
install:
$(INSTALL) -m 755 -d $(prefix)/lib
diff -r 174eb7677ea9 -r 4e01706c77ef pkgtools/libnbcompat/files/README
--- a/pkgtools/libnbcompat/files/README Mon Aug 23 03:31:51 2004 +0000
+++ b/pkgtools/libnbcompat/files/README Mon Aug 23 03:32:12 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: README,v 1.9 2004/08/20 23:30:30 schmonz Exp $
+$NetBSD: README,v 1.10 2004/08/23 03:32:12 jlam Exp $
0 Introduction
==============
@@ -13,6 +13,7 @@
archivers/pax
pkgtools/mtree
pkgtools/pkg_install
+ textproc/nbsed
A script, src2nbcompat, is also included in the sources that simplifies
importing software from the NetBSD src module into pkgsrc.
@@ -43,22 +44,24 @@
*NOTE* the most recent libnbcompat.
*NOTE*
-libnbcompat-20040814 has been tested to build and install correctly
+libnbcompat-20040822 has been tested to build and install correctly
on the following operating systems:
FreeBSD-4.8/i386 <jlam%NetBSD.org@localhost>
- Debian Linux 3.0 (woody) <wiz%NetBSD.org@localhost>
- Interix 3.5 <schmonz%NetBSD.org@localhost>
+ FreeBSD-5.1/alpha <grant%NetBSD.org@localhost>
IRIX 6.5 <schmonz%NetBSD.org@localhost>
MacOS X 10.2.8 <jlam%NetBSD.org@localhost>
MacOS X 10.3.5 <schmonz%NetBSD.org@localhost>
+ MS Interix 3.5 <schmonz%NetBSD.org@localhost>
+ NetBSD-1.5/i386 <cgd%NetBSD.org@localhost>
NetBSD-1.6.2/i386 <jlam%NetBSD.org@localhost>
- NetBSD-2.0_BETA/i386 <wiz%NetBSD.org@localhost>
- Red Hat Linux 7.3 <schmonz%NetBSD.org@localhost>
- Red Hat Enterprise Linux 3 <schmonz%NetBSD.org@localhost>
- Solaris 7/sparc <blsecres%ssdtgsm.com@localhost>
- Solaris 8/sparc <roland.illig%gmx.de@localhost>
- Solaris 9/sparc <schmonz%NetBSD.org@localhost>
+ NetBSD-2.0_BETA/i386 <schmonz%NetBSD.org@localhost>
+ Red Hat Linux 6.0/i386 <cgd%NetBSD.org@localhost>
+ Red Hat Linux 7.2/i386 <cgd%NetBSD.org@localhost>
+ Red Hat Linux 7.3/i386 <cgd%NetBSD.org@localhost>
+ Solaris 2.6/sparc <cgd%NetBSD.org@localhost>
+ Solaris 8/sparc <cgd%NetBSD.org@localhost>
+ Solaris 9/sparc <grant%NetBSD.org@localhost>
3 Usage
@@ -68,7 +71,9 @@
end, the changes to NetBSD sources to use libnbcompat are minor. The
procedure is:
- (1) Add #include <nbcompat.h> at the top of the source file.
+ (1) Add #include <nbcompat.h> at the top of the source files that
+ include system headers, but below the inclusion of any
+ "config.h".
(2) Surround each system header file included in the source file
with #if HAVE_<header_name>_H ... #endif.
diff -r 174eb7677ea9 -r 4e01706c77ef pkgtools/libnbcompat/files/__fts13.c
--- a/pkgtools/libnbcompat/files/__fts13.c Mon Aug 23 03:31:51 2004 +0000
+++ b/pkgtools/libnbcompat/files/__fts13.c Mon Aug 23 03:32:12 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: __fts13.c,v 1.6 2004/08/16 17:24:56 jlam Exp $ */
+/* $NetBSD: __fts13.c,v 1.7 2004/08/23 03:32:12 jlam Exp $ */
/*-
* Copyright (c) 1990, 1993, 1994
@@ -29,61 +29,43 @@
* SUCH DAMAGE.
*/
-#include "nbcompat/nbconfig.h"
-
-#if HAVE_SYS_CDEFS_H
-#include <sys/cdefs.h>
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
#endif
+#include <nbcompat.h>
+#include <nbcompat/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
#if 0
static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94";
#else
-__RCSID("$NetBSD: __fts13.c,v 1.6 2004/08/16 17:24:56 jlam Exp $");
+__RCSID("$NetBSD: __fts13.c,v 1.7 2004/08/23 03:32:12 jlam Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
-#if HAVE_SYS_PARAM_H
-#include <sys/param.h>
+#if 0
+#include "namespace.h"
#endif
-#if HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
+#include <nbcompat/param.h>
+#include <nbcompat/stat.h>
-#if HAVE_ASSERT_H
-#include <assert.h>
-#endif
-
-#if HAVE_DIRENT_H
-#include <dirent.h>
-#endif
-
+#include <nbcompat/assert.h>
+#include <nbcompat/dirent.h>
#if HAVE_ERRNO_H
#include <errno.h>
#endif
-
#if HAVE_FCNTL_H
#include <fcntl.h>
#endif
-
-#if HAVE_LIMITS_H
-#include <limits.h>
-#endif
+#include <nbcompat/fts.h>
+#include <nbcompat/stdlib.h>
+#include <nbcompat/string.h>
+#include <nbcompat/unistd.h>
-#include "nbcompat/fts.h"
-
-#if HAVE_STDLIB_H
-#include <stdlib.h>
+#if 0
+#if ! HAVE_NBTOOL_CONFIG_H
+#define HAVE_STRUCT_DIRENT_D_NAMLEN 1
#endif
-#if HAVE_STRING_H
-#include <string.h>
-#endif
-#if HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#if !HAVE_CONFIG_H
-#define HAVE_STRUCT_DIRENT_D_NAMLEN 1
#endif
#if 0
@@ -104,6 +86,7 @@
#define STAT stat
#endif
+#if 0
#ifdef __LIBC12_SOURCE__
Home |
Main Index |
Thread Index |
Old Index