diff -urN /usr/ports/devel/sdts++/Makefile devel/sdts++/Makefile --- /usr/ports/devel/sdts++/Makefile 2012-05-29 05:59:15.000000000 +0900 +++ devel/sdts++/Makefile 2012-09-25 03:21:04.000000000 +0900 @@ -1,9 +1,5 @@ -# New ports collection makefile for: sdts++ -# Date created: 08 Feb 2000 -# Whom: erik@habatech.no -# +# Created by: 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 @@ -15,16 +11,17 @@ MAINTAINER= ports@FreeBSD.org COMMENT= C++ library for SDTS related development -LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs +LIB_DEPENDS= boost_thread:${PORTSDIR}/devel/boost-libs -BROKEN= does not compile - -USE_AUTOTOOLS= libtool +USE_DOS2UNIX= sdts++/io/sio_Utils.cpp USE_GMAKE= yes -GNU_CONFIGURE= yes -USE_LDCONFIG= 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 -MAKE_ARGS= CXX="${CXX}" +USE_LDCONFIG= yes +MAKE_JOBS_SAFE= yes INFO= sdts++ diff -urN /usr/ports/devel/sdts++/files/patch-ac devel/sdts++/files/patch-ac --- /usr/ports/devel/sdts++/files/patch-ac 2003-12-14 01:27:51.000000000 +0900 +++ devel/sdts++/files/patch-ac 1970-01-01 09:00:00.000000000 +0900 @@ -1,11 +0,0 @@ ---- sdts++/Makefile.in.orig Sat Dec 13 14:19:23 2003 -+++ sdts++/Makefile.in Sat Dec 13 14:21:14 2003 -@@ -147,7 +147,7 @@ - - AUTOMAKE_OPTIONS := subdir-objects - --AM_CPPFLAGS := -I. -I.. -Icontainer -Iio -Ibuilder -Ilogical -I${prefix}/include -I${BOOST_HEADER} -+AM_CPPFLAGS := -I. -I.. -Icontainer -Iio -Ibuilder -Ilogical -I${prefix}/include -I${BOOST_HEADER} -I${BOOST_HEADER}/stlport - - container_sources := container/sc_Subfield.cpp \ - container/sc_Field.cpp \ diff -urN /usr/ports/devel/sdts++/files/patch-configure.in devel/sdts++/files/patch-configure.in --- /usr/ports/devel/sdts++/files/patch-configure.in 2012-05-17 01:09:15.000000000 +0900 +++ devel/sdts++/files/patch-configure.in 1970-01-01 09:00:00.000000000 +0900 @@ -1,31 +0,0 @@ ---- 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::iterator == char * --dnl --AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], [[ --char v[2]; --std::vector::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::iterator == char * -+dnl -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], [[ -+char const v[2]; -+std::vector::const_iterator i = &v[0]; -+]])],[],[AC_DEFINE(VECTOR_ITERATOR_POINTER_NOT_EQUIVALENT) ]) -+ - - dnl - dnl let's make sure the sysutils package is happy diff -urN /usr/ports/devel/sdts++/files/patch-sdts++-io-sio_8211Converter.h devel/sdts++/files/patch-sdts++-io-sio_8211Converter.h --- /usr/ports/devel/sdts++/files/patch-sdts++-io-sio_8211Converter.h 2012-05-17 01:09:15.000000000 +0900 +++ devel/sdts++/files/patch-sdts++-io-sio_8211Converter.h 1970-01-01 09:00:00.000000000 +0900 @@ -1,54 +0,0 @@ ---- 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::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::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::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::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; diff -urN /usr/ports/devel/sdts++/files/patch-sdts++__io__FormatParset.yy devel/sdts++/files/patch-sdts++__io__FormatParset.yy --- /usr/ports/devel/sdts++/files/patch-sdts++__io__FormatParset.yy 1970-01-01 09:00:00.000000000 +0900 +++ devel/sdts++/files/patch-sdts++__io__FormatParset.yy 2012-09-12 16:56:42.000000000 +0900 @@ -0,0 +1,13 @@ +--- 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 + ++#include ++ ++#include ++ + #ifndef INCLUDED_SIO8211FIELDFORMAT_H + #include "sdts++/io/sio_8211FieldFormat.h" + #endif diff -urN /usr/ports/devel/sdts++/files/patch-sdts++__io__sio_8211Converter.cpp devel/sdts++/files/patch-sdts++__io__sio_8211Converter.cpp --- /usr/ports/devel/sdts++/files/patch-sdts++__io__sio_8211Converter.cpp 1970-01-01 09:00:00.000000000 +0900 +++ devel/sdts++/files/patch-sdts++__io__sio_8211Converter.cpp 2012-09-12 16:57:21.000000000 +0900 @@ -0,0 +1,10 @@ +--- sdts++/io/sio_8211Converter.cpp.orig 2002-11-25 07:07:43.000000000 +0900 ++++ sdts++/io/sio_8211Converter.cpp 2012-09-12 16:47:10.000000000 +0900 +@@ -16,6 +16,7 @@ + + #include + #include ++#include + + #include + diff -urN /usr/ports/devel/sdts++/files/patch-sdts++__io__sio_8211DDRField.cpp devel/sdts++/files/patch-sdts++__io__sio_8211DDRField.cpp --- /usr/ports/devel/sdts++/files/patch-sdts++__io__sio_8211DDRField.cpp 1970-01-01 09:00:00.000000000 +0900 +++ devel/sdts++/files/patch-sdts++__io__sio_8211DDRField.cpp 2012-09-12 16:57:52.000000000 +0900 @@ -0,0 +1,10 @@ +--- sdts++/io/sio_8211DDRField.cpp.orig 2002-11-25 07:07:43.000000000 +0900 ++++ sdts++/io/sio_8211DDRField.cpp 2012-09-12 16:48:13.000000000 +0900 +@@ -18,6 +18,7 @@ + #endif + + #include ++#include + + + diff -urN /usr/ports/devel/sdts++/files/patch-sdts++__io__sio_Utils.cpp devel/sdts++/files/patch-sdts++__io__sio_Utils.cpp --- /usr/ports/devel/sdts++/files/patch-sdts++__io__sio_Utils.cpp 1970-01-01 09:00:00.000000000 +0900 +++ devel/sdts++/files/patch-sdts++__io__sio_Utils.cpp 2012-09-12 17:02:29.000000000 +0900 @@ -0,0 +1,10 @@ +--- sdts++/io/sio_Utils.cpp.orig 2002-10-08 05:44:24.000000000 +0900 ++++ sdts++/io/sio_Utils.cpp 2012-09-12 16:50:32.000000000 +0900 +@@ -15,6 +15,7 @@ + #endif + + #include ++#include + + + diff -urN /usr/ports/devel/sdts++/files/patch-sysutils__t_basename.cpp devel/sdts++/files/patch-sysutils__t_basename.cpp --- /usr/ports/devel/sdts++/files/patch-sysutils__t_basename.cpp 1970-01-01 09:00:00.000000000 +0900 +++ devel/sdts++/files/patch-sysutils__t_basename.cpp 2012-09-12 16:58:37.000000000 +0900 @@ -0,0 +1,10 @@ +--- sysutils/t_basename.cpp.orig 2002-11-27 09:21:34.000000000 +0900 ++++ sysutils/t_basename.cpp 2012-09-12 16:55:05.000000000 +0900 +@@ -3,6 +3,7 @@ + // + + #include ++#include + + #include "fileutils.h" + diff -urN /usr/ports/devel/sdts++/files/patch-sysutils__t_dirname.cpp devel/sdts++/files/patch-sysutils__t_dirname.cpp --- /usr/ports/devel/sdts++/files/patch-sysutils__t_dirname.cpp 1970-01-01 09:00:00.000000000 +0900 +++ devel/sdts++/files/patch-sysutils__t_dirname.cpp 2012-09-12 16:58:50.000000000 +0900 @@ -0,0 +1,10 @@ +--- sysutils/t_dirname.cpp.orig 2002-11-27 09:21:34.000000000 +0900 ++++ sysutils/t_dirname.cpp 2012-09-12 16:54:58.000000000 +0900 +@@ -3,6 +3,7 @@ + // + + #include ++#include + + #include "fileutils.h" + diff -urN /usr/ports/devel/sdts++/files/patch-sysutils__t_stringutils.cpp devel/sdts++/files/patch-sysutils__t_stringutils.cpp --- /usr/ports/devel/sdts++/files/patch-sysutils__t_stringutils.cpp 1970-01-01 09:00:00.000000000 +0900 +++ devel/sdts++/files/patch-sysutils__t_stringutils.cpp 2012-09-12 16:59:13.000000000 +0900 @@ -0,0 +1,10 @@ +--- sysutils/t_stringutils.cpp.orig 2001-07-18 05:50:15.000000000 +0900 ++++ sysutils/t_stringutils.cpp 2012-09-12 16:44:29.000000000 +0900 +@@ -5,6 +5,7 @@ + #include + #include + #include ++#include + + using namespace std; +