- Update to 2.01.1

- Refine patches

Approved by:	tabthorpe

8 files changed, 120 insertions, 85 deletions

diff --git a/devel/libbobcat/Makefile b/devel/libbobcat/Makefile
index dd88beacf27f..52f502a41974 100644
--- a/devel/libbobcat/Makefile
+++ b/devel/libbobcat/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libbobcat
-PORTVERSION=	2.00.1
+PORTVERSION=	2.01.1
 CATEGORIES=	devel
 MASTER_SITES=	SF/bobcat
 DISTNAME=	bobcat_${PORTVERSION}
@@ -20,6 +20,7 @@ BUILD_DEPENDS=	icmake:${PORTSDIR}/devel/icmake \
 		yodl>=2.0:${PORTSDIR}/textproc/yodl
 
 MANCOMPRESSED=	yes
+MAN1=		bobcatlcgen.1
 MAN3=		a2x.3bobcat align.3bobcat arg.3bobcat argconfig.3bobcat \
 		autoptr.3bobcat binarysearch.3bobcat cgi.3bobcat \
 		clientsocket.3bobcat cmdfinder.3bobcat cmdfinderbase.3bobcat \
@@ -29,12 +30,13 @@ MAN3=		a2x.3bobcat align.3bobcat arg.3bobcat argconfig.3bobcat \
 		gethostent.3bobcat glob.3bobcat hash.3bobcat hostent.3bobcat \
 		hostname.3bobcat ifdstream.3bobcat ifdstreambuf.3bobcat \
 		indent.3bobcat inetaddress.3bobcat iostream.3bobcat \
-		iostreambuf.3bobcat irandstream.3bobcat level.3bobcat \
-		localclientsocket.3bobcat localserversocket.3bobcat \
+		iostreambuf.3bobcat irandstream.3bobcat lc.3bobcat level.3bobcat \
+		lm.3bobcat localclientsocket.3bobcat localserversocket.3bobcat \
 		localsocketbase.3bobcat log.3bobcat logbuffer.3bobcat \
 		mailheaders.3bobcat manipulators.3bobcat milter.3bobcat \
-		msg.3bobcat multistreambuf.3bobcat ofdstream.3bobcat \
-		ofdstreambuf.3bobcat onekey.3bobcat pattern.3bobcat \
+		mlm.3bobcat msg.3bobcat multistreambuf.3bobcat ofdstream.3bobcat \
+		ofdstreambuf.3bobcat ofilterstreambuf.3bobcat ofoldstream.3bobcat \
+		ofoldstreambuf.3bobcat onekey.3bobcat pattern.3bobcat \
 		pipe.3bobcat process.3bobcat randbuffer.3bobcat \
 		redirector.3bobcat refcount.3bobcat repeat.3bobcat \
 		selector.3bobcat serversocket.3bobcat socketbase.3bobcat \
@@ -46,6 +48,8 @@ MAN7=		bobcat.7
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
 PORTDOCS=	*
 
+PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
+
 USE_LDCONFIG=	yes
 WRKSRC=		${WRKDIR}/bobcat-${PORTVERSION}
 
@@ -67,7 +71,7 @@ post-patch:
 .endif
 
 do-build:
-	@cd ${WRKSRC} && ./build libraries all strip && ./build man
+	@cd ${WRKSRC} && ./build libraries all strip && ./build lcgen && ./build man
 
 do-install:
 	@cd ${WRKSRC} && ./build install
