From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Dec 17 11:40:21 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 46FAA16A40F for ; Sun, 17 Dec 2006 11:40:21 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.FreeBSD.org (Postfix) with ESMTP id B4C3443CA5 for ; Sun, 17 Dec 2006 11:40:20 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id kBHBeKlJ043152 for ; Sun, 17 Dec 2006 11:40:20 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id kBHBeK9q043151; Sun, 17 Dec 2006 11:40:20 GMT (envelope-from gnats) Resent-Date: Sun, 17 Dec 2006 11:40:20 GMT Resent-Message-Id: <200612171140.kBHBeK9q043151@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "David Nečas" Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9002516A40F for ; Sun, 17 Dec 2006 11:33:29 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [69.147.83.33]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9402043CA3 for ; Sun, 17 Dec 2006 11:33:26 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.13.1/8.13.1) with ESMTP id kBHBXQqv052383 for ; Sun, 17 Dec 2006 11:33:26 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id kBHBXQhU052382; Sun, 17 Dec 2006 11:33:26 GMT (envelope-from nobody) Message-Id: <200612171133.kBHBXQhU052382@www.freebsd.org> Date: Sun, 17 Dec 2006 11:33:26 GMT From: "David Nečas" To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.0 Cc: Subject: ports/106833: [maintainer-update] science/gwyddion: update to 2.2 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Dec 2006 11:40:21 -0000 >Number: 106833 >Category: ports >Synopsis: [maintainer-update] science/gwyddion: update to 2.2 >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: Sun Dec 17 11:40:14 GMT 2006 >Closed-Date: >Last-Modified: >Originator: David Nečas >Release: FreeBSD 6.1-RELEASE i386 >Organization: FSci MU Brno CZ >Environment: FreeBSD 6.1-RELEASE FreeBSD 6.1-RELEASE #0: Sun May 7 04:32:43 UTC 2006 root@opus.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386 >Description: A regular update to new backward compatible upstream version 2.2 with improvements and non-critical bug fixes. It adds a few more bits of libtool hackery similar to ltverhack to the Makefile to fix shared library versioning -- I found it still more straightforward than to use ltverhack and then fix the fixed libtool to get disable-static working again. Hopefully it's acceptable. >How-To-Repeat: N.A. >Fix: Patch attached with submission follows: diff -Nru gwyddion.old/Makefile gwyddion/Makefile --- gwyddion.old/Makefile Sat Dec 16 14:08:11 2006 +++ gwyddion/Makefile Sun Dec 17 13:02:21 2006 @@ -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 @@ 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 diff -Nru gwyddion.old/distinfo gwyddion/distinfo --- gwyddion.old/distinfo Sat Dec 16 14:08:11 2006 +++ gwyddion/distinfo Sat Dec 16 14:44:28 2006 @@ -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 -Nru gwyddion.old/pkg-plist gwyddion/pkg-plist --- gwyddion.old/pkg-plist Sat Dec 16 14:08:11 2006 +++ gwyddion/pkg-plist Sun Dec 17 12:43:47 2006 @@ -16,17 +16,20 @@ 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/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/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/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 @@ %%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 >Release-Note: >Audit-Trail: >Unformatted: