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



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c961137a9305
branches:  trunk
changeset: 479177:c961137a9305
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Aug 06 16:55:06 2004 +0000

description:
Update pkgtools/libnbcompat to 20040805.  Changes from version 20040512
include:

  (1) Add a statvfs() implementation based on statfs(), and remove the
      statfs() NetBSD-compatibility implementation.  statvfs() is used
      in src/usr.sbin/pkg_install on the HEAD branch.

  (2) Add a fnmatch() implementation, needed by IRIX.  fnmatch() is used
      in src/usr.sbin/pkg_install on the HEAD branch.

  (3) Remove fseeko(), inet_ntop(), inet_pton(), sl_*() strptime(), and
      timegm() as they're not used by any of the bootstrap packages that
      require libnbcompat (pax, mtree, pkg_install).  All that's left is
      what's necessary to bootstrap those three packages.

diffstat:

 doc/CHANGES                                     |     3 +-
 pkgtools/libnbcompat/Makefile                   |    20 +-
 pkgtools/libnbcompat/PLIST                      |     6 +-
 pkgtools/libnbcompat/buildlink3.mk              |     4 +-
 pkgtools/libnbcompat/files/Makefile.in          |    11 +-
 pkgtools/libnbcompat/files/README               |    85 +
 pkgtools/libnbcompat/files/configure            |  2836 ++++++++++++----------
 pkgtools/libnbcompat/files/configure.ac         |   258 +-
 pkgtools/libnbcompat/files/fnmatch.c            |   211 +
 pkgtools/libnbcompat/files/fseeko.c             |    40 -
 pkgtools/libnbcompat/files/inet_ntop.c          |   191 -
 pkgtools/libnbcompat/files/inet_pton.c          |   285 --
 pkgtools/libnbcompat/files/nbcompat.h           |   221 +-
 pkgtools/libnbcompat/files/nbcompat/config.h.in |    53 +-
 pkgtools/libnbcompat/files/nbcompat/fnmatch.h   |    48 +
 pkgtools/libnbcompat/files/nbcompat/queue.h     |   166 +
 pkgtools/libnbcompat/files/nbcompat/statfs.h    |    62 -
 pkgtools/libnbcompat/files/nbcompat/statvfs.h   |   127 +
 pkgtools/libnbcompat/files/sl_init.c            |   119 -
 pkgtools/libnbcompat/files/src2nbcompat         |     8 +-
 pkgtools/libnbcompat/files/statfs.c             |   151 -
 pkgtools/libnbcompat/files/statvfs.c            |   126 +
 pkgtools/libnbcompat/files/strptime.c           |   391 ---
 pkgtools/libnbcompat/files/timegm.c             |   119 -
 24 files changed, 2564 insertions(+), 2977 deletions(-)

diffs (truncated from 6213 to 300 lines):

diff -r 2b596ab63371 -r c961137a9305 doc/CHANGES
--- a/doc/CHANGES       Fri Aug 06 16:52:56 2004 +0000
+++ b/doc/CHANGES       Fri Aug 06 16:55:06 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.6812 2004/08/06 16:04:13 schmonz Exp $
+$NetBSD: CHANGES,v 1.6813 2004/08/06 16:55:06 jlam Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -3748,3 +3748,4 @@
        Added amavisd-new-20040701 [jlam 2004-08-06]
        Moved amavisd-new to security/amavisd-new [jlam 2004-08-06]
        Updated getmail to 4.0.8 [schmonz 2004-08-06]
+       Updated libnbcompat to 20040805 [jlam 2004-08-06]
diff -r 2b596ab63371 -r c961137a9305 pkgtools/libnbcompat/Makefile
--- a/pkgtools/libnbcompat/Makefile     Fri Aug 06 16:52:56 2004 +0000
+++ b/pkgtools/libnbcompat/Makefile     Fri Aug 06 16:55:06 2004 +0000
@@ -1,21 +1,25 @@
-# $NetBSD: Makefile,v 1.35 2004/05/12 21:51:08 grant Exp $
+# $NetBSD: Makefile,v 1.36 2004/08/06 16:55:09 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-20040512
+DISTNAME=              libnbcompat-20040805
 CATEGORIES=            pkgtools
 MASTER_SITES=          # empty
 DISTFILES=             # empty
 
 MAINTAINER=            grant%NetBSD.org@localhost
 HOMEPAGE=              http://www.NetBSD.org/
-COMMENT=               Portable NetBSD compatibility library
+COMMENT=               portable NetBSD compatibility library
 
