Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2016Q3

Browse Source
This commit is contained in:
sambuc
2016-11-18 22:39:22 +01:00
committed by sambuc
parent 9d819b6d54
commit 1242aa1e36
35952 changed files with 949747 additions and 377081 deletions
Download Patch File Download Diff File Expand all files Collapse all files
math/pari/patches/patch-Configure
+21
View File
@@ -0,0 +1,21 @@
$NetBSD: patch-Configure,v 1.1 2016/03/03 13:28:22 wiz Exp $
--- Configure.orig 2015-06-02 14:03:57.000000000 +0000
+++ Configure
@@ -119,14 +119,14 @@ fi
. ./get_static # static
# For dynamic linking, before and after installing
runpath=\"$libdir\"
-LDDYN="-lpari"
+LDDYN="-Wl,-R$libdir -L$libdir -lpari"
# get_modld needs $includedir from get_install, static, and LDDYN
. ./get_modld # $_modld_list
# Which copy, SHELL ?
case "$osname" in
os2) ln_s=cp; make_sh=sh;;
- *) ln_s="ln -s"; make_sh="/bin/sh";;
+ *) ln_s="ln -sf"; make_sh="/bin/sh";;
esac
####################### CONFIGURE - CLEANUP #################################
rm -f gmon.out # created by Configure -pg
math/pari/patches/patch-ab
-57
View File
@@ -1,57 +0,0 @@
$NetBSD: patch-ab,v 1.7 2010/02/06 10:37:06 sno Exp $
--- Configure.orig 2008-01-16 15:57:54.000000000 +0000
+++ Configure
@@ -36,7 +36,7 @@ cd $config_dir
. ./get_PATH
# We might need the following :
echo Looking for some tools first ...
-list='ld zcat gzip ranlib perl emacs'
+list='ld zcat ranlib emacs'
pathspace=`echo $PATH | sed -e "s/$dir_sep/ /g" | sed -e 's,\\\\,/,g'`
for file in $list; do
@@ -49,6 +49,7 @@ for file in $list; do
esac
done
if test -z "$zcat" -a -n "$gzip"; then zcat="$gzip -dc"; fi
+perl=${PERL5}
####################### CONFIGURE - ARCHITECTURE ############################
. ./get_archos # arch, osname
@@ -101,14 +102,14 @@ fi
. ./get_static # static
# For dynamic linking, before and after installing
runpath="$libdir"
-LDDYN="-L$libdir -lpari"
+LDDYN="-Wl,-R$libdir -L$libdir -lpari"
# get_modld needs $includedir from get_install, static, and LDDYN
. ./get_modld # $_modld_list
# Which copy, SHELL ?
case "$osname" in
os2) ln_s=cp; make_sh=sh;;
- *) ln_s="ln -s"; make_sh="/bin/sh";;
+ *) ln_s="ln -sf"; make_sh="/bin/sh";;
esac
####################### CONFIGURE - CLEANUP #################################
rm -f gmon.out # created by Configure -pg
@@ -172,14 +173,14 @@ if test "$objdir" != "$mkobjdir"; then
fi
case $ans in
-y) if (cd $objdir; make gp); then
+y) if (cd $objdir; ${MAKE} gp); then
echo $n "Shall we install the files where they belong (y/n)? $c"
dflt=n; rep='y n'; . $config_dir/myread
case $ans in
- y) make install;;
- n) echo "Ok. Type \"${cdobjdir}make install\" when you are ready";;
+ y) ${MAKE} install;;
+ n) echo "Ok. Type \"${cdobjdir}${MAKE} install\" when you are ready";;
esac
fi;;
-n) echo "Ok. Type \"${cdobjdir}make install\" when you are ready";;
+n) echo "Ok. Type \"${cdobjdir}${MAKE} install\" when you are ready";;
esac
echo 'Bye !'
math/pari/patches/patch-ac
-13
View File
@@ -1,13 +0,0 @@
$NetBSD: patch-ac,v 1.2 2010/02/06 10:37:06 sno Exp $
--- config/get_archos.orig 2008-01-16 15:57:13.000000000 +0000
+++ config/get_archos
@@ -26,7 +26,7 @@ if test "$fastread" != yes; then
==========================================================================
I know of the following Operating Systems
EOM
- rep='os2 freebsd netbsd cygwin linux hpux aix osf1 solaris sunos nextstep concentrix irix';
+ rep='os2 freebsd netbsd cygwin linux hpux aix osf1 solaris sunos nextstep concentrix irix dragonfly';
. ./display
echo $n ..."Any of these apply ? $c"
dflt=$osname; . ./myread
math/pari/patches/patch-ae
-60
View File
@@ -1,60 +0,0 @@
$NetBSD: patch-ae,v 1.3 2010/02/06 10:37:06 sno Exp $
--- config/get_readline.orig 2008-01-16 15:57:14.000000000 +0000
+++ config/get_readline
@@ -33,21 +33,11 @@ if test -n "$readline"; then
$cygtop/H-${arch}-cygwin32/${arch}-cygwin32/include\
";;
*) incpth="$incpth\
- /usr/local/include/readline\
- /usr/include/readline\
- /opt/include/readline\
- /opt/local/include/readline\
- /opt/gnu/include/readline\
- /usr/unsupported/include/readline\
- /usr/local/include\
- /usr/include\
- /opt/include\
- /opt/local/include\
- /opt/gnu/include\
+ $LOCALBASE/include\
";;
esac
pth="$with_readline_include $readline_add $incpth"
- x=`./locate 'readline.h' '' $pth`
+ x=`./locate 'readline/readline.h' '' $pth`
CPPF_defined=
case $x in
?:/*|/*) rl_include=`dirname $x`
@@ -111,22 +101,11 @@ if test -n "$readline"; then
lib=$rl_fullname; sym=tgetent; . ./locatesymbol
need_tgetent="$try"
if test -n "$need_tgetent"; then
- opth=$pth; pth="$with_ncurses_lib $libpth"
- lib=ncurses; . ./locatelib
- if test -n "$try"; then # ncurses found. Does it contain tgetent ?
- lib=$try; . ./locatesymbol
- fi
- pth=$opth
- if test -n "$try"; then
- rl_ncurses=$ncurses
- need_tgetent=
- else # give termcap a try
lib=termcap; . ./locatelib
if test -n "$try"; then
rl_termcap=$termcap
need_tgetent=
fi
- fi
fi
# Readline -- CFLAGS
if (echo $rl_include | grep "readline$" > /dev/null); then
@@ -135,7 +114,7 @@ if test -n "$readline"; then
else # in case headers are not installed correctly
RLINCLUDE="-I$rl_include -DREADLINE_LIBRARY"
fi
- RLLIBS="-L$readline -lreadline"
+ RLLIBS="-Wl,-R$readline -L$readline -lreadline"
if test -n "$rl_ncurses"; then
echo ..."Library ncurses needed by readline"
RLLIBS="$RLLIBS -L$rl_ncurses -lncurses"
math/pari/patches/patch-ai
-349
View File
@@ -1,349 +0,0 @@
$NetBSD: patch-ai,v 1.4 2010/10/01 20:50:55 minskim Exp $
--- config/Makefile.SH.orig 2010-01-09 17:59:48.000000000 +0000
+++ config/Makefile.SH
@@ -70,7 +70,7 @@ plotrunpath=
case "$which_graphic_lib" in
*X11*)
PLOTCFLAGS="$PLOTCFLAGS $X11_INC"
- PLOTLIBS="$PLOTLIBS $X11_LIBS"
+ PLOTLIBS="-Wl,-R${X11BASE}/lib $PLOTLIBS $X11_LIBS"
plotrunpath=$X11
graph="plotX $graph"
;;
@@ -110,25 +110,12 @@ if test -n "$runpathprefix"; then
RUNPTH=`$config_dir/ldflags "$LDneedsWl" "$runpathprefix$TOP/$objdir$dir_sep$tmp"`
fi
-if test -z "$DLLD"; then
- exec="gp-sta"; static=y
-else
- exec="gp-sta gp-dyn"
-fi
case "$sizeof_long" in
4) numbits=32;;
8) numbits=64;;
esac
dotest="env \"LD_LIBRARY_PATH=.$dir_sep\$\$LD_LIBRARY_PATH\" \$(SHELL) $src/test/dotest $numbits"
-if test -z "$emacs"; then
- install_emacs_files=
-else
- install_emacs_files=install_emacs_files
-fi
-case "$static" in
- n) dft=dyn; libdft=lib-dyn;;
- y) dft=sta; libdft= ;;
-esac
+install_emacs_files=install_emacs_files
CPPFLAGS="-I. -I$src/headers"
if test "$has_dlopen" = builtin; then
@@ -153,16 +140,14 @@ AR = ar
SIZEOF_LONG= $sizeof_long
CC_FLAVOR =
-CC = $CC \$(CC_FLAVOR)
+CC = \$(LIBTOOL) --mode=compile $CC \$(CC_FLAVOR)
CPPFLAGS = $CPPFLAGS
CFLAGS = $CFLAGS
DLCFLAGS = $DLCFLAGS
LD_FLAVOR = \$(CC_FLAVOR)
-LD = $LD \$(LD_FLAVOR)
+LD = \$(LIBTOOL) --mode=link $LD \$(LD_FLAVOR)
LDFLAGS = $LDFLAGS
DLLD_FLAVOR = \$(LD_FLAVOR)
-DLLD = $DLLD \$(DLLD_FLAVOR)
-DLLDFLAGS = $DLLDFLAGS
EXTRADLLDFLAGS = $EXTRADLLDFLAGS
# HIGHLY EXPERIMENTAL (only tested with gmp-4.0 on ix86 and Ultra).
@@ -179,29 +164,19 @@ EXTRADLLDFLAGS = $EXTRADLLDFLAGS
#the following line
#GMPO2 = \$(GMP)/sparcv9.o
-_O = .o
-_A = .a
+_O = .lo
+_A = .la
LIB_PREFIX = $lib_prefix
-DLLIB_PREFIX = $dllib_prefix
-LIBPARI_BASE = $libpari_base
-LIBPARI = \$(LIB_PREFIX)pari
-DLLIBPARI = \$(DLLIB_PREFIX)pari
-LIBPARI_STA = \$(LIBPARI)\$(_A)
-LIBPARI_SO = \$(DLLIBPARI).$DLSUFFIX
-SOLIBPARI = \$(DLLIB_PREFIX)\$(LIBPARI_BASE).$DLSUFFIX
-LIBPARI_DYN = \$(SOLIBPARI)$sodest
-LIBPARI_SONAME= \$(SOLIBPARI)$soname
+LIBPARI = \$(LIB_PREFIX)$libpari_base\$(_A)
DL_DFLT_NAME = $DL_DFLT_NAME
EXPORT_FILE = $export_file
EXPORT_CREATE = $export_create
EXPORT_LIB = $export_lib
EXPORT_LIB_CREATE = $export_lib_create
-DLLD_IGNORE = $dlld_ignore
RUNPTH = $RUNPTH
RUNPTH_FINAL = $RUNPTH_FINAL
-LDDYN = $LDDYN
LIBS = $LIBS
RM = rm -f
@@ -226,8 +201,10 @@ MISCDIR = \$(DATADIR)/misc
DOCDIR = \$(DATADIR)/doc
INSTALL = $cfg/install
-INSTALL_PROGRAM = \$(INSTALL)
-INSTALL_DATA = \$(INSTALL) -m 644
+INSTALL_PROGRAM = \$(BSD_INSTALL_PROGRAM)
+INSTALL_SCRIPT = \$(BSD_INSTALL_SCRIPT)
+INSTALL_DATA = \$(BSD_INSTALL_DATA)
+INSTALL_MAN = \$(BSD_INSTALL_MAN)
# Readline
RLINCLUDE = $RLINCLUDE
@@ -239,7 +216,7 @@ QTDIR = "$QTDIR"
MOC = \$(QTDIR)/bin/moc
PLOTCFLAGS = $PLOTCFLAGS
PLOTLIBS = $PLOTLIBS
-CPLUSPLUS = g++
+CPLUSPLUS = \$(LIBTOOL) --mode=compile $CXX \$(CXX_FLAVOR)
FLTKDIR = "$FLTKDIR"
@@ -254,21 +231,16 @@ DOTEST=$dotest
OBJS = $OBJS
OBJSGP = $OBJSGP
-gp: gp-$dft ../gp$suffix$exe_suff $libdft
+all: \$(LIBPARI)
-../gp$suffix$exe_suff: gp-$dft
- -\$(RM) \$@
- -\$(LN) $ln_objdir/gp-$dft$exe_suff \$@
+lib: \$(LIBPARI)
-all: $exec lib-sta
+\$(LIBPARI): \$(OBJS)
+ \$(LD) -o \$@ \$(OBJS) -rpath \$(LIBDIR) --version-info 0:0
-lib-sta: \$(LIBPARI_STA)
-lib-dyn: \$(LIBPARI_DYN)
-
-\$(LIBPARI_STA): $add_funclist \$(OBJS)
- -\$(RM) \$@
- \$(AR) r \$@ \$(OBJS)
- -$ranlib \$@
+gp: \$(OBJSGP) \$(LIBPARI)
+ \$(RM) \$@
+ \$(LD) -o \$@ \$(LDFLAGS) \$(OBJSGP) \$(RUNPTH_FINAL) \$(PLOTLIBS) \$(LIBS) \$(RLLIBS) \$(LIBPARI)
kerntest\$(_O): $src/test/kerntest.c
\$(CC) -c \$(CFLAGS) -I$src/language \$(CPPFLAGS) -o \$@ $src/test/kerntest.c
@@ -297,11 +269,6 @@ tune-dyn: tune.o \$(LIBPARI_DYN)
tune-sta: tune.o \$(LIBPARI_STA)
\$(LD) \$(LDFLAGS) -o \$@ \$< \$(GMPOBJS) ./\$(LIBPARI_STA) \$(LIBS)
-gp-sta: $add_funclist \$(OBJS) \$(OBJSGP)
- \$(RM) \$@
- \$(LD) -o \$@ \$(LDFLAGS) \$(OBJS) \$(OBJSGP) \$(RUNPTH) \$(RLLIBS) \$(PLOTLIBS) \$(LIBS)
- $postconfig gp-sta
-
cleanemacs:
\$(RM) $emx/*.elc
cleantest:
@@ -316,7 +283,7 @@ clean: cleanobj cleantest cleanemacs cle
.headers: $HEADERS
@touch \$@
-install: install-lib-$dft install-include install-bin install-man install-misc install-doc install-examples install-cfg install-data
+install: install-lib install-include install-bin install-man install-misc install-examples install-cfg install-data
install-include:
-mkdir -p \$(INCLUDEDIR)/pari
@@ -324,23 +291,11 @@ install-include:
\$(INSTALL_DATA) \$\$i \$(INCLUDEDIR)/pari; done
-for i in $headerlist; do \\
\$(INSTALL_DATA) $src/headers/\$\$i.h \$(INCLUDEDIR)/pari; done
- -\$(RM) \$(INCLUDEDIR)/pari/genpari.h
-\$(LN) pari.h \$(INCLUDEDIR)/pari/genpari.h
-install-bin: install-bin-$dft
-
-install-bin-dyn: gp-dyn
+install-bin: gp
-mkdir -p \$(BINDIR)
- -\$(RM) \$(BINDIR)/gp-$version$exe_suff \$(BINDIR)/gp$exe_suff
- \$(LD) -o \$(BINDIR)/gp-$version$exe_suff \$(LDFLAGS) \$(OBJSGP) \$(RUNPTH_FINAL) \$(TOPLDDYN) \$(LDDYN) \$(PLOTLIBS) \$(LIBS)
- -\$(STRIP) \$(STRIPFLAGS) \$(BINDIR)/gp-$version$exe_suff
- $postconfig \$(BINDIR)/gp-$version$exe_suff
- -\$(LN) gp-$version$exe_suff \$(BINDIR)/gp$exe_suff
-
-install-bin-sta: gp-sta
- -mkdir -p \$(BINDIR)
- -\$(RM) \$(BINDIR)/gp-$version$exe_suff \$(BINDIR)/gp$exe_suff
- \$(INSTALL_PROGRAM) gp-sta$exe_suff \$(BINDIR)/gp-$version$exe_suff
+ \$(LIBTOOL) --mode=install \$(INSTALL_PROGRAM) gp$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 OSF.
# -\$(STRIP) \$(STRIPFLAGS) \$(BINDIR)/gp-$version
@@ -348,24 +303,22 @@ install-bin-sta: gp-sta
install-man::
-mkdir -p \$(MANDIR)
- -\$(RM) \$(MANDIR)/pari.1 \$(MANDIR)/gp.1 \$(MANDIR)/gp-$version.1
- \$(INSTALL_DATA) $doc/gphelp.1 \$(MANDIR)
- \$(INSTALL_DATA) $doc/gp.1 \$(MANDIR)/gp-$version.1
+ \$(INSTALL_MAN) $doc/gphelp.1 \$(MANDIR)
+ \$(INSTALL_MAN) $doc/gp.1 \$(MANDIR)
-\$(LN) gp.1 \$(MANDIR)/pari.1
- -\$(LN) gp-$version.1 \$(MANDIR)/gp.1
install-misc: $install_emacs_files
-mkdir -p \$(MISCDIR) \$(BINDIR)
- \$(INSTALL_PROGRAM) $misc/tex2mail \$(BINDIR)
- \$(INSTALL_DATA) $doc/tex2mail.1 \$(MANDIR)
- \$(INSTALL_DATA) $misc/README \$(MISCDIR)
- \$(INSTALL_DATA) $misc/color.dft \$(MISCDIR)
- \$(INSTALL_DATA) $misc/gpalias \$(MISCDIR)
- \$(INSTALL_PROGRAM) $misc/gpflog \$(MISCDIR)
- \$(INSTALL_DATA) $misc/gprc.dft \$(MISCDIR)
- \$(INSTALL_DATA) $misc/new.dic \$(MISCDIR)
- \$(INSTALL_DATA) $misc/pari.xpm \$(MISCDIR)
- \$(INSTALL_PROGRAM) $misc/xgp \$(MISCDIR)
+ \$(INSTALL_SCRIPT) $misc/tex2mail \$(BINDIR)
+ \$(INSTALL_MAN) $doc/tex2mail.1 \$(MANDIR)
+ \$(INSTALL_DATA) $misc/README \$(MISCDIR)
+ \$(INSTALL_DATA) $misc/color.dft \$(MISCDIR)
+ \$(INSTALL_DATA) $misc/gpalias \$(MISCDIR)
+ \$(INSTALL_SCRIPT) $misc/gpflog \$(MISCDIR)
+ \$(INSTALL_DATA) $misc/gprc.dft \$(MISCDIR)
+ \$(INSTALL_DATA) $misc/new.dic \$(MISCDIR)
+ \$(INSTALL_DATA) $misc/pari.xpm \$(MISCDIR)
+ \$(INSTALL_SCRIPT) $misc/xgp \$(MISCDIR)
install-cfg::
-mkdir -p \$(SYSDATADIR)
@@ -377,8 +330,15 @@ install-cfg::
install-doc::
-mkdir -p \$(BINDIR) \$(DOCDIR)
+ -\$(INSTALL_DATA) ../AUTHORS \$(DATADIR)
+ -\$(INSTALL_DATA) ../CHANGES \$(DATADIR)
+ -\$(INSTALL_DATA) ../COMPAT \$(DATADIR)
+ -\$(INSTALL_DATA) ../COPYING \$(DATADIR)
+ -\$(INSTALL_DATA) ../MACHINES \$(DATADIR)
+ -\$(INSTALL_DATA) ../NEW \$(DATADIR)
+ -\$(INSTALL_DATA) ../README \$(DATADIR)
-cd $doc; \$(MAKE) all
- -\$(INSTALL_PROGRAM) $doc/gphelp \$(BINDIR)
+ -\$(INSTALL_SCRIPT) $doc/gphelp \$(BINDIR)
-\$(INSTALL_DATA) $doc/Makefile \$(DOCDIR)
-\$(INSTALL_DATA) $doc/translations \$(DOCDIR)
-\$(INSTALL_DATA) $doc/appa.tex \$(DOCDIR)
@@ -395,11 +355,10 @@ install-doc::
-\$(INSTALL_DATA) $doc/usersch4.tex \$(DOCDIR)
-\$(INSTALL_DATA) $doc/usersch5.tex \$(DOCDIR)
-\$(INSTALL_DATA) $doc/paricfg.tex \$(DOCDIR)
- -\$(INSTALL_DATA) $doc/libpari.dvi \$(DOCDIR)
- -\$(INSTALL_DATA) $doc/users.dvi \$(DOCDIR)
- -\$(INSTALL_DATA) $doc/tutorial.dvi \$(DOCDIR)
- -\$(INSTALL_DATA) $doc/refcard.dvi \$(DOCDIR)
- -\$(INSTALL_DATA) $doc/refcard.ps \$(DOCDIR)
+ -\$(INSTALL_DATA) $doc/libpari.pdf \$(DOCDIR)
+ -\$(INSTALL_DATA) $doc/users.pdf \$(DOCDIR)
+ -\$(INSTALL_DATA) $doc/tutorial.pdf \$(DOCDIR)
+ -\$(INSTALL_DATA) $doc/refcard.pdf \$(DOCDIR)
install-examples:
-mkdir -p \$(EXDIR)
@@ -426,20 +385,9 @@ install-data:
done; \
fi
-install-lib-sta: \$(LIBPARI_STA)
+install-lib: \$(LIBPARI)
-mkdir -p \$(LIBDIR)
- -\$(RM) \$(LIBDIR)/\$(LIBPARI_STA)
- \$(INSTALL_DATA) \$(LIBPARI_STA) \$(LIBDIR)/\$(LIBPARI_STA)
-
-install-lib-dyn-base:
- -mkdir -p \$(LIBDIR)
- -\$(RM) \$(LIBDIR)/\$(LIBPARI_DYN) \$(LIBDIR)/\$(LIBPARI_SONAME) \$(LIBDIR)/\$(LIBPARI_SO)
- \$(INSTALL_PROGRAM) \$(LIBPARI_DYN) \$(LIBDIR)/\$(LIBPARI_DYN)
-install-lib-dyn-link: install-lib-dyn-base
- -if test "\$(LIBPARI_SONAME)" != "\$(LIBPARI_SO)"; then \
- \$(LN) \$(LIBPARI_DYN) \$(LIBDIR)/\$(LIBPARI_SONAME);\
- \$(LN) \$(LIBPARI_DYN) \$(LIBDIR)/\$(LIBPARI_SO); fi
-install-lib-dyn: \$(LIBPARI_DYN) install-lib-dyn-link
+ \$(LIBTOOL) --mode=install \$(BSD_INSTALL_LIB) \$(LIBPARI) \$(LIBDIR)/
pariinl.h: parilvl0.h parilvl1.h
cat parilvl0.h parilvl1.h > pariinl.h
@@ -462,63 +410,13 @@ dotest-$i::
EOT
done
-if test -z "$DLLD"; then
- cat >> $file << EOT
-
-\$(LIBPARI_DYN)::
- @echo "Configure could not find a way to build a shared library on this machine"
-
-EOT
-else
- if test -n "$export_file"; then
- cat >> $file << EOT
-
-EXPORT_FILE_BASE = $src/systems/os2/pari.def.base
-VERSION_VERBOSE = $pari_release_verbose
-
-\$(EXPORT_FILE): \$(OBJS) \$(EXPORT_FILE_BASE)
- cat \$(EXPORT_FILE_BASE) | sed 's/<DLL_BASE>/\$(DLLIBPARI)/' | sed 's/<VENDOR>/pari.math.u-bordeaux.fr\//' | sed 's/<VERSION>/\$(VERSION_VERBOSE)/' | sed 's/<DESCR>/GP\/PARI compiled with \$(CFLAGS)/' > \$@
- \$(EXPORT_CREATE) \$(OBJS) >> \$@
-
-\$(DLLIBPARI)\$(_A): \$(EXPORT_FILE)
- \$(EXPORT_LIB_CREATE) -o \$@ \$(EXPORT_FILE)
-
-EOT
- fi
- cat >> $file << EOT
-
-gp-dyn: $add_funclist \$(OBJSGP) \$(LIBPARI_DYN) \$(EXPORT_LIB)
- \$(RM) \$@
- \$(LD) -o \$@ \$(LDFLAGS) \$(OBJSGP) \$(RUNPTH) \$(TOPLDDYN) \$(LDDYN) \$(PLOTLIBS) \$(LIBS)
- $postconfig gp-dyn
-
-\$(LIBPARI_DYN): $add_funclist \$(OBJS) \$(EXPORT_FILE)
- -\$(RM) \$(LIBPARI_DYN)
- \$(DLLD_IGNORE)\$(DLLD) -o \$(LIBPARI_DYN) \$(DLLDFLAGS) \$(OBJS) \$(EXTRADLLDFLAGS) \$(EXPORT_FILE)
- -if test "\$(LIBPARI_DYN)" != "\$(LIBPARI_SO)"; then \
- \$(RM) \$(LIBPARI_SO);\
- \$(LN) \$(LIBPARI_DYN) \$(LIBPARI_SO); fi
- -if test "\$(LIBPARI_DYN)" != "\$(LIBPARI_SONAME)"; then \
- \$(RM) \$(LIBPARI_SONAME);\
- \$(LN) \$(LIBPARI_DYN) \$(LIBPARI_SONAME); fi
-EOT
-fi
-
-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
-
-$install_emacs_files: elc
+cat >> $file << EOT
+$install_emacs_files:
-mkdir -p \$(EMACSDIR)
-cd $emx; for f in *.elc *.el pariemacs.txt; do \
\$(INSTALL_DATA) \$\$f \$(EMACSDIR); \
done
EOT
-fi
if test -n "$add_funclist"; then
cat >> $file << EOT
math/pari/patches/patch-aj
-13
View File
@@ -1,13 +0,0 @@
$NetBSD: patch-aj,v 1.2 2010/02/06 10:37:06 sno Exp $
--- src/headers/paristio.h.orig 2008-01-16 15:55:40.000000000 +0000
+++ src/headers/paristio.h
@@ -15,6 +15,8 @@ Foundation, Inc., 59 Temple Place - Suit
/* This file contains memory and I/O management definitions */
+#include <fcntl.h>
+
typedef struct {
long s, us;
} pari_timer;
math/pari/patches/patch-ak
-96
View File
@@ -1,96 +0,0 @@
$NetBSD: patch-ak,v 1.2 2010/02/06 10:37:06 sno Exp $
--- src/test/dotest.orig 2010-02-05 10:43:24.000000000 +0000
+++ src/test/dotest
@@ -44,14 +44,8 @@ else
fi
$RM -f $file_bench
-dotestSUF=${dotestSUF:-"sta dyn"}
-for arg in $dotestSUF; do
- case "$arg" in
- sta|dyn) if test $x $execdir/gp-$arg; then SUF="$SUF $arg"; fi ;;
- esac
-done
file_test=gp.out
-for suf in $SUF; do eval time$suf=0 files$suf=; done
+eval time=0 files=
for testdata in $testlist; do
O=$IFS;IFS=_;set $testdata;IFS=$O;testname=$1;testmul=$2
file_in=$testdir/in/$testname
@@ -65,44 +59,37 @@ for testdata in $testlist; do
testmul=${testmul:-1000}
wr "* Testing $testname $c"
- for suf in $SUF; do
- wr " for gp-$suf..$c"
- case "$suf" in
- exe) file_diff=$testname.dif;;
- *) file_diff=$testname-$suf.dif
- gp=$execdir/gp-$suf;;
- esac
+ wr " for gp..$c"
+ file_diff=$testnamef.dif
+ gp=$execdir/gp
$gp -q --test < $file_in > $file_test 2>&1
diff -c $file_out $file_test > $file_diff
pat=`grep "^[-+!] " $file_diff | grep -v "Total time"`
time=`${tail}2 $file_test | sed -n 's,.*Total time spent: \(.*\),\1,p'`
if test -n "$time"; then
- eval t='$'time$suf
+ eval t='$'time
if test -n "$exprbug"; then
t=`expr $time \'\*\' $testmul / 1000 + $t`
else
t=`expr $time '*' $testmul / 1000 + $t`
fi
- eval time$suf=$t
+ eval time=$t
fi
if test -z "$pat"; then
wr "TIME=$time";
else
eval BUG$suf=BUG
- eval files$suf=\"'$'files$suf $file_diff\"
+ eval files=\"'$'files $file_diff\"
wr "BUG [${time:-0}]"
fi
- done
wrln
done
$RM -f $file_test
BUG=
-for suf in $SUF; do
- B=`eval echo '$'BUG$suf`; BUG="$BUG$B"
- t=`eval echo '$'time$suf`
+ B=`eval echo '$'BUG`; BUG="$BUG$B"
+ t=`eval echo '$'time`
if test -n "$B"; then B=' [BUG]'; fi
- wrln "+++$B Total bench for gp-$suf is $t"
-done
+ wrln "+++$B Total bench for gp is $t"
if test -z "$BUG"; then exit 0; fi
pwd=`pwd`
@@ -110,18 +97,16 @@ wrln
wrln "PROBLEMS WERE NOTED. The following files list them in diff format: "
wrln "Directory: $pwd"
bugp=; buge=;
-for suf in $SUF; do
- B=`eval echo '$'BUG$suf`; BUG="$BUG$B"
+ B=`eval echo '$'BUG`; BUG="$BUG$B"
if test -n "$B"; then
- flist=`eval echo '$'files$suf`
+ flist=`eval echo '$'files`
for f in $flist; do
wrln " $f"
case "$f" in
- *program*) bugp="$suf$bugp";;
+ *program*) bugp="$bugp";;
esac
done
fi
-done
case "x$bugp" in
x) file_diff=;;
math/pari/patches/patch-al
-103
View File
@@ -1,103 +0,0 @@
$NetBSD: patch-al,v 1.4 2010/10/01 20:50:55 minskim Exp $
--- config/DOC_Make.SH.orig 2008-03-31 11:43:59.000000000 +0000
+++ config/DOC_Make.SH
@@ -8,11 +8,11 @@ MACROS= paricfg.tex parimacro.tex
USERS_TEX=\$(MACROS) users.tex usersch1.tex usersch2.tex usersch3.tex
PARI_TEX=\$(MACROS) libpari.tex appa.tex appb.tex appc.tex usersch4.tex usersch5.tex
-doc all: develop.dvi libpari.dvi users.dvi refcard.ps tutorial.dvi
+docdvi: develop.dvi libpari.dvi users.dvi refcard.ps tutorial.dvi
docps: develop.ps libpari.ps refcard.ps tutorial.ps users.ps INSTALL.ps
-docpdf: develop.pdf libpari.pdf users.pdf tutorial.pdf refcard.pdf INSTALL.pdf
+all doc docpdf: develop.pdf libpari.pdf users.pdf tutorial.pdf refcard.pdf INSTALL.pdf
-.SUFFIXES: .tex .ipf .pod .inf .dumbpod .3 .html
+.SUFFIXES: .tex .ipf .pod .inf .dumbpod .3 .html .ps .pdf .dvi .idx .std
paricfg.tex: paricfg.tex.in
sed -e 's/@version@/$version.$patch/'\\
@@ -20,50 +20,50 @@ paricfg.tex: paricfg.tex.in
-e 's!@libdir@!$libdir!'\\
-e 's!@datadir@!$datadir!' paricfg.tex.in > \$@
-%.pdf: %.tex \$(MACROS)
- pdftex \$<
+.tex.pdf: \$*.tex \$(MACROS)
+ \$(PDFTEX) \$<
-%.dvi: %.tex \$(MACROS)
+.tex.dvi: \$*.tex \$(MACROS)
tex \$<
libpari.pdf: \$(PARI_TEX) \$(MACROS)
-rm -f libpari.std
- pdftex libpari
- pdftex libpari
- make libpari.std; pdftex libpari; rm -f libpari.std
+ \$(PDFTEX) libpari
+ \$(PDFTEX) libpari
+ \$(MAKE) libpari.std; \$(PDFTEX) libpari; rm -f libpari.std
libpari.dvi: \$(PARI_TEX) \$(MACROS)
-rm -f libpari.std
tex libpari
tex libpari
- make libpari.std; tex libpari; rm -f libpari.std
+ \$(MAKE) libpari.std; tex libpari; rm -f libpari.std
develop.pdf: develop.tex \$(MACROS)
-rm -f develop.std
- pdftex develop
- pdftex develop
- make develop.std; pdftex develop; rm -f develop.std
+ \$(PDFTEX) develop
+ \$(PDFTEX) develop
+ \$(MAKE) develop.std; \$(PDFTEX) develop; rm -f develop.std
develop.dvi: develop.tex \$(MACROS)
-rm -f develop.std
tex develop
tex develop
- make develop.std; tex develop; rm -f develop.std
+ \$(MAKE) develop.std; tex develop; rm -f develop.std
tutorial.pdf: tutorial.tex \$(MACROS)
-rm -f tutorial.std
- pdftex tutorial
- pdftex tutorial
+ \$(PDFTEX) tutorial
+ \$(PDFTEX) tutorial
tutorial.dvi: tutorial.tex \$(MACROS)
-rm -f tutorial.std
tex tutorial
tex tutorial
-%.ps: %.dvi
+.dvi.ps: \$*.dvi
dvips \$< -o \$@
refcard.ps: refcard.dvi
dvips -t landscape -t a4 refcard.dvi -o \$@
-%.std: %.idx
+.idx.std: \$*.idx
sed -e 's/!\([1-9]\)!/!00\1!/'\\
-e 's/!\([1-9][0-9]\)!/!0\1!/'\\
-e 's/\\\\EFF {}/f/g'\\
@@ -74,13 +74,13 @@ users.dvi: \$(USERS_TEX)
-rm -f users.std
tex users
tex users
- make users.std; tex users; rm -f users.std
+ \$(MAKE) users.std; tex users; rm -f users.std
users.pdf: \$(USERS_TEX)
-rm -f users.std
- pdftex users
- pdftex users
- make users.std; pdftex users; rm -f users.std
+ \$(PDFTEX) users
+ \$(PDFTEX) users
+ \$(MAKE) users.std; \$(PDFTEX) users; rm -f users.std
gpman: gp.1
nroff -man gp.1 | unix2dos -ascii > gp.man
math/pari/patches/patch-an
-50
View File
@@ -1,50 +0,0 @@
$NetBSD: patch-an,v 1.3 2010/02/12 18:18:29 sno Exp $
--- src/language/anal.h.orig 2008-06-10 15:43:14.000000000 +0000
+++ src/language/anal.h
@@ -61,7 +61,6 @@ void changevalue_p(entree *ep, GEN x);
void changevalue(entree *ep, GEN val);
entree *do_alias(entree *ep);
int is_identifier(char *s);
-entree *is_entry_intern(char *s, entree **table, long *hash);
long is_keyword_char(char c);
char *readstring(char *src, char *s);
long loop_break(void);
@@ -80,23 +79,15 @@ void hit_return(void);
extern char *gp_function_name;
extern int (*whatnow_fun)(char *, int);
extern void (*sigint_fun)(void);
-extern void *foreignHandler;
-extern GEN (*foreignExprHandler)(char*);
-extern char foreignExprSwitch;
-extern entree * (*foreignAutoload)(char*, long);
-extern void (*foreignFuncFree)(entree *);
extern int (*default_exception_handler)(long);
extern const long functions_tblsz; /* hashcodes table size */
/* Variables containing the list of PARI functions */
-extern entree **functions_hash; /* functions hashtable */
extern entree **members_hash; /* members hashtable */
-extern entree functions_basic[];
/* Variables containing the list of specific GP functions */
extern entree functions_gp[];
extern entree gp_member_list[];
-extern entree functions_highlevel[];
/* Variables containing the list of old PARI fonctions (up to 1.39.15) */
extern entree **funct_old_hash; /* hashtable */
@@ -118,13 +109,6 @@ enum { RET_GEN, RET_INT, RET_LONG, RET_V
extern void *PARI_stack_limit;
#endif
-/* entrees */
-#define EpVALENCE(ep) ((ep)->valence & 0xFF)
-#define EpSTATIC(ep) ((ep)->valence & 0x100)
-#define EpSETSTATIC(ep) ((ep)->valence |= 0x100)
-#define EpPREDEFINED(ep) (EpVALENCE(ep) < EpUSER)
-enum { EpUSER = 100, EpNEW, EpALIAS, EpVAR, EpGVAR, EpMEMBER, EpINSTALL };
-
/* defaults */
char* get_sep(const char *t);
long get_int(const char *s, long dflt);
math/pari/patches/patch-ao
-29
View File
@@ -1,29 +0,0 @@
$NetBSD: patch-ao,v 1.3 2010/02/12 18:18:29 sno Exp $
--- src/headers/paripriv.h.orig 2008-03-31 11:43:59.000000000 +0000
+++ src/headers/paripriv.h
@@ -850,4 +850,24 @@ GEN kbesselnew(GEN n, GEN z, long pr
GEN polylogd0(long m, GEN x, long flag, long prec);
GEN twistpartialzeta(GEN p, GEN q, long f, long c, GEN va, GEN cff);
+/* Something from src/languages/anal.[ch] to support Math::Pari */
+
+/* entrees */
+#define EpVALENCE(ep) ((ep)->valence & 0xFF)
+#define EpSTATIC(ep) ((ep)->valence & 0x100)
+#define EpSETSTATIC(ep) ((ep)->valence |= 0x100)
+#define EpPREDEFINED(ep) (EpVALENCE(ep) < EpUSER)
+enum { EpUSER = 100, EpNEW, EpALIAS, EpVAR, EpGVAR, EpMEMBER, EpINSTALL };
+
+extern entree **functions_hash; /* functions hashtable */
+extern entree functions_basic[];
+extern entree functions_highlevel[];
+extern entree *is_entry_intern(char *s, entree **table, long *hash);
+
+extern void *foreignHandler;
+extern GEN (*foreignExprHandler)(char*);
+extern char foreignExprSwitch;
+extern entree * (*foreignAutoload)(char*, long);
+extern void (*foreignFuncFree)(entree *);
+
ENDEXTERN
math/pari/patches/patch-ap
-13
View File
@@ -1,13 +0,0 @@
$NetBSD: patch-ap,v 1.3 2010/03/13 22:16:34 schmonz Exp $
--- config/TOP_Make.SH.orig 2008-10-23 16:30:37.000000000 +0000
+++ config/TOP_Make.SH
@@ -40,7 +40,7 @@ dft target::
@echo "Available extra tests: test-all $top_test_extra"
all::
- @-cd doc && \$(MAKE) doc
+# @-cd doc && \$(MAKE) doc
@\$(MAKE) gp
gp bench test-kernel test-all $top_test_extra $top_dotest_extra install cleanobj cleantest install-bin install-doc install-data install-lib-sta install-bin-sta dobench tune::
math/pari/patches/patch-config_DOC__Make.SH
+15
View File
@@ -0,0 +1,15 @@
$NetBSD: patch-config_DOC__Make.SH,v 1.1 2016/03/03 13:28:22 wiz Exp $
Rules for dvi/ps are broken, just generate PDFs to work around this.
--- config/DOC_Make.SH.orig 2014-07-30 13:38:47.000000000 +0000
+++ config/DOC_Make.SH
@@ -21,7 +21,7 @@ MACROS= paricfg.tex parimacro.tex
USERS_TEX=\$(MACROS) appa.tex users.tex usersch1.tex usersch2.tex usersch3.tex
PARI_TEX=\$(MACROS) libpari.tex appb.tex appd.tex usersch4.tex usersch5.tex usersch6.tex usersch7.tex
-doc all: develop.dvi libpari.dvi parallel.dvi users.dvi refcard.ps tutorial.dvi
+doc all: develop.pdf libpari.pdf parallel.pdf users.pdf refcard.pdf tutorial.pdf
docps: develop.ps libpari.ps parallel.ps refcard.ps tutorial.ps users.ps INSTALL.ps
docpdf: develop.pdf libpari.pdf parallel.pdf users.pdf tutorial.pdf refcard.pdf INSTALL.pdf
math/pari/patches/patch-config_Makefile.SH
+240
View File
@@ -0,0 +1,240 @@
$NetBSD: patch-config_Makefile.SH,v 1.2 2016/05/07 10:03:25 joerg Exp $
--- config/Makefile.SH.orig 2014-12-13 20:52:52.000000000 +0000
+++ config/Makefile.SH
@@ -52,8 +52,6 @@ case "$osname" in
dlld_ignore=- ;;
mingw)
export_file='$(LIBPARI).def';;
- darwin)
- ld_install_name="-Wl,-install_name -Wl,\"$libdir\"/\$(LIBPARI_DYN)";;
esac
case "$osname" in
mingw|cygwin)
@@ -93,7 +91,7 @@ plotrunpath=
case "$which_graphic_lib" in
*X11*)
PLOTCFLAGS="$PLOTCFLAGS $X11_INC"
- PLOTLIBS="$PLOTLIBS $X11_LIBS"
+ PLOTLIBS="-Wl,-R${X11BASE}/lib $PLOTLIBS $X11_LIBS"
plotrunpath=$X11
graph="plotX $graph"
;;
@@ -134,20 +132,11 @@ if test -n "$runpathprefix"; then
RUNPTH=`$config_dir/ldflags "$LDneedsWl" $runpathprefix\\\$\(TOPDIR\)/$objdir$dir_sep"$tmp"`
fi
-if test -z "$DLLD"; then
- exec="gp-sta"; static=y
-else
- exec="gp-sta gp-dyn"
-fi
case "$sizeof_long" in
4) numbits=32;;
8) numbits=64;;
esac
dotest="env \"RUNTEST=\$(RUNTEST)\" \"LD_LIBRARY_PATH=.$dir_sep\$\$LD_LIBRARY_PATH\" \$(SHELL) $src/test/dotest $numbits"
-case "$static" in
- n) dft=dyn; libdft=lib-dyn;;
- y) dft=sta; libdft= ;;
-esac
CPPFLAGS="-I. -I$src/headers"
if test "$has_dlopen" = builtin; then
@@ -176,16 +165,16 @@ RANLIB = ranlib
SIZEOF_LONG= $sizeof_long
CC_FLAVOR =
-CC = $CC \$(CC_FLAVOR)
+CC = \$(LIBTOOL) --mode=compile $CC \$(CC_FLAVOR)
CPPFLAGS = $CPPFLAGS
CFLAGS = $CFLAGS
DLCFLAGS = $DLCFLAGS
KERNELCFLAGS = $KERNELCFLAGS
LD_FLAVOR = \$(CC_FLAVOR)
-LD = $LD \$(LD_FLAVOR)
+LD = \$(LIBTOOL) --mode=link $LD \$(LD_FLAVOR)
LDFLAGS = $LDFLAGS
DLLD_FLAVOR = \$(LD_FLAVOR)
-DLLD = $DLLD \$(DLLD_FLAVOR)
+DLLD = \$(LIBTOOL) --mode=link $DLLD \$(DLLD_FLAVOR)
DLLDFLAGS = $DLLDFLAGS
EXTRADLLDFLAGS = $EXTRADLLDFLAGS
RUNTEST = $RUNTEST
@@ -204,18 +193,12 @@ RUNTEST = $RUNTEST
#the following line
#GMPO2 = \$(GMP)/sparcv9.o
-_O = .o
-_A = .a
+_O = .lo
+_A = .la
LIB_PREFIX = $lib_prefix
DLLIB_PREFIX = $dllib_prefix
-LIBPARI_BASE = $libpari_base
-LIBPARI = \$(LIB_PREFIX)pari
-DLLIBPARI = \$(DLLIB_PREFIX)pari
-LIBPARI_STA = \$(LIBPARI)\$(_A)
-LIBPARI_SO = \$(DLLIBPARI).$DLSUFFIX
-SOLIBPARI = \$(DLLIB_PREFIX)\$(LIBPARI_BASE).$DLSUFFIX
-LIBPARI_DYN = \$(SOLIBPARI)$sodest
-LIBPARI_SONAME= \$(SOLIBPARI)$soname
+LIBPARI_BASE = $eibpari_base
+LIBPARI = \$(LIB_PREFIX)$libpari_base\$(_A)
DL_DFLT_NAME = $DL_DFLT_NAME
LD_INSTALL_NAME = $ld_install_name
@@ -289,21 +272,15 @@ OBJSGP = $OBJSGP
.PHONY: gp dft clean
-gp: gp-$dft ../gp$suffix$exe_suff $libdft
-
-../gp$suffix$exe_suff: gp-$dft
- -\$(RM) \$@
- -\$(LN) $ln_objdir/gp-$dft \$@
-
-all: $exec lib-sta
+gp: \$(OBJSGP) \$(LIBPARI)
+ \$(RM) \$@
+ \$(LD) -o \$@ \$(LDFLAGS) \$(OBJSGP) \$(RUNPTH_FINAL) \$(PLOTLIBS) \$(LIBS) \$(RLLIBS) \$(LIBPARI)
-lib-sta: \$(LIBPARI_STA)
-lib-dyn: \$(LIBPARI_DYN)
+all: gp \$(LIBPARI)
+lib: \$(LIBPARI)
-\$(LIBPARI_STA): $add_funclist \$(OBJS)
- -\$(RM) \$@
- \$(AR) r \$@ \$(OBJS)
- -\$(RANLIB) \$@
+\$(LIBPARI): \$(OBJS)
+ \$(LD) -o \$@ \$(OBJS) -rpath \$(PREFIX)/lib \$(GMPLIBS) --version-info 0:0
kerntest\$(_O): $src/test/kerntest.c
\$(CC) -c -I$src/language \$(CPPFLAGS) \$(CFLAGS) -o \$@ $src/test/kerntest.c
@@ -335,11 +312,6 @@ tune-dyn: tune\$(_O) \$(LIBPARI_DYN)
tune-sta: tune\$(_O) \$(LIBPARI_STA)
\$(LD) \$(LDFLAGS) \$(RUNPTH) -o \$@ \$< \$(GMPOBJS) ./\$(LIBPARI_STA) \$(STA_LIBS)
-gp-sta: $add_funclist \$(OBJS) \$(OBJSGP)
- \$(RM) \$@
- \$(LD) -o \$@ \$(LDFLAGS) \$(OBJS) \$(OBJSGP) \$(RUNPTH) \$(RLLIBS) \$(PLOTLIBS) \$(STA_LIBS)
- $postconfig gp-sta
-
cleantest:
\$(RM) *.dif gp.out io-testfile pari.ps
cleanobj:
@@ -364,7 +336,7 @@ clean: cleanall
.headers: $HEADERS
@touch \$@
-install-nodata: install-lib-$dft install-include install-bin install-man install-misc install-doc install-examples install-cfg
+install-nodata: install-lib install-include install-bin install-man install-misc install-examples install-cfg
install: install-nodata install-data
@@ -377,37 +349,19 @@ install-include:
-\$(RM) \$(INCLUDEDIR)/pari/genpari.h
-\$(LN) pari.h \$(INCLUDEDIR)/pari/genpari.h
-install-bin: install-bin-$dft
-
-install-bin-dyn: gp-dyn install-lib-dyn
+install-bin: gp
-mkdir -p \$(BINDIR)
- -\$(RM) \$(BINDIR)/gp-$version$exe_suff \$(BINDIR)/gp$exe_suff
- \$(LD) -o \$(BINDIR)/gp-$version$exe_suff -L\$(LIBDIR) \$(LDFLAGS) \$(OBJSGP) \$(RUNPTH_FINAL) \$(LDDYN) \$(RLLIBS) \$(PLOTLIBS) \$(LIBS)
- -\$(STRIP) \$(STRIPFLAGS) \$(BINDIR)/gp-$version$exe_suff
- -cd \$(BINDIR); $postconfig gp-$version$exe_suff
- -\$(LN) gp-$version$exe_suff \$(BINDIR)/gp$exe_suff
-
-install-bin-sta: gp-sta
- -mkdir -p \$(BINDIR)
- -\$(RM) \$(BINDIR)/gp-$version$exe_suff \$(BINDIR)/gp$exe_suff
- \$(INSTALL_PROGRAM) gp-sta \$(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 OSF.
-# -\$(STRIP) \$(STRIPFLAGS) \$(BINDIR)/gp-$version
- -cd \$(BINDIR); $postconfig gp-$version$exe_suff
+ \$(LIBTOOL) --mode=install \$(INSTALL_PROGRAM) gp$exe_suff \$(BINDIR)/gp-$version$exe_suff
install-man::
-mkdir -p \$(MANDIR)
-\$(RM) \$(MANDIR)/pari.1 \$(MANDIR)/gp.1 \$(MANDIR)/gp-$version.1
- \$(INSTALL_DATA) $doc/gphelp.1 \$(MANDIR)
\$(INSTALL_DATA) $doc/gp.1 \$(MANDIR)/gp-$version.1
-\$(LN) gp.1 \$(MANDIR)/pari.1
-\$(LN) gp-$version.1 \$(MANDIR)/gp.1
install-misc:
-mkdir -p \$(MISCDIR) \$(BINDIR)
- \$(INSTALL_PROGRAM) $misc/tex2mail \$(BINDIR)
- \$(INSTALL_DATA) $doc/tex2mail.1 \$(MANDIR)
\$(INSTALL_DATA) $misc/README \$(MISCDIR)
\$(INSTALL_DATA) $misc/color.dft \$(MISCDIR)
\$(INSTALL_DATA) $misc/gpalias \$(MISCDIR)
@@ -426,7 +380,6 @@ install-cfg::
install-doc::
-mkdir -p \$(BINDIR) \$(DOCDIR)
-cd $doc; \$(MAKE) all
- -\$(INSTALL_PROGRAM) $doc/gphelp \$(BINDIR)
-\$(INSTALL_DATA) $doc/translations \$(DOCDIR)
-\$(INSTALL_DATA) $doc/appa.tex \$(DOCDIR)
-\$(INSTALL_DATA) $doc/appb.tex \$(DOCDIR)
@@ -443,12 +396,11 @@ install-doc::
-\$(INSTALL_DATA) $doc/usersch4.tex \$(DOCDIR)
-\$(INSTALL_DATA) $doc/usersch5.tex \$(DOCDIR)
-\$(INSTALL_DATA) $doc/paricfg.tex \$(DOCDIR)
- -\$(INSTALL_DATA) $doc/develop.dvi \$(DOCDIR)
- -\$(INSTALL_DATA) $doc/libpari.dvi \$(DOCDIR)
- -\$(INSTALL_DATA) $doc/users.dvi \$(DOCDIR)
- -\$(INSTALL_DATA) $doc/tutorial.dvi \$(DOCDIR)
- -\$(INSTALL_DATA) $doc/refcard.dvi \$(DOCDIR)
- -\$(INSTALL_DATA) $doc/refcard.ps \$(DOCDIR)
+ -\$(INSTALL_DATA) $doc/develop.pdf \$(DOCDIR)
+ -\$(INSTALL_DATA) $doc/libpari.pdf \$(DOCDIR)
+ -\$(INSTALL_DATA) $doc/users.pdf \$(DOCDIR)
+ -\$(INSTALL_DATA) $doc/tutorial.pdf \$(DOCDIR)
+ -\$(INSTALL_DATA) $doc/refcard.pdf \$(DOCDIR)
install-docpdf::
-mkdir -p \$(BINDIR) \$(DOCDIR)
@@ -483,23 +435,9 @@ install-data:
done; \
fi
-install-lib-sta: \$(LIBPARI_STA)
- -mkdir -p \$(LIBDIR)
- -\$(RM) \$(LIBDIR)/\$(LIBPARI_STA)
- \$(INSTALL_DATA) \$(LIBPARI_STA) \$(LIBDIR)/\$(LIBPARI_STA)
-
-install-lib-dyn-base:
+install-lib: \$(LIBPARI)
-mkdir -p \$(LIBDIR)
- -\$(RM) \$(LIBDIR)/\$(LIBPARI_DYN) \$(LIBDIR)/\$(LIBPARI_SONAME) \$(LIBDIR)/\$(LIBPARI_SO)
- \$(DLLD_IGNORE)\$(DLLD) -o \$(LIBDIR)/\$(LIBPARI_DYN) \$(DLLDFLAGS) \$(OBJS) \$(EXTRADLLDFLAGS) \$(DYN_LIBS) \$(EXPORT_FILE) \$(LD_INSTALL_NAME)
- $install_implib
-
-install-lib-dyn-link: install-lib-dyn-base
- -if test "\$(LIBPARI_DYN)" != "\$(LIBDIR)/\$(LIBPARI_SO)"; then \
- \$(LN) \$(LIBPARI_DYN) \$(LIBDIR)/\$(LIBPARI_SO); fi
- -if test "\$(LIBPARI_SONAME)" != "\$(LIBPARI_SO)"; then \
- \$(LN) \$(LIBPARI_DYN) \$(LIBDIR)/\$(LIBPARI_SONAME); fi
-install-lib-dyn: \$(LIBPARI_DYN) install-lib-dyn-link
+ \$(LIBTOOL) --mode=install \$(BSD_INSTALL_LIB) \$(LIBPARI) \$(LIBDIR)/
nsis: gp
-cd $doc; \$(MAKE) docpdf
@@ -595,11 +533,6 @@ EOT
fi
cat >> $file << EOT
-gp-dyn: $add_funclist \$(OBJSGP) \$(LIBPARI_DYN) \$(EXPORT_LIB)
- \$(RM) \$@
- \$(LD) -o \$@ -L\$(TOPLDDYN) \$(LDFLAGS) \$(OBJSGP) \$(RUNPTH) \$(RLLIBS) \$(LDDYN) \$(PLOTLIBS) \$(LIBS)
- $postconfig gp-dyn
-
\$(LIBPARI_DYN): $add_funclist \$(OBJS) \$(EXPORT_FILE)
-\$(RM) \$(LIBPARI_DYN)
\$(DLLD_IGNORE)\$(DLLD) -o \$(TOPLDDYN)/\$(LIBPARI_DYN) \$(DLLDFLAGS) \$(OBJS) \$(EXTRADLLDFLAGS) \$(DYN_LIBS) \$(EXPORT_FILE)
math/pari/patches/patch-config_TOP__Make.SH
+12
View File
@@ -0,0 +1,12 @@
$NetBSD: patch-config_TOP__Make.SH,v 1.1 2016/03/03 13:28:22 wiz Exp $
--- config/TOP_Make.SH.orig 2014-07-30 13:38:47.000000000 +0000
+++ config/TOP_Make.SH
@@ -40,7 +40,6 @@ dft target::
all::
@\$(MAKE) gp
- @-cd doc && \$(MAKE) doc
gp bench test-kernel test-all install cleanall cleanobj cleantest nsis install-bin install-doc install-docpdf install-nodata install-data install-lib-sta install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
@dir=\`config/objdir\`; echo "Making \$@ in \$\$dir";\\
math/pari/patches/patch-aa → math/pari/patches/patch-config_get__PATH
+2 -2
View File
@@ -1,6 +1,6 @@
$NetBSD: patch-aa,v 1.13 2010/02/06 10:37:06 sno Exp $
$NetBSD: patch-config_get__PATH,v 1.1 2016/03/03 13:28:22 wiz Exp $
--- config/get_PATH.orig 2008-01-16 15:57:16.000000000 +0000
--- config/get_PATH.orig 2011-09-22 20:02:11.000000000 +0000
+++ config/get_PATH
@@ -4,35 +4,7 @@ if test -z "$OS2_SHELL"; then dir_sep=':
pth="\
math/pari/patches/patch-af → math/pari/patches/patch-config_get__X11
+6 -4
View File
@@ -1,11 +1,12 @@
$NetBSD: patch-af,v 1.2 2010/02/06 10:37:06 sno Exp $
$NetBSD: patch-config_get__X11,v 1.1 2016/03/03 13:28:22 wiz Exp $
--- config/get_X11.orig 2008-01-16 15:57:17.000000000 +0000
--- config/get_X11.orig 2014-03-25 08:59:21.000000000 +0000
+++ config/get_X11
@@ -10,20 +10,7 @@ cd ..; rm -rf $tdir
@@ -10,21 +10,8 @@ cd ..; rm -rf $tdir
# Check xmkmf answer
# X11 -- Headers
if test ! -f $Xincroot/X11/Xos.h; then
x11pth="\
- x11pth="$addlib64\
- /usr/openwin/share/lib\
- /usr/openwin/lib\
- /usr/X11R6/lib /usr/X11R5/lib /usr/X11R4/lib\
@@ -20,6 +21,7 @@ $NetBSD: patch-af,v 1.2 2010/02/06 10:37:06 sno Exp $
- /usr/lib\
- /usr/local/lib\
- /usr/athena/lib\
+ x11pth="\
+ $X11BASE/lib\
";
pth=`echo $x11pth | sed 's,/lib,/include,g'`
math/pari/patches/patch-config_get__archos
+13
View File
@@ -0,0 +1,13 @@
$NetBSD: patch-config_get__archos,v 1.1 2016/03/03 13:28:22 wiz Exp $
--- config/get_archos.orig 2011-09-22 20:02:11.000000000 +0000
+++ config/get_archos
@@ -26,7 +26,7 @@ if test "$fastread" != yes; then
==========================================================================
I know of the following Operating Systems
EOM
- rep='os2 freebsd netbsd cygwin linux mingw gnu gnukfreebsd hpux aix osf1 solaris sunos nextstep concentrix irix';
+ rep='os2 freebsd netbsd cygwin linux mingw gnu gnukfreebsd hpux aix osf1 solaris sunos nextstep concentrix irix dragonfly';
. ./display
echo $n ..."Any of these apply ? $c"
dflt=$osname; . ./myread
math/pari/patches/patch-ag → math/pari/patches/patch-config_get__dlld
+6 -6
View File
@@ -1,6 +1,6 @@
$NetBSD: patch-ag,v 1.2 2010/02/06 10:37:06 sno Exp $
$NetBSD: patch-config_get__dlld,v 1.1 2016/03/03 13:28:22 wiz Exp $
--- config/get_dlld.orig 2009-09-19 12:01:14.000000000 +0000
--- config/get_dlld.orig 2015-03-18 10:33:24.000000000 +0000
+++ config/get_dlld
@@ -9,7 +9,7 @@ DLSUFFIX=so
soname=.$soname_num
@@ -11,18 +11,18 @@ $NetBSD: patch-ag,v 1.2 2010/02/06 10:37:06 sno Exp $
case $pari_release_verbose in
*STABLE*) sodest=.$version.$patch;; # released version
*DEVELOPMENT*) sodest=.$patch.0.0;; # unstable version
@@ -67,6 +67,7 @@ if test -n "$DLLD"; then
@@ -76,6 +76,7 @@ if test -n "$DLLD"; then
aix) DLLDFLAGS='-r' ;;
darwin) DLLD=; DLLDFLAGS='-dylib -flat_namespace -undefined suppress' ;;
darwin) DLLDFLAGS="-compatibility_version $compat_ver -current_version $num_ver" ;;
freebsd) DLLDFLAGS='-Bshareable -x' ;;
+ dragonfly*) DLLDFLAGS='-Bshareable -x' ;;
hpux) DLLDFLAGS='-b' ;;
irix) DLLDFLAGS='-shared -elf -no_unresolved -all' ;;
osf1) DLLDFLAGS='-shared' ;;
@@ -91,7 +92,7 @@ if test -n "$DLLD"; then
DLLDFLAGS="-shared $extra \$(CFLAGS) \$(DLCFLAGS) $DLLDFLAGS"
@@ -107,7 +108,7 @@ if test -n "$DLLD"; then
fi
case "$osname" in
# Beware: will run through 'eval' [ hence ${...} instead of \$(...) ]
- gnu*|cygwin|osf1|freebsd|linux|sunos|solaris) EXTRADLLDFLAGS='-lc ${LIBS}';;
+ dragonfly*|gnu*|cygwin|osf1|freebsd|linux|sunos|solaris) EXTRADLLDFLAGS='-lc ${LIBS}';;
esac
math/pari/patches/patch-ah → math/pari/patches/patch-config_get__install
+3 -3
View File
@@ -1,6 +1,6 @@
$NetBSD: patch-ah,v 1.2 2010/02/06 10:37:06 sno Exp $
$NetBSD: patch-config_get__install,v 1.1 2016/03/03 13:28:22 wiz Exp $
--- config/get_install.orig 2008-01-16 15:57:11.000000000 +0000
--- config/get_install.orig 2014-07-30 13:38:47.000000000 +0000
+++ config/get_install
@@ -23,7 +23,7 @@ fi
echo $n "...for architecture-independent files (share-prefix) ? $c"
@@ -8,6 +8,6 @@ $NetBSD: patch-ah,v 1.2 2010/02/06 10:37:06 sno Exp $
-dfltman=$share_prefix/man/man1
+dfltman=$prefix/man/man1
dfltemacs=$share_prefix/emacs/site-lisp/pari
dfltdata=$share_prefix/pari
echo "Installation directories for:"
math/pari/patches/patch-am → math/pari/patches/patch-config_get__ld
+3 -3
View File
@@ -1,8 +1,8 @@
$NetBSD: patch-am,v 1.2 2010/02/06 10:37:06 sno Exp $
$NetBSD: patch-config_get__ld,v 1.1 2016/03/03 13:28:22 wiz Exp $
--- config/get_ld.orig 2008-01-16 15:56:58.000000000 +0000
--- config/get_ld.orig 2011-09-22 20:02:11.000000000 +0000
+++ config/get_ld
@@ -58,7 +58,7 @@ if test "$GNULDused" = yes; then
@@ -70,7 +70,7 @@ if test "$GNULDused" = yes; then
runpathprefix='-rpath '
else # guess...
case "$osname" in
math/pari/patches/patch-ad → math/pari/patches/patch-config_get__libpth
+2 -2
View File
@@ -1,6 +1,6 @@
$NetBSD: patch-ad,v 1.2 2010/02/06 10:37:06 sno Exp $
$NetBSD: patch-config_get__libpth,v 1.1 2016/03/03 13:28:22 wiz Exp $
--- config/get_libpth.orig 2008-01-16 15:56:55.000000000 +0000
--- config/get_libpth.orig 2014-03-25 08:59:21.000000000 +0000
+++ config/get_libpth
@@ -1,7 +1,3 @@
-case "$sizeof_long" in
math/pari/patches/patch-config_get_fltk
-12
View File
@@ -1,12 +0,0 @@
$NetBSD: patch-config_get_fltk,v 1.1 2011/12/10 23:53:34 marino Exp $
--- config/get_fltk.orig 2008-03-31 11:43:59.000000000 +0000
+++ config/get_fltk
@@ -30,6 +30,6 @@ if test -n "$with_fltk"; then
case "$osname" in
cygwin) FLTK_LIBS="-lgdi32 -lole32 -luuid -lwsock32 -lsupc++" ;;
darwin) FLTK_LIBS="-framework Carbon -lsupc++" ;;
- *) FLTK_LIBS="$X11_LIBS" ;;
+ *) FLTK_LIBS="$X11_LIBS -lstdc++" ;;
esac
fi
math/pari/patches/patch-src_headers_paridecl.h
+8 -8
View File
@@ -1,13 +1,13 @@
$NetBSD: patch-src_headers_paridecl.h,v 1.1 2015/01/23 15:07:53 joerg Exp $
$NetBSD: patch-src_headers_paridecl.h,v 1.2 2016/03/03 13:28:22 wiz Exp $
--- src/headers/paridecl.h.orig 2015-01-22 19:57:35.000000000 +0000
--- src/headers/paridecl.h.orig 2015-05-27 15:40:13.000000000 +0000
+++ src/headers/paridecl.h
@@ -264,7 +264,7 @@ GEN readseq(char *t);
long manage_var(long n, entree *ep);
void name_var(long n, char *s);
@@ -1165,7 +1165,7 @@ GEN* safelistel(GEN x, long l);
GEN* safegcoeff(GEN x, long a, long b);
GEN strntoGENstr(const char *s, long n0);
GEN strtoGENstr(const char *s);
-GEN strtoi(char *s);
+GEN pari_strtoi(char *s);
GEN strtor(char *s, long prec);
-GEN strtoi(const char *s);
+GEN pari_strtoi(const char *s);
GEN strtor(const char *s, long prec);
GEN type0(GEN x);
math/pari/patches/patch-src_headers_paristio.h
+13
View File
@@ -0,0 +1,13 @@
$NetBSD: patch-src_headers_paristio.h,v 1.1 2016/03/03 13:28:22 wiz Exp $
--- src/headers/paristio.h.orig 2014-09-15 11:32:55.000000000 +0000
+++ src/headers/paristio.h
@@ -13,6 +13,8 @@ Foundation, Inc., 51 Franklin Street, Fi
/* This file contains memory and I/O management definitions */
+#include <fcntl.h>
+
typedef struct {
long s, us;
} pari_timer;
math/pari/patches/patch-src_language_anal.c
+7 -7
View File
@@ -1,13 +1,13 @@
$NetBSD: patch-src_language_anal.c,v 1.1 2015/01/23 15:07:53 joerg Exp $
$NetBSD: patch-src_language_anal.c,v 1.2 2016/03/03 13:28:22 wiz Exp $
--- src/language/anal.c.orig 2015-01-22 19:57:33.000000000 +0000
--- src/language/anal.c.orig 2014-10-01 14:57:39.000000000 +0000
+++ src/language/anal.c
@@ -2520,7 +2520,7 @@ int_read(char **s)
@@ -496,7 +496,7 @@ int_read(const char **s)
}
GEN
-strtoi(char *s) { return int_read(&s); }
+pari_strtoi(char *s) { return int_read(&s); }
-strtoi(const char *s) { return int_read(&s); }
+pari_strtoi(const char *s) { return int_read(&s); }
GEN
strtor(char *s, long PREC)
GEN
strtor(const char *s, long prec)
math/pari/patches/patch-src_language_compile.c
+13
View File
@@ -0,0 +1,13 @@
$NetBSD: patch-src_language_compile.c,v 1.1 2016/03/03 13:28:22 wiz Exp $
--- src/language/compile.c.orig 2015-03-18 10:33:24.000000000 +0000
+++ src/language/compile.c
@@ -1915,7 +1915,7 @@ compilenode(long n, int mode, long flag)
op_push(OCpushreal, data_push(strntoGENstr(tree[n].str,tree[n].len)),n);
break;
case CSTint:
- op_push(OCpushgen, data_push(strtoi((char*)tree[n].str)),n);
+ op_push(OCpushgen, data_push(pari_strtoi((char*)tree[n].str)),n);
compilecast(n,Ggen, mode);
break;
case CSTstr:
math/pari/patches/patch-src_language_es.c
+21
View File
@@ -0,0 +1,21 @@
$NetBSD: patch-src_language_es.c,v 1.2 2016/03/03 13:28:22 wiz Exp $
--- src/language/es.c.orig 2015-09-26 23:11:11.000000000 +0000
+++ src/language/es.c
@@ -243,7 +243,6 @@ gp_read_stream_buf(FILE *fi, Buffer *b)
init_filtre(&F, b);
IM.file = fi;
- IM.fgets= &fgets;
IM.getline= &file_input;
IM.free = 0;
return input_loop(&F,&IM);
@@ -337,7 +336,7 @@ file_getline(Buffer *b, char **s0, input
/* # of chars read by fgets is an int; be careful */
read = minuu(left, MAX);
s = b->buf + used;
- if (! IM->fgets(s, (int)read, IM->file)) return **s0? *s0: NULL; /* EOF */
+ if (! fgets(s, (int)read, IM->file)) return **s0? *s0: NULL; /* EOF */
l = strlen(s);
if (l+1 < read || s[l-1] == '\n') return *s0; /* \n */
math/pari/patches/patch-src_language_parsec.h
+13
View File
@@ -0,0 +1,13 @@
$NetBSD: patch-src_language_parsec.h,v 1.1 2016/03/03 13:28:22 wiz Exp $
--- src/language/parsec.h.orig 2014-07-30 13:38:47.000000000 +0000
+++ src/language/parsec.h
@@ -203,7 +203,7 @@ newintnode(struct node_loc *loc)
if (loc->end-loc->start<=(long)(1+LOG10_2*BITS_IN_LONG))
{
pari_sp ltop=avma;
- GEN g=strtoi(loc->start);
+ GEN g=pari_strtoi(loc->start);
long s;
avma=ltop;
if (signe(g)==0) return newnode(Fsmall,0,-1,loc);
math/pari/patches/patch-src_modules_mpqs.c
+8 -8
View File
@@ -1,8 +1,8 @@
$NetBSD: patch-src_modules_mpqs.c,v 1.1 2015/01/23 15:07:53 joerg Exp $
$NetBSD: patch-src_modules_mpqs.c,v 1.2 2016/03/03 13:28:22 wiz Exp $
--- src/modules/mpqs.c.orig 2015-01-22 19:57:31.000000000 +0000
--- src/modules/mpqs.c.orig 2014-09-15 11:32:55.000000000 +0000
+++ src/modules/mpqs.c
@@ -2345,7 +2345,7 @@ mpqs_combine_large_primes(mpqs_handle_t
@@ -2215,7 +2215,7 @@ mpqs_combine_large_primes(mpqs_handle_t
*f = gerepileuptoint(av0, inv_q);
return c;
}
@@ -11,7 +11,7 @@ $NetBSD: patch-src_modules_mpqs.c,v 1.1 2015/01/23 15:07:53 joerg Exp $
av2 = avma; /* preserve inv_q and Y1 */
while (fgets(buf, MPQS_STRING_LENGTH, COMB))
@@ -2371,7 +2371,7 @@ mpqs_combine_large_primes(mpqs_handle_t
@@ -2241,7 +2241,7 @@ mpqs_combine_large_primes(mpqs_handle_t
*f = gerepileuptoint(av0, inv_q);
return c;
}
@@ -20,7 +20,7 @@ $NetBSD: patch-src_modules_mpqs.c,v 1.1 2015/01/23 15:07:53 joerg Exp $
i = 1 - i; /* subsequent relations go to other row */
av2 = avma; /* preserve inv_q and Y1 */
continue;
@@ -2381,7 +2381,7 @@ mpqs_combine_large_primes(mpqs_handle_t
@@ -2251,7 +2251,7 @@ mpqs_combine_large_primes(mpqs_handle_t
memset((void *)ei, 0, ei_size * sizeof(long));
mpqs_set_exponents(ei, e[0].E);
mpqs_set_exponents(ei, e[1].E);
@@ -29,12 +29,12 @@ $NetBSD: patch-src_modules_mpqs.c,v 1.1 2015/01/23 15:07:53 joerg Exp $
new_Y = modii(mulii(mulii(Y1, Y2), inv_q), h->N);
new_Y1 = subii(h->N, new_Y);
if (absi_cmp(new_Y1, new_Y) < 0) new_Y = new_Y1;
@@ -2692,7 +2692,7 @@ mpqs_add_relation(GEN Y_prod, GEN N, lon
@@ -2362,7 +2362,7 @@ mpqs_add_relation(GEN Y_prod, GEN N, lon
s = strchr(rel, ':') - 1;
*s = '\0';
- res = remii(mulii(Y_prod, strtoi(rel)), N);
+ res = remii(mulii(Y_prod, pari_strtoi(rel)), N);
s = strtok(s + 3, " \n");
s = paristrtok_r(s + 3, " \n", &tok);
while (s != NULL)