5 files changed, 91 insertions, 65 deletions

diff --git a/devel/sdts++/Makefile b/devel/sdts++/Makefile
index 091fb7680e3b..8fa25033371c 100644
--- a/devel/sdts++/Makefile
+++ b/devel/sdts++/Makefile
@@ -6,26 +6,26 @@
 #
 
 PORTNAME=	sdts++
-PORTVERSION=	1.3.1a
-PORTREVISION=	1
+PORTVERSION=	1.5.1
+PORTREVISION=	0
 CATEGORIES=	devel
-MASTER_SITES=	ftp://sdts.er.usgs.gov/pub/sdts/software/sdtsxx/:site1 \
-		http://lychnobite.org/sdts/:site1 \
-		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	boost
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:site1 \
-		boost_1_27_0${EXTRACT_SUFX}
+MASTER_SITES=	http://thor-f5.er.usgs.gov/sdts/sdtsxx/ \
+		http://lychnobite.org/sdts/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C++ library for SDTS related development
 
+BUILD_DEPENDS=	${LOCALBASE}/lib/libboost_thread.so:${PORTSDIR}/devel/boost
+RUN_DEPENDS=	${LOCALBASE}/lib/libboost_thread.so:${PORTSDIR}/devel/boost
+
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--with-boost=${WRKDIR}/boost_1_27_0
+INSTALLS_SHLIB=	yes
+CONFIGURE_ARGS=	--with-boost=${LOCALBASE}/include
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.pre.mk>                                          
 
-.if ${OSVERSION} >= 500113
-BROKEN=         "Configure fails"
+.if ${OSVERSION} < 500035
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/sdts++/distinfo b/devel/sdts++/distinfo
index 3bca58fc75b6..d4ab5715edd5 100644
--- a/devel/sdts++/distinfo
+++ b/devel/sdts++/distinfo
@@ -1,2 +1,2 @@
-MD5 (sdts++-1.3.1a.tar.gz) = 47f54146d1cb644f231e630879b6c670
+MD5 (sdts++-1.5.1.tar.gz) = 678387d3ebb4b973a7ebf74f8e09be44
 MD5 (boost_1_27_0.tar.gz) = fc288f75e222e82be687ecb391e9da68
diff --git a/devel/sdts++/files/patch-ab b/devel/sdts++/files/patch-ab
new file mode 100644
index 000000000000..6c964eb5ec02
--- /dev/null
+++ b/devel/sdts++/files/patch-ab
@@ -0,0 +1,64 @@
+--- sdts++/builder/sb_Accessor.cpp.orig	Tue Jun 10 22:51:40 2003
++++ sdts++/builder/sb_Accessor.cpp	Sat Dec 13 14:17:48 2003
+@@ -26,6 +26,12 @@
+ #include <cctype>

+ #include <cstring>

+ 

++#if __FreeBSD__
++#  include <osreldate.h>
++#  if __FreeBSD_version < 500035
++#    include <stlport/iosfwd>
++#  endif
++#endif
+ #include <boost/smart_ptr.hpp>

+ #include <boost/filesystem/path.hpp>

+ #include <boost/filesystem/operations.hpp>

+@@ -155,27 +158,27 @@
+ 

+ 

+ 

+-static const char* module_mnemonics_[] =

+-{ 

+-  {"CATS"},

+-  {"CATD"},

+-  {"DDOM"},

+-  {"DDSH"},

+-  {"MDOM"},

+-  {"MDEF"},

+-  {"DQHL"},

+-  {"DQPA"},

+-  {"DQAA"},

+-  {"DQLC"},

+-  {"DQCG"},

+-  {"IDEN"},

+-  {"IREF"},

+-  {"LDEF"},

+-  {"RSDF"},

+-  {"STAT"},

+-  {"XREF"},

+-  {""}

+-}; // module_mnemonics

++static const char* module_mnemonics_[] =
++{ 
++  "CATS",
++  "CATD",
++  "DDOM",
++  "DDSH",
++  "MDOM",
++  "MDEF",
++  "DQHL",
++  "DQPA",
++  "DQAA",
++  "DQLC",
++  "DQCG",
++  "IDEN",
++  "IREF",
++  "LDEF",
++  "RSDF",
++  "STAT",
++  "XREF",
++  ""
++}; // module_mnemonics
+ 

