1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-25 00:51:21 +00:00

Fix build with non-i386 architectures, and fix the installation path for

the headers.

Most of this was adapted from the RedHat src RPMs.

Approved by:	maintainer timeout
This commit is contained in:
Joe Marcus Clarke 2004-07-21 02:02:02 +00:00
parent f5306125c7
commit 90ba67f079
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=114321
6 changed files with 154 additions and 32 deletions

View File

@ -6,18 +6,18 @@
PORTNAME= howl
PORTVERSION= 0.9.5
PORTREVISION= 1
CATEGORIES?= net devel
MASTER_SITES= http://www.porchdogsoft.com/download/
MAINTAINER= paul@aps.org
COMMENT= Zeroconf/Rendezvous implementation
ONLY_FOR_ARCHS= i386
USE_GMAKE= yes
USE_GNOME= lthack gnometarget pkgconfig
USE_INC_LIBTOOL_VER=13
CONFIGURE_ENV+= CFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" \
LDFLAGS="${PTHREAD_LIBS}"
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
@ -27,5 +27,7 @@ PLIST_SUB= VERSION="${PORTVERSION}"
post-patch:
@${REINPLACE_CMD} -e 's|-pthread||g' ${WRKSRC}/configure
@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} \
-E -e '/^library_includedir[[:space:]]*=/s^\$$[(]includedir[)]/howl^$$(includedir)/howl-${PORTVERSION}^g'
.include <bsd.port.mk>

View File

@ -0,0 +1,24 @@
--- 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

View File

@ -0,0 +1,61 @@
--- 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 );

View File

@ -0,0 +1,25 @@
--- 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--;
}

View File

@ -0,0 +1,10 @@
--- 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);

View File

@ -1,30 +1,30 @@
bin/mDNSBrowse
bin/mDNSPublish
bin/mDNSResponder
include/howl/corby/buffer.h
include/howl/corby/channel.h
include/howl/corby/corby.h
include/howl/corby/message.h
include/howl/corby/object.h
include/howl/corby/orb.h
include/howl/discovery/discovery.h
include/howl/discovery/text_record.h
include/howl/howl.h
include/howl/howl_dll.h
include/howl/rendezvous/rendezvous.h
include/howl/rendezvous/text_record.h
include/howl/salt/address.h
include/howl/salt/assert.h
include/howl/salt/interface.h
include/howl/salt/log.h
include/howl/salt/salt.h
include/howl/salt/signal.h
include/howl/salt/socket.h
include/howl/salt/time.h
include/howl/salt/verrno.h
include/howl/salt/vstdlib.h
include/howl/salt/vstring.h
include/howl/salt/vtypes.h
include/howl-%%VERSION%%/corby/buffer.h
include/howl-%%VERSION%%/corby/channel.h
include/howl-%%VERSION%%/corby/corby.h
include/howl-%%VERSION%%/corby/message.h
include/howl-%%VERSION%%/corby/object.h
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%%/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/interface.h
include/howl-%%VERSION%%/salt/log.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.a
lib/libhowl.so
@ -45,8 +45,8 @@ share/howl/help/txt_rec_str_iter-summary.html
share/howl/help/txt_rec_str_iter.html
@dirrm share/howl/help
@dirrm share/howl
@dirrm include/howl/salt
@dirrm include/howl/rendezvous
@dirrm include/howl/discovery
@dirrm include/howl/corby
@dirrm include/howl
@dirrm include/howl-%%VERSION%%/salt
@dirrm include/howl-%%VERSION%%/rendezvous
@dirrm include/howl-%%VERSION%%/discovery
@dirrm include/howl-%%VERSION%%/corby
@dirrm include/howl-%%VERSION%%