kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

devel/libbobcat: Update version 3.21.01=>3.25.01

Browse source 
- Fix patch files to reflect 'make makepatch'
This commit is contained in:
Muhammad Moinur Rahman 2015-06-07 11:32:57 +00:00
parent 21abc1c176
commit 6e47a493b5
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=388690
25 changed files with 119 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
devel/libbobcat/Makefile
View file

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= libbobcat
PORTVERSION= 3.21.01
PORTVERSION= 3.25.01
CATEGORIES= devel
MASTER_SITES= SF/bobcat/bobcat/${PORTVERSION}
DISTNAME= bobcat_${PORTVERSION}
@ -15,7 +15,7 @@ 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}
@ -44,17 +44,16 @@ 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| ; \

4
devel/libbobcat/distinfo
View file

@ -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

8
devel/libbobcat/files/patch-arg-arg
View file

@ -1,11 +1,11 @@
--- 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>

8
devel/libbobcat/files/patch-datetime-datetime
View file

@ -1,11 +1,11 @@
--- 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>

6
devel/libbobcat/files/patch-diffiehellman-diffiehellman
View file

@ -1,10 +1,10 @@
--- 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
+

6
devel/libbobcat/files/patch-exception-errnodescr.cc
View file

@ -1,6 +1,6 @@
--- 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)
{

6
devel/libbobcat/files/patch-hostname-hostname
View file

@ -1,10 +1,10 @@
--- 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
+

19
devel/libbobcat/files/patch-icmake-man
View file

@ -1,6 +1,6 @@
--- 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);
@ -12,7 +12,7 @@
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);
@ -23,7 +23,7 @@
}
}
@@ -44,9 +49,11 @@
@@ -45,16 +50,20 @@ void man()
{
run("yodl2man --no-warnings -r 3 -o ../../tmp/man/man7/"
LIBRARY ".7 " LIBRARY ".yo");
@ -32,6 +32,15 @@
"-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");

8
devel/libbobcat/files/patch-ifilterstreambuf-ifilterstreambuf
View file

@ -1,11 +1,11 @@
--- 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>

6
devel/libbobcat/files/patch-inetaddress-inetaddress
View file

@ -1,10 +1,10 @@
--- 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

8
devel/libbobcat/files/patch-localsocketbase-localsocketbase
View file

@ -1,11 +1,11 @@
--- 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

13
devel/libbobcat/files/patch-logbuffer_logbuffer Normal file
View file

@ -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>

8
devel/libbobcat/files/patch-ofdstreambuf-ofdstreambuf
View file

@ -1,11 +1,11 @@
--- 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>

8
devel/libbobcat/files/patch-process-process
View file

@ -1,11 +1,11 @@
--- 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>

9
devel/libbobcat/files/patch-readlinebuf_readlinebuf
View file

@ -1,11 +1,12 @@
--- 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>

8
devel/libbobcat/files/patch-readlinehistory-readlinehistory
View file

@ -1,11 +1,11 @@
--- ./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>

8
devel/libbobcat/files/patch-sharedmemory-sharedmemory
View file

@ -1,11 +1,11 @@
--- 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>

8
devel/libbobcat/files/patch-sharedstreambuf-sharedstreambuf
View file

@ -1,11 +1,11 @@
--- 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>

8
devel/libbobcat/files/patch-signal-signal
View file

@ -1,11 +1,11 @@
--- 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>

6
devel/libbobcat/files/patch-socketbase-socketbase
View file

@ -1,10 +1,10 @@
--- 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
+

8
devel/libbobcat/files/patch-stat-stat
View file

@ -1,11 +1,11 @@
--- 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>

8
devel/libbobcat/files/patch-syslogbuf-syslogbuf
View file

@ -1,12 +1,12 @@
--- 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
+

8
devel/libbobcat/files/patch-syslogstream-syslogstream
View file

@ -1,12 +1,12 @@
--- 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
+

10
devel/libbobcat/files/patch-tempstream-tempstream1.cc
View file

@ -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;

9
devel/libbobcat/pkg-plist
View file

@ -13,6 +13,7 @@ include/bobcat/clientsocket
include/bobcat/cmdfinder
include/bobcat/cmdfinderbase
include/bobcat/configfile
include/bobcat/csv
include/bobcat/datetime
include/bobcat/decryptbuf
include/bobcat/diffiehellman
@ -84,8 +85,10 @@ 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
@ -106,6 +109,7 @@ include/bobcat/tablebuf
include/bobcat/tablelines
include/bobcat/tablesupport
include/bobcat/tempstream
include/bobcat/tty
include/bobcat/typetrait
include/bobcat/user
include/bobcat/x2a
@ -127,6 +131,7 @@ 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
@ -193,10 +198,13 @@ 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
@ -212,6 +220,7 @@ 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