Upgrade to 20020910 and unbroken.

PR:		ports/42598
Submitted by:	Saito Tomokatsu <saito@asir.org> (maintainer)

6 files changed, 54 insertions, 42 deletions

diff --git a/math/asir2000/Makefile b/math/asir2000/Makefile
index 22870700ac4e..82d48283618e 100644
--- a/math/asir2000/Makefile
+++ b/math/asir2000/Makefile
@@ -6,26 +6,27 @@
 #
 
 PORTNAME=	asir
-PORTVERSION=	20020410
+PORTVERSION=	20020910
 CATEGORIES=	math
-MASTER_SITES=	ftp://ftp.asir.org/pub/asir/
+MASTER_SITES=	ftp://ftp.asir.org/pub/asir/src/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${ASIR_DOC}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	saito@asir.org
 
-BROKEN=		"Does not build"
-
 WRKSRC=		${WRKDIR}/asir2000
 PREFIX?=	${LOCALBASE}
 USE_IMAKE=	YES
+XFREE86_HTML_MAN=	no
+USE_X_PREFIX = no
 HAS_CONFIGURE=	YES
 CONFIGURE_ENV=	OLD_PARI_VERSION=${OLD_PARI_VERSION} \
 		PARI_VERSION=${PARI_VERSION} \
 		LAPACK_VERSION=${LAPACK_VERSION}
 CONFIGURE_ARGS= -oxhome ${PREFIX} -plot ${PARI} -fep -interval ${LAPACK}
-ASIR_DOC_VERSION=	20010313
+ASIR_DOC_VERSION=	20020910
 ASIR_DOC=	asirdoc-${ASIR_DOC_VERSION}.tar.gz
+MAN1=		asir.1
 
 LIB_DATA=	alpi bfct bgk const cyclic defs.h dfff dmul fctrdata fctrtest \
 		fff gr ifplot katsura launch mat nf num primdec \
@@ -41,7 +42,7 @@ PARI_VERSION=	`${GREP} PORTVERSION ${PARI_DIR}/Makefile | cut -f 2`
 LIB_DEPENDS+=	pari.1:${OLD_PARI_DIR}
 PARI=	-oldpari
 .else
-LIB_DEPENDS+=	pari-2.2.3:${PARI_DIR}
+LIB_DEPENDS+=	pari-2.2:${PARI_DIR}
 PARI=	-pari
 .endif
 
@@ -78,9 +79,11 @@ post-install:
 	   done \
 	)
 	@(cd ${WRKSRC}; make install-doc)
-	@${LN} -s ${PREFIX}/bin/asir ${DATADIR}/ox_asir
-	@${LN} -s ${PREFIX}/bin/asir ${DATADIR}/ox_plot
-	@${LN} -s ${PREFIX}/bin/asir ${DATADIR}/ox_launch
+	@${LN} -fs ${PREFIX}/bin/asir ${DATADIR}/ox_asir
+	@${LN} -fs ${PREFIX}/bin/asir ${DATADIR}/ox_plot
+	@${LN} -fs ${PREFIX}/bin/asir ${DATADIR}/ox_launch
 	@${TAR} xfz ${DISTDIR}/${ASIR_DOC} -C ${DOCSDIR}
+	@${INSTALL_MAN} ${DOCSDIR}/${MAN1} ${PREFIX}/man/man1
+	@${GZIP_CMD} ${PREFIX}/man/man1/${MAN1}
 
 .include <bsd.port.mk>
