Index: trunk/fink/main/finkinfo/macathena-moira.info
===================================================================
--- trunk/fink/main/finkinfo/macathena-moira.info (revision 188)
+++ trunk/fink/main/finkinfo/macathena-moira.info (revision 191)
@@ -1,4 +1,4 @@
 Package: macathena-moira
-Version: 20091016
+Version: svn3945
 Revision: 1
 Source: http://macathena.mit.edu/dist/moira-%v.tar.gz
@@ -12,12 +12,12 @@
 	queues, and several other aspects of the Athena environment.
 <<
-Source-MD5: f97903ce5b82af35247705b9aeeb33d3
+Source-MD5: a55bce75d0b8190d4f9f4fc9fbc0c029
 
-Depends: macathena-hesiod, libncurses5-shlibs
+Depends: %N-shlibs (= %v-%r), macathena-hesiod, libncurses5-shlibs
 BuildDepends: fink (>= 0.24.12), libncurses5
 UpdateConfigGuess: true
 PatchFile: %n.patch
-PatchFile-MD5: e05590ac3f1b07dad64b082f9673c382
-PatchScript: patch -p1 < %{PatchFile}
+PatchFile-MD5: d760881dfcd6de5496f96af1163f65f2
+PatchScript: patch -p0 < %{PatchFile}
 ConfigureParams: --with-krb5 --without-krb4 --with-com_err --with-hesiod --mandir=%p/share/man
 CompileScript: <<
@@ -33,8 +33,24 @@
 	mv %i/share/man/man1/chsh.1 %i/share/man/man1/chsh.moira.1
 	
-	%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
-	
 	%b/mkinstalldirs %i/share/doc/%n
 	cat %b/include/mit-copyright.h | python -c "import sys; print ''.join(sys.stdin.readlines()[2:-2])" >%i/share/doc/%n/copyright
 <<
+
+SplitOff: <<
+  Package: %N-shlibs
+  Files: %lib/libmoira.*.dylib
+  Shlibs: <<
+    %p/%lib/libmoira.0.dylib 1.0.0 %N-shlibs (>= svn3945-1)
+  <<
+<<
+SplitOff2: <<
+  Package: %N-dev
+  Depends: %N-shlibs (= %v-%r)
+  BuildDependsOnly: True
+  Files: %lib/libmoira.dylib %lib/libmoira.la %lib/libmoira.a include share/man/man3
+<<
+SplitOff3: <<
+  Package: %N-update-server
+  Depends: %N-shlibs (= %v-%r)
+  Files: etc sbin/update_server share/man/man8/update_server.*
+<<
Index: trunk/fink/main/finkinfo/macathena-moira.patch
===================================================================
--- trunk/fink/main/finkinfo/macathena-moira.patch (revision 188)
+++ trunk/fink/main/finkinfo/macathena-moira.patch (revision 191)
@@ -1,5 +1,36 @@
-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
+Index: configure.in
+===================================================================
+--- configure.in	(revision 3945)
++++ configure.in	(working copy)
+@@ -142,6 +142,12 @@
+ 			       $LIBPATH -ldes)],
+ 		 $LIBPATH -ldes425 -lkrb5 -l${crypto} -lcom_err -lresolv)
+ fi
++if test "$KRB4_LIBS" != "" ; then
++    AC_CANONICAL_TARGET
++    case "$target_os" in
++    darwin*) KRB4_LIBS="$KRB4_LIBS -framework Kerberos"
++    esac
++fi
+ 
+ AC_MSG_CHECKING(for Kerberos 5)
+ AC_ARG_WITH(krb5,
+@@ -163,6 +169,12 @@
+     REG_SVR_DEFS=-DKRB4
+     REG_SVR_LIBS=-lkadm
+ fi
++if test "$KRB5_LIBS" != "" ; then
++    AC_CANONICAL_TARGET
++    case "$target_os" in
++    darwin*) KRB5_LIBS="$KRB5_LIBS -framework Kerberos"
++    esac
++fi
+ AC_SUBST(REG_SVR_DEFS)
+ AC_SUBST(REG_SVR_INCLUDES)
+ AC_SUBST(REG_SVR_LIBS)
+Index: clients/mrtest/mrtest.c
+===================================================================
+--- clients/mrtest/mrtest.c	(revision 3945)
++++ clients/mrtest/mrtest.c	(working copy)
 @@ -97,8 +97,13 @@
  	}
@@ -16,26 +47,8 @@
  #ifdef HAVE_READLINE
    /* we don't want filename completion */
