Upgrade the math/PDL port to the latest version 2.1.1. Correctly identify a

couple of LIB_DEPENDS as such, and add a KITCHEN_SINK dependency on the GSL
math libraries.

PR:		19517
Submitted by:	Brian Handy <handy@physics.montana.edu>

6 files changed, 73 insertions, 41 deletions

diff --git a/math/PDL/Makefile b/math/PDL/Makefile
index 21058a1d2604..9df813e058c1 100644
--- a/math/PDL/Makefile
+++ b/math/PDL/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	PDL
-PORTVERSION=	2.005
+PORTVERSION=	2.1.1
 CATEGORIES=	math perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	PDL
@@ -23,7 +23,8 @@ USE_PERL5=	yes
 SCRIPTS_ENV=	PERL=${PERL}
 
 .if defined(KITCHEN_SINK)
-BUILD_DEPENDS+=	fftw.2:${PORTSDIR}/math/fftw
+LIB_DEPENDS+=	fftw.2:${PORTSDIR}/math/fftw \
+		gsl.0:${PORTSDIR}/math/gsl
 RUN_DEPENDS+=	ppmtogif:${PORTSDIR}/graphics/netpbm \
 		mpeg_encode:${PORTSDIR}/graphics/mpeg_encode \
 		saoimage:${PORTSDIR}/astro/saoimage
@@ -45,7 +46,9 @@ BROKEN=	test script t/flexraw.t fails all 26 tests
 MAN1=	PDL::Philosophy.1 PDL::Internals.1 PDL::PP.1 PDL::Tips.1 \
 	PDL::Dataflow.1 PDL::Indexing.1 PDL::FAQ.1 PDL::Delta.1 \
 	PDL::Objects.1 PDL::Impatient.1 pdl.1 perldl.1
-MAN3=	PDL::PP::Dump.3 PDL::PP::Signature.3 PDL::Types.3 PDL::Dbg.3 \
+MAN3=	PDL.3 PDL::Char.3 PDL::Complex.3 PDL::Fit::Gaussian.3 PDL::Func.3 \
+	PDL::Graphics::LUT.3 PDL::LM.3 PDL::Polynomial.3 \
+	PDL::PP::Dump.3 PDL::PP::Signature.3 PDL::Types.3 PDL::Dbg.3 \
 	PDL::Exporter.3 PDL::Core.3 PDL::Basic.3 PDL::Lite.3 PDL::LiteF.3 \
         PDL::Ops.3 PDL::Options.3 PDL::Primitive.3 \
 	PDL::Slices.3 PDL::Tests.3 PDL::Math.3 PDL::AutoLoader.3 \
diff --git a/math/PDL/distinfo b/math/PDL/distinfo
index dbb3c002c0d1..a8d7807d11ce 100644
--- a/math/PDL/distinfo
+++ b/math/PDL/distinfo
@@ -1 +1 @@
-MD5 (PDL-2.005.tar.gz) = c2f5deac7cfcbee17735ea252511e972
+MD5 (PDL-2.1.1.tar.gz) = 06d0c8f900a2948ce85491ccadc10951
diff --git a/math/PDL/files/patch-aa b/math/PDL/files/patch-aa
index 5c9d66f74449..f9bc10c9fabd 100644
--- a/math/PDL/files/patch-aa
+++ b/math/PDL/files/patch-aa
@@ -1,23 +1,23 @@
---- perldl.conf.orig	Tue Apr  4 12:38:33 2000
-+++ perldl.conf	Tue Apr  4 12:39:29 2000
-@@ -14,7 +14,7 @@
- # 0 -> don't use
- # true -> force use
+--- perldl.conf.orig	Sat Apr 22 01:34:00 2000
++++ perldl.conf	Mon Jun 26 01:36:12 2000
+@@ -27,7 +27,7 @@
+ #			define => '',
+ #                     },
  
 -	WITH_POSIX_THREADS => undef,  	
 +	WITH_POSIX_THREADS => 0,
  
  # Try to build Graphics/TriD
  	WITH_3D => undef,
-@@ -22,14 +22,14 @@
+@@ -35,14 +35,14 @@
  #  You can use e.g. '-lMesaGL -lMesaGLU' with the correct -L directory
  #  to use Mesa.
  	OPENGL_LIBS => 
 -             '-L/usr/X11R6/lib -L/usr/lib/mesa -lMesaGL -lMesaGLU -lGL -lGLU -lXext -lX11',
-+             '%%LIBPATH%% -lMesaGL -lMesaGLU -lGL -lGLU -lXext -lX11',
++             '-L/usr/X11R6/lib -lMesaGL -lMesaGLU -lGL -lGLU -lXext -lX11',
  	OPENGL_DEFINE => '',
 - 	OPENGL_INC => '-I/usr/X11R6/include',
-+ 	OPENGL_INC => '%%INCPATH%%',
++ 	OPENGL_INC => '-I/usr/X11R6/include -I/usr/X11R6/include/GL',
  
  
  # Whether or not to build the Karma interface module
