Index: head/devel/libbobcat/Makefile
===================================================================
--- head/devel/libbobcat/Makefile	(revision 388689)
+++ head/devel/libbobcat/Makefile	(revision 388690)
@@ -1,75 +1,74 @@
 # $FreeBSD$
 
 PORTNAME=	libbobcat
-PORTVERSION=	3.21.01
+PORTVERSION=	3.25.01
 CATEGORIES=	devel
 MASTER_SITES=	SF/bobcat/bobcat/${PORTVERSION}
 DISTNAME=	bobcat_${PORTVERSION}
 EXTRACT_SUFX=	.orig.tar.gz
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Brokken's Own Base Classes And Templates
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	icmake:${PORTSDIR}/devel/icmake \
 		yodl>=3.0:${PORTSDIR}/textproc/yodl
 
-USE_GCC=	yes
+USE_GCC=	4.9+
 USE_XORG=	x11
 
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
 PORTDOCS=	*
 
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
 USE_LDCONFIG=	yes
 WRKSRC=		${WRKDIR}/bobcat-${PORTVERSION}
 
 USES=		readline shebangfix
 
 SHEBANG_LANG=	icmake
 icmake_OLD_CMD=	/usr/bin/icmake
 icmake_CMD=	${LOCALBASE}/bin/icmake
 
 SHEBANG_FILES=	build \
 		documentation/examples/sockets/client/build \
 		documentation/examples/sockets/client2/build \
 		documentation/examples/sockets/forkserver/build \
 		documentation/examples/sockets/forkserver2/build \
 		documentation/examples/sockets/server/build
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|"/usr"|"${PREFIX}"| ; \
+	${REINPLACE_CMD} -e 's|"/usr"|"${PREFIX}"| ; \
 		s|"/share/doc/libbobcat3"|"/share/doc/${PORTNAME}-${PORTVERSION}"| ; \
 		s|"/share/doc/libbobcat3-dev"|"/share/doc/${PORTNAME}-${PORTVERSION}/dev"| ; \
 		s|"/share/man"|"/man"| ; \
 		s|"-d"|"-Pp"| ; \
 		s|#define MANHTML|| ; \
 		s|g++|${CXX}| ; \
+		s|Wall|Wall -D_GLIBCXX_USE_C99| ; \
 		s|gcc|${CC}|' \
 		${WRKSRC}/INSTALL.im
-	@${REINPLACE_CMD} -e 's|"-isystem tmp -Wall -O3"|"-isystem tmp ${LOCALBASE}/include -Wall ${CXXFLAGS}"|' \
-		${WRKSRC}/build
 	@${REINPLACE_CMD} -e 's|"cp -r |"cp -R |' \
 		${WRKSRC}/icmake/install
 	@${REINPLACE_CMD} -e 's|-lssl|-lssl -L${LOCALBASE}/lib| ; \
 		s|-lX11|-lX11 -L${LOCALBASE}/lib| ; \
 		s|-lmilter|-lmilter -lpthread|' \
 		${WRKSRC}/icmake/special
 .if ! ${PORT_OPTIONS:MDOCS}
 	@${REINPLACE_CMD} -e 's|#define DOCOTHER||' \
 		${WRKSRC}/INSTALL.im
 .endif
 
 do-build:
 	@cd ${WRKSRC} && ./build libraries all strip && ./build man
 
 do-install:
 	@cd ${WRKSRC} && ./build install ${STAGEDIR} ${STAGEDIR}
 
 .include <bsd.port.mk>
Index: head/devel/libbobcat/distinfo
===================================================================
--- head/devel/libbobcat/distinfo	(revision 388689)
+++ head/devel/libbobcat/distinfo	(revision 388690)
@@ -1,2 +1,2 @@
-SHA256 (bobcat_3.21.01.orig.tar.gz) = 568d5e6a63b9d8561816d8fa09cf4b587a621790ce558430fa5dfab47514b92e
-SIZE (bobcat_3.21.01.orig.tar.gz) = 1011794
+SHA256 (bobcat_3.25.01.orig.tar.gz) = 8a350ebc736370a7629cbb55097c222016cedd0e804f123017ac5e6921080c1f
+SIZE (bobcat_3.25.01.orig.tar.gz) = 1133805
Index: head/devel/libbobcat/files/patch-arg-arg
===================================================================
--- head/devel/libbobcat/files/patch-arg-arg	(revision 388689)
+++ head/devel/libbobcat/files/patch-arg-arg	(revision 388690)
@@ -1,12 +1,12 @@
---- arg/arg.orig	2013-11-13 11:44:52.000000000 +0100
-+++ arg/arg	2013-11-27 16:37:01.000000000 +0100
+--- arg/arg.orig	2013-10-02 13:57:01 UTC
++++ arg/arg
 @@ -5,6 +5,9 @@
          Singleton Class built around getopt() and getopt_long() (3)
  */
  
