Date: Fri, 19 Mar 2004 00:25:24 +0900 (JST) From: Hiroki Sato <hrs@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: alfred@FreeBSD.org Subject: ports/64423: Fix port: net/mDNSResponder Message-ID: <200403181525.i2IFPOv9093950@alph.allbsd.org> Resent-Message-ID: <200403181530.i2IFUCVY075584@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 64423
>Category: ports
>Synopsis: Fix port: net/mDNSResponder
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Mar 18 07:30:12 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: Hiroki Sato
>Release: FreeBSD 4.9-STABLE i386
>Organization:
Tokyo University of Science
>Environment:
System: FreeBSD alph.allbsd.org 4.9-STABLE FreeBSD 4.9-STABLE #1: Sun Feb 8 19:26:12 JST 2004 hrs@alph.allbsd.org:/usr/obj/usr/src/sys/ALPH i386
>Description:
Remove the BROKEN line in the case of ${OSVERSION} < 500000 or
!i386 or !ia64. The changes include: 1) FreeBSD 4.x has no
stdint.h so it has been #ifdef'd, 2) "mDNSs32" and "mDNSu32"
have been typedef'd with "int," not "long" for LP64 architectures.
As far as I can check it can be compiled on sparc64, ia64, and
i386(4.x and 5.x) now.
>How-To-Repeat:
N/A
>Fix:
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/mDNSResponder/Makefile,v
retrieving revision 1.3
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.3 Makefile
--- Makefile 18 Mar 2004 12:14:51 -0000 1.3
+++ Makefile 18 Mar 2004 14:56:14 -0000
@@ -23,10 +23,4 @@
BUILD_WRKSRC= ${WRKSRC}/mDNSPosix
INSTALL_WRKSRC= ${WRKSRC}/mDNSPosix
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000 || ( ${ARCH} != "i386" && ${ARCH} != "ia64" )
-BROKEN= "Does not compile on 4.x or on !i386 and !ia64"
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: files/patch-mDNSCore::mDNSClientAPI.h
===================================================================
RCS file: files/patch-mDNSCore::mDNSClientAPI.h
diff -N files/patch-mDNSCore::mDNSClientAPI.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-mDNSCore::mDNSClientAPI.h 18 Mar 2004 15:16:27 -0000
@@ -0,0 +1,11 @@
+--- mDNSCore/mDNSClientAPI.h Wed Mar 3 08:01:04 2004
++++ mDNSCore/mDNSClientAPI.h Thu Mar 18 23:49:19 2004
+@@ -618,7 +618,7 @@
+ typedef unsigned char mDNSu8;
+ typedef signed short mDNSs16;
+ typedef unsigned short mDNSu16;
+-#if _LP64
++#if defined(_LP64) || defined(__sparc64__) || defined(__alpha__) || defined(__amd64__) || defined(__ia64__)
+ typedef signed int mDNSs32;
+ typedef unsigned int mDNSu32;
+ #else
Index: files/patch-mDNSPosix::mDNSUNP.h
===================================================================
RCS file: files/patch-mDNSPosix::mDNSUNP.h
diff -N files/patch-mDNSPosix::mDNSUNP.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-mDNSPosix::mDNSUNP.h 18 Mar 2004 14:32:39 -0000
@@ -0,0 +1,12 @@
+--- mDNSPosix/mDNSUNP.h Thu Mar 18 23:30:48 2004
++++ mDNSPosix/mDNSUNP.h Thu Mar 18 23:30:52 2004
+@@ -67,7 +67,9 @@
+ #ifndef __mDNSUNP_h
+ #define __mDNSUNP_h
+
++#if !defined(__FreeBSD__) || __FreeBSD__ > 500000
+ #include <stdint.h>
++#endif
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <net/if.h>
Index: files/patch-mDNSShared::dns_sd.h
===================================================================
RCS file: files/patch-mDNSShared::dns_sd.h
diff -N files/patch-mDNSShared::dns_sd.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-mDNSShared::dns_sd.h 18 Mar 2004 14:32:57 -0000
@@ -0,0 +1,12 @@
+--- mDNSShared/dns_sd.h Thu Mar 18 23:31:38 2004
++++ mDNSShared/dns_sd.h Thu Mar 18 23:31:43 2004
+@@ -46,7 +46,9 @@
+
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#if !defined(__FreeBSD__) || __FreeBSD__ > 500000
+ #include <stdint.h>
++#endif
+ #include <netinet/in.h>
+
+
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200403181525.i2IFPOv9093950>