Attachment #51887 for bug #78696

View | Details | Raw Unified | Return to bug 78696
Collapse All | Expand All




#

PORTNAME=	qalculate
PORTVERSION=	0.7.2
PORTREVISION=	1
CATEGORIES=	math
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}
#DISTNAME=	${PORTNAME}-gtk-${PORTVERSION}

MAINTAINER=	asa@agava.com
COMMENT=	Very powerful GUI calculator for GNOME

LIB_DEPENDS=	cln.3:${PORTSDIR}/math/cln

.include <bsd.port.pre.mk>

.if ${OSVERSION} < 500000
IGNORE=		Maintainer could not test this port on 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
.endif

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)qalculate/distinfo (-2 / +2 lines)
1	MD5 (qalculate-gtk-0.6.3.tar.gz) = 6deb12cb5b457c42f26f0da9abf442f4	1	MD5 (qalculate-0.7.2.tar.gz) = 75af1f213829fb0905ce6784ee0e1017
2	SIZE (qalculate-gtk-0.6.3.tar.gz) = 1387128	2	SIZE (qalculate-0.7.2.tar.gz) = 1504796

Lines 1-11 Link Here

(-)qalculate/files/extra-patch-FreeBSD4 (-11 lines)
1	--- src/calclib/Calculator.cc.orig Sun Aug 29 17:22:28 2004
2	+++ src/calclib/Calculator.cc Sun Aug 29 17:27:37 2004
3	@@ -225,7 +225,7 @@
4
5	saved_locale = strdup(setlocale(LC_NUMERIC, NULL));
6	struct lconv *lc = localeconv();
7	- place_currency_code_before = lc->int_p_cs_precedes;
8	+ place_currency_code_before = lc->p_cs_precedes;
9	place_currency_sign_before = lc->p_cs_precedes;
10	setlocale(LC_NUMERIC, "C");
11	ILLEGAL_IN_NAMES = DOT_S + RESERVED OPERATORS SPACES PARENTHESISS VECTOR_WRAPS;

Lines 1-11 Link Here

(-)qalculate/files/patch-src::Makefile.in (-11 lines)
1	--- src/Makefile.in.orig Wed Sep 1 10:41:43 2004
2	+++ src/Makefile.in Wed Sep 1 10:41:50 2004
3	@@ -110,7 +110,7 @@
4	LIBOBJS = @LIBOBJS@
5	LIBS = @LIBS@
6	LIBTOOL = @LIBTOOL@
7	-LN_S = @LN_S@
8	+LN_S = @LN_S@ -f
9	LTLIBOBJS = @LTLIBOBJS@
10	MAINT = @MAINT@
11	MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@




--- 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>
 




--- 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>
 #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
@@ -33,7 +33,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>




--- 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>
 #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
@@ -16,7 +16,7 @@
 #include <time.h>
 #include <pthread.h>




bin/qalculate
bin/qalculate-gtk
share/gnome/applnk/Utilities/qalculate.desktop
share/gnome/applications/qalculate.desktop
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.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/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

Return to bug 78696

Lines 6-19 Link Here

(-)qalculate/Makefile (-8 / +4 lines)
6	#	6	#
7		7
8	PORTNAME= qalculate	8	PORTNAME= qalculate
9	PORTVERSION= 0.6.3	9	PORTVERSION= 0.7.2
10	PORTREVISION= 1
11	CATEGORIES= math	10	CATEGORIES= math
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
14	DISTNAME= ${PORTNAME}-gtk-${PORTVERSION}	13	#DISTNAME= ${PORTNAME}-gtk-${PORTVERSION}
15		14
16	MAINTAINER= asa@gascom.ru	15	MAINTAINER= asa@agava.com
17	COMMENT= Very powerful GUI calculator for GNOME	16	COMMENT= Very powerful GUI calculator for GNOME
18		17
19	LIB_DEPENDS= cln.3:${PORTSDIR}/math/cln	18	LIB_DEPENDS= cln.3:${PORTSDIR}/math/cln
Lines 28-37 Link Here
28	.include <bsd.port.pre.mk>	27	.include <bsd.port.pre.mk>
29		28
30	.if ${OSVERSION} < 500000	29	.if ${OSVERSION} < 500000
31	# cln is built with gcc 3.4 on FreeBSD 4.x	30	IGNORE= Maintainer could not test this port on 4.x
32	USE_GCC= 3.4
33	# in FreeBSD 4.x struct liconv does not contain int_p_cs_precedes
34	EXTRA_PATCHES= ${FILESDIR}/extra-patch-FreeBSD4
35	.endif	31	.endif
36		32
37	.include <bsd.port.post.mk>	33	.include <bsd.port.post.mk>

