diff options
| -rw-r--r-- | devel/libbobcat/Makefile | 29 | ||||
| -rw-r--r-- | devel/libbobcat/distinfo | 4 | ||||
| -rw-r--r-- | devel/libbobcat/files/patch-glob-glob1.cc | 12 | ||||
| -rw-r--r-- | devel/libbobcat/files/patch-inetaddress-inetaddress | 12 | ||||
| -rw-r--r-- | devel/libbobcat/files/patch-tempstream-tempstream1.cc | 14 | ||||
| -rw-r--r-- | devel/libbobcat/pkg-plist | 12 |
6 files changed, 47 insertions, 36 deletions
diff --git a/devel/libbobcat/Makefile b/devel/libbobcat/Makefile index ad886af22b74..a046eeb04a3b 100644 --- a/devel/libbobcat/Makefile +++ b/devel/libbobcat/Makefile @@ -1,12 +1,7 @@ -# New ports collection makefile for: libbobcat -# Date created: March 4, 2009 -# Whom: Gabor Pali <pgj@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= libbobcat -PORTVERSION= 2.18.00 +PORTVERSION= 3.11.01 CATEGORIES= devel MASTER_SITES= SF/bobcat/bobcat/${PORTVERSION} DISTNAME= bobcat_${PORTVERSION} @@ -18,17 +13,17 @@ 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 +USE_XORG= x11 + MANCOMPRESSED= yes MAN3= a2x.3bobcat align.3bobcat arg.3bobcat argconfig.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 \ + encryptbuf.3bobcat errno.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 \ @@ -41,15 +36,15 @@ MAN3= a2x.3bobcat align.3bobcat arg.3bobcat argconfig.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 \ + pipe.3bobcat process.3bobcat ptriter.3bobcat randbuffer.3bobcat \ + ranger.3bobcat readlinebuf.3bobcat readlinehistory.3bobcat \ + readlinestream.3bobcat redirector.3bobcat \ repeat.3bobcat selector.3bobcat serversocket.3bobcat \ - socketbase.3bobcat stat.3bobcat string.3bobcat \ + signal.3bobcat socketbase.3bobcat stat.3bobcat string.3bobcat \ stringline.3bobcat syslogbuf.3bobcat syslogstream.3bobcat \ table.3bobcat tablebuf.3bobcat tablelines.3bobcat \ - tablesupport.3bobcat typetrait.3bobcat user.3bobcat \ - x2a.3bobcat xpointer.3bobcat + tablesupport.3bobcat tempstream.3bobcat typetrait.3bobcat \ + user.3bobcat x2a.3bobcat xpointer.3bobcat MAN7= bobcat.7 DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION} @@ -63,8 +58,8 @@ WRKSRC= ${WRKDIR}/bobcat-${PORTVERSION} post-patch: @${REINPLACE_CMD} -e 's|"/usr"|"${PREFIX}"| ; \ - s|"/share/doc/libbobcat2"|"/share/doc/${PORTNAME}-${PORTVERSION}"| ; \ - s|"/share/doc/libbobcat2-dev"|"/share/doc/${PORTNAME}-${PORTVERSION}/dev"| ; \ + 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|| ; \ diff --git a/devel/libbobcat/distinfo b/devel/libbobcat/distinfo index bae9ea828f2b..019572836f2b 100644 --- a/devel/libbobcat/distinfo +++ b/devel/libbobcat/distinfo @@ -1,2 +1,2 @@ -SHA256 (bobcat_2.18.00.orig.tar.gz) = 0b1a8b9119d358ee962819bf58b9be977062ecffb9f3d95afb3e219565fc7d54 -SIZE (bobcat_2.18.00.orig.tar.gz) = 874220 +SHA256 (bobcat_3.11.01.orig.tar.gz) = aba495ff6837761d0a6c8a602a07fcad9782ff627117a0a0f1d0d1d0e5889947 +SIZE (bobcat_3.11.01.orig.tar.gz) = 875674 diff --git a/devel/libbobcat/files/patch-glob-glob1.cc b/devel/libbobcat/files/patch-glob-glob1.cc new file mode 100644 index 000000000000..6a05f1f1b35a --- /dev/null +++ b/devel/libbobcat/files/patch-glob-glob1.cc @@ -0,0 +1,12 @@ +--- glob/glob1.cc.orig 2012-10-27 10:28:31.000000000 +0200 ++++ glob/glob1.cc 2012-12-02 01:08:36.000000000 +0100 +@@ -1,6 +1,6 @@ + #include "glob.ih" + + Glob::Glob(string const &pattern, int flags, Dots dots) +-: +- Glob(ANY, pattern, flags, dots) +-{} ++{ ++ Glob(ANY, pattern, flags, dots); ++} diff --git a/devel/libbobcat/files/patch-inetaddress-inetaddress b/devel/libbobcat/files/patch-inetaddress-inetaddress deleted file mode 100644 index 5d04e5ef2d48..000000000000 --- a/devel/libbobcat/files/patch-inetaddress-inetaddress +++ /dev/null @@ -1,12 +0,0 @@ ---- 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-tempstream-tempstream1.cc b/devel/libbobcat/files/patch-tempstream-tempstream1.cc new file mode 100644 index 000000000000..78a7b07deedc --- /dev/null +++ b/devel/libbobcat/files/patch-tempstream-tempstream1.cc @@ -0,0 +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 @@ + strcpy(buf + base.length(), "XXXXXX"); + base.copy(buf, string::npos); + ++#ifdef __FreeBSD__ ++ int fd = mkstemp(buf); ++#else + int fd = mkostemp(buf, O_RDWR); ++#endif + + if (fd == -1) + throw Errno("TempStream"); diff --git a/devel/libbobcat/pkg-plist b/devel/libbobcat/pkg-plist index 2a438c77b133..9ff6cd1b6315 100644 --- a/devel/libbobcat/pkg-plist +++ b/devel/libbobcat/pkg-plist @@ -5,6 +5,7 @@ include/bobcat/arg include/bobcat/argconfig include/bobcat/autoptr include/bobcat/bigint +include/bobcat/binarysearch include/bobcat/binops include/bobcat/cgi include/bobcat/cidr @@ -18,15 +19,12 @@ 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/gs include/bobcat/hash include/bobcat/hmacbuf include/bobcat/hostent @@ -62,7 +60,9 @@ include/bobcat/onekey include/bobcat/pattern include/bobcat/pipe include/bobcat/process +include/bobcat/ptriter include/bobcat/randbuffer +include/bobcat/ranger include/bobcat/readlinebuf include/bobcat/readlinehistory include/bobcat/readlinestream @@ -71,6 +71,7 @@ include/bobcat/refcount include/bobcat/repeat include/bobcat/selector include/bobcat/serversocket +include/bobcat/signal include/bobcat/socketbase include/bobcat/stat include/bobcat/string @@ -82,6 +83,7 @@ include/bobcat/tablebase include/bobcat/tablebuf include/bobcat/tablelines include/bobcat/tablesupport +include/bobcat/tempstream include/bobcat/typetrait include/bobcat/user include/bobcat/x2a @@ -89,5 +91,5 @@ include/bobcat/xpointer lib/libbobcat.a lib/libbobcat.so lib/libbobcat.so.%%PORTVERSION%% -lib/libbobcat.so.2 +lib/libbobcat.so.3 @dirrm include/bobcat |