git: 2a4f51a41672 - main - science/gnudatalanguage: upgrade to v1.0.1

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Thierry Thomas <thierry_at_FreeBSD.org>
Date: Wed, 20 Oct 2021 18:19:20 UTC
The branch main has been updated by thierry:

URL: https://cgit.FreeBSD.org/ports/commit/?id=2a4f51a41672715a5e8d2edd172f4966a73ea6a9

commit 2a4f51a41672715a5e8d2edd172f4966a73ea6a9
Author:     Thierry Thomas <thierry@FreeBSD.org>
AuthorDate: 2021-10-20 18:15:52 +0000
Commit:     Thierry Thomas <thierry@FreeBSD.org>
CommitDate: 2021-10-20 18:19:14 +0000

    science/gnudatalanguage: upgrade to v1.0.1
    
    - Release notes at
      <https://github.com/gnudatalanguage/gdl/releases/tag/v1.0.1>
    
    - Switch back to GraphicsMagick (preferred by upstream).
---
 science/gnudatalanguage/Makefile  | 33 +++++++++--------
 science/gnudatalanguage/distinfo  |  6 ++--
 science/gnudatalanguage/pkg-plist | 76 +++++++++++++++++++++------------------
 3 files changed, 60 insertions(+), 55 deletions(-)

diff --git a/science/gnudatalanguage/Makefile b/science/gnudatalanguage/Makefile
index c0d5fa8fb459..9b87359c0a22 100644
--- a/science/gnudatalanguage/Makefile
+++ b/science/gnudatalanguage/Makefile
@@ -1,9 +1,8 @@
 # Created by: thierry@pompo.net
 
 PORTNAME=	gnudatalanguage
-PORTVERSION=	1.0.0
+PORTVERSION=	1.0.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	5
 CATEGORIES=	science lang
 .if defined(BUILD_PYTHON_MODULE)
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -47,11 +46,11 @@ TEST_TARGET=	test
 
 SLAVEDIRS=	science/py-gnudatalanguage
 
-# Upstream prefer GraphicsMagick over ImageMackick but ATM it fails
+# Upstream prefer GraphicsMagick over ImageMackick
 # see https://github.com/gnudatalanguage/gdl/issues/611
 # and https://github.com/gnudatalanguage/gdl/issues/1044 for ImageMagick 7
-OPTIONS_DEFINE=	EIGEN EXAMPLES FFTW GLPK IMAGEMAGICK GRIB HDF5 LIBPROJ4 MPI NETCDF PYTHON UDUNITS
-OPTIONS_DEFAULT=EIGEN FFTW GLPK IMAGEMAGICK GRIB HDF5 LIBPROJ4 NETCDF PYTHON UDUNITS
+OPTIONS_DEFINE=	EIGEN EXAMPLES FFTW GLPK GRAPHICSMAGICK GRIB HDF5 LIBPROJ4 MPI NETCDF PYTHON UDUNITS
+OPTIONS_DEFAULT=EIGEN FFTW GLPK GRAPHICSMAGICK GRIB HDF5 LIBPROJ4 NETCDF PYTHON UDUNITS
 
 EIGEN_DESC=		Eigen3 support (boost performance)
 EIGEN_USES=		eigen:3
@@ -68,15 +67,15 @@ GLPK_LIB_DEPENDS=	libglpk.so:math/glpk
 GLPK_CMAKE_ON=		-DGLPK=ON:BOOL=YES
 GLPK_CMAKE_OFF=		-DGLPK=OFF:BOOL=NO
 
+GRAPHICSMAGICK_DESC=		Support GraphicsMagick
+GRAPHICSMAGICK_LIB_DEPENDS=	libGraphicsMagick.so:graphics/GraphicsMagick
+GRAPHICSMAGICK_CMAKE_ON=	-DGRAPHICSMAGICK:BOOL=YES
+GRAPHICSMAGICK_CMAKE_OFF=	-DGRAPHICSMAGICK:BOOL=NO
 # Temporary swith to ImageMagick
