* Install examples.

* Install library as libpari.a. (Previously the package installed
  libpari.a.2.1 and created a symbolic link libpari.a).
* Fix warning about O_RDONLY being redefined.

6 files changed, 54 insertions, 14 deletions

diff --git a/math/pari/Makefile b/math/pari/Makefile
index 91d6b158b7b..01d020e7008 100644
--- a/math/pari/Makefile
+++ b/math/pari/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/05/03 22:16:51 jtb Exp $
+# $NetBSD: Makefile,v 1.6 2001/05/04 17:14:08 jtb Exp $
 
 DISTNAME=		pari-2.1.0
 CATEGORIES=		math
@@ -7,7 +7,7 @@ MASTER_SITES=		ftp://www.gn-50uma.de/gn/gn-50uma.de/pari-2.1/ \
 
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.parigp-home.de
-COMMENT=		PARI-GP is a software package for computer-aided number theory
+COMMENT=		software package for computer-aided number theory
 
 DEPENDS+=		readline>=4.0:../../devel/readline
 BUILD_DEPENDS+=		emacs-[0-9]*:../../editors/emacs
@@ -32,4 +32,9 @@ 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
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/pari/distinfo b/math/pari/distinfo
index d450ccdf02e..a87bdadfd69 100644
--- a/math/pari/distinfo
+++ b/math/pari/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 08:45:43 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/05/04 17:14:08 jtb Exp $
 
 SHA1 (pari-2.1.0.tar.gz) = c6239c5119fb3403de7fe4d49b962a1598996921
 Size (pari-2.1.0.tar.gz) = 1524250 bytes
-SHA1 (patch-aa) = 7a1ca16b1bb7d48ed3bbbeaa7e48b0c567c6caed
-SHA1 (patch-ab) = 7670bfc9adc606e17e3897a7f784290813fcb294
+SHA1 (patch-aa) = c224a8df1bf66e21cd6d07515d8d407b514f85d9
+SHA1 (patch-ab) = 09cf8c0541c4e1b74e0524ac382b00791616a375
 SHA1 (patch-ac) = 84af235f319ae108aadeedea5a25e005540160ac
+SHA1 (patch-ad) = 82c0532ba6bc23b1c91865591c2bdfbee144bcf9
diff --git a/math/pari/patches/patch-aa b/math/pari/patches/patch-aa
index a81946bfc70..9e397cc1ed3 100644
--- a/math/pari/patches/patch-aa
+++ b/math/pari/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2001/03/20 13:49:35 jtb Exp $
+$NetBSD: patch-aa,v 1.3 2001/05/04 17:14:08 jtb Exp $
 
 --- Configure.orig	Mon Nov 13 14:35:43 2000
 +++ Configure
@@ -47,9 +47,9 @@ $NetBSD: patch-aa,v 1.2 2001/03/20 13:49:35 jtb Exp $
  	    esac;;
 +  netbsd)   case "`uname -m`" in
 +	    alpha)      arch=alpha;;
-+	    hp300)      arch=hppa;;
 +	    i386)       arch=ix86;;
 +	    sun3)       arch=m68k;;
++	    *68k)       arch=m68k;;
 +	    *)          arch=none;;
 +	    esac;;
    sunos)    case "$3" in 5*) osname=solaris;; esac
diff --git a/math/pari/patches/patch-ab b/math/pari/patches/patch-ab
index 81c96af1e7d..12a2aaabb77 100644
--- a/math/pari/patches/patch-ab
+++ b/math/pari/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/03/07 20:57:51 jtb Exp $
+$NetBSD: patch-ab,v 1.2 2001/05/04 17:14:08 jtb Exp $
 
---- config/Makefile.SH.orig	Mon Mar 27 17:43:42 2000
+--- config/Makefile.SH.orig	Mon Mar 27 18:43:42 2000
 +++ config/Makefile.SH
 @@ -80,7 +80,7 @@
  X11)
@@ -70,12 +70,22 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/03/07 20:57:51 jtb Exp $
  	-\$(INSTALL_DATA) $doc/translations \$(MISCDIR)
  	-\$(INSTALL_DATA) $doc/paricfg.tex  \$(MISCDIR)
  	-\$(INSTALL_DATA) $doc/parimacro.tex \$(MISCDIR)
-@@ -311,7 +312,7 @@
+@@ -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
  	-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)/libpari.a.$version
- 	-\$(LN) libpari.a.$version \$(LIBDIR)/libpari.a
++	\$(INSTALL_DATA) libpari.a \$(LIBDIR)
  
+ install-lib-dyn: libpari.$somake
+ 	-mkdir -p \$(LIBDIR)
diff --git a/math/pari/patches/patch-ad b/math/pari/patches/patch-ad
new file mode 100644
index 00000000000..9e4a71875e3
--- /dev/null
+++ b/math/pari/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2001/05/04 17:14:08 jtb Exp $
+
+--- src/headers/paristio.h.orig	Fri Nov  3 21:00:25 2000
++++ src/headers/paristio.h
+@@ -15,6 +15,8 @@
+ 
+ /* This file contains memory and I/O management definitions       */
+ 
++#include <fcntl.h>
++
+ typedef unsigned char *byteptr;
+ 
+ typedef struct stackzone
diff --git a/math/pari/pkg/PLIST b/math/pari/pkg/PLIST
index eb59f2b9930..9ca9d6ef034 100644
--- a/math/pari/pkg/PLIST
+++ b/math/pari/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/03/07 20:57:48 jtb Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/05/04 17:14:08 jtb Exp $
 bin/gp
 bin/gp-2.1
 bin/gphelp
@@ -17,10 +17,20 @@ include/pari/paristio.h
 include/pari/parisys.h
 include/pari/paritype.h
 lib/libpari.a
-lib/libpari.a.2.1
 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
@@ -40,4 +50,5 @@ 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
 @dirrm share/pari