Lines 1-15 Link Here

(-)qalculate/files/patch-src::calclib::Calculator.cc (-15 lines)
1	--- src/calclib/Calculator.cc.orig Thu Jul 8 12:00:01 2004
2	+++ src/calclib/Calculator.cc Thu Jul 8 12:05:08 2004
3	@@ -27,9 +27,11 @@
4	#include <unistd.h>
5	#include <time.h>
6	#include <sys/types.h>
7	+#include <sys/wait.h>
8	#include <sys/stat.h>
9	+#include <sys/time.h>
10	+#include <sys/resource.h>
11	#include <dirent.h>
12	-#include <wait.h>
13	#include <queue>
14	#include <stack>
15

Lines 1-16 Link Here

(-)qalculate/files/patch-src::libcalculate::Calculator.cc (-13 / +2 lines)
1	--- src/libqalculate/Calculator.cc.orig Wed Dec 22 12:00:09 2004	1	--- src/libqalculate/Calculator.cc.orig Fri Mar 11 15:07:18 2005
2	+++ src/libqalculate/Calculator.cc Wed Dec 22 12:00:17 2004	2	+++ src/libqalculate/Calculator.cc Fri Mar 11 15:07:44 2005
3	@@ -33,7 +33,7 @@
4	#include <sys/types.h>
5	#include <sys/stat.h>
6	#include <dirent.h>
7	-#include <wait.h>
8	+#include <sys/wait.h>
9	#include <queue>
10	#include <glib.h>
11
12	--- src/libqalculate/Calculator.cc.orig Wed Dec 22 12:00:09 2004
13	+++ src/libqalculate/Calculator.cc Wed Dec 22 12:00:17 2004
14	@@ -33,7 +33,7 @@	3	@@ -33,7 +33,7 @@
15	#include <sys/types.h>	4	#include <sys/types.h>
16	#include <sys/stat.h>	5	#include <sys/stat.h>

Lines 1-16 Link Here

(-)qalculate/files/patch-src::qalc.cc (-13 / +2 lines)
1	--- src/qalc.cc.orig Wed Dec 22 14:30:48 2004	1	--- src/qalc.cc.orig Fri Mar 11 15:24:57 2005
2	+++ src/qalc.cc Wed Dec 22 14:31:16 2004	2	+++ src/qalc.cc Fri Mar 11 15:25:24 2005
3	@@ -16,7 +16,7 @@
4	#include <time.h>
5	#include <pthread.h>
6	#include <dirent.h>
7	-#include <malloc.h>
8	+#include <stdlib.h>
9	#include <stdio.h>
10	#include <vector>
11	#include <glib.h>
12	--- src/qalc.cc.orig Wed Dec 22 14:30:48 2004
13	+++ src/qalc.cc Wed Dec 22 14:31:16 2004
14	@@ -16,7 +16,7 @@	3	@@ -16,7 +16,7 @@
15	#include <time.h>	4	#include <time.h>
16	#include <pthread.h>	5	#include <pthread.h>

Lines 1-67 Link Here