-+#ifdef __FreeBSD__
-+#include <errno.h>
++#if defined(__FreeBSD__) || defined(__DragonFly__)
++#include <cerrno>
 +#endif
  
  #include <string>
  #include <vector>
Index: head/devel/libbobcat/files/patch-datetime-datetime
===================================================================
--- head/devel/libbobcat/files/patch-datetime-datetime	(revision 388689)
+++ head/devel/libbobcat/files/patch-datetime-datetime	(revision 388690)
@@ -1,13 +1,13 @@
---- datetime/datetime.orig	2013-11-13 11:44:52.000000000 +0100
-+++ datetime/datetime	2013-11-27 16:22:41.000000000 +0100
+--- datetime/datetime.orig	2013-10-02 13:57:01 UTC
++++ datetime/datetime
 @@ -1,6 +1,10 @@
  #ifndef INCLUDED_BOBCAT_DATETIME_
  #define INCLUDED_BOBCAT_DATETIME_
  
-+#ifdef __FreeBSD__
-+#include <errno.h>
++#if defined(__FreeBSD__) || defined(__DragonFly__)
++#include <cerrno>
 +#endif
 +
  #include <ctime>
  #include <iosfwd>
  
Index: head/devel/libbobcat/files/patch-diffiehellman-diffiehellman
===================================================================
--- head/devel/libbobcat/files/patch-diffiehellman-diffiehellman	(revision 388689)
+++ head/devel/libbobcat/files/patch-diffiehellman-diffiehellman	(revision 388690)
@@ -1,13 +1,13 @@
---- diffiehellman/diffiehellman.orig	2013-10-02 12:36:00.000000000 +0200
-+++ diffiehellman/diffiehellman	2013-11-27 14:08:18.000000000 +0100
+--- diffiehellman/diffiehellman.orig	2013-10-01 16:50:39 UTC
++++ diffiehellman/diffiehellman
 @@ -1,6 +1,10 @@
  #ifndef INCLUDED_BOBCAT_DIFFIEHELLMAN_
  #define INCLUDED_BOBCAT_DIFFIEHELLMAN_
  
-+#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
 +#include <sys/types.h>
 +#endif
 +
  #include <memory>
  #include <iosfwd>
  
Index: head/devel/libbobcat/files/patch-exception-errnodescr.cc
===================================================================
--- head/devel/libbobcat/files/patch-exception-errnodescr.cc	(revision 388689)
+++ head/devel/libbobcat/files/patch-exception-errnodescr.cc	(revision 388690)
@@ -1,20 +1,20 @@
---- exception/errnodescr.cc.orig	2013-10-02 12:36:00.000000000 +0200
-+++ exception/errnodescr.cc	2013-11-27 15:02:26.000000000 +0100
-@@ -7,16 +7,12 @@
+--- exception/errnodescr.cc.orig	2013-10-01 16:50:34 UTC
++++ exception/errnodescr.cc
+@@ -7,16 +7,12 @@ std::ostream &errnodescr(std::ostream &o
  {
      if (errno != 0)
      {
 -        char *buffer = new char[Exception::STRERROR_BUFSIZE];
 -
 -        if (char *cp = strerror_r(errno, buffer, Exception::STRERROR_BUFSIZE))
 +        if (char *cp = strerror(errno))
              out << cp;
          else
          {
              out << "internal error: strerror_r failed with errno = " << errno;
          }
 -
 -        delete[] buffer;
      }
  
      return out;
Index: head/devel/libbobcat/files/patch-hostname-hostname
===================================================================
--- head/devel/libbobcat/files/patch-hostname-hostname	(revision 388689)
+++ head/devel/libbobcat/files/patch-hostname-hostname	(revision 388690)
@@ -1,13 +1,13 @@
---- hostname/hostname.orig	2013-11-13 11:45:02.000000000 +0100
-+++ hostname/hostname	2013-11-27 16:50:05.000000000 +0100
+--- hostname/hostname.orig	2013-10-12 15:12:39 UTC
++++ hostname/hostname
 @@ -1,6 +1,10 @@
  #ifndef INCLUDED_BOBCAT_HOSTNAME_
  #define INCLUDED_BOBCAT_HOSTNAME_
  
-+#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
 +#include <sys/socket.h>
 +#endif
 +
  #include <bobcat/hostent>
  
  namespace FBB
Index: head/devel/libbobcat/files/patch-icmake-man
===================================================================
--- head/devel/libbobcat/files/patch-icmake-man	(revision 388689)
+++ head/devel/libbobcat/files/patch-icmake-man	(revision 388690)
@@ -1,37 +1,46 @@
---- icmake/man.orig	2015-01-21 17:14:17.031076759 +0600
-+++ icmake/man	2015-01-21 17:15:44.394071693 +0600
-@@ -9,7 +9,10 @@
+--- icmake/man.orig	2014-06-04 17:51:49 UTC
++++ icmake/man
+@@ -9,7 +9,10 @@ void man()
  
      special(0, 0);
  
 -    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 +38,10 @@
+@@ -36,8 +39,10 @@ void man()
      
              run("yodl2man  --no-warnings -r 3 -l 3 -o ../../tmp/man/man3/" + 
                                              base + ".3" LIBRARY " " + yodl);
 +#ifdef MANHTML
              run("yodl2html --no-warnings -r 3 -l 3 -o ../../tmp/manhtml/" + 
                                              base + ".3.html " + yodl);
 +#endif
          }
      }
  