diff --git a/devel/libbobcat/distinfo b/devel/libbobcat/distinfo
index 42b561ecefed..a05358d6dbf8 100644
--- a/devel/libbobcat/distinfo
+++ b/devel/libbobcat/distinfo
@@ -1,3 +1,3 @@
-MD5 (bobcat_2.00.1.orig.tar.gz) = 967356328cbc29f825f52d2f606e9c21
-SHA256 (bobcat_2.00.1.orig.tar.gz) = cf652b66b9bd5542d979c1465f0c5478df6a441fde3c9d95bdef149313731710
-SIZE (bobcat_2.00.1.orig.tar.gz) = 495892
+MD5 (bobcat_2.01.1.orig.tar.gz) = e9edb003fca6e9867367870d40d58d0c
+SHA256 (bobcat_2.01.1.orig.tar.gz) = c9712717854cb6e98e07829b38e965f2a257c335ee1c12aae6113cb5ec4c7baa
+SIZE (bobcat_2.01.1.orig.tar.gz) = 508633
diff --git a/devel/libbobcat/files/patch-hostname-hostname.ih b/devel/libbobcat/files/patch-hostname-hostname.ih
index 61ca53163e73..05e9a911bf27 100644
--- a/devel/libbobcat/files/patch-hostname-hostname.ih
+++ b/devel/libbobcat/files/patch-hostname-hostname.ih
@@ -1,10 +1,12 @@
 --- hostname/hostname.ih.orig	2007-02-13 13:29:39.000000000 +0100
-+++ hostname/hostname.ih	2009-03-04 12:30:14.000000000 +0100
-@@ -3,6 +3,7 @@
++++ hostname/hostname.ih	2009-03-10 05:44:08.000000000 +0100
+@@ -3,6 +3,9 @@
  #include <bobcat/inetaddress>
  #include <bobcat/gethostent>
  #include <netdb.h>
++#ifdef __FreeBSD__
 +#include <sys/socket.h>
++#endif
  
  using namespace std;
  using namespace FBB;
diff --git a/devel/libbobcat/files/patch-icmake-man b/devel/libbobcat/files/patch-icmake-man
index 75ba17cba76e..f744d470f9cc 100644
--- a/devel/libbobcat/files/patch-icmake-man
+++ b/devel/libbobcat/files/patch-icmake-man
@@ -1,29 +1,47 @@
---- icmake/man.orig	2007-02-13 13:29:38.000000000 +0100
-+++ icmake/man	2009-03-04 20:38:35.000000000 +0100
-@@ -9,7 +9,7 @@
+--- icmake/man.orig	2009-03-10 05:33:46.000000000 +0100
++++ icmake/man	2009-03-10 05:38:20.000000000 +0100
+@@ -9,7 +9,10 @@
  
      special(0, 0);
  
--    md("tmp/man/man3 tmp/man/man7 tmp/manhtml");
-+    md("tmp/man/man3 tmp/man/man7");
+-    md("tmp/man/man1 tmp/man/man3 tmp/man/man7 tmp/manhtml");
++    md("tmp/man/man1 tmp/man/man3 tmp/man/man7");
++#ifdef MANHTML
++    md("tmp/manhtml");
++#endif
  
      chdir("documentation/man");
  
-@@ -35,8 +35,6 @@
+@@ -27,8 +30,10 @@
+     {
+         run("yodl2man  --no-warnings -o ../../tmp/man/man1/bobcatlcgen.1 "
+                                                             "bobcatlcgen.yo");
++#ifdef MANHTML
+         run("yodl2html --no-warnings -o ../../tmp/manhtml/bobcatlcgen.1.html "
+                                                             "bobcatlcgen.yo");
++#endif
+     }
+ 
+     yo = makelist("*.yo") - (list)"bobcat.yo" -  (list)"bobcatlcgen.yo";
+@@ -43,8 +48,10 @@
      
              run("yodl2man  --no-warnings -o ../../tmp/man/man3/" + 
                                                      base + ".3bobcat " + yodl);
--            run("yodl2html --no-warnings -o ../../tmp/manhtml/" + 
--                                                    base + ".3.html " + yodl);
++#ifdef MANHTML
+             run("yodl2html --no-warnings -o ../../tmp/manhtml/" + 
+                                                     base + ".3.html " + yodl);
++#endif
          }
      }
  
