diff -c pari-2.1.1/src/gp/gp.c pari-2.1.1-patched/src/gp/gp.c
*** pari-2.1.1/src/gp/gp.c	Mon Apr  2 05:31:12 2001
--- pari-2.1.1-patched/src/gp/gp.c	Thu Aug 23 18:47:13 2001
***************
*** 1908,1913 ****
--- 1908,1914 ----
      f = gprc_chk(str); /* in $HOME */
      if (!f) f = gprc_chk(s); /* in . */
      if (!f) f = gprc_chk("/etc/gprc");
+     if (!f) f = gprc_chk("@FINK@/etc/gprc");
      if (!f) f = gprc_chk("C:/_gprc");
      free(str);
    }
diff -ruN pari-2.1.4/emacsen-install pari-2.1.4-patched/emacsen-install
--- pari-2.1.4/emacsen-install	Wed Dec 31 16:00:00 1969
+++ pari-2.1.4-patched/emacsen-install	Sun Aug  4 15:01:19 2002
@@ -0,0 +1,33 @@
+#!/bin/sh
+# @FINK@/lib/emacsen-common/packages/install/pari-gp
+set -e
+ 
+FLAVOR=$1
+echo install/pari-gp: Handling install of emacsen flavor ${FLAVOR}
+
+byte_compile_options="-batch -f batch-byte-compile"
+el_files="pari.el"
+el_dir=@FINK@/share/emacs/site-lisp/pari-gp
+elc_dir=@FINK@/share/${FLAVOR}/site-lisp/pari-gp
+el_path_list="${el_dir}/pari.el"
+elc_path_list="${elc_dir}/pari.el"
+
+if [ ${FLAVOR} != emacs ]
+then
+  echo install/pari-gp: byte-compiling for ${FLAVOR}
+
+  # Create the directory
+  mkdir -p ${elc_dir}
+
+  # Copy the temp .el files
+  cp ${el_path_list} ${elc_dir}
+
+  # Byte compile them
+  ${FLAVOR} ${byte_compile_options} ${elc_path_list}
+
+  # remove the redundant .el files
+  # presumes that any .el files in the <flavor> dir are trash.
+  rm ${elc_dir}/*.el
+fi
+exit 0;
+
diff -ruN pari-2.1.4/emacsen-remove pari-2.1.4-patched/emacsen-remove
--- pari-2.1.4/emacsen-remove	Wed Dec 31 16:00:00 1969
+++ pari-2.1.4-patched/emacsen-remove	Sun Aug  4 15:01:30 2002
@@ -0,0 +1,13 @@
+#!/bin/sh
+# @FINK@/lib/emacsen-common/packages/remove/pari-gp
+set -e
+
+FLAVOR=$1
+echo remove/pari-gp: Handling removal of emacsen flavor ${FLAVOR}
+
+if [ ${FLAVOR} != emacs ]
+then
+  echo emacsen-common: purging byte-compiled files for ${FLAVOR}
+  rm -f @FINK@/share/${FLAVOR}/site-lisp/pari-gp/*.elc
+fi
+exit 0;
--- pari-2.1.5/src/gp/gp.c.bak	2005-04-03 14:40:32.000000000 -0700
+++ pari-2.1.5/src/gp/gp.c	2005-04-03 14:41:14.000000000 -0700
@@ -45,7 +45,7 @@
 #   endif
 #  endif
   extern int isatty(int);
-  extern void add_history(char*);
+  extern int add_history(const char*);
 ENDEXTERN
 #endif
 
--- pari-2.1.5/src/gp/gp_rl.c.bak	2005-04-03 14:41:39.000000000 -0700
+++ pari-2.1.5/src/gp/gp_rl.c	2005-04-03 14:47:55.000000000 -0700
@@ -42,9 +42,9 @@
 extern int rl_clear_message();
 extern int rl_begin_undo_group(), rl_end_undo_group();
 extern int rl_read_key();
-extern int rl_stuff_char();
-extern char *filename_completion_function(char *text,int state);
-extern char *username_completion_function(char *text,int state);
+extern void rl_stuff_char(int);
+extern char *filename_completion_function(const char *text,int state);
+extern char *username_completion_function(const char *text,int state);
 #endif
 char **pari_completion(char *text, int start, int end);
 extern int rl_completion_query_items;
@@ -639,8 +639,8 @@
 
   Bind('h', rl_short_help, emacs_meta_keymap);
   Bind('H', rl_long_help,  emacs_meta_keymap);
-  Bind('h', rl_short_help, vi_movement_keymap);
-  Bind('H', rl_long_help,  vi_movement_keymap);
+  /*Bind('h', rl_short_help, vi_movement_keymap);
+  Bind('H', rl_long_help,  vi_movement_keymap);*/
   Bind('(', pari_rl_matched_insert, emacs_standard_keymap);
   Bind('[', pari_rl_matched_insert, emacs_standard_keymap);
   Bind(6, pari_rl_forward_sexp,  emacs_meta_keymap); /* M-C-f */
diff -ruN pari-2.1.5/Configure pari-2.1.5-patched/Configure
--- pari-2.1.5/Configure	2003-04-03 11:11:02.000000000 -0800
+++ pari-2.1.5-patched/Configure	2005-09-29 22:28:23.000000000 -0700
@@ -418,6 +418,7 @@
 	fi;;
       os2) libpth=`echo $LIBRARY_PATH | sed 's/;/ /g' | sed 's,\\\\,/,g'`;;
  	*) libpth="\
+	@FINK@/lib\
  	/usr/local/lib\
  	/lib\
  	/usr/lib\
@@ -546,6 +547,7 @@
        $cygtop/H-${arch}-cygwin32/${arch}-cygwin32/include\
      ";;
       *) incpth="\
+      @FINK@/include/readline\
       /usr/local/include/readline\
       /usr/include/readline\
       /opt/include/readline\
diff -ruN pari-2.1.7/config/locatelib pari-2.1.7-patched/config/locatelib
--- pari-2.1.7/config/locatelib	2002-06-22 06:18:29.000000000 -0700
+++ pari-2.1.7-patched/config/locatelib	2005-10-08 08:24:33.000000000 -0700
@@ -3,7 +3,7 @@
     os2)
       try=`ls $dir/$lib.a 2> /dev/null`;;
     *)
-      ok=`(ls $dir/lib$lib.* | head -1) 2> /dev/null`
+      ok=`(ls $dir/lib$lib.* | head -n 1) 2> /dev/null`
       if test -n "$ok"; then
         # for .so and .sl
         try=`ls $dir/lib$lib.s? 2> /dev/null`