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 20030829. Changes from...
details: https://anonhg.NetBSD.org/pkgsrc/rev/6b430ea0c2a6
branches: trunk
changeset: 460852:6b430ea0c2a6
user: jlam <jlam%pkgsrc.org@localhost>
date: Fri Sep 05 18:35:49 2003 +0000
description:
Update pkgtools/libnbcompat to 20030829. Changes from previous version
include:
* Move headers out of the global namespace and into the nbcompat
directory. Since there are no headers other than nbcompat.h in
${PREFIX}/include/libnbcompat, just install it directly in
${PREFIX}/include. Using libnbcompat is now a matter of including
nbcompat.h at the top of *.c files and linking against -lnbcompat.
* Only build functions into libnbcompat.a if they aren't already in
the system libraries.
* Move several *.[ch] files that are pax- or mtree-specific out
of libnbcompat (they should belong with those packages).
On NetBSD 1.6 systems, libnbcompat.a now contains just the bare minimum:
the sha2 routines.
diffstat:
doc/CHANGES | 3 +-
pkgtools/libnbcompat/Makefile | 10 +-
pkgtools/libnbcompat/PLIST | 39 +-
pkgtools/libnbcompat/buildlink2.mk | 12 +-
pkgtools/libnbcompat/files/Makefile.in | 26 +-
pkgtools/libnbcompat/files/configure | 713 +++++++++++++++------
pkgtools/libnbcompat/files/configure.ac | 50 +-
pkgtools/libnbcompat/files/extern.h | 114 ---
pkgtools/libnbcompat/files/ftpglob.h | 92 --
pkgtools/libnbcompat/files/getid.c | 458 --------------
pkgtools/libnbcompat/files/getopt.h | 80 --
pkgtools/libnbcompat/files/md5.h | 53 -
pkgtools/libnbcompat/files/md5c.c | 4 +-
pkgtools/libnbcompat/files/md5hl.c | 6 +-
pkgtools/libnbcompat/files/misc.c | 292 ---------
pkgtools/libnbcompat/files/mtree.h | 136 ----
pkgtools/libnbcompat/files/nbcompat.h | 70 +-
pkgtools/libnbcompat/files/nbcompat/getopt.h | 78 ++
pkgtools/libnbcompat/files/nbcompat/glob.h | 92 ++
pkgtools/libnbcompat/files/nbcompat/md5.h | 53 +
pkgtools/libnbcompat/files/nbcompat/nbconfig.h.in | 24 +-
pkgtools/libnbcompat/files/nbcompat/rmd160.h | 46 +
pkgtools/libnbcompat/files/nbcompat/sha1.h | 28 +
pkgtools/libnbcompat/files/nbcompat/sha2.h | 151 ++++
pkgtools/libnbcompat/files/pack_dev.c | 313 ---------
pkgtools/libnbcompat/files/pack_dev.h | 47 -
pkgtools/libnbcompat/files/rmd160.c | 6 +-
pkgtools/libnbcompat/files/rmd160.h | 46 -
pkgtools/libnbcompat/files/rmd160hl.c | 6 +-
pkgtools/libnbcompat/files/setmode.c | 503 ---------------
pkgtools/libnbcompat/files/sha1.c | 4 +-
pkgtools/libnbcompat/files/sha1.h | 28 -
pkgtools/libnbcompat/files/sha1hl.c | 6 +-
pkgtools/libnbcompat/files/sha2.c | 2 +-
pkgtools/libnbcompat/files/sha2.h | 151 ----
pkgtools/libnbcompat/files/sha2hl.c | 6 +-
pkgtools/libnbcompat/files/spec.c | 591 ------------------
pkgtools/libnbcompat/files/stat_flags.c | 198 ------
pkgtools/libnbcompat/files/stat_flags.h | 39 -
39 files changed, 1131 insertions(+), 3445 deletions(-)
diffs (truncated from 5112 to 300 lines):
diff -r d495c13b7608 -r 6b430ea0c2a6 doc/CHANGES
--- a/doc/CHANGES Fri Sep 05 17:02:54 2003 +0000
+++ b/doc/CHANGES Fri Sep 05 18:35:49 2003 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.3253 2003/09/05 17:02:54 xtraeme Exp $
+$NetBSD: CHANGES,v 1.3254 2003/09/05 18:35:49 jlam Exp $
Changes to the packages collection and infrastructure in 2003:
@@ -3546,3 +3546,4 @@
Updated leafnode to 1.9.43 [wiz 2003-09-05]
Updated lftp to 2.6.7 [xtraeme 2003-09-05]
Added gtranslator-1.0 [xtraeme 2003-09-05]
+ Updated libnbcompat to 20030829 [jlam 2003-09-05]
diff -r d495c13b7608 -r 6b430ea0c2a6 pkgtools/libnbcompat/Makefile
--- a/pkgtools/libnbcompat/Makefile Fri Sep 05 17:02:54 2003 +0000
+++ b/pkgtools/libnbcompat/Makefile Fri Sep 05 18:35:49 2003 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2003/09/04 01:51:15 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2003/09/05 18:35:58 jlam Exp $
#
-DISTNAME= libnbcompat-20030828
+DISTNAME= libnbcompat-20030829
CATEGORIES= pkgtools
MASTER_SITES= # empty
DISTFILES= # empty
@@ -18,9 +18,9 @@
GNU_CONFIGURE= # defined
-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}
+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 d495c13b7608 -r 6b430ea0c2a6 pkgtools/libnbcompat/PLIST
--- a/pkgtools/libnbcompat/PLIST Fri Sep 05 17:02:54 2003 +0000
+++ b/pkgtools/libnbcompat/PLIST Fri Sep 05 18:35:49 2003 +0000
@@ -1,26 +1,19 @@
-@comment $NetBSD: PLIST,v 1.8 2003/09/03 13:11:12 jlam Exp $
-include/libnbcompat/extern.h
-include/libnbcompat/ftpglob.h
-include/libnbcompat/getopt.h
-include/libnbcompat/md5.h
-include/libnbcompat/mtree.h
-include/libnbcompat/nbcompat.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
-include/libnbcompat/sha1.h
-include/libnbcompat/sha2.h
-include/libnbcompat/stat_flags.h
-include/libnbcompat/util.h
+@comment $NetBSD: PLIST,v 1.9 2003/09/05 18:35:58 jlam Exp $
+include/nbcompat.h
+include/nbcompat/err.h
+include/nbcompat/fts.h
+include/nbcompat/getopt.h
+include/nbcompat/glob.h
+include/nbcompat/md5.h
+include/nbcompat/nbconfig.h
+include/nbcompat/nbtypes.h
+include/nbcompat/poll.h
+include/nbcompat/rmd160.h
+include/nbcompat/sha1.h
+include/nbcompat/sha2.h
+include/nbcompat/statfs.h
+include/nbcompat/vis.h
lib/libnbcompat.a
-@dirrm include/libnbcompat/nbcompat
-@dirrm include/libnbcompat
+@dirrm include/nbcompat
@unexec ${RMDIR} -p %D/include 2>/dev/null || ${TRUE}
@unexec ${RMDIR} -p %D/lib 2>/dev/null || ${TRUE}
diff -r d495c13b7608 -r 6b430ea0c2a6 pkgtools/libnbcompat/buildlink2.mk
--- a/pkgtools/libnbcompat/buildlink2.mk Fri Sep 05 17:02:54 2003 +0000
+++ b/pkgtools/libnbcompat/buildlink2.mk Fri Sep 05 18:35:49 2003 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink2.mk,v 1.11 2003/09/04 01:51:15 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.12 2003/09/05 18:35:58 jlam Exp $
.if !defined(LIBNBCOMPAT_BUILDLINK2_MK)
LIBNBCOMPAT_BUILDLINK2_MK= # defined
-BUILDLINK_DEPENDS.libnbcompat?= libnbcompat>=20030828
+BUILDLINK_DEPENDS.libnbcompat?= libnbcompat>=20030829
BUILDLINK_PKGSRCDIR.libnbcompat?= ../../pkgtools/libnbcompat
BUILDLINK_DEPMETHOD.libnbcompat?= build
@@ -11,12 +11,10 @@
EVAL_PREFIX+= BUILDLINK_PREFIX.libnbcompat=libnbcompat
BUILDLINK_PREFIX.libnbcompat_DEFAULT= ${LOCALBASE}
-BUILDLINK_FILES.libnbcompat= include/libnbcompat/*/*
-BUILDLINK_FILES.libnbcompat+= include/libnbcompat/*
+BUILDLINK_FILES.libnbcompat= include/nbcompat.h
+BUILDLINK_FILES.libnbcompat+= include/nbcompat/*
BUILDLINK_FILES.libnbcompat+= lib/libnbcompat.*
-BUILDLINK_CPPFLAGS.libnbcompat= \
- -I${BUILDLINK_PREFIX.libnbcompat}/include/libnbcompat
BUILDLINK_LDADD.libnbcompat= -lnbcompat
BUILDLINK_TARGETS+= libnbcompat-buildlink
@@ -24,8 +22,6 @@
libnbcompat-buildlink: _BUILDLINK_USE
.if defined(GNU_CONFIGURE)
-CPPFLAGS+= ${BUILDLINK_CPPFLAGS.libnbcompat}
-CFLAGS+= ${BUILDLINK_CPPFLAGS.libnbcompat}
LIBS+= ${BUILDLINK_LDADD.libnbcompat}
.endif
diff -r d495c13b7608 -r 6b430ea0c2a6 pkgtools/libnbcompat/files/Makefile.in
--- a/pkgtools/libnbcompat/files/Makefile.in Fri Sep 05 17:02:54 2003 +0000
+++ b/pkgtools/libnbcompat/files/Makefile.in Fri Sep 05 18:35:49 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.14 2003/09/03 16:38:38 jlam Exp $
+# $NetBSD: Makefile.in,v 1.15 2003/09/05 18:35:58 jlam Exp $
#
srcdir= @srcdir@
@@ -19,16 +19,12 @@
LIB= libnbcompat.a
-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
+INCS= nbcompat.h nbcompat/err.h nbcompat/fts.h nbcompat/getopt.h \
+ nbcompat/glob.h nbcompat/md5.h nbcompat/nbtypes.h \
+ nbcompat/poll.h nbcompat/rmd160.h nbcompat/sha1.h \
+ nbcompat/sha2.h nbcompat/statfs.h nbcompat/vis.h
-OBJS= @LIBOBJS@ \
- md5c.o md5hl.o rmd160.o rmd160hl.o sha1.o sha1hl.o \
- sha2.o sha2hl.o setmode.o getid.o misc.o pack_dev.o \
- spec.o setmode.o stat_flags.o pwcache.o getopt_long.o
+OBJS= @LIBOBJS@
LINK= $(CCLD) $(CFLAGS) $(LDFLAGS) -o $@
COMPILE= $(CC) $(CPPFLAGS) $(CFLAGS)
@@ -73,13 +69,13 @@
$(INSTALL) -m 755 -d $(prefix)/lib
$(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
+ $(INSTALL) -m 755 -d $(prefix)/include
+ $(INSTALL) -m 755 -d $(prefix)/include/nbcompat
@for file in $(INCS); do \
- echo "$(INSTALL) -m 444 $$file $(prefix)/include/libnbcompat/$$file"; \
- $(INSTALL) -m 444 $$file $(prefix)/include/libnbcompat/$$file; \
+ echo "$(INSTALL) -m 444 $$file $(prefix)/include/$$file"; \
+ $(INSTALL) -m 444 $$file $(prefix)/include/$$file; \
done
- $(INSTALL) -m 444 nbcompat/nbconfig.hi $(prefix)/include/libnbcompat/nbcompat/nbconfig.h
+ $(INSTALL) -m 444 nbcompat/nbconfig.hi $(prefix)/include/nbcompat/nbconfig.h
clean:
rm -f *.a *.o bits nbcompat/nbtypes.h nbcompat/nbcompat.hi
diff -r d495c13b7608 -r 6b430ea0c2a6 pkgtools/libnbcompat/files/configure
--- a/pkgtools/libnbcompat/files/configure Fri Sep 05 17:02:54 2003 +0000
+++ b/pkgtools/libnbcompat/files/configure Fri Sep 05 18:35:49 2003 +0000
@@ -3166,8 +3166,10 @@
+
+
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 fts.h getopt.h glob.h inttypes.h libutil.h limits.h \
machine/endian.h memory.h ndir.h netdb.h netinet/in6_machtypes.h \
paths.h poll.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 \
@@ -3316,6 +3318,152 @@
done
+
+
+
+
+for ac_header in md5.h rmd160.h sha1.h sha2.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
+#line $LINENO "configure"
+/* 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>&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
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc in
+ yes:no )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ (
+ cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf%gnu.org@localhost. ##
+## ------------------------------------ ##
+_ASBOX
+ ) |
Home |
Main Index |
Thread Index |
Old Index