-@@ -44,8 +42,6 @@
+@@ -52,8 +59,10 @@
      {
          run("yodl2man  --no-warnings -o ../../tmp/man/man7/bobcat.7 "
                                                                  "bobcat.yo");
--        run("yodl2html --no-warnings -o ../../tmp/manhtml/bobcat.7.html "
--                                                                "bobcat.yo");
++#ifdef MANHTML
+         run("yodl2html --no-warnings -o ../../tmp/manhtml/bobcat.7.html "
+                                                                 "bobcat.yo");
++#endif
      }
  
      run("touch man-stamp");
diff --git a/devel/libbobcat/files/patch-inetaddress-inetaddress b/devel/libbobcat/files/patch-inetaddress-inetaddress
index 765671cf79fd..5d04e5ef2d48 100644
--- a/devel/libbobcat/files/patch-inetaddress-inetaddress
+++ b/devel/libbobcat/files/patch-inetaddress-inetaddress
@@ -1,10 +1,12 @@
---- inetaddress/inetaddress.orig	2009-03-05 23:39:43.000000000 +0100
-+++ inetaddress/inetaddress	2009-03-05 23:37:27.000000000 +0100
-@@ -4,6 +4,7 @@
+--- inetaddress/inetaddress.orig	2008-03-19 15:54:18.000000000 +0100
++++ inetaddress/inetaddress	2009-03-10 05:44:45.000000000 +0100
+@@ -4,6 +4,9 @@
  #include <netinet/in.h>
  #include <string>
  #include <bobcat/errno>
++#ifdef __FreeBSD__
 +#include <sys/socket.h>
