Index: trunk/fink/main/finkinfo/macathena-moira.info =================================================================== --- trunk/fink/main/finkinfo/macathena-moira.info (revision 172) +++ trunk/fink/main/finkinfo/macathena-moira.info (revision 173) @@ -1,5 +1,5 @@ Package: macathena-moira -Version: 20080830 -Revision: 2 +Version: 20090105 +Revision: 1 Source: http://macathena.mit.edu/dist/moira-%v.tar.gz Maintainer: SIPB MacAthena Project @@ -12,5 +12,5 @@ queues, and several other aspects of the Athena environment. << -Source-MD5: f531703191a30b130c772e8fcaa05c43 +Source-MD5: afded014c91f64801d6d87e4b6aad038 Depends: macathena-hesiod, libncurses5 @@ -18,5 +18,5 @@ UpdateConfigGuess: true PatchFile: %n.patch -PatchFile-MD5: 7e555a88ae3cbec212434b5e0311e468 +PatchFile-MD5: 94503d049c26fb82527ca045902cb794 PatchScript: patch -p1 < %{PatchFile} ConfigureParams: --with-krb5 --with-com_err --with-hesiod Index: trunk/fink/main/finkinfo/macathena-moira.patch =================================================================== --- trunk/fink/main/finkinfo/macathena-moira.patch (revision 172) +++ trunk/fink/main/finkinfo/macathena-moira.patch (revision 173) @@ -1,220 +1,2 @@ -Index: moira/Makefile.in -=================================================================== ---- moira.orig/Makefile.in -+++ moira/Makefile.in -@@ -35,11 +35,11 @@ - @for d in $(SUBDIRS); do (echo "### Making $@ in $$d"; cd $$d; $(MAKE) $@) || exit 1; done - - install: -- $(srcdir)/mkinstalldirs $(bindir) $(sbindir) $(mrbindir) $(mandir) -+ $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir) - @for d in $(SUBDIRS); do (echo "### Making $@ in $$d"; cd $$d; $(MAKE) $@) || exit 1; done - - svrinstall: -- $(srcdir)/mkinstalldirs $(mrbindir) -+ $(srcdir)/mkinstalldirs $(DESTDIR)$(mrbindir) - @for d in $(SVRDIRS); do (echo "### Making install in $$d"; cd $$d; $(MAKE) install) || exit 1; done - - world: depend all -Index: moira/clients/addusr/Makefile.in -=================================================================== ---- moira.orig/clients/addusr/Makefile.in -+++ moira/clients/addusr/Makefile.in -@@ -40,7 +40,7 @@ - depend: - - install: all -- $(INSTALL_PROGRAM) -m 755 addusr $(bindir) -+ $(INSTALL_PROGRAM) -m 755 addusr $(DESTDIR)$(bindir) - - $(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP) - $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS) -Index: moira/clients/blanche/Makefile.in -=================================================================== ---- moira.orig/clients/blanche/Makefile.in -+++ moira/clients/blanche/Makefile.in -@@ -40,7 +40,7 @@ - depend: - - install: all -- $(INSTALL_PROGRAM) blanche $(bindir) -+ $(INSTALL_PROGRAM) blanche $(DESTDIR)$(bindir) - - $(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP) - $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS) -Index: moira/clients/chfn/Makefile.in -=================================================================== ---- moira.orig/clients/chfn/Makefile.in -+++ moira/clients/chfn/Makefile.in -@@ -40,7 +40,7 @@ - depend: - - install: all -- $(INSTALL_PROGRAM) $(TARGET) $(bindir) -+ $(INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(bindir) - - $(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP) - $(CC) -o $@ $(LDFLAGS) $@.o $(LIBS) -Index: moira/clients/chpobox/Makefile.in -=================================================================== ---- moira.orig/clients/chpobox/Makefile.in -+++ moira/clients/chpobox/Makefile.in -@@ -40,7 +40,7 @@ - depend: - - install: all -- $(INSTALL_PROGRAM) $(TARGET) $(bindir) -+ $(INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(bindir) - - $(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP) - $(CC) -o $@ $(LDFLAGS) $@.o $(LIBS) -Index: moira/clients/chsh/Makefile.in -=================================================================== ---- moira.orig/clients/chsh/Makefile.in -+++ moira/clients/chsh/Makefile.in -@@ -40,7 +40,7 @@ - depend: - - install: all -- $(INSTALL_PROGRAM) $(TARGET) $(bindir) -+ $(INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(bindir) - - $(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP) - $(CC) -o $@ $(LDFLAGS) $@.o $(LIBS) -Index: moira/clients/mailmaint/Makefile.in -=================================================================== ---- moira.orig/clients/mailmaint/Makefile.in -+++ moira/clients/mailmaint/Makefile.in -@@ -40,7 +40,7 @@ - depend: - - install: all -- $(INSTALL_PROGRAM) mailmaint $(bindir) -+ $(INSTALL_PROGRAM) mailmaint $(DESTDIR)$(bindir) - - $(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP) - $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS) -Index: moira/clients/mitch/Makefile.in -=================================================================== ---- moira.orig/clients/mitch/Makefile.in -+++ moira/clients/mitch/Makefile.in -@@ -40,7 +40,7 @@ - depend: - - install: all -- $(INSTALL_PROGRAM) mitch $(bindir) -+ $(INSTALL_PROGRAM) mitch $(DESTDIR)$(bindir) - - $(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP) - $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS) -Index: moira/clients/moira/Makefile.in -=================================================================== ---- moira.orig/clients/moira/Makefile.in -+++ moira/clients/moira/Makefile.in -@@ -44,14 +44,14 @@ - depend: - - install: all -- $(INSTALL_PROGRAM) namespace $(bindir) -- $(INSTALL_PROGRAM) moira $(bindir) -- rm -f $(bindir)/listmaint -- ln -s moira $(bindir)/listmaint -- rm -f $(bindir)/dcmmaint -- ln -s moira $(bindir)/dcmmaint -- rm -f $(bindir)/usermaint -- ln -s moira $(bindir)/usermaint -+ $(INSTALL_PROGRAM) namespace $(DESTDIR)$(bindir) -+ $(INSTALL_PROGRAM) moira $(DESTDIR)$(bindir) -+ rm -f $(DESTDIR)$(bindir)/listmaint -+ ln -s moira $(DESTDIR)$(bindir)/listmaint -+ rm -f $(DESTDIR)$(bindir)/dcmmaint -+ ln -s moira $(DESTDIR)$(bindir)/dcmmaint -+ rm -f $(DESTDIR)$(bindir)/usermaint -+ ln -s moira $(DESTDIR)$(bindir)/usermaint - - moira: $(MOBJS) ../lib/libmrclient.a $(MR_LIBDEP) - $(CC) -o $@ $(LDFLAGS) $(MOBJS) $(LIBS) -Index: moira/clients/mrcheck/Makefile.in -=================================================================== ---- moira.orig/clients/mrcheck/Makefile.in -+++ moira/clients/mrcheck/Makefile.in -@@ -40,7 +40,7 @@ - depend: - - install: all -- $(INSTALL_PROGRAM) mrcheck $(bindir) -+ $(INSTALL_PROGRAM) mrcheck $(DESTDIR)$(bindir) - - $(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP) - $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS) -Index: moira/clients/mrtest/Makefile.in -=================================================================== ---- moira.orig/clients/mrtest/Makefile.in -+++ moira/clients/mrtest/Makefile.in -@@ -40,7 +40,7 @@ - depend: - - install: all -- $(INSTALL_PROGRAM) mrtest $(bindir) -+ $(INSTALL_PROGRAM) mrtest $(DESTDIR)$(bindir) - - $(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP) - $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS) -Index: moira/clients/stanley/Makefile.in -=================================================================== ---- moira.orig/clients/stanley/Makefile.in -+++ moira/clients/stanley/Makefile.in -@@ -40,7 +40,7 @@ - depend: - - install: all -- $(INSTALL_PROGRAM) stanley $(bindir) -+ $(INSTALL_PROGRAM) stanley $(DESTDIR)$(bindir) - - $(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP) - $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS) -Index: moira/clients/stella/Makefile.in -=================================================================== ---- moira.orig/clients/stella/Makefile.in -+++ moira/clients/stella/Makefile.in -@@ -40,7 +40,7 @@ - depend: - - install: all -- $(INSTALL_PROGRAM) stella $(bindir) -+ $(INSTALL_PROGRAM) stella $(DESTDIR)$(bindir) - - $(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP) - $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS) -Index: moira/man/Makefile.in -=================================================================== ---- moira.orig/man/Makefile.in -+++ moira/man/Makefile.in -@@ -32,6 +32,7 @@ - depend: - - install: -- for m in $(MAN1); do $(INSTALL_DATA) $(srcdir)/$$m $(mandir)/man1; done -- for m in $(MAN3); do $(INSTALL_DATA) $(srcdir)/$$m $(mandir)/man3; done -- for m in $(MAN8); do $(INSTALL_DATA) $(srcdir)/$$m $(mandir)/man8; done -+ $(srcdir)/../mkinstalldirs $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man3 $(DESTDIR)$(mandir)/man8 -+ for m in $(MAN1); do $(INSTALL_DATA) $(srcdir)/$$m $(DESTDIR)$(mandir)/man1; done -+ for m in $(MAN3); do $(INSTALL_DATA) $(srcdir)/$$m $(DESTDIR)$(mandir)/man3; done -+ for m in $(MAN8); do $(INSTALL_DATA) $(srcdir)/$$m $(DESTDIR)$(mandir)/man8; done -Index: moira/update/Makefile.in -=================================================================== ---- moira.orig/update/Makefile.in -+++ moira/update/Makefile.in -@@ -43,8 +43,8 @@ - depend: - - install: all -- $(INSTALL_PROGRAM) update_test $(bindir) -- $(INSTALL_PROGRAM) update_server $(sbindir) -+ $(INSTALL_PROGRAM) update_test $(DESTDIR)$(bindir) -+ $(INSTALL_PROGRAM) update_server $(DESTDIR)$(sbindir) - - update_test: $(COBJS) $(MR_LIBDEP) - $(CC) -o $@ $(LDFLAGS) $(COBJS) $(LIBS) 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 @@ -224,10 +6,10 @@ } -+#ifndef __APPLE__ ++#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(); -+#else -+ add_error_table(&et_sms_error_table); -+ add_error_table(&et_krb_error_table); +#endif @@ -241,12 +23,12 @@ return; -+#ifndef __APPLE__ ++#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(); -+#else -+ add_error_table(&et_sms_error_table); -+ add_error_table(&et_krb_error_table); -+ add_error_table(&et_ureg_error_table); +#endif +