mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-21 04:06:46 +00:00
Code Issues Releases Activity

- Update to 3.0.1

Browse Source 
PR:		155455
Submitted by:	Benjamin Kaduk <kaduk-fbsd@MIT.EDU> (maintainer)
This commit is contained in:
Martin Wilke 2011-03-18 03:22:13 +00:00
parent de777d0faa
commit 4d326521e1
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=271201
6 changed files with 53 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
net-im/zephyr/Makefile
View File

@ -1,14 +1,14 @@
# New ports collection makefile for: zephyr
# Date created: 2009-11-12
# Date created: 12 November 2009
# Whom: Ben Kaduk <kaduk@mit.edu>
#
# $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 @@ OPTIONS= HEIMDAL "Use Heimdal Kerberos for ss/com_err" no
.include <bsd.port.options.mk>
# 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)
@ -51,6 +43,6 @@ KRB5_DIR?= ${DESTDIR}/usr
# it is an upstream bug that --with-krb5 needs a path
CONFIGURE_ARGS= --with-krb5="${KRB5_DIR}"
CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}"
CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}"
.include <bsd.port.mk>

5
net-im/zephyr/distinfo
View File

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

84
net-im/zephyr/files/patch-configure
View File

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

10
net-im/zephyr/files/patch-lib-Zinternal.c
View File

@ -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 <internal.h>
#include <arpa/inet.h>
#include <sys/socket.h>
-#include <utmp.h>
#ifndef lint
static const char rcsid_Zinternal_c[] =

26
net-im/zephyr/files/patch-zwgc-main.c
View File

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

2
net-im/zephyr/pkg-plist
View File

@ -12,7 +12,7 @@ include/zephyr/mit-copyright.h
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