4 files changed, 136 insertions, 36 deletions

diff --git a/devel/bglibs/Makefile b/devel/bglibs/Makefile
index 17a09f38593e..3d2af87cdcb4 100644
--- a/devel/bglibs/Makefile
+++ b/devel/bglibs/Makefile
@@ -14,8 +14,6 @@ MASTER_SITES=	http://untroubled.org/bglibs/
 MAINTAINER=	sergei@kolobov.com
 COMMENT=	One stop library package by Bruce Guenter
 
-BGLIBS_ROOT?=	${PREFIX}
-
 NOT_FOR_ARCHS=	alpha ia64
 
 DOCS=		NEWS README TODO
diff --git a/devel/bglibs/files/patch-crypto::sha512.c b/devel/bglibs/files/patch-crypto::sha512.c
new file mode 100644
index 000000000000..effa3b29dad0
--- /dev/null
+++ b/devel/bglibs/files/patch-crypto::sha512.c
@@ -0,0 +1,89 @@
+--- crypto/sha512.c.orig	Wed Jul 30 16:09:51 2003
++++ crypto/sha512.c	Wed Jul 30 16:09:55 2003
+@@ -26,46 +26,46 @@
+ #define min(X,Y) ((X)<(Y) ? (X) : (Y))
+ 
+ static const uint64 K[] = {
+-  0x428a2f98d728ae22, 0x7137449123ef65cd,
+-  0xb5c0fbcfec4d3b2f, 0xe9b5dba58189dbbc,
+-  0x3956c25bf348b538, 0x59f111f1b605d019,
+-  0x923f82a4af194f9b, 0xab1c5ed5da6d8118,
+-  0xd807aa98a3030242, 0x12835b0145706fbe,
+-  0x243185be4ee4b28c, 0x550c7dc3d5ffb4e2,
+-  0x72be5d74f27b896f, 0x80deb1fe3b1696b1,
+-  0x9bdc06a725c71235, 0xc19bf174cf692694,
+-  0xe49b69c19ef14ad2, 0xefbe4786384f25e3,
+-  0x0fc19dc68b8cd5b5, 0x240ca1cc77ac9c65,
+-  0x2de92c6f592b0275, 0x4a7484aa6ea6e483,
+-  0x5cb0a9dcbd41fbd4, 0x76f988da831153b5,
+-  0x983e5152ee66dfab, 0xa831c66d2db43210,
+-  0xb00327c898fb213f, 0xbf597fc7beef0ee4,
+-  0xc6e00bf33da88fc2, 0xd5a79147930aa725,
+-  0x06ca6351e003826f, 0x142929670a0e6e70,
+-  0x27b70a8546d22ffc, 0x2e1b21385c26c926,
+-  0x4d2c6dfc5ac42aed, 0x53380d139d95b3df,
+-  0x650a73548baf63de, 0x766a0abb3c77b2a8,
+-  0x81c2c92e47edaee6, 0x92722c851482353b,
+-  0xa2bfe8a14cf10364, 0xa81a664bbc423001,
+-  0xc24b8b70d0f89791, 0xc76c51a30654be30,
+-  0xd192e819d6ef5218, 0xd69906245565a910,
+-  0xf40e35855771202a, 0x106aa07032bbd1b8,
+-  0x19a4c116b8d2d0c8, 0x1e376c085141ab53,
+-  0x2748774cdf8eeb99, 0x34b0bcb5e19b48a8,
+-  0x391c0cb3c5c95a63, 0x4ed8aa4ae3418acb,
+-  0x5b9cca4f7763e373, 0x682e6ff3d6b2b8a3,
+-  0x748f82ee5defb2fc, 0x78a5636f43172f60,
+-  0x84c87814a1f0ab72, 0x8cc702081a6439ec,
+-  0x90befffa23631e28, 0xa4506cebde82bde9,
+-  0xbef9a3f7b2c67915, 0xc67178f2e372532b,
+-  0xca273eceea26619c, 0xd186b8c721c0c207,
+-  0xeada7dd6cde0eb1e, 0xf57d4f7fee6ed178,
+-  0x06f067aa72176fba, 0x0a637dc5a2c898a6,
+-  0x113f9804bef90dae, 0x1b710b35131c471b,
+-  0x28db77f523047d84, 0x32caab7b40c72493,
+-  0x3c9ebe0a15c9bebc, 0x431d67c49c100d4c,
+-  0x4cc5d4becb3e42b6, 0x597f299cfc657e2a,
+-  0x5fcb6fab3ad6faec, 0x6c44198c4a475817
++  0x428a2f98d728ae22ULL, 0x7137449123ef65cdULL,
++  0xb5c0fbcfec4d3b2fULL, 0xe9b5dba58189dbbcULL,
++  0x3956c25bf348b538ULL, 0x59f111f1b605d019ULL,
++  0x923f82a4af194f9bULL, 0xab1c5ed5da6d8118ULL,
++  0xd807aa98a3030242ULL, 0x12835b0145706fbeULL,
++  0x243185be4ee4b28cULL, 0x550c7dc3d5ffb4e2ULL,
++  0x72be5d74f27b896fULL, 0x80deb1fe3b1696b1ULL,
++  0x9bdc06a725c71235ULL, 0xc19bf174cf692694ULL,
++  0xe49b69c19ef14ad2ULL, 0xefbe4786384f25e3ULL,
++  0x0fc19dc68b8cd5b5ULL, 0x240ca1cc77ac9c65ULL,
++  0x2de92c6f592b0275ULL, 0x4a7484aa6ea6e483ULL,
++  0x5cb0a9dcbd41fbd4ULL, 0x76f988da831153b5ULL,
++  0x983e5152ee66dfabULL, 0xa831c66d2db43210ULL,
++  0xb00327c898fb213fULL, 0xbf597fc7beef0ee4ULL,
++  0xc6e00bf33da88fc2ULL, 0xd5a79147930aa725ULL,
++  0x06ca6351e003826fULL, 0x142929670a0e6e70ULL,
++  0x27b70a8546d22ffcULL, 0x2e1b21385c26c926ULL,
++  0x4d2c6dfc5ac42aedULL, 0x53380d139d95b3dfULL,
++  0x650a73548baf63deULL, 0x766a0abb3c77b2a8ULL,
++  0x81c2c92e47edaee6ULL, 0x92722c851482353bULL,
++  0xa2bfe8a14cf10364ULL, 0xa81a664bbc423001ULL,
++  0xc24b8b70d0f89791ULL, 0xc76c51a30654be30ULL,
++  0xd192e819d6ef5218ULL, 0xd69906245565a910ULL,
++  0xf40e35855771202aULL, 0x106aa07032bbd1b8ULL,
++  0x19a4c116b8d2d0c8ULL, 0x1e376c085141ab53ULL,
++  0x2748774cdf8eeb99ULL, 0x34b0bcb5e19b48a8ULL,
++  0x391c0cb3c5c95a63ULL, 0x4ed8aa4ae3418acbULL,
++  0x5b9cca4f7763e373ULL, 0x682e6ff3d6b2b8a3ULL,
++  0x748f82ee5defb2fcULL, 0x78a5636f43172f60ULL,
++  0x84c87814a1f0ab72ULL, 0x8cc702081a6439ecULL,
++  0x90befffa23631e28ULL, 0xa4506cebde82bde9ULL,
++  0xbef9a3f7b2c67915ULL, 0xc67178f2e372532bULL,
++  0xca273eceea26619cULL, 0xd186b8c721c0c207ULL,
++  0xeada7dd6cde0eb1eULL, 0xf57d4f7fee6ed178ULL,
++  0x06f067aa72176fbaULL, 0x0a637dc5a2c898a6ULL,
++  0x113f9804bef90daeULL, 0x1b710b35131c471bULL,
++  0x28db77f523047d84ULL, 0x32caab7b40c72493ULL,
++  0x3c9ebe0a15c9bebcULL, 0x431d67c49c100d4cULL,
++  0x4cc5d4becb3e42b6ULL, 0x597f299cfc657e2aULL,
++  0x5fcb6fab3ad6faecULL, 0x6c44198c4a475817ULL
+ };
+ 
+ static const uint64 H0[8] = {
diff --git a/devel/bglibs/files/patch-selftests.sh b/devel/bglibs/files/patch-selftests.sh
new file mode 100644
index 000000000000..fcca67f260cf
--- /dev/null
+++ b/devel/bglibs/files/patch-selftests.sh
@@ -0,0 +1,12 @@
+--- selftests.sh	(revision 397)
++++ selftests.sh	(working copy)
+@@ -14,7 +14,8 @@
+   rm -f $t/*
+   sed -e '1,/^#ifdef SELFTEST_EXP$/d' -e '/^#endif/,$d' $1 >$t/test.exp
+ 
+-  ./compile $1 -DSELFTEST_MAIN -o $t/test.o || {
++  sed -e 's/-o ${base}.o//' compile | \
++  sh -s $1 -DSELFTEST_MAIN -o $t/test.o || {
+     echo "=====> Compile failed! <====="
+     return 1
+   }
diff --git a/devel/bglibs/pkg-plist b/devel/bglibs/pkg-plist
index f3045c3465df..1302e620691d 100644
--- a/devel/bglibs/pkg-plist
+++ b/devel/bglibs/pkg-plist
@@ -1,40 +1,57 @@
+@comment $FreeBSD$
 include/bglibs/adt/common.h
 include/bglibs/adt/ghash.h
 include/bglibs/adt/gqueue.h
 include/bglibs/adt/gstack.h
+@dirrm include/bglibs/adt
 include/bglibs/base64/base64.h
+@dirrm include/bglibs/base64
 include/bglibs/cdb/cdb.h
 include/bglibs/cdb/make.h
 include/bglibs/cdb/str.h
+@dirrm include/bglibs/cdb
 include/bglibs/cli/cli.h
+@dirrm include/bglibs/cli
 include/bglibs/crc/crc32.h
 include/bglibs/crc/crc64.h
+@dirrm include/bglibs/crc
 include/bglibs/crypto/md5.h
 include/bglibs/crypto/sha1.h
 include/bglibs/crypto/sha256.h
 include/bglibs/crypto/sha384.h
 include/bglibs/crypto/sha512.h
+@dirrm include/bglibs/crypto
 include/bglibs/cvm-sasl/cvm-sasl.h
+@dirrm include/bglibs/cvm-sasl
 include/bglibs/cvm/client.h
 include/bglibs/cvm/errors.h
 include/bglibs/cvm/facts.h
 include/bglibs/cvm/module.h
+@dirrm include/bglibs/cvm
 include/bglibs/dict/dict.h
 include/bglibs/dict/load.h
+@dirrm include/bglibs/dict
 include/bglibs/installer.h
 include/bglibs/iobuf/iobuf.h
+@dirrm include/bglibs/iobuf
 include/bglibs/misc/misc.h
+@dirrm include/bglibs/misc
 include/bglibs/msg/msg.h
 include/bglibs/msg/wrap.h
+@dirrm include/bglibs/msg
 include/bglibs/net/ipv4.h
 include/bglibs/net/resolve.h
 include/bglibs/net/socket.h
+@dirrm include/bglibs/net
 include/bglibs/path/path.h
+@dirrm include/bglibs/path
 include/bglibs/pwcmp/client.h
 include/bglibs/pwcmp/hex.h
 include/bglibs/pwcmp/module.h
+@dirrm include/bglibs/pwcmp
 include/bglibs/str/iter.h
 include/bglibs/str/str.h
+@dirrm include/bglibs/str
 include/bglibs/sysdeps.h
 include/bglibs/systime.h
 include/bglibs/uint16.h
@@ -43,9 +60,13 @@ include/bglibs/uint64.h
 include/bglibs/uintnn.h
 include/bglibs/unix/nonblock.h
 include/bglibs/unix/sig.h
+@dirrm include/bglibs/unix
 include/bglibs/vmailmgr/client.h
 include/bglibs/vmailmgr/vpwentry.h
+@dirrm include/bglibs/vmailmgr
+@dirrm include/bglibs
 lib/libbase64/base64.a
+@dirrm lib/libbase64
 lib/libbg-adt.a
 lib/libbg-base64.a
 lib/libbg-cdb.a
@@ -67,83 +88,63 @@ lib/libbg-unix.a
 lib/libcdb/cdb.a
 lib/libcdb/make.a
 lib/libcdb/str.a
+@dirrm lib/libcdb
 lib/libcli/cli.a
+@dirrm lib/libcli
 lib/libcrypto/md5.a
 lib/libcrypto/sha1.a
 lib/libcrypto/sha256.a
 lib/libcrypto/sha512a.a
+@dirrm lib/libcrypto
 lib/libcvm-client.a
 lib/libcvm-command.a
 lib/libcvm-local.a
 lib/libcvm-sasl.a
 lib/libcvm-sasl/cvm-sasl.a
+@dirrm lib/libcvm-sasl
 lib/libcvm-udp.a
 lib/libcvm/client.a
 lib/libcvm/command.a
 lib/libcvm/local.a
 lib/libcvm/udp.a
+@dirrm lib/libcvm
 lib/libdict/dict.a
 lib/libdict/load.a
+@dirrm lib/libdict
 lib/libinstaller.a
 lib/libinstcheck.a
 lib/libinstshow.a
 lib/libiobuf/iobuf.a
 lib/libiobuf/str.a
+@dirrm lib/libiobuf
 lib/libmisc/misc.a
+@dirrm lib/libmisc
 lib/libmsg/msg.a
 lib/libmsg/wrap.a
+@dirrm lib/libmsg
 lib/libnet/ipv4.a
 lib/libnet/resolve.a
 lib/libnet/socket.a
+@dirrm lib/libnet
 lib/libpath/path.a
+@dirrm lib/libpath
 lib/libpwcmp-module.a
 lib/libpwcmp.a
 lib/libpwcmp/client.a
 lib/libpwcmp/hex.a
 lib/libpwcmp/module.a
+@dirrm lib/libpwcmp
 lib/libstr/iter.a
 lib/libstr/str.a
+@dirrm lib/libstr
 lib/libsysdeps.a
 lib/libunix/nonblock.a
 lib/libunix/sig.a
+@dirrm lib/libunix
 lib/libvmailmgr.a
 lib/libvmailmgr/client.a
 lib/libvmailmgr/vpwentry.a
 @dirrm lib/libvmailmgr
-@dirrm lib/libunix
-@dirrm lib/libstr
-@dirrm lib/libpwcmp
-@dirrm lib/libpath
-@dirrm lib/libnet
-@dirrm lib/libmsg
-@dirrm lib/libmisc
-@dirrm lib/libiobuf
-@dirrm lib/libdict
-@dirrm lib/libcvm-sasl
-@dirrm lib/libcvm
-@dirrm lib/libcrypto
-@dirrm lib/libcli
-@dirrm lib/libcdb
-@dirrm lib/libbase64
-@dirrm include/bglibs/vmailmgr
-@dirrm include/bglibs/unix
-@dirrm include/bglibs/str
-@dirrm include/bglibs/pwcmp
-@dirrm include/bglibs/path
-@dirrm include/bglibs/net
-@dirrm include/bglibs/msg
-@dirrm include/bglibs/misc
-@dirrm include/bglibs/iobuf
-@dirrm include/bglibs/dict
-@dirrm include/bglibs/cvm-sasl
-@dirrm include/bglibs/cvm
-@dirrm include/bglibs/crypto
-@dirrm include/bglibs/crc
-@dirrm include/bglibs/cli
-@dirrm include/bglibs/cdb
-@dirrm include/bglibs/base64
-@dirrm include/bglibs/adt
-@dirrm include/bglibs
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO