ports/110332: [maintainer-update] science/gwyddion: update to 2.5

Thu Mar 15 13:10:01 UTC 2007

>Number:         110332
>Category:       ports
>Synopsis:       [maintainer-update] science/gwyddion: update to 2.5
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Mar 15 13:10:00 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     David Nečas
>Release:        6.2-RELEASE
>Organization:
FSci MU Brno CZ
>Environment:
FreeBSD bamboo 6.2-RELEASE FreeBSD 6.2-RELEASE #0: Fri Jan 12 10:40:27 UTC 2007     root at dessler.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC  i386
>Description:
Regular update to a new backward compatible upstream version 2.5 with improvements and non-critical bug fixes.

I made certain significant changes to the port itself however:

- USE_X_PREFIX was removed so that it installs to LOCALBASE now (it was a mistake
  to use USE_X_PREFIX), I suppose it should be noted in UPDATING.

  AFAIK nothing depends on this port.

  As a side effect the Freedesktop stuff works properly now.

- The PERL_LEVEL < 500601 workaround was removed: 4.x is no longer supported so
  it should be redundant now
>How-To-Repeat:
N.A.
>Fix:


Patch attached with submission follows:

diff -Nru gwyddion.old/Makefile gwyddion/Makefile

--- gwyddion.old/Makefile	Thu Feb  8 23:35:31 2007
+++ gwyddion/Makefile	Wed Mar 14 20:31:11 2007
@@ -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 @@
 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 @@
 		${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 -Nru gwyddion.old/distinfo gwyddion/distinfo
--- gwyddion.old/distinfo	Thu Feb  8 23:35:31 2007
+++ gwyddion/distinfo	Wed Mar 14 20:12:10 2007
@@ -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 -Nru gwyddion.old/pkg-plist gwyddion/pkg-plist
--- gwyddion.old/pkg-plist	Sun Jan 21 18:36:15 2007
+++ gwyddion/pkg-plist	Wed Mar 14 20:33:08 2007
@@ -22,11 +22,13 @@
 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/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/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 @@
 %%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,30 @@
 %%DATADIR%%/gradients/Yellow
 %%DATADIR%%/gradients/Zones
 share/applications/gwyddion.desktop
+share/mime/application/x-bcr-spm.xml
+share/mime/application/x-bcrf-spm.xml
+share/mime/application/x-dme-spm.xml
 share/mime/application/x-gwyddion-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-nt-mdt-spm.xml
+share/mime/application/x-hdf.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-netcdf.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-spml-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

>Release-Note:
>Audit-Trail:
>Unformatted:

