4 files changed, 7 insertions, 88 deletions

diff --git a/science/gnudatalanguage/Makefile b/science/gnudatalanguage/Makefile
index 84e68c4ddfae..c8c4672b1d98 100644
--- a/science/gnudatalanguage/Makefile
+++ b/science/gnudatalanguage/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnudatalanguage
-DISTVERSION=	0.9pre5
+DISTVERSION=	0.9pre6
 CATEGORIES=	science lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -35,7 +35,7 @@ LIB_DEPENDS+=	plplotd.11:${PORTSDIR}/math/plplot	\
 		readline.5:${PORTSDIR}/devel/readline
 
 USE_XLIB=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include"	\
 		LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib"
diff --git a/science/gnudatalanguage/distinfo b/science/gnudatalanguage/distinfo
index e8c82c9e81ce..f31ffd841c01 100644
--- a/science/gnudatalanguage/distinfo
+++ b/science/gnudatalanguage/distinfo
@@ -1,3 +1,3 @@
-MD5 (gdl-0.9pre5.tar.gz) = d2a740ba633ff7ace23f452d34a9c42c
-SHA256 (gdl-0.9pre5.tar.gz) = 81121a4e7e217dc986b4827ce690a8650f264dd648108ffde8f1eb77633d41cb
-SIZE (gdl-0.9pre5.tar.gz) = 1131751
+MD5 (gdl-0.9pre6.tar.gz) = 5830539e7301f049f27f2a112467fab3
+SHA256 (gdl-0.9pre6.tar.gz) = a6a597f2cb5fea889b32f99fba595c3535e47ee219a334fd274ab704133e35ea
+SIZE (gdl-0.9pre6.tar.gz) = 1183644
diff --git a/science/gnudatalanguage/files/patch-src__datatypes.cpp b/science/gnudatalanguage/files/patch-src__datatypes.cpp
deleted file mode 100644
index aed6eedfa65b..000000000000
--- a/science/gnudatalanguage/files/patch-src__datatypes.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
---- src/datatypes.cpp.orig	Mon Oct 17 10:22:04 2005
-+++ src/datatypes.cpp	Fri Mar 23 21:43:42 2007
-@@ -52,6 +52,43 @@
- 
- using namespace std;
- 
-+// these need to be defined early, since some gcc versions were reported to
-+// complain about: specialization of
-+// 'Data_< <template-parameter-1-1> >::Data_(const dimension&, BaseGDL::InitType)
-+// [with Sp = SpDXXX]' after instantiation
-+//
-+// string, ptr, obj (cannot be INDGEN,
-+// need not to be zeroed if all intialized later)
-+// struct (as a separate class) as well
-+template<> Data_<SpDString>::Data_(const dimension& dim_,
-+				   BaseGDL::InitType iT):
-+  SpDString(dim_), dd(dim.N_Elements())
-+{
-+  dim.Purge();
-+
-+  if( iT == BaseGDL::INDGEN)
-+    throw GDLException("DStringGDL(dim,InitType=INDGEN) called.");
-+}
-+template<> Data_<SpDPtr>::Data_(const dimension& dim_,
-+				BaseGDL::InitType iT):
-+  SpDPtr(dim_), dd(dim.N_Elements())
-+{
-+  dim.Purge();
-+
-+  if( iT == BaseGDL::INDGEN)
-+    throw GDLException("DPtrGDL(dim,InitType=INDGEN) called.");
-+}
-+template<> Data_<SpDObj>::Data_(const dimension& dim_,
-+				BaseGDL::InitType iT):
-+  SpDObj(dim_), dd(dim.N_Elements())
-+{
-+  dim.Purge();
-+
-+  if( iT == BaseGDL::INDGEN)
-+    throw GDLException("DObjGDL(dim,InitType=INDGEN) called.");
-+}
-+
-+
- // this (ugly) including of other sourcefiles has to be done, because
- // on Mac OS X a template instantiation request (see bottom of file)
- // can only be done once
-@@ -518,36 +555,6 @@
- //   return true;
- // }
- 
--// string, ptr, obj (cannot be INDGEN, 
--// need not to be zeroed if all intialized later)
--// struct (as a separate class) as well
--template<> Data_<SpDString>::Data_(const dimension& dim_,  
--				   BaseGDL::InitType iT): 
--  SpDString(dim_), dd(dim.N_Elements())
--{
--  dim.Purge();
--  
--  if( iT == BaseGDL::INDGEN)
--    throw GDLException("DStringGDL(dim,InitType=INDGEN) called.");
--}
--template<> Data_<SpDPtr>::Data_(const dimension& dim_,  
--				BaseGDL::InitType iT): 
--  SpDPtr(dim_), dd(dim.N_Elements())
--{
--  dim.Purge();
--  
--  if( iT == BaseGDL::INDGEN)
--    throw GDLException("DPtrGDL(dim,InitType=INDGEN) called.");
--}
--template<> Data_<SpDObj>::Data_(const dimension& dim_,  
--				BaseGDL::InitType iT): 
--  SpDObj(dim_), dd(dim.N_Elements())
--{
--  dim.Purge();
--
--  if( iT == BaseGDL::INDGEN)
--    throw GDLException("DObjGDL(dim,InitType=INDGEN) called.");
--}
- 
- template<class Sp>
- const SizeT Data_<Sp>::NBytes() const 
diff --git a/science/gnudatalanguage/pkg-plist b/science/gnudatalanguage/pkg-plist
index ade754fca271..2d2852be55b7 100644
--- a/science/gnudatalanguage/pkg-plist
+++ b/science/gnudatalanguage/pkg-plist
@@ -15,6 +15,8 @@
 %%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/dicom/gdlffdicom_trim.pro
 %%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/dist.pro
 %%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/factorial.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/file_basename.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/file_dirname.pro
 %%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/file_lines.pro
 %%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/filepath.pro
 %%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/findfile.pro