On Tue Apr 25, 2017 at 02:42:53PM +0300, Paul Irofti wrote:
> A few comments below.
>
> > Index: Makefile
> > ===================================================================
> [...]
> > -MODULES = lang/python
> > -BUILD_DEPENDS = devel/doxygen
> > +MODULES = lang/python \
> > + gcc4
> > +
> > +MODGCC4_LANGS = c++
> > +MODGCC4_ARCHS = ${GCC3_ARCHS} ${GCC4_ARCHS}
>
> Is this a new idiom? gcc3 archs under gcc4 archs?
>
> > Index: distinfo
> > ===================================================================
> > RCS file: /cvs/ports/math/ginac/distinfo,v
> > retrieving revision 1.9
> > diff -u -p -u -p -r1.9 distinfo
> > --- distinfo 27 Jun 2015 10:26:38 -0000 1.9
> > +++ distinfo 23 Apr 2017 18:34:30 -0000
> > @@ -1,2 +1,2 @@
> > -SHA256 (ginac-1.6.4.tar.bz2) = YkEVgha09oxiXOfYQ9W2sHAwT4fn/I9AdbdlAcoPPGA=
> > -SIZE (ginac-1.6.4.tar.bz2) = 1028044
> > +SHA256 (ginac-1.7.2.tar.bz2) = JLdbYcXLJyU041s/LP1k8FOyiu50Aq9LDlaexN4h2Lc=
> > +SIZE (ginac-1.7.2.tar.bz2) = 1056339
> > Index: patches/patch-check_check_matrices_cpp
> > ===================================================================
> > RCS file: patches/patch-check_check_matrices_cpp
> > diff -N patches/patch-check_check_matrices_cpp
> > --- patches/patch-check_check_matrices_cpp 17 Mar 2009 11:53:01 -0000
> > 1.2
> > +++ /dev/null 1 Jan 1970 00:00:00 -0000
> > @@ -1,12 +0,0 @@
> > -$OpenBSD: patch-check_check_matrices_cpp,v 1.2 2009/03/17 11:53:01 pirofti
> > Exp $
> > ---- check/check_matrices.cpp.orig Tue Feb 17 14:39:22 2009
> > -+++ check/check_matrices.cpp Tue Mar 10 16:12:26 2009
> > -@@ -217,7 +217,7 @@ unsigned check_matrices()
> > - result += rational_matrix_determinants(); cout << '.' << flush;
> > - result += funny_matrix_determinants(); cout << '.' << flush;
> > - result += compare_matrix_determinants(); cout << '.' << flush;
> > -- result += symbolic_MATrix_inverse(); cout << '.' << flush;
> > -+ //result += symbolic_matrix_inverse(); cout << '.' << flush;
> > -
> > - return result;
> > - }
>
>
> This patch is broken, see the MAT capitalization. Does this regress test
> pass now w/o disabling the inverse test?
Testsuite looks good without this patch one amd64:
============================================================================
Testsuite summary for GiNaC 1.7.2
============================================================================
# TOTAL: 61
# # PASS: 61
# # SKIP: 0
# # XFAIL: 0
# # FAIL: 0
# # XPASS: 0
# # ERROR: 0
# ============================================================================
>
> > Index: pkg/DESCR
> > ===================================================================
> > RCS file: /cvs/ports/math/ginac/pkg/DESCR,v
> > retrieving revision 1.1.1.1
> > diff -u -p -u -p -r1.1.1.1 DESCR
> > --- pkg/DESCR 1 Dec 2007 13:38:38 -0000 1.1.1.1
> > +++ pkg/DESCR 23 Apr 2017 18:34:30 -0000
> > @@ -1,8 +1,7 @@
> > -The name GiNaC is an iterated and recursive abbreviation for GiNaC is
> > -Not a CAS, where CAS stands for Computer Algebra System. It has been
> > -developed to become a replacement engine for xloops which in the past
> > -was powered by the Maple CAS. Its design is revolutionary in a sense
> > -that contrary to other CAS it does not try to provide extensive
> > -algebraic capabilities and a simple programming language but instead
> > -accepts a given language (C++) and extends it by a set of algebraic
> > -capabilities.
> > +The name GiNaC is an iterated and recursive abbreviation for GiNaC is Not a
> > +CAS, where CAS stands for Computer Algebra System. It has been developed to
> > +become a replacement engine for xloops which in the past was powered by the
> > +Maple CAS. Its design is revolutionary in a sense that contrary to other
> > CAS it
> > +does not try to provide extensive algebraic capabilities and a simple
> > +programming language but instead accepts a given language (C++) and
> > extends it
> > +by a set of algebraic capabilities.
>
> Did you wrap the text here? Why do you need this?
I wanted to use the full line length, anyway new patch below with
input from you and sthen@.
Thanks and regards,
Rafael
Index: Makefile
===================================================================
RCS file: /cvs/ports/math/ginac/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- Makefile 10 Apr 2017 11:46:22 -0000 1.23
+++ Makefile 25 Apr 2017 19:41:25 -0000
@@ -2,29 +2,34 @@
COMMENT= GiNaC is Not a Computer Algebra System (CAS)
-DISTNAME= ginac-1.6.4
-SHARED_LIBS += ginac 5.0 # 0.5
+DISTNAME= ginac-1.7.2
+SHARED_LIBS += ginac 6.0 # 0.5
CATEGORIES= math
-HOMEPAGE= http://www.ginac.de/
+HOMEPAGE= https://www.ginac.de/
MAINTAINER= Paul Irofti <piro...@openbsd.org>
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
-MASTER_SITES= ${HOMEPAGE} \
- ftp://ftpthep.physik.uni-mainz.de/pub/GiNaC/
+MASTER_SITES= ${HOMEPAGE}
EXTRACT_SUFX= .tar.bz2
WANTLIB= c m ncurses readline ${LIBCXX} gmp cln
-MODULES = lang/python
-BUILD_DEPENDS = devel/doxygen
+MODULES = lang/python \
+ gcc4
+
+MODGCC4_LANGS = c++
+MODGCC4_ARCHS = *
+
LIB_DEPENDS= devel/cln
USE_GMAKE= Yes
CONFIGURE_STYLE=gnu
+
+CONFIGURE_ENV= ac_cv_path_DOXYGEN=""
TEST_TARGET= check
Index: distinfo
===================================================================
RCS file: /cvs/ports/math/ginac/distinfo,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 distinfo
--- distinfo 27 Jun 2015 10:26:38 -0000 1.9
+++ distinfo 25 Apr 2017 19:41:25 -0000
@@ -1,2 +1,2 @@
-SHA256 (ginac-1.6.4.tar.bz2) = YkEVgha09oxiXOfYQ9W2sHAwT4fn/I9AdbdlAcoPPGA=
-SIZE (ginac-1.6.4.tar.bz2) = 1028044
+SHA256 (ginac-1.7.2.tar.bz2) = JLdbYcXLJyU041s/LP1k8FOyiu50Aq9LDlaexN4h2Lc=
+SIZE (ginac-1.7.2.tar.bz2) = 1056339
Index: patches/patch-check_check_matrices_cpp
===================================================================
RCS file: /cvs/ports/math/ginac/patches/patch-check_check_matrices_cpp,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-check_check_matrices_cpp
--- patches/patch-check_check_matrices_cpp 17 Mar 2009 11:53:01 -0000
1.2
+++ patches/patch-check_check_matrices_cpp 25 Apr 2017 19:41:25 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-check_check_matrices_cpp,v 1.2 2009/03/17 11:53:01 pirofti Exp
$
---- check/check_matrices.cpp.orig Tue Feb 17 14:39:22 2009
-+++ check/check_matrices.cpp Tue Mar 10 16:12:26 2009
-@@ -217,7 +217,7 @@ unsigned check_matrices()
- result += rational_matrix_determinants(); cout << '.' << flush;
- result += funny_matrix_determinants(); cout << '.' << flush;
- result += compare_matrix_determinants(); cout << '.' << flush;
-- result += symbolic_matrix_inverse(); cout << '.' << flush;
-+ //result += symbolic_matrix_inverse(); cout << '.' << flush;
-
- return result;
- }
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/math/ginac/patches/patch-configure,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-configure
--- patches/patch-configure 18 Aug 2011 15:19:54 -0000 1.5
+++ patches/patch-configure 25 Apr 2017 19:41:25 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.5 2011/08/18 15:19:54 pirofti Exp $
---- configure.orig Mon Jul 18 22:09:56 2011
-+++ configure Thu Aug 18 02:17:28 2011
-@@ -11473,7 +11473,7 @@ if ${ac_cv_lib_dl_dlopen+:} false; then :
+--- configure.orig Sun Apr 23 20:10:28 2017
++++ configure Sun Apr 23 20:12:42 2017
+@@ -12145,7 +12145,7 @@ if ${ac_cv_lib_dl_dlopen+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.5 2011/08/
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -11526,7 +11526,7 @@ if ${ac_cv_lib_dld_shl_load+:} false; then :
+@@ -12206,7 +12206,7 @@ if ${ac_cv_lib_dld_shl_load+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -19,7 +19,7 @@ $OpenBSD: patch-configure,v 1.5 2011/08/
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -11569,7 +11569,7 @@ if ${ac_cv_lib_dl_dlopen+:} false; then :
+@@ -12249,7 +12249,7 @@ if ${ac_cv_lib_dl_dlopen+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -28,7 +28,7 @@ $OpenBSD: patch-configure,v 1.5 2011/08/
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -11647,7 +11647,7 @@ if ${ac_cv_lib_dld_dld_link+:} false; then :
+@@ -12327,7 +12327,7 @@ if ${ac_cv_lib_dld_dld_link+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -37,7 +37,7 @@ $OpenBSD: patch-configure,v 1.5 2011/08/
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -16399,14 +16399,14 @@ fi
+@@ -18302,14 +18302,14 @@ fi
if test "$CONFIG_EXCOMPILER" = "yes"; then
found_dlopen_lib="no"
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/math/ginac/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 PLIST
--- pkg/PLIST 6 Jan 2015 21:11:54 -0000 1.5
+++ pkg/PLIST 25 Apr 2017 19:41:25 -0000
@@ -1,5 +1,4 @@
@comment $OpenBSD: PLIST,v 1.5 2015/01/06 21:11:54 sthen Exp $
-bin/ginac-excompiler
@bin bin/ginsh
@bin bin/viewgar
include/ginac/
@@ -10,6 +9,7 @@ include/ginac/basic.h
include/ginac/class_info.h
include/ginac/clifford.h
include/ginac/color.h
+include/ginac/compiler.h
include/ginac/constant.h
include/ginac/container.h
include/ginac/ex.h
@@ -55,5 +55,6 @@ lib/libginac.a
lib/libginac.la
@lib lib/libginac.so.${LIBginac_VERSION}
lib/pkgconfig/ginac.pc
+libexec/ginac-excompiler
@man man/man1/ginsh.1
@man man/man1/viewgar.1
