diff options
| author | Kirill Ponomarev <krion@FreeBSD.org> | 2005-08-05 15:13:50 +0000 |
|---|---|---|
| committer | Kirill Ponomarev <krion@FreeBSD.org> | 2005-08-05 15:13:50 +0000 |
| commit | fba2f3a4ceff140ef83dfc444e9b18db38adf6d2 (patch) | |
| tree | b280c243c179260d391cf1e25dc3e507918a1b5c /math/asir2000 | |
| parent | Fix double-free bug (also reported upstream). (diff) | |
Update to 20050603 and fix build on 6.x/7.x
Approved by: portmgr (implicit)
Notes
Notes:
svn path=/head/; revision=140791
Diffstat (limited to 'math/asir2000')
| -rw-r--r-- | math/asir2000/Makefile | 6 | ||||
| -rw-r--r-- | math/asir2000/distinfo | 8 | ||||
| -rw-r--r-- | math/asir2000/files/patch-engine_Z.c | 30 |
3 files changed, 37 insertions, 7 deletions
diff --git a/math/asir2000/Makefile b/math/asir2000/Makefile index 601601fb0624..385e35f0ebf0 100644 --- a/math/asir2000/Makefile +++ b/math/asir2000/Makefile @@ -6,7 +6,7 @@ # PORTNAME= asir -PORTVERSION= 20050131 +PORTVERSION= 20050603 CATEGORIES= math MASTER_SITES= ftp://ftp.jssac.org/pub/distfiles/asir/ \ ftp://ftp.asir.org/pub/asir/src/ @@ -23,8 +23,8 @@ USE_AUTOCONF_VER= 253 USE_AUTOMAKE_VER= 15 USE_XLIB= yes CONFIGURE_ARGS= --enable-shared --enable-plot --enable-fep --enable-interval --with-pari -ASIR_SRC_VERSION= 20050112 -ASIR_DOC_VERSION= 20050111 +ASIR_SRC_VERSION= 20050603 +ASIR_DOC_VERSION= 20050603 ASIR_SRC= asir-${ASIR_DOC_VERSION}.tar.gz ASIR_DOC= asirdoc-${ASIR_DOC_VERSION}.tar.gz MAN1= asir.1 diff --git a/math/asir2000/distinfo b/math/asir2000/distinfo index 98e6d6e56ac9..f6af60a667f6 100644 --- a/math/asir2000/distinfo +++ b/math/asir2000/distinfo @@ -1,4 +1,4 @@ -MD5 (asir-20050111.tar.gz) = c6b118ae804bd4c4d2bfe6a423553756 -SIZE (asir-20050111.tar.gz) = 2360127 -MD5 (asirdoc-20050111.tar.gz) = 9b0ad90478fe1c8774f565aa67002371 -SIZE (asirdoc-20050111.tar.gz) = 1569253 +MD5 (asir-20050603.tar.gz) = 0ac9b56dd2fbb95be98ca776d0806434 +SIZE (asir-20050603.tar.gz) = 2368279 +MD5 (asirdoc-20050603.tar.gz) = 4ef0155807ebdae3df234f26b0e4eeb1 +SIZE (asirdoc-20050603.tar.gz) = 1339927 diff --git a/math/asir2000/files/patch-engine_Z.c b/math/asir2000/files/patch-engine_Z.c new file mode 100644 index 000000000000..4e432ae1a541 --- /dev/null +++ b/math/asir2000/files/patch-engine_Z.c @@ -0,0 +1,30 @@ + +$FreeBSD$ + +--- engine/Z.c.orig ++++ engine/Z.c +@@ -2,19 +2,11 @@ + #include "base.h" + #include "inline.h" + +-#if defined(__GNUC__) +-#define INLINE inline +-#elif defined(VISUAL) +-#define INLINE __inline +-#else +-#define INLINE +-#endif +- +-INLINE void _addz(Z n1,Z n2,Z nr); +-INLINE void _subz(Z n1,Z n2,Z nr); +-INLINE void _mulz(Z n1,Z n2,Z nr); +-INLINE int _addz_main(unsigned int *m1,int d1,unsigned int *m2,int d2,unsigned int *mr); +-INLINE int _subz_main(unsigned int *m1,int d1,unsigned int *m2,int d2,unsigned int *mr); ++void _addz(Z n1,Z n2,Z nr); ++void _subz(Z n1,Z n2,Z nr); ++void _mulz(Z n1,Z n2,Z nr); ++int _addz_main(unsigned int *m1,int d1,unsigned int *m2,int d2,unsigned int *mr); ++int _subz_main(unsigned int *m1,int d1,unsigned int *m2,int d2,unsigned int *mr); + + /* immediate int -> Z */ + #define UTOZ(c,n) (n)=(!((unsigned int)(c))?0:(((unsigned int)(c))<=IMM_MAX?((Z)((((unsigned int)(c))<<1)|1)):utoz((unsigned int)(c)))) |