Revision: 139542 https://trac.macports.org/changeset/139542 Author: devans@macports.org Date: 2015-08-19 15:51:36 -0700 (Wed, 19 Aug 2015) Log Message: ----------- ghemical: update to version 3.0.0, dependencies, configuration, reconfigure using distributed autogen.sh for intltool 0.51 compatibility, reported clang build failure fixed using debian patch (#48630). Modified Paths: -------------- trunk/dports/science/ghemical/Portfile Added Paths: ----------- trunk/dports/science/ghemical/files/ trunk/dports/science/ghemical/files/patch-autogen.sh.diff trunk/dports/science/ghemical/files/patch-debian-bug-756440.diff Modified: trunk/dports/science/ghemical/Portfile =================================================================== --- trunk/dports/science/ghemical/Portfile 2015-08-19 22:43:30 UTC (rev 139541) +++ trunk/dports/science/ghemical/Portfile 2015-08-19 22:51:36 UTC (rev 139542) @@ -1,3 +1,4 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 # $Id$ PortSystem 1.0 @@ -3,6 +4,6 @@ name ghemical -version 2.99.2 -set release_date 20090911 +version 3.0.0 +set release_date 20111012 categories science license GPL-2+ @@ -24,11 +25,14 @@ homepage http://www.bioinformatics.org/ghemical/${name}/ master_sites http://www.bioinformatics.org/ghemical/download/release${release_date}/ -checksums sha1 b84b3f750ccd05a9cc0b1a8318abb3a24f2be9c1 \ - rmd160 2d8a4d4f3d38c6b2e8b70d14f1b748c40c760334 +checksums rmd160 dc30bd1cd68a958297512f4b17c195200994d26a \ + sha256 babb2bda93cf0c20f234452eeb7d19d1d8c0e4c4d611734f110f8de066a1bcb2 depends_build port:pkgconfig \ - port:intltool + port:intltool \ + port:autoconf \ + port:automake \ + port:libtool depends_lib port:gtk2 \ port:libglade2 \ @@ -37,10 +41,17 @@ port:libghemical \ port:liboglappth -configure.args --enable-gamess \ - --enable-shortcuts \ - --enable-openbabel +# reconfigure using distributed autogen.sh for intltool 0.51 compatibility +patchfiles patch-autogen.sh.diff \ + patch-debian-bug-756440.diff + +configure.cmd ./autogen.sh && ./configure + +configure.args --enable-gtk \ + --enable-openbabel \ + --disable-silent-rules + platform darwin 9 { configure.ldflags-append "-L${prefix}/lib -L/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries" } Added: trunk/dports/science/ghemical/files/patch-autogen.sh.diff =================================================================== --- trunk/dports/science/ghemical/files/patch-autogen.sh.diff (rev 0) +++ trunk/dports/science/ghemical/files/patch-autogen.sh.diff 2015-08-19 22:51:36 UTC (rev 139542) @@ -0,0 +1,20 @@ +--- autogen.sh.orig 2015-08-19 14:53:23.000000000 -0700 ++++ autogen.sh 2015-08-19 14:53:44.000000000 -0700 +@@ -6,7 +6,7 @@ + intltoolize --force --copy + + echo "Running libtoolize" +-libtoolize --force --copy ++glibtoolize --force --copy + + echo "Removing autom4te.cache" + rm -fr autom4te.cache +@@ -35,7 +35,7 @@ + ##export ACLOCAL=aclocal-1.4 + ##export AUTOMAKE=automake-1.4 + +-autoreconf -v -f ++autoreconf -v -f -i + + echo "======================================" + echo "Now you are ready to run './configure'" Added: trunk/dports/science/ghemical/files/patch-debian-bug-756440.diff =================================================================== --- trunk/dports/science/ghemical/files/patch-debian-bug-756440.diff (rev 0) +++ trunk/dports/science/ghemical/files/patch-debian-bug-756440.diff 2015-08-19 22:51:36 UTC (rev 139542) @@ -0,0 +1,33 @@ +--- src/project.h 2011-09-14 21:10:38.000000000 +0400 ++++ src/project.h 2014-07-30 01:09:50.224766049 +0400 +@@ -122,6 +122,14 @@ + graphical user interface. + */ + ++class project; ++ ++bool ReadGPR_OLD(project &, istream &, bool, bool = false); ///< this is for the very old version. ++bool ReadGPR_v100(project &, istream &, bool, bool = false); ///< this is for the version 1.00. ++bool ReadGPR_v110(project &, istream &, bool, bool = false); ///< this is for the version 1.10. ++/// This is an input function for the v1.11 ghemical file format. ++bool ReadGPR(project &, istream &, bool, bool = false); ++ + class project : + public custom_transformer_client, + public model +@@ -207,11 +215,11 @@ + + // methods for file I/O : ReadGPR and WriteGPR are friend functions so that it would be easier to "borrow" them elsewhere... + // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +- friend bool ReadGPR_OLD(project &, istream &, bool, bool = false); ///< this is for the very old version. +- friend bool ReadGPR_v100(project &, istream &, bool, bool = false); ///< this is for the version 1.00. +- friend bool ReadGPR_v110(project &, istream &, bool, bool = false); ///< this is for the version 1.10. ++ friend bool ReadGPR_OLD(project &, istream &, bool, bool); ///< this is for the very old version. ++ friend bool ReadGPR_v100(project &, istream &, bool, bool); ///< this is for the version 1.00. ++ friend bool ReadGPR_v110(project &, istream &, bool, bool); ///< this is for the version 1.10. + /// This is an input function for the v1.11 ghemical file format. +- friend bool ReadGPR(project &, istream &, bool, bool = false); ++ friend bool ReadGPR(project &, istream &, bool, bool); + + friend void WriteGPR_v100(project &, ostream &); ///< this is for the version 1.00. + /// This is an output function for the v1.11 ghemical file format.