Index: head/devel/libbobcat/Makefile =================================================================== --- head/devel/libbobcat/Makefile (revision 377727) +++ head/devel/libbobcat/Makefile (revision 377728) @@ -1,76 +1,75 @@ # $FreeBSD$ PORTNAME= libbobcat -PORTVERSION= 3.18.01 -PORTREVISION= 1 +PORTVERSION= 3.21.01 CATEGORIES= devel MASTER_SITES= SF/bobcat/bobcat/${PORTVERSION} DISTNAME= bobcat_${PORTVERSION} EXTRACT_SUFX= .orig.tar.gz -MAINTAINER= ports@FreeBSD.org +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_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 post-patch: @${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|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 Index: head/devel/libbobcat/distinfo =================================================================== --- head/devel/libbobcat/distinfo (revision 377727) +++ head/devel/libbobcat/distinfo (revision 377728) @@ -1,2 +1,2 @@ -SHA256 (bobcat_3.18.01.orig.tar.gz) = c4986aa865937c496de66186652ed37d474ab23407913e09884dae450fea2ffb -SIZE (bobcat_3.18.01.orig.tar.gz) = 995892 +SHA256 (bobcat_3.21.01.orig.tar.gz) = 568d5e6a63b9d8561816d8fa09cf4b587a621790ce558430fa5dfab47514b92e +SIZE (bobcat_3.21.01.orig.tar.gz) = 1011794 Index: head/devel/libbobcat/files/patch-icmake-man =================================================================== --- head/devel/libbobcat/files/patch-icmake-man (revision 377727) +++ head/devel/libbobcat/files/patch-icmake-man (revision 377728) @@ -1,37 +1,37 @@ ---- icmake/man.orig 2013-11-13 11:44:52.000000000 +0100 -+++ icmake/man 2013-11-27 12:47:25.000000000 +0100 +--- 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 @@ 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 @@ - run("yodl2man --no-warnings -r 3 -o ../../tmp/man/man3/" + + run("yodl2man --no-warnings -r 3 -l 3 -o ../../tmp/man/man3/" + base + ".3" LIBRARY " " + yodl); +#ifdef MANHTML - run("yodl2html --no-warnings -r 3 -o ../../tmp/manhtml/" + + run("yodl2html --no-warnings -r 3 -l 3 -o ../../tmp/manhtml/" + base + ".3.html " + yodl); +#endif } } @@ -44,9 +49,11 @@ { 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("touch man-stamp"); Index: head/devel/libbobcat/files/patch-readlinebuf_readlinebuf =================================================================== --- head/devel/libbobcat/files/patch-readlinebuf_readlinebuf (nonexistent) +++ head/devel/libbobcat/files/patch-readlinebuf_readlinebuf (revision 377728) @@ -0,0 +1,13 @@ +--- 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 @@ + #ifndef INCLUDED_BOBCAT_READLINEBUF_ + #define INCLUDED_BOBCAT_READLINEBUF_ + ++#if defined(__FreeBSD__) || defined(__DragonFly__) ++#include ++#endif ++ + #include + #include + #include Property changes on: head/devel/libbobcat/files/patch-readlinebuf_readlinebuf ___________________________________________________________________ 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/pkg-plist =================================================================== --- head/devel/libbobcat/pkg-plist (revision 377727) +++ head/devel/libbobcat/pkg-plist (revision 377728) @@ -1,213 +1,219 @@ 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/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/serversocket include/bobcat/sharedblock 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/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/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/sharedblock.3bobcat.gz man/man3/sharedmemory.3bobcat.gz man/man3/sharedmutex.3bobcat.gz man/man3/sharedpos.3bobcat.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/typetrait.3bobcat.gz man/man3/user.3bobcat.gz man/man3/x2a.3bobcat.gz man/man3/xpointer.3bobcat.gz man/man7/bobcat.7.gz