Changeset 188

Show
Ignore:
Timestamp:
10/18/09 17:53:09 (15 years ago)
Author:
broder
Message:

Update Moira to the latest version, and add a new patch to correct for
build-system issues.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/fink/main/finkinfo/macathena-moira.info

    r185 r188  
    11Package: macathena-moira 
    2 Version: 20090105 
    3 Revision: 2 
     2Version: 20091016 
     3Revision: 1 
    44Source: http://macathena.mit.edu/dist/moira-%v.tar.gz 
    55Maintainer: SIPB MacAthena Project <sipb-macathena@mit.edu> 
    …… 
    1212        queues, and several other aspects of the Athena environment. 
    1313<< 
    14 Source-MD5: afded014c91f64801d6d87e4b6aad038 
     14Source-MD5: f97903ce5b82af35247705b9aeeb33d3 
    1515 
    1616Depends: macathena-hesiod, libncurses5-shlibs 
    …… 
    1818UpdateConfigGuess: true 
    1919PatchFile: %n.patch 
    20 PatchFile-MD5: 94503d049c26fb82527ca045902cb794 
     20PatchFile-MD5: e05590ac3f1b07dad64b082f9673c382 
    2121PatchScript: patch -p1 < %{PatchFile} 
    22 ConfigureParams: --with-krb5 --with-com_err --with-hesiod --mandir=%p/share/man 
     22ConfigureParams: --with-krb5 --without-krb4 --with-com_err --with-hesiod --mandir=%p/share/man 
    2323CompileScript: << 
    2424        autoconf 
    …… 
    3535        %b/mkinstalldirs %i/include/moira %i/lib 
    3636        cp %b/include/moira.h %b/lib/mr_et.h %b/lib/krb_et.h %b/lib/ureg_err.h %i/include/moira 
    37         cp %b/lib/libmoira.a %i/lib 
    3837         
    3938        %b/mkinstalldirs %i/share/doc/%n 

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

    r173 r188  
    1 diff -ur moira.orig/clients/mrtest/mrtest.c moira/clients/mrtest/mrtest.c 
    2 --- moira.orig/clients/mrtest/mrtest.c 2008-08-30 18:22:14.000000000 -0400 
    3 +++ moira/clients/mrtest/mrtest.c      2009-01-04 03:20:08.000000000 -0500 
     1diff -ur moira-20091016.orig/clients/mrtest/mrtest.c moira-20091016/clients/mrtest/mrtest.c 
     2--- moira-20091016.orig/clients/mrtest/mrtest.c        2009-10-16 16:37:18.000000000 -0400 
     3+++ moira-20091016/clients/mrtest/mrtest.c     2009-10-18 17:26:49.000000000 -0400 
    44@@ -97,8 +97,13 @@ 
    55        } 
    …… 
    1616 #ifdef HAVE_READLINE 
    1717   /* we don't want filename completion */ 
    18 diff -ur moira.orig/lib/mr_init.c moira/lib/mr_init.c 
    19 --- moira.orig/lib/mr_init.c    2008-08-30 18:22:14.000000000 -0400 
    20 +++ moira/lib/mr_init.c 2009-01-04 03:19:06.000000000 -0500 
     18diff -ur moira-20091016.orig/configure.in moira-20091016/configure.in 
     19--- moira-20091016.orig/configure.in    2009-10-16 16:37:18.000000000 -0400 
     20+++ moira-20091016/configure.in 2009-10-18 17:27:47.000000000 -0400 
     21@@ -464,12 +464,12 @@ 
     22 if test "$zephyr" != no; then 
     23   KLIBS="-lzephyr $KLIBS" 
     24 fi 
     25-LIBS="-lmoira $KLIBS" 
     26-AC_SUBST(KLIBS) 
     27- 
     28 MR_LIBDEP='$(BUILDTOP)/lib/libmoira.la' 
     29 AC_SUBST(MR_LIBDEP) 
     30  
     31+LIBS="$MR_LIBDEP $KLIBS" 
     32+AC_SUBST(KLIBS) 
     33+ 
     34 AC_OUTPUT(Makefile lib/Makefile include/Makefile clients/Makefile \ 
     35          clients/lib/Makefile clients/addusr/Makefile \ 
     36          clients/blanche/Makefile clients/chfn/Makefile \ 
     37diff -ur moira-20091016.orig/lib/mr_init.c moira-20091016/lib/mr_init.c 
     38--- moira-20091016.orig/lib/mr_init.c   2009-10-16 16:37:18.000000000 -0400 
     39+++ moira-20091016/lib/mr_init.c        2009-10-18 17:26:49.000000000 -0400 
    2140@@ -20,8 +20,15 @@ 
    2241   if (mr_inited)