Index: /trunk/fink/main/finkinfo/macathena-moira.info
===================================================================
--- /trunk/fink/main/finkinfo/macathena-moira.info (revision 185)
+++ /trunk/fink/main/finkinfo/macathena-moira.info (revision 188)
@@ -1,5 +1,5 @@
 Package: macathena-moira
-Version: 20090105
-Revision: 2
+Version: 20091016
+Revision: 1
 Source: http://macathena.mit.edu/dist/moira-%v.tar.gz
 Maintainer: SIPB MacAthena Project <sipb-macathena@mit.edu>
@@ -12,5 +12,5 @@
 	queues, and several other aspects of the Athena environment.
 <<
-Source-MD5: afded014c91f64801d6d87e4b6aad038
+Source-MD5: f97903ce5b82af35247705b9aeeb33d3
 
 Depends: macathena-hesiod, libncurses5-shlibs
@@ -18,7 +18,7 @@
 UpdateConfigGuess: true
 PatchFile: %n.patch
-PatchFile-MD5: 94503d049c26fb82527ca045902cb794
+PatchFile-MD5: e05590ac3f1b07dad64b082f9673c382
 PatchScript: patch -p1 < %{PatchFile}
-ConfigureParams: --with-krb5 --with-com_err --with-hesiod --mandir=%p/share/man
+ConfigureParams: --with-krb5 --without-krb4 --with-com_err --with-hesiod --mandir=%p/share/man
 CompileScript: <<
 	autoconf
@@ -35,5 +35,4 @@
 	%b/mkinstalldirs %i/include/moira %i/lib
 	cp %b/include/moira.h %b/lib/mr_et.h %b/lib/krb_et.h %b/lib/ureg_err.h %i/include/moira
-	cp %b/lib/libmoira.a %i/lib
 	
 	%b/mkinstalldirs %i/share/doc/%n
Index: /trunk/fink/main/finkinfo/macathena-moira.patch
===================================================================
--- /trunk/fink/main/finkinfo/macathena-moira.patch (revision 173)
+++ /trunk/fink/main/finkinfo/macathena-moira.patch (revision 188)
@@ -1,5 +1,5 @@
-diff -ur moira.orig/clients/mrtest/mrtest.c moira/clients/mrtest/mrtest.c
---- moira.orig/clients/mrtest/mrtest.c	2008-08-30 18:22:14.000000000 -0400
-+++ moira/clients/mrtest/mrtest.c	2009-01-04 03:20:08.000000000 -0500
+diff -ur moira-20091016.orig/clients/mrtest/mrtest.c moira-20091016/clients/mrtest/mrtest.c
+--- moira-20091016.orig/clients/mrtest/mrtest.c	2009-10-16 16:37:18.000000000 -0400
++++ moira-20091016/clients/mrtest/mrtest.c	2009-10-18 17:26:49.000000000 -0400
 @@ -97,8 +97,13 @@
  	}
@@ -16,7 +16,26 @@
  #ifdef HAVE_READLINE
    /* we don't want filename completion */
-diff -ur moira.orig/lib/mr_init.c moira/lib/mr_init.c
---- moira.orig/lib/mr_init.c	2008-08-30 18:22:14.000000000 -0400
-+++ moira/lib/mr_init.c	2009-01-04 03:19:06.000000000 -0500
+diff -ur moira-20091016.orig/configure.in moira-20091016/configure.in
+--- moira-20091016.orig/configure.in	2009-10-16 16:37:18.000000000 -0400
++++ moira-20091016/configure.in	2009-10-18 17:27:47.000000000 -0400
+@@ -464,12 +464,12 @@
+ if test "$zephyr" != no; then
+   KLIBS="-lzephyr $KLIBS"
+ fi
+-LIBS="-lmoira $KLIBS"
+-AC_SUBST(KLIBS)
+-
+ MR_LIBDEP='$(BUILDTOP)/lib/libmoira.la'
+ AC_SUBST(MR_LIBDEP)
+ 
++LIBS="$MR_LIBDEP $KLIBS"
++AC_SUBST(KLIBS)
++
+ AC_OUTPUT(Makefile lib/Makefile include/Makefile clients/Makefile \
+ 	  clients/lib/Makefile clients/addusr/Makefile \
+ 	  clients/blanche/Makefile clients/chfn/Makefile \
+diff -ur moira-20091016.orig/lib/mr_init.c moira-20091016/lib/mr_init.c
+--- moira-20091016.orig/lib/mr_init.c	2009-10-16 16:37:18.000000000 -0400
++++ moira-20091016/lib/mr_init.c	2009-10-18 17:26:49.000000000 -0400
 @@ -20,8 +20,15 @@
    if (mr_inited)