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 20040814. Changes from...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/46671608ac74
branches:  trunk
changeset: 479545:46671608ac74
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Aug 16 17:24:42 2004 +0000

description:
Update pkgtools/libnbcompat to 20040814.  Changes from version 20040813
include:

    * Adding a regex(3) implementation for those platforms that don't
      have one, e.g. IRIX 5.3.

    * Allow nbcompat.h to be included multiple times in case it's needed
      to override values of set by config.h in bootstrap packages.  This
      should fix problems with building pkg_install and pax on platforms
      that have /usr/include/glob.h.

    * Remove namespace.h, which should be a no-op since we're building
      a userland library separate from the NetBSD sources.

    * Remove HAVE_CONFIG_H checks from sources since we're always going
      to have and and we're always going to be including it.

    * Rename all inclusion guards in nbcompat/*.h to be _NBCOMPAT_*_H_ so
      that it won't get triggered by any settings in system headers.

This has been tested on:

        FreeBSD-4.8/i386        Debian Linux 3.0 (woody)
        IRIX 6.5                MacOS X 10.2.8
        MacOS X 10.3.5          NetBSD-1.6.2/i386
        NetBSD-2.0_BETA/i386    Red Hat Linux 7.3
        Solaris 7/sparc         Solaris 8/sparc
        Solaris 9/sparc

diffstat:

 doc/CHANGES                                     |     3 +-
 pkgtools/libnbcompat/Makefile                   |     4 +-
 pkgtools/libnbcompat/buildlink3.mk              |     4 +-
 pkgtools/libnbcompat/files/Makefile.in          |     3 +-
 pkgtools/libnbcompat/files/README               |    19 +-
 pkgtools/libnbcompat/files/__fts13.c            |     6 +-
 pkgtools/libnbcompat/files/cclass.h             |   104 +
 pkgtools/libnbcompat/files/cname.h              |   175 ++
 pkgtools/libnbcompat/files/configure            |   286 +++
 pkgtools/libnbcompat/files/configure.ac         |    15 +-
 pkgtools/libnbcompat/files/engine.c             |  1188 ++++++++++++++
 pkgtools/libnbcompat/files/fnmatch.c            |     8 +-
 pkgtools/libnbcompat/files/getopt_long.c        |    12 +-
 pkgtools/libnbcompat/files/md5c.c               |     5 +-
 pkgtools/libnbcompat/files/md5hl.c              |     6 +-
 pkgtools/libnbcompat/files/namespace.h          |   628 -------
 pkgtools/libnbcompat/files/nbcompat.h           |    24 +-
 pkgtools/libnbcompat/files/nbcompat/config.h.in |     6 +
 pkgtools/libnbcompat/files/nbcompat/err.h       |    10 +-
 pkgtools/libnbcompat/files/nbcompat/fts.h       |     8 +-
 pkgtools/libnbcompat/files/nbcompat/getopt.h    |    10 +-
 pkgtools/libnbcompat/files/nbcompat/glob.h      |     8 +-
 pkgtools/libnbcompat/files/nbcompat/md5.h       |     8 +-
 pkgtools/libnbcompat/files/nbcompat/poll.h      |     8 +-
 pkgtools/libnbcompat/files/nbcompat/regex.h     |   151 +
 pkgtools/libnbcompat/files/nbcompat/rmd160.h    |     8 +-
 pkgtools/libnbcompat/files/nbcompat/sha1.h      |     8 +-
 pkgtools/libnbcompat/files/nbcompat/vis.h       |     8 +-
 pkgtools/libnbcompat/files/pwcache.c            |     6 +-
 pkgtools/libnbcompat/files/regcomp.c            |  1926 +++++++++++++++++++++++
 pkgtools/libnbcompat/files/regerror.c           |   248 ++
 pkgtools/libnbcompat/files/regex2.h             |   209 ++
 pkgtools/libnbcompat/files/regexec.c            |   261 +++
 pkgtools/libnbcompat/files/regfree.c            |   149 +
 pkgtools/libnbcompat/files/rmd160.c             |     7 +-
 pkgtools/libnbcompat/files/rmd160hl.c           |     7 +-
 pkgtools/libnbcompat/files/setenv.c             |     6 +-
 pkgtools/libnbcompat/files/setmode.c            |     8 +-
 pkgtools/libnbcompat/files/sha1.c               |     5 +-
 pkgtools/libnbcompat/files/sha1hl.c             |    13 +-
 pkgtools/libnbcompat/files/statvfs.c            |     4 +-
 pkgtools/libnbcompat/files/strmode.c            |     6 +-
 pkgtools/libnbcompat/files/unvis.c              |     8 +-
 pkgtools/libnbcompat/files/utils.h              |   100 +
 pkgtools/libnbcompat/files/vis.c                |     9 +-
 45 files changed, 4930 insertions(+), 765 deletions(-)

diffs (truncated from 6404 to 300 lines):

diff -r 80cc6d633b1e -r 46671608ac74 doc/CHANGES
--- a/doc/CHANGES       Mon Aug 16 17:13:54 2004 +0000
+++ b/doc/CHANGES       Mon Aug 16 17:24:42 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.6907 2004/08/16 17:13:54 minskim Exp $
+$NetBSD: CHANGES,v 1.6908 2004/08/16 17:24:42 jlam Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -3864,3 +3864,4 @@
        Added glabels-2.0.1 [wiz 2004-08-16]
        Updated zsh to 4.2.1 [recht 2004-08-16]
        Added py-funge-0.2beta1 [minskim 2004-08-16]
+       Updated libnbcompat to 20040814 [jlam 2004-08-16]
diff -r 80cc6d633b1e -r 46671608ac74 pkgtools/libnbcompat/Makefile
--- a/pkgtools/libnbcompat/Makefile     Mon Aug 16 17:13:54 2004 +0000
+++ b/pkgtools/libnbcompat/Makefile     Mon Aug 16 17:24:42 2004 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.38 2004/08/13 04:38:02 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2004/08/16 17:24:56 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-20040813
+DISTNAME=              libnbcompat-20040814
 CATEGORIES=            pkgtools
 MASTER_SITES=          # empty
 DISTFILES=             # empty
diff -r 80cc6d633b1e -r 46671608ac74 pkgtools/libnbcompat/buildlink3.mk
--- a/pkgtools/libnbcompat/buildlink3.mk        Mon Aug 16 17:13:54 2004 +0000
+++ b/pkgtools/libnbcompat/buildlink3.mk        Mon Aug 16 17:24:42 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2004/08/13 04:38:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2004/08/16 17:24:56 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>=20040813
+BUILDLINK_DEPENDS.libnbcompat+=                libnbcompat>=20040814
 BUILDLINK_PKGSRCDIR.libnbcompat?=      ../../pkgtools/libnbcompat
 BUILDLINK_DEPMETHOD.libnbcompat?=      build
 BUILDLINK_LDADD.libnbcompat=           -lnbcompat
diff -r 80cc6d633b1e -r 46671608ac74 pkgtools/libnbcompat/files/Makefile.in
--- a/pkgtools/libnbcompat/files/Makefile.in    Mon Aug 16 17:13:54 2004 +0000
+++ b/pkgtools/libnbcompat/files/Makefile.in    Mon Aug 16 17:24:42 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.24 2004/08/10 18:47:55 jlam Exp $
+# $NetBSD: Makefile.in,v 1.25 2004/08/16 17:24:56 jlam Exp $
 #
 
 srcdir=                @srcdir@
@@ -34,6 +34,7 @@
                nbcompat/poll.h \
                nbcompat/pwd.h \
                nbcompat/queue.h \
+               nbcompat/regex.h \
                nbcompat/rmd160.h \
                nbcompat/sha1.h \
                nbcompat/stat.h \
diff -r 80cc6d633b1e -r 46671608ac74 pkgtools/libnbcompat/files/README
--- a/pkgtools/libnbcompat/files/README Mon Aug 16 17:13:54 2004 +0000
+++ b/pkgtools/libnbcompat/files/README Mon Aug 16 17:24:42 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: README,v 1.5 2004/08/13 14:18:44 jlam Exp $
+$NetBSD: README,v 1.6 2004/08/16 17:24:56 jlam Exp $
 
  0 Introduction
  ==============
@@ -43,13 +43,20 @@
 *NOTE* the most recent libnbcompat.
 *NOTE*
 
-libnbcompat-20040813 has been tested to build and install correctly
+libnbcompat-20040814 has been tested to build and install correctly
 on the following operating systems:
 
-       FreeBSD-4.8/i386        <jlam%NetBSD.org@localhost>
-       MacOS X 10.2.8          <jlam%NetBSD.org@localhost>
-       NetBSD-1.6.2/i386       <jlam%NetBSD.org@localhost>
-       Solaris 2.7/sparc       <blsecres%ssdtgsm.com@localhost>
+       FreeBSD-4.8/i386                <jlam%NetBSD.org@localhost>
+       Debian Linux 3.0 (woody)        <wiz%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>
+       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>
+       Solaris 7/sparc                 <blsecres%ssdtgsm.com@localhost>
+       Solaris 8/sparc                 <roland.illig%gmx.de@localhost>
+       Solaris 9/sparc                 <schmonz%NetBSD.org@localhost>
 
 
  3 Usage
diff -r 80cc6d633b1e -r 46671608ac74 pkgtools/libnbcompat/files/__fts13.c
--- a/pkgtools/libnbcompat/files/__fts13.c      Mon Aug 16 17:13:54 2004 +0000
+++ b/pkgtools/libnbcompat/files/__fts13.c      Mon Aug 16 17:24:42 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: __fts13.c,v 1.5 2004/03/12 15:21:13 grant Exp $        */
+/*     $NetBSD: __fts13.c,v 1.6 2004/08/16 17:24:56 jlam Exp $ */
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -29,9 +29,7 @@
  * SUCH DAMAGE.
  */
 
