diff -ruN zephyr.orig/Makefile zephyr/Makefile --- zephyr.orig/Makefile 2011-03-11 00:23:04.000000000 -0500 +++ zephyr/Makefile 2011-03-11 00:35:25.000000000 -0500 @@ -1,14 +1,14 @@ # New ports collection makefile for: zephyr -# Date created: 2009-11-12 +# Date created: 12 November 2009 # Whom: Ben Kaduk # -# $FreeBSD: ports/net-im/zephyr/Makefile,v 1.3 2010/09/18 10:42:23 pav Exp $ +# $FreeBSD$ # PORTNAME= zephyr -PORTVERSION= 3.0 +DISTVERSION= 3.0.1 CATEGORIES= net-im -MASTER_SITES= http://zephyr.1ts.org/export/2552/distribution/ +MASTER_SITES= http://zephyr.1ts.org/export/2642/distribution/ MAINTAINER= kaduk-fbsd@mit.edu COMMENT= An enterprise-scale distributed messaging system @@ -29,14 +29,6 @@ .include -# On 6.X zephyr install libzephyr.so.4 and libzephyr.so.4.0 for others -.if ${OSVERSION} < 700000 -PLIST_SUB+= ZEPHYR_SHVERSION=4 -BROKEN= bad plist -.else -PLIST_SUB+= ZEPHYR_SHVERSION=4.0 -.endif - .if defined(WITH_HEIMDAL) LIB_DEPENDS+= ss.1:${PORTSDIR}/security/heimdal .if defined(HEIMDAL_HOME) diff -ruN zephyr.orig/distinfo zephyr/distinfo --- zephyr.orig/distinfo 2011-03-11 00:23:35.000000000 -0500 +++ zephyr/distinfo 2011-03-11 00:26:58.000000000 -0500 @@ -1,3 +1,2 @@ -MD5 (zephyr-3.0.tar.gz) = 083824d15cbfbf12a03224a96a92bec3 -SHA256 (zephyr-3.0.tar.gz) = 8d09cd7a753ff8c8be9e5bd9db1a6a63c23171109ff2be6d876095d48cf5b6ff -SIZE (zephyr-3.0.tar.gz) = 684678 +SHA256 (zephyr-3.0.1.tar.gz) = a67c8b04aedc2e80e8e157853b91c01963ddeb1bdb5f776fdb3bc69bf703763b +SIZE (zephyr-3.0.1.tar.gz) = 671953 diff -ruN zephyr.orig/files/patch-configure zephyr/files/patch-configure --- zephyr.orig/files/patch-configure 2011-03-11 00:24:34.000000000 -0500 +++ zephyr/files/patch-configure 2011-03-11 00:26:58.000000000 -0500 @@ -1,45 +1,53 @@ ---- configure.orig 2009-11-12 08:19:57.000000000 +0000 -+++ configure 2009-11-12 08:32:53.000000000 +0000 -@@ -24651,15 +24651,15 @@ - { echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_send" >&5 - echo "${ECHO_T}$ac_cv_lib_resolv_res_send" >&6; } - if test $ac_cv_lib_resolv_res_send = yes; then -- LIBZEPHYR_LIBS="-lresolv $LIBZEPHYR_LIBS" -+ LIBZEPHYR_LIBS="-lc $LIBZEPHYR_LIBS" - else -- { echo "$as_me:$LINENO: checking for __res_send in -lresolv" >&5 --echo $ECHO_N "checking for __res_send in -lresolv... $ECHO_C" >&6; } -+ { echo "$as_me:$LINENO: checking for res_send in -lc" >&5 -+echo $ECHO_N "checking for res_send in -lc... $ECHO_C" >&6; } - if test "${ac_cv_lib_resolv___res_send+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +--- ./configure.orig 2010-11-06 19:01:04.000000000 -0400 ++++ ./configure 2011-02-21 14:30:09.000000000 -0500 +@@ -20412,13 +20412,13 @@ + + LIBZEPHYR_LIBS="$LIBZEPHYR_LIBS $KRB5_LIBS" + # the zephyr library needs -lresolv if it's built with krb5 +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_send in -lresolv" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_send in -lc" >&5 + $as_echo_n "checking for res_send in -lresolv... " >&6; } + if test "${ac_cv_lib_resolv_res_send+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lresolv $LIBS" +LIBS="-lc $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -24673,11 +24673,11 @@ - #ifdef __cplusplus - extern "C" - #endif --char __res_send (); -+char res_send (); - int - main () - { --return __res_send (); -+return res_send (); - ; - return 0; - } -@@ -24715,7 +24715,7 @@ - { echo "$as_me:$LINENO: result: $ac_cv_lib_resolv___res_send" >&5 - echo "${ECHO_T}$ac_cv_lib_resolv___res_send" >&6; } - if test $ac_cv_lib_resolv___res_send = yes; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -20449,7 +20449,7 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_send" >&5 + $as_echo "$ac_cv_lib_resolv_res_send" >&6; } + if test "x$ac_cv_lib_resolv_res_send" = x""yes; then : - LIBZEPHYR_LIBS="-lresolv $LIBZEPHYR_LIBS" + LIBZEPHYR_LIBS="$LIBZEPHYR_LIBS" else - { { echo "$as_me:$LINENO: error: Zephyr requires libresolv along with Kerberos V." >&5 - echo "$as_me: error: Zephyr requires libresolv along with Kerberos V." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __res_send in -lresolv" >&5 + $as_echo_n "checking for __res_send in -lresolv... " >&6; } +@@ -20567,13 +20567,13 @@ + CPPFLAGS="$CPPFLAGS -I$hesiod/include" + LDFLAGS="$LDFLAGS -L$hesiod/lib" + fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for hes_resolve in -lhesiod" >&5 +-$as_echo_n "checking for hes_resolve in -lhesiod... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for hes_resolve in -lc" >&5 ++$as_echo_n "checking for hes_resolve in -lc... " >&6; } + if test "${ac_cv_lib_hesiod_hes_resolve+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lhesiod $LIBS $LIBS" ++LIBS="-lc $LIBS $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -20609,7 +20609,7 @@ + as_fn_error $? "Hesiod library not found" "$LINENO" 5 + fi + +- HESIOD_LIBS="-lhesiod" ++ HESIOD_LIBS="-lc" + $as_echo "#define HAVE_HESIOD 1" >>confdefs.h + + fi diff -ruN zephyr.orig/files/patch-lib-Zinternal.c zephyr/files/patch-lib-Zinternal.c --- zephyr.orig/files/patch-lib-Zinternal.c 2011-03-11 00:24:55.000000000 -0500 +++ zephyr/files/patch-lib-Zinternal.c 1969-12-31 19:00:00.000000000 -0500 @@ -1,10 +0,0 @@ ---- lib/Zinternal.c.orig 2010-09-07 22:44:54.000000000 -0400 -+++ lib/Zinternal.c 2010-09-07 22:45:00.000000000 -0400 -@@ -14,7 +14,6 @@ - #include - #include - #include --#include - - #ifndef lint - static const char rcsid_Zinternal_c[] = diff -ruN zephyr.orig/files/patch-zwgc-main.c zephyr/files/patch-zwgc-main.c --- zephyr.orig/files/patch-zwgc-main.c 2011-03-11 00:25:04.000000000 -0500 +++ zephyr/files/patch-zwgc-main.c 1969-12-31 19:00:00.000000000 -0500 @@ -1,26 +0,0 @@ ---- zwgc/main.c.orig 2009-12-20 01:29:41.000000000 +0000 -+++ zwgc/main.c 2009-12-20 01:32:34.000000000 +0000 -@@ -396,9 +396,8 @@ - void - notice_handler(ZNotice_t *notice) - { --#ifndef HAVE_ARES -+ int error; - char node[MAXDNAME]; --#endif - - #if defined(CMU_ZWGCPLUS) - list_add_notice(notice); -@@ -415,9 +414,11 @@ - notice_callback, notice); - - #else -- getnameinfo((const struct sockaddr *)&(notice->z_sender_sockaddr), -+ error = getnameinfo((const struct sockaddr *)&(notice->z_sender_sockaddr), - sizeof(notice->z_sender_sockaddr), - node, sizeof(node), NULL, 0, 0); -+ if (error != 0) -+ snprintf(node, MAXDNAME, "?"); - - process_notice(notice, node); - #ifdef CMU_ZWGCPLUS diff -ruN zephyr.orig/pkg-plist zephyr/pkg-plist --- zephyr.orig/pkg-plist 2011-03-11 00:24:02.000000000 -0500 +++ zephyr/pkg-plist 2011-03-11 00:40:26.000000000 -0500 @@ -12,7 +12,7 @@ include/zephyr/zephyr.h include/zephyr/zephyr_err.h lib/libzephyr.a -lib/libzephyr.so.%%ZEPHYR_SHVERSION%% +lib/libzephyr.so.4.0 lib/libzephyr.la sbin/zshutdown_notify sbin/zephyrd