Update to pari-2.1.1.

  Fixed
    1- return() could forget objects on heap                            [F2]
    2- polhensellift(x^3+x^2+2,[x^2,x+1],2) --> pols not coprime        [F3]
    3- Configure missed some shared libraries [e.g RedHat 7.0]          [F4]
    4- requests for precision of bnfinit(x) [ = Q ] could yield SEGV    [F6]
    5- compatible = 3 not taken into account when reading a file        [F7]
    6- lines > 0: output driver didn't reset properly after user output [F9]
    7- nfdisc(x^5+2*x^4+3*x^3-3*x^2+122*x-1) --> impossible inverse     [F10]
    8- bug in gcc-2.95: SEGV on Linux (quicksqri)                       [F11]
    9- addrfrac: could return a t_RFRAC whose denominator wasn't a t_POL[F12]
   10- bnfcertify (zimmertbound): off by two error when reading bound   [F13]
BA 11- pbs in Fp_factor_irred (factoring over Fq a pol. defined over Fp)[F25]
   12- typo in quadhilbertimag (SEGV for very large discriminants)      [F28]
BA 13- isprime(n < 2, 2 or 3) gave wrong result                         [F31]
BA 14- nfgaloisconj(polcyclo(11)+1)--> oo loop                          [F35]
       nfgaloisconj(polcyclo(40))-->incorrect result
IS 15- typo in squfof tuning on 64bit machines                          [F36]
   16- van Hoeij's algorithm (factor(Z[X])): wrong bound in LLL_cmbf    [F41]
   17- rare SEGV in nfdisc                                              [F44]
   18- rare problem in isprincipal (large non Galois base field)        [F56]
       --> wrong result (generators not required) or infinite loop.
   19- build failed with readline-4.2                                   [F57]

  Changed
    1- DOS distribution archives (GPM removed)                          [C1]
XR  2- try more prime ideals in nfsqff [nffactor, modular part]         [C4]
    3- renamed library function gsize() to sizedigit() [pb with gtk]    [C10]
IK  4- let lisGEN() return NULL when EOF is met (was oo loop)           [C12]
    5- install the whole distribution (see ?12) + improved Configure    [C17]

  Added
    1- README.WIN, config/[arch-osname|locatesymbol], doc/tex2mail.1    [A1]

6 files changed, 193 insertions, 189 deletions

diff --git a/math/pari/Makefile b/math/pari/Makefile
index 01d020e7008..ccc3c9c6eb3 100644
--- a/math/pari/Makefile
+++ b/math/pari/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2001/05/04 17:14:08 jtb Exp $
+# $NetBSD: Makefile,v 1.7 2001/05/19 17:31:05 jtb Exp $
 
-DISTNAME=		pari-2.1.0
+DISTNAME=		pari-2.1.1
 CATEGORIES=		math
 MASTER_SITES=		ftp://www.gn-50uma.de/gn/gn-50uma.de/pari-2.1/ \
 			http://www.gn-50uma.de/ftp/pari-2.1/
@@ -10,31 +10,23 @@ HOMEPAGE=		http://www.parigp-home.de
 COMMENT=		software package for computer-aided number theory
 
 DEPENDS+=		readline>=4.0:../../devel/readline
-BUILD_DEPENDS+=		emacs-[0-9]*:../../editors/emacs
 BUILD_DEPENDS+= 	teTeX-[0-9]*:../../print/teTeX
 
-USE_PERL5=		#defined
-USE_X11=		#defined
+USE_PERL5=		yes
 
-HAS_CONFIGURE=		#defined
-CONFIGURE_SCRIPT=	${WRKSRC}/Configure
+USE_X11=		yes
+
+USE_CURSES=		yes
 REPLACE_NCURSES=	${WRKSRC}/Configure
 
-CONFIGURE_ARGS+=	--prefix=${PREFIX}
+HAS_CONFIGURE=		yes
+CONFIGURE_SCRIPT=	${WRKSRC}/Configure
 
