3 files changed, 144 insertions, 10 deletions

diff --git a/science/cgnslib/Makefile b/science/cgnslib/Makefile
index b7b3c9a34a68..3715f7868365 100644
--- a/science/cgnslib/Makefile
+++ b/science/cgnslib/Makefile
@@ -2,9 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	cgnslib
-DISTVERSION=	3.1.4-2
+DISTVERSION=	3.1.4
+PORTEPOCH=	1
 CATEGORIES=	science
-MASTER_SITES=	SF/cgns/${PORTNAME}_${PORTVERSION:R:R}/
+MASTER_SITES=	SF/cgns/${PORTNAME}_${PORTVERSION:R}/
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
@@ -60,8 +61,7 @@ PLIST_SUB=	TOOLS=""
 PLIST_SUB=	TOOLS="@comment "
 .endif
 
-WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION:R}
-LIBVER=		${PORTVERSION:R:R}
+LIBVER=		${PORTVERSION:R}
 
 .if ${PORT_OPTIONS:MTESTS}
 regression-test:
diff --git a/science/cgnslib/distinfo b/science/cgnslib/distinfo
index f9fb86a54981..078831d2144b 100644
--- a/science/cgnslib/distinfo
+++ b/science/cgnslib/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cgnslib_3.1.4-2.tar.gz) = 327216275ce11e1cbe13b5b6c81ff53c44b24b93f829099233eae103e75be433
-SIZE (cgnslib_3.1.4-2.tar.gz) = 876039
+SHA256 (cgnslib_3.1.4.tar.gz) = c07a84bc780da0ea28446ad25e8af6e6b7999fd9cb053ec2de24678001b8b932
+SIZE (cgnslib_3.1.4.tar.gz) = 1589501
diff --git a/science/cgnslib/pkg-plist b/science/cgnslib/pkg-plist
index eab6ef951a83..940b0b40283a 100644
--- a/science/cgnslib/pkg-plist
+++ b/science/cgnslib/pkg-plist
@@ -23,19 +23,18 @@ bin/cgnsplot
 %%TOOLS%%bin/cgnstools/plot3d_to_cgns
 %%TOOLS%%bin/cgnstools/plotwish
 %%TOOLS%%bin/cgnstools/tecplot_to_cgns
-bin/cgnsreplace
 bin/cgnsupdate
 bin/cgnsversion
 bin/cgnsview
 bin/hdf2adf
 bin/unitconv
 include/cgnsBuild.defs
+include/cgns_io.h
 include/cgnslib.h
-include/cgnswin_f.h
 include/cgnslib_f.h
-include/cgns_io.h
 include/cgnstypes.h
 include/cgnstypes_f.h
+include/cgnswin_f.h
 lib/libcgns.a
 lib/libcgns.so
 lib/libcgns.so.3
@@ -71,6 +70,134 @@ lib/libcgns.so.3.1
 %%TOOLS%%share/cgnstools/findfile.tcl
 %%TOOLS%%share/cgnstools/frame.tcl
 %%TOOLS%%share/cgnstools/help.tcl