@@ -27,3 +27,12 @@
          WHERE_KARMA => undef,   # you may explicitly specify directory location
  	
  # Whether or not to build the PDL::Slatec module
+@@ -61,7 +61,7 @@
+ # Location to search for the GSL libs
+ 	GSL_LIBS => [ '/lib','/usr/lib','/usr/local/lib'],
+ # Location to find GSL includes:
+- 	GSL_INC => '-I/usr/local/include ',
++ 	GSL_INC => '-I/usr/local/include/gsl -I/usr/local/include ',
+ 
+ 
+ # Whether or not to build the PDL::FFTW module
diff --git a/math/PDL/files/patch-ab b/math/PDL/files/patch-ab
new file mode 100644
index 000000000000..717649f1f6ac
--- /dev/null
+++ b/math/PDL/files/patch-ab
@@ -0,0 +1,10 @@
+--- Graphics/TriD/OpenGL/OpenGL.xs	2000/08/22 11:50:22	1.1
++++ Graphics/TriD/OpenGL/OpenGL.xs	2000/08/22 11:50:34
+@@ -5,6 +5,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
++#define GL_GLEXT_LEGACY
+ #include <GL/gl.h>
+ #include <GL/glx.h>
+ #include <GL/glu.h>
diff --git a/math/PDL/pkg-descr b/math/PDL/pkg-descr
index 83290ff53090..aac3a429d9d7 100644
--- a/math/PDL/pkg-descr
+++ b/math/PDL/pkg-descr
@@ -13,4 +13,4 @@ the whole image in a few seconds.
 A simple interactive shell (perldl) is provided for command line use
 together with a module (PDL) for use in perl scripts.
 
-WWW: http://www.aao.gov.au/local/www/kgb/perldl/
+WWW: http://pdl.perl.org/
diff --git a/math/PDL/pkg-plist b/math/PDL/pkg-plist
index a2412837480b..fe6175be0f1f 100644
--- a/math/PDL/pkg-plist
+++ b/math/PDL/pkg-plist
@@ -35,6 +35,7 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/Filter/Linear.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/Fit/Gaussian.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/Fit/LM.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/Fit/Polynomial.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/Func.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/Gaussian.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/Graphics/IIS.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/Graphics/LUT.pm
@@ -131,33 +132,34 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Core.html
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Dataflow.html
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Dbg.html
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Delta.html
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Doc/Perldl.html
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Doc.html
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Doc_Perldl.html
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Exporter.html
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/FAQ.html
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/FFT.html
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Filter_LinPred.html
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Filter_Linear.html
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Fit_Gaussian.html
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Fit_LM.html
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Fit_Polynomial.html
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Filter/LinPred.html
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Filter/Linear.html
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Fit/Gaussian.html
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Fit/LM.html
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Fit/Polynomial.html
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Func.html
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Gaussian.html
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Graphics_IIS.html
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Graphics_LUT.html
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Graphics_OpenGLQ.html
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Graphics_PGPLOT.html
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Graphics_TriD.html
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Graphics_TriD_MathGraph.html
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Graphics_TriD_Rout.html
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Graphics_TriD_Tk.html
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Graphics_TriD_VRML.html
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/IO_Browser.html
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/IO_FastRaw.html
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/IO_FlexRaw.html
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/IO_Misc.html
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/IO_NDF.html
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/IO_Pic.html
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/IO_Pnm.html
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Graphics/IIS.html
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Graphics/LUT.html
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Graphics/OpenGLQ.html
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Graphics/PGPLOT.html
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Graphics/TriD.html
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Graphics/TriD/MathGraph.html
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Graphics/TriD/Rout.html
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Graphics/TriD/Tk.html
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Graphics/TriD/VRML.html
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/IO/Browser.html
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/IO/FastRaw.html
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/IO/FlexRaw.html
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/IO/Misc.html
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/IO/NDF.html
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/IO/Pic.html
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/IO/Pnm.html
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Image2D.html
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/ImageND.html
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/ImageRGB.html
@@ -171,22 +173,22 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/LiteF.html
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Math.html
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Objects.html
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Ops.html
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Opt_Simplex.html
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Opt/Simplex.html
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Options.html
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/PDL.html
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/PP.html
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Philosophy.html
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Pod_Parser.html
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Pod_Select.html
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Pod_Usage.html
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Pod/Parser.html
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Pod/Select.html
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Pod/Usage.html
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Primitive.html
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Slatec.html
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Slices.html
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Tests.html
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Tips.html
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Types.html
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/pod2html-dircache
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/pod2html-itemcache
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/pod2htmd.x~~
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/pod2htmi.x~~
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/IO/Browser.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/IO/FastRaw.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/IO/FlexRaw.pm
@@ -310,6 +312,14 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/PDL/Tests/Tests.so
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/PP
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/Opt
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/IO
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Pod
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Opt
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/IO
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Graphics/TriD
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Graphics
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Fit
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Filter
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL/Doc
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs/PDL
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/HtmlDocs
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/PDL/Graphics/VRML