-#GRAPHICSMAGICK_DESC=		Support GraphicsMagick
-#GRAPHICSMAGICK_LIB_DEPENDS=	libGraphicsMagick.so:graphics/GraphicsMagick
-#GRAPHICSMAGICK_CMAKE_ON=	-DGRAPHICSMAGICK:BOOL=YES
-#GRAPHICSMAGICK_CMAKE_OFF=	-DGRAPHICSMAGICK:BOOL=NO
-IMAGEMAGICK_DESC=	Support ImageMagick
-IMAGEMAGICK_LIB_DEPENDS=libMagick++-6.so:graphics/ImageMagick6
-IMAGEMAGICK_CMAKE_ON=	-DGRAPHICSMAGICK:BOOL=NO -DMAGICK:BOOL=YES -DMAGICKDIR=${LOCALBASE}
-IMAGEMAGICK_CMAKE_OFF=	-DMAGICK:BOOL=NO
+#IMAGEMAGICK_DESC=	Support ImageMagick
+#IMAGEMAGICK_LIB_DEPENDS=libMagick++-7.so:graphics/ImageMagick7
+#IMAGEMAGICK_CMAKE_ON=	-DGRAPHICSMAGICK:BOOL=NO -DMAGICK:BOOL=YES -DMAGICKDIR=${LOCALBASE}
+#IMAGEMAGICK_CMAKE_OFF=	-DMAGICK:BOOL=NO
 
 GRIB_DESC=		Support GRIB messages
 GRIB_LIB_DEPENDS=	libeccodes.so:science/eccodes
@@ -89,8 +88,8 @@ HDF5_CMAKE_OFF=		-DHDF5:BOOL=NO -DHDF:BOOL=NO
 
 LIBPROJ4_DESC=		Support cartographic processes
 LIBPROJ4_LIB_DEPENDS=	libproj.so:graphics/proj
-LIBPROJ4_CMAKE_ON=	-DLIBPROJ4:BOOL=YES
-LIBPROJ4_CMAKE_OFF=	-DLIBPROJ4:BOOL=NO
+LIBPROJ4_CMAKE_ON=	-DLIBPROJ:BOOL=YES
+LIBPROJ4_CMAKE_OFF=	-DLIBPROJ:BOOL=NO
 
 MPI_LIB_DEPENDS=	libmpich.so:net/mpich
 MPI_CMAKE_ON=		-DMPI:BOOL=ON
@@ -114,8 +113,8 @@ PYTHON_CMAKE_OFF=	-DPYTHON:BOOL=NO
 #QHULL_CMAKE_OFF=	-DQHULL:BOOL=NO
 
 UDUNITS_LIB_DEPENDS=	libudunits2.so:science/udunits
-UDUNITS_CMAKE_ON=	-DUDUNITS:BOOL=YES
-UDUNITS_CMAKE_OFF=	-DUDUNITS:BOOL=NO
+UDUNITS_CMAKE_ON=	-DUDUNITS2:BOOL=YES
+UDUNITS_CMAKE_OFF=	-DUDUNITS2:BOOL=NO
 
 .if defined(BUILD_PYTHON_MODULE)
 CATEGORIES+=	python