+%%TOOLS%%share/cgnstools/help/cgnsplot/base.html
+%%TOOLS%%share/cgnstools/help/cgnsplot/cgnsplot.html
+%%TOOLS%%share/cgnstools/help/cgnsplot/cutting.html
+%%TOOLS%%share/cgnstools/help/cgnsplot/defaults.html
+%%TOOLS%%share/cgnstools/help/cgnsplot/display.html
+%%TOOLS%%share/cgnstools/help/cgnsplot/graphics.html
+%%TOOLS%%share/cgnstools/help/cgnsplot/help.html
+%%TOOLS%%share/cgnstools/help/cgnsplot/images/axes_but.gif
+%%TOOLS%%share/cgnstools/help/cgnsplot/images/backface_but.gif
+%%TOOLS%%share/cgnstools/help/cgnsplot/images/base_sel.gif
+%%TOOLS%%share/cgnstools/help/cgnsplot/images/center_but.gif
+%%TOOLS%%share/cgnstools/help/cgnsplot/images/cgnsplot.gif
+%%TOOLS%%share/cgnstools/help/cgnsplot/images/cutplane.gif
+%%TOOLS%%share/cgnstools/help/cgnsplot/images/cutting_but.gif
+%%TOOLS%%share/cgnstools/help/cgnsplot/images/cutview.gif
+%%TOOLS%%share/cgnstools/help/cgnsplot/images/display_menu.gif
+%%TOOLS%%share/cgnstools/help/cgnsplot/images/error.gif
+%%TOOLS%%share/cgnstools/help/cgnsplot/images/file_menu.gif
+%%TOOLS%%share/cgnstools/help/cgnsplot/images/graphics.gif
+%%TOOLS%%share/cgnstools/help/cgnsplot/images/help.gif
+%%TOOLS%%share/cgnstools/help/cgnsplot/images/help_but.gif
+%%TOOLS%%share/cgnstools/help/cgnsplot/images/help_menu.gif
+%%TOOLS%%share/cgnstools/help/cgnsplot/images/lighting_but.gif
+%%TOOLS%%share/cgnstools/help/cgnsplot/images/open_but.gif
+%%TOOLS%%share/cgnstools/help/cgnsplot/images/options_menu.gif
+%%TOOLS%%share/cgnstools/help/cgnsplot/images/perspective.gif
+%%TOOLS%%share/cgnstools/help/cgnsplot/images/perspective_but.gif
+%%TOOLS%%share/cgnstools/help/cgnsplot/images/popup.gif
+%%TOOLS%%share/cgnstools/help/cgnsplot/images/region_info.gif
+%%TOOLS%%share/cgnstools/help/cgnsplot/images/reset_but.gif
+%%TOOLS%%share/cgnstools/help/cgnsplot/images/separator.gif
+%%TOOLS%%share/cgnstools/help/cgnsplot/images/setup.gif
+%%TOOLS%%share/cgnstools/help/cgnsplot/images/setup_but.gif
+%%TOOLS%%share/cgnstools/help/cgnsplot/images/status.gif
+%%TOOLS%%share/cgnstools/help/cgnsplot/images/tree.gif
+%%TOOLS%%share/cgnstools/help/cgnsplot/menu.html
+%%TOOLS%%share/cgnstools/help/cgnsplot/perspective.html
+%%TOOLS%%share/cgnstools/help/cgnsplot/separator.html
+%%TOOLS%%share/cgnstools/help/cgnsplot/status.html
+%%TOOLS%%share/cgnstools/help/cgnsplot/toolbar.html
+%%TOOLS%%share/cgnstools/help/cgnsview/buttons.html
+%%TOOLS%%share/cgnstools/help/cgnsview/cgnsnodes.html
+%%TOOLS%%share/cgnstools/help/cgnsview/cgnsview.html
+%%TOOLS%%share/cgnstools/help/cgnsview/customize.html
+%%TOOLS%%share/cgnstools/help/cgnsview/datadesc.html
+%%TOOLS%%share/cgnstools/help/cgnsview/dialogs.html
+%%TOOLS%%share/cgnstools/help/cgnsview/images/autosize_dialog.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/calc.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/cgnsview.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/check.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/check_dialog.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/clear_but.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/collapse.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/command.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/config_menu.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/convert.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/create_but.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/custom_menu.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/datadesc.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/datasize.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/delete_but.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/expand.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/export.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/file-link.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/file.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/file_menu.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/fileinfo_dialog.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/find.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/find_dialog.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/findagain.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/folder-link.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/folder.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/follow.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/help.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/help_menu.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/helpsetup_dialog.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/import.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/invalid.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/linkdesc.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/linknode_dialog.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/modify_but.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/new.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/nodedata.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/nodedesc.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/nodeinfo.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/noderef.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/nodetree.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/open.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/plot.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/popup.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/properties.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/question-link.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/question.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/read_but.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/refresh.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/save.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/separator.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/tools_menu.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/tree_menu.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/unitconv.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/units.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/update.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/utility.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/images/version_dialog.gif
+%%TOOLS%%share/cgnstools/help/cgnsview/linkdesc.html
+%%TOOLS%%share/cgnstools/help/cgnsview/menu.html
+%%TOOLS%%share/cgnstools/help/cgnsview/nodedata.html
+%%TOOLS%%share/cgnstools/help/cgnsview/nodedesc.html
+%%TOOLS%%share/cgnstools/help/cgnsview/nodetree.html
+%%TOOLS%%share/cgnstools/help/cgnsview/separator.html
+%%TOOLS%%share/cgnstools/help/cgnsview/toolbar.html
+%%TOOLS%%share/cgnstools/help/cgnsview/unitconv.html
+%%TOOLS%%share/cgnstools/help/utilities/convert.html
+%%TOOLS%%share/cgnstools/help/utilities/export.html
+%%TOOLS%%share/cgnstools/help/utilities/images/dimensionalization.gif
+%%TOOLS%%share/cgnstools/help/utilities/images/export_plot3d.gif
+%%TOOLS%%share/cgnstools/help/utilities/images/export_tecplot.gif
+%%TOOLS%%share/cgnstools/help/utilities/images/extract_subset.gif
+%%TOOLS%%share/cgnstools/help/utilities/images/import_patran.gif
+%%TOOLS%%share/cgnstools/help/utilities/images/import_plot3d.gif
+%%TOOLS%%share/cgnstools/help/utilities/images/import_tecplot.gif
+%%TOOLS%%share/cgnstools/help/utilities/images/import_user.gif
+%%TOOLS%%share/cgnstools/help/utilities/images/interpolate_solution.gif
+%%TOOLS%%share/cgnstools/help/utilities/images/solution_location.gif
+%%TOOLS%%share/cgnstools/help/utilities/images/solution_variables.gif
+%%TOOLS%%share/cgnstools/help/utilities/import.html
+%%TOOLS%%share/cgnstools/help/utilities/subset.html
+%%TOOLS%%share/cgnstools/help/utilities/utilities.html
 %%TOOLS%%share/cgnstools/import.tcl
 %%TOOLS%%share/cgnstools/menubar.tcl
 %%TOOLS%%share/cgnstools/patran.tcl
@@ -90,5 +217,12 @@ lib/libcgns.so.3.1
 %%TOOLS%%share/cgnstools/util.tcl
 %%TOOLS%%share/cgnstools/utilities.mnu
 %%TOOLS%%share/cgnstools/vtk.tcl
-%%TOOLS%%@dirrm bin/cgnstools
+%%TOOLS%%@dirrm share/cgnstools/help/cgnsview/images
+%%TOOLS%%@dirrm share/cgnstools/help/cgnsview
+%%TOOLS%%@dirrm share/cgnstools/help/utilities/images
+%%TOOLS%%@dirrm share/cgnstools/help/utilities
+%%TOOLS%%@dirrm share/cgnstools/help/cgnsplot/images
+%%TOOLS%%@dirrm share/cgnstools/help/cgnsplot
+%%TOOLS%%@dirrm share/cgnstools/help
 %%TOOLS%%@dirrm share/cgnstools
+%%TOOLS%%@dirrm bin/cgnstools