-READLINE_PREFIX_DEFAULT=${LOCALBASE}
-EVAL_PREFIX+=		READLINE_PREFIX=readline
-CONFIGURE_ENV+=		READLINE_PREFIX=${READLINE_PREFIX}
+CONFIGURE_ARGS+=	--prefix=${PREFIX} --share-prefix=${PREFIX}/share
 
 CONFIGURE_ENV+=		LOCALBASE=${LOCALBASE}
-
 CONFIGURE_ENV+=		X11BASE=${X11BASE}
-CONFIGURE_ARGS+=	--graphic=X11
-CONFIGURE_ENV+=		miscdir=${PREFIX}/share/pari
 
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/pari
-	cd ${WRKSRC}/examples/ && ${INSTALL_DATA} EXPLAIN *.gp	\
-		matexp.c Inputrc ${PREFIX}/share/examples/pari
+CONFIGURE_ARGS+=	--graphic=X11
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/pari/distinfo b/math/pari/distinfo
index a87bdadfd69..7962eadd304 100644
--- a/math/pari/distinfo
+++ b/math/pari/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.3 2001/05/04 17:14:08 jtb Exp $
+SHA1 (patch-aa) = 9e8fa39a708332148bd658d4d04ac687044e96b4
 
-SHA1 (pari-2.1.0.tar.gz) = c6239c5119fb3403de7fe4d49b962a1598996921
-Size (pari-2.1.0.tar.gz) = 1524250 bytes
-SHA1 (patch-aa) = c224a8df1bf66e21cd6d07515d8d407b514f85d9
-SHA1 (patch-ab) = 09cf8c0541c4e1b74e0524ac382b00791616a375
+SHA1 (pari-2.1.1.tar.gz) = 358e90e2caf1afbd4440e3a43af827feec019b8d
+Size (pari-2.1.1.tar.gz) = 1530823 bytes
+SHA1 (patch-aa) = 9e8fa39a708332148bd658d4d04ac687044e96b4
+SHA1 (patch-ab) = 97951552f9b9836d0375fd41c7abd18a5ce90238
 SHA1 (patch-ac) = 84af235f319ae108aadeedea5a25e005540160ac
 SHA1 (patch-ad) = 82c0532ba6bc23b1c91865591c2bdfbee144bcf9
+SHA1 (patch-ae) = 360d354635deb09be42be616be1900bb68c9a3c4
diff --git a/math/pari/patches/patch-aa b/math/pari/patches/patch-aa
index 9e397cc1ed3..2a56ebf21c0 100644
--- a/math/pari/patches/patch-aa
+++ b/math/pari/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2001/05/04 17:14:08 jtb Exp $
+$NetBSD: patch-aa,v 1.4 2001/05/19 17:31:05 jtb Exp $
 
---- Configure.orig	Mon Nov 13 14:35:43 2000
+--- Configure.orig	Fri Apr 27 13:51:44 2001
 +++ Configure
-@@ -148,35 +148,10 @@
+@@ -169,35 +169,9 @@
  pth="\
    /bin\
    /usr/bin\
@@ -37,25 +37,10 @@ $NetBSD: patch-aa,v 1.3 2001/05/04 17:14:08 jtb Exp $
 -  /usr/openwin/bin\
 -  /usr/local/bin\
 +  $LOCALBASE/lib\
-+  $READLINE_PREFIX/lib
  "
  # /usr/openwin/bin added for xmkmf
  
-@@ -252,6 +227,13 @@
- 	    *RT625*)        arch=sparcv8_super;; # HyperSparc
- 	    *CY605*)        arch=sparcv8_super;;
- 	    esac;;
-+  netbsd)   case "`uname -m`" in
-+	    alpha)      arch=alpha;;
-+	    i386)       arch=ix86;;
-+	    sun3)       arch=m68k;;
-+	    *68k)       arch=m68k;;
-+	    *)          arch=none;;
-+	    esac;;
-   sunos)    case "$3" in 5*) osname=solaris;; esac
- 	    case "$5" in
- 	    sun3*)    arch=m68k;;
-@@ -294,7 +276,7 @@
+@@ -272,7 +246,7 @@
  ==========================================================================
  I know of the following Operating Systems
  EOM