diff --git a/math/asir2000/distinfo b/math/asir2000/distinfo
index 911df6baca67..e1613faa473e 100644
--- a/math/asir2000/distinfo
+++ b/math/asir2000/distinfo
@@ -1,2 +1,2 @@
-MD5 (asir-20020410.tar.gz) = 03705e97c77a33116767b77b0643e660
-MD5 (asirdoc-20010313.tar.gz) = bd192a7dd920e53d927ddd4e42659942
+MD5 (asir-20020910.tar.gz) = bb89246a7a8d2130e96e596dd6140507
+MD5 (asirdoc-20020910.tar.gz) = 31976cc7f276c99e4c073872fffac1e3
diff --git a/math/asir2000/files/patch-ad b/math/asir2000/files/patch-ad
index 40a1e9ae0394..0833e9db4284 100644
--- a/math/asir2000/files/patch-ad
+++ b/math/asir2000/files/patch-ad
@@ -1,5 +1,5 @@
---- configure.orig	Fri Oct  5 20:01:21 2001
-+++ configure	Sat Mar  2 20:10:01 2002
+--- configure.orig	Thu Jul 25 17:53:13 2002
++++ configure	Fri Jul 26 14:44:17 2002
 @@ -4,6 +4,7 @@
  use_plot=0
  use_pari=0
@@ -17,22 +17,24 @@
  	-fep)
  		use_fep=1 ;;
  	esac
-@@ -43,12 +46,14 @@
+@@ -43,12 +46,16 @@
  libname=$libname"_pari"
  libpari=pari
  echo "#define USE_PARI" >> include/config.h
-+echo "#define PARI_VERSION \"PARI CALCULATOR Version ${OLD_PARI_VERSION}, Copyright (C) 2000 The PARI Group\"" >> include/version.h
++echo "#define PARI_VERSION \"PARI ${OLD_PARI_VERSION}, copyright (C) 2000,
++     C. Batut, K. Belabas, D. Bernardi, H. Cohen and M. Olivier\"" >> include/version.h
  fi
  
  if [ $use_pari = 2 ]; then
  libname=$libname"_pari"
  libpari=pari-2.2
  echo "#define USE_PARI" >> include/config.h
-+echo "#define PARI_VERSION \"PARI CALCULATOR Version ${PARI_VERSION}, Copyright (C) 2000 The PARI Group\"" >> include/version.h
++echo "#define PARI_VERSION \"PARI ${PARI_VERSION}, copyright (C) 2000,
++     C. Batut, K. Belabas, D. Bernardi, H. Cohen and M. Olivier\"" >> include/version.h
  fi
  
  if [ $use_plot != 0 ]; then
-@@ -59,6 +64,11 @@
+@@ -59,6 +66,11 @@
  if [ $use_interval != 0 ]; then
  libname=$libname"_itv"
  echo "#define USE_INTERVAL" >> include/config.h
diff --git a/math/asir2000/files/patch-af b/math/asir2000/files/patch-af
index 2f3b2735a72e..e69de29bb2d1 100644
--- a/math/asir2000/files/patch-af
+++ b/math/asir2000/files/patch-af
@@ -1,25 +0,0 @@
---- parse/glob.c.orig	Sat Jan  5 02:45:29 2002
-+++ parse/glob.c	Sat Jan 26 18:33:43 2002
-@@ -51,6 +51,7 @@
- #include "al.h"
- #include "parse.h"
- #include "ox.h"
-+#include "version.h"
- #if PARI
- #include "genpari.h"
- #endif
-@@ -669,8 +670,12 @@
- 	printf("Copyright (C) 1994-2000, all rights reserved, FUJITSU LABORATORIES LIMITED.\n");
- 	printf("Copyright 2000,2001, Risa/Asir committers, http://www.openxm.org/.\n");
- 	printf("GC 5.3, copyright 1999, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n");
--	printf("PARI 2.2.1(alpha), copyright (C) 2000,\n");
--	printf("     C. Batut, K. Belabas, D. Bernardi, H. Cohen and M. Olivier.\n");
-+#if PARI
-+	printf("%s.\n",PARI_VERSION);
-+#endif
-+#if LAPACK
-+	printf("%s.\n",LAPACK_VERSION);
-+#endif
- }
- 
- 
diff --git a/math/asir2000/files/patch-ag b/math/asir2000/files/patch-ag
new file mode 100644
index 000000000000..e10d05ec309b
--- /dev/null
+++ b/math/asir2000/files/patch-ag
@@ -0,0 +1,25 @@
+--- parse/glob.c.orig	Fri Jul 26 09:33:03 2002
++++ parse/glob.c	Fri Jul 26 14:38:01 2002
+@@ -51,6 +51,7 @@
+ #include "al.h"
+ #include "parse.h"
+ #include "ox.h"
++#include "version.h"
+ #if PARI
+ #include "genpari.h"
+ #endif
+@@ -669,8 +670,12 @@
+ 	printf("Copyright (C) 1994-2000, all rights reserved, FUJITSU LABORATORIES LIMITED.\n");
+ 	printf("Copyright 2000,2001, Risa/Asir committers, http://www.openxm.org/.\n");
+ 	printf("GC 6.1(alpha5) copyright 2001, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n");
+-	printf("PARI 2.2.1(alpha), copyright (C) 2000,\n");
+-	printf("     C. Batut, K. Belabas, D. Bernardi, H. Cohen and M. Olivier.\n");
++#if PARI
++	printf("%s.\n",PARI_VERSION);
++#endif
++#if LAPACK
++	printf("%s.\n",LAPACK_VERSION);
++#endif
+ }
+ 
+ 
diff --git a/math/asir2000/pkg-plist b/math/asir2000/pkg-plist
index c8361a8f9ee6..91c169cb72c9 100644
--- a/math/asir2000/pkg-plist
+++ b/math/asir2000/pkg-plist
@@ -104,6 +104,7 @@ share/asir/help-eg/dp_true_nf
 share/asir/help-eg/dp_true_nf_mod
 share/asir/help-eg/dp_vtoe
 share/asir/help-eg/draw_obj
