Attachment #128103 for bug #171990

View | Details | Raw Unified | Return to bug 171990
Collapse All | Expand All




# Created by: erik@habatech.no
# Date created:         08 Feb 2000
# Whom:                 erik@habatech.no
#
# $FreeBSD: ports/devel/sdts++/Makefile,v 1.28 2012/05/28 20:59:15 pav Exp $
#

PORTNAME=	sdts++
PORTVERSION=	1.5.1

MAINTAINER=	ports@FreeBSD.org
COMMENT=	C++ library for SDTS related development

LIB_DEPENDS=	boost_thread:${PORTSDIR}/devel/boost-libs

USE_DOS2UNIX=	sdts++/io/sio_Utils.cpp

USE_AUTOTOOLS=	libtool
USE_GMAKE=	yes
USE_AUTOTOOLS=	libtoolize aclocal automake autoconf
LIBTOOLIZE_ARGS=--copy --force
ACLOCAL_ARGS=	-I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS=	--add-missing --copy --foreign
CONFIGURE_ARGS=	--with-boost=${LOCALBASE}/include
USE_LDCONFIG=	yes
MAKE_JOBS_SAFE=	yes

INFO=		sdts++


Lines 1-11 Link Here

(-)devel/sdts++/files/patch-ac (-11 lines)
1	--- sdts++/Makefile.in.orig Sat Dec 13 14:19:23 2003
2	+++ sdts++/Makefile.in Sat Dec 13 14:21:14 2003
3	@@ -147,7 +147,7 @@
4
5	AUTOMAKE_OPTIONS := subdir-objects
6
7	-AM_CPPFLAGS := -I. -I.. -Icontainer -Iio -Ibuilder -Ilogical -I${prefix}/include -I${BOOST_HEADER}
8	+AM_CPPFLAGS := -I. -I.. -Icontainer -Iio -Ibuilder -Ilogical -I${prefix}/include -I${BOOST_HEADER} -I${BOOST_HEADER}/stlport
9
10	container_sources := container/sc_Subfield.cpp \
11	container/sc_Field.cpp \




--- configure.in.orig	2012-03-11 19:45:25.000000000 +0300
+++ configure.in	2012-03-11 19:46:08.000000000 +0300
@@ -23,13 +23,6 @@
 
 AC_HEADER_STAT
 
-dnl
-dnl see if std::vector<char>::iterator == char *
-dnl
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <vector>]], [[
-char v[2];
-std::vector<char>::iterator i = &v[0];
-]])],[],[AC_DEFINE(VECTOR_ITERATOR_POINTER_NOT_EQUIVALENT) ])
 
 dnl program checks
 
@@ -93,6 +86,14 @@
 export BOOST_HEADER
 
 
+dnl
+dnl see if std::vector<char>::iterator == char *
+dnl
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stlport/vector>]], [[
+char const v[2];
+std::vector<char>::const_iterator i = &v[0];
+]])],[],[AC_DEFINE(VECTOR_ITERATOR_POINTER_NOT_EQUIVALENT) ])
+
 
 dnl
 dnl let's make sure the sysutils package is happy




--- sdts++/io/sio_8211Converter.h.orig	2002-12-03 21:48:05.000000000 +0300
+++ sdts++/io/sio_8211Converter.h	2012-03-11 19:56:04.000000000 +0300
@@ -51,14 +51,16 @@
                                      char const* data,
                                      long bitLength) const = 0;
 