@@ -64,7 +49,7 @@ $NetBSD: patch-aa,v 1.3 2001/05/04 17:14:08 jtb Exp $
    . ./display
    echo $n ..."Any of these apply ? $c"
    dflt=$osname; . ./myread
-@@ -330,7 +312,7 @@
+@@ -308,7 +282,7 @@
  #   Modifications for pretty name and asm file
  #
  case "$osname" in
@@ -73,7 +58,16 @@ $NetBSD: patch-aa,v 1.3 2001/05/04 17:14:08 jtb Exp $
    nextstep) pretty="$pretty running $osname";
              if test "$arch" = m68k; then asmarch=none; fi ;;
  esac
-@@ -427,20 +409,9 @@
+@@ -362,7 +336,7 @@
+ case "$osname-$arch" in
+   os2-*)  ln_s=cp; make_sh=sh; exe_suff=.exe; extraflag="-Zexe" ;;
+   cygwin*) ln_s="ln -s"; make_sh="/bin/sh"; exe_suff=.exe; extraflag="" ;;
+-  *)       ln_s="ln -s"; make_sh="/bin/sh"; exe_suff=; extraflag="" ;;
++  *)       ln_s="ln -sf"; make_sh="/bin/sh"; exe_suff=; extraflag="" ;;
+ esac
+ 
+ ####################### CONFIGURE - LIBRARIES ###############################
+@@ -405,20 +379,8 @@
  	fi;;
        os2) libpth=`echo $LIBRARY_PATH | sed 's/;/ /g' | sed 's,\\\\,/,g'`;;
   	*) libpth="\
@@ -91,24 +85,11 @@ $NetBSD: patch-aa,v 1.3 2001/05/04 17:14:08 jtb Exp $
 - 	/usr/ccs/lib\
 - 	/usc/ucblib\
 - 	/usr/shlib\
-+	$LOCALBASE/lib\
-+	$READLINE_PREFIX/lib\
++        $LOCALBASE/lib\
   	.\
       ";;
       esac
-@@ -523,9 +494,9 @@
-   if test -n "$readline"; then
- # Readline -- TermCap
-     if test -n "`(nm $rl_fullname | grep tgetent)2>/dev/null`"; then
--      lib=ncurses; . ./locatelib
-+      lib=curses; . ./locatelib
-       if test -n "$try" -a -n "`(nm $try | grep tgetent)2>/dev/null`"; then
--        rl_ncurses=$ncurses
-+        rl_curses=$curses
-       else
-         lib=termcap; . ./locatelib
-         rl_termcap=$termcap
-@@ -546,17 +517,8 @@
+@@ -528,21 +490,11 @@
         $cygtop/H-${arch}-cygwin32/${arch}-cygwin32/include\
       ";;
        *) incpth="\
@@ -124,26 +105,24 @@ $NetBSD: patch-aa,v 1.3 2001/05/04 17:14:08 jtb Exp $
 -      /opt/local/include\
 -      /opt/gnu/include\
 +      $LOCALBASE/include\
-+      $READLINE_PREFIX/include/readline
      ";;
      esac
      pth="$readline_add $incpth"