diff --git a/science/gnudatalanguage/distinfo b/science/gnudatalanguage/distinfo
index 5c408956636c..b5225abcf4cb 100644
--- a/science/gnudatalanguage/distinfo
+++ b/science/gnudatalanguage/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1628872407
-SHA256 (gnudatalanguage-gdl-v1.0.0_GH0.tar.gz) = 24bb2ccb5f6696ad535ec48c488a6daa1400b74e24a3ff421f9f070887636031
-SIZE (gnudatalanguage-gdl-v1.0.0_GH0.tar.gz) = 32757673
+TIMESTAMP = 1634750665
+SHA256 (gnudatalanguage-gdl-v1.0.1_GH0.tar.gz) = eb055abfc096b4075ff195c2d347fab3343665de71bae374489e17ebca60474a
+SIZE (gnudatalanguage-gdl-v1.0.1_GH0.tar.gz) = 32775655
diff --git a/science/gnudatalanguage/pkg-plist b/science/gnudatalanguage/pkg-plist
index 15ff136c9335..3f44d4a6d1a2 100644
--- a/science/gnudatalanguage/pkg-plist
+++ b/science/gnudatalanguage/pkg-plist
@@ -1,13 +1,8 @@
 bin/gdl
 man/man1/gdl.1.gz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/CMakeLists.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/LIST
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/Saturn.jpg
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/banner_for_testsuite.pro
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/benchmark/README.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/benchmark/basic_benchmarks.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/benchmark/basic_benchmarks_by_type.pro
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/benchmark/basic_benchmarks.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/benchmark/bench_fft.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/benchmark/bench_matrix_invert.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/benchmark/bench_matrix_multiply.pro
@@ -26,11 +21,13 @@ man/man1/gdl.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/benchmark/plot_all_benchmark.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/benchmark/plot_basic_benchmarks.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/benchmark/print_basic_benchmarks.pro
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/benchmark/README.txt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/benchmark/run_all_benchmark.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/byte_array.h5
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/check_if_device_is_ok.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/check_save_restore.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/cmake_install.cmake
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/CMakeLists.txt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/cw_bgroup_broken.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/decomposed_return_values.sav
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/delvarrnew.pp.pro
@@ -62,6 +59,7 @@ man/man1/gdl.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/interactive_tests/test_all_projs.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/interactive_tests/test_axis.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/interactive_tests/test_besel.pro
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/interactive_tests/test_bg.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/interactive_tests/test_bug_2974380.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/interactive_tests/test_bug_3104326.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/interactive_tests/test_bug_3275334.pro
@@ -88,13 +86,16 @@ man/man1/gdl.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/interactive_tests/test_titles.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/interactive_tests/test_widgets.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/libtest_ce.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/LIST
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/make_test_delvarrnew.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/nc_test.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/ob_xml_to_struct__define.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/obxml.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/python/test-GDL.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/rnewtest.pp.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/rnewtest.pro
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/Saturn.jpg
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/spawn_is_dangerous/image_test.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/spawn_is_dangerous/test_bug_2876161.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/spawn_is_dangerous/test_bug_3104209.pro
@@ -111,9 +112,6 @@ man/man1/gdl.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/spawn_is_dangerous/test_step.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/spawn_is_dangerous/test_zip.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/string.h5
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test-read_ascii.pro
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test-read_ascii.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test-swap_endian.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_ac_correlate.pro.txt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_angles.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_arg_present.pro
@@ -186,10 +184,10 @@ man/man1/gdl.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_byte_conversion.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bytscl.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_call_external.pro
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_call_function.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_call_function_extra.pro
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_call_procedure.pro
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_call_function.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_call_procedure_extra.pro
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_call_procedure.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_check_math.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_chisqr_cvf.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_cir_3pnt.pro
@@ -213,9 +211,9 @@ man/man1/gdl.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_expint.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_extra_keywords.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_factorial.pro
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_fft.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_fft_dim.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_fft_leak.pro
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_fft.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_file_basename.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_file_copy.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_file_dirname.pro
@@ -229,8 +227,8 @@ man/man1/gdl.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_fix.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_fixprint.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_float2string.pro
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_formats.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_formats_random_input.sav
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_formats.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_fx_root.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_fz_roots.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_gammas.pro
@@ -249,8 +247,8 @@ man/man1/gdl.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_hist_2d.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_hist_equal.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_histo.pro
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_idl8.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_idl_validname.pro
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_idl8.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_idlneturl.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_image_statistics.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_indgen.pro
@@ -305,8 +303,8 @@ man/man1/gdl.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_plot_usersym.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_plotting_ranges.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_pmulti.pro
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_poly2d.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_poly_fit.pro
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_poly2d.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_polywarp.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_postscript.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_powell.pro
@@ -329,8 +327,8 @@ man/man1/gdl.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_routine_name.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_routine_names.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_same_name.pro
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_save.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_save_restore.pro
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_save.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_scope_varfetch.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_scope_varname.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_simplex.pro
@@ -338,8 +336,8 @@ man/man1/gdl.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_smooth.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_sort.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_spher_harm.pro
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_spl.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_spl_init.pro
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_spl.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_standardize.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_str_functions.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_str_sep.pro
@@ -368,11 +366,14 @@ man/man1/gdl.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_wavelet.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_where.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_window_background.pro
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_wordexp.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_wordexp_null_string.pro
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_wordexp.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_xdr.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_xmlsax.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_zeropoly.pro
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test-read_ascii.pro
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test-read_ascii.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test-swap_endian.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/tiff/24bit_color.tif
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/tiff/24bit_color.txt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/tiff/8bit_gray_geo.tif
@@ -383,11 +384,6 @@ man/man1/gdl.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/wrong/test_sem.pro
 %%DATADIR%%/AUTHORS
 %%DATADIR%%/README
-%%DATADIR%%/lib/CMprocedures/mpcurvefit.pro
-%%DATADIR%%/lib/CMprocedures/mpfit.pro
-%%DATADIR%%/lib/CMprocedures/mpfit2dpeak.pro
-%%DATADIR%%/lib/CMprocedures/mpfitfun.pro
-%%DATADIR%%/lib/CMprocedures/mpfitpeak.pro
 %%DATADIR%%/lib/a_correlate.pro
 %%DATADIR%%/lib/appleman.pro
 %%DATADIR%%/lib/array_indices.pro
