Update to 0.9.6.

Approved by:	maintainer

8 files changed, 16 insertions, 145 deletions

diff --git a/net/howl/Makefile b/net/howl/Makefile
index b56fe96520bd..d4c0cf6b1c75 100644
--- a/net/howl/Makefile
+++ b/net/howl/Makefile
@@ -5,8 +5,7 @@
 #
 
 PORTNAME=	howl
-PORTVERSION=	0.9.5
-PORTREVISION=	1
+PORTVERSION=	0.9.6
 CATEGORIES?=	net devel
 MASTER_SITES=	http://www.porchdogsoft.com/download/
 
@@ -14,8 +13,8 @@ MAINTAINER=	paul@aps.org
 COMMENT=	Zeroconf/Rendezvous implementation
 
 USE_GMAKE=	yes
-USE_GNOME=	lthack gnometarget pkgconfig
-USE_INC_LIBTOOL_VER=13
+USE_GNOME=	gnometarget pkgconfig
+USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" \
 		LDFLAGS="${PTHREAD_LIBS}"
 USE_REINPLACE=	yes
diff --git a/net/howl/distinfo b/net/howl/distinfo
index e4b3116b9ccc..5a08edafdf49 100644
--- a/net/howl/distinfo
+++ b/net/howl/distinfo
@@ -1,2 +1,2 @@
-MD5 (howl-0.9.5.tar.gz) = 28dc9e00de626ea14070bb42c6736ace
-SIZE (howl-0.9.5.tar.gz) = 552178
+MD5 (howl-0.9.6.tar.gz) = 1a593f39928c0c4841939128b75e8279
+SIZE (howl-0.9.6.tar.gz) = 538741
diff --git a/net/howl/files/patch-include_salt_vtypes.h b/net/howl/files/patch-include_salt_vtypes.h
deleted file mode 100644
index 6118fd7e2f37..000000000000
--- a/net/howl/files/patch-include_salt_vtypes.h
+++ /dev/null
@@ -1,24 +0,0 @@
---- include/salt/vtypes.h.orig	Fri Jul  2 00:42:34 2004
-+++ include/salt/vtypes.h	Fri Jul  2 00:50:40 2004
-@@ -56,7 +56,7 @@
- typedef short					sw_short;
- typedef unsigned short		sw_ushort;
- typedef long					sw_long;
--typedef unsigned long		sw_ulong;
-+typedef unsigned int		sw_ulong;
- typedef unsigned char	*	sw_octets;
- typedef char				*	sw_string;
- #if !defined(__VXWORKS__) || defined(__cplusplus)
-@@ -139,8 +139,11 @@
- 
- #elif defined(__FreeBSD__) || defined(__NetBSD__)
- 
--#	if defined(i386)
-+#include <machine/endian.h>
-+#if BYTE_ORDER == LITTLE_ENDIAN
- #		define SW_ENDIAN		1
-+#elif BYTE_ORDER == BIG_ENDIAN
-+#		define SW_ENDIAN		0
- #	else
- #		error "CPU unknown"
- #	endif
diff --git a/net/howl/files/patch-src_lib_howl_NotOSX_DNSServices.h b/net/howl/files/patch-src_lib_howl_NotOSX_DNSServices.h
deleted file mode 100644
index b30530bf401e..000000000000
--- a/net/howl/files/patch-src_lib_howl_NotOSX_DNSServices.h
+++ /dev/null
@@ -1,61 +0,0 @@
---- src/lib/howl/NotOSX/DNSServices.h.orig	Fri Jul  2 00:53:26 2004
-+++ src/lib/howl/NotOSX/DNSServices.h	Fri Jul  2 00:56:58 2004
-@@ -98,6 +98,10 @@
- #include	<stddef.h>
- #include <salt/salt.h>
- 
-+#ifdef HAVE_STDINT_H
-+#include <stdint.h>
-+#endif
-+
- #ifdef	__cplusplus
- 	extern "C" {
- #endif
-@@ -224,7 +228,11 @@
- 	@abstract	8-bit unsigned data type.
- */
- 
-+#ifdef HAVE_STDINT_H
-+typedef uint8_t			DNSUInt8;
-+#else
- typedef unsigned char		DNSUInt8;
-+#endif
- 
- dns_check_compile_time( sizeof( DNSUInt8 ) == 1 );
- 
-@@ -234,7 +242,11 @@
- 	@abstract	16-bit unsigned data type.
- */
- 
-+#ifdef HAVE_STDINT_H
-+typedef uint16_t		DNSUInt16;
-+#else
- typedef unsigned short		DNSUInt16;
-+#endif
- 
- dns_check_compile_time( sizeof( DNSUInt16 ) == 2 );
- 
-@@ -244,7 +256,11 @@
- 	@abstract	32-bit unsigned data type.
- */
- 
-+#ifdef HAVE_STDINT_H
-+typedef uint32_t		DNSUInt32;
-+#else
- typedef unsigned long		DNSUInt32;
-+#endif
- 
- dns_check_compile_time( sizeof( DNSUInt32 ) == 4 );
- 
-@@ -254,7 +270,11 @@
- 	@abstract	32-bit signed data type.
- */
- 
-+#ifdef HAVE_STDINT_H
-+typedef int32_t			DNSSInt32;
-+#else
- typedef signed long		DNSSInt32;
-+#endif
- 
- dns_check_compile_time( sizeof( DNSSInt32 ) == 4 );
- 
diff --git a/net/howl/files/patch-src_lib_howl_NotOSX_notosx_mdns.c b/net/howl/files/patch-src_lib_howl_NotOSX_notosx_mdns.c
deleted file mode 100644
index 3f4ed9ba8c59..000000000000
--- a/net/howl/files/patch-src_lib_howl_NotOSX_notosx_mdns.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/lib/howl/NotOSX/notosx_mdns.c.orig	Thu Apr 15 10:34:27 2004
-+++ src/lib/howl/NotOSX/notosx_mdns.c	Thu Apr 15 10:34:38 2004
-@@ -54,7 +54,7 @@
- #include <salt/assert.h>
- #include <salt/log.h>
- #include <stdio.h>
--
-+#include <sys/time.h>
- 
- #define CACHE_SIZE 750
- 
diff --git a/net/howl/files/patch-src_lib_howl_Posix_posix_salt.c b/net/howl/files/patch-src_lib_howl_Posix_posix_salt.c
deleted file mode 100644
index 23c49f596b44..000000000000
--- a/net/howl/files/patch-src_lib_howl_Posix_posix_salt.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/lib/howl/Posix/posix_salt.c.orig	Fri Jul  2 00:46:53 2004
-+++ src/lib/howl/Posix/posix_salt.c	Fri Jul  2 00:47:30 2004
-@@ -450,12 +450,14 @@
- 				sw_debug("sw_salt_run() : fd %d is readable\n", psocket->m_super.m_fd);
- 				events |= SW_SOCKET_READ;
- 				num--;
-+				FD_CLR(psocket->m_super.m_fd, &readfds);
- 			}
- 		
- 			if (FD_ISSET(psocket->m_super.m_fd, &writefds))
- 			{
- 				sw_debug("sw_salt_run() : fd %d is writable\n", psocket->m_super.m_fd);
- 				events |= SW_SOCKET_WRITE;
-+				FD_CLR(psocket->m_super.m_fd, &writefds);
- 				num--;
- 			}
- 		
-@@ -463,6 +465,7 @@
- 			{
- 				sw_debug("sw_salt_run() : fd %d is oobable\n", psocket->m_super.m_fd);
- 				events |= SW_SOCKET_OOB;
-+				FD_CLR(psocket->m_super.m_fd, &oobfds);
- 				num--;
- 			}
- 
diff --git a/net/howl/files/patch-src_mDNSResponder_Posix_posix_main.c b/net/howl/files/patch-src_mDNSResponder_Posix_posix_main.c
deleted file mode 100644
index 9cac018d2a12..000000000000
--- a/net/howl/files/patch-src_mDNSResponder_Posix_posix_main.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/mDNSResponder/Posix/posix_main.c.orig	Fri Jul  2 00:49:18 2004
-+++ src/mDNSResponder/Posix/posix_main.c	Fri Jul  2 00:49:32 2004
-@@ -239,6 +239,7 @@
- 	signal(SIGHUP, sw_mdnsd_signal_handler);
- 	signal(SIGUSR1, sw_mdnsd_signal_handler);
- 	signal(SIGUSR2, sw_mdnsd_signal_handler);
-+	signal(SIGPIPE, SIG_IGN);
- 
- 	sigfillset(&signalSet);
- 
diff --git a/net/howl/pkg-plist b/net/howl/pkg-plist
index 809ef2835a8d..9b2009bca5a4 100644
--- a/net/howl/pkg-plist
+++ b/net/howl/pkg-plist
@@ -1,5 +1,7 @@
 bin/mDNSBrowse
 bin/mDNSPublish