-@@ -591,10 +553,10 @@
+-    x=`./locate 'readline.h' '' $pth`
++    x=`./locate 'readline/readline.h' '' $pth`
+     CPPF_defined=
+     case $x in
+      ?:/*|/*) rl_include=`echo $x | sed 's,/readline.h,,'`
+@@ -580,7 +532,7 @@
  # in case headers are not installed correctly
        RLINCLUDE="-I$rl_include -DREADLINE_LIBRARY"
      fi
 -    RLLIBS="-L$readline -lreadline"
--    if test -n "$rl_ncurses"; then
--      echo ..."Library ncurses needed by readline"
--      RLLIBS="$RLLIBS -lncurses"
-+    RLLIBS="-R$readline -L$readline -lreadline"
-+    if test -n "$rl_curses"; then
-+      echo ..."Library curses needed by readline"
-+      RLLIBS="$RLLIBS -lcurses"
-     fi
-     if test -n "$rl_termcap"; then
-       echo ..."Library termcap needed by readline"
-@@ -649,33 +611,7 @@
++    RLLIBS="-Wl,-R$readline -L$readline -lreadline"
+     if test -n "$rl_ncurses"; then
+       echo ..."Library ncurses needed by readline"
+       RLLIBS="$RLLIBS -lncurses"
+@@ -638,33 +590,7 @@
        # X11 -- Headers
        if test ! -f $Xincroot/X11/Xos.h; then
          x11pth="\
@@ -178,64 +157,50 @@ $NetBSD: patch-aa,v 1.3 2001/05/04 17:14:08 jtb Exp $
          ";
          pth=`echo $x11pth | s,/lib,/include,g`
          x=`./locate X11/Xos.h '' $pth`
-@@ -816,8 +752,8 @@
+@@ -806,7 +732,7 @@
  if test -n "$__gnuc__"; then
    __GNUC__="-D__GNUC__"
    warn="-Wall -Wno-implicit"
 -  OPTFLAGS="-O3 -DGCC_INLINE $warn"
--  DBGFLAGS="-g $warn"
 +  OPTFLAGS="-DGCC_INLINE $warn"
-+  DBGFLAGS="$warn"
+   DBGFLAGS="-g $warn"
    # Some architectures need -fPIC for building dynamic lib
    case "$osname-$arch" in hpux-*) DLCFLAGS=-fPIC;; esac
-   # Specific optimisations for some architectures
-@@ -937,6 +873,7 @@
-       esac;;
-   solaris-*) LD=$CC; LDFLAGS=$cflags; runpathprefix=-R ;;
-   os2-*)     LD=$CC; LDFLAGS="$cflags -Zexe" ;;
-+  netbsd-*)  LD=$CC ;;
-   *)         LD=$CC; LDFLAGS=$cflags ;;
- esac
+@@ -926,6 +852,7 @@
+   linux-*|cygwin*)
+       LD=$CC; LDFLAGS="$cflags -Xlinker -export-dynamic"
+       runpathprefix='-Xlinker -rpath -Xlinker ';;
++  netbsd-*)  LD=$CC;;
+   osf1-alpha)
+       LD=$ld; LIBS="$LIBS -lots -lc"; runpathprefix='-rpath '
+       LDFLAGS='-std0 -call_shared /usr/lib/cmplrs/cc/crt0.o'
+@@ -1141,11 +1068,9 @@
+ dflt=$share_prefix; . ./myread; share_prefix=$ans
+ 
+ if test -z "$share_prefix"; then
+-  dfltman=$prefix/man/man1
+   dfltall=$prefix/lib/pari
+ else
+-  dfltman=$share_prefix/man/man1
+-  dfltall=$share_prefix/doc/pari
++  dfltall=$share_prefix/pari
+ fi
  
-@@ -969,7 +906,7 @@
-     hpux-*)  DLSUFFIX=sl ;;
-     irix-*)  DLSUFFIX=so ;;
-     sunos-*) DLSUFFIX=so; somake=.`echo $version| sed 's/\.//g'`.$patch ;;
--    linux-*|solaris-*|*-alpha)
-+    linux-*|solaris-*)
-                DLSUFFIX=so; somake=.$version; sodest=.$patch ;;
-     freebsd-*)
-                if test $PORTOBJFORMAT = "elf"; then
-@@ -1013,10 +950,10 @@
-       freebsd-*)  DLLDFLAGS="-Bshareable -x" ;;
-       linux-*)    DLLDFLAGS="-shared -soname \$@" ;;
-       irix-*)     DLLDFLAGS="-shared -elf -no_unresolved -all" ;;
--      *-alpha)    DLLDFLAGS="-shared"; EXTRADLLDFLAGS='${LIBS}'
--         case "$optimization" in
--           full) DLLDFLAGS="$DLLDFLAGS -O3" ;;
--         esac;;
-+#      *-alpha)    DLLDFLAGS="-shared"; EXTRADLLDFLAGS='${LIBS}'
-+#         case "$optimization" in
-+#           full) DLLDFLAGS="$DLLDFLAGS -O3" ;;
-+#         esac;;
-       sunos-*)    DLLDFLAGS="-assert nodefinitions" ;;
-       solaris-*)  DLLDFLAGS="-G -h \$@" ;;
-       *)          DLLD=;;
-@@ -1156,7 +1093,7 @@
- dflt=$prefix/man/man1; . ./myread; mandir=$ans
+ echo $n ..."\"gp\" executable ? $c"
+@@ -1158,7 +1083,7 @@
+ dflt=$prefix/include/pari; . ./myread; includedir=$ans
  
- echo $n ..."documentation, help scripts, and emacs macros ? $c"
--dflt=$prefix/lib/pari; . ./myread; miscdir=$ans
-+dflt=$prefix/share/pari; . ./myread; miscdir=$ans
+ echo $n ..."manual pages ? $c"
+-dflt=$dfltman; . ./myread; mandir=$ans
++dflt=$prefix/man/man1; . ./myread; mandir=$ans
  
- echo $n ..."miscellaneous data (galois resolvents) ? $c"
- dflt=$miscdir/data; . ./myread; datadir=$ans
-@@ -1211,7 +1148,7 @@
+ echo $n ..."documentation, examples, and emacs macros ? $c"
+ dflt=$dfltall; . ./myread; miscdir=$ans
+@@ -1222,6 +1147,7 @@
  case "$osname" in
    *cygwin*) LDDYN="-L$libdir -lpari_dll" ; runpath="$libdir" ;
  	    DYNLIBS=-lpari_dll ; DYNFLAGS=-Dlibpari_USE_DLL ;;
--  *)        LDDYN="-L$libdir -lpari" ; runpath="$libdir" ;;
-+  *)        LDDYN="-R$libdir -L$libdir -lpari" ; runpath="$libdir" ;;
++  netbsd)   LDDYN="-Wl,-R$libdir -L$libdir -l$libpari_base" ; runpath="$libdir" ;;
+   *)        LDDYN="-L$libdir -l$libpari_base" ; runpath="$libdir" ;;
  esac
  
- cat << EOT
diff --git a/math/pari/patches/patch-ab b/math/pari/patches/patch-ab
index 12a2aaabb77..172e024de67 100644
--- a/math/pari/patches/patch-ab
+++ b/math/pari/patches/patch-ab
@@ -1,18 +1,18 @@
-$NetBSD: patch-ab,v 1.2 2001/05/04 17:14:08 jtb Exp $
+$NetBSD: patch-ab,v 1.3 2001/05/19 17:31:05 jtb Exp $
 
---- config/Makefile.SH.orig	Mon Mar 27 18:43:42 2000
+--- config/Makefile.SH.orig	Wed Apr 18 11:40:57 2001
 +++ config/Makefile.SH
-@@ -80,7 +80,7 @@
+@@ -81,7 +81,7 @@
  X11)
    PLOTFILE=plotX.c
    PLOTCFLAGS=-I$Xincroot
 -  PLOTLIBS="-L$X11 -lX11 $extralib"
-+  PLOTLIBS="-R$X11 -L$X11 -lX11 $extralib"
++  PLOTLIBS="-Wl,-R$X11 -L$X11 -lX11 $extralib"
    if test "$osname" = concentrix; then PLOTLIBS="-lX11"; fi
    plotrunpath=$X11
    ;;
-@@ -160,8 +160,9 @@
- INCLUDEDIR = $includedir
+@@ -175,8 +175,10 @@
+ MISCDIR = \$(ALLDIR)/misc
  
  INSTALL = $cfg/install
 -INSTALL_PROGRAM = \$(INSTALL)
@@ -20,15 +20,15 @@ $NetBSD: patch-ab,v 1.2 2001/05/04 17:14:08 jtb Exp $
 +INSTALL_PROGRAM = \$(BSD_INSTALL_PROGRAM)
 +INSTALL_SCRIPT = \$(BSD_INSTALL_SCRIPT)
 +INSTALL_DATA = \$(BSD_INSTALL_DATA)
++INSTALL_MAN = \$(BSD_INSTALL_MAN)
  
  # Graphic library.
  PLOTFILE   = $PLOTFILE
-@@ -257,21 +258,21 @@
+@@ -272,21 +274,17 @@
  	   \$(INSTALL_DATA) \$\$i.h                \$(INCLUDEDIR); done
  	-for i in $hlist; do \\
  	   \$(INSTALL_DATA) $src/headers/\$\$i.h   \$(INCLUDEDIR); done
 -	-\$(RM) \$(INCLUDEDIR)/genpari.h
-+#	-\$(RM) \$(INCLUDEDIR)/genpari.h
  	-\$(LN) pari.h \$(INCLUDEDIR)/genpari.h
  
  install-bin: install-bin-$dft
@@ -36,56 +36,52 @@ $NetBSD: patch-ab,v 1.2 2001/05/04 17:14:08 jtb Exp $
  install-bin-dyn: gp-dyn
  	-mkdir -p \$(BINDIR)
 -	-\$(RM) \$(BINDIR)/gp-$version \$(BINDIR)/gp$exe_suff
-+#	-\$(RM) \$(BINDIR)/gp-$version \$(BINDIR)/gp$exe_suff
  	-\$(LD) -o \$(BINDIR)/gp-$version \$(LDFLAGS) \$(OBJSGP) \$(RUNPTH_FINAL) \$(TOPLDDYN) \$(LDDYN) \$(PLOTLIBS) \$(LIBS)
 -	strip \$(BINDIR)/gp-$version
-+#	strip \$(BINDIR)/gp-$version
  	-\$(LN) gp-$version$exe_suff \$(BINDIR)/gp$exe_suff
  
  install-bin-sta: gp-sta
  	-mkdir -p \$(BINDIR)
 -	-\$(RM) \$(BINDIR)/gp-$version \$(BINDIR)/gp$exe_suff
-+#	-\$(RM) \$(BINDIR)/gp-$version \$(BINDIR)/gp$exe_suff
  	\$(INSTALL_PROGRAM) gp-sta$exe_suff \$(BINDIR)/gp-$version$exe_suff
  	-\$(LN) gp-$version$exe_suff \$(BINDIR)/gp$exe_suff
  # Can't strip it if we want install() to work on Linux or OSF.
-@@ -281,17 +282,17 @@
+@@ -294,15 +292,14 @@
+ 
+ install-man::
  	-mkdir -p \$(MANDIR)
- 	\$(INSTALL_DATA) $doc/gphelp.1 \$(MANDIR)
- 	\$(INSTALL_DATA) $doc/gp.1 \$(MANDIR)
+-	\$(INSTALL_DATA) $doc/gphelp.1 \$(MANDIR)
+-	\$(INSTALL_DATA) $doc/gp.1 \$(MANDIR)
 -	-\$(RM) \$(MANDIR)/pari.1
-+#	-\$(RM) \$(MANDIR)/pari.1
++	\$(INSTALL_MAN) $doc/gphelp.1 \$(MANDIR)
++	\$(INSTALL_MAN) $doc/gp.1 \$(MANDIR)
  	-\$(LN) gp.1 \$(MANDIR)/pari.1
  
- install-misc: $install_emacs_files
+ install-misc: $install_emacs_files install-top
+ 	-mkdir -p \$(MISCDIR) \$(BINDIR)
 -	\$(INSTALL_PROGRAM) $misc/tex2mail \$(BINDIR)
+-	\$(INSTALL_DATA) $doc/tex2mail.1 \$(MANDIR)
 +	\$(INSTALL_SCRIPT) $misc/tex2mail \$(BINDIR)
- 
- install-doc:
- 	-mkdir -p \$(MISCDIR)
- 	-mkdir -p \$(BINDIR)
++	\$(INSTALL_MAN) $doc/tex2mail.1 \$(MANDIR)
+ 	\$(INSTALL_DATA) $misc/README    \$(MISCDIR)
+ 	\$(INSTALL_DATA) $misc/color.dft \$(MISCDIR)
+ 	\$(INSTALL_DATA) $misc/gpalias   \$(MISCDIR)
+@@ -328,7 +325,7 @@
+ install-doc::
+ 	-mkdir -p \$(ALLDIR) \$(BINDIR) \$(DOCDIR)
  	-cd $doc; \$(MAKE) all
 -	-\$(INSTALL_PROGRAM) $doc/gphelp    \$(BINDIR)
 +	-\$(INSTALL_SCRIPT) $doc/gphelp    \$(BINDIR)
- 	-\$(INSTALL_DATA) $doc/translations \$(MISCDIR)
- 	-\$(INSTALL_DATA) $doc/paricfg.tex  \$(MISCDIR)
- 	-\$(INSTALL_DATA) $doc/parimacro.tex \$(MISCDIR)
-@@ -306,14 +307,13 @@
- 	-\$(INSTALL_DATA) $doc/refcard.ps   \$(MISCDIR)
- 
- install-data:
--	-mkdir -p \$(DATADIR)
--	@-for f in $data/*; do \$(INSTALL_DATA)  \$\$f \$(DATADIR); done 2>/dev/null
-+#	-mkdir -p \$(DATADIR)
-+#	@-for f in $data/*; do \$(INSTALL_DATA)  \$\$f \$(DATADIR); done 2>/dev/null
- 
- install-lib-sta: libpari.a
+ 	-\$(INSTALL_DATA) $doc/Makefile     \$(DOCDIR)
+ 	-\$(INSTALL_DATA) $doc/translations \$(DOCDIR)
+ 	-\$(INSTALL_DATA) $doc/appa.tex     \$(DOCDIR)
+@@ -372,8 +369,7 @@
+ install-lib-sta: \$(LIBPARI_STA)
  	-mkdir -p \$(LIBDIR)
--	-\$(RM) \$(LIBDIR)/libpari.a
--	\$(INSTALL_DATA) libpari.a \$(LIBDIR)/libpari.a.$version
--	-\$(LN) libpari.a.$version \$(LIBDIR)/libpari.a
-+#	-\$(RM) \$(LIBDIR)/libpari.a
-+	\$(INSTALL_DATA) libpari.a \$(LIBDIR)
+ 	-\$(RM) \$(LIBDIR)/\$(LIBPARI_STA)
+-	\$(INSTALL_DATA) \$(LIBPARI_STA) \$(LIBDIR)/\$(LIBPARI_STA).$version
+-	-\$(LN) \$(LIBPARI_STA).$version \$(LIBDIR)/\$(LIBPARI_STA)
++	\$(INSTALL_DATA) \$(LIBPARI_STA) \$(LIBDIR)
  
- install-lib-dyn: libpari.$somake
+ install-lib-dyn: \$(LIBPARI_DYN)
  	-mkdir -p \$(LIBDIR)
diff --git a/math/pari/patches/patch-ae b/math/pari/patches/patch-ae
new file mode 100644
index 00000000000..bf33fdd5c24
--- /dev/null
+++ b/math/pari/patches/patch-ae
@@ -0,0 +1,18 @@
+$NetBSD: patch-ae,v 1.1 2001/05/19 17:31:05 jtb Exp $
+
+--- config/arch-osname.orig	Sun Apr  1 22:10:23 2001
++++ config/arch-osname
+@@ -11,6 +11,13 @@
+   fx2800)   arch=fx2800; osname=concentrix;;
+   hp*)      arch=hppa; osname=hpux;;
+   freebsd|os2)  arch=ix86;;
++  netbsd)   case "`uname -m`" in
++            alpha)     arch=alpha;;
++            i386)      arch=ix86;;
++            sun3)      arch=m68k;;
++            *68k)      arch=m68k;;
++            *)         arch=none;;
++            esac;;
+   ultrix)   arch=mips;;
+   nextstep) arch=`file /bin/sh | sed 's/.*(for architecture \(.*\))/\1/'`;;
+   osf1)     case "$5" in alpha) arch=alpha;; esac;;
diff --git a/math/pari/pkg/PLIST b/math/pari/pkg/PLIST
index 9ca9d6ef034..9a0a265da1e 100644
--- a/math/pari/pkg/PLIST
+++ b/math/pari/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2001/05/04 17:14:08 jtb Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/05/19 17:31:05 jtb Exp $
 bin/gp
 bin/gp-2.1
 bin/gphelp
@@ -20,35 +20,67 @@ lib/libpari.a
 man/man1/gp.1
 man/man1/gphelp.1
 man/man1/pari.1
-share/examples/pari/EXPLAIN
-share/examples/pari/Inputrc
-share/examples/pari/bench.gp
-share/examples/pari/cl.gp
-share/examples/pari/classno.gp
-share/examples/pari/contfrac.gp
-share/examples/pari/lucas.gp
-share/examples/pari/matexp.c
-share/examples/pari/rho.gp
-share/examples/pari/squfof.gp
-share/examples/pari/taylor.gp
-share/pari/pari-translator.el
-share/pari/pari.el
-share/pari/pari.elc
-share/pari/paricfg.tex
-share/pari/pariemacs.txt
-share/pari/parimacro.tex
-share/pari/refcard.dvi
-share/pari/refcard.ps
-share/pari/translations
-share/pari/tutorial.dvi
-share/pari/users.dvi
-share/pari/usersch1.tex
-share/pari/usersch2.tex
-share/pari/usersch3.tex
-share/pari/usersch4.tex
-share/pari/usersch5.tex
-share/pari/with-syntax.el
-@dirrm include/pari
-@unexec rmdir %D/share/pari/data 2>/dev/null || true
-@dirrm share/examples/pari
+man/man1/tex2mail.1
+share/pari/AUTHORS
+share/pari/Announce.2.1
+share/pari/CHANGES
+share/pari/COMPAT
+share/pari/COPYING
+share/pari/CVS.txt
+share/pari/MACHINES
+share/pari/NEW
+share/pari/README
+share/pari/TODO
+share/pari/doc/Makefile
+share/pari/doc/appa.tex
+share/pari/doc/appb.tex
+share/pari/doc/appc.tex
+share/pari/doc/paricfg.tex.in
+share/pari/doc/parimacro.tex
+share/pari/doc/pdfmacs.tex
+share/pari/doc/refcard.dvi
+share/pari/doc/refcard.ps
+share/pari/doc/refcard.tex
+share/pari/doc/translations
+share/pari/doc/tutorial.dvi
+share/pari/doc/tutorial.tex
+share/pari/doc/users.dvi
+share/pari/doc/users.tex
+share/pari/doc/usersch1.tex
+share/pari/doc/usersch2.tex
+share/pari/doc/usersch3.tex
+share/pari/doc/usersch4.tex
+share/pari/doc/usersch5.tex
+share/pari/emacs/pari-translator.el
+share/pari/emacs/pari.el
+share/pari/emacs/pari.elc
+share/pari/emacs/pariemacs.txt
+share/pari/emacs/with-syntax.el
+share/pari/examples/EXPLAIN
+share/pari/examples/Inputrc
+share/pari/examples/Makefile
+share/pari/examples/bench.gp
+share/pari/examples/cl.gp
+share/pari/examples/classno.gp
+share/pari/examples/contfrac.gp
+share/pari/examples/lucas.gp
+share/pari/examples/matexp.c
+share/pari/examples/rho.gp
+share/pari/examples/squfof.gp
+share/pari/examples/taylor.gp
+share/pari/misc/README
+share/pari/misc/color.dft
+share/pari/misc/gpalias
+share/pari/misc/gpflog
+share/pari/misc/gprc.dft
+share/pari/misc/new.dic
+share/pari/misc/pari.xpm
+share/pari/misc/xgp
+@dirrm share/pari/misc
+@exec /bin/mkdir -p /usr/pkg/share/pari/galdata
+@dirrm share/pari/galdata
+@dirrm share/pari/examples
+@dirrm share/pari/emacs
+@dirrm share/pari/doc
 @dirrm share/pari
+@dirrm include/pari