-#ifdef VECTOR_ITERATOR_POINTER_NOT_EQUIVALENT
-      long makeFixedSubfield(sc_Subfield& subfield,
-                                     std::vector<char>::const_iterator & data,
-                                     long bitLength) const
-        {
-          return makeFixedSubfield( subfield, &data[0], bitLength );
-        }
-#endif
+// The overload, incorrectly permitted by Autoconf, is disabled
+
+// #ifdef VECTOR_ITERATOR_POINTER_NOT_EQUIVALENT
+//       long makeFixedSubfield(sc_Subfield& subfield,
+//                                      std::vector<char>::const_iterator & data,
+//                                      long bitLength) const
+//         {
+//           return makeFixedSubfield( subfield, &data[0], bitLength );
+//         }
+// #endif
 
       /// Variable width subfields
       /** Returns the length of the data converted. This does not__ included
@@ -68,15 +70,17 @@
                                    long maxLength,
                                    char delimiter) const;
 
-#ifdef VECTOR_ITERATOR_POINTER_NOT_EQUIVALENT
-      long makeVarSubfield(sc_Subfield& subfield,
-                                   std::vector<char>::const_iterator & data,
-                                   long maxLength,
-                                   char delimiter) const
-        {
-          return makeVarSubfield( subfield, &data[0], maxLength, delimiter );
-        }
-#endif
+// The overload, incorrectly permitted by Autoconf, is disabled
+
+// #ifdef VECTOR_ITERATOR_POINTER_NOT_EQUIVALENT
+//       long makeVarSubfield(sc_Subfield& subfield,
+//                                    std::vector<char>::const_iterator & data,
+//                                    long maxLength,
+//                                    char delimiter) const
+//         {
+//           return makeVarSubfield( subfield, &data[0], maxLength, delimiter );
+//         }
+// #endif
 
       /// Adds a "null field" (adds an end-of-field character) to the buffer.
       virtual long addEmptySubfield(sio_Buffer& buffer) const;




--- sdts++/io/FormatParser.yy.orig	2002-10-08 05:44:24.000000000 +0900
+++ sdts++/io/FormatParser.yy	2012-09-12 16:53:19.000000000 +0900
@@ -71,6 +71,10 @@
 
 #include <iostream>
 
+#include <cstdio>
+
+#include <cstdlib>
+
 #ifndef INCLUDED_SIO8211FIELDFORMAT_H
 #include "sdts++/io/sio_8211FieldFormat.h"
 #endif

Line 0 Link Here

(-)devel/sdts++/files/patch-sdts++__io__sio_8211Converter.cpp (+10 lines)
	1	--- sdts++/io/sio_8211Converter.cpp.orig 2002-11-25 07:07:43.000000000 +0900
	2	+++ sdts++/io/sio_8211Converter.cpp 2012-09-12 16:47:10.000000000 +0900
	3	@@ -16,6 +16,7 @@
	4
	5	#include <strstream>
	6	#include <iomanip>
	7	+#include <cstring>
	8
	9	#include <algorithm>
	10

Line 0 Link Here

(-)devel/sdts++/files/patch-sdts++__io__sio_8211DDRField.cpp (+10 lines)
	1	--- sdts++/io/sio_8211DDRField.cpp.orig 2002-11-25 07:07:43.000000000 +0900
	2	+++ sdts++/io/sio_8211DDRField.cpp 2012-09-12 16:48:13.000000000 +0900
	3	@@ -18,6 +18,7 @@
	4	#endif
	5
	6	#include <strstream>
	7	+#include <cstring>
	8
	9
	10

Line 0 Link Here

(-)devel/sdts++/files/patch-sdts++__io__sio_Utils.cpp (+10 lines)
	1	--- sdts++/io/sio_Utils.cpp.orig 2002-10-08 05:44:24.000000000 +0900
	2	+++ sdts++/io/sio_Utils.cpp 2012-09-12 16:50:32.000000000 +0900
	3	@@ -15,6 +15,7 @@
	4	#endif
	5
	6	#include <cstdlib>
	7	+#include <cstring>
	8
	9
	10

Line 0 Link Here

(-)devel/sdts++/files/patch-sysutils__t_basename.cpp (+10 lines)
	1	--- sysutils/t_basename.cpp.orig 2002-11-27 09:21:34.000000000 +0900
	2	+++ sysutils/t_basename.cpp 2012-09-12 16:55:05.000000000 +0900
	3	@@ -3,6 +3,7 @@
	4	//
	5
	6	#include <iostream>
	7	+#include <cstdlib>
	8
	9	#include "fileutils.h"
	10

Line 0 Link Here

(-)devel/sdts++/files/patch-sysutils__t_dirname.cpp (+10 lines)
	1	--- sysutils/t_dirname.cpp.orig 2002-11-27 09:21:34.000000000 +0900
	2	+++ sysutils/t_dirname.cpp 2012-09-12 16:54:58.000000000 +0900
	3	@@ -3,6 +3,7 @@
	4	//
	5
	6	#include <iostream>
	7	+#include <cstdlib>
	8
	9	#include "fileutils.h"
	10

Line 0 Link Here

(-)devel/sdts++/files/patch-sysutils__t_stringutils.cpp (+10 lines)
	1	--- sysutils/t_stringutils.cpp.orig 2001-07-18 05:50:15.000000000 +0900
	2	+++ sysutils/t_stringutils.cpp 2012-09-12 16:44:29.000000000 +0900
	3	@@ -5,6 +5,7 @@
	4	#include <iostream>
	5	#include <string>
	6	#include <cassert>
	7	+#include <cstdlib>
	8
	9	using namespace std;
	10

Return to bug 171990

Lines 1-9 Link Here

(-)devel/sdts++/Makefile (-12 / +9 lines)
1	# New ports collection makefile for: sdts++	1	# Created by: erik@habatech.no
2	# Date created: 08 Feb 2000
3	# Whom: erik@habatech.no
4	#
5	# $FreeBSD: ports/devel/sdts++/Makefile,v 1.28 2012/05/28 20:59:15 pav Exp $	2	# $FreeBSD: ports/devel/sdts++/Makefile,v 1.28 2012/05/28 20:59:15 pav Exp $
6	#
7		3
8	PORTNAME= sdts++	4	PORTNAME= sdts++
9	PORTVERSION= 1.5.1	5	PORTVERSION= 1.5.1
Lines 15-30 Link Here
15	MAINTAINER= ports@FreeBSD.org	11	MAINTAINER= ports@FreeBSD.org
16	COMMENT= C++ library for SDTS related development	12	COMMENT= C++ library for SDTS related development
17		13
18	LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs	14	LIB_DEPENDS= boost_thread:${PORTSDIR}/devel/boost-libs
19		15
20	BROKEN= does not compile	16	USE_DOS2UNIX= sdts++/io/sio_Utils.cpp
21
22	USE_AUTOTOOLS= libtool
23	USE_GMAKE= yes	17	USE_GMAKE= yes
24	GNU_CONFIGURE= yes	18	USE_AUTOTOOLS= libtoolize aclocal automake autoconf
25	USE_LDCONFIG= yes	19	LIBTOOLIZE_ARGS=--copy --force
		20	ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal
		21	AUTOMAKE_ARGS= --add-missing --copy --foreign
26	CONFIGURE_ARGS= --with-boost=${LOCALBASE}/include	22	CONFIGURE_ARGS= --with-boost=${LOCALBASE}/include
27	MAKE_ARGS= CXX="${CXX}"	23	USE_LDCONFIG= yes
		24	MAKE_JOBS_SAFE= yes
28		25
29	INFO= sdts++	26	INFO= sdts++
30		27

Lines 1-31 Link Here

(-)devel/sdts++/files/patch-configure.in (-31 lines)
1	--- configure.in.orig 2012-03-11 19:45:25.000000000 +0300
2	+++ configure.in 2012-03-11 19:46:08.000000000 +0300
3	@@ -23,13 +23,6 @@
4
5	AC_HEADER_STAT
6
7	-dnl
8	-dnl see if std::vector<char>::iterator == char *
9	-dnl
10	-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <vector>]], [[
11	-char v[2];
12	-std::vector<char>::iterator i = &v[0];
13	-]])],[],[AC_DEFINE(VECTOR_ITERATOR_POINTER_NOT_EQUIVALENT) ])
14
15	dnl program checks
16
17	@@ -93,6 +86,14 @@
18	export BOOST_HEADER
19
20
21	+dnl
22	+dnl see if std::vector<char>::iterator == char *
23	+dnl
24	+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stlport/vector>]], [[
25	+char const v[2];
26	+std::vector<char>::const_iterator i = &v[0];
27	+]])],[],[AC_DEFINE(VECTOR_ITERATOR_POINTER_NOT_EQUIVALENT) ])
28	+
29
30	dnl
31	dnl let's make sure the sysutils package is happy

Lines 1-54 Link Here

(-)devel/sdts++/files/patch-sdts++-io-sio_8211Converter.h (-54 lines)
1	--- sdts++/io/sio_8211Converter.h.orig 2002-12-03 21:48:05.000000000 +0300
2	+++ sdts++/io/sio_8211Converter.h 2012-03-11 19:56:04.000000000 +0300
3	@@ -51,14 +51,16 @@
4	char const* data,
5	long bitLength) const = 0;
6
7	-#ifdef VECTOR_ITERATOR_POINTER_NOT_EQUIVALENT
8	- long makeFixedSubfield(sc_Subfield& subfield,
9	- std::vector<char>::const_iterator & data,
10	- long bitLength) const
11	- {
12	- return makeFixedSubfield( subfield, &data[0], bitLength );
13	- }
14	-#endif
15	+// The overload, incorrectly permitted by Autoconf, is disabled
16	+
17	+// #ifdef VECTOR_ITERATOR_POINTER_NOT_EQUIVALENT
18	+// long makeFixedSubfield(sc_Subfield& subfield,
19	+// std::vector<char>::const_iterator & data,
20	+// long bitLength) const
21	+// {
22	+// return makeFixedSubfield( subfield, &data[0], bitLength );
23	+// }
24	+// #endif
25
26	/// Variable width subfields
27	/** Returns the length of the data converted. This does not__ included
28	@@ -68,15 +70,17 @@
29	long maxLength,
30	char delimiter) const;
31
32	-#ifdef VECTOR_ITERATOR_POINTER_NOT_EQUIVALENT
33	- long makeVarSubfield(sc_Subfield& subfield,
34	- std::vector<char>::const_iterator & data,
35	- long maxLength,
36	- char delimiter) const
37	- {
38	- return makeVarSubfield( subfield, &data[0], maxLength, delimiter );
39	- }
40	-#endif
41	+// The overload, incorrectly permitted by Autoconf, is disabled
42	+
43	+// #ifdef VECTOR_ITERATOR_POINTER_NOT_EQUIVALENT
44	+// long makeVarSubfield(sc_Subfield& subfield,
45	+// std::vector<char>::const_iterator & data,
46	+// long maxLength,
47	+// char delimiter) const
48	+// {
49	+// return makeVarSubfield( subfield, &data[0], maxLength, delimiter );
50	+// }
51	+// #endif
52
53	/// Adds a "null field" (adds an end-of-field character) to the buffer.
54	virtual long addEmptySubfield(sio_Buffer& buffer) const;

Line 0 Link Here

(-)devel/sdts++/files/patch-sdts++__io__FormatParset.yy (+13 lines)
	1	--- sdts++/io/FormatParser.yy.orig 2002-10-08 05:44:24.000000000 +0900
	2	+++ sdts++/io/FormatParser.yy 2012-09-12 16:53:19.000000000 +0900
	3	@@ -71,6 +71,10 @@
	4
	5	#include <iostream>
	6
	7	+#include <cstdio>
	8	+
	9	+#include <cstdlib>
	10	+
	11	#ifndef INCLUDED_SIO8211FIELDFORMAT_H
	12	#include "sdts++/io/sio_8211FieldFormat.h"
	13	#endif