Index: head/science/gnudatalanguage/Makefile
===================================================================
--- head/science/gnudatalanguage/Makefile	(revision 413522)
+++ head/science/gnudatalanguage/Makefile	(revision 413523)
@@ -1,132 +1,133 @@
 # Created by: thierry@pompo.net
 # $FreeBSD$
 
 PORTNAME=	gnudatalanguage
 DISTVERSION=	0.9.6v2
+PORTREVISION=	1
 CATEGORIES=	science lang
 MASTER_SITES=	SF/${PORTNAME}/gdl/${PORTVERSION:R}
 .if defined(BUILD_PYTHON_MODULE)
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 .endif
 DISTNAME=	gdl-${DISTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT?=	GDL, a free IDL compatible incremental compiler
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS+=	libplplot.so:math/plplot	\
 		libpng.so:graphics/png	\
 		libps.so:print/pslib	\
 		libgsl.so:math/gsl
 
 USE_WX=		2.8
 USE_XORG=	x11 sm ice xext
 USES=		cmake:outsource compiler:gcc-c++11-lib dos2unix ncurses pkgconfig readline tar:tgz
 
 # Disable ncurses and readline from ports
 # Disable ImageMagick (does'nt work with plplot because dynamic drivers
 #	are enabled by default)
 # TODO: add a slave port for mpich
 CMAKE_ARGS=	-DREADLINEDIR:STRING="/usr"		\
 		-DNCURSESDIR:STRING="/usr"		\
 		-DMPICH:BOOL=NO				\
 		-DMAGICK:BOOL=NO
 CPPFLAGS+=	${CFLAGS} -fno-inline -DNPY_NO_DEPRECATED_API -DNPY_1_7_API_VERSION
 LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 WRKSRC=		${WRKDIR}/gdl-${PORTVERSION:R}
 
 SLAVEDIRS=	science/py-gnudatalanguage
 
 OPTIONS_DEFINE=	EIGEN EXAMPLES FFTW GRAPHICSMAGICK GRIB HDF5 LIBPROJ4 MPICH2 NETCDF PYTHON UDUNITS
 OPTIONS_DEFAULT=EIGEN EXAMPLES FFTW GRAPHICSMAGICK GRIB HDF5 LIBPROJ4 NETCDF PYTHON UDUNITS
 
 EIGEN_DESC=	Eigen3 support (boost performance)
 EIGEN_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/eigen3.pc:math/eigen3
 EIGEN_CMAKE_ON=		-DEIGEN3:BOOL=YES
 EIGEN_CMAKE_OFF=	-DEIGEN3:BOOL=NO
 
 FFTW_LIB_DEPENDS=	libfftw3.so:math/fftw3		\
 			libfftw3f.so:math/fftw3-float
 FFTW_CMAKE_ON=		-DFFTW:BOOL=YES
 FFTW_CMAKE_OFF=		-DFFTW: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
 
 GRIB_DESC=		Support GRIB messages
 GRIB_LIB_DEPENDS=	libgrib_api.so:science/grib_api
 GRIB_CMAKE_ON=		-DGRIB:BOOL=YES
 GRIB_CMAKE_OFF=		-DGRIB:BOOL=NO
 
 HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 HDF5_CMAKE_ON=		-DHDF5:BOOL=YES
 HDF5_CMAKE_OFF=		-DHDF5:BOOL=NO -DHDF:BOOL=NO
 
 LIBPROJ4_DESC=		Support cartographic processes
 LIBPROJ4_LIB_DEPENDS=	libproj4.so:math/libproj4
 LIBPROJ4_CMAKE_ON=	-DLIBPROJ4:BOOL=YES
 LIBPROJ4_CMAKE_OFF=	-DLIBPROJ4:BOOL=NO
 
 MPICH2_LIB_DEPENDS=	libmpich.so.8:net/mpich2
 MPICH2_CMAKE_ON=	-DMPICH:BOOL=YES
 MPICH2_CMAKE_OFF=	-DMPICH:BOOL=NO
 
 NETCDF_LIB_DEPENDS=	libnetcdf.so:science/netcdf
 NETCDF_CMAKE_ON=	-DNETCDF:BOOL=YES -DHDF:BOOL=NO
 NETCDF_CMAKE_OFF=	-DNETCDF:BOOL=NO
 
 PYTHON_USES=		python
 PYTHON_BUILD_DEPENDS=	${PYNUMPY}
 PYTHON_RUN_DEPENDS=	${PYNUMPY} \
 			${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib
 PYTHON_CMAKE_ON=	-DPYTHON:BOOL=YES -DPYTHONVERSION:STRING="${PYTHON_VER}"
 PYTHON_CMAKE_OFF=	-DPYTHON:BOOL=NO
 
 # math/qhull conflicts with math/plplot
 #QHULL_DESC=		Enable Qhull support
 #QHULL_LIB_DEPENDS=	libqhull.so:math/qhull
 #QHULL_CMAKE_ON=		-DQHULL:BOOL=YES
 #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
 
 .if defined(BUILD_PYTHON_MODULE)
 CATEGORIES+=	python
 CMAKE_ARGS+=	-DPYTHON_MODULE:BOOL=YES -DOPENMP:BOOL=NO
 PLIST=		pkg-plist.pymod
 .else
 CMAKE_ARGS+=	-DPYTHON_MODULE:BOOL=NO
 .endif
 
 .if defined(BUILD_PYTHON_MODULE)
 do-install:
 	${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
 	${INSTALL_DATA} ${INSTALL_WRKSRC}/src/libgdl.so ${STAGEDIR}${PYTHON_SITELIBDIR}/GDL.so
 .endif
 
 .if !defined(BUILD_PYTHON_MODULE)
 post-stage:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/testsuite
 	(cd ${WRKSRC}/testsuite && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}/testsuite/)
 .endif
 
 .if defined(MAINTAINER_MODE)
 regression-test:	install
 . if defined(BUILD_PYTHON_MODULE)
 	@${ECHO_CMD} 'import GDL' > ${WRKDIR}/testgdl.py
 	@${ECHO_CMD} 'print GDL.function("sin",(1,))' >> ${WRKDIR}/testgdl.py
 	${PYTHON_CMD} ${WRKDIR}/testgdl.py
 . else
 	@${ECHO_CMD} ".RUN ${EXAMPLESDIR}/testsuite/test_suite.pro"	\
 		> ${WRKDIR}/testgdl
 	@${ECHO_CMD} "exit" >> ${WRKDIR}/testgdl
 	${PREFIX}/bin/gdl < ${WRKDIR}/testgdl
 . endif
 .endif
 
 .include <bsd.port.mk>
Index: head/science/grib_api/Makefile
===================================================================
--- head/science/grib_api/Makefile	(revision 413522)
+++ head/science/grib_api/Makefile	(revision 413523)
@@ -1,40 +1,42 @@
 # Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	grib_api
-PORTVERSION=	1.13.1
+PORTVERSION=	1.14.7
+DISTVERSIONSUFFIX=	-Source
 CATEGORIES=	science
 MASTER_SITES=	https://software.ecmwf.int/wiki/download/attachments/3473437/ \
 		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	ECMWF API for WMO FM-92 GRIB messages
 
 LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libnetcdf.so:science/netcdf \
 		libpng.so:graphics/png
 
 OPTIONS_SINGLE=	JPEG
 OPTIONS_SINGLE_JPEG=	JASPER OPENJPEG
 OPTIONS_DEFAULT=OPENJPEG
 
 PORTSCOUT=	site:https://software.ecmwf.int/wiki/display/GRIB/Releases
 
 CONFIGURE_ARGS=	--enable-pthread --with-netcdf=${LOCALBASE} --with-png-support
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 USES=		libtool pathfix
 
 PORTDATA=	*
 
 JASPER_CONFIGURE_ON=	--with-jasper=${LOCALBASE}
 JASPER_LIB_DEPENDS=	libjasper.so:graphics/jasper
 OPENJPEG_CONFIGURE_ON=	--with-openjpeg=${LOCALBASE}
 OPENJPEG_LIB_DEPENDS=	libopenjpeg.so:graphics/openjpeg15
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/grib1to2 ${STAGEDIR}${PREFIX}/bin/grib1to2
 
 .include <bsd.port.mk>
Index: head/science/grib_api/distinfo
===================================================================
--- head/science/grib_api/distinfo	(revision 413522)
+++ head/science/grib_api/distinfo	(revision 413523)
@@ -1,2 +1,2 @@
-SHA256 (grib_api-1.13.1.tar.gz) = aa66c4d744f3073b06792c0e6299fcae99aa2a921f8b59a9ccd9056bf26baf5f
-SIZE (grib_api-1.13.1.tar.gz) = 14947384
+SHA256 (grib_api-1.14.7-Source.tar.gz) = a42b9b0bd6bd2364897c13feafd09adba6a52e05866db61d2d7ab5ee0534f1f7
+SIZE (grib_api-1.14.7-Source.tar.gz) = 4540167
Index: head/science/grib_api/files/patch-tools-Makefile.in
===================================================================
--- head/science/grib_api/files/patch-tools-Makefile.in	(revision 413522)
+++ head/science/grib_api/files/patch-tools-Makefile.in	(revision 413523)
@@ -1,15 +1,16 @@
---- tools/Makefile.in.orig	2015-04-02 12:05:41 UTC
+--- tools/Makefile.in.orig	2016-03-16 17:11:30 UTC
 +++ tools/Makefile.in
-@@ -89,10 +89,10 @@ bin_PROGRAMS = grib_keys$(EXEEXT) grib_h
- 	grib_cmp$(EXEEXT) grib_convert$(EXEEXT) grib_distance$(EXEEXT) \
+@@ -90,11 +90,11 @@ bin_PROGRAMS = grib_keys$(EXEEXT) grib_h
  	grib_corruption_check$(EXEEXT) grib_compare$(EXEEXT) \
- 	grib_list_keys$(EXEEXT) parser$(EXEEXT) grib_count$(EXEEXT) \
--	grib_index_build$(EXEEXT) grib1to2$(EXEEXT) \
-+	grib_index_build$(EXEEXT) \
- 	gg_sub_area_check$(EXEEXT) grib_moments$(EXEEXT) \
- 	grib_to_netcdf$(EXEEXT) grib_to_json$(EXEEXT)
--noinst_PROGRAMS = gaussian$(EXEEXT) grib_diff$(EXEEXT) \
-+noinst_PROGRAMS = gaussian$(EXEEXT) grib_diff$(EXEEXT) grib1to2$(EXEEXT) \
- 	mars_request$(EXEEXT) xref$(EXEEXT) all_keys$(EXEEXT)
+ 	grib_list_keys$(EXEEXT) grib_parser$(EXEEXT) \
+ 	grib_count$(EXEEXT) grib_index_build$(EXEEXT) \
+-	grib1to2$(EXEEXT) gg_sub_area_check$(EXEEXT) \
++	gg_sub_area_check$(EXEEXT) \
+ 	grib_moments$(EXEEXT) grib_to_netcdf$(EXEEXT) \
+ 	grib_to_json$(EXEEXT)
+ noinst_PROGRAMS = gaussian$(EXEEXT) grib_diff$(EXEEXT) \
+-	mars_request$(EXEEXT) xref$(EXEEXT) all_keys$(EXEEXT)
++	mars_request$(EXEEXT) xref$(EXEEXT) all_keys$(EXEEXT) grib1to2$(EXEEXT)
  subdir = tools
  DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ 	$(top_srcdir)/config/depcomp $(noinst_HEADERS)
Index: head/science/grib_api/pkg-plist
===================================================================
--- head/science/grib_api/pkg-plist	(revision 413522)
+++ head/science/grib_api/pkg-plist	(revision 413523)
@@ -1,43 +1,44 @@
 bin/big2gribex
 bin/gg_sub_area_check
 bin/grib1to2
 bin/grib2ppm
 bin/grib_add
 bin/grib_cmp
 bin/grib_compare
 bin/grib_convert
 bin/grib_copy
 bin/grib_corruption_check
 bin/grib_count
 bin/grib_debug
 bin/grib_distance
 bin/grib_dump
 bin/grib_error
 bin/grib_filter
 bin/grib_get
 bin/grib_get_data
 bin/grib_histogram
 bin/grib_index_build
 bin/grib_info
 bin/grib_keys
 bin/grib_list_keys
 bin/grib_ls
 bin/grib_moments
 bin/grib_packing
+bin/grib_parser
 bin/grib_repair
 bin/grib_set
 bin/grib_to_json
 bin/grib_to_netcdf
-bin/parser
-bin/points
 bin/tigge_accumulations
 bin/tigge_check
 bin/tigge_name
 bin/tigge_split
 include/grib_api.h
+include/grib_api_version.h
+include/grib_api_windef.h
 lib/libgrib_api.a
 lib/libgrib_api.so
-lib/libgrib_api.so.0
-lib/libgrib_api.so.0.0.0
+lib/libgrib_api.so.1
+lib/libgrib_api.so.1.0.0
 libdata/pkgconfig/grib_api.pc
 libdata/pkgconfig/grib_api_f90.pc