diff options
| author | bapt <bapt@FreeBSD.org> | 2010-09-08 15:16:34 +0800 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2010-09-08 15:16:34 +0800 |
| commit | 8e136452161039990b6692b09e4a8818f6e4cdee (patch) | |
| tree | cf1a4a9254f3ef23b6c167101ec3307c48c4486f /net-im | |
| parent | 0bf4a309253de5e105b658ced23d34af30bbe3a6 (diff) | |
| download | freebsd-ports-gnome-8e136452161039990b6692b09e4a8818f6e4cdee.tar.gz freebsd-ports-gnome-8e136452161039990b6692b09e4a8818f6e4cdee.tar.zst freebsd-ports-gnome-8e136452161039990b6692b09e4a8818f6e4cdee.zip | |
- 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]
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/zephyr/Makefile | 7 | ||||
| -rw-r--r-- | net-im/zephyr/files/patch-lib-Zinternal.c | 10 | ||||
| -rw-r--r-- | net-im/zephyr/pkg-plist | 2 |
3 files changed, 18 insertions, 1 deletions
diff --git a/net-im/zephyr/Makefile b/net-im/zephyr/Makefile index 45a5e8315f8f..54bd40d30433 100644 --- a/net-im/zephyr/Makefile +++ b/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) diff --git a/net-im/zephyr/files/patch-lib-Zinternal.c b/net-im/zephyr/files/patch-lib-Zinternal.c new file mode 100644 index 000000000000..9092bdd41358 --- /dev/null +++ b/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[] = diff --git a/net-im/zephyr/pkg-plist b/net-im/zephyr/pkg-plist index 5be28d831268..00f108efd4b4 100644 --- a/net-im/zephyr/pkg-plist +++ b/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 |