1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-24 04:33:24 +00:00

- fix build on FreeBSD-10

This commit is contained in:
Dirk Meyer 2014-11-14 08:36:07 +00:00
parent 9caabf5217
commit 0f9de2df15
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=372553
5 changed files with 61 additions and 17 deletions

View File

@ -15,7 +15,8 @@ COMMENT= Controller for ISDN TK-Anlage (PBX) made by Istec
USES= zip
USE_CSTD= gnu89
USE_CXXSTD= gnu++98
USE_GCC= any
NO_WRKSUBDIR= yes
# Personal Preferences, Where to install.
@ -39,12 +40,6 @@ FIXME= areacode estic spunk
.include <bsd.port.options.mk>
.if ${OSVERSION} > 1000000
.if ${CC} != gcc42
BROKEN= needs gcc4.2 to compile
.endif
.endif
.if ${PORT_OPTIONS:MX11}
X_OR_NOT=-x
PLIST_SUB+= WITHOUT_X="@comment "

View File

@ -0,0 +1,11 @@
--- spunk/coll.cc.orig 1996-11-30 00:40:58.000000000 +0100
+++ spunk/coll.cc 2014-11-14 08:11:36.000000000 +0100
@@ -21,7 +21,7 @@
#include <stdlib.h>
#include <string.h>
-#include <iostream.h>
+#include <iostream>
#include "machine.h"
#include "check.h"

View File

@ -1,5 +1,5 @@
--- spunk/coll.h.orig Wed Dec 18 23:42:14 1996
+++ spunk/coll.h Sun Oct 8 10:19:16 2006
--- spunk/coll.h.orig 1996-12-18 23:42:14.000000000 +0100
+++ spunk/coll.h 2014-11-14 08:12:06.000000000 +0100
@@ -24,7 +24,7 @@
@ -39,6 +39,15 @@
// Item not found
return -1;
@@ -512,7 +512,7 @@
}
// Index points to the correct position, insert item
- AtInsert (Index, Item);
+ this->AtInsert (Index, Item);
}
@@ -522,7 +522,7 @@
{
// do a binary search

View File

@ -1,6 +1,39 @@
--- spunk/stream.h.orig Thu Nov 7 18:06:52 1996
+++ spunk/stream.h Tue Sep 6 09:54:21 2005
@@ -50,19 +50,19 @@
--- spunk/stream.h.orig 1996-11-07 18:06:52.000000000 +0100
+++ spunk/stream.h 2014-11-14 08:10:27.000000000 +0100
@@ -44,25 +44,53 @@
#include <stdio.h>
#include <string.h>
+#include "machine.h"
+
+class Stream;
+
+Stream& operator << (Stream&, char);
+Stream& operator << (Stream&, unsigned char);
+Stream& operator << (Stream&, signed char);
+Stream& operator << (Stream&, i16);
+Stream& operator << (Stream&, u16);
+Stream& operator << (Stream&, i32);
+Stream& operator << (Stream&, u32);
+Stream& operator << (Stream&, float);
+Stream& operator << (Stream&, double);
+Stream& operator << (Stream&, char*);
+
+Stream& operator >> (Stream&, char&);
+Stream& operator >> (Stream&, unsigned char&);
+Stream& operator >> (Stream&, signed char&);
+Stream& operator >> (Stream&, i16&);
+Stream& operator >> (Stream&, u16&);
+Stream& operator >> (Stream&, i32&);
+Stream& operator >> (Stream&, u32&);
+Stream& operator >> (Stream&, float&);
+Stream& operator >> (Stream&, double&);
+Stream& operator >> (Stream&, char*);
+
+
#include "strmable.h"
#include "coll.h"
#include "str.h"
@ -17,6 +50,7 @@
-static const stSeekError = 10; // error using Seek, GetPos etc.
-static const stReadTimeout = 11; // Timeout on read (CharacterStream only)
-static const stWriteTimeout = 12; // Timeout on write (CharcterStream only)
+
+static const int stOk = 0; // things are allright
+static const int stInitError = 1; // error initializing the stream
+static const int stReadError = 2; // error reading from the stream

View File

@ -8,8 +8,3 @@ etc/pbx/estic.ini.generic_example
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/estic.doc
var/log/pbx/debug
@dirrm etc/pbx
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm var/log/pbx
@dirrm var/log
@dirrm var