11 files changed, 82 insertions, 108 deletions

diff --git a/devel/sdts++/Makefile b/devel/sdts++/Makefile
index 4f9b93949459..7b93f9b36ae4 100644
--- a/devel/sdts++/Makefile
+++ b/devel/sdts++/Makefile
@@ -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$
-#
 
 PORTNAME=	sdts++
 PORTVERSION=	1.5.1
@@ -15,16 +11,18 @@ MASTER_SITES=	http://thor-f5.er.usgs.gov/sdts/sdtsxx/ \
 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_BISON=	build
 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 --git a/devel/sdts++/files/patch-ac b/devel/sdts++/files/patch-ac
deleted file mode 100644
index 45f57105104c..000000000000
--- a/devel/sdts++/files/patch-ac
+++ /dev/null
@@ -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 --git a/devel/sdts++/files/patch-configure.in b/devel/sdts++/files/patch-configure.in
deleted file mode 100644
index a55b7b32c609..000000000000
--- a/devel/sdts++/files/patch-configure.in
+++ /dev/null
@@ -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<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

diff --git a/devel/sdts++/files/patch-sdts++-io-sio_8211Converter.h b/devel/sdts++/files/patch-sdts++-io-sio_8211Converter.h
deleted file mode 100644
index 8fefa8747c08..000000000000
--- a/devel/sdts++/files/patch-sdts++-io-sio_8211Converter.h
+++ /dev/null
@@ -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<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;
diff --git a/devel/sdts++/files/patch-sdts++__io__FormatParset.yy b/devel/sdts++/files/patch-sdts++__io__FormatParset.yy
new file mode 100644
index 000000000000..ea268ef8a1ff
--- /dev/null
+++ b/devel/sdts++/files/patch-sdts++__io__FormatParset.yy
@@ -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 <iostream>
+ 
++#include <cstdio>
++
++#include <cstdlib>
++
+ #ifndef INCLUDED_SIO8211FIELDFORMAT_H
+ #include "sdts++/io/sio_8211FieldFormat.h"
+ #endif
diff --git a/devel/sdts++/files/patch-sdts++__io__sio_8211Converter.cpp b/devel/sdts++/files/patch-sdts++__io__sio_8211Converter.cpp
new file mode 100644
index 000000000000..01e85d38a263
--- /dev/null
+++ b/devel/sdts++/files/patch-sdts++__io__sio_8211Converter.cpp
@@ -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 <strstream>
+ #include <iomanip>
++#include <cstring>
+ 
+ #include <algorithm>
+ 
diff --git a/devel/sdts++/files/patch-sdts++__io__sio_8211DDRField.cpp b/devel/sdts++/files/patch-sdts++__io__sio_8211DDRField.cpp
new file mode 100644
index 000000000000..32988f5a9b40
--- /dev/null
+++ b/devel/sdts++/files/patch-sdts++__io__sio_8211DDRField.cpp
@@ -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 <strstream>
++#include <cstring>
+ 
+ 
+ 
diff --git a/devel/sdts++/files/patch-sdts++__io__sio_Utils.cpp b/devel/sdts++/files/patch-sdts++__io__sio_Utils.cpp
new file mode 100644
index 000000000000..a2622c1e8202
--- /dev/null
+++ b/devel/sdts++/files/patch-sdts++__io__sio_Utils.cpp
@@ -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 <cstdlib>
++#include <cstring>
+ 
+ 
+ 
diff --git a/devel/sdts++/files/patch-sysutils__t_basename.cpp b/devel/sdts++/files/patch-sysutils__t_basename.cpp
new file mode 100644
index 000000000000..71aef16be9be
--- /dev/null
+++ b/devel/sdts++/files/patch-sysutils__t_basename.cpp
@@ -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 <iostream>
++#include <cstdlib>
+ 
+ #include "fileutils.h"
+ 
diff --git a/devel/sdts++/files/patch-sysutils__t_dirname.cpp b/devel/sdts++/files/patch-sysutils__t_dirname.cpp
new file mode 100644
index 000000000000..0616cfbe6daa
--- /dev/null
+++ b/devel/sdts++/files/patch-sysutils__t_dirname.cpp
@@ -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 <iostream>
++#include <cstdlib>
+ 
+ #include "fileutils.h"
+ 
diff --git a/devel/sdts++/files/patch-sysutils__t_stringutils.cpp b/devel/sdts++/files/patch-sysutils__t_stringutils.cpp
new file mode 100644
index 000000000000..d6c102534b89
--- /dev/null
+++ b/devel/sdts++/files/patch-sysutils__t_stringutils.cpp
@@ -0,0 +1,9 @@
+--- 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 <iostream>
+ #include <string>
+ #include <cassert>
++#include <cstdlib>
+ 
+ using namespace std;