- Update to 2.07.04

6 files changed, 14 insertions, 34 deletions

diff --git a/devel/libbobcat/Makefile b/devel/libbobcat/Makefile
index d590572ae928..e82107ccc72e 100644
--- a/devel/libbobcat/Makefile
+++ b/devel/libbobcat/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libbobcat
-PORTVERSION=	2.05.00
+PORTVERSION=	2.07.04
 CATEGORIES=	devel
 MASTER_SITES=	SF/bobcat/bobcat/${PORTVERSION}
 DISTNAME=	bobcat_${PORTVERSION}
@@ -27,10 +27,10 @@ MAN3=		a2x.3bobcat align.3bobcat arg.3bobcat argconfig.3bobcat \
 		cgi.3bobcat clientsocket.3bobcat cmdfinder.3bobcat \
 		cmdfinderbase.3bobcat configfile.3bobcat datetime.3bobcat \
 		decryptbuf.3bobcat digestbuf.3bobcat encryptbuf.3bobcat \
-		errno.3bobcat fnwrap1.3bobcat fnwrap1c.3bobcat \
+		errno.3bobcat fnwrap.3bobcat fnwrap1.3bobcat fnwrap1c.3bobcat \
 		fnwrap2.3bobcat fnwrap2c.3bobcat foreach.3bobcat \
-		fork.3bobcat gethostent.3bobcat glob.3bobcat hash.3bobcat \
-		hmacbuf.3bobcat hostent.3bobcat hostname.3bobcat \
+		fork.3bobcat fswap.3bobcat gethostent.3bobcat glob.3bobcat \
+		hash.3bobcat hmacbuf.3bobcat hostent.3bobcat hostname.3bobcat \
 		ifdstream.3bobcat ifdstreambuf.3bobcat indent.3bobcat \
 		inetaddress.3bobcat iostream.3bobcat iostreambuf.3bobcat \
 		irandstream.3bobcat lc.3bobcat level.3bobcat lm.3bobcat \
diff --git a/devel/libbobcat/distinfo b/devel/libbobcat/distinfo
index f292884f3a4c..110f2eb10277 100644
--- a/devel/libbobcat/distinfo
+++ b/devel/libbobcat/distinfo
@@ -1,3 +1,3 @@
-MD5 (bobcat_2.05.00.orig.tar.gz) = 0b38b8f6962460a05c7afcfa0362d1d4
-SHA256 (bobcat_2.05.00.orig.tar.gz) = 15bb15d2a828eda52b575eefd4924eecc4504050df0f1babef8daa37e4edaac9
-SIZE (bobcat_2.05.00.orig.tar.gz) = 557462
+MD5 (bobcat_2.07.04.orig.tar.gz) = 83c4d7126d5fe37f997265397a1b73fd
+SHA256 (bobcat_2.07.04.orig.tar.gz) = 22e91b3988345dde17941d8511145822a757f9c2ae36441c1fa9dc9d826b18cc
+SIZE (bobcat_2.07.04.orig.tar.gz) = 639453
diff --git a/devel/libbobcat/files/patch-cgi-accept.cc b/devel/libbobcat/files/patch-cgi-accept.cc
deleted file mode 100644
index 5a0a3fedfbc1..000000000000
--- a/devel/libbobcat/files/patch-cgi-accept.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- cgi/accept.cc.orig	2009-09-01 10:41:09.000000000 +0200
-+++ cgi/accept.cc	2009-10-05 02:52:05.000000000 +0200
-@@ -4,7 +4,7 @@
- {
-     for_each(d_buffer.rbegin() + 1, d_buffer.rend(), 
-             d_stack, 
--        static_cast<void (stack<char>::*)(char &&)>(&stack<char>::push));
-+        static_cast<void (stack<char>::*)(char const &)>(&stack<char>::push));
- 
- // With g++4-4 (?)
- //        static_cast<void (stack<char>::*)(char const &)>(&stack<char>::push));
diff --git a/devel/libbobcat/files/patch-cgi-push.cc b/devel/libbobcat/files/patch-cgi-push.cc
deleted file mode 100644
index 16e243187aaf..000000000000
--- a/devel/libbobcat/files/patch-cgi-push.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- cgi/push.cc.orig	2009-09-01 10:41:09.000000000 +0200
-+++ cgi/push.cc	2009-10-05 02:47:46.000000000 +0200
-@@ -3,7 +3,7 @@
- void CGIFSA::push()
- {
-     for_each(d_buffer.begin(), d_buffer.end(), d_stack, 
--        static_cast<void (stack<char>::*)(char &&)>(&stack<char>::push));
-+        static_cast<void (stack<char>::*)(char const &)>(&stack<char>::push));
- 
- // With g++4-4 (?)
- //        static_cast<void (stack<char>::*)(char const &)>(&stack<char>::push));
diff --git a/devel/libbobcat/files/patch-icmake-man b/devel/libbobcat/files/patch-icmake-man
index 0451d07f024c..d2a1b3665689 100644
--- a/devel/libbobcat/files/patch-icmake-man
+++ b/devel/libbobcat/files/patch-icmake-man
@@ -1,5 +1,5 @@
---- icmake/man.orig	2009-09-01 10:41:10.000000000 +0200
-+++ icmake/man	2009-10-04 16:00:03.000000000 +0200
+--- icmake/man.orig	2010-02-15 09:46:25.000000000 +0100
++++ icmake/man	2010-04-05 22:04:11.000000000 +0200
 @@ -9,7 +9,10 @@
  
      special(0, 0);
@@ -36,11 +36,11 @@
  
 @@ -52,8 +59,10 @@
      {
-         run("yodl2man  --no-warnings -o ../../tmp/man/man7/bobcat.7 "
+         run("yodl2man  --no-warnings  -r 15000 -o ../../tmp/man/man7/bobcat.7 "
                                                                  "bobcat.yo");
 +#ifdef MANHTML
-         run("yodl2html --no-warnings -o ../../tmp/manhtml/bobcat.7.html "
-                                                                 "bobcat.yo");
+         run("yodl2html --no-warnings  -r 15000 "
+                         "-o ../../tmp/manhtml/bobcat.7.html bobcat.yo");
 +#endif
      }
  
diff --git a/devel/libbobcat/pkg-plist b/devel/libbobcat/pkg-plist
index 3a9fcd10669b..f5cb12126830 100644
--- a/devel/libbobcat/pkg-plist
+++ b/devel/libbobcat/pkg-plist
@@ -16,12 +16,14 @@ include/bobcat/decryptbuf
 include/bobcat/digestbuf
 include/bobcat/encryptbuf
 include/bobcat/errno
+include/bobcat/fnwrap
 include/bobcat/fnwrap1
 include/bobcat/fnwrap1c
 include/bobcat/fnwrap2
 include/bobcat/fnwrap2c
 include/bobcat/foreach
 include/bobcat/fork
+include/bobcat/fswap
 include/bobcat/gethostent
 include/bobcat/glob
 include/bobcat/hash