Update to 2.2.12.beta.

Submitted by:	maintainer
PR:		93945

1 files changed, 34 insertions, 41 deletions

diff --git a/math/pari-devel/files/patch-af b/math/pari-devel/files/patch-af
index 59e280642e6f..d38cb95063bf 100644
--- a/math/pari-devel/files/patch-af
+++ b/math/pari-devel/files/patch-af
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- config/Makefile.SH.orig
-+++ config/Makefile.SH
-@@ -176,7 +176,7 @@
+--- config/Makefile.SH.orig	Tue Jan 17 00:52:21 2006
++++ config/Makefile.SH	Tue Feb 28 18:09:23 2006
+@@ -162,7 +162,7 @@
  CC_FLAVOR  =
  CC         = $CC \$(CC_FLAVOR)
  CPPFLAGS   = $CPPFLAGS
@@ -12,31 +9,39 @@ $FreeBSD$
  DLCFLAGS   = $DLCFLAGS
  LD_FLAVOR  = \$(CC_FLAVOR)
  LD         = $LD \$(LD_FLAVOR)
-@@ -238,9 +238,12 @@
- INCLUDEDIR= \$(DESTDIR)$includedir
- LIBDIR    = \$(DESTDIR)$libdir
- BINDIR    = \$(DESTDIR)$bindir
--MANDIR    = \$(DESTDIR)$mandir
-+MANDIR    = \$(DESTDIR)\${PREFIX}/man/man1
- EMACSDIR  = \$(DESTDIR)$emacsdir
--DATADIR   = \$(DESTDIR)$datadir
-+#DATADIR   = \$(DESTDIR)$datadir
-+ALLDIR    =\${PREFIX}/share/doc/pari
-+READMEDIR = \$(ALLDIR)
-+DATADIR   = \$(ALLDIR)
- SYSDATADIR= \$(DESTDIR)$sysdatadir
+@@ -221,13 +221,15 @@
+ 
+ # Change these installation directories to suit your needs.
+ # DESTDIR is used to install to a false hierachy (to build a Debian package)
+-INCLUDEDIR= "\$(DESTDIR)$includedir"
+-LIBDIR    = "\$(DESTDIR)$libdir"
+-BINDIR    = "\$(DESTDIR)$bindir"
+-MANDIR    = "\$(DESTDIR)$mandir"
+-EMACSDIR  = "\$(DESTDIR)$emacsdir"
+-DATADIR   = "\$(DESTDIR)$datadir"
+-SYSDATADIR= "\$(DESTDIR)$sysdatadir"
++INCLUDEDIR= "\$(DESTDIR)$includedir"
++LIBDIR    = "\$(DESTDIR)$libdir"
++BINDIR    = "\$(DESTDIR)$bindir"
++MANDIR    = "\$(DESTDIR)\${PREFIX}/man/man1"
++EMACSDIR  = "\$(DESTDIR)$emacsdir"
++ALLDIR    = "\${PREFIX}/share/doc/pari"
++READMEDIR = "\$(ALLDIR)"
++DATADIR   = "\$(ALLDIR)" 
++SYSDATADIR= "\$(DESTDIR)$sysdatadir"
  
  EXDIR     = \$(DATADIR)/examples
-@@ -392,7 +395,7 @@
- 	-\$(RM) \$(MANDIR)/pari.1
+ MISCDIR   = \$(DATADIR)/misc
+@@ -385,7 +387,7 @@
  	-\$(LN) gp.1 \$(MANDIR)/pari.1
+ 	-\$(LN) gp-$version.1 \$(MANDIR)/gp.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)
-@@ -405,6 +408,19 @@
+@@ -398,6 +400,19 @@
  	\$(INSTALL_DATA) $misc/pari.xpm  \$(MISCDIR)
  	\$(INSTALL_PROGRAM) $misc/xgp    \$(MISCDIR)
  
@@ -54,9 +59,9 @@ $FreeBSD$
 +	\$(INSTALL_DATA) $TOP/TODO         \$(READMEDIR)
 +
  install-cfg::
- 	-mkdir -p \$(SYSDATADIR) \$(DATADIR)/PARI
- 	\$(INSTALL_DATA) $desc/pari.desc   \$(DATADIR)
-@@ -413,7 +429,7 @@
+ 	-mkdir -p \$(SYSDATADIR)
+ 	-\$(INSTALL_DATA) pari.cfg \$(SYSDATADIR)
+@@ -408,7 +423,7 @@
  
  install-doc::
  	-mkdir -p \$(BINDIR) \$(DOCDIR)
@@ -65,7 +70,7 @@ $FreeBSD$
  	-\$(INSTALL_PROGRAM) $doc/gphelp    \$(BINDIR)
  	-\$(INSTALL_DATA) $doc/Makefile     \$(DOCDIR)
  	-\$(INSTALL_DATA) $doc/translations \$(DOCDIR)
-@@ -431,11 +447,11 @@
+@@ -426,11 +441,11 @@
  	-\$(INSTALL_DATA) $doc/usersch4.tex \$(DOCDIR)
  	-\$(INSTALL_DATA) $doc/usersch5.tex \$(DOCDIR)
  	-\$(INSTALL_DATA) $doc/paricfg.tex  \$(DOCDIR)
@@ -82,26 +87,14 @@ $FreeBSD$
  
  install-examples:
  	-mkdir -p \$(EXDIR)
-@@ -532,15 +548,16 @@
- 
- if test -n "$emacs"; then
-   cat >> $file << EOT
--elc:
--	@echo "Byte-Compiling elisp files..."
--	-cd $emx; $emacs -batch \
--	   --eval '(setq load-path (append (list ".") load-path))' \
--	   -f batch-byte-compile *.el
-+#elc:
-+#	@echo "Byte-Compiling elisp files..."
-+#	-cd $emx; $emacs -batch \
-+#	   --eval '(setq load-path (append (list ".") load-path))' \
-+#	   -f batch-byte-compile *.el
+@@ -524,9 +539,9 @@
+ 	   --eval '(setq load-path (append (list ".") load-path))' \
+ 	   -f batch-byte-compile *.el
  
 -$install_emacs_files: elc
 +$install_emacs_files: #elc
  	-mkdir -p \$(EMACSDIR)
 -	-cd $emx; for f in *.elc *.el pariemacs.txt; do \
-+#	-cd $emx; for f in *.elc *.el pariemacs.txt; do \
 +	-cd $emx; for f in *.el pariemacs.txt; do \
  	  \$(INSTALL_DATA) \$\$f \$(EMACSDIR); \
  	done