root/trunk/fink/main/finkinfo/macathena-moira.patch

configure.in

@@ -142 +142 @@
-                               $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 +169 @@
-    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)

clients/mrtest/mrtest.c

@@ -97 +97 @@
-        }
-    }
-
+#if defined(__APPLE__) && defined(__MACH__)
+  add_error_table(&et_sms_error_table);
+  add_error_table(&et_krb_error_table);
+#else
-  initialize_sms_error_table();
-  initialize_krb_error_table();
+#endif
-
-#ifdef HAVE_READLINE
-  /* we don't want filename completion */

lib/mr_init.c

@@ -20 +20 @@
-  if (mr_inited)
-    return;
-
+#if defined(__APPLE__) && defined(__MACH__)
+  add_error_table(&et_sms_error_table);
+  add_error_table(&et_krb_error_table);
+  add_error_table(&et_ureg_error_table);
+#else
-  initialize_sms_error_table();
-  initialize_krb_error_table();
-  initialize_ureg_error_table();
+#endif
+
-  mr_inited = 1;
-}

include/Makefile.in

@@ -7 +7 @@
-SRCTOP=@top_srcdir@
-BUILDTOP=../..
-
+prefix=@prefix@
+includedir=@includedir@
+INSTALL=@INSTALL@
+
-all:
-
-clean:
@@ -17 +21 @@
-depend:
-
-install:
+        $(SRCTOP)/mkinstalldirs $(DESTDIR)$(includedir)/moira
+        $(INSTALL) moira.h $(DESTDIR)$(includedir)/moira

lib/Makefile.in

@@ -25 +25 @@
-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 +55 @@
-
-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

update/Makefile.in

@@ -4 +4 @@
-@SET_MAKE@
-
-CC=@CC@
-
+ -DCONFIG_FILE=\"$(sysconfdir)/athena/moira.conf\"
-CFLAGS=@CFLAGS@
-DEFS=@DEFS@
-ALL_CFLAGS=$(CPPFLAGS) $(CFLAGS) $(DEFS)
@@ -50 +50 @@
-install: all
-        $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) update_test $(DESTDIR)$(bindir)
-        $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) update_server $(DESTDIR)$(sbindir)
-/etc
-/etc
+$(sysconfdir)
+$(sysconfdir)
-
-update_test: $(COBJS) $(MR_LIBDEP)
-        $(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) $(COBJS) $(LIBS)

update/config.c

@@ -26 +26 @@
-
-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

configure.in

@@ -461 +461 @@
-MR_INCLUDE('$(BUILDTOP)/lib')
-MR_INCLUDE('$(BUILDTOP)/db')
-MR_INCLUDE('$(srcdir)')
--L\$(BUILDTOP)/lib 
+
-KLIBS="$KRB4_LIBS $KRB5_LIBS -lcom_err $LIBS"
-KLIBS="$LIBS"
-if test "$hesiod" != no; then