+ 

+ 

diff --git a/devel/sdts++/files/patch-ac b/devel/sdts++/files/patch-ac
new file mode 100644
index 000000000000..45f57105104c
--- /dev/null
+++ b/devel/sdts++/files/patch-ac
@@ -0,0 +1,11 @@
+--- 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++/pkg-plist b/devel/sdts++/pkg-plist
index 5dec875953de..68f3527cd660 100644
--- a/devel/sdts++/pkg-plist
+++ b/devel/sdts++/pkg-plist
@@ -1,57 +1,9 @@
-include/sdts++/builder/sb_Accessor.h
-include/sdts++/builder/sb_At.h
-include/sdts++/builder/sb_Catd.h
-include/sdts++/builder/sb_Cats.h
-include/sdts++/builder/sb_Cell.h
-include/sdts++/builder/sb_Ddom.h
-include/sdts++/builder/sb_Ddsh.h
-include/sdts++/builder/sb_Dq.h
-include/sdts++/builder/sb_ForeignID.h
-include/sdts++/builder/sb_Iden.h
-include/sdts++/builder/sb_Iref.h
-include/sdts++/builder/sb_Ldef.h
-include/sdts++/builder/sb_Line.h
-include/sdts++/builder/sb_Module.h
-include/sdts++/builder/sb_Rsdf.h
 include/sdts++/builder/sb_Spatial.h
-include/sdts++/builder/sb_Stat.h
-include/sdts++/builder/sb_Utils.h
-include/sdts++/builder/sb_Xref.h
-include/sdts++/container/sc_Field.h
-include/sdts++/container/sc_Module.h
-include/sdts++/container/sc_MultiTypeValue.h
-include/sdts++/container/sc_Record.h
-include/sdts++/container/sc_Subfield.h
-include/sdts++/io/sio_8211Converter.h
-include/sdts++/io/sio_8211DDR.h
-include/sdts++/io/sio_8211DDRField.h
-include/sdts++/io/sio_8211DDRLeader.h
-include/sdts++/io/sio_8211DR.h
-include/sdts++/io/sio_8211DRLeader.h
-include/sdts++/io/sio_8211DirEntry.h
-include/sdts++/io/sio_8211Directory.h
-include/sdts++/io/sio_8211Field.h
-include/sdts++/io/sio_8211FieldArea.h
-include/sdts++/io/sio_8211FieldFormat.h
-include/sdts++/io/sio_8211Leader.h
-include/sdts++/io/sio_8211Record.h
-include/sdts++/io/sio_8211SubfieldFormat.h
-include/sdts++/io/sio_8211Utils.h
-include/sdts++/io/sio_Buffer.h
-include/sdts++/io/sio_Converter.h
-include/sdts++/io/sio_ConverterFactory.h
-include/sdts++/io/sio_Error.h
-include/sdts++/io/sio_Reader.h
-include/sdts++/io/sio_Utils.h
-include/sdts++/io/sio_Writer.h
-include/sdts++/logical/sl_Chain.h
-include/sdts++/logical/sl_Node.h
 include/sdts++/logical/sl_Object.h
-include/sdts++/logical/sl_Point.h
-include/sdts++/logical/sl_Polygon.h
 include/sdts++/logical/sl_Ring.h
-include/sdts++/logical/sl_String.h
 include/sysutils/fileutils.h
+include/sysutils/stringutils.h
+info/dir
 @unexec install-info --delete %D/info/sdts++.info %D/info/dir
 info/sdts++.info
 @exec install-info %D/info/sdts++.info %D/info/dir
@@ -59,9 +11,8 @@ lib/libsdts++.a
 lib/libsdts++.so
 lib/libsdts++.so.0
 lib/libsysutils.a
+lib/libsdts++.la
 @dirrm include/sysutils
 @dirrm include/sdts++/logical
-@dirrm include/sdts++/io
-@dirrm include/sdts++/container
 @dirrm include/sdts++/builder
 @dirrm include/sdts++