-NO_BUILDLINK=          # defined
-NO_PKGTOOLS_REQD_CHECK=        # defined
-NO_CHECKSUM=           # defined
-NO_MTREE=              # defined
+NO_BUILDLINK=          yes
+NO_PKGTOOLS_REQD_CHECK=        yes
+NO_CHECKSUM=           yes
+NO_MTREE=              yes
 
-GNU_CONFIGURE=         # defined
+GNU_CONFIGURE=         yes
 
 PKG_INFO=              PKG_DBDIR=${_PKG_DBDIR} ${PKG_INFO_CMD}
 PKG_CREATE=            PKG_DBDIR=${_PKG_DBDIR} ${PKG_CREATE_CMD}
diff -r 2b596ab63371 -r c961137a9305 pkgtools/libnbcompat/PLIST
--- a/pkgtools/libnbcompat/PLIST        Fri Aug 06 16:52:56 2004 +0000
+++ b/pkgtools/libnbcompat/PLIST        Fri Aug 06 16:55:06 2004 +0000
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.10 2003/09/06 01:35:07 jlam Exp $
+@comment $NetBSD: PLIST,v 1.11 2004/08/06 16:55:09 jlam Exp $
 include/nbcompat.h
 include/nbcompat/err.h
+include/nbcompat/fnmatch.h
 include/nbcompat/fts.h
 include/nbcompat/getopt.h
 include/nbcompat/glob.h
@@ -8,9 +9,10 @@
 include/nbcompat/nbconfig.h
 include/nbcompat/nbtypes.h
 include/nbcompat/poll.h
+include/nbcompat/queue.h
 include/nbcompat/rmd160.h
 include/nbcompat/sha1.h
-include/nbcompat/statfs.h
+include/nbcompat/statvfs.h
 include/nbcompat/vis.h
 lib/libnbcompat.a
 @dirrm include/nbcompat
diff -r 2b596ab63371 -r c961137a9305 pkgtools/libnbcompat/buildlink3.mk
--- a/pkgtools/libnbcompat/buildlink3.mk        Fri Aug 06 16:52:56 2004 +0000
+++ b/pkgtools/libnbcompat/buildlink3.mk        Fri Aug 06 16:55:06 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:39 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/08/06 16:55:09 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>=20030916
+BUILDLINK_DEPENDS.libnbcompat+=                libnbcompat>=20040805
 BUILDLINK_PKGSRCDIR.libnbcompat?=      ../../pkgtools/libnbcompat
 BUILDLINK_DEPMETHOD.libnbcompat?=      build
 BUILDLINK_LDADD.libnbcompat=           -lnbcompat
diff -r 2b596ab63371 -r c961137a9305 pkgtools/libnbcompat/files/Makefile.in
--- a/pkgtools/libnbcompat/files/Makefile.in    Fri Aug 06 16:52:56 2004 +0000
+++ b/pkgtools/libnbcompat/files/Makefile.in    Fri Aug 06 16:55:06 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.22 2003/12/10 07:21:20 grant Exp $
+# $NetBSD: Makefile.in,v 1.23 2004/08/06 16:55:09 jlam Exp $
 #
 
 srcdir=                @srcdir@
@@ -19,10 +19,11 @@
 
 LIB=           libnbcompat.a
 
-INCS=          nbcompat.h nbcompat/err.h nbcompat/fts.h nbcompat/getopt.h \
-               nbcompat/glob.h nbcompat/md5.h nbcompat/nbconfig.h \
-               nbcompat/nbtypes.h nbcompat/poll.h nbcompat/rmd160.h \
-               nbcompat/sha1.h nbcompat/statfs.h nbcompat/vis.h
+INCS=          nbcompat.h nbcompat/err.h nbcompat/fnmatch.h nbcompat/fts.h \
+               nbcompat/getopt.h nbcompat/glob.h nbcompat/md5.h \
+               nbcompat/nbconfig.h nbcompat/nbtypes.h nbcompat/poll.h \
+               nbcompat/queue.h nbcompat/rmd160.h nbcompat/sha1.h \
+               nbcompat/statvfs.h nbcompat/vis.h
 
 # always use our local glob() implementation.
 OBJS=          glob.o @LIBOBJS@
