[150009] trunk/dports/math

mf2k at macports.org mf2k at macports.org
Fri Jul 8 07:19:15 PDT 2016


Revision: 150009
          https://trac.macports.org/changeset/150009
Author:   mf2k at macports.org
Date:     2016-07-08 07:19:15 -0700 (Fri, 08 Jul 2016)
Log Message:
-----------
libqalculate qalculate-gtk: Update to version 0.9.8. (#51785)

Modified Paths:
--------------
    trunk/dports/math/libqalculate/Portfile
    trunk/dports/math/qalculate-gtk/Portfile

Added Paths:
-----------
    trunk/dports/math/libqalculate/files/
    trunk/dports/math/libqalculate/files/patch-libqalculate_unordered.diff

Modified: trunk/dports/math/libqalculate/Portfile
===================================================================
--- trunk/dports/math/libqalculate/Portfile	2016-07-08 13:33:35 UTC (rev 150008)
+++ trunk/dports/math/libqalculate/Portfile	2016-07-08 14:19:15 UTC (rev 150009)
@@ -1,14 +1,14 @@
 # -*- 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
+PortSystem  1.0
+PortGroup   github 1.0
 
-name		libqalculate
-version		0.9.7
-revision        3 
+github.setup    qalculate libqalculate 0.9.8
+
 categories	math
 platforms	darwin
-maintainers	vcn.com:jjstickel
+maintainers	gmail.com:jjstickel
 license     GPL-2+
 
 description	libqalculate is math libary for expression evaluation \
@@ -21,28 +21,18 @@
 		functionality.  This library directly supports the \
 		GUI interface qalculate-gtk or qalculate-kde.
 
-homepage	http://qalculate.sourceforge.net/
-master_sites	sourceforge:qalculate
+master_sites    https://github.com/${github.author}/${github.project}/files/316260
 
-checksums           md5     a1507ab862f4ad9852788619aada35cd \
-                    sha1    c15f7f3a97995decf62cc964956fc1e374ecd78c \
-                    rmd160  cc9e198769bea9731f92d2f3836875c83f715674
+checksums       rmd160  aec2d6aa507bff6fc64755e9ba44ce5e72586fe5 \
+    sha256  0dd74d36885ab8d98f1268e17950426af2eb93ab9e819703ded230b042cceb5c
 
-depends_build port:intltool \
+patchfiles    patch-libqalculate_unordered.diff
+patch.pre_args      -p1
+
+depends_build-append    port:intltool \
     port:pkgconfig
 
-depends_lib	port:cln\
+depends_lib-append    port:cln\
     port:libxml2\
     path:lib/pkgconfig/glib-2.0.pc:glib2\
     port:readline
-
-patch {
-    reinplace "s|<malloc.h>|<malloc/malloc.h>|" ${worksrcpath}/src/qalc.cc
-}
-
-# autoreconf to reconfigure with our intltool.m4
-
-use_autoreconf      yes
-autoreconf.args     -fvi
-
-livecheck.regex     ${name}-(\[0-9.]+)${extract.suffix}

Added: trunk/dports/math/libqalculate/files/patch-libqalculate_unordered.diff
===================================================================
--- trunk/dports/math/libqalculate/files/patch-libqalculate_unordered.diff	                        (rev 0)
+++ trunk/dports/math/libqalculate/files/patch-libqalculate_unordered.diff	2016-07-08 14:19:15 UTC (rev 150009)
@@ -0,0 +1,20 @@
+--- a/libqalculate/includes.h	2016-06-02 14:20:43.000000000 +0200
++++ b/libqalculate/includes.h	2016-07-01 12:16:57.438132639 +0200
+@@ -33,7 +33,7 @@
+ #include <stdint.h>
+ 
+ 
+-#ifdef __GNUC__
++#if defined(__GNUC__) && !defined(__clang__)
+ #	define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
+ #	if GCC_VERSION >= 40300
+ #		include <tr1/unordered_map>
+@@ -53,6 +53,8 @@
+ #		endif
+ #		#define unordered_map Sgi::hash_map
+ #	endif
++#elif defined(__clang__) && defined(_LIBCPP_VERSION)
++#	include <unordered_map>
+ #else      // ...  there are other compilers, right?
+ 	namespace Sgi = std;
+ #	define unordered_map Sgi::hash_map

Modified: trunk/dports/math/qalculate-gtk/Portfile
===================================================================
--- trunk/dports/math/qalculate-gtk/Portfile	2016-07-08 13:33:35 UTC (rev 150008)
+++ trunk/dports/math/qalculate-gtk/Portfile	2016-07-08 14:19:15 UTC (rev 150009)
@@ -2,15 +2,17 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup   github 1.0
 
-name                qalculate-gtk
-version             0.9.7
+github.setup    qalculate qalculate-gtk 0.9.8
+
 categories          math
 platforms           darwin
-license             GPL-2
+license             GPL-2+
 maintainers         gmail.com:jjstickel
 
-description         Qalculate! is a multi-purpose desktop calculator for GNU/Linux.
+description         Qalculate! is a multi-purpose desktop calculator for\
+    GNU/Linux.
 
 long_description    Qalculate! is a multi-purpose desktop calculator for \
                     GNU/Linux. It is small and simple to use but with much \
@@ -18,36 +20,23 @@
                     customizable functions, units, arbitrary precision, \
                     plotting, and a user-friendly interface.
 
-homepage            http://qalculate.sourceforge.net/
-master_sites        sourceforge:qalculate
+master_sites        https://github.com/${github.author}/${github.project}/files/316290
 
-checksums           sha256  a4ea8ee2366ac3ad53bb17fd2f76a7bed7211640cf2fdadfcf3b79eb4b37282d \
-                    rmd160  bbb89fbfc6199dcf87666596ee0d7df3019635af
+checksums           rmd160  91f3781f48f5f6d33f997006299f02d7f32392d3 \
+    sha256  0ee6c239def411515fd35a0dca8b3fd144e8a41c19709ef0ee094b3db4ceda30
+                    
 
-depends_build       port:pkgconfig port:intltool
+depends_build-append       port:pkgconfig port:intltool
 
-depends_lib         port:libqalculate \
-                    port:libglade2 \
-                    port:rarian
+depends_lib-append         port:libqalculate
 
-depends_run         port:gtk2 \
-                    port:gnome-vfs
+depends_run-append         port:gtk3
 
 patchfiles          patch-src_callbacks.cc-const.diff
 
-use_parallel_build  yes
-
-# autoreconf to reconfigure with macports intltool.m4
-use_autoreconf  yes
-autoreconf.args -fvi
-
 configure.args      --disable-gnuplot
 
 variant gnuplot description {enable gnuplot support} {
     depends_run-append      port:gnuplot
     configure.args-delete   --disable-gnuplot
 }
-
-post-destroot {
-    file delete ${destroot}${prefix}/bin/qalculate
-}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160708/04bc0a39/attachment.html>


More information about the macports-changes mailing list