4 files changed, 43 insertions, 50 deletions

diff --git a/devel/libbobcat/Makefile b/devel/libbobcat/Makefile
index 09025e02e1bb..ad886af22b74 100644
--- a/devel/libbobcat/Makefile
+++ b/devel/libbobcat/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libbobcat
-PORTVERSION=	2.09.02
+PORTVERSION=	2.18.00
 CATEGORIES=	devel
 MASTER_SITES=	SF/bobcat/bobcat/${PORTVERSION}
 DISTNAME=	bobcat_${PORTVERSION}
@@ -15,41 +15,41 @@ EXTRACT_SUFX=	.orig.tar.gz
 MAINTAINER=	pgj@FreeBSD.org
 COMMENT=	Brokken's Own Base Classes And Templates
 
+LICENSE=	GPLv3
+
 BUILD_DEPENDS=	icmake:${PORTSDIR}/devel/icmake \
 		${LOCALBASE}/include/X11/Xlib.h:${PORTSDIR}/x11/libX11 \
-		yodl>=3.0:${PORTSDIR}/textproc/yodl \
-		g++45:${PORTSDIR}/lang/gcc45
+		yodl>=3.0:${PORTSDIR}/textproc/yodl
 
 MANCOMPRESSED=	yes
-MAN1=		bobcatlcgen.1
 MAN3=		a2x.3bobcat align.3bobcat arg.3bobcat argconfig.3bobcat \
-		autoptr.3bobcat bigint.3bobcat binarysearch.3bobcat \
-		cgi.3bobcat clientsocket.3bobcat cmdfinder.3bobcat \
-		cmdfinderbase.3bobcat configfile.3bobcat datetime.3bobcat \
-		decryptbuf.3bobcat digestbuf.3bobcat encryptbuf.3bobcat \
-		errno.3bobcat fnwrap.3bobcat fnwrap1.3bobcat fnwrap1c.3bobcat \
-		fnwrap2.3bobcat fnwrap2c.3bobcat foreach.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 \
-		localclientsocket.3bobcat localserversocket.3bobcat \
-		localsocketbase.3bobcat log.3bobcat logbuffer.3bobcat \
-		mailheaders.3bobcat manipulators.3bobcat mbuf.3bobcat \
-		milter.3bobcat mlm.3bobcat msg.3bobcat mstream.3bobcat \
-		multistreambuf.3bobcat ofdstream.3bobcat ofdstreambuf.3bobcat \
-		ofilterstreambuf.3bobcat ofoldstream.3bobcat \
-		ofoldstreambuf.3bobcat ohexstreambuf.3bobcat onekey.3bobcat \
-		pattern.3bobcat pipe.3bobcat process.3bobcat \
-		randbuffer.3bobcat readlinebuf.3bobcat \
-		readlinehistory.3bobcat readlinestream.3bobcat \
-		redirector.3bobcat refcount.3bobcat \
+		bigint.3bobcat binarysearch.3bobcat \
+		binops.3bobcat cgi.3bobcat cidr.3bobcat clientsocket.3bobcat \
+		cmdfinder.3bobcat cmdfinderbase.3bobcat configfile.3bobcat \
+		datetime.3bobcat decryptbuf.3bobcat digestbuf.3bobcat \
+		encryptbuf.3bobcat errno.3bobcat fnwrap.3bobcat \
+		foreach.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 \
+		level.3bobcat lm.3bobcat localclientsocket.3bobcat \
+		localserversocket.3bobcat localsocketbase.3bobcat log.3bobcat \
+		logbuffer.3bobcat mailheaders.3bobcat manipulators.3bobcat \
+		mbuf.3bobcat milter.3bobcat mlm.3bobcat \
+		mstream.3bobcat multistreambuf.3bobcat ofdstream.3bobcat \
+		ofdstreambuf.3bobcat ofilterstreambuf.3bobcat \
+		ofoldstream.3bobcat ofoldstreambuf.3bobcat \
+		ohexstreambuf.3bobcat onekey.3bobcat pattern.3bobcat \
+		pipe.3bobcat process.3bobcat randbuffer.3bobcat \
+		readlinebuf.3bobcat readlinehistory.3bobcat \
+		readlinestream.3bobcat redirector.3bobcat refcount.3bobcat \
 		repeat.3bobcat selector.3bobcat serversocket.3bobcat \
 		socketbase.3bobcat stat.3bobcat string.3bobcat \
-		syslogbuf.3bobcat syslogstream.3bobcat table.3bobcat \
-		tablebuf.3bobcat tablelines.3bobcat tablesupport.3bobcat \
-		typetrait.3bobcat user.3bobcat x2a.3bobcat xpointer.3bobcat
+		stringline.3bobcat syslogbuf.3bobcat syslogstream.3bobcat \
+		table.3bobcat tablebuf.3bobcat tablelines.3bobcat \
+		tablesupport.3bobcat typetrait.3bobcat user.3bobcat \
+		x2a.3bobcat xpointer.3bobcat
 MAN7=		bobcat.7
 
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
@@ -57,6 +57,7 @@ PORTDOCS=	*
 
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
+USE_GCC=	4.6
 USE_LDCONFIG=	yes
 WRKSRC=		${WRKDIR}/bobcat-${PORTVERSION}
 
@@ -67,8 +68,8 @@ post-patch:
 		s|"/share/man"|"/man"| ; \
 		s|"-d"|"-Pp"| ; \
 		s|#define MANHTML|| ; \
-		s|g++|g++45| ; \
-		s|gcc|gcc45|' \
+		s|g++|g++46| ; \
+		s|gcc|gcc46|' \
 		${WRKSRC}/INSTALL.im
 	@${REINPLACE_CMD} -e 's|#!/usr/bin/icmake|#!${LOCALBASE}/bin/icmake| ; \
 		s|"-isystem tmp -Wall -O3"|"-isystem tmp ${LOCALBASE}/include -Wall ${CXXFLAGS}"|' \
@@ -85,7 +86,7 @@ post-patch:
 .endif
 
 do-build:
-	@cd ${WRKSRC} && ./build libraries all strip && ./build lcgen && ./build man
+	@cd ${WRKSRC} && ./build libraries all strip && ./build man
 
 do-install:
 	@cd ${WRKSRC} && ./build install
diff --git a/devel/libbobcat/distinfo b/devel/libbobcat/distinfo
index 7698bb14c030..bae9ea828f2b 100644
--- a/devel/libbobcat/distinfo
+++ b/devel/libbobcat/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bobcat_2.09.02.orig.tar.gz) = 48ceed1880de6631c829afa445156a1d7a9692783699e83ffefec4210d29e8c5
-SIZE (bobcat_2.09.02.orig.tar.gz) = 586994
+SHA256 (bobcat_2.18.00.orig.tar.gz) = 0b1a8b9119d358ee962819bf58b9be977062ecffb9f3d95afb3e219565fc7d54
+SIZE (bobcat_2.18.00.orig.tar.gz) = 874220
diff --git a/devel/libbobcat/files/patch-icmake-man b/devel/libbobcat/files/patch-icmake-man
index d2a1b3665689..d2e94ad29455 100644
--- a/devel/libbobcat/files/patch-icmake-man
+++ b/devel/libbobcat/files/patch-icmake-man
@@ -1,5 +1,5 @@
---- icmake/man.orig	2010-02-15 09:46:25.000000000 +0100
-+++ icmake/man	2010-04-05 22:04:11.000000000 +0200
+--- icmake/man.orig	2011-05-25 13:00:10.000000000 +0200
++++ icmake/man	2011-11-14 20:36:27.000000000 +0100
 @@ -9,7 +9,10 @@
  
      special(0, 0);
@@ -12,18 +12,7 @@
  
      chdir("documentation/man");
  
-@@ -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 @@
+@@ -35,8 +38,10 @@
      
              run("yodl2man  --no-warnings -r 15000 -o ../../tmp/man/man3/" + 
                                                      base + ".3bobcat " + yodl);
@@ -34,7 +23,7 @@
          }
      }
  
-@@ -52,8 +59,10 @@
+@@ -44,8 +49,10 @@
      {
          run("yodl2man  --no-warnings  -r 15000 -o ../../tmp/man/man7/bobcat.7 "
                                                                  "bobcat.yo");
diff --git a/devel/libbobcat/pkg-plist b/devel/libbobcat/pkg-plist
index 69fe99490711..2a438c77b133 100644
--- a/devel/libbobcat/pkg-plist
+++ b/devel/libbobcat/pkg-plist
@@ -1,12 +1,13 @@
 @comment $FreeBSD$
-bin/bobcatlcgen
 include/bobcat/a2x
 include/bobcat/align
 include/bobcat/arg
 include/bobcat/argconfig
 include/bobcat/autoptr
 include/bobcat/bigint
+include/bobcat/binops
 include/bobcat/cgi
+include/bobcat/cidr
 include/bobcat/clientsocket
 include/bobcat/cmdfinder
 include/bobcat/cmdfinderbase
@@ -37,6 +38,7 @@ include/bobcat/inetaddress
 include/bobcat/iostream
 include/bobcat/iostreambuf
 include/bobcat/irandstream
+include/bobcat/iuo
 include/bobcat/lc
 include/bobcat/level
 include/bobcat/localclientsocket
@@ -72,6 +74,7 @@ include/bobcat/serversocket
 include/bobcat/socketbase
 include/bobcat/stat
 include/bobcat/string
+include/bobcat/stringline
 include/bobcat/syslogbuf
 include/bobcat/syslogstream
 include/bobcat/table