3 files changed, 16 insertions, 8 deletions

diff --git a/science/gwyddion/Makefile b/science/gwyddion/Makefile
index 9615baed5b8c..c8b9929b7594 100644
--- a/science/gwyddion/Makefile
+++ b/science/gwyddion/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gwyddion
-PORTVERSION=	2.2
+PORTVERSION=	2.3
 CATEGORIES=	science graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/science/gwyddion/distinfo b/science/gwyddion/distinfo
index 323e0987800a..2a38cf2ce7be 100644
--- a/science/gwyddion/distinfo
+++ b/science/gwyddion/distinfo
@@ -1,3 +1,3 @@
-MD5 (gwyddion-2.2.tar.bz2) = 46c07e478a83fe8dcf56e9968d4aec33
-SHA256 (gwyddion-2.2.tar.bz2) = 9ff1db8c8093ac80e432cf83b2493af4544e0f9f63faa1cddbb0c4ffe1e7421e
-SIZE (gwyddion-2.2.tar.bz2) = 2016874
+MD5 (gwyddion-2.3.tar.bz2) = d0b1a4670ea565743f5a9a1ddfdc7245
+SHA256 (gwyddion-2.3.tar.bz2) = 11a9fa626a59082b5c92d6d07b6d77d8b9d87f0ec67ebd192fe1e2ff457e3805
+SIZE (gwyddion-2.3.tar.bz2) = 2047386
diff --git a/science/gwyddion/pkg-plist b/science/gwyddion/pkg-plist
index 5a1f7f778835..c06c3e7f3043 100644
--- a/science/gwyddion/pkg-plist
+++ b/science/gwyddion/pkg-plist
@@ -25,6 +25,7 @@ lib/gwyddion/modules/file/hitachi-afm.so
 lib/gwyddion/modules/file/jeol.so
 lib/gwyddion/modules/file/jpkscan.so
 lib/gwyddion/modules/file/metropro.so
+lib/gwyddion/modules/file/microprof.so
 lib/gwyddion/modules/file/mifile.so
 lib/gwyddion/modules/file/nanoscope.so
 lib/gwyddion/modules/file/nanonis.so
@@ -252,6 +253,8 @@ include/gwyddion/app/gwyplaintool.h
 include/gwyddion/app/gwytool.h
 include/gwyddion/app/gwyapp.h
 include/gwyddion/app/gwyapptypes.h
+include/gwyddion/app/gwymoduleutils-file.h
+include/gwyddion/app/gwymoduleutils.h
 include/gwyddion/app/menu.h
 include/gwyddion/app/resource-editor.h
 include/gwyddion/app/settings.h
@@ -278,12 +281,15 @@ share/pixmaps/gwyddion.png
 %%DATADIR%%/pixmaps/cd_rstep.png
 %%DATADIR%%/pixmaps/cd_step.png
 %%DATADIR%%/pixmaps/gwy_3d_base-24.png
+%%DATADIR%%/pixmaps/gwy_arithmetic-24.png
 %%DATADIR%%/pixmaps/gwy_bold-20.png
 %%DATADIR%%/pixmaps/gwy_cantilever-24.png
 %%DATADIR%%/pixmaps/gwy_color_range-24.png
 %%DATADIR%%/pixmaps/gwy_crop-24.png
 %%DATADIR%%/pixmaps/gwy_cwt-24.png
+%%DATADIR%%/pixmaps/gwy_data_measure-24.png
 %%DATADIR%%/pixmaps/gwy_distance-24.png
+%%DATADIR%%/pixmaps/gwy_drift-24.png
 %%DATADIR%%/pixmaps/gwy_dwt-24.png
 %%DATADIR%%/pixmaps/gwy_edge-24.png
 %%DATADIR%%/pixmaps/gwy_facet_level-24.png
@@ -305,14 +311,15 @@ share/pixmaps/gwyddion.png
 %%DATADIR%%/pixmaps/gwy_graph_halfgauss-24.png
 %%DATADIR%%/pixmaps/gwy_graph_measure-24.png
 %%DATADIR%%/pixmaps/gwy_graph_palette-24.png
-%%DATADIR%%/pixmaps/gwy_graph_vertical-24.png
-%%DATADIR%%/pixmaps/gwy_gwyddion-32.png
 %%DATADIR%%/pixmaps/gwy_graph_pointer-24.png
 %%DATADIR%%/pixmaps/gwy_graph_ruler-24.png
+%%DATADIR%%/pixmaps/gwy_graph_vertical-24.png
 %%DATADIR%%/pixmaps/gwy_graph_zoom_fit-24.png
 %%DATADIR%%/pixmaps/gwy_graph_zoom_in-24.png
 %%DATADIR%%/pixmaps/gwy_graph_zoom_out-24.png
+%%DATADIR%%/pixmaps/gwy_gwyddion-32.png
 %%DATADIR%%/pixmaps/gwy_gwyddion-60.png
+%%DATADIR%%/pixmaps/gwy_immerse-24.png
 %%DATADIR%%/pixmaps/gwy_italic-20.png
 %%DATADIR%%/pixmaps/gwy_less-24.png
 %%DATADIR%%/pixmaps/gwy_level-24.png
@@ -322,7 +329,6 @@ share/pixmaps/gwyddion.png
 %%DATADIR%%/pixmaps/gwy_logscale_horizontal-24.png
 %%DATADIR%%/pixmaps/gwy_logscale_vertical-24.png
 %%DATADIR%%/pixmaps/gwy_mask-24.png
-%%DATADIR%%/pixmaps/gwy_more-24.png
 %%DATADIR%%/pixmaps/gwy_mask_add-24.png
 %%DATADIR%%/pixmaps/gwy_mask_circle-24.png
 %%DATADIR%%/pixmaps/gwy_mask_circle_exclusive-24.png
@@ -338,10 +344,13 @@ share/pixmaps/gwyddion.png
 %%DATADIR%%/pixmaps/gwy_mask_remove-24.png
 %%DATADIR%%/pixmaps/gwy_mask_shrink-24.png
 %%DATADIR%%/pixmaps/gwy_mask_subtract-24.png
+%%DATADIR%%/pixmaps/gwy_merge-24.png
+%%DATADIR%%/pixmaps/gwy_more-24.png
 %%DATADIR%%/pixmaps/gwy_palettes-24.png
 %%DATADIR%%/pixmaps/gwy_pointer_measure-24.png
 %%DATADIR%%/pixmaps/gwy_polynom-24.png
 %%DATADIR%%/pixmaps/gwy_profile-24.png
+%%DATADIR%%/pixmaps/gwy_remove_under_mask-24.png
 %%DATADIR%%/pixmaps/gwy_rotate-24.png
 %%DATADIR%%/pixmaps/gwy_rotate_180-24.png
 %%DATADIR%%/pixmaps/gwy_rotate_90_ccw-24.png
@@ -363,7 +372,6 @@ share/pixmaps/gwyddion.png
 %%DATADIR%%/pixmaps/gwy_zoom_out-24.png
 %%DATADIR%%/pixmaps/gwyddion.ico
 %%DATADIR%%/pixmaps/splash.png
-%%DATADIR%%/pixmaps/gwy_remove_under_mask-24.png
 %%DATADIR%%/glmaterials/Alien-Alloy
 %%DATADIR%%/glmaterials/Black-Plastic
 %%DATADIR%%/glmaterials/Black-Rubber