+bin/mDNSQuery
+bin/mDNSResolve
 bin/mDNSResponder
 include/howl-%%VERSION%%/corby/buffer.h
 include/howl-%%VERSION%%/corby/channel.h
@@ -10,24 +12,25 @@ include/howl-%%VERSION%%/corby/orb.h
 include/howl-%%VERSION%%/discovery/discovery.h
 include/howl-%%VERSION%%/discovery/text_record.h
 include/howl-%%VERSION%%/howl.h
-include/howl-%%VERSION%%/howl_dll.h
+include/howl-%%VERSION%%/howl_config.h
 include/howl-%%VERSION%%/rendezvous/rendezvous.h
 include/howl-%%VERSION%%/rendezvous/text_record.h
 include/howl-%%VERSION%%/salt/address.h
-include/howl-%%VERSION%%/salt/assert.h
+include/howl-%%VERSION%%/salt/debug.h
 include/howl-%%VERSION%%/salt/interface.h
-include/howl-%%VERSION%%/salt/log.h
+include/howl-%%VERSION%%/salt/platform.h
 include/howl-%%VERSION%%/salt/salt.h
 include/howl-%%VERSION%%/salt/signal.h
 include/howl-%%VERSION%%/salt/socket.h
 include/howl-%%VERSION%%/salt/time.h
-include/howl-%%VERSION%%/salt/verrno.h
-include/howl-%%VERSION%%/salt/vstdlib.h
-include/howl-%%VERSION%%/salt/vstring.h
-include/howl-%%VERSION%%/salt/vtypes.h
-lib/libhowl-%%VERSION%%.so.0
+lib/libhowl-%%VERSION%%.so.1
+lib/libhowl-%%VERSION%%.so
 lib/libhowl.a
 lib/libhowl.so
+lib/libmDNSResponder-%%VERSION%%.so
+lib/libmDNSResponder-%%VERSION%%.so.0
+lib/libmDNSResponder.a
+lib/libmDNSResponder.so
 libdata/pkgconfig/howl.pc
 share/howl/help/address-summary.html
 share/howl/help/address.html