- Fix build on CURRENT [1]

- Fix build on 6.4 [2]

Submitted by:	Benjamin Kaduk <kaduk-fbsd _at_ mit.edu> [1] (maintainer)
Reported by:	pointy hat (erwin) [1], pointy hat (pav) [2]

net-im/zephyr/Makefile

@@ -29,6 +29,13 @@ 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
+.else
+PLIST_SUB+=	ZEPHYR_SHVERSION=4.0
+.endif
+
 .if defined(WITH_HEIMDAL)
 LIB_DEPENDS+=	ss.1:${PORTSDIR}/security/heimdal
 .if defined(HEIMDAL_HOME)

net-im/zephyr/files/patch-lib-Zinternal.c

@@ -0,0 +1,10 @@
+--- 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[] =

net-im/zephyr/pkg-plist

@@ -12,7 +12,7 @@ include/zephyr/mit-copyright.h
 include/zephyr/zephyr.h
 include/zephyr/zephyr_err.h
 lib/libzephyr.a
-lib/libzephyr.so.4.0
+lib/libzephyr.so.%%ZEPHYR_SHVERSION%%
 lib/libzephyr.la
 sbin/zshutdown_notify
 sbin/zephyrd