Date: Fri, 11 Mar 2005 16:22:50 +0300 (MSK) From: Sergey Akifyev <asa@agava.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/78696: [maintainer] qalculate 0.6.3 -> 0.7.2 Message-ID: <20050311132250.6257A720418@agava.mipt.ru> Resent-Message-ID: <200503111330.j2BDU3iG066527@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 78696
>Category: ports
>Synopsis: [maintainer] qalculate 0.6.3 -> 0.7.2
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Fri Mar 11 13:30:03 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Sergey Akifyev
>Release: FreeBSD 4.6-STABLE i386
>Organization:
AGAVA Software Ltd.
>Environment:
System:
>Description:
* update 0.6.3 -> 0.7.2
* change maintainer address
* drop support for FreeBSD 4.x for now
>How-To-Repeat:
>Fix:
--- qalculate.diff begins here ---
diff -ruN qalculate.orig/Makefile qalculate/Makefile
--- qalculate.orig/Makefile Mon Nov 8 01:36:48 2004
+++ qalculate/Makefile Fri Mar 11 15:02:08 2005
@@ -6,14 +6,13 @@
#
PORTNAME= qalculate
-PORTVERSION= 0.6.3
-PORTREVISION= 1
+PORTVERSION= 0.7.2
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
-DISTNAME= ${PORTNAME}-gtk-${PORTVERSION}
+#DISTNAME= ${PORTNAME}-gtk-${PORTVERSION}
-MAINTAINER= asa@gascom.ru
+MAINTAINER= asa@agava.com
COMMENT= Very powerful GUI calculator for GNOME
LIB_DEPENDS= cln.3:${PORTSDIR}/math/cln
@@ -28,10 +27,7 @@
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500000
-# cln is built with gcc 3.4 on FreeBSD 4.x
-USE_GCC= 3.4
-# in FreeBSD 4.x struct liconv does not contain int_p_cs_precedes
-EXTRA_PATCHES= ${FILESDIR}/extra-patch-FreeBSD4
+IGNORE= Maintainer could not test this port on 4.x
.endif
.include <bsd.port.post.mk>
diff -ruN qalculate.orig/distinfo qalculate/distinfo
--- qalculate.orig/distinfo Sun Aug 29 21:39:01 2004
+++ qalculate/distinfo Fri Mar 11 15:01:59 2005
@@ -1,2 +1,2 @@
-MD5 (qalculate-gtk-0.6.3.tar.gz) = 6deb12cb5b457c42f26f0da9abf442f4
-SIZE (qalculate-gtk-0.6.3.tar.gz) = 1387128
+MD5 (qalculate-0.7.2.tar.gz) = 75af1f213829fb0905ce6784ee0e1017
+SIZE (qalculate-0.7.2.tar.gz) = 1504796
diff -ruN qalculate.orig/files/extra-patch-FreeBSD4 qalculate/files/extra-patch-FreeBSD4
--- qalculate.orig/files/extra-patch-FreeBSD4 Sun Aug 29 21:39:02 2004
+++ qalculate/files/extra-patch-FreeBSD4 Thu Jan 1 03:00:00 1970
@@ -1,11 +0,0 @@
---- src/calclib/Calculator.cc.orig Sun Aug 29 17:22:28 2004
-+++ src/calclib/Calculator.cc Sun Aug 29 17:27:37 2004
-@@ -225,7 +225,7 @@
-
- saved_locale = strdup(setlocale(LC_NUMERIC, NULL));
- struct lconv *lc = localeconv();
-- place_currency_code_before = lc->int_p_cs_precedes;
-+ place_currency_code_before = lc->p_cs_precedes;
- place_currency_sign_before = lc->p_cs_precedes;
- setlocale(LC_NUMERIC, "C");
- ILLEGAL_IN_NAMES = DOT_S + RESERVED OPERATORS SPACES PARENTHESISS VECTOR_WRAPS;
diff -ruN qalculate.orig/files/patch-src::Makefile.in qalculate/files/patch-src::Makefile.in
--- qalculate.orig/files/patch-src::Makefile.in Tue Oct 12 10:40:48 2004
+++ qalculate/files/patch-src::Makefile.in Thu Jan 1 03:00:00 1970
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig Wed Sep 1 10:41:43 2004
-+++ src/Makefile.in Wed Sep 1 10:41:50 2004
-@@ -110,7 +110,7 @@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
--LN_S = @LN_S@
-+LN_S = @LN_S@ -f
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
diff -ruN qalculate.orig/files/patch-src::calclib::Calculator.cc qalculate/files/patch-src::calclib::Calculator.cc
--- qalculate.orig/files/patch-src::calclib::Calculator.cc Sun Aug 29 21:39:02 2004
+++ qalculate/files/patch-src::calclib::Calculator.cc Thu Jan 1 03:00:00 1970
@@ -1,15 +0,0 @@
---- src/calclib/Calculator.cc.orig Thu Jul 8 12:00:01 2004
-+++ src/calclib/Calculator.cc Thu Jul 8 12:05:08 2004
-@@ -27,9 +27,11 @@
- #include <unistd.h>
- #include <time.h>
- #include <sys/types.h>
-+#include <sys/wait.h>
- #include <sys/stat.h>
-+#include <sys/time.h>
-+#include <sys/resource.h>
- #include <dirent.h>
--#include <wait.h>
- #include <queue>
- #include <stack>
-
diff -ruN qalculate.orig/files/patch-src::libcalculate::Calculator.cc qalculate/files/patch-src::libcalculate::Calculator.cc
--- qalculate.orig/files/patch-src::libcalculate::Calculator.cc Thu Mar 10 16:16:31 2005
+++ qalculate/files/patch-src::libcalculate::Calculator.cc Fri Mar 11 15:08:30 2005
@@ -1,16 +1,5 @@
---- src/libqalculate/Calculator.cc.orig Wed Dec 22 12:00:09 2004
-+++ src/libqalculate/Calculator.cc Wed Dec 22 12:00:17 2004
-@@ -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>
-
---- src/libqalculate/Calculator.cc.orig Wed Dec 22 12:00:09 2004
-+++ src/libqalculate/Calculator.cc Wed Dec 22 12:00:17 2004
+--- src/libqalculate/Calculator.cc.orig Fri Mar 11 15:07:18 2005
++++ src/libqalculate/Calculator.cc Fri Mar 11 15:07:44 2005
@@ -33,7 +33,7 @@
#include <sys/types.h>
#include <sys/stat.h>
diff -ruN qalculate.orig/files/patch-src::qalc.cc qalculate/files/patch-src::qalc.cc
--- qalculate.orig/files/patch-src::qalc.cc Thu Mar 10 16:16:31 2005
+++ qalculate/files/patch-src::qalc.cc Fri Mar 11 15:25:52 2005
@@ -1,16 +1,5 @@
---- src/qalc.cc.orig Wed Dec 22 14:30:48 2004
-+++ src/qalc.cc Wed Dec 22 14:31:16 2004
-@@ -16,7 +16,7 @@
- #include <time.h>
- #include <pthread.h>
- #include <dirent.h>
--#include <malloc.h>
-+#include <stdlib.h>
- #include <stdio.h>
- #include <vector>
- #include <glib.h>
---- src/qalc.cc.orig Wed Dec 22 14:30:48 2004
-+++ src/qalc.cc Wed Dec 22 14:31:16 2004
+--- src/qalc.cc.orig Fri Mar 11 15:24:57 2005
++++ src/qalc.cc Fri Mar 11 15:25:24 2005
@@ -16,7 +16,7 @@
#include <time.h>
#include <pthread.h>
diff -ruN qalculate.orig/pkg-plist qalculate/pkg-plist
--- qalculate.orig/pkg-plist Tue Oct 12 23:57:06 2004
+++ qalculate/pkg-plist Fri Mar 11 15:01:13 2005
@@ -1,67 +1,72 @@
bin/qalculate
-bin/qalculate-gtk
share/gnome/applnk/Utilities/qalculate.desktop
share/gnome/applications/qalculate.desktop
-share/gnome/help/qalculate-gtk/C/legal.xml
-share/gnome/help/qalculate-gtk/C/qalculate-gtk.xml
-share/gnome/help/qalculate-gtk/C/figures/calculation-history.png
-share/gnome/help/qalculate-gtk/C/figures/calculator-buttons-screen.png
-share/gnome/help/qalculate-gtk/C/figures/calculator-buttons.png
-share/gnome/help/qalculate-gtk/C/figures/completion.png
-share/gnome/help/qalculate-gtk/C/figures/convert-number-bases.png
-share/gnome/help/qalculate-gtk/C/figures/convert-unit.png
-share/gnome/help/qalculate-gtk/C/figures/edit-function.png
-share/gnome/help/qalculate-gtk/C/figures/edit-matrix.png
-share/gnome/help/qalculate-gtk/C/figures/edit-unit.png
-share/gnome/help/qalculate-gtk/C/figures/function-manager.png
-share/gnome/help/qalculate-gtk/C/figures/gnuplot.png
-share/gnome/help/qalculate-gtk/C/figures/import-csv.png
-share/gnome/help/qalculate-gtk/C/figures/insert-function-screen.png
-share/gnome/help/qalculate-gtk/C/figures/insert-function.png
-share/gnome/help/qalculate-gtk/C/figures/mainwindow-screen.png
-share/gnome/help/qalculate-gtk/C/figures/mainwindow.png
-share/gnome/help/qalculate-gtk/C/figures/plot-data.png
-share/gnome/help/qalculate-gtk/C/figures/plot-settings.png
-share/gnome/help/qalculate-gtk/C/figures/store-variable.png
-share/gnome/help/qalculate-gtk/C/figures/unit-manager.png
-share/gnome/help/qalculate-gtk/C/figures/variable-manager.png
-share/gnome/omf/qalculate-gtk/qalculate-gtk-C.omf
-share/gnome/qalculate-gtk/glade/about.glade
-share/gnome/qalculate-gtk/glade/argumentrules.glade
-share/gnome/qalculate-gtk/glade/csvexport.glade
-share/gnome/qalculate-gtk/glade/csvimport.glade
-share/gnome/qalculate-gtk/glade/decimals.glade
-share/gnome/qalculate-gtk/glade/functionedit.glade
-share/gnome/qalculate-gtk/glade/functions.glade
-share/gnome/qalculate-gtk/glade/main.glade
-share/gnome/qalculate-gtk/glade/matrixedit.glade
-share/gnome/qalculate-gtk/glade/namesedit.glade
-share/gnome/qalculate-gtk/glade/nbases.glade
-share/gnome/qalculate-gtk/glade/nbexpression.glade
-share/gnome/qalculate-gtk/glade/periodictable.glade
-share/gnome/qalculate-gtk/glade/plot.glade
-share/gnome/qalculate-gtk/glade/precision.glade
-share/gnome/qalculate-gtk/glade/preferences.glade
-share/gnome/qalculate-gtk/glade/unit.glade
-share/gnome/qalculate-gtk/glade/unitedit.glade
-share/gnome/qalculate-gtk/glade/units.glade
-share/gnome/qalculate-gtk/glade/unknownedit.glade
-share/gnome/qalculate-gtk/glade/variableedit.glade
-share/gnome/qalculate-gtk/glade/variables.glade
+share/gnome/help/qalculate/C/appendixa.xml
+share/gnome/help/qalculate/C/appendixb.xml
+share/gnome/help/qalculate/C/appendixc.xml
+share/gnome/help/qalculate/C/legal.xml
+share/gnome/help/qalculate/C/qalculate.xml
+share/gnome/help/qalculate/C/figures/calculation-history.png
+share/gnome/help/qalculate/C/figures/calculator-buttons-screen.png
+share/gnome/help/qalculate/C/figures/calculator-buttons.png
+share/gnome/help/qalculate/C/figures/completion.png
+share/gnome/help/qalculate/C/figures/convert-number-bases.png
+share/gnome/help/qalculate/C/figures/convert-unit.png
+share/gnome/help/qalculate/C/figures/edit-function.png
+share/gnome/help/qalculate/C/figures/edit-matrix.png
+share/gnome/help/qalculate/C/figures/edit-unit.png
+share/gnome/help/qalculate/C/figures/function-manager.png
+share/gnome/help/qalculate/C/figures/gnuplot.png
+share/gnome/help/qalculate/C/figures/import-csv.png
+share/gnome/help/qalculate/C/figures/insert-function-screen.png
+share/gnome/help/qalculate/C/figures/insert-function.png
+share/gnome/help/qalculate/C/figures/mainwindow-screen.png
+share/gnome/help/qalculate/C/figures/mainwindow.png
+share/gnome/help/qalculate/C/figures/plot-data.png
+share/gnome/help/qalculate/C/figures/plot-settings.png
+share/gnome/help/qalculate/C/figures/store-variable.png
+share/gnome/help/qalculate/C/figures/unit-manager.png
+share/gnome/help/qalculate/C/figures/variable-manager.png
+share/gnome/omf/qalculate/qalculate-C.omf
+share/gnome/qalculate/glade/about.glade
+share/gnome/qalculate/glade/argumentrules.glade
+share/gnome/qalculate/glade/csvexport.glade
+share/gnome/qalculate/glade/csvimport.glade
+share/gnome/qalculate/glade/datasetedit.glade
+share/gnome/qalculate/glade/datasets.glade
+share/gnome/qalculate/glade/decimals.glade
+share/gnome/qalculate/glade/functionedit.glade
+share/gnome/qalculate/glade/functions.glade
+share/gnome/qalculate/glade/main.glade
+share/gnome/qalculate/glade/matrixedit.glade
+share/gnome/qalculate/glade/namesedit.glade
+share/gnome/qalculate/glade/nbases.glade
+share/gnome/qalculate/glade/nbexpression.glade
+share/gnome/qalculate/glade/periodictable.glade
+share/gnome/qalculate/glade/plot.glade
+share/gnome/qalculate/glade/precision.glade
+share/gnome/qalculate/glade/preferences.glade
+share/gnome/qalculate/glade/unit.glade
+share/gnome/qalculate/glade/unitedit.glade
+share/gnome/qalculate/glade/units.glade
+share/gnome/qalculate/glade/unknownedit.glade
+share/gnome/qalculate/glade/variableedit.glade
+share/gnome/qalculate/glade/variables.glade
+share/gnome/qalculate/datasets.xml
share/gnome/qalculate/elements.xml
share/gnome/qalculate/functions.xml
+share/gnome/qalculate/planets.xml
share/gnome/qalculate/prefixes.xml
share/gnome/qalculate/units.xml
share/gnome/qalculate/variables.xml
-share/locale/sv/LC_MESSAGES/qalculate-gtk.mo
-@exec scrollkeeper-install -q %D/share/gnome/omf/qalculate-gtk/qalculate-gtk-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/qalculate-gtk/qalculate-gtk-C.omf 2>/dev/null || /usr/bin/true
+share/locale/sv/LC_MESSAGES/qalculate.mo
+@exec scrollkeeper-install -q %D/share/gnome/omf/qalculate/qalculate-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/qalculate/qalculate-C.omf 2>/dev/null || /usr/bin/true
@dirrm share/gnome/applnk/Utilities
@dirrm share/gnome/applnk
-@dirrm share/gnome/help/qalculate-gtk/C/figures
-@dirrm share/gnome/help/qalculate-gtk/C
-@dirrm share/gnome/help/qalculate-gtk
-@dirrm share/gnome/omf/qalculate-gtk
+@dirrm share/gnome/help/qalculate/C/figures
+@dirrm share/gnome/help/qalculate/C
+@dirrm share/gnome/help/qalculate
+@dirrm share/gnome/omf/qalculate
+@dirrm share/gnome/qalculate/glade
@dirrm share/gnome/qalculate
-@dirrm share/gnome/qalculate-gtk/glade
-@dirrm share/gnome/qalculate-gtk
--- qalculate.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050311132250.6257A720418>