diff -Nurd -x'*~' octave-@OCTVERSION@.orig/src/DLD-FUNCTIONS/__glpk__.cc octave-@OCTVERSION@/src/DLD-FUNCTIONS/__glpk__.cc
--- octave-@OCTVERSION@.orig/src/DLD-FUNCTIONS/__glpk__.cc	2009-01-16 01:46:23.000000000 -0500
+++ octave-@OCTVERSION@/src/DLD-FUNCTIONS/__glpk__.cc	2010-10-15 17:50:25.000000000 -0400
@@ -59,8 +59,20 @@
 
 #else
 
-void _glp_lib_print_hook (int (*func)(void *info, char *buf), void *info);
-void _glp_lib_fault_hook (int (*func)(void *info, char *buf), void *info);
+void _glp_lib_print_hook (int (*func)(void *info, char *buf), void *info)
+{ /* stolen from glpk-4.26 */
+      int (*hook)(void *, const char *) = (int(*)(void *, const char *))
+         (func);
+      glp_term_hook(hook, info);
+      return;
+}
+
+void _glp_lib_fault_hook (int (*func)(void *info, char *buf), void *info)
+{ /* stolen from glpk-4.26 */
+      assert(func == func);
+      assert(info == info);
+      return;
+}
 
 #endif
 }
diff -Nurd '-x*~' octave-@OCTVERSION@//octave-forge-comp octave-@OCTVERSION@.patched//octave-forge-comp
--- octave-@OCTVERSION@//octave-forge-comp	1969-12-31 19:00:00.000000000 -0500
+++ octave-@OCTVERSION@.patched//octave-forge-comp	2011-08-11 20:23:10.000000000 -0400
@@ -0,0 +1,4 @@
+#!@FINKPREFIX@/bin/octave-@OCTVERSION@ -V
+pkg prefix bld/share/octave/@OCTVERSION@/packages bld/lib/octave/@OCTVERSION@/packages
+pkg global_list bld/share/octave/@OCTVERSION@/octave_packages
+pkg install -verbose -nodeps ./@PKGNAME@/
diff -Nurd '-x*~' octave-@OCTVERSION@//octave-forge-compile.sh octave-@OCTVERSION@.patched//octave-forge-compile.sh
--- octave-@OCTVERSION@//octave-forge-compile.sh	1969-12-31 19:00:00.000000000 -0500
+++ octave-@OCTVERSION@.patched//octave-forge-compile.sh	2011-08-11 20:23:10.000000000 -0400
@@ -0,0 +1,7 @@
+#!/bin/sh -ev
+cd ..
+mkdir -p bld/share/octave/@OCTVERSION@/packages bld/lib/octave/@OCTVERSION@/packages
+cp @FINKPREFIX@/share/octave/@OCTVERSION@/scripts/octave-forge-comp @FINKPREFIX@/share/octave/@OCTVERSION@/scripts/octave-forge-inst bld
+chmod a+x bld/octave-forge*
+sed -i.bak -e "s/@PKGNAME@/$1/" bld/octave-forge*
+bld/octave-forge-comp
\ No newline at end of file
diff -Nurd '-x*~' octave-@OCTVERSION@//octave-forge-inst octave-@OCTVERSION@.patched//octave-forge-inst
--- octave-@OCTVERSION@//octave-forge-inst	1969-12-31 19:00:00.000000000 -0500
+++ octave-@OCTVERSION@.patched//octave-forge-inst	2011-08-11 20:23:10.000000000 -0400
@@ -0,0 +1,7 @@
+#!@FINKPREFIX@/bin/octave-@OCTVERSION@ -q
+load share/octave/@OCTVERSION@/octave_packages;
+apfx = global_packages {1}.archprefix;
+global_packages {1}.archprefix = regexprep(apfx,'.*bld','@FINKPREFIX@');
+dr = global_packages {1}.dir;
+global_packages {1}.dir = regexprep(dr,'.*bld','@FINKPREFIX@');
+save -text share/octave/@OCTVERSION@/octave_packages global_packages
diff -Nurd '-x*~' octave-@OCTVERSION@//octave-forge-install.sh octave-@OCTVERSION@.patched//octave-forge-install.sh
--- octave-@OCTVERSION@//octave-forge-install.sh	1969-12-31 19:00:00.000000000 -0500
+++ octave-@OCTVERSION@.patched//octave-forge-install.sh	2011-08-11 20:23:10.000000000 -0400
@@ -0,0 +1,5 @@
+#!/bin/sh -ev
+cd $2
+cp -r $3/../bld/{share,lib} .
+$3/../bld/octave-forge-inst
+mv share/octave/@OCTVERSION@/octave_packages share/octave/@OCTVERSION@/packages/$1/.
diff -Nurd '-x*~' octave-@OCTVERSION@//octave-forge-postinst octave-@OCTVERSION@.patched//octave-forge-postinst
--- octave-@OCTVERSION@//octave-forge-postinst	1969-12-31 19:00:00.000000000 -0500
+++ octave-@OCTVERSION@.patched//octave-forge-postinst	2011-08-11 20:23:10.000000000 -0400
@@ -0,0 +1,6 @@
+#!@FINKPREFIX@/bin/octave-@OCTVERSION@ -q
+load @FINKPREFIX@/share/octave/@OCTVERSION@/packages/@PKGNAME@/octave_packages
+newpackage = global_packages;
+load @FINKPREFIX@/var/octave/@OCTVERSION@/octave_packages
+global_packages = {global_packages{:},newpackage{:}};
+save -text @FINKPREFIX@/var/octave/@OCTVERSION@/octave_packages global_packages
diff -Nurd '-x*~' octave-@OCTVERSION@//octave-forge-prerm octave-@OCTVERSION@.patched//octave-forge-prerm
--- octave-@OCTVERSION@//octave-forge-prerm	1969-12-31 19:00:00.000000000 -0500
+++ octave-@OCTVERSION@.patched//octave-forge-prerm	2011-08-11 20:23:10.000000000 -0400
@@ -0,0 +1,9 @@
+#!@FINKPREFIX@/bin/octave-@OCTVERSION@ -q
+load @FINKPREFIX@/var/octave/@OCTVERSION@/octave_packages
+for i = 1:length(global_packages)
+  if strcmp(global_packages{i}.name,'@PKGNAME@')
+    global_packages(i) = [];
+    break
+  endif
+endfor
+save -text @FINKPREFIX@/var/octave/@OCTVERSION@/octave_packages global_packages
diff -Naur startup/octaverc.null startup/octaverc
--- startup/octaverc.null	2011-08-12 14:21:47.000000000 -0400
+++ startup/octaverc	2011-08-12 12:32:41.000000000 -0400
@@ -0,0 +1,24 @@
+## System-wide startup file for Octave.
+##
+## This file should contain any commands that should be executed each
+## time Octave starts for every user at this site.
+
+## Configure readline using the file inputrc in the Octave startup
+## directory.
+
+read_readline_init_file (sprintf ("%s%s%s",
+				  octave_config_info ("startupfiledir"),
+				  filesep, "inputrc"));
+
+if (strcmp (PAGER (), "less") && isempty (getenv ("LESS")))
+  PAGER_FLAGS ('-e -X -P"-- less ?pB(%pB\\%):--. (f)orward, (b)ack, (q)uit$"');
+endif
+
+## This appears here instead of in the pkg/PKG_ADD file so that --norc
+## will also skip automatic loading of packages.
+
+try 
+	pkg global_list @FINKPREFIX@/var/octave/@OCTVERSION@/octave_packages
+catch
+end_try_catch
+pkg ("load", "auto");
diff -Nurd '-x*~' octave-@OCTVERSION@/doc/interpreter/mkoctfile-@OCTVERSION@.1 octave-@OCTVERSION@.patched/doc/interpreter/mkoctfile-@OCTVERSION@.1
--- octave-@OCTVERSION@/doc/interpreter/mkoctfile-@OCTVERSION@.1	2011-08-12 22:01:38.000000000 -0400
+++ octave-@OCTVERSION@.patched/doc/interpreter/mkoctfile-@OCTVERSION@.1	2011-08-12 22:18:42.000000000 -0400
@@ -19,11 +19,11 @@
 .\"
 .\" This page was contributed by Dirk Eddelbuettel <edd@debian.org>
 .\"
