From a786b42842b487c67c7aa073db598190e3eec88a Mon Sep 17 00:00:00 2001 From: Alfred Perlstein Date: Fri, 19 Mar 2004 23:44:07 +0000 Subject: [PATCH] Fix on !i386/!ia64 and on 4.x. In collaboration with: Stuart Cheshire --- net/mDNSResponder/Makefile | 8 +------- .../files/patch-mDNSCore::mDNSClientAPI.h | 16 ++++++++++++++++ .../files/patch-mDNSPosix::mDNSUNP.h | 14 ++++++++++++++ .../files/patch-mDNSShared::dns_sd.h | 14 ++++++++++++++ 4 files changed, 45 insertions(+), 7 deletions(-) create mode 100644 net/mDNSResponder/files/patch-mDNSCore::mDNSClientAPI.h create mode 100644 net/mDNSResponder/files/patch-mDNSPosix::mDNSUNP.h create mode 100644 net/mDNSResponder/files/patch-mDNSShared::dns_sd.h diff --git a/net/mDNSResponder/Makefile b/net/mDNSResponder/Makefile index eec8e860338b..4120dc4ab6c0 100644 --- a/net/mDNSResponder/Makefile +++ b/net/mDNSResponder/Makefile @@ -23,10 +23,4 @@ MAKE_ARGS+= os=freebsd BUILD_WRKSRC= ${WRKSRC}/mDNSPosix INSTALL_WRKSRC= ${WRKSRC}/mDNSPosix -.include - -.if ${OSVERSION} < 500000 || ( ${ARCH} != "i386" && ${ARCH} != "ia64" ) -BROKEN= "Does not compile on 4.x or on !i386 and !ia64" -.endif - -.include +.include diff --git a/net/mDNSResponder/files/patch-mDNSCore::mDNSClientAPI.h b/net/mDNSResponder/files/patch-mDNSCore::mDNSClientAPI.h new file mode 100644 index 000000000000..e1f03d822e2c --- /dev/null +++ b/net/mDNSResponder/files/patch-mDNSCore::mDNSClientAPI.h @@ -0,0 +1,16 @@ +--- mDNSCore/mDNSClientAPI.h.old Tue Mar 2 15:01:04 2004 ++++ mDNSCore/mDNSClientAPI.h Fri Mar 19 15:26:43 2004 +@@ -618,9 +618,12 @@ + typedef unsigned char mDNSu8; + typedef signed short mDNSs16; + typedef unsigned short mDNSu16; +-#if _LP64 ++#if defined(_LP64) || defined(__LP64__) + typedef signed int mDNSs32; + typedef unsigned int mDNSu32; ++#elif defined(_ILP64) || defined(__ILP64__) ++typedef signed int32 mDNSs32; ++typedef unsigned int32 mDNSu32; + #else + typedef signed long mDNSs32; + typedef unsigned long mDNSu32; diff --git a/net/mDNSResponder/files/patch-mDNSPosix::mDNSUNP.h b/net/mDNSResponder/files/patch-mDNSPosix::mDNSUNP.h new file mode 100644 index 000000000000..282672c92478 --- /dev/null +++ b/net/mDNSResponder/files/patch-mDNSPosix::mDNSUNP.h @@ -0,0 +1,14 @@ +--- mDNSPosix/mDNSUNP.h.old Fri Mar 19 15:34:56 2004 ++++ mDNSPosix/mDNSUNP.h Fri Mar 19 15:38:28 2004 +@@ -67,7 +67,11 @@ + #ifndef __mDNSUNP_h + #define __mDNSUNP_h + ++#if defined(__FreeBSD__) && __FreeBSD_version >= 500000 + #include ++#elif !defined(__FreeBSD__) ++#include ++#endif + #include + #include + #include diff --git a/net/mDNSResponder/files/patch-mDNSShared::dns_sd.h b/net/mDNSResponder/files/patch-mDNSShared::dns_sd.h new file mode 100644 index 000000000000..60445de8e345 --- /dev/null +++ b/net/mDNSResponder/files/patch-mDNSShared::dns_sd.h @@ -0,0 +1,14 @@ +--- mDNSShared/dns_sd.h.old Fri Mar 19 15:38:48 2004 ++++ mDNSShared/dns_sd.h Fri Mar 19 15:38:58 2004 +@@ -46,7 +46,11 @@ + + #include + #include ++#if defined(__FreeBSD__) && __FreeBSD_version >= 500000 + #include ++#elif !defined(__FreeBSD__) ++#include ++#endif + #include + +