(-)qalculate/pkg-plist (-56 / +61 lines)
1	bin/qalculate	1	bin/qalculate
2	bin/qalculate-gtk
3	share/gnome/applnk/Utilities/qalculate.desktop	2	share/gnome/applnk/Utilities/qalculate.desktop
4	share/gnome/applications/qalculate.desktop	3	share/gnome/applications/qalculate.desktop
5	share/gnome/help/qalculate-gtk/C/legal.xml	4	share/gnome/help/qalculate/C/appendixa.xml
6	share/gnome/help/qalculate-gtk/C/qalculate-gtk.xml	5	share/gnome/help/qalculate/C/appendixb.xml
7	share/gnome/help/qalculate-gtk/C/figures/calculation-history.png	6	share/gnome/help/qalculate/C/appendixc.xml
8	share/gnome/help/qalculate-gtk/C/figures/calculator-buttons-screen.png	7	share/gnome/help/qalculate/C/legal.xml
9	share/gnome/help/qalculate-gtk/C/figures/calculator-buttons.png	8	share/gnome/help/qalculate/C/qalculate.xml
10	share/gnome/help/qalculate-gtk/C/figures/completion.png	9	share/gnome/help/qalculate/C/figures/calculation-history.png
11	share/gnome/help/qalculate-gtk/C/figures/convert-number-bases.png	10	share/gnome/help/qalculate/C/figures/calculator-buttons-screen.png
12	share/gnome/help/qalculate-gtk/C/figures/convert-unit.png	11	share/gnome/help/qalculate/C/figures/calculator-buttons.png
13	share/gnome/help/qalculate-gtk/C/figures/edit-function.png	12	share/gnome/help/qalculate/C/figures/completion.png
14	share/gnome/help/qalculate-gtk/C/figures/edit-matrix.png	13	share/gnome/help/qalculate/C/figures/convert-number-bases.png
15	share/gnome/help/qalculate-gtk/C/figures/edit-unit.png	14	share/gnome/help/qalculate/C/figures/convert-unit.png
16	share/gnome/help/qalculate-gtk/C/figures/function-manager.png	15	share/gnome/help/qalculate/C/figures/edit-function.png
17	share/gnome/help/qalculate-gtk/C/figures/gnuplot.png	16	share/gnome/help/qalculate/C/figures/edit-matrix.png
18	share/gnome/help/qalculate-gtk/C/figures/import-csv.png	17	share/gnome/help/qalculate/C/figures/edit-unit.png
19	share/gnome/help/qalculate-gtk/C/figures/insert-function-screen.png	18	share/gnome/help/qalculate/C/figures/function-manager.png
20	share/gnome/help/qalculate-gtk/C/figures/insert-function.png	19	share/gnome/help/qalculate/C/figures/gnuplot.png
21	share/gnome/help/qalculate-gtk/C/figures/mainwindow-screen.png	20	share/gnome/help/qalculate/C/figures/import-csv.png
22	share/gnome/help/qalculate-gtk/C/figures/mainwindow.png	21	share/gnome/help/qalculate/C/figures/insert-function-screen.png
23	share/gnome/help/qalculate-gtk/C/figures/plot-data.png	22	share/gnome/help/qalculate/C/figures/insert-function.png
24	share/gnome/help/qalculate-gtk/C/figures/plot-settings.png	23	share/gnome/help/qalculate/C/figures/mainwindow-screen.png
25	share/gnome/help/qalculate-gtk/C/figures/store-variable.png	24	share/gnome/help/qalculate/C/figures/mainwindow.png
26	share/gnome/help/qalculate-gtk/C/figures/unit-manager.png	25	share/gnome/help/qalculate/C/figures/plot-data.png
27	share/gnome/help/qalculate-gtk/C/figures/variable-manager.png	26	share/gnome/help/qalculate/C/figures/plot-settings.png
28	share/gnome/omf/qalculate-gtk/qalculate-gtk-C.omf	27	share/gnome/help/qalculate/C/figures/store-variable.png
29	share/gnome/qalculate-gtk/glade/about.glade	28	share/gnome/help/qalculate/C/figures/unit-manager.png
30	share/gnome/qalculate-gtk/glade/argumentrules.glade	29	share/gnome/help/qalculate/C/figures/variable-manager.png
31	share/gnome/qalculate-gtk/glade/csvexport.glade	30	share/gnome/omf/qalculate/qalculate-C.omf
32	share/gnome/qalculate-gtk/glade/csvimport.glade	31	share/gnome/qalculate/glade/about.glade
33	share/gnome/qalculate-gtk/glade/decimals.glade	32	share/gnome/qalculate/glade/argumentrules.glade
34	share/gnome/qalculate-gtk/glade/functionedit.glade	33	share/gnome/qalculate/glade/csvexport.glade
35	share/gnome/qalculate-gtk/glade/functions.glade	34	share/gnome/qalculate/glade/csvimport.glade
36	share/gnome/qalculate-gtk/glade/main.glade	35	share/gnome/qalculate/glade/datasetedit.glade
37	share/gnome/qalculate-gtk/glade/matrixedit.glade	36	share/gnome/qalculate/glade/datasets.glade
38	share/gnome/qalculate-gtk/glade/namesedit.glade	37	share/gnome/qalculate/glade/decimals.glade
39	share/gnome/qalculate-gtk/glade/nbases.glade	38	share/gnome/qalculate/glade/functionedit.glade
40	share/gnome/qalculate-gtk/glade/nbexpression.glade	39	share/gnome/qalculate/glade/functions.glade
41	share/gnome/qalculate-gtk/glade/periodictable.glade	40	share/gnome/qalculate/glade/main.glade
42	share/gnome/qalculate-gtk/glade/plot.glade	41	share/gnome/qalculate/glade/matrixedit.glade
43	share/gnome/qalculate-gtk/glade/precision.glade	42	share/gnome/qalculate/glade/namesedit.glade
44	share/gnome/qalculate-gtk/glade/preferences.glade	43	share/gnome/qalculate/glade/nbases.glade
45	share/gnome/qalculate-gtk/glade/unit.glade	44	share/gnome/qalculate/glade/nbexpression.glade
46	share/gnome/qalculate-gtk/glade/unitedit.glade	45	share/gnome/qalculate/glade/periodictable.glade
47	share/gnome/qalculate-gtk/glade/units.glade	46	share/gnome/qalculate/glade/plot.glade
48	share/gnome/qalculate-gtk/glade/unknownedit.glade	47	share/gnome/qalculate/glade/precision.glade
49	share/gnome/qalculate-gtk/glade/variableedit.glade	48	share/gnome/qalculate/glade/preferences.glade
50	share/gnome/qalculate-gtk/glade/variables.glade	49	share/gnome/qalculate/glade/unit.glade
		50	share/gnome/qalculate/glade/unitedit.glade
		51	share/gnome/qalculate/glade/units.glade
		52	share/gnome/qalculate/glade/unknownedit.glade
		53	share/gnome/qalculate/glade/variableedit.glade
		54	share/gnome/qalculate/glade/variables.glade
		55	share/gnome/qalculate/datasets.xml
