- Update to 2.5

PR:             110332
Submitted by:   David  <yeti@gwyddion.net>

4 files changed, 72 insertions, 19 deletions

diff --git a/science/gwyddion/Makefile b/science/gwyddion/Makefile
index 67eb0f7ccbb8..2c1a83e437b1 100644
--- a/science/gwyddion/Makefile
+++ b/science/gwyddion/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gwyddion
-PORTVERSION=	2.4
+PORTVERSION=	2.5
 CATEGORIES=	science graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -25,11 +25,10 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--disable-gtk-doc --with-html-dir=${PREFIX}/share/doc \
-		--disable-pascal
+		--disable-pascal --disable-pygwy
 
 MAKE_ARGS=	pkgconfigdatadir=${PREFIX}/libdata/pkgconfig
 
-USE_X_PREFIX=	yes
 USE_GNOME=	desktopfileutils gnomemimedata gtk20 libxml2
 USE_GL=		yes
 USE_BZIP2=	yes
@@ -65,11 +64,4 @@ post-patch:
 		${WRKSRC}/ltmain.sh
 	@${REINPLACE_CMD} -e '/^SUBDIRS =/,/[^\]$$/d' ${WRKSRC}/devel-docs/Makefile.in
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500601
-BUILD_DEPENDS+=	${LOCALBASE}/bin/pod2man:${PORTSDIR}/textproc/p5-podlators
-CONFIGURE_ENV+=	POD2MAN="${LOCALBASE}/bin/pod2man"
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/science/gwyddion/distinfo b/science/gwyddion/distinfo
index 672fb20c696a..433926c75772 100644
--- a/science/gwyddion/distinfo
+++ b/science/gwyddion/distinfo
@@ -1,3 +1,3 @@
-MD5 (gwyddion-2.4.tar.bz2) = 0160ff86ec0ee51e8b184374b5eb3463
-SHA256 (gwyddion-2.4.tar.bz2) = 56fc760a055e2bab2eb4ff8a8a817f695868ee3d4d2be914b3b015225507d1b4
-SIZE (gwyddion-2.4.tar.bz2) = 2051542
+MD5 (gwyddion-2.5.tar.bz2) = fe2befbac527d54a2b5bad36800321a7
+SHA256 (gwyddion-2.5.tar.bz2) = 22c9f616a44e0328d577e506aef81d90b20b9838a6ffc4bc880d0784d3283ae1
+SIZE (gwyddion-2.5.tar.bz2) = 2085657
diff --git a/science/gwyddion/files/patch-data-gwyddion.xml b/science/gwyddion/files/patch-data-gwyddion.xml
new file mode 100644
index 000000000000..6fb746734b39
--- /dev/null
+++ b/science/gwyddion/files/patch-data-gwyddion.xml
@@ -0,0 +1,37 @@
+--- data/gwyddion.xml.orig	Fri Mar  9 12:19:43 2007
++++ data/gwyddion.xml	Thu Mar 15 16:23:56 2007
+@@ -61,16 +61,6 @@
+   <glob pattern="*.GWY"/>
+ </mime-type>
+ 
+-<!-- From module hdf4file.c -->
+-<mime-type type="application/x-hdf">
+-  <comment>Hierarchical Data Format</comment>
+-    <magic priority="10">
+-    <match type="string" offset="0" value="\x0e\x03\x13\x01"/>
+-  </magic>
+-  <glob pattern="*.hdf"/>
+-  <glob pattern="*.HDF"/>
+-</mime-type>
+-
+ <!-- From module hitachi-afm.c -->
+ <mime-type type="application/x-hitachi-spm">
+   <comment>Hitachi SPM data</comment>
+@@ -137,17 +127,6 @@
+     <match type="string" offset="0" value="\\*File list\r\n"/>
+     <match type="string" offset="0" value="?*File list\r\n"/>
+   </magic>
+-</mime-type>
+-
+-<!-- From module netcdf.c -->
+-<mime-type type="application/x-netcdf">
+-  <comment>NetCDF data</comment>
+-  <magic priority="10">
+-    <match type="string" offset="0" value="CDF\x01"/>
+-    <match type="string" offset="0" value="CDF\x02"/>
+-  </magic>
+-  <glob pattern="*.nc"/>
+-  <glob pattern="*.NC"/>
+ </mime-type>
+ 
+ <!-- From module nt-mdt.c -->
diff --git a/science/gwyddion/pkg-plist b/science/gwyddion/pkg-plist
index c06c3e7f3043..39ce9c63205b 100644
--- a/science/gwyddion/pkg-plist
+++ b/science/gwyddion/pkg-plist
@@ -22,11 +22,13 @@ 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/intematix.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-ii.so
 lib/gwyddion/modules/file/nanoscope.so
 lib/gwyddion/modules/file/nanonis.so
 lib/gwyddion/modules/file/nanotop.so
@@ -96,6 +98,7 @@ lib/gwyddion/modules/process/maskops.so
 lib/gwyddion/modules/process/median-bg.so
 lib/gwyddion/modules/process/merge.so
 lib/gwyddion/modules/process/outliers.so
+lib/gwyddion/modules/process/polydistort.so
 lib/gwyddion/modules/process/polylevel.so
 lib/gwyddion/modules/process/presentationops.so
 lib/gwyddion/modules/process/rotate.so
@@ -205,6 +208,7 @@ include/gwyddion/libgwydgets/gwygraphwindow.h
 include/gwyddion/libgwydgets/gwygrapharea.h
 include/gwyddion/libgwydgets/gwygraphbasics.h
 include/gwyddion/libgwydgets/gwygraphcorner.h
+include/gwyddion/libgwydgets/gwygraphcurves.h
 include/gwyddion/libgwydgets/gwygraph.h
 include/gwyddion/libgwydgets/gwygraphlabel.h
 include/gwyddion/libgwydgets/gwygraphselections.h
@@ -275,7 +279,7 @@ libexec/gwyddion/plugins/process/invert_ruby.rb.rgi
 %%NLS%%share/locale/de/LC_MESSAGES/gwyddion.mo
 %%NLS%%share/locale/it/LC_MESSAGES/gwyddion.mo
 share/mime/packages/gwyddion.xml
-share/pixmaps/gwyddion.png
+share/icons/hicolor/48x48/apps/gwyddion.png
 %%DATADIR%%/pixmaps/cd_line.png
 %%DATADIR%%/pixmaps/cd_rline.png
 %%DATADIR%%/pixmaps/cd_rstep.png
@@ -450,12 +454,32 @@ share/pixmaps/gwyddion.png
 %%DATADIR%%/gradients/Yellow
 %%DATADIR%%/gradients/Zones
 share/applications/gwyddion.desktop
-share/mime/application/x-gwyddion-spm.xml
+share/mime/application/x-bcr-spm.xml
+share/mime/application/x-bcrf-spm.xml
 share/mime/application/x-createc-spm.xml
-share/mime/application/x-nanoscope-spm.xml
-share/mime/application/x-spmlab-spm.xml
-share/mime/application/x-sis-spm.xml
+share/mime/application/x-dme-spm.xml
+share/mime/application/x-gwyddion-spm.xml
+share/mime/application/x-hitachi-spm.xml
+share/mime/application/x-jpk-spm.xml
+share/mime/application/x-mi-spm.xml
+share/mime/application/x-nanonis-spm.xml
+share/mime/application/x-nanoscope-ii-spm.xml
+share/mime/application/x-nanoscope-iii-spm.xml
+share/mime/application/x-nanosurf-spm.xml
 share/mime/application/x-nt-mdt-spm.xml
+share/mime/application/x-pni-spm.xml
+share/mime/application/x-rhk-sm2-spm.xml
+share/mime/application/x-rhk-sm3-spm.xml
+share/mime/application/x-seiko-spm.xml
+share/mime/application/x-sis-spm.xml
+share/mime/application/x-spml-spm.xml
+share/mime/application/x-spmlab-spm.xml
+share/mime/application/x-stp-spm.xml
+share/mime/application/x-surf-spm.xml
+share/mime/application/x-unisoku-spm.xml
+share/mime/application/x-witec-spm.xml
+share/mime/application/x-wsxm-spm.xml
+share/mime/application/x-zygo-spm.xml
 @dirrm share/gwyddion/gradients
 @dirrm share/gwyddion/glmaterials
 @dirrm share/gwyddion/pixmaps