Fix build on Solaris.

4 files changed, 40 insertions, 8 deletions

diff --git a/net/mDNSResponder/Makefile b/net/mDNSResponder/Makefile
index fba82f1a0c8..ad7474c285b 100644
--- a/net/mDNSResponder/Makefile
+++ b/net/mDNSResponder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/01/17 23:41:49 tron Exp $
+# $NetBSD: Makefile,v 1.17 2006/02/04 21:02:31 markd Exp $
 
 DISTNAME=	mDNSResponder-107.5
 CATEGORIES=	net
@@ -48,7 +48,8 @@ INSTALLATION_DIRS=	bin include lib sbin
 .if !empty(MACHINE_PLATFORM:MNetBSD-3.99.[1-7]-*) || \
     !empty(MACHINE_PLATFORM:MNetBSD-3.[0-9]-*) || \
     !empty(MACHINE_PLATFORM:MNetBSD-3.[0-9][._]*) || \
-    !empty(MACHINE_PLATFORM:MNetBSD-[0-2]*)
+    !empty(MACHINE_PLATFORM:MNetBSD-[0-2]*) || \
+    !empty(MACHINE_PLATFORM:MSunOS-5.[0-9]-*)
 .include "../../devel/librfuncs/buildlink3.mk"
 
 MAKE_ENV+=	EXTRA_LIBS=-Wl,-R${BUILDLINK_PREFIX.librfuncs:Q}/lib\ ${BUILDLINK_LDFLAGS.librfuncs:Q}
diff --git a/net/mDNSResponder/distinfo b/net/mDNSResponder/distinfo
index 0f57e8c3414..77b97db34ca 100644
--- a/net/mDNSResponder/distinfo
+++ b/net/mDNSResponder/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.9 2006/01/17 12:44:33 tron Exp $
+$NetBSD: distinfo,v 1.10 2006/02/04 21:02:31 markd Exp $
 
 SHA1 (mDNSResponder-107.5.tar.gz) = 8dec7293db2efbfef290be5aeb5fc50e2a7824a2
 RMD160 (mDNSResponder-107.5.tar.gz) = df10cb280905f957b5bb2419207288bb66c94e97
 Size (mDNSResponder-107.5.tar.gz) = 1379397 bytes
-SHA1 (patch-aa) = 9636cfc90b8cfa204bdada3fbe6ac784163210a9
+SHA1 (patch-aa) = a840ae02dfdf5ae6108e8ffd5c978a6c6648b8a3
+SHA1 (patch-ab) = 471169a9125567da940e792e3b43b88443e8e1bb
diff --git a/net/mDNSResponder/patches/patch-aa b/net/mDNSResponder/patches/patch-aa
index 2b8c7f24aec..002e7a59516 100644
--- a/net/mDNSResponder/patches/patch-aa
+++ b/net/mDNSResponder/patches/patch-aa
@@ -1,8 +1,25 @@
-$NetBSD: patch-aa,v 1.6 2006/01/17 12:44:33 tron Exp $
+$NetBSD: patch-aa,v 1.7 2006/02/04 21:02:31 markd Exp $
 
---- mDNSPosix/Makefile.orig	2006-01-06 01:06:17.000000000 +0000
-+++ mDNSPosix/Makefile	2006-01-17 11:30:40.000000000 +0000
-@@ -643,7 +643,7 @@
+--- mDNSPosix/Makefile.orig	2006-01-06 14:06:17.000000000 +1300
++++ mDNSPosix/Makefile
+@@ -281,6 +281,7 @@ CFLAGS_OS = -DNOT_HAVE_DAEMON -DNOT_HAVE
+ CC = gcc
+ LD = gcc -shared
+ LIBFLAGS = -lsocket -lnsl -lresolv
++SYSTEMLIBS = -lsocket -lnsl
+ JAVACFLAGS_OS += -I$(JDK)/include/solaris
+ ifneq ($(DEBUG),1)
+ STRIP = strip
+@@ -450,7 +451,7 @@ Clients: setup libdns_sd ../Clients/buil
+ 	@echo "Clients done"
+ 
+ ../Clients/build/dns-sd:
+-	@$(MAKE) -C ../Clients
++	@$(MAKE) -C ../Clients SYSTEMLIBS="$(SYSTEMLIBS)"
+ 
+ # nss_mdns target builds the Name Service Switch module
+ nss_mdns: setup $(BUILDDIR)/$(NSSLIBFILE)
+@@ -643,7 +644,7 @@ $(BUILDDIR)/mDNSNetMonitor:          $(S
  	$(CC) $+ -o $@ $(LIBFLAGS)
  
  $(BUILDDIR)/dnsextd:                 $(SPECIALOBJ) $(OBJDIR)/dnsextd.c.threadsafe.o
diff --git a/net/mDNSResponder/patches/patch-ab b/net/mDNSResponder/patches/patch-ab
new file mode 100644
index 00000000000..637bf0de599
--- /dev/null
+++ b/net/mDNSResponder/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.3 2006/02/04 21:02:31 markd Exp $
+
+--- Clients/Makefile.orig	2006-02-03 23:36:07.253466000 +1300
++++ Clients/Makefile
+@@ -56,7 +56,7 @@
+ ifneq "$(wildcard /usr/lib/libSystem.dylib)" ""
+ LIBS =
+ else
+-LIBS = -L../mDNSPosix/build/prod/ -ldns_sd
++LIBS = -L../mDNSPosix/build/prod/ -ldns_sd $(SYSTEMLIBS)
+ endif
+ 
+ targets: build/dns-sd