51	share/gnome/qalculate/elements.xml	56	share/gnome/qalculate/elements.xml
52	share/gnome/qalculate/functions.xml	57	share/gnome/qalculate/functions.xml
		58	share/gnome/qalculate/planets.xml
53	share/gnome/qalculate/prefixes.xml	59	share/gnome/qalculate/prefixes.xml
54	share/gnome/qalculate/units.xml	60	share/gnome/qalculate/units.xml
55	share/gnome/qalculate/variables.xml	61	share/gnome/qalculate/variables.xml
56	share/locale/sv/LC_MESSAGES/qalculate-gtk.mo	62	share/locale/sv/LC_MESSAGES/qalculate.mo
57	@exec scrollkeeper-install -q %D/share/gnome/omf/qalculate-gtk/qalculate-gtk-C.omf 2>/dev/null \|\| /usr/bin/true	63	@exec scrollkeeper-install -q %D/share/gnome/omf/qalculate/qalculate-C.omf 2>/dev/null \|\| /usr/bin/true
58	@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/qalculate-gtk/qalculate-gtk-C.omf 2>/dev/null \|\| /usr/bin/true	64	@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/qalculate/qalculate-C.omf 2>/dev/null \|\| /usr/bin/true
59	@dirrm share/gnome/applnk/Utilities	65	@dirrm share/gnome/applnk/Utilities
60	@dirrm share/gnome/applnk	66	@dirrm share/gnome/applnk
61	@dirrm share/gnome/help/qalculate-gtk/C/figures	67	@dirrm share/gnome/help/qalculate/C/figures
62	@dirrm share/gnome/help/qalculate-gtk/C	68	@dirrm share/gnome/help/qalculate/C
63	@dirrm share/gnome/help/qalculate-gtk	69	@dirrm share/gnome/help/qalculate
64	@dirrm share/gnome/omf/qalculate-gtk	70	@dirrm share/gnome/omf/qalculate
		71	@dirrm share/gnome/qalculate/glade
65	@dirrm share/gnome/qalculate	72	@dirrm share/gnome/qalculate
66	@dirrm share/gnome/qalculate-gtk/glade
67	@dirrm share/gnome/qalculate-gtk