- Update to 1.027

- Move installed libs into a subdir - ${PREFIX}/lib/bglibs.
  This should help prevent namespace pollution and avoid conflicts
  over generic library names.
  NOTE: header files are installed into ${PREFIX}/include/bglibs
  for the same reasons.
- Remove patch we do not need anymore

4 files changed, 108 insertions, 86 deletions

diff --git a/devel/bglibs/Makefile b/devel/bglibs/Makefile
index 4453d2ed6efd..ea7168a7b9b1 100644
--- a/devel/bglibs/Makefile
+++ b/devel/bglibs/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bglibs
-PORTVERSION=	1.019
+PORTVERSION=	1.027
 CATEGORIES=	devel
 MASTER_SITES=	http://untroubled.org/${PORTNAME}/
 
@@ -15,7 +15,11 @@ COMMENT=	One stop library package by Bruce Guenter
 
 NOT_FOR_ARCHS=	alpha
 
+USE_GPG=	yes
+SIG_SUFFIX=	.sig
 LDFLAGS?=	-s
+BGLIBS_INC=	${PREFIX}/include/${PORTNAME}
+BGLIBS_LIB=	${PREFIX}/lib/${PORTNAME}
 
 DOCS=		NEWS README TODO doc/html/*
 
@@ -23,10 +27,11 @@ do-configure:
 	${ECHO_CMD} "${PREFIX}"		> ${WRKSRC}/conf-home
 	${ECHO_CMD} "${CC} ${CFLAGS}"	> ${WRKSRC}/conf-cc
 	${ECHO_CMD} "${CC} ${LDFLAGS}"	> ${WRKSRC}/conf-ld
+	${ECHO_CMD} "${BGLIBS_INC}"	> ${WRKSRC}/conf-include
+	${ECHO_CMD} "${BGLIBS_LIB}"	> ${WRKSRC}/conf-lib
 
-do-install:
-	cd ${WRKSRC} && ./installer
 .if !defined(NOPORTDOCS)
+post-install:
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
diff --git a/devel/bglibs/distinfo b/devel/bglibs/distinfo
index a3d80fbdb8dd..007b7a5cb3a3 100644
--- a/devel/bglibs/distinfo
+++ b/devel/bglibs/distinfo
@@ -1,2 +1,4 @@
-MD5 (bglibs-1.019.tar.gz) = 1e9e1d716d4527d08ea1dbf076a30c30
-SIZE (bglibs-1.019.tar.gz) = 266793
+MD5 (bglibs-1.027.tar.gz) = a449d525efab430a00db9415a877252b
+SIZE (bglibs-1.027.tar.gz) = 321537
+MD5 (bglibs-1.027.tar.gz.sig) = a52760f04570a622ce41a55c0f9fa36a
+SIZE (bglibs-1.027.tar.gz.sig) = 189
diff --git a/devel/bglibs/files/patch-insthier.c b/devel/bglibs/files/patch-insthier.c
deleted file mode 100644
index 783a1d6a129d..000000000000
--- a/devel/bglibs/files/patch-insthier.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- insthier.c.orig	Tue Jun  3 19:20:34 2003
-+++ insthier.c	Tue Jun  3 19:21:30 2003
-@@ -15,7 +15,7 @@
- 
-   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);
diff --git a/devel/bglibs/pkg-plist b/devel/bglibs/pkg-plist
index 196fd79d2b5e..565208acfacb 100644
--- a/devel/bglibs/pkg-plist
+++ b/devel/bglibs/pkg-plist
@@ -58,62 +58,69 @@ include/bglibs/unix/sig.h
 include/bglibs/unix/trigger.h
 include/bglibs/vmailmgr/client.h
 include/bglibs/vmailmgr/vpwentry.h
-lib/libbase64/base64.a
-lib/libbg-adt.a
-lib/libbg-base64.a
-lib/libbg-cdb.a
-lib/libbg-cli.a
-lib/libbg-crc.a
-lib/libbg-crypto.a
-lib/libbg-dict.a
-lib/libbg-fmt.a
-lib/libbg-installer.a
-lib/libbg-instcheck.a
-lib/libbg-instshow.a
-lib/libbg-iobuf.a
-lib/libbg-misc.a
-lib/libbg-msg.a
-lib/libbg-net.a
-lib/libbg-path.a
-lib/libbg-str.a
-lib/libbg-sysdeps.a
-lib/libbg-unix.a
-lib/libbg.a
-lib/libcdb/cdb.a
-lib/libcdb/make.a
-lib/libcdb/str.a
-lib/libcli/cli.a
-lib/libcrypto/md5.a
-lib/libcrypto/sha1.a
-lib/libcrypto/sha256.a
-lib/libcrypto/sha512a.a
-lib/libdict/dict.a
-lib/libdict/load.a
-lib/libinstaller.a
-lib/libinstcheck.a
-lib/libinstshow.a
-lib/libiobuf/iobuf.a
-lib/libiobuf/str.a
-lib/libmisc/misc.a
-lib/libmsg/msg.a
-lib/libmsg/wrap.a
-lib/libnet/ipv4.a
-lib/libnet/resolve.a
-lib/libnet/socket.a
-lib/libpath/path.a
-lib/libpwcmp-module.a
-lib/libpwcmp.a
-lib/libpwcmp/client.a
-lib/libpwcmp/hex.a
-lib/libpwcmp/module.a
-lib/libstr/iter.a
-lib/libstr/str.a
-lib/libsysdeps.a
-lib/libunix/nonblock.a
-lib/libunix/sig.a
-lib/libvmailmgr.a
-lib/libvmailmgr/client.a
-lib/libvmailmgr/vpwentry.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/crypt.lib
+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
+lib/bglibs/libbg-cli.a
+lib/bglibs/libbg-crc.a
+lib/bglibs/libbg-crypto.a
+lib/bglibs/libbg-dict.a
+lib/bglibs/libbg-fmt.a
+lib/bglibs/libbg-installer.a
+lib/bglibs/libbg-instcheck.a
+lib/bglibs/libbg-instshow.a
+lib/bglibs/libbg-iobuf.a
+lib/bglibs/libbg-misc.a
+lib/bglibs/libbg-msg.a
+lib/bglibs/libbg-net.a
+lib/bglibs/libbg-path.a
+lib/bglibs/libbg-str.a
+lib/bglibs/libbg-sysdeps.a
+lib/bglibs/libbg-unix.a
+lib/bglibs/libbg.a
+lib/bglibs/libinstaller.a
+lib/bglibs/libinstcheck.a
+lib/bglibs/libinstshow.a
+lib/bglibs/libpwcmp-module.a
+lib/bglibs/libpwcmp.a
+lib/bglibs/libsysdeps.a
+lib/bglibs/libvmailmgr.a
+lib/bglibs/m.lib
+lib/bglibs/misc/misc.a
+lib/bglibs/msg/msg.a
+lib/bglibs/msg/wrap.a
+lib/bglibs/net.lib
+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/rt.lib
+lib/bglibs/s.lib
+lib/bglibs/shadow.lib
+lib/bglibs/socket.lib
+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
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
@@ -123,6 +130,15 @@ lib/libvmailmgr/vpwentry.a
 %%PORTDOCS%%%%DOCSDIR%%/cmsg_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/common_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/deprecated.html
+%%PORTDOCS%%%%DOCSDIR%%/dir_000000.html
+%%PORTDOCS%%%%DOCSDIR%%/dir_000001.html
+%%PORTDOCS%%%%DOCSDIR%%/dir_000002.html
+%%PORTDOCS%%%%DOCSDIR%%/dir_000003.html
+%%PORTDOCS%%%%DOCSDIR%%/dir_000004.html
+%%PORTDOCS%%%%DOCSDIR%%/dir_000005.html
+%%PORTDOCS%%%%DOCSDIR%%/dir_000006.html
+%%PORTDOCS%%%%DOCSDIR%%/dir_000007.html
+%%PORTDOCS%%%%DOCSDIR%%/dirs.html
 %%PORTDOCS%%%%DOCSDIR%%/djb_2sig_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/doxygen.css
 %%PORTDOCS%%%%DOCSDIR%%/doxygen.png
@@ -133,9 +149,14 @@ lib/libvmailmgr/vpwentry.a
 %%PORTDOCS%%%%DOCSDIR%%/functions_vars.html
 %%PORTDOCS%%%%DOCSDIR%%/group__envstr.html
 %%PORTDOCS%%%%DOCSDIR%%/group__fmt.html
+%%PORTDOCS%%%%DOCSDIR%%/group__ibuf.html
+%%PORTDOCS%%%%DOCSDIR%%/group__installer.html
+%%PORTDOCS%%%%DOCSDIR%%/group__instlib.html
 %%PORTDOCS%%%%DOCSDIR%%/group__iobuf.html
 %%PORTDOCS%%%%DOCSDIR%%/group__ipv4.html
 %%PORTDOCS%%%%DOCSDIR%%/group__ipv6.html
+%%PORTDOCS%%%%DOCSDIR%%/group__obuf.html
+%%PORTDOCS%%%%DOCSDIR%%/group__path.html
 %%PORTDOCS%%%%DOCSDIR%%/group__resolve.html
 %%PORTDOCS%%%%DOCSDIR%%/group__selfpipe.html
 %%PORTDOCS%%%%DOCSDIR%%/group__socket.html
@@ -144,15 +165,19 @@ lib/libvmailmgr/vpwentry.a
 %%PORTDOCS%%%%DOCSDIR%%/group__trigger.html
 %%PORTDOCS%%%%DOCSDIR%%/ibuf_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/installer_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/iobuf_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/ipv4_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/ipv6_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/iter_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/misc_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/modules.html
+%%PORTDOCS%%%%DOCSDIR%%/multi_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/nonblock_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/number_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/obuf_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/pages.html
+%%PORTDOCS%%%%DOCSDIR%%/path_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/resolve_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/selfpipe_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/sig_8h-source.html
@@ -186,17 +211,18 @@ lib/libvmailmgr/vpwentry.a
 @dirrm include/bglibs/unix
 @dirrm include/bglibs/vmailmgr
 @dirrm include/bglibs
-@dirrm lib/libbase64
-@dirrm lib/libcdb
-@dirrm lib/libcli
-@dirrm lib/libcrypto
-@dirrm lib/libdict
-@dirrm lib/libiobuf
-@dirrm lib/libmisc
-@dirrm lib/libmsg
-@dirrm lib/libnet
-@dirrm lib/libpath
-@dirrm lib/libpwcmp
-@dirrm lib/libstr
-@dirrm lib/libunix
-@dirrm lib/libvmailmgr
+@dirrm lib/bglibs/base64
+@dirrm lib/bglibs/cdb
+@dirrm lib/bglibs/cli
+@dirrm lib/bglibs/crypto
+@dirrm lib/bglibs/dict
+@dirrm lib/bglibs/iobuf
+@dirrm lib/bglibs/misc
+@dirrm lib/bglibs/msg
+@dirrm lib/bglibs/net
+@dirrm lib/bglibs/path
+@dirrm lib/bglibs/pwcmp
+@dirrm lib/bglibs/str
+@dirrm lib/bglibs/unix
+@dirrm lib/bglibs/vmailmgr
+@dirrm lib/bglibs