pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc update mtree to 20030905:
details: https://anonhg.NetBSD.org/pkgsrc/rev/36bd4d9897e6
branches: trunk
changeset: 460821:36bd4d9897e6
user: grant <grant%pkgsrc.org@localhost>
date: Fri Sep 05 04:38:44 2003 +0000
description:
update mtree to 20030905:
* sync with -current
* fixes for libnbcompat new world order
* autoconf and Makefile cleanup
diffstat:
doc/CHANGES | 3 +-
pkgtools/mtree/Makefile | 11 +-
pkgtools/mtree/files/Makefile.in | 60 +-
pkgtools/mtree/files/acconfig.h | 8 -
pkgtools/mtree/files/aclocal.m4 | 141 -
pkgtools/mtree/files/compare.c | 39 +-
pkgtools/mtree/files/config.h.in | 526 +---
pkgtools/mtree/files/configure | 4380 +++++++-----------------------------
pkgtools/mtree/files/configure.ac | 277 +--
pkgtools/mtree/files/crc.c | 27 +-
pkgtools/mtree/files/create.c | 51 +-
pkgtools/mtree/files/excludes.c | 31 +-
pkgtools/mtree/files/mtree.8 | 14 +-
pkgtools/mtree/files/mtree.c | 33 +-
pkgtools/mtree/files/mtree.cat8 | 22 +-
pkgtools/mtree/files/verify.c | 35 +-
16 files changed, 1181 insertions(+), 4477 deletions(-)
diffs (truncated from 6590 to 300 lines):
diff -r 2d5aadfed521 -r 36bd4d9897e6 doc/CHANGES
--- a/doc/CHANGES Fri Sep 05 03:58:21 2003 +0000
+++ b/doc/CHANGES Fri Sep 05 04:38:44 2003 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.3245 2003/09/05 03:58:08 itojun Exp $
+$NetBSD: CHANGES,v 1.3246 2003/09/05 04:40:40 grant Exp $
Changes to the packages collection and infrastructure in 2003:
@@ -3538,3 +3538,4 @@
Added bbdb 2.34 [minoura 2003-09-04]
Updated mserv to 0.05nb2 [abs 2003-09-04]
Updated quagga to 0.96.2 [itojun 2003-09-05]
+ Updated mtree to 20030905 [grant 2003-09-05]
diff -r 2d5aadfed521 -r 36bd4d9897e6 pkgtools/mtree/Makefile
--- a/pkgtools/mtree/Makefile Fri Sep 05 03:58:21 2003 +0000
+++ b/pkgtools/mtree/Makefile Fri Sep 05 04:38:44 2003 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/09/05 03:58:21 reed Exp $
+# $NetBSD: Makefile,v 1.8 2003/09/05 04:38:44 grant Exp $
#
-DISTNAME= mtree-20030731
+DISTNAME= mtree-20030905
CATEGORIES= pkgtools
MASTER_SITES= # empty
DISTFILES= # empty
@@ -25,3 +25,10 @@
.include "../../pkgtools/libnbcompat/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
+
+PREFIX:= ${PKG_TOOLS_BIN:C|/[^/]?bin$||}
+.if ${PREFIX} == "/usr"
+CONFIGURE_ARGS+= --mandir=${PREFIX}/share/man
+.else
+CONFIGURE_ARGS+= --mandir=${PREFIX}/man
+.endif
diff -r 2d5aadfed521 -r 36bd4d9897e6 pkgtools/mtree/files/Makefile.in
--- a/pkgtools/mtree/files/Makefile.in Fri Sep 05 03:58:21 2003 +0000
+++ b/pkgtools/mtree/files/Makefile.in Fri Sep 05 04:38:44 2003 +0000
@@ -1,36 +1,39 @@
-# $NetBSD: Makefile.in,v 1.4 2003/07/31 09:30:28 grant Exp $
+# $NetBSD: Makefile.in,v 1.5 2003/09/05 04:38:45 grant Exp $
+
+srcdir= @srcdir@
-srcdir = @srcdir@
-prefix = @prefix@
-VPATH = @srcdir@
-SHELL = /bin/sh
+prefix= @prefix@
+exec_prefix= @exec_prefix@
+sbindir= @sbindir@
+mandir= @mandir@
+
+man8dir= $(mandir)/man8
+cat8dir= $(mandir)/cat8
-CC = @CC@
-CCLD = $(CC)
-CFLAGS = -I$(srcdir) -I. -I$(prefix)/include/libnbcompat @INCLUDES@ @CFLAGS@
-CPPFLAGS= @CPPFLAGS@
-DEFS = @DEFS@
-INSTALL = @INSTALL@
-LDFLAGS = @LDFLAGS@ -L$(prefix)/lib
-LIBS = @LIBS@ -lnbcompat
+CC= @CC@
+CCLD= $(CC)
+LIBS= @LIBS@
+CPPFLAGS= @CPPFLAGS@ -I. -I$(srcdir)
+DEFS= @DEFS@
+CFLAGS= @CFLAGS@
+LDFLAGS= @LDFLAGS@
+
+INSTALL= @INSTALL@
-LINK= $(CCLD) $(CFLAGS) $(LDFLAGS) -o $@
-COMPILE=$(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS)
+PROG= mtree
+
+SRCS= compare.c crc.c create.c excludes.c mtree.c verify.c
+OBJS= $(SRCS:.c=.o)
-mandir= $(prefix)/man
-mandirman8= $(mandir)/man8
-mandircat8= $(mandir)/cat8
+.PHONY: all clean install
-PROG= mtree
-OBJS= compare.o crc.o create.o excludes.o mtree.o verify.o
+.c.o:
+ $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -c $<
all: $(PROG)
$(PROG): $(OBJS)
- $(LINK) $(OBJS) $(LIBS)
-
-.c.o:
- $(COMPILE) -c $< -o $@
+ $(CCLD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
clean:
rm -f $(OBJS) $(PROG)
@@ -40,6 +43,9 @@
rm -f configure.lineno config.log
install:
- $(INSTALL) $(PROG) $(PREFIX)/sbin
- $(INSTALL) -m 444 $(PROG).8 $(mandirman8)/$(PROG).8
- $(INSTALL) -m 444 $(PROG).cat8 $(mandircat8)/$(PROG).0
+ $(INSTALL) -m 755 -d $(sbindir)
+ $(INSTALL) -m 755 -d $(man8dir)
+ $(INSTALL) -m 755 -d $(cat8dir)
+ $(INSTALL) $(PROG) $(sbindir)
+ $(INSTALL) -m 444 $(PROG).8 $(man8dir)/$(PROG).8
+ $(INSTALL) -m 444 $(PROG).cat8 $(cat8dir)/$(PROG).0
diff -r 2d5aadfed521 -r 36bd4d9897e6 pkgtools/mtree/files/acconfig.h
--- a/pkgtools/mtree/files/acconfig.h Fri Sep 05 03:58:21 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-/* $Id: acconfig.h,v 1.1.1.1 2003/03/31 08:51:33 grant Exp $ */
-
-/* Define if *printf() uses %qd to print `long long' (otherwise uses %lld) */
-#undef HAVE_PRINTF_QD
-
-/* Define if `long long' is supported and sizeof(off_t) >= 8 */
-#undef HAVE_QUAD_SUPPORT
-
diff -r 2d5aadfed521 -r 36bd4d9897e6 pkgtools/mtree/files/aclocal.m4
--- a/pkgtools/mtree/files/aclocal.m4 Fri Sep 05 03:58:21 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,141 +0,0 @@
-dnl $Id: aclocal.m4,v 1.1.1.1 2003/03/31 08:51:33 grant Exp $
-dnl
-
-dnl
-dnl AC_MSG_TRY_COMPILE
-dnl
-dnl Written by Luke Mewburn <lukem%netbsd.org@localhost>
-dnl
-dnl Usage:
-dnl AC_MSG_TRY_COMPILE(Message, CacheVar, Includes, Code,
-dnl ActionPass [,ActionFail] )
-dnl
-dnl effectively does:
-dnl AC_CACHE_CHECK(Message, CacheVar,
-dnl AC_TRY_COMPILE(Includes, Code, CacheVar = yes, CacheVar = no)
-dnl if CacheVar == yes
-dnl AC_MESSAGE_RESULT(yes)
-dnl ActionPass
-dnl else
-dnl AC_MESSAGE_RESULT(no)
-dnl ActionFail
-dnl )
-dnl
-AC_DEFUN(AC_MSG_TRY_COMPILE, [
- AC_CACHE_CHECK($1, $2, [
- AC_TRY_COMPILE([ $3 ], [ $4; ], [ $2=yes ], [ $2=no ])
- ])
- if test "x[$]$2" = "xyes"; then
- $5
- else
- $6
- :
- fi
-])
-
-dnl
-dnl AC_MSG_TRY_LINK
-dnl
-dnl Usage:
-dnl AC_MSG_TRY_LINK(Message, CacheVar, Includes, Code,
-dnl ActionPass [,ActionFail] )
-dnl
-dnl as AC_MSG_TRY_COMPILE, but uses AC_TRY_LINK instead of AC_TRY_COMPILE
-dnl
-AC_DEFUN(AC_MSG_TRY_LINK, [
- AC_CACHE_CHECK($1, $2, [
- AC_TRY_LINK([ $3 ], [ $4; ], [ $2=yes ], [ $2=no ])
- ])
- if test "x[$]$2" = "xyes"; then
- $5
- else
- $6
- :
- fi
-])
-
-
-dnl
-dnl AC_LIBRARY_NET: #Id: net.m4,v 1.5 1997/11/09 21:36:54 jhawk Exp #
-dnl
-dnl Written by John Hawkinson <jhawk%mit.edu@localhost>. This code is in the Public
-dnl Domain.
-dnl
-dnl This test is for network applications that need socket() and
-dnl gethostbyname() -ish functions. Under Solaris, those applications need to
-dnl link with "-lsocket -lnsl". Under IRIX, they should *not* link with
-dnl "-lsocket" because libsocket.a breaks a number of things (for instance:
-dnl gethostbyname() under IRIX 5.2, and snoop sockets under most versions of
-dnl IRIX).
-dnl
-dnl Unfortunately, many application developers are not aware of this, and
-dnl mistakenly write tests that cause -lsocket to be used under IRIX. It is
-dnl also easy to write tests that cause -lnsl to be used under operating
-dnl systems where neither are necessary (or useful), such as SunOS 4.1.4, which
-dnl uses -lnsl for TLI.
-dnl
-dnl This test exists so that every application developer does not test this in
-dnl a different, and subtly broken fashion.
-dnl
-dnl It has been argued that this test should be broken up into two seperate
-dnl tests, one for the resolver libraries, and one for the libraries necessary
-dnl for using Sockets API. Unfortunately, the two are carefully intertwined and
-dnl allowing the autoconf user to use them independantly potentially results in
-dnl unfortunate ordering dependancies -- as such, such component macros would
-dnl have to carefully use indirection and be aware if the other components were
-dnl executed. Since other autoconf macros do not go to this trouble, and almost
-dnl no applications use sockets without the resolver, this complexity has not
-dnl been implemented.
-dnl
-dnl The check for libresolv is in case you are attempting to link statically
-dnl and happen to have a libresolv.a lying around (and no libnsl.a).
-dnl
-AC_DEFUN(AC_LIBRARY_NET, [
- # Most operating systems have gethostbyname() in the default searched
- # libraries (i.e. libc):
- AC_CHECK_FUNC(gethostbyname, ,
- # Some OSes (eg. Solaris) place it in libnsl:
- AC_CHECK_LIB(nsl, gethostbyname, ,
- # Some strange OSes (SINIX) have it in libsocket:
- AC_CHECK_LIB(socket, gethostbyname, ,
- # Unfortunately libsocket sometimes depends on libnsl.
- # AC_CHECK_LIB's API is essentially broken so the following
- # ugliness is necessary:
- AC_CHECK_LIB(socket, gethostbyname,
- LIBS="-lsocket -lnsl $LIBS",
- AC_CHECK_LIB(resolv, gethostbyname),
- -lnsl)
- )
- )
- )
- AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket, ,
- AC_CHECK_LIB(socket, socket, LIBS="-lsocket -lnsl $LIBS", , -lnsl)))
- ])
-
-
-dnl
-dnl Test for __attribute__
-dnl
-
-AC_DEFUN(AC_C___ATTRIBUTE__, [
-AC_MSG_CHECKING(for __attribute__)
-AC_CACHE_VAL(ac_cv___attribute__, [
-AC_TRY_COMPILE([
-#include <stdlib.h>
-],
-[
-static void foo(void) __attribute__ ((noreturn));
-
-static void
-foo(void)
-{
- exit(1);
-}
-],
-ac_cv___attribute__=yes,
-ac_cv___attribute__=no)])
-if test "$ac_cv___attribute__" = "yes"; then
- AC_DEFINE(HAVE___ATTRIBUTE__, 1, [define if your compiler has __attribute__])
-fi
-AC_MSG_RESULT($ac_cv___attribute__)
-])
diff -r 2d5aadfed521 -r 36bd4d9897e6 pkgtools/mtree/files/compare.c
--- a/pkgtools/mtree/files/compare.c Fri Sep 05 03:58:21 2003 +0000
+++ b/pkgtools/mtree/files/compare.c Fri Sep 05 04:38:44 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: compare.c,v 1.1.1.1 2003/03/31 08:51:09 grant Exp $ */
+/* $NetBSD: compare.c,v 1.2 2003/09/05 04:38:46 grant Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -12,11 +12,7 @@
* 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
+ * 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.
*
@@ -33,38 +29,59 @@
* SUCH DAMAGE.
*/
Home |
Main Index |
Thread Index |
Old Index