[45273] trunk/dports/math
devans at macports.org
devans at macports.org
Mon Jan 12 09:24:15 PST 2009
Revision: 45273
http://trac.macports.org/changeset/45273
Author: devans at macports.org
Date: 2009-01-12 09:24:14 -0800 (Mon, 12 Jan 2009)
Log Message:
-----------
New ports libqalculate, qalculate-gtk with minor lint fixes. Thanks to jjstickel. See #17618.
Added Paths:
-----------
trunk/dports/math/libqalculate/
trunk/dports/math/libqalculate/Portfile
trunk/dports/math/libqalculate/files/
trunk/dports/math/libqalculate/files/patch-libqalculate-0.9.6_macports.diff
trunk/dports/math/qalculate-gtk/
trunk/dports/math/qalculate-gtk/Portfile
trunk/dports/math/qalculate-gtk/files/
trunk/dports/math/qalculate-gtk/files/patch-qalculate-gtk-0.9.6_macports.diff
Added: trunk/dports/math/libqalculate/Portfile
===================================================================
--- trunk/dports/math/libqalculate/Portfile (rev 0)
+++ trunk/dports/math/libqalculate/Portfile 2009-01-12 17:24:14 UTC (rev 45273)
@@ -0,0 +1,36 @@
+# -*- 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
+
+name libqalculate
+version 0.9.6
+categories math
+platforms darwin
+maintainers vcn.com:jjstickel
+
+description libqalculate is math libary for expression evaluation \
+ with units, variables and functions support and CAS \
+ functionality.
+
+long_description \
+ libqalculate is math libary for expression evaluation \
+ with units, variables and functions support and CAS \
+ functionality. This library directly supports the \
+ GUI interface qalculate-gtk or qalculate-kde.
+
+homepage http://qalculate.sourceforge.net/
+master_sites sourceforge:qalculate
+checksums md5 e14432fc490f9a697e23e31a74e0eb19
+
+depends_lib port:cln\
+ port:libxml2\
+ port:glib2\
+ lib:libreadline:readline
+
+use_parallel_build yes
+
+patchfiles patch-libqalculate-0.9.6_macports.diff
+patch.pre_args -p1
+
+use_autoconf yes
Property changes on: trunk/dports/math/libqalculate/Portfile
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Added: trunk/dports/math/libqalculate/files/patch-libqalculate-0.9.6_macports.diff
===================================================================
--- trunk/dports/math/libqalculate/files/patch-libqalculate-0.9.6_macports.diff (rev 0)
+++ trunk/dports/math/libqalculate/files/patch-libqalculate-0.9.6_macports.diff 2009-01-12 17:24:14 UTC (rev 45273)
@@ -0,0 +1,79 @@
+diff -ur libqalculate-0.9.6/configure.in libqalculate-0.9.6_patched/configure.in
+--- libqalculate-0.9.6/configure.in 2007-05-18 02:08:26.000000000 -0600
++++ libqalculate-0.9.6_patched/configure.in 2008-12-10 15:24:03.000000000 -0700
+@@ -91,13 +91,6 @@
+
+ AC_LANG([C++])
+
+-AC_PATH_CLN(1.1.0, [
+- LIBS="$LIBS $CLN_LIBS"
+- CPPFLAGS="$CPPFLAGS $CLN_CPPFLAGS"
+- AC_DEFINE(HAVE_LIBCLN,1,[If CLN can be used])
+-], AC_MSG_ERROR([No suitable installed version of CLN could be found.]))
+-
+-
+ PKG_CHECK_MODULES(GLIB, [
+ glib-2.0
+ libxml-2.0 >= 2.3.8
+@@ -105,6 +98,17 @@
+ AC_SUBST(GLIB_CFLAGS)
+ AC_SUBST(GLIB_LIBS)
+
++PKG_CHECK_MODULES(CLN, [ cln >= 1.2 ],
++ [have_recent_cln=yes], [have_recent_cln=no])
++AC_SUBST(CLN_CPPFLAGS)
++AC_SUBST(CLN_LIBS)
++
++if test "$have_recent_cln" = "yes" ; then
++ AC_DEFINE(HAVE_RECENT_CLN, 1, [Define if CLN can be used])
++ LIBS="$LIBS $CLN_LIBS"
++ CPPFLAGS="$CPPFLAGS $CLN_CPPFLAGS"
++fi
++
+ dnl --------------------------------
+ dnl | check for readline |-----------------------------------------
+ dnl --------------------------------
+diff -ur libqalculate-0.9.6/libqalculate/Calculator.cc libqalculate-0.9.6_patched/libqalculate/Calculator.cc
+--- libqalculate-0.9.6/libqalculate/Calculator.cc 2007-05-18 02:08:59.000000000 -0600
++++ libqalculate-0.9.6_patched/libqalculate/Calculator.cc 2008-12-10 15:26:07.000000000 -0700
+@@ -33,7 +33,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <dirent.h>
+-#include <wait.h>
++#include <sys/wait.h>
+ #include <queue>
+ #include <glib.h>
+ //#include <dlfcn.h>
+diff -ur libqalculate-0.9.6/libqalculate/Number.cc libqalculate-0.9.6_patched/libqalculate/Number.cc
+--- libqalculate-0.9.6/libqalculate/Number.cc 2007-05-18 02:03:22.000000000 -0600
++++ libqalculate-0.9.6_patched/libqalculate/Number.cc 2008-12-10 15:24:04.000000000 -0700
+@@ -28,6 +28,7 @@
+
+ using namespace cln;
+
++/*
+ void cln::cl_abort() {
+ CALCULATOR->error(true, "CLN Error: see terminal output (probably too large or small floating point number)", NULL);
+ if(CALCULATOR->busy()) {
+@@ -36,7 +37,7 @@
+ exit(0);
+ }
+ }
+-
++*/
+ string printCL_I(cl_I integ, int base = 10, bool display_sign = true, BaseDisplay base_display = BASE_DISPLAY_NORMAL, bool lower_case = false) {
+ if(base == BASE_ROMAN_NUMERALS) {
+ if(!zerop(integ) && integ < 10000 && integ > -10000) {
+diff -ur libqalculate-0.9.6/src/qalc.cc libqalculate-0.9.6_patched/src/qalc.cc
+--- libqalculate-0.9.6/src/qalc.cc 2007-05-18 02:34:44.000000000 -0600
++++ libqalculate-0.9.6_patched/src/qalc.cc 2008-12-10 15:26:28.000000000 -0700
+@@ -16,7 +16,7 @@
+ #include <time.h>
+ #include <pthread.h>
+ #include <dirent.h>
+-#include <malloc.h>
++#include <malloc/malloc.h>
+ #include <stdio.h>
+ #include <vector>
+ #include <glib.h>
Added: trunk/dports/math/qalculate-gtk/Portfile
===================================================================
--- trunk/dports/math/qalculate-gtk/Portfile (rev 0)
+++ trunk/dports/math/qalculate-gtk/Portfile 2009-01-12 17:24:14 UTC (rev 45273)
@@ -0,0 +1,44 @@
+# -*- 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
+
+name qalculate-gtk
+version 0.9.6
+categories math
+platforms darwin
+maintainers vcn.com:jjstickel
+
+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 \
+ power and versatility underneath. Features include \
+ customizable functions, units, arbitrary precision, \
+ plotting, and a user-friendly interface.
+
+homepage http://qalculate.sourceforge.net/
+master_sites sourceforge:qalculate
+checksums md5 1f787bc8c2ac7410a878a0e895a127d8
+
+depends_lib port:libqalculate\
+ port:libglade2\
+ port:rarian\
+ port:pkgconfig
+
+depends_run lib:libgtk-x11-2.0:gtk2\
+ port:gnuplot\
+ port:gnome-vfs
+
+use_parallel_build yes
+
+patchfiles patch-qalculate-gtk-0.9.6_macports.diff
+patch.pre_args -p1
+
+use_autoconf yes
+
+variant yelp description {Provides GUI help via yelp} {
+ depends_run-append port:yelp\
+ port:libgnome
+}
Property changes on: trunk/dports/math/qalculate-gtk/Portfile
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Added: trunk/dports/math/qalculate-gtk/files/patch-qalculate-gtk-0.9.6_macports.diff
===================================================================
--- trunk/dports/math/qalculate-gtk/files/patch-qalculate-gtk-0.9.6_macports.diff (rev 0)
+++ trunk/dports/math/qalculate-gtk/files/patch-qalculate-gtk-0.9.6_macports.diff 2009-01-12 17:24:14 UTC (rev 45273)
@@ -0,0 +1,58 @@
+diff -ur qalculate-gtk-0.9.6/configure.in qalculate-gtk-0.9.6_patched/configure.in
+--- qalculate-gtk-0.9.6/configure.in 2007-05-18 02:36:10.000000000 -0600
++++ qalculate-gtk-0.9.6_patched/configure.in 2009-01-09 13:48:51.000000000 -0700
+@@ -63,12 +63,6 @@
+
+ AC_LANG([C++])
+
+-AC_PATH_CLN(1.1.0, [
+- LIBS="$LIBS $CLN_LIBS"
+- CPPFLAGS="$CPPFLAGS $CLN_CPPFLAGS"
+- AC_DEFINE(HAVE_LIBCLN,1,[If CLN can be used])
+-], AC_MSG_ERROR([No suitable installed version of CLN could be found.]))
+-
+ PKG_CHECK_MODULES(GLIB, [
+ glib-2.0 >= 2.4
+ libxml-2.0
+@@ -95,6 +89,17 @@
+ AC_SUBST(QALCULATE_CFLAGS)
+ AC_SUBST(QALCULATE_LIBS)
+
++PKG_CHECK_MODULES(CLN, [ cln >= 1.2 ],
++ [have_recent_cln=yes], [have_recent_cln=no])
++AC_SUBST(CLN_CPPFLAGS)
++AC_SUBST(CLN_LIBS)
++
++if test "$have_recent_cln" = "yes" ; then
++ AC_DEFINE(HAVE_LIBCLN12, 1, [Define if CLN can be used])
++ LIBS="$LIBS $CLN_LIBS"
++ CPPFLAGS="$CPPFLAGS $CLN_CPPFLAGS"
++fi
++
+ LIBGNOME_REQUIRED=2.0.0
+
+ USE_LIBGNOME="auto"
+diff -ur qalculate-gtk-0.9.6/src/main.cc qalculate-gtk-0.9.6_patched/src/main.cc
+--- qalculate-gtk-0.9.6/src/main.cc 2007-05-18 02:33:00.000000000 -0600
++++ qalculate-gtk-0.9.6_patched/src/main.cc 2009-01-09 13:49:21.000000000 -0700
+@@ -92,16 +92,18 @@
+ g_free(icon);
+ }
+
++ gtk_init(&argc, &argv);
++
+ g_object_get(G_OBJECT(program), GNOME_PARAM_POPT_CONTEXT, &pctx, NULL);
+
+- gtk_init(&argc, &argv);
+
+ #else
+
+- gtk_window_set_default_icon_from_file(PACKAGE_DATA_DIR "/pixmaps/qalculate.png", NULL);
+
+ gtk_init(&argc, &argv);
+
++ gtk_window_set_default_icon_from_file(PACKAGE_DATA_DIR "/pixmaps/qalculate.png", NULL);
++
+ #endif
+
+ glade_init();
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090112/a112bbd4/attachment.html>
More information about the macports-changes
mailing list