Update to 1.024. From the changelog:

- Fixed (again) glob patterns to allow both "!" (like modern glob) or
  "^" (like existing shells) for negating character sets.

- Tweaked str_alloc to use realloc when appropriate.

- Fixed glob pattern matches to use "!" instead of "~" for negating
  character sets like all other globs use.

- Fixed the installer libraries to include all the necessary object
  files for producing the installer/instcheck/instshow programs.

- Added a generic installer program, similar to the "install" program
  included with ezmlm.

- Fixed the instshow library to use and dispaly the install prefix just
  like the other instlib programs.

- The installers now automatically create missing directories, and
  installs into temporary files that get renamed.

- Added path_mkdirs function.

- Fixed typo bug in str_catfv and str_copyfv that caused failures on (at
  least) PPC and S390 architectures.  Thanks Gerrit Pape.

- Fixed 32-to-64 bit sign extension bug in fmt_multi on some 64-bit
  platforms.  Thanks Gerrit Pape.

- installer/instcheck program libraries now optionally install into a
  prefix directory specified on the command line or with
  $install_prefix (which can be set on the make command line).

- Installation is now done under seperate include/lib directories.

- Added sysdep for "extern int daylight" (replaced by a macro if not
  present).

- Fixed a couple of length counting bugs in the fmt number code.

- Added multiple-item formatting functions fmt_multi (similar to printf,
  but safer), fmt_multiv, obuf_putf, str_catf, and str_copyf, as well as
  a set of formatted message functions.

5 files changed, 88 insertions, 74 deletions

diff --git a/devel/bglibs/Makefile b/devel/bglibs/Makefile
index bed5e6e573a..764be6de968 100644
--- a/devel/bglibs/Makefile
+++ b/devel/bglibs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:18 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/07/15 05:45:00 schmonz Exp $
 #
 
-DISTNAME=		bglibs-1.019
+DISTNAME=		bglibs-1.024
 CATEGORIES=		devel
 MASTER_SITES=		${HOMEPAGE}
 
@@ -9,11 +9,14 @@ MAINTAINER=		schmonz@NetBSD.org
 HOMEPAGE=		http://untroubled.org/bglibs/
 COMMENT=		Collection of libraries by Bruce Guenter
 
-
 BUILD_TARGET=		all
+INSTALL_TARGET=		install
 
 DJB_RESTRICTED=		NO
-BGWARE_INSTALLER=	YES
+
+DJB_CONFIG_CMDS=							\
+	${ECHO} ${DJB_CONFIG_PREFIX}/include/bglibs > conf-include;	\
+	${ECHO} ${DJB_CONFIG_PREFIX}/lib/bglibs > conf-lib;
 
 .include "../../mk/djbware.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/bglibs/PLIST b/devel/bglibs/PLIST
index a0555d1791d..1314d38bd0d 100644
--- a/devel/bglibs/PLIST
+++ b/devel/bglibs/PLIST
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/12/21 00:12:29 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/07/15 05:45:00 schmonz Exp $
+bin/bg-installer
+bin/crc-gentab
 include/bglibs/adt/common.h
 include/bglibs/adt/ghash.h
 include/bglibs/adt/gqueue.h
@@ -58,7 +60,19 @@ include/bglibs/unix/sig.h
 include/bglibs/unix/trigger.h
 include/bglibs/vmailmgr/client.h
 include/bglibs/vmailmgr/vpwentry.h
-lib/bglibs/libbase64/base64.a
+lib/bglibs/base64/base64.a
+lib/bglibs/cdb/cdb.a
+lib/bglibs/cdb/make.a
+lib/bglibs/cdb/str.a
+lib/bglibs/cli/cli.a
+lib/bglibs/crypto/md5
+lib/bglibs/crypto/sha1.a
+lib/bglibs/crypto/sha256.a
+lib/bglibs/crypto/sha512a.a
+lib/bglibs/dict/dict.a
+lib/bglibs/dict/load.a
+lib/bglibs/iobuf/iobuf.a
+lib/bglibs/iobuf/str.a
 lib/bglibs/libbg-adt.a
 lib/bglibs/libbg-base64.a
 lib/bglibs/libbg-cdb.a
@@ -79,55 +93,43 @@ lib/bglibs/libbg-str.a
 lib/bglibs/libbg-sysdeps.a
 lib/bglibs/libbg-unix.a
 lib/bglibs/libbg.a
-lib/bglibs/libcdb/cdb.a
-lib/bglibs/libcdb/make.a
-lib/bglibs/libcdb/str.a
-lib/bglibs/libcli/cli.a
-lib/bglibs/libcrypto/md5.a
-lib/bglibs/libcrypto/sha1.a
-lib/bglibs/libcrypto/sha256.a
-lib/bglibs/libcrypto/sha512a.a
-lib/bglibs/libdict/dict.a
-lib/bglibs/libdict/load.a
 lib/bglibs/libinstaller.a
 lib/bglibs/libinstcheck.a
 lib/bglibs/libinstshow.a
-lib/bglibs/libiobuf/iobuf.a
-lib/bglibs/libiobuf/str.a
-lib/bglibs/libmisc/misc.a
-lib/bglibs/libmsg/msg.a
-lib/bglibs/libmsg/wrap.a
-lib/bglibs/libnet/ipv4.a
-lib/bglibs/libnet/resolve.a
-lib/bglibs/libnet/socket.a
-lib/bglibs/libpath/path.a
 lib/bglibs/libpwcmp-module.a
 lib/bglibs/libpwcmp.a
-lib/bglibs/libpwcmp/client.a
-lib/bglibs/libpwcmp/hex.a
-lib/bglibs/libpwcmp/module.a
-lib/bglibs/libstr/iter.a
-lib/bglibs/libstr/str.a
 lib/bglibs/libsysdeps.a
-lib/bglibs/libunix/nonblock.a
-lib/bglibs/libunix/sig.a
 lib/bglibs/libvmailmgr.a
-lib/bglibs/libvmailmgr/client.a
-lib/bglibs/libvmailmgr/vpwentry.a
-@dirrm lib/bglibs/libvmailmgr
-@dirrm lib/bglibs/libunix
-@dirrm lib/bglibs/libstr
-@dirrm lib/bglibs/libpwcmp
-@dirrm lib/bglibs/libpath
-@dirrm lib/bglibs/libnet
-@dirrm lib/bglibs/libmsg
-@dirrm lib/bglibs/libmisc
-@dirrm lib/bglibs/libiobuf
-@dirrm lib/bglibs/libdict
-@dirrm lib/bglibs/libcrypto
-@dirrm lib/bglibs/libcli
-@dirrm lib/bglibs/libcdb
-@dirrm lib/bglibs/libbase64
+lib/bglibs/misc/misc.a
+lib/bglibs/msg/msg.a
+lib/bglibs/msg/wrap.a
+lib/bglibs/net/ipv4.a
+lib/bglibs/net/resolve.a
+lib/bglibs/net/socket.a
+lib/bglibs/path/path.a
+lib/bglibs/pwcmp/client.a
+lib/bglibs/pwcmp/hex.a
+lib/bglibs/pwcmp/module.a
+lib/bglibs/str/iter.a
+lib/bglibs/str/str.a
+lib/bglibs/unix/nonblock.a
+lib/bglibs/unix/sig.a
+lib/bglibs/vmailmgr/client.a
+lib/bglibs/vmailmgr/vpwentry.a
+@dirrm lib/bglibs/vmailmgr
+@dirrm lib/bglibs/unix
+@dirrm lib/bglibs/str
+@dirrm lib/bglibs/pwcmp
+@dirrm lib/bglibs/path
+@dirrm lib/bglibs/net
+@dirrm lib/bglibs/msg
+@dirrm lib/bglibs/misc
+@dirrm lib/bglibs/iobuf
+@dirrm lib/bglibs/dict
+@dirrm lib/bglibs/crypto
+@dirrm lib/bglibs/cli
+@dirrm lib/bglibs/cdb
+@dirrm lib/bglibs/base64
 @dirrm lib/bglibs
 @dirrm include/bglibs/vmailmgr
 @dirrm include/bglibs/unix
diff --git a/devel/bglibs/buildlink3.mk b/devel/bglibs/buildlink3.mk
index 18eedc711fd..ffb43d35f5b 100644
--- a/devel/bglibs/buildlink3.mk
+++ b/devel/bglibs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/12/21 00:12:29 schmonz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2005/07/15 05:45:00 schmonz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 BGLIBS_BUILDLINK3_MK:=	${BGLIBS_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nbglibs}
 BUILDLINK_PACKAGES+=	bglibs
 
 .if !empty(BGLIBS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.bglibs+=	bglibs>=1.019
+BUILDLINK_DEPENDS.bglibs+=	bglibs>=1.024
 BUILDLINK_PKGSRCDIR.bglibs?=	../../devel/bglibs
 BUILDLINK_DEPMETHOD.bglibs?=	build
 .endif	# BGLIBS_BUILDLINK3_MK
diff --git a/devel/bglibs/distinfo b/devel/bglibs/distinfo
index f76b72d2f17..58b8a48fb51 100644
--- a/devel/bglibs/distinfo
+++ b/devel/bglibs/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 22:24:10 agc Exp $
+$NetBSD: distinfo,v 1.3 2005/07/15 05:45:00 schmonz Exp $
 
-SHA1 (bglibs-1.019.tar.gz) = 851e74a3b3a1fc9ea6edd3cc04693db4187580b2
-RMD160 (bglibs-1.019.tar.gz) = 0e74c9b17c2db588d6d142ec25431070c2738f91
-Size (bglibs-1.019.tar.gz) = 266793 bytes
-SHA1 (patch-aa) = 043782561c1aa7c0f1590d5bd49242bea3bb0c7b
+SHA1 (bglibs-1.024.tar.gz) = c0baed53730115a57b6b2cc050fe2f4979679835
+RMD160 (bglibs-1.024.tar.gz) = 9077e847717b28365d2485ed3c73603efd274af7
+Size (bglibs-1.024.tar.gz) = 313463 bytes
+SHA1 (patch-aa) = 78a4b4ee0f2270d52378142d51bc21a09f2ccf4e
diff --git a/devel/bglibs/patches/patch-aa b/devel/bglibs/patches/patch-aa
index 44cd46cbf9f..f42833fbc88 100644
--- a/devel/bglibs/patches/patch-aa
+++ b/devel/bglibs/patches/patch-aa
@@ -1,22 +1,31 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/12/21 00:12:29 schmonz Exp $
+$NetBSD: patch-aa,v 1.2 2005/07/15 05:45:00 schmonz Exp $
 
---- insthier.c.orig	2004-11-15 15:50:28.000000000 -0500
-+++ insthier.c
-@@ -15,7 +15,7 @@ void insthier(void)
+--- bg-installer.c.orig	2005-07-11 00:47:35.000000000 -0400
++++ bg-installer.c
+@@ -151,7 +151,7 @@ static void show(char type, unsigned uid
+   obuf_endl(&outbuf);
+ }
  
-   bin = d(home, "bin", -1, -1, 0755);
- 
--  inc = d(home, "include", -1, -1, 0755);
-+  inc = d(home, "include/bglibs", -1, -1, 0755);
- 
-   cf(inc, "installer.h", -1, -1, 0644, "install/installer.h");
-   C(inc, sysdeps.h);
-@@ -111,7 +111,7 @@ void insthier(void)
-   CF(vmailmgr, client.h);
-   CF(vmailmgr, vpwentry.h);
-   
--  lib = d(home, "lib", -1, -1, 0755);
-+  lib = d(home, "lib/bglibs", -1, -1, 0755);
- 
-   c(lib, "libbg.a", -1, -1, 0644);
+-static void setmode(const char* filename,
++static void bgsetmode(const char* filename,
+ 		    unsigned uid, unsigned gid, unsigned mode)
+ {
+   if (chown(filename, uid, gid) != 0)
+@@ -201,7 +201,7 @@ static void c(unsigned uid, unsigned gid
+     if (!ibuf_copytofd(&in, out)
+ 	|| close(out) != 0)
+       diefsys(1, "{Could not write '}s{'}", pathtmp.s);
+-    setmode(pathtmp.s, uid, gid, mode);
++    bgsetmode(pathtmp.s, uid, gid, mode);
+     if (rename(pathtmp.s, path.s) != 0)
+       diefsys(1, "{Could not rename '}s{' to '}s{'}", pathtmp.s, path.s);
+     ibuf_close(&in);
+@@ -224,7 +224,7 @@ static void d(unsigned uid, unsigned gid
+     }
+     else if (!S_ISDIR(st.st_mode))
+       dief(1, "{Path '}s{' exists but is not a directory}", path.s);
+-    setmode(path.s, uid, gid, mode);
++    bgsetmode(path.s, uid, gid, mode);
+   }
  
+   if (opt_check) {