Changeset 152 for trunk

Show
Ignore:
Timestamp:
10/27/08 21:13:43 (16 years ago)
Author:
broder
Message:

Update macathena-moira with a newer snapshot (and eliminate a patch
that's no longer required)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r137 r152  
    11Package: macathena-moira 
    2 Version: 20080331 
    3 Revision: 2 
     2Version: 20080830 
     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: ef6afe1f325480972e9b97a92a6bbda2 
     14Source-MD5: f531703191a30b130c772e8fcaa05c43 
    1515 
    1616Depends: macathena-hesiod, libncurses5 
    …… 
    1818UpdateConfigGuess: true 
    1919PatchFile: %n.patch 
    20 PatchFile-MD5: b351913b158ec878a18051c34b677c3f 
     20PatchFile-MD5: ddba5b97628f0cad674cd20bce153bde 
    2121PatchScript: patch -p0 < %{PatchFile} 
    2222ConfigureParams: --with-krb5 --with-com_err --with-hesiod 

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

    r45 r152  
    217217 update_test: $(COBJS) $(MR_LIBDEP) 
    218218        $(CC) -o $@ $(LDFLAGS) $(COBJS) $(LIBS) 
    219 --- configure.in.orig   2006-05-12 16:26:10.000000000 -0400 
    220 +++ configure.in        2007-12-18 15:53:40.000000000 -0500 
    221 @@ -1,6 +1,6 @@ 
    222  AC_INIT(patchlevel.h) 
    223   
    224 -dnl On Athena at least, many of the packages (krb, zephyr, hesiod, etc) 
    225 +dnl On Athena at least, many of the packages (krb, hesiod, etc) 
    226  dnl will all be in /usr/athena... this hack lets us not end up with 10 
    227  dnl copies of -I/usr/athena/include -L/usr/athena/lib in our command lines 
    228  AC_DEFUN(MR_EXTEND, [ 
    229 @@ -115,17 +115,16 @@ 
    230      [  --with-krb4=PREFIX      Specify location of krb4], 
    231      [krb4="$withval"], [krb4=no]) 
    232  AC_MSG_RESULT($krb4) 
    233 -if test $krb4 = "no"; then 
    234 -    AC_MSG_ERROR(Kerberos is required for Moira) 
    235 -fi 
    236 -if test "$krb4" != yes; then 
    237 -    MR_INCLUDE($krb4/include) 
    238 -    if test -d "$krb4/include/kerberosIV"; then 
    239 -       MR_INCLUDE($krb4/include/kerberosIV) 
    240 +if test "$krb4" != no; then 
    241 +    if test "$krb4" != yes; then 
    242 +        MR_INCLUDE($krb4/include) 
    243 +        if test -d "$krb4/include/kerberosIV"; then 
    244 +        MR_INCLUDE($krb4/include/kerberosIV) 
    245 +        fi 
    246 +        MR_LIBS($krb4/lib) 
    247 +    elif test -d /usr/include/kerberosIV; then 
    248 +        MR_INCLUDE(/usr/include/kerberosIV) 
    249      fi 
    250 -    MR_LIBS($krb4/lib) 
    251 -elif test -d /usr/include/kerberosIV; then 
    252 -    MR_INCLUDE(/usr/include/kerberosIV) 
    253  fi 
    254  AC_CHECK_LIB(k5crypto, main, crypto="k5crypto", 
    255               [AC_CHECK_LIB(crypto, main, crypto="crypto")]) 
    256 @@ -143,20 +142,26 @@ 
    257      [krb5="$withval"], [krb5=no]) 
    258  AC_MSG_RESULT($krb5) 
    259  if test "$krb5" != no; then 
    260 -    REG_SVR_DEFS=-DKRB5 
    261      if test "$krb5" != yes; then 
    262 -       REG_SVR_INCLUDES=-I$krb5/include 
    263 -       REG_SVR_LIBS=-L$krb5/lib 
    264 +        REG_SVR_DEFS=-DKRB5 
    265 +        if test "$krb5" != yes; then 
    266 +        REG_SVR_INCLUDES=-I$krb5/include 
    267 +        REG_SVR_LIBS=-L$krb5/lib 
    268 +        fi 
    269 +        REG_SVR_LIBS="$REG_SVR_LIBS -lkadm5clnt -lgssapi_krb5 -lgssrpc -lkrb4 -ldes425 -lkrb5 -l${crypto} -lresolv" 
    270 +    else 
    271 +        REG_SVR_DEFS=-DKRB4 
    272 +        REG_SVR_LIBS=-lkadm 
    273      fi 
    274 -    REG_SVR_LIBS="$REG_SVR_LIBS -lkadm5clnt -lgssapi_krb5 -lgssrpc -lkrb4 -ldes425 -lkrb5 -l${crypto} -lresolv" 
    275 -else 
    276 -    REG_SVR_DEFS=-DKRB4 
    277 -    REG_SVR_LIBS=-lkadm 
    278  fi 
    279  AC_SUBST(REG_SVR_DEFS) 
    280  AC_SUBST(REG_SVR_INCLUDES) 
    281  AC_SUBST(REG_SVR_LIBS) 
    282   
    283 +if test $krb5 = "no" -a $krb4 = "no"; then 
    284 +    AC_MSG_ERROR(Kerberos is required for Moira) 
    285 +fi 
    286 + 
    287  # Hesiod support 
    288  AC_MSG_CHECKING(for Hesiod) 
    289  AC_ARG_WITH(hesiod, 
    290 @@ -176,23 +181,6 @@ 
    291      MR_DEFINE(HAVE_HESIOD) 
    292  fi 
    293   
    294 -# Zephyr support 
    295 -AC_MSG_CHECKING(for Zephyr) 
    296 -AC_ARG_WITH(zephyr, 
    297 -    [  --with-zephyr=PREFIX    Specify location of Zephyr], 
    298 -    [zephyr="$withval"], [zephyr=no]) 
    299 -AC_MSG_RESULT($zephyr) 
    300 -if test "$zephyr" != no; then 
    301 -    if test "$zephyr" != yes; then 
    302 -       MR_INCLUDE($zephyr/include) 
    303 -       MR_LIBS($zephyr/lib) 
    304 -    fi 
    305 -    AC_CHECK_LIB(zephyr, ZInitialize, :, 
    306 -                [AC_MSG_ERROR(Zephyr library not found)], 
    307 -                $LIBPATH $KRB4_LIBS -lcom_err) 
    308 -    MR_DEFINE(HAVE_ZEPHYR) 
    309 -fi 
    310 - 
    311  # RSAREF support (default: build util/rsaref if present) 
    312  AC_MSG_CHECKING(for RSAREF) 
    313  AC_ARG_WITH(rsaref, 
    314 @@ -449,7 +437,7 @@ 
    315  MR_INCLUDE('$(BUILDTOP)/db') 
    316  MR_INCLUDE('$(srcdir)') 
    317  LDFLAGS="$LDFLAGS -L\$(BUILDTOP)/lib $LIBPATH" 
    318 -KLIBS="-lzephyr $KRB4_LIBS -lcom_err -lhesiod $LIBS" 
    319 +KLIBS="$KRB4_LIBS -lcom_err -lhesiod $LIBS" 
    320  LIBS="-lmoira $KLIBS" 
    321  AC_SUBST(KLIBS) 
    322