diff -r 2b596ab63371 -r c961137a9305 pkgtools/libnbcompat/files/README
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/pkgtools/libnbcompat/files/README Fri Aug 06 16:55:06 2004 +0000
@@ -0,0 +1,85 @@
+$NetBSD: README,v 1.1 2004/08/06 16:55:09 jlam Exp $
+
+ 0 Introduction
+ ==============
+
+libnbcompat builds and installs a portable NetBSD-compability library
+that supplies routines missing on operating systems that are used by
+the family of pkgsrc bootstrap tools.  Note that libnbcompat is very
+much a work-in-progress.  Only the functions that are directly used
+by the bootstrap tools are implemented in the library.  At the moment,
+this includes the following packages:
+
+       archivers/pax
+       pkgtools/mtree
+       pkgtools/pkg_install
+
+A script, src2nbcompat is also included in the sources that simplifies
+importing software from the NetBSD src module into pkgsrc.
+
+
+ 1 Updating this package
+ =======================
+
+Please take care when updating this package.  Do *not* simply commit
+changes to this package and ask for testers.  This package is too
+fundamental to the proper bootstrapping of pkgsrc to let accidental
+breakage seep in.  Proper methodology for updating this package is:
+
+    (1) Post a tarball at a publicly accessible URL containing the
+       pkgtools/libnbcompat directory.
+
+    (2) Ask on the tech-pkg%NetBSD.org@localhost mailing list for testers.
+
+    (3) Fix any breakage on non-NetBSD operating systems before
+       committing.
+
+
+ 2 Tested operating systems
+ ==========================
+
+*NOTE*
+*NOTE* This section should be kept up-to-date with the results for
+*NOTE* the most recent libnbcompat.
+*NOTE*
+
+libnbcompat-20040805 has been tested to build and install correctly
+on the following operating systems:
+
+       FreeBSD-4.8/i386        <jlam%NetBSD.org@localhost>
+       IRIX 6.5                <jschauma%NetBSD.org@localhost>
+       MacOS X 10.3.4          <schmonz%NetBSD.org@localhost>
+       NetBSD-1.6.2/i386       <jlam%NetBSD.org@localhost>
+       NetBSD-2.0_BETA/i386    <hubertf%NetBSD.org@localhost>
+       Red Hat Linux 7.3       <schmonz%NetBSD.org@localhost>
+       Solaris 9/sparc         <salo%NetBSD.org@localhost>
+
+
+ 3 Usage
+ =======
+
+This library is intended to simplify porting NetBSD software.  To that
+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.
+
+    (2) Surround each system header file included in the source file
+       with #if HAVE_<header_name>_H ... #endif.
+
+You may need to add additional headers present on other operating
+systems that define any system-supplied functions, e.g. <sys/vfs.h>.
+
+The src2nbcompat script included in the libncompat sources can be used
+to automate this process to some extent.  It is intended to import
+sources from a NetBSD src checkout into pkgsrc.  It will copy the
+sources from a directory and automatically insert the proper lines
+into the files.  For example, to import the pkg_install sources into
+pkgsrc, run:
+
+       src2nbcompat \
+               /usr/src/usr.sbin/pkg_install \
+               /usr/pkgsrc/pkgtools/pkg_install/files
+
+You will need to run a "cvs diff" on the imported files to check that
+any local changes are preserved across imports.
diff -r 2b596ab63371 -r c961137a9305 pkgtools/libnbcompat/files/configure
--- a/pkgtools/libnbcompat/files/configure      Fri Aug 06 16:52:56 2004 +0000
+++ b/pkgtools/libnbcompat/files/configure      Fri Aug 06 16:55:06 2004 +0000
@@ -3296,15 +3296,16 @@
 
 
 for ac_header in arpa/nameser.h assert.h bind/bitypes.h dirent.h err.h \
-       errno.h fcntl.h fts.h inttypes.h libutil.h limits.h \
+       errno.h fcntl.h fnmatch.h fts.h inttypes.h libutil.h limits.h \
        machine/endian.h memory.h ndir.h netdb.h netinet/in6_machtypes.h \
        paths.h pwd.h stdint.h stdlib.h stringlist.h strings.h \
        string.h sys/bitypes.h sys/byteorder.h sys/cdefs.h sys/dir.h \
        sys/endian.h sys/file.h sys/mkdev.h sys/ndir.h \
-       sys/param.h sys/queue.h sys/time.h sys/ttycom.h \
+       sys/param.h sys/time.h sys/ttycom.h \
        sys/stat.h sys/statfs.h sys/statvfs.h sys/vfs.h sys/types.h \
        sys/vfs.h termcap.h termios.h time.h tzfile.h unistd.h util.h \
        utmp.h
+
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -3468,10 +3469,11 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_includes_default
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
+
+       $ac_includes_default
+       #ifdef HAVE_SYS_PARAM_H
+       #include <sys/param.h>
+       #endif
 
 
 #include <$ac_header>
@@ -3513,6 +3515,550 @@
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
+ :
+else
+  :
+fi
+
+done
+
+
+
+for ac_header in glob.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5



Home | Main Index | Thread Index | Old Index