-.TH MKOCTFILE 1 "1 November 2002" "GNU Octave"
+.TH mkoctfile-@OCTVERSION@ 1 "1 November 2002" "GNU Octave"
 .SH NAME
-mkoctfile \- Compile dynamic-load modules for GNU Octave
+mkoctfile-@OCTVERSION@ \- Compile dynamic-load modules for GNU Octave
 .SH SYNOPSIS
-.BR mkoctfile\  [\-IDIR]\ [\-DDEF]\ [\-lLIB]\ [\-LDIR]\ [\-M|\-\-depend]\ 
+.BR mkoctfile-@OCTVERSION@\  [\-IDIR]\ [\-DDEF]\ [\-lLIB]\ [\-LDIR]\ [\-M|\-\-depend]\ 
 [\-c]\ [\-o FILE|\-\-output FILE]\ [\-p VAR|\-\-print VAR]\ [\-s|\-\-strip]\ 
 [\-v|\-\-verbose]\ [\-h|\-?|\-\-help]\ \fIfile\fP .\|.\|.  
 .SH DESCRIPTION
diff -Nurd '-x*~' octave-@OCTVERSION@/doc/interpreter/octave-@OCTVERSION@.1 octave-@OCTVERSION@.patched/doc/interpreter/octave-@OCTVERSION@.1
--- octave-@OCTVERSION@/doc/interpreter/octave-@OCTVERSION@.1	2011-08-12 22:00:40.000000000 -0400
+++ octave-@OCTVERSION@.patched/doc/interpreter/octave-@OCTVERSION@.1	2011-08-12 22:18:40.000000000 -0400
@@ -16,19 +16,19 @@
 .\" along with Octave; see the file COPYING.  If not, see
 .\" <http://www.gnu.org/licenses/>.
 .\"
-.TH Octave 1 "Jan 8 1996"
+.TH Octave-@OCTVERSION@ 1 "Jan 8 1996"
 .SH NAME
