- Update to 20070718 [1]

- Respect NOPORTDOCS and use PORTDOCS to simplify pkg-plist [2]
- Remove useless PREFIX assignment which is for user not port's Makefile [2]

PR:		ports/114723 [1]
Submitted by:	Tomokatsu SAITO <saito at a2z.co.jp> (maintainer) [1]
Approved by:	maintainer [2]

3 files changed, 26 insertions, 38 deletions

diff --git a/math/asir2000/files/patch-ag b/math/asir2000/files/patch-ag
index ca1664be124a..6ac60758df5f 100644
--- a/math/asir2000/files/patch-ag
+++ b/math/asir2000/files/patch-ag
@@ -1,5 +1,5 @@
---- parse/glob.c.orig	Tue Oct 11 00:16:38 2005
-+++ parse/glob.c	Tue Oct 11 00:24:51 2005
+--- parse/glob.c.orig	Thu Jan  4 00:48:08 2007
++++ parse/glob.c	Wed Jul 18 12:25:46 2007
 @@ -51,6 +51,7 @@
  #include "al.h"
  #include "parse.h"
@@ -8,7 +8,7 @@
  #if defined(PARI)
  #include "genpari.h"
  #endif
-@@ -767,7 +768,7 @@
+@@ -765,7 +766,7 @@
  char *get_pariversion() 
  {
  #if PARI
@@ -17,3 +17,21 @@
  	return PARIVERSION", Copyright (C) 2000-2005 The PARI Group.\n";
  #else
  	return "PARI 2.0.17, copyright 1989-1999, C. Batut, K. Belabas, D. Bernardi,\n   H. Cohen and M. Olivier.\n";
+@@ -785,7 +786,7 @@
+ 
+ void copyright()
+ {
+-	char *format = "This is Risa/Asir%s, Version %d (%s Distribution).\nCopyright (C) 1994-2000, all rights reserved, FUJITSU LABORATORIES LIMITED.\nCopyright 2000-2007, Risa/Asir committers, http://www.openxm.org/.\nGC 6.5 Copyright 1988-2005, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n%s";
++	char *format = "This is Risa/Asir%s, Version %d (%s Distribution).\nCopyright (C) 1994-2000, all rights reserved, FUJITSU LABORATORIES LIMITED.\nCopyright 2000-2007, Risa/Asir committers, http://www.openxm.org/.\nGC 6.8 Copyright 1988-2005, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n%s";
+ 	printf(format, get_intervalversion(), get_asir_version(), get_asir_distribution(), get_pariversion());
+ }
+ 
+@@ -794,7 +795,7 @@
+ 	static char *notice;
+ 	char *s1, *s2, *s3;
+ 	int d, len;
+-	char *format = "This is Risa/Asir%s, Version %d (%s Distribution).\nCopyright (C) 1994-2000, all rights reserved, FUJITSU LABORATORIES LIMITED.\nCopyright 2000-2007, Risa/Asir committers, http://www.openxm.org/.\nGC 6.5 copyright 1988-2005, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n%s";
++	char *format = "This is Risa/Asir%s, Version %d (%s Distribution).\nCopyright (C) 1994-2000, all rights reserved, FUJITSU LABORATORIES LIMITED.\nCopyright 2000-2007, Risa/Asir committers, http://www.openxm.org/.\nGC 6.8 copyright 1988-2005, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n%s";
+ 	if (!notice) {
+ 		s1 = get_intervalversion();
+ 		s2 = get_asir_distribution();
diff --git a/math/asir2000/files/patch-bg b/math/asir2000/files/patch-bg
index 8228cdc9f854..5c63716224b0 100644
--- a/math/asir2000/files/patch-bg
+++ b/math/asir2000/files/patch-bg
@@ -1,11 +1,11 @@
---- parse/Makefile.am.orig	Fri May  2 02:24:05 2003
-+++ parse/Makefile.am	Fri May  2 02:24:23 2003
-@@ -3,7 +3,7 @@
- incdir      = ${prefix}/include/asir
+--- parse/Makefile.am.orig	Sun Feb 18 17:46:47 2007
++++ parse/Makefile.am	Wed Jul 18 11:39:43 2007
+@@ -4,7 +4,7 @@
  inc_HEADERS = comp.h cpp.h parse.h w_stdio.h
  
+ GC       = gc6.8
 -asirdir  = ${prefix}/lib/asir
 +asirdir  = ${prefix}/share/asir
  DEFS     = @DEFS@ -DASIR_LIBDIR=\"${asirdir}\"
  INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/parse -I${top_srcdir}/io \
-            -I${top_srcdir}/gc/include \
+            -I${top_srcdir}/${GC}/include \
diff --git a/math/asir2000/files/patch-engine_Z.c b/math/asir2000/files/patch-engine_Z.c
deleted file mode 100644
index 4e432ae1a541..000000000000
--- a/math/asir2000/files/patch-engine_Z.c
+++ /dev/null
@@ -1,30 +0,0 @@
-
-$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))))