-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
+Index: lib/mr_init.c
+===================================================================
+--- lib/mr_init.c	(revision 3945)
++++ lib/mr_init.c	(working copy)
 @@ -20,8 +20,15 @@
    if (mr_inited)
@@ -54,2 +67,94 @@
    mr_inited = 1;
  }
+Index: include/Makefile.in
+===================================================================
+--- include/Makefile.in	(revision 3945)
++++ include/Makefile.in	(working copy)
+@@ -7,6 +7,10 @@
+ SRCTOP=@top_srcdir@
+ BUILDTOP=../..
+ 
++prefix=@prefix@
++includedir=@includedir@
++INSTALL=@INSTALL@
++
+ all:
+ 
+ clean:
+@@ -17,3 +21,5 @@
+ depend:
+ 
+ install:
++	$(SRCTOP)/mkinstalldirs $(DESTDIR)$(includedir)/moira
++	$(INSTALL) moira.h $(DESTDIR)$(includedir)/moira
+Index: lib/Makefile.in
+===================================================================
+--- lib/Makefile.in	(revision 3945)
++++ lib/Makefile.in	(working copy)
+@@ -25,6 +25,7 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
++includedir=@includedir@
+ 
+ OBJS=	critical.lo fixhost.lo fixname.lo \
+ 	hash.lo kname_unparse.lo kname_parse.lo krb_et.lo mr_access.lo mr_auth.lo \
+@@ -54,6 +55,8 @@
+ 
+ install: all
+ 	$(LIBTOOL) --mode=install  $(INSTALL) libmoira.la $(DESTDIR)$(libdir)/libmoira.la
++	$(SRCTOP)/mkinstalldirs $(DESTDIR)$(includedir)/moira
++	$(INSTALL) mr_et.h krb_et.h ureg_err.h $(DESTDIR)$(includedir)/moira
+ 
+ libmoira.la: $(OBJS)
+ 	$(LIBTOOL) --mode=link $(CC) $(ALL_LDFLAGS) -o $@ $(OBJS) -rpath $(libdir) -version-info 0:0:0
+Index: update/Makefile.in
+===================================================================
+--- update/Makefile.in	(revision 3945)
++++ update/Makefile.in	(working copy)
+@@ -4,7 +4,7 @@
+ @SET_MAKE@
+ 
+ CC=@CC@
+-CPPFLAGS=@CPPFLAGS@
++CPPFLAGS=@CPPFLAGS@ -DCONFIG_FILE=\"$(sysconfdir)/athena/moira.conf\"
+ CFLAGS=@CFLAGS@
+ DEFS=@DEFS@
+ ALL_CFLAGS=$(CPPFLAGS) $(CFLAGS) $(DEFS)
+@@ -50,8 +50,8 @@
+ install: all
+ 	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) update_test $(DESTDIR)$(bindir)
+ 	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) update_server $(DESTDIR)$(sbindir)
+-	$(SRCTOP)/mkinstalldirs $(DESTDIR)/etc/athena
+-	$(INSTALL) -m 644 moira.conf $(DESTDIR)/etc/athena/moira.conf
++	$(SRCTOP)/mkinstalldirs $(DESTDIR)$(sysconfdir)/athena
++	$(INSTALL) -m 644 moira.conf $(DESTDIR)$(sysconfdir)/athena/moira.conf
+ 
+ update_test: $(COBJS) $(MR_LIBDEP)
+ 	$(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) $(COBJS) $(LIBS)
+Index: update/config.c
+===================================================================
+--- update/config.c	(revision 3945)
++++ update/config.c	(working copy)
+@@ -26,8 +26,6 @@
+ 
+ RCSID("$Header: /afs/.athena.mit.edu/astaff/project/moiradev/repository/moira/update/config.c,v 1.7 1998-02-15 17:49:27 danw Exp $");
+ 
+-#define CONFIG_FILE	"/etc/athena/moira.conf"
+-
+ /* Variables currently supported:
+  * chroot directory	daemon will run chrooted to this directory
+  * user username	daemon will run with this user's uid
+Index: configure.in
+===================================================================
+--- configure.in	(revision 3945)
++++ configure.in	(working copy)
+@@ -461,7 +461,7 @@
+ MR_INCLUDE('$(BUILDTOP)/lib')
+ MR_INCLUDE('$(BUILDTOP)/db')
+ MR_INCLUDE('$(srcdir)')
+-LDFLAGS="$LDFLAGS -L\$(BUILDTOP)/lib $LIBPATH"
++LDFLAGS="$LDFLAGS $LIBPATH"
+ KLIBS="$KRB4_LIBS $KRB5_LIBS -lcom_err $LIBS"
+ KLIBS="$LIBS"
+ if test "$hesiod" != no; then