@@ -396,14 +392,20 @@ man/man1/gdl.1.gz
 %%DATADIR%%/lib/calendar.pro
 %%DATADIR%%/lib/chisqr_cvf.pro
 %%DATADIR%%/lib/cir_3pnt.pro
+%%DATADIR%%/lib/CMprocedures/mpcurvefit.pro
+%%DATADIR%%/lib/CMprocedures/mpfit.pro
+%%DATADIR%%/lib/CMprocedures/mpfit2dpeak.pro
+%%DATADIR%%/lib/CMprocedures/mpfitfun.pro
+%%DATADIR%%/lib/CMprocedures/mpfitpeak.pro
 %%DATADIR%%/lib/color_quan.pro
 %%DATADIR%%/lib/congrid.pro
 %%DATADIR%%/lib/correlate.pro
 %%DATADIR%%/lib/curvefit.pro
 %%DATADIR%%/lib/cvttobm.pro
 %%DATADIR%%/lib/cw_bgroup_donotuseyet.pro
-%%DATADIR%%/lib/define_msgblk.pro
+%%DATADIR%%/lib/cw_bgroup.pro
 %%DATADIR%%/lib/define_msgblk_from_file.pro
+%%DATADIR%%/lib/define_msgblk.pro
 %%DATADIR%%/lib/delvar.pro
 %%DATADIR%%/lib/deriv.pro
 %%DATADIR%%/lib/diag_matrix.pro
@@ -437,13 +439,15 @@ man/man1/gdl.1.gz
 %%DATADIR%%/lib/gdl_multimin_fdf.pro
 %%DATADIR%%/lib/get_login_info.pro
 %%DATADIR%%/lib/hanning.pro
+%%DATADIR%%/lib/heap_nosave.pro
+%%DATADIR%%/lib/heap_save.pro
 %%DATADIR%%/lib/helpform.pro
 %%DATADIR%%/lib/hist_2d.pro
 %%DATADIR%%/lib/hist_equal.pro
 %%DATADIR%%/lib/hist_nd.pro
 %%DATADIR%%/lib/identity.pro
-%%DATADIR%%/lib/idl_container.pro
 %%DATADIR%%/lib/idl_container__define.pro
+%%DATADIR%%/lib/idl_container.pro
 %%DATADIR%%/lib/idl_object.pro
 %%DATADIR%%/lib/idl_validname.pro
 %%DATADIR%%/lib/image_statistics.pro
@@ -546,9 +550,9 @@ man/man1/gdl.1.gz
 %%DATADIR%%/lib/online_help.pro
 %%DATADIR%%/lib/oploterr.pro
 %%DATADIR%%/lib/ploterr.pro
-%%DATADIR%%/lib/poly.pro
 %%DATADIR%%/lib/poly_area.pro
 %%DATADIR%%/lib/poly_fit.pro
+%%DATADIR%%/lib/poly.pro
 %%DATADIR%%/lib/polyfillv.pro
 %%DATADIR%%/lib/polywarp.pro
 %%DATADIR%%/lib/popd.pro
@@ -579,6 +583,7 @@ man/man1/gdl.1.gz
 %%DATADIR%%/lib/read_jpeg2000.pro
 %%DATADIR%%/lib/read_pict.pro
 %%DATADIR%%/lib/read_png.pro
+%%DATADIR%%/lib/read_ppm.pro
 %%DATADIR%%/lib/read_tiff.pro
 %%DATADIR%%/lib/read_x11_bitmap.pro
 %%DATADIR%%/lib/read_xwd.pro
@@ -594,10 +599,10 @@ man/man1/gdl.1.gz
 %%DATADIR%%/lib/strmatch.pro
 %%DATADIR%%/lib/strsplit.pro
 %%DATADIR%%/lib/svsol.pro
-%%DATADIR%%/lib/swap_endian.pro
 %%DATADIR%%/lib/swap_endian_inplace.pro
-%%DATADIR%%/lib/template.pro
+%%DATADIR%%/lib/swap_endian.pro
 %%DATADIR%%/lib/template_blank.pro
+%%DATADIR%%/lib/template.pro
 %%DATADIR%%/lib/tic.pro
 %%DATADIR%%/lib/toc.pro
 %%DATADIR%%/lib/trace.pro
