diff options
Diffstat (limited to 'math/pari/patches')
-rw-r--r-- | math/pari/patches/patch-aa | 155 | ||||
-rw-r--r-- | math/pari/patches/patch-ab | 74 | ||||
-rw-r--r-- | math/pari/patches/patch-ae | 18 |
3 files changed, 113 insertions, 134 deletions
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;; |