From owner-svn-ports-head@FreeBSD.ORG Fri Nov 14 08:36:09 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B5104D5A; Fri, 14 Nov 2014 08:36:09 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 95D6D300; Fri, 14 Nov 2014 08:36:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAE8a9OD001112; Fri, 14 Nov 2014 08:36:09 GMT (envelope-from dinoex@FreeBSD.org) Received: (from dinoex@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAE8a8I9001104; Fri, 14 Nov 2014 08:36:08 GMT (envelope-from dinoex@FreeBSD.org) Message-Id: <201411140836.sAE8a8I9001104@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dinoex set sender to dinoex@FreeBSD.org using -f From: Dirk Meyer Date: Fri, 14 Nov 2014 08:36:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r372553 - in head/misc/estic: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Nov 2014 08:36:09 -0000 Author: dinoex Date: Fri Nov 14 08:36:07 2014 New Revision: 372553 URL: https://svnweb.freebsd.org/changeset/ports/372553 QAT: https://qat.redports.org/buildarchive/r372553/ Log: - fix build on FreeBSD-10 Added: head/misc/estic/files/patch-coll.cc (contents, props changed) Modified: head/misc/estic/Makefile head/misc/estic/files/patch-coll.h head/misc/estic/files/patch-stream.h head/misc/estic/pkg-plist Modified: head/misc/estic/Makefile ============================================================================== --- head/misc/estic/Makefile Fri Nov 14 08:21:02 2014 (r372552) +++ head/misc/estic/Makefile Fri Nov 14 08:36:07 2014 (r372553) @@ -15,7 +15,8 @@ COMMENT= Controller for ISDN TK-Anlage 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 -.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 " Added: head/misc/estic/files/patch-coll.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/estic/files/patch-coll.cc Fri Nov 14 08:36:07 2014 (r372553) @@ -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 + #include +-#include ++#include + + #include "machine.h" + #include "check.h" Modified: head/misc/estic/files/patch-coll.h ============================================================================== --- head/misc/estic/files/patch-coll.h Fri Nov 14 08:21:02 2014 (r372552) +++ head/misc/estic/files/patch-coll.h Fri Nov 14 08:36:07 2014 (r372553) @@ -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 Modified: head/misc/estic/files/patch-stream.h ============================================================================== --- head/misc/estic/files/patch-stream.h Fri Nov 14 08:21:02 2014 (r372552) +++ head/misc/estic/files/patch-stream.h Fri Nov 14 08:36:07 2014 (r372553) @@ -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 + #include + ++#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 Modified: head/misc/estic/pkg-plist ============================================================================== --- head/misc/estic/pkg-plist Fri Nov 14 08:21:02 2014 (r372552) +++ head/misc/estic/pkg-plist Fri Nov 14 08:36:07 2014 (r372553) @@ -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