-@@ -44,9 +49,11 @@
+@@ -45,16 +50,20 @@ void man()
      {
          run("yodl2man  --no-warnings  -r 3 -o ../../tmp/man/man7/" 
                                                  LIBRARY ".7 " LIBRARY ".yo");
 +#ifdef MANHTML
          run("yodl2html --no-warnings  -r 3 "
                          "-o ../../tmp/manhtml/" LIBRARY ".7.html " 
                                                              LIBRARY ".yo");
++#endif
+ 
+         run("yodl2man  --no-warnings  -r 3 -l 3 "
+                     "-o ../../tmp/man/man7/sharedreadme.7" LIBRARY
+                     " sharedreadme.yo");
++#ifdef MANHTML
+         run("yodl2html --no-warnings  -r 3 "
+                         "-o ../../tmp/manhtml/sharedreadme.7.html "
+                                     "sharedreadme.yo");
 +#endif
      }
  
      run("touch man-stamp");
Index: head/devel/libbobcat/files/patch-ifilterstreambuf-ifilterstreambuf
===================================================================
--- head/devel/libbobcat/files/patch-ifilterstreambuf-ifilterstreambuf	(revision 388689)
+++ head/devel/libbobcat/files/patch-ifilterstreambuf-ifilterstreambuf	(revision 388690)
@@ -1,13 +1,13 @@
---- ifilterstreambuf/ifilterstreambuf.orig	2013-11-13 11:44:52.000000000 +0100
-+++ ifilterstreambuf/ifilterstreambuf	2013-11-27 14:52:22.000000000 +0100
+--- ifilterstreambuf/ifilterstreambuf.orig	2013-10-02 13:57:01 UTC
++++ ifilterstreambuf/ifilterstreambuf
 @@ -1,6 +1,10 @@
  #ifndef INCLUDED_BOBCAT_IFILTERSTREAMBUF_
  #define INCLUDED_BOBCAT_IFILTERSTREAMBUF_
  
-+#ifdef __FreeBSD__
-+#include <stdio.h>
++#if defined(__FreeBSD__) || defined(__DragonFly__)
++#include <cstdio>
 +#endif
 +
  #include <streambuf>
  #include <memory>
  
Index: head/devel/libbobcat/files/patch-inetaddress-inetaddress
===================================================================
--- head/devel/libbobcat/files/patch-inetaddress-inetaddress	(revision 388689)
+++ head/devel/libbobcat/files/patch-inetaddress-inetaddress	(revision 388690)
@@ -1,14 +1,14 @@
---- inetaddress/inetaddress.orig	2013-11-13 11:44:52.000000000 +0100
-+++ inetaddress/inetaddress	2013-11-27 16:51:01.000000000 +0100
+--- inetaddress/inetaddress.orig	2015-01-25 09:51:12 UTC
++++ inetaddress/inetaddress
 @@ -1,6 +1,11 @@
  #ifndef INCLUDED_BOBCAT_INETADDRESS_
  #define INCLUDED_BOBCAT_INETADDRESS_
  
-+#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
 +#include <sys/types.h>
 +#include <sys/socket.h>
 +#endif
 +
  #include <netinet/in.h>
  #include <string>
  
Index: head/devel/libbobcat/files/patch-localsocketbase-localsocketbase
===================================================================
--- head/devel/libbobcat/files/patch-localsocketbase-localsocketbase	(revision 388689)
+++ head/devel/libbobcat/files/patch-localsocketbase-localsocketbase	(revision 388690)
@@ -1,13 +1,13 @@
---- localsocketbase/localsocketbase.orig	2013-11-13 11:44:52.000000000 +0100
-+++ localsocketbase/localsocketbase	2013-11-27 16:51:46.000000000 +0100
+--- localsocketbase/localsocketbase.orig	2013-10-06 09:51:05 UTC
++++ localsocketbase/localsocketbase
 @@ -5,6 +5,10 @@
  #include <string>
  #include <sys/socket.h>
  
