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 20030826. Changes from...
details: https://anonhg.NetBSD.org/pkgsrc/rev/4017758024c9
branches: trunk
changeset: 460720:4017758024c9
user: jlam <jlam%pkgsrc.org@localhost>
date: Wed Sep 03 13:11:11 2003 +0000
description:
Update pkgtools/libnbcompat to 20030826. Changes from previous version:
* Properly declare statfs() and fstatfs() if we use the libnbcompat
versions.
* Move some headers into a private directory in the installed
location so that they don't override headers of the same name
on the system.
* Define TAILQ_HEAD_INITIALIZER if it doesn't exist.
* Add a poll() implementation using select() for poll()-less systems.
Thanks for Charles Blundell for the implementation!
* Fix the vis.h check for systems whose vis() is not as featureful
as NetBSD's.
diffstat:
doc/CHANGES | 3 +-
pkgtools/libnbcompat/Makefile | 5 +-
pkgtools/libnbcompat/PLIST | 15 +-
pkgtools/libnbcompat/buildlink2.mk | 5 +-
pkgtools/libnbcompat/files/Makefile.in | 61 +++---
pkgtools/libnbcompat/files/__fts13.c | 20 +-
pkgtools/libnbcompat/files/bits.c | 6 +-
pkgtools/libnbcompat/files/configure | 295 +++++++++++++++++++++++-------
pkgtools/libnbcompat/files/configure.ac | 61 ++++--
pkgtools/libnbcompat/files/extern.h | 9 +-
pkgtools/libnbcompat/files/getopt.h | 10 +-
pkgtools/libnbcompat/files/getopt_long.c | 6 +-
pkgtools/libnbcompat/files/md5c.c | 6 +-
pkgtools/libnbcompat/files/md5hl.c | 8 +-
pkgtools/libnbcompat/files/namespace.h | 4 +-
pkgtools/libnbcompat/files/nbcompat.h | 78 ++++++-
pkgtools/libnbcompat/files/pack_dev.c | 8 +-
pkgtools/libnbcompat/files/pwcache.c | 6 +-
pkgtools/libnbcompat/files/rmd160.c | 8 +-
pkgtools/libnbcompat/files/rmd160hl.c | 8 +-
pkgtools/libnbcompat/files/setenv.c | 6 +-
pkgtools/libnbcompat/files/setmode.c | 6 +-
pkgtools/libnbcompat/files/sha1.c | 6 +-
pkgtools/libnbcompat/files/sha1hl.c | 8 +-
pkgtools/libnbcompat/files/sha2.c | 4 +-
pkgtools/libnbcompat/files/sha2hl.c | 8 +-
pkgtools/libnbcompat/files/spec.c | 6 +-
pkgtools/libnbcompat/files/stat_flags.c | 16 +-
pkgtools/libnbcompat/files/statfs.c | 49 +----
pkgtools/libnbcompat/files/unvis.c | 8 +-
pkgtools/libnbcompat/files/util.h | 4 +-
pkgtools/libnbcompat/files/vis.c | 12 +-
32 files changed, 475 insertions(+), 280 deletions(-)
diffs (truncated from 1616 to 300 lines):
diff -r 488c72e2b03f -r 4017758024c9 doc/CHANGES
--- a/doc/CHANGES Wed Sep 03 13:08:04 2003 +0000
+++ b/doc/CHANGES Wed Sep 03 13:11:11 2003 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.3219 2003/09/03 12:36:55 martin Exp $
+$NetBSD: CHANGES,v 1.3220 2003/09/03 13:11:41 jlam Exp $
Changes to the packages collection and infrastructure in 2003:
@@ -3494,3 +3494,4 @@
Updated doxygen to 1.3.3 [martti 2003-09-03]
Updated libnbcompat to 20030825 [jlam 2003-09-03]
Updated mserv to 0.35 [martin 2003-09-03]
+ Updated libnbcompat to 20030826 [jlam 2003-09-03]
diff -r 488c72e2b03f -r 4017758024c9 pkgtools/libnbcompat/Makefile
--- a/pkgtools/libnbcompat/Makefile Wed Sep 03 13:08:04 2003 +0000
+++ b/pkgtools/libnbcompat/Makefile Wed Sep 03 13:11:11 2003 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2003/09/03 07:07:04 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2003/09/03 13:11:11 jlam Exp $
#
-DISTNAME= libnbcompat-20030825
+DISTNAME= libnbcompat-20030826
CATEGORIES= pkgtools
MASTER_SITES= # empty
DISTFILES= # empty
@@ -20,6 +20,7 @@
PKG_INFO= PKG_DBDIR=${PKG_DBDIR} ${PKG_INFO_CMD}
PKG_CREATE= PKG_DBDIR=${PKG_DBDIR} ${PKG_CREATE_CMD}
+PKG_DELETE= PKG_DBDIR=${PKG_DBDIR} ${PKG_DELETE_CMD}
do-extract:
@${CP} -Rp ${FILESDIR} ${WRKSRC}
diff -r 488c72e2b03f -r 4017758024c9 pkgtools/libnbcompat/PLIST
--- a/pkgtools/libnbcompat/PLIST Wed Sep 03 13:08:04 2003 +0000
+++ b/pkgtools/libnbcompat/PLIST Wed Sep 03 13:11:11 2003 +0000
@@ -1,14 +1,17 @@
-@comment $NetBSD: PLIST,v 1.7 2003/09/03 06:16:08 tron Exp $
-include/libnbcompat/err.h
+@comment $NetBSD: PLIST,v 1.8 2003/09/03 13:11:12 jlam Exp $
include/libnbcompat/extern.h
include/libnbcompat/ftpglob.h
-include/libnbcompat/fts.h
include/libnbcompat/getopt.h
include/libnbcompat/md5.h
include/libnbcompat/mtree.h
include/libnbcompat/nbcompat.h
-include/libnbcompat/nbconfig.h
-include/libnbcompat/nbtypes.h
+include/libnbcompat/nbcompat/err.h
+include/libnbcompat/nbcompat/fts.h
+include/libnbcompat/nbcompat/nbconfig.h
+include/libnbcompat/nbcompat/nbtypes.h
+include/libnbcompat/nbcompat/poll.h
+include/libnbcompat/nbcompat/statfs.h
+include/libnbcompat/nbcompat/vis.h
include/libnbcompat/pack_dev.h
include/libnbcompat/pwcache.h
include/libnbcompat/rmd160.h
@@ -16,8 +19,8 @@
include/libnbcompat/sha2.h
include/libnbcompat/stat_flags.h
include/libnbcompat/util.h
-include/libnbcompat/vis.h
lib/libnbcompat.a
+@dirrm include/libnbcompat/nbcompat
@dirrm include/libnbcompat
@unexec ${RMDIR} -p %D/include 2>/dev/null || ${TRUE}
@unexec ${RMDIR} -p %D/lib 2>/dev/null || ${TRUE}
diff -r 488c72e2b03f -r 4017758024c9 pkgtools/libnbcompat/buildlink2.mk
--- a/pkgtools/libnbcompat/buildlink2.mk Wed Sep 03 13:08:04 2003 +0000
+++ b/pkgtools/libnbcompat/buildlink2.mk Wed Sep 03 13:11:11 2003 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink2.mk,v 1.8 2003/09/02 22:19:03 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.9 2003/09/03 13:11:12 jlam Exp $
.if !defined(LIBNBCOMPAT_BUILDLINK2_MK)
LIBNBCOMPAT_BUILDLINK2_MK= # defined
-BUILDLINK_DEPENDS.libnbcompat?= libnbcompat>=20030823
+BUILDLINK_DEPENDS.libnbcompat?= libnbcompat>=20030826
BUILDLINK_PKGSRCDIR.libnbcompat?= ../../pkgtools/libnbcompat
BUILDLINK_DEPMETHOD.libnbcompat?= build
@@ -11,6 +11,7 @@
EVAL_PREFIX+= BUILDLINK_PREFIX.libnbcompat=libnbcompat
BUILDLINK_PREFIX.libnbcompat_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.libnbcompat= include/libnbcompat/*/*
BUILDLINK_FILES.libnbcompat+= include/libnbcompat/*
BUILDLINK_FILES.libnbcompat+= lib/libnbcompat.*
diff -r 488c72e2b03f -r 4017758024c9 pkgtools/libnbcompat/files/Makefile.in
--- a/pkgtools/libnbcompat/files/Makefile.in Wed Sep 03 13:08:04 2003 +0000
+++ b/pkgtools/libnbcompat/files/Makefile.in Wed Sep 03 13:11:11 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.12 2003/09/03 03:43:45 jlam Exp $
+# $NetBSD: Makefile.in,v 1.13 2003/09/03 13:11:13 jlam Exp $
#
srcdir= @srcdir@
@@ -7,7 +7,7 @@
SHELL= /bin/sh
CC= @CC@
-CFLAGS= -I${srcdir} -I. @INCLUDES@ @CFLAGS@
+CFLAGS= -I$(srcdir) -I. @INCLUDES@ @CFLAGS@
CPPFLAGS= @CPPFLAGS@
DEFS= @DEFS@
INSTALL= @INSTALL@
@@ -19,32 +19,34 @@
LIB= libnbcompat.a
-INCS= err.h extern.h ftpglob.h fts.h getopt.h md5.h mtree.h \
- nbcompat.h nbtypes.h pack_dev.h pwcache.h \
- rmd160.h sha1.h sha2.h stat_flags.h util.h vis.h
+INCS= extern.h ftpglob.h getopt.h md5.h mtree.h nbcompat.h \
+ nbcompat/err.h nbcompat/fts.h nbcompat/nbtypes.h \
+ nbcompat/poll.h nbcompat/statfs.h nbcompat/vis.h \
+ pack_dev.h pwcache.h rmd160.h sha1.h sha2.h stat_flags.h \
+ util.h
OBJS= @LIBOBJS@ \
md5c.o md5hl.o rmd160.o rmd160hl.o sha1.o sha1hl.o \
- sha2.o sha2hl.o unvis.o vis.o setmode.o __fts13.o \
- getid.o misc.o pack_dev.o spec.o setmode.o stat_flags.o \
- pwcache.o getopt_long.o
+ sha2.o sha2hl.o setmode.o __fts13.o getid.o misc.o \
+ pack_dev.o spec.o setmode.o stat_flags.o pwcache.o \
+ getopt_long.o
LINK= $(CCLD) $(CFLAGS) $(LDFLAGS) -o $@
COMPILE= $(CC) $(CPPFLAGS) $(CFLAGS)
.PHONY: all install clean distclean
-all: nbtypes.h nbconfig.hi ${LIB}
+all: nbcompat/nbtypes.h nbcompat/nbconfig.hi $(LIB)
-.c.o: nbtypes.h
+.c.o: nbcompat/nbtypes.h
$(COMPILE) $(DEFS) -c $<
-${LIB}: ${OBJS}
- ${AR} cr $@ ${OBJS}
- ${RANLIB} $@
+$(LIB): $(OBJS)
+ $(AR) cr $@ $(OBJS)
+ $(RANLIB) $@
-nbconfig.hi: nbconfig.h
- ${AWK} ' \
+nbcompat/nbconfig.hi: nbcompat/nbconfig.h
+ $(AWK) ' \
BEGIN { process = 1 } \
/NBCOMPAT template section follows\./ { process = 0 } \
/^\#[ ]*define[ ]+PACKAGE_.*/ { next } \
@@ -60,27 +62,28 @@
} \
} \
{ print } \
- ' nbconfig.h > $@
+ ' nbcompat/nbconfig.h > $@
-nbtypes.h: bits
- ./bits nbtypes.h
+nbcompat/nbtypes.h: bits
+ ./bits $@
bits: bits.c
- ${CC} -o bits bits.c
+ $(CC) -o bits bits.c
install:
- ${INSTALL} -m 555 ${LIB} ${prefix}/lib
- ${RANLIB} ${prefix}/lib/${LIB}
- ${INSTALL} -m 755 -d ${prefix}/include/libnbcompat
- @for file in ${INCS}; do \
- echo "${INSTALL} -m 444 $$file ${prefix}/include/libnbcompat/$$file"; \
- ${INSTALL} -m 444 $$file ${prefix}/include/libnbcompat/$$file; \
+ $(INSTALL) -m 555 ${LIB} $(prefix)/lib
+ $(RANLIB) $(prefix)/lib/$(LIB)
+ $(INSTALL) -m 755 -d $(prefix)/include/libnbcompat
+ $(INSTALL) -m 755 -d $(prefix)/include/libnbcompat/nbcompat
+ @for file in $(INCS); do \
+ echo "$(INSTALL) -m 444 $$file $(prefix)/include/libnbcompat/$$file"; \
+ $(INSTALL) -m 444 $$file $(prefix)/include/libnbcompat/$$file; \
done
- ${INSTALL} -m 444 nbconfig.hi ${prefix}/include/libnbcompat/nbconfig.h
+ $(INSTALL) -m 444 nbcompat/nbconfig.hi $(prefix)/include/libnbcompat/nbcompat/nbconfig.h
clean:
- rm -f *.a *.o bits nbtypes.h
+ rm -f *.a *.o bits nbcompat/nbtypes.h nbcompat/nbcompat.hi
distclean: clean
- rm -f Makefile config.log config.status configure.lineno nbconfig.h
-
+ rm -f Makefile config.log config.status configure.lineno
+ rm -f nbcompat/nbconfig.h
diff -r 488c72e2b03f -r 4017758024c9 pkgtools/libnbcompat/files/__fts13.c
--- a/pkgtools/libnbcompat/files/__fts13.c Wed Sep 03 13:08:04 2003 +0000
+++ b/pkgtools/libnbcompat/files/__fts13.c Wed Sep 03 13:11:11 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: __fts13.c,v 1.3 2003/09/01 15:31:15 jlam Exp $ */
+/* $NetBSD: __fts13.c,v 1.4 2003/09/03 13:11:13 jlam Exp $ */
/*-
* Copyright (c) 1990, 1993, 1994
@@ -30,7 +30,7 @@
*/
#if HAVE_CONFIG_H
-#include "nbconfig.h"
+#include "nbcompat/nbconfig.h"
#endif
#if HAVE_SYS_CDEFS_H
@@ -41,12 +41,16 @@
#if 0
static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94";
#else
-__RCSID("$NetBSD: __fts13.c,v 1.3 2003/09/01 15:31:15 jlam Exp $");
+__RCSID("$NetBSD: __fts13.c,v 1.4 2003/09/03 13:11:13 jlam Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
+#if HAVE_SYS_PARAM_H
#include <sys/param.h>
+#endif
+#if HAVE_SYS_STAT_H
#include <sys/stat.h>
+#endif
#if HAVE_ASSERT_H
#include <assert.h>
@@ -56,7 +60,9 @@
#include <dirent.h>
#endif
+#if HAVE_ERRNO_H
#include <errno.h>
+#endif
#if HAVE_FCNTL_H
#include <fcntl.h>
@@ -66,11 +72,17 @@
#include <limits.h>
#endif
-#include "fts.h"
+#include "nbcompat/fts.h"
+#if HAVE_STDLIB_H
#include <stdlib.h>
+#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
diff -r 488c72e2b03f -r 4017758024c9 pkgtools/libnbcompat/files/bits.c
--- a/pkgtools/libnbcompat/files/bits.c Wed Sep 03 13:08:04 2003 +0000
+++ b/pkgtools/libnbcompat/files/bits.c Wed Sep 03 13:11:11 2003 +0000
@@ -31,9 +31,9 @@
* SUCH DAMAGE.
*/
-#include "nbconfig.h"
+#include "nbcompat/nbconfig.h"
#if 0
-__RCSID("$Id: bits.c,v 1.3 2003/09/01 15:31:15 jlam Exp $");
+__RCSID("$Id: bits.c,v 1.4 2003/09/03 13:11:13 jlam Exp $");
#endif
#include <stdio.h>
#include <string.h>
@@ -127,7 +127,7 @@
}
fprintf(f, "/* %s -- this file was generated by\n", fn);
fprintf(f, " %*s %s */\n\n", (int)strlen(fn), "",
- "$Id: bits.c,v 1.3 2003/09/01 15:31:15 jlam Exp $");
+ "$Id: bits.c,v 1.4 2003/09/03 13:11:13 jlam Exp $");
fprintf(f, "#ifndef %s\n", hb);
fprintf(f, "#define %s\n", hb);
fprintf(f, "\n");
diff -r 488c72e2b03f -r 4017758024c9 pkgtools/libnbcompat/files/configure
--- a/pkgtools/libnbcompat/files/configure Wed Sep 03 13:08:04 2003 +0000
+++ b/pkgtools/libnbcompat/files/configure Wed Sep 03 13:11:11 2003 +0000
@@ -1274,7 +1274,7 @@
- ac_config_headers="$ac_config_headers nbconfig.h"
Home |
Main Index |
Thread Index |
Old Index