-octave \- A high-level interactive language for numerical computations.
+octave-@OCTVERSION@ \- A high-level interactive language for numerical computations.
 .SH SYNOPSIS
 .nf
-octave [options]
+octave-@OCTVERSION@ [options]
 .fi
 .SH OPTIONS
-The complete set of command-line options for octave is available by
+The complete set of command-line options for octave-@OCTVERSION@ is available by
 running the command
 .nf
 
-    octave \-\-help
+    octave-@OCTVERSION@ \-\-help
 
 .fi
 .SH DESCRIPTION
diff -Nurd '-x*~' octave-@OCTVERSION@/doc/interpreter/octave-bug-@OCTVERSION@.1 octave-@OCTVERSION@.patched/doc/interpreter/octave-bug-@OCTVERSION@.1
--- octave-@OCTVERSION@/doc/interpreter/octave-bug-@OCTVERSION@.1	2011-08-12 22:01:04.000000000 -0400
+++ octave-@OCTVERSION@.patched/doc/interpreter/octave-bug-@OCTVERSION@.1	2011-08-12 22:13:25.000000000 -0400
@@ -18,18 +18,18 @@
 .\"
 .\" This page was contributed by Dirk Eddelbuettel <edd@debian.org>
 .\" 
-.TH octave-bug 1 "6 March 2000" GNU
+.TH octave-bug-@OCTVERSION@ 1 "6 March 2000" GNU
 .SH NAME
-octave-bug \- report a bug in GNU Octave
+octave-bug-@OCTVERSION@ \- report a bug in GNU Octave
 .SH SYNOPSIS
-.B octave-bug
+.B octave-bug-@OCTVERSION@
 .RB [\| \-s
 .IR subject \|]
 .SH DESCRIPTION
-.B octave-bug
+.B octave-bug-@OCTVERSION@
 is a shell script to help the user compose and mail bug reports
 concerning Octave in a standard format.  
-.B octave-bug
+.B octave-bug-@OCTVERSION@
 is typically invoked by the Octave command
 .B bug_report
 which is intended to be called interactively from within Octave. This
@@ -37,7 +37,7 @@
 template bug report file and starts an editor on that file.  The bug report
 will be sent to the bug-octave mailing list once the editing has been
 completed (this assumes of course that your system can use email). However,
-the user could also call \fBoctave-bug\fR outside of Octave.
+the user could also call \fBoctave-bug-@OCTVERSION@\fR outside of Octave.
 .PP
 Please read the `Bugs' chapter in the Octave manual to find out how to submit
 a bug report that will enable the Octave maintainers to fix the problem.  If
@@ -50,7 +50,7 @@
 be quoted.
 .SH ENVIRONMENT VARIABLES
 .B 
-octave-bug 
+octave-bug-@OCTVERSION@ 
 uses the environment variables
 .BR USER, 
 .BR EDITOR, 
@@ -60,7 +60,7 @@
 .SH VERSION
 This document was last revised for Octave version 2.0.16.
 .SH SEE ALSO
-.BR octave (1),
+.BR octave-@OCTVERSION@ (1),
 .BR bashbug (1)     
 .SH AUTHOR
 .nf
diff -Nurd '-x*~' octave-@OCTVERSION@/doc/interpreter/octave-config-@OCTVERSION@.1 octave-@OCTVERSION@.patched/doc/interpreter/octave-config-@OCTVERSION@.1
--- octave-@OCTVERSION@/doc/interpreter/octave-config-@OCTVERSION@.1	2011-08-12 22:01:22.000000000 -0400
+++ octave-@OCTVERSION@.patched/doc/interpreter/octave-config-@OCTVERSION@.1	2011-08-12 22:18:38.000000000 -0400
@@ -18,23 +18,23 @@
 .\"
 .\" This page was contributed by Dirk Eddelbuettel <edd@debian.org>.
 .\" 
-.TH OCTAVE-CONFIG 1 "19 February 2003" "GNU Octave"
+.TH OCTAVE-CONFIG-@OCTVERSION@ 1 "19 February 2003" "GNU Octave"
 .SH NAME
-octave-config - GNU Octave component and library information retrieval
+octave-config-@OCTVERSION@ - GNU Octave component and library information retrieval
 .SH SYNOPSIS
-.B octave-config
+.B octave-config-@OCTVERSION@
 .RI [ options ]
 .SH DESCRIPTION
 .PP
-.B octave-config
+.B octave-config-@OCTVERSION@
 is a tool to obtain directory information for 
 .I .oct
 and 
 .I .m
 files for
-.BR octave (1).
+.BR octave-@OCTVERSION@ (1).
 .SH OPTIONS
-.B octave-config
+.B octave-config-@OCTVERSION@
 accepts the following options:
 .TP 8
 .B \--m-site-dir
@@ -72,7 +72,7 @@
 .TP 8
 .B \-h|-?|--help
 Display a help page about
-.B octave-config
+.B octave-config-@OCTVERSION@
 .SH AUTHOR
 John W. Eaton <jwe@bevo.che.wisc.edu>