-+#ifdef __FreeBSD__
-+#include <string.h>
++#if defined(__FreeBSD__) || defined(__DragonFly__)
++#include <cstring>
 +#endif
 +
  namespace FBB
  {
  
Index: head/devel/libbobcat/files/patch-logbuffer_logbuffer
===================================================================
--- head/devel/libbobcat/files/patch-logbuffer_logbuffer	(nonexistent)
+++ head/devel/libbobcat/files/patch-logbuffer_logbuffer	(revision 388690)
@@ -0,0 +1,13 @@
+--- logbuffer/logbuffer.orig	2014-08-24 07:42:02 UTC
++++ logbuffer/logbuffer
+@@ -1,6 +1,10 @@
+ #ifndef INCLUDED_BOBCAT_LOGBUFFER_
+ #define INCLUDED_BOBCAT_LOGBUFFER_
+ 
++#if defined(__FreeBSD__) || defined(__DragonFly__)
++#include <cstdio>
++#endif
++
+ #include <streambuf>
+ #include <ostream>
+ #include <string>

Property changes on: head/devel/libbobcat/files/patch-logbuffer_logbuffer
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/devel/libbobcat/files/patch-ofdstreambuf-ofdstreambuf
===================================================================
--- head/devel/libbobcat/files/patch-ofdstreambuf-ofdstreambuf	(revision 388689)
+++ head/devel/libbobcat/files/patch-ofdstreambuf-ofdstreambuf	(revision 388690)
@@ -1,13 +1,13 @@
---- ofdstreambuf/ofdstreambuf.orig	2013-11-13 11:44:53.000000000 +0100
-+++ ofdstreambuf/ofdstreambuf	2013-11-27 14:45:13.000000000 +0100
+--- ofdstreambuf/ofdstreambuf.orig	2013-10-03 16:52:33 UTC
++++ ofdstreambuf/ofdstreambuf
 @@ -1,6 +1,10 @@
  #ifndef INCLUDED_BOBCAT_OFDSTREAMBUF_
  #define INCLUDED_BOBCAT_OFDSTREAMBUF_
  
-+#ifdef __FreeBSD__
-+#include <stdio.h>
++#if defined(__FreeBSD__) || defined(__DragonFly__)
++#include <cstdio>
 +#endif
 +
  #include <streambuf>
  
  namespace FBB
Index: head/devel/libbobcat/files/patch-process-process
===================================================================
--- head/devel/libbobcat/files/patch-process-process	(revision 388689)
+++ head/devel/libbobcat/files/patch-process-process	(revision 388690)
@@ -1,13 +1,13 @@
---- process/process.orig	2013-11-13 11:45:02.000000000 +0100
-+++ process/process	2013-11-27 16:52:35.000000000 +0100
+--- process/process.orig	2013-12-30 10:13:10 UTC
++++ process/process
 @@ -5,6 +5,10 @@
  #include <ostream>
  #include <istream>
  
-+#ifdef __FreeBSD__
-+#include <signal.h>
++#if defined(__FreeBSD__) || defined(__DragonFly__)
++#include <csignal>
 +#endif
 +
  #include <bobcat/fork>
  #include <bobcat/string>
  #include <bobcat/pipe>
Index: head/devel/libbobcat/files/patch-readlinebuf_readlinebuf
===================================================================
--- head/devel/libbobcat/files/patch-readlinebuf_readlinebuf	(revision 388689)
+++ head/devel/libbobcat/files/patch-readlinebuf_readlinebuf	(revision 388690)
@@ -1,13 +1,14 @@
---- readlinebuf/readlinebuf.orig	2015-01-21 16:26:21.946273880 +0600
-+++ readlinebuf/readlinebuf	2015-01-21 16:26:46.260272553 +0600
-@@ -1,6 +1,10 @@
+--- readlinebuf/readlinebuf.orig	2013-10-04 15:17:42 UTC
++++ readlinebuf/readlinebuf
+@@ -1,6 +1,11 @@
  #ifndef INCLUDED_BOBCAT_READLINEBUF_
  #define INCLUDED_BOBCAT_READLINEBUF_
  
 +#if defined(__FreeBSD__) || defined(__DragonFly__) 
-+#include <stdio.h>
++#include <cstdio>
++#include <cstdlib>
 +#endif
 +
  #include <string>
  #include <streambuf>
  #include <memory>
Index: head/devel/libbobcat/files/patch-readlinehistory-readlinehistory
===================================================================
--- head/devel/libbobcat/files/patch-readlinehistory-readlinehistory	(revision 388689)
+++ head/devel/libbobcat/files/patch-readlinehistory-readlinehistory	(revision 388690)
@@ -1,12 +1,12 @@
---- ./readlinehistory/readlinehistory.orig	2010-11-04 12:52:11.000000000 +0100
-+++ ./readlinehistory/readlinehistory	2010-11-13 22:00:30.000000000 +0100
+--- readlinehistory/readlinehistory.orig	2013-10-04 18:57:32 UTC
++++ readlinehistory/readlinehistory
 @@ -4,6 +4,9 @@
  #include <iterator>
  #include <string>
  
-+#ifdef __FreeBSD__
-+#include <stdio.h>
++#if defined(__FreeBSD__) || defined(__DragonFly__)
++#include <cstdio>
 +#endif
  #include <readline/history.h>
  
  namespace FBB
Index: head/devel/libbobcat/files/patch-sharedmemory-sharedmemory
===================================================================
--- head/devel/libbobcat/files/patch-sharedmemory-sharedmemory	(revision 388689)
+++ head/devel/libbobcat/files/patch-sharedmemory-sharedmemory	(revision 388690)
@@ -1,13 +1,13 @@
---- sharedmemory/sharedmemory.orig	2013-11-22 08:50:45.000000000 +0100
-+++ sharedmemory/sharedmemory	2013-11-27 14:38:27.000000000 +0100
+--- sharedmemory/sharedmemory.orig	2014-06-04 06:31:09 UTC
++++ sharedmemory/sharedmemory
 @@ -1,6 +1,10 @@
  #ifndef INCLUDED_BOBCAT_SHAREDMEMORY_
  #define INCLUDED_BOBCAT_SHAREDMEMORY_
  
-+#ifdef __FreeBSD__
-+#include <stdio.h>
++#if defined(__FreeBSD__) || defined(__DragonFly__)
++#include <cstdio>
 +#endif
 +
  #include <ios>
  
  #include <bobcat/fswap>
Index: head/devel/libbobcat/files/patch-sharedstreambuf-sharedstreambuf
===================================================================
--- head/devel/libbobcat/files/patch-sharedstreambuf-sharedstreambuf	(revision 388689)
+++ head/devel/libbobcat/files/patch-sharedstreambuf-sharedstreambuf	(revision 388690)
@@ -1,13 +1,13 @@
---- sharedstreambuf/sharedstreambuf.orig	2013-11-22 08:53:40.000000000 +0100
-+++ sharedstreambuf/sharedstreambuf	2013-11-27 14:30:47.000000000 +0100
+--- sharedstreambuf/sharedstreambuf.orig	2014-06-01 13:29:49 UTC
++++ sharedstreambuf/sharedstreambuf
 @@ -1,6 +1,10 @@
  #ifndef INCLUDED_BOBCAT_SHAREDSTREAMBUF_
  #define INCLUDED_BOBCAT_SHAREDSTREAMBUF_
  
-+#ifdef __FreeBSD__
-+#include <stdio.h>
++#if defined(__FreeBSD__) || defined(__DragonFly__)
++#include <cstdio>
 +#endif
 +
  #include <ios>
  #include <streambuf>
  
Index: head/devel/libbobcat/files/patch-signal-signal
===================================================================
--- head/devel/libbobcat/files/patch-signal-signal	(revision 388689)
+++ head/devel/libbobcat/files/patch-signal-signal	(revision 388690)
@@ -1,13 +1,13 @@
---- signal/signal.orig	2013-10-02 12:35:59.000000000 +0200
-+++ signal/signal	2013-11-27 14:28:38.000000000 +0100
+--- signal/signal.orig	2013-12-26 12:39:10 UTC
++++ signal/signal
 @@ -1,6 +1,10 @@
  #ifndef INCLUDED_SIGNAL_
  #define INCLUDED_SIGNAL_
  
-+#ifdef __FreeBSD__
-+#include <stdlib.h>
++#if defined(__FreeBSD__) || defined(__DragonFly__)
++#include <cstdlib>
 +#endif
 +
  #include <vector>
  #include <signal.h>
  
Index: head/devel/libbobcat/files/patch-socketbase-socketbase
===================================================================
--- head/devel/libbobcat/files/patch-socketbase-socketbase	(revision 388689)
+++ head/devel/libbobcat/files/patch-socketbase-socketbase	(revision 388690)
@@ -1,13 +1,13 @@
---- socketbase/socketbase.orig	2013-11-13 11:44:53.000000000 +0100
-+++ socketbase/socketbase	2013-11-27 14:27:08.000000000 +0100
+--- socketbase/socketbase.orig	2015-01-25 09:51:12 UTC
++++ socketbase/socketbase
 @@ -1,6 +1,10 @@
  #ifndef INCLUDED_BOBCAT_SOCKETBASE_
  #define INCLUDED_BOBCAT_SOCKETBASE_
  
-+#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
 +#include <sys/types.h>
 +#endif
 +
  #include <string>
  #include <sys/socket.h>
  
Index: head/devel/libbobcat/files/patch-stat-stat
===================================================================
--- head/devel/libbobcat/files/patch-stat-stat	(revision 388689)
+++ head/devel/libbobcat/files/patch-stat-stat	(revision 388690)
@@ -1,13 +1,13 @@
---- stat/stat.orig	2013-11-13 11:44:53.000000000 +0100
-+++ stat/stat	2013-11-27 14:25:52.000000000 +0100
+--- stat/stat.orig	2014-03-03 16:28:16 UTC
++++ stat/stat
 @@ -6,6 +6,10 @@
  #include <unistd.h>
  #include <string>
  
-+#ifdef __FreeBSD__
-+#include <errno.h>
++#if defined(__FreeBSD__) || defined(__DragonFly__)
++#include <cerrno>
 +#endif
 +
  #include <bobcat/datetime>
  #include <bobcat/gs>
  
Index: head/devel/libbobcat/files/patch-syslogbuf-syslogbuf
===================================================================
--- head/devel/libbobcat/files/patch-syslogbuf-syslogbuf	(revision 388689)
+++ head/devel/libbobcat/files/patch-syslogbuf-syslogbuf	(revision 388690)
@@ -1,14 +1,14 @@
---- syslogbuf/syslogbuf.orig	2013-11-13 11:45:02.000000000 +0100
-+++ syslogbuf/syslogbuf	2013-11-27 14:19:23.000000000 +0100
+--- syslogbuf/syslogbuf.orig	2013-10-12 12:10:29 UTC
++++ syslogbuf/syslogbuf
 @@ -90,6 +90,11 @@
  #include <syslog.h>
  #include <streambuf>
  #include <string>
 +
-+#ifdef __FreeBSD__
-+#include <stdio.h>
++#if defined(__FreeBSD__) || defined(__DragonFly__)
++#include <cstdio>
 +#endif
 +
                          
  namespace FBB
  {
Index: head/devel/libbobcat/files/patch-syslogstream-syslogstream
===================================================================
--- head/devel/libbobcat/files/patch-syslogstream-syslogstream	(revision 388689)
+++ head/devel/libbobcat/files/patch-syslogstream-syslogstream	(revision 388690)
@@ -1,14 +1,14 @@
---- syslogstream/syslogstream.orig	2013-11-13 11:44:53.000000000 +0100
-+++ syslogstream/syslogstream	2013-11-27 14:17:49.000000000 +0100
+--- syslogstream/syslogstream.orig	2013-10-03 17:45:14 UTC
++++ syslogstream/syslogstream
 @@ -88,6 +88,11 @@
  
  #include <ostream>
  #include <syslog.h>
 +
-+#ifdef __FreeBSD__
-+#include <errno.h>
++#if defined(__FreeBSD__) || defined(__DragonFly__)
++#include <cerrno>
 +#endif
 +
                          
  namespace FBB
  {
Index: head/devel/libbobcat/files/patch-tempstream-tempstream1.cc
===================================================================
--- head/devel/libbobcat/files/patch-tempstream-tempstream1.cc	(revision 388689)
+++ head/devel/libbobcat/files/patch-tempstream-tempstream1.cc	(revision 388690)
@@ -1,14 +1,14 @@
---- tempstream/tempstream1.cc.orig	2012-05-07 16:35:29.000000000 +0200
-+++ tempstream/tempstream1.cc	2012-12-02 00:49:06.000000000 +0100
-@@ -7,7 +7,11 @@
+--- tempstream/tempstream1.cc.orig	2013-10-01 16:50:32 UTC
++++ tempstream/tempstream1.cc
+@@ -7,7 +7,11 @@ TempStream::TempStream(string const &bas
      strcpy(buf + base.length(), "XXXXXX");
      base.copy(buf, string::npos);
  
-+#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
 +    int fd = mkstemp(buf);
 +#else
      int fd = mkostemp(buf, O_RDWR);
 +#endif
  
      if (fd == -1)
-         throw Errno("TempStream");
+         throw Exception() << "TempStream: " << errnodescr;
Index: head/devel/libbobcat/pkg-plist
===================================================================
--- head/devel/libbobcat/pkg-plist	(revision 388689)
+++ head/devel/libbobcat/pkg-plist	(revision 388690)
@@ -1,219 +1,228 @@
 include/bobcat/a2x
 include/bobcat/align
 include/bobcat/arg
 include/bobcat/argconfig
 include/bobcat/autoptr
 include/bobcat/base64streambufbase
 include/bobcat/bigint
 include/bobcat/binarysearch
 include/bobcat/binops
 include/bobcat/cgi
 include/bobcat/cidr
 include/bobcat/clientsocket
 include/bobcat/cmdfinder
 include/bobcat/cmdfinderbase
 include/bobcat/configfile
+include/bobcat/csv
 include/bobcat/datetime
 include/bobcat/decryptbuf
 include/bobcat/diffiehellman
 include/bobcat/digestbuf
 include/bobcat/encryptbuf
 include/bobcat/errno
 include/bobcat/exception
 include/bobcat/fbb
 include/bobcat/fnwrap
 include/bobcat/foreach
 include/bobcat/fork
 include/bobcat/fswap
 include/bobcat/gethostent
 include/bobcat/glob
 include/bobcat/gs
 include/bobcat/hash
 include/bobcat/hmacbuf
 include/bobcat/hostent
 include/bobcat/hostname
 include/bobcat/ibase64stream
 include/bobcat/ibase64streambuf
 include/bobcat/ifdstream
 include/bobcat/ifdstreambuf
 include/bobcat/ifilterstreambuf
 include/bobcat/indent
 include/bobcat/inetaddress
 include/bobcat/iostream
 include/bobcat/iostreambuf
 include/bobcat/irandstream
 include/bobcat/isharedstream
 include/bobcat/isymcryptstream
 include/bobcat/isymcryptstreambuf
 include/bobcat/iterator
 include/bobcat/iuo
 include/bobcat/lc
 include/bobcat/level
 include/bobcat/linearmap
 include/bobcat/localclientsocket
 include/bobcat/localserversocket
 include/bobcat/localsocketbase
 include/bobcat/log
 include/bobcat/logbuffer
 include/bobcat/mailheaders
 include/bobcat/mbuf
 include/bobcat/milter
 include/bobcat/msg
 include/bobcat/mstream
 include/bobcat/multistreambuf
 include/bobcat/ofdstream
 include/bobcat/ofdstreambuf
 include/bobcat/ofilterstreambuf
 include/bobcat/ofoldstream
 include/bobcat/ofoldstreambuf
 include/bobcat/ohexstreambuf
 include/bobcat/onekey
 include/bobcat/osharedstream
 include/bobcat/pattern
 include/bobcat/pipe
 include/bobcat/primefactors
 include/bobcat/process
 include/bobcat/processenums
 include/bobcat/ptriter
 include/bobcat/randbuffer
 include/bobcat/ranger
 include/bobcat/readlinebuf
 include/bobcat/readlinehistory
 include/bobcat/readlinestream
 include/bobcat/redirector
 include/bobcat/refcount
 include/bobcat/repeat
 include/bobcat/selector
+include/bobcat/semaphore
 include/bobcat/serversocket
 include/bobcat/sharedblock
+include/bobcat/sharedcondition
 include/bobcat/sharedmemory
 include/bobcat/sharedmutex
 include/bobcat/sharedpos
 include/bobcat/sharedsegment
 include/bobcat/sharedstream
 include/bobcat/sharedstreambuf
 include/bobcat/signal
 include/bobcat/socketbase
 include/bobcat/stat
 include/bobcat/string
 include/bobcat/stringline
 include/bobcat/symcryptstreambufbase
 include/bobcat/syslogbuf
 include/bobcat/syslogstream
 include/bobcat/table
 include/bobcat/tablebase
 include/bobcat/tablebuf
 include/bobcat/tablelines
 include/bobcat/tablesupport
 include/bobcat/tempstream
+include/bobcat/tty
 include/bobcat/typetrait
 include/bobcat/user
 include/bobcat/x2a
 include/bobcat/xpointer
 lib/libbobcat.a
 lib/libbobcat.so
 lib/libbobcat.so.%%PORTVERSION%%
 lib/libbobcat.so.3
 man/man3/a2x.3bobcat.gz
 man/man3/align.3bobcat.gz
 man/man3/arg.3bobcat.gz
 man/man3/argconfig.3bobcat.gz
 man/man3/bigint.3bobcat.gz
 man/man3/binarysearch.3bobcat.gz
 man/man3/binops.3bobcat.gz
 man/man3/cgi.3bobcat.gz
 man/man3/cidr.3bobcat.gz
 man/man3/clientsocket.3bobcat.gz
 man/man3/cmdfinder.3bobcat.gz
 man/man3/cmdfinderbase.3bobcat.gz
 man/man3/configfile.3bobcat.gz
+man/man3/csv.3bobcat.gz
 man/man3/datetime.3bobcat.gz
 man/man3/decryptbuf.3bobcat.gz
 man/man3/diffiehellman.3bobcat.gz
 man/man3/digestbuf.3bobcat.gz
 man/man3/encryptbuf.3bobcat.gz
 man/man3/exception.3bobcat.gz
 man/man3/fork.3bobcat.gz
 man/man3/fswap.3bobcat.gz
 man/man3/gethostent.3bobcat.gz
 man/man3/glob.3bobcat.gz
 man/man3/hash.3bobcat.gz
 man/man3/hmacbuf.3bobcat.gz
 man/man3/hostent.3bobcat.gz
 man/man3/hostname.3bobcat.gz
 man/man3/ibase64stream.3bobcat.gz
 man/man3/ibase64streambuf.3bobcat.gz
 man/man3/ifdstream.3bobcat.gz
 man/man3/ifdstreambuf.3bobcat.gz
 man/man3/ifilterstreambuf.3bobcat.gz
 man/man3/indent.3bobcat.gz
 man/man3/inetaddress.3bobcat.gz
 man/man3/iostream.3bobcat.gz
 man/man3/iostreambuf.3bobcat.gz
 man/man3/irandstream.3bobcat.gz
 man/man3/isharedstream.3bobcat.gz
 man/man3/isymcryptstream.3bobcat.gz
 man/man3/isymcryptstreambuf.3bobcat.gz
 man/man3/iterator.3bobcat.gz
 man/man3/level.3bobcat.gz
 man/man3/linearmap.3bobcat.gz
 man/man3/lm.3bobcat.gz
 man/man3/localclientsocket.3bobcat.gz
 man/man3/localserversocket.3bobcat.gz
 man/man3/localsocketbase.3bobcat.gz
 man/man3/log.3bobcat.gz
 man/man3/logbuffer.3bobcat.gz
 man/man3/mailheaders.3bobcat.gz
 man/man3/manipulators.3bobcat.gz
 man/man3/mbuf.3bobcat.gz
 man/man3/milter.3bobcat.gz
 man/man3/mlm.3bobcat.gz
 man/man3/mstream.3bobcat.gz
 man/man3/multistreambuf.3bobcat.gz
 man/man3/ofdstream.3bobcat.gz
 man/man3/ofdstreambuf.3bobcat.gz
 man/man3/ofilterstreambuf.3bobcat.gz
 man/man3/ofoldstream.3bobcat.gz
 man/man3/ofoldstreambuf.3bobcat.gz
 man/man3/ohexstreambuf.3bobcat.gz
 man/man3/onekey.3bobcat.gz
 man/man3/osharedstream.3bobcat.gz
 man/man3/pattern.3bobcat.gz
 man/man3/pipe.3bobcat.gz
 man/man3/primefactors.3bobcat.gz
 man/man3/process.3bobcat.gz
 man/man3/ptriter.3bobcat.gz
 man/man3/randbuffer.3bobcat.gz
 man/man3/ranger.3bobcat.gz
 man/man3/readlinebuf.3bobcat.gz
 man/man3/readlinehistory.3bobcat.gz
 man/man3/readlinestream.3bobcat.gz
 man/man3/redirector.3bobcat.gz
 man/man3/repeat.3bobcat.gz
 man/man3/reverseiterator.3bobcat.gz
 man/man3/selector.3bobcat.gz
 man/man3/serversocket.3bobcat.gz
+man/man3/semaphore.3bobcat.gz
 man/man3/sharedblock.3bobcat.gz
+man/man3/sharedcondition.3bobcat.gz
 man/man3/sharedmemory.3bobcat.gz
 man/man3/sharedmutex.3bobcat.gz
 man/man3/sharedpos.3bobcat.gz
+man/man7/sharedreadme.7bobcat.gz
 man/man3/sharedsegment.3bobcat.gz
 man/man3/sharedstream.3bobcat.gz
 man/man3/sharedstreambuf.3bobcat.gz
 man/man3/signal.3bobcat.gz
 man/man3/socketbase.3bobcat.gz
 man/man3/stat.3bobcat.gz
 man/man3/string.3bobcat.gz
 man/man3/stringline.3bobcat.gz
 man/man3/syslogbuf.3bobcat.gz
 man/man3/syslogstream.3bobcat.gz
 man/man3/table.3bobcat.gz
 man/man3/tablebuf.3bobcat.gz
 man/man3/tablelines.3bobcat.gz
 man/man3/tablesupport.3bobcat.gz
 man/man3/tempstream.3bobcat.gz
+man/man3/tty.3bobcat.gz
 man/man3/typetrait.3bobcat.gz
 man/man3/user.3bobcat.gz
 man/man3/x2a.3bobcat.gz
 man/man3/xpointer.3bobcat.gz
 man/man7/bobcat.7.gz