@@ -629,6 +634,7 @@ man/man1/gdl.1.gz
 %%DATADIR%%/lib/write_jpeg.pro
 %%DATADIR%%/lib/write_pict.pro
 %%DATADIR%%/lib/write_png.pro
+%%DATADIR%%/lib/write_ppm.pro
 %%DATADIR%%/lib/write_tiff.pro
 %%DATADIR%%/lib/xdisplayfile.pro
 %%DATADIR%%/lib/xmanager.pro
@@ -636,7 +642,6 @@ man/man1/gdl.1.gz
 %%DATADIR%%/resource/gdl.ico
 %%DATADIR%%/resource/gdl.png
 %%DATADIR%%/resource/maps/COPYRIGHTS
-%%DATADIR%%/resource/maps/README
 %%DATADIR%%/resource/maps/earth.jpg
 %%DATADIR%%/resource/maps/high/continents_med.dbf
 %%DATADIR%%/resource/maps/high/continents_med.shp
@@ -644,12 +649,12 @@ man/man1/gdl.1.gz
 %%DATADIR%%/resource/maps/high/ne_10m_admin_0_boundary_lines_land.dbf
 %%DATADIR%%/resource/maps/high/ne_10m_admin_0_boundary_lines_land.shp
 %%DATADIR%%/resource/maps/high/ne_10m_admin_0_boundary_lines_land.shx
-%%DATADIR%%/resource/maps/high/ne_10m_admin_1_states_provinces.dbf
-%%DATADIR%%/resource/maps/high/ne_10m_admin_1_states_provinces.shp
-%%DATADIR%%/resource/maps/high/ne_10m_admin_1_states_provinces.shx
 %%DATADIR%%/resource/maps/high/ne_10m_admin_1_states_provinces_lines.dbf
 %%DATADIR%%/resource/maps/high/ne_10m_admin_1_states_provinces_lines.shp
 %%DATADIR%%/resource/maps/high/ne_10m_admin_1_states_provinces_lines.shx
+%%DATADIR%%/resource/maps/high/ne_10m_admin_1_states_provinces.dbf
+%%DATADIR%%/resource/maps/high/ne_10m_admin_1_states_provinces.shp
+%%DATADIR%%/resource/maps/high/ne_10m_admin_1_states_provinces.shx
 %%DATADIR%%/resource/maps/high/ne_10m_lakes.dbf
 %%DATADIR%%/resource/maps/high/ne_10m_lakes.shp
 %%DATADIR%%/resource/maps/high/ne_10m_lakes.shx
@@ -662,12 +667,12 @@ man/man1/gdl.1.gz
 %%DATADIR%%/resource/maps/low/ne_110m_admin_0_boundary_lines_land.dbf
 %%DATADIR%%/resource/maps/low/ne_110m_admin_0_boundary_lines_land.shp
 %%DATADIR%%/resource/maps/low/ne_110m_admin_0_boundary_lines_land.shx
-%%DATADIR%%/resource/maps/low/ne_110m_admin_1_states_provinces.dbf
-%%DATADIR%%/resource/maps/low/ne_110m_admin_1_states_provinces.shp
-%%DATADIR%%/resource/maps/low/ne_110m_admin_1_states_provinces.shx
 %%DATADIR%%/resource/maps/low/ne_110m_admin_1_states_provinces_lines.dbf
 %%DATADIR%%/resource/maps/low/ne_110m_admin_1_states_provinces_lines.shp
 %%DATADIR%%/resource/maps/low/ne_110m_admin_1_states_provinces_lines.shx
+%%DATADIR%%/resource/maps/low/ne_110m_admin_1_states_provinces.dbf
+%%DATADIR%%/resource/maps/low/ne_110m_admin_1_states_provinces.shp
+%%DATADIR%%/resource/maps/low/ne_110m_admin_1_states_provinces.shx
 %%DATADIR%%/resource/maps/low/ne_110m_lakes.dbf
 %%DATADIR%%/resource/maps/low/ne_110m_lakes.shp
 %%DATADIR%%/resource/maps/low/ne_110m_lakes.shx
@@ -676,3 +681,4 @@ man/man1/gdl.1.gz
 %%DATADIR%%/resource/maps/low/ne_50m_rivers_lake_centerlines.shx
 %%DATADIR%%/resource/maps/projDefinitions.sav
 %%DATADIR%%/resource/maps/projections.ods
+%%DATADIR%%/resource/maps/README