-#if HAVE_CONFIG_H
 #include "nbcompat/nbconfig.h"
-#endif
 
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
@@ -41,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)fts.c      8.6 (Berkeley) 8/14/94";
 #else
-__RCSID("$NetBSD: __fts13.c,v 1.5 2004/03/12 15:21:13 grant Exp $");
+__RCSID("$NetBSD: __fts13.c,v 1.6 2004/08/16 17:24:56 jlam Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff -r 80cc6d633b1e -r 46671608ac74 pkgtools/libnbcompat/files/cclass.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/pkgtools/libnbcompat/files/cclass.h       Mon Aug 16 17:24:42 2004 +0000
@@ -0,0 +1,104 @@
+/*     $NetBSD: cclass.h,v 1.1 2004/08/16 17:24:56 jlam Exp $  */
+
+/*-
+ * Copyright (c) 1992, 1993, 1994
+ *     The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Henry Spencer.
+ *
+ * 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. 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.
+ *
+ *     @(#)cclass.h    8.3 (Berkeley) 3/20/94
+ */
+
+/*-
+ * Copyright (c) 1992, 1993, 1994 Henry Spencer.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Henry Spencer.
+ *
+ * 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.
+ *
+ *     @(#)cclass.h    8.3 (Berkeley) 3/20/94
+ */
+
+/* character-class table */
+static const struct cclass {
+       const char *name;
+       const char *chars;
+       const char *multis;
+} cclasses[] = {
+       { "alnum",      "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz\
+0123456789",                           "" },
+       { "alpha",      "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz",
+                                       "" },
+       { "blank",      " \t",          "" },
+       { "cntrl",      "\007\b\t\n\v\f\r\1\2\3\4\5\6\16\17\20\21\22\23\24\
+\25\26\27\30\31\32\33\34\35\36\37\177",        "" },
+       { "digit",      "0123456789",   "" },
+       { "graph",      "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz\
+0123456789!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~",
+                                       "" },
+       { "lower",      "abcdefghijklmnopqrstuvwxyz",
+                                       "" },
+       { "print",      "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz\
+0123456789!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~ ",
+                                       "" },
+       { "punct",      "!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~",
+                                       "" },
+       { "space",      "\t\n\v\f\r ",  "" },
+       { "upper",      "ABCDEFGHIJKLMNOPQRSTUVWXYZ",
+                                       "" },
+       { "xdigit",     "0123456789ABCDEFabcdef",
+                                       "" },
+       { NULL,         0,              "" }
+};
diff -r 80cc6d633b1e -r 46671608ac74 pkgtools/libnbcompat/files/cname.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/pkgtools/libnbcompat/files/cname.h        Mon Aug 16 17:24:42 2004 +0000
@@ -0,0 +1,175 @@
+/*     $NetBSD: cname.h,v 1.1 2004/08/16 17:24:56 jlam Exp $   */
+
+/*-
+ * Copyright (c) 1992, 1993, 1994
+ *     The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Henry Spencer.
+ *
+ * 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. 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.
+ *
+ *     @(#)cname.h     8.3 (Berkeley) 3/20/94
+ */
+
+/*-
+ * Copyright (c) 1992, 1993, 1994 Henry Spencer.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Henry Spencer.
+ *
+ * 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



Home | Main Index | Thread Index | Old Index