++#endif
  
  /*
      int-info coming in or going out: host byte order
diff --git a/devel/libbobcat/files/patch-inetaddress-inetaddress.ih b/devel/libbobcat/files/patch-inetaddress-inetaddress.ih
index d2a86a359453..db4b8c937dab 100644
--- a/devel/libbobcat/files/patch-inetaddress-inetaddress.ih
+++ b/devel/libbobcat/files/patch-inetaddress-inetaddress.ih
@@ -1,10 +1,12 @@
 --- inetaddress/inetaddress.ih.orig	2007-02-13 13:29:39.000000000 +0100
-+++ inetaddress/inetaddress.ih	2009-03-04 12:16:16.000000000 +0100
-@@ -2,6 +2,7 @@
++++ inetaddress/inetaddress.ih	2009-03-10 05:44:57.000000000 +0100
+@@ -2,6 +2,9 @@
  
  #include <netdb.h>
  #include <bobcat/gethostent>
++#ifdef __FreeBSD__
 +#include <sys/socket.h>
++#endif
  
  using namespace std;
  using namespace FBB;
diff --git a/devel/libbobcat/files/patch-process-process.ih b/devel/libbobcat/files/patch-process-process.ih
index 60a2ea0bb0d2..b24ca76420b7 100644
--- a/devel/libbobcat/files/patch-process-process.ih
+++ b/devel/libbobcat/files/patch-process-process.ih
@@ -1,10 +1,12 @@
 --- process/process.ih.orig	2008-11-03 16:24:04.000000000 +0100
-+++ process/process.ih	2009-03-04 12:19:54.000000000 +0100
-@@ -6,6 +6,7 @@
++++ process/process.ih	2009-03-10 05:45:35.000000000 +0100
+@@ -6,6 +6,9 @@
  #include <sys/types.h>
  // #include <sys/stat.h>
  #include <sys/wait.h>
++#ifdef __FreeBSD__
 +#include <signal.h>
++#endif
  
  #include <bobcat/errno>
  #include <bobcat/redirector>
diff --git a/devel/libbobcat/pkg-plist b/devel/libbobcat/pkg-plist
index ab567a5b87c6..f233d3aac9c6 100644
--- a/devel/libbobcat/pkg-plist
+++ b/devel/libbobcat/pkg-plist
@@ -1,69 +1,74 @@
 @comment $FreeBSD$
-include/bobcat/xpointer
-include/bobcat/milter
+bin/bobcatlcgen
+include/bobcat/a2x
+include/bobcat/align
+include/bobcat/arg
 include/bobcat/argconfig
+include/bobcat/autoptr
 include/bobcat/cgi
+include/bobcat/clientsocket
+include/bobcat/cmdfinder
+include/bobcat/cmdfinderbase
+include/bobcat/configfile
+include/bobcat/datetime
+include/bobcat/errno
+include/bobcat/fnwrap1
+include/bobcat/fnwrap1c
+include/bobcat/fnwrap2
+include/bobcat/fnwrap2c
 include/bobcat/foreach
+include/bobcat/fork
+include/bobcat/gethostent
+include/bobcat/glob
+include/bobcat/hash
+include/bobcat/hostent
+include/bobcat/hostname
+include/bobcat/ifdstream
+include/bobcat/ifdstreambuf
+include/bobcat/indent
+include/bobcat/inetaddress
+include/bobcat/iostream
+include/bobcat/iostreambuf
+include/bobcat/irandstream
+include/bobcat/lc
+include/bobcat/level
+include/bobcat/localclientsocket
+include/bobcat/localserversocket
+include/bobcat/localsocketbase
+include/bobcat/log
+include/bobcat/logbuffer
+include/bobcat/mailheaders
+include/bobcat/milter
+include/bobcat/msg
+include/bobcat/multistreambuf
+include/bobcat/ofdstream
+include/bobcat/ofdstreambuf
+include/bobcat/ofilterstreambuf
+include/bobcat/ofoldstream
+include/bobcat/ofoldstreambuf
+include/bobcat/onekey
+include/bobcat/pattern
+include/bobcat/pipe
+include/bobcat/process
+include/bobcat/randbuffer
+include/bobcat/redirector
+include/bobcat/refcount
 include/bobcat/repeat
+include/bobcat/selector
 include/bobcat/serversocket
-include/bobcat/clientsocket
 include/bobcat/socketbase
-include/bobcat/inetaddress
-include/bobcat/cmdfinderbase
+include/bobcat/stat
+include/bobcat/string
+include/bobcat/syslogbuf
+include/bobcat/syslogstream
 include/bobcat/table
-include/bobcat/process
-include/bobcat/localserversocket
-include/bobcat/localclientsocket
-include/bobcat/level
-include/bobcat/gethostent
-include/bobcat/configfile
-include/bobcat/cmdfinder
-include/bobcat/arg
-include/bobcat/user
 include/bobcat/tablesupport
-include/bobcat/syslogstream
-include/bobcat/string
-include/bobcat/stat
-include/bobcat/selector
-include/bobcat/redirector
-include/bobcat/pipe
-include/bobcat/pattern
-include/bobcat/onekey
-include/bobcat/ofdstream
-include/bobcat/multistreambuf
-include/bobcat/msg
-include/bobcat/mailheaders
-include/bobcat/log
-include/bobcat/localsocketbase
-include/bobcat/irandstream
-include/bobcat/iostream
-include/bobcat/ifdstream
-include/bobcat/hostname
-include/bobcat/glob
-include/bobcat/fork
-include/bobcat/fnwrap2c
-include/bobcat/fnwrap2
-include/bobcat/fnwrap1c
-include/bobcat/fnwrap1
-include/bobcat/autoptr
-include/bobcat/x2a
 include/bobcat/typetrait
-include/bobcat/syslogbuf
-include/bobcat/refcount
-include/bobcat/randbuffer
-include/bobcat/logbuffer
-include/bobcat/ofdstreambuf
-include/bobcat/iostreambuf
-include/bobcat/indent
-include/bobcat/ifdstreambuf
-include/bobcat/hostent
-include/bobcat/hash
-include/bobcat/errno
-include/bobcat/datetime
-include/bobcat/align
-include/bobcat/a2x
+include/bobcat/user
+include/bobcat/x2a
+include/bobcat/xpointer
 lib/libbobcat.a
-lib/libbobcat.so.2.00.1
-lib/libbobcat.so.2
 lib/libbobcat.so
+lib/libbobcat.so.%%PORTVERSION%%
+lib/libbobcat.so.2
 @dirrm include/bobcat