+share/asir/help-eg/draw_string
 share/asir/help-eg/ecm_add_ff
 share/asir/help-eg/ecm_chsgn_ff
 share/asir/help-eg/ecm_sub_ff
@@ -148,6 +149,7 @@ share/asir/help-eg/ilcm
 share/asir/help-eg/imag
 share/asir/help-eg/int32ton
 share/asir/help-eg/inv
+share/asir/help-eg/invmat
 share/asir/help-eg/ior
 share/asir/help-eg/irem
 share/asir/help-eg/irredcheck_ff
@@ -268,6 +270,7 @@ share/asir/help-eg/sub_str
 share/asir/help-eg/subst
 share/asir/help-eg/tdiv
 share/asir/help-eg/time
+share/asir/help-eg/timer
 share/asir/help-eg/tolex
 share/asir/help-eg/tolex_d
 share/asir/help-eg/tolex_gsl
@@ -379,6 +382,7 @@ share/asir/help-jp/dp_true_nf
 share/asir/help-jp/dp_true_nf_mod
 share/asir/help-jp/dp_vtoe
 share/asir/help-jp/draw_obj
+share/asir/help-jp/draw_string
 share/asir/help-jp/ecm_add_ff
 share/asir/help-jp/ecm_chsgn_ff
 share/asir/help-jp/ecm_sub_ff
@@ -423,6 +427,7 @@ share/asir/help-jp/ilcm
 share/asir/help-jp/imag
 share/asir/help-jp/int32ton
 share/asir/help-jp/inv
+share/asir/help-jp/invmat
 share/asir/help-jp/ior
 share/asir/help-jp/irem
 share/asir/help-jp/irredcheck_ff
@@ -541,6 +546,7 @@ share/asir/help-jp/sub_str
 share/asir/help-jp/subst
 share/asir/help-jp/tdiv
 share/asir/help-jp/time
+share/asir/help-jp/timer
 share/asir/help-jp/tolex
 share/asir/help-jp/tolex_d
 share/asir/help-jp/tolex_gsl
@@ -1110,6 +1116,7 @@ share/doc/asir/html-jp/man_toc.html
 share/doc/asir/html-internal-ja/internal.html
 share/doc/asir/html-internal-ja/internal_toc.html
 share/doc/asir/internal.ps
+share/doc/asir/asir.1
 @dirrm share/asir/help-jp
 @dirrm share/asir/help-eg
 @dirrm share/asir