- Update to 2.2

PR:		ports/106833
Submitted by:	David <yeti@gwyddion.net> (maintainer)

3 files changed, 20 insertions, 15 deletions

diff --git a/science/gwyddion/Makefile b/science/gwyddion/Makefile
index 592b1cf0ee6c..9615baed5b8c 100644
--- a/science/gwyddion/Makefile
+++ b/science/gwyddion/Makefile
@@ -6,13 +6,11 @@
 #
 
 PORTNAME=	gwyddion
-PORTVERSION=	2.1
-PORTREVISION=	1
+PORTVERSION=	2.2
 CATEGORIES=	science graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-PATCHFILES=	${PORTNAME}-2.1-bigendian-build.patch
 PATCH_SITES=	${MASTER_SITES}
 PATCH_SITE_SUBDIR=	${MASTER_SITE_SUBDIR}
 
@@ -52,16 +50,19 @@ USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 .endif
 
-# Inhibit installation of .la files.  Theoretically USE_AUTOTOOLS=libtool:15
-# prevents that but in practice it doesn't work well and in addition the Ports
-# libtool causes installation of static version of modules that are more work
-# to get rid of than this.
+# Fix shared library versioning and inhibit installation of .la files manually.
+# Ports libtool + ltverhack fixes versions but it installs static versions of
+# modules, so one would have to hack it too.
 #
 # Inhibit installation of excessive API documentation.  Option
 # --disable-gtk-doc disables only building, not installation of documentation
 # present in the source tarball.
 post-patch:
-	@${REINPLACE_CMD} -e '/# Install the pseudo-library/,/^$$/d' ${WRKSRC}/ltmain.sh
+	${REINPLACE_CMD} -e \
+		'/freebsd-elf)/,/;;/ s|major="\.$$current"|major=.`expr $$current - $$age`|; \
+		 /freebsd-elf)/,/;;/ s|versuffix="\.$$current"|versuffix="$$major"|; \
+		 /# Install the pseudo-library/,/^$$/d' \
+		${WRKSRC}/ltmain.sh
 	@${REINPLACE_CMD} -e '/^SUBDIRS =/,/[^\]$$/d' ${WRKSRC}/devel-docs/Makefile.in
 
 .include <bsd.port.pre.mk>
diff --git a/science/gwyddion/distinfo b/science/gwyddion/distinfo
index cdf096647396..323e0987800a 100644
--- a/science/gwyddion/distinfo
+++ b/science/gwyddion/distinfo
@@ -1,6 +1,3 @@
-MD5 (gwyddion-2.1.tar.bz2) = a6cc909e0a3435ca239365e61aa1bb70
-SHA256 (gwyddion-2.1.tar.bz2) = ce9c270120067bc8582953f380b22ebdb8492d15e874f2d75ba955f90cf2d3c7
-SIZE (gwyddion-2.1.tar.bz2) = 1952888
-MD5 (gwyddion-2.1-bigendian-build.patch) = e906fe9b77b6104fc6adfcf09ae40580
-SHA256 (gwyddion-2.1-bigendian-build.patch) = 82a631ca48d15377f8341686f30edfee3197259c663107d35f82058227268ac8
-SIZE (gwyddion-2.1-bigendian-build.patch) = 568
+MD5 (gwyddion-2.2.tar.bz2) = 46c07e478a83fe8dcf56e9968d4aec33
+SHA256 (gwyddion-2.2.tar.bz2) = 9ff1db8c8093ac80e432cf83b2493af4544e0f9f63faa1cddbb0c4ffe1e7421e
+SIZE (gwyddion-2.2.tar.bz2) = 2016874
diff --git a/science/gwyddion/pkg-plist b/science/gwyddion/pkg-plist
index 4eaa668518bd..5a1f7f778835 100644
--- a/science/gwyddion/pkg-plist
+++ b/science/gwyddion/pkg-plist
@@ -16,17 +16,20 @@ lib/gwyddion/modules/file/asciiexport.so
 lib/gwyddion/modules/file/bcrfile.so
 lib/gwyddion/modules/file/burleigh.so
 lib/gwyddion/modules/file/createc.so
+lib/gwyddion/modules/file/dmefile.so
 lib/gwyddion/modules/file/ezdfile.so
 lib/gwyddion/modules/file/ecsfile.so
 lib/gwyddion/modules/file/gwyfile.so
 lib/gwyddion/modules/file/hdf4file.so
 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/mifile.so
 lib/gwyddion/modules/file/nanoscope.so
 lib/gwyddion/modules/file/nanonis.so
 lib/gwyddion/modules/file/nanotop.so
+lib/gwyddion/modules/file/netcdf.so
 lib/gwyddion/modules/file/nt-mdt.so
 lib/gwyddion/modules/file/omicron.so
 lib/gwyddion/modules/file/pixmap.so
@@ -61,8 +64,10 @@ lib/gwyddion/modules/process/angle_dist.so
 lib/gwyddion/modules/process/arithmetic.so
 lib/gwyddion/modules/process/basicops.so
 lib/gwyddion/modules/process/calibrate.so
+lib/gwyddion/modules/process/convolution_filter.so
 lib/gwyddion/modules/process/crosscor.so
 lib/gwyddion/modules/process/cwt.so
+lib/gwyddion/modules/process/drift.so
 lib/gwyddion/modules/process/dwt.so
 lib/gwyddion/modules/process/dwtanisotropy.so
 lib/gwyddion/modules/process/edge.so
@@ -108,6 +113,7 @@ lib/gwyddion/modules/tool/filter.so
 lib/gwyddion/modules/tool/grainremover.so
 lib/gwyddion/modules/tool/icolorange.so
 lib/gwyddion/modules/tool/level3.so
+lib/gwyddion/modules/tool/linestats.so
 lib/gwyddion/modules/tool/maskedit.so
 lib/gwyddion/modules/tool/polynom.so
 lib/gwyddion/modules/tool/profile.so
@@ -214,7 +220,7 @@ include/gwyddion/libgwydgets/gwyruler.h
 include/gwyddion/libgwydgets/gwyradiobuttons.h
 include/gwyddion/libgwydgets/gwyscitext.h
 include/gwyddion/libgwydgets/gwyselectiongraph1darea.h
-include/gwyddion/libgwydgets/gwyselectiongrapharea.h  
+include/gwyddion/libgwydgets/gwyselectiongrapharea.h
 include/gwyddion/libgwydgets/gwyselectiongraphline.h
 include/gwyddion/libgwydgets/gwyselectiongraphpoint.h
 include/gwyddion/libgwydgets/gwyselectiongraphzoom.h
@@ -299,6 +305,7 @@ 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