Attachment 50948 Details for Bug 77514 – mDNSResponder.diff

[patch] mDNSResponder.diff

mDNSResponder.diff (text/plain), 7.56 KB, created by Michael Nottebrock on 2005-02-14 15:10:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Nottebrock

Created: 2005-02-14 15:10:21 UTC

Size: 7.56 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/pcvs/ports/net/mDNSResponder/Makefile,v
>retrieving revision 1.5
>diff -u -r1.5 Makefile
>--- Makefile	16 Apr 2004 02:15:01 -0000	1.5
>+++ Makefile	14 Feb 2005 14:48:42 -0000
>@@ -7,9 +7,8 @@
> #
> 
> PORTNAME=	mDNSResponder
>-PORTVERSION=	62
>-PORTREVISION=	1
>-CATEGORIES=	net
>+PORTVERSION=	98
>+CATEGORIES=	net dns
> MASTER_SITES=	http://darwinsource.opendarwin.org/tarballs/apsl/
> DISTNAME=	${PORTNAME}-${PORTVERSION}
> 
>@@ -19,17 +18,33 @@
> INSTALLS_SHLIB=	YES
> 
> USE_GMAKE=	YES
>-MAKE_ARGS+=	os=freebsd
>+USE_REINPLACE=	YES
>+MAKE_ARGS+=	os=freebsd LOCALBASE=${PREFIX} MANPATH=${MANPREFIX}/man
> BUILD_WRKSRC=	${WRKSRC}/mDNSPosix
> INSTALL_WRKSRC=	${WRKSRC}/mDNSPosix
>-EXTRA_PROGS=	mDNSClientPosix \
>+EXTRA_PROGS_BIN=mDNSClientPosix \
> 		mDNSIdentify \
> 		mDNSNetMonitor \
> 		mDNSProxyResponderPosix \
> 		mDNSResponderPosix
>+EXTRA_PROGS_SBIN=dnsextd
>+
>+EXTRAMAN8=	dnsextd.8 mDNSResponder.8
>+
>+MAN8=		mdnsd.8 ${EXTRAMAN8}
>+
>+pre-build:
>+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
>+		${WRKSRC}/mDNSPosix/Makefile
> 
> post-install:
> 	cd ${INSTALL_WRKSRC}/build/prod && \
>-	    ${INSTALL_PROGRAM} ${EXTRA_PROGS} ${PREFIX}/bin
>+		${INSTALL_PROGRAM} ${EXTRA_PROGS_BIN} ${PREFIX}/bin && \
>+		${INSTALL_PROGRAM} ${EXTRA_PROGS_SBIN} ${PREFIX}/sbin
>+.	for section in 1 2 3 4 5 6 7 8
>+.		for page in ${EXTRAMAN${section}}
>+			${INSTALL_MAN} ${WRKSRC}/mDNSShared/${page} ${MAN${section}PREFIX}/man/man${page:E}/
>+.		endfor
>+.	endfor
> 
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>RCS file: /home/pcvs/ports/net/mDNSResponder/distinfo,v
>retrieving revision 1.1
>diff -u -r1.1 distinfo
>--- distinfo	3 Mar 2004 02:31:35 -0000	1.1
>+++ distinfo	14 Feb 2005 14:48:42 -0000
>@@ -1,2 +1,2 @@
>-MD5 (mDNSResponder-62.tar.gz) = 345da920880bcc028eacf4d11d96cc61
>-SIZE (mDNSResponder-62.tar.gz) = 767255
>+MD5 (mDNSResponder-98.tar.gz) = 26ddb6f2ed2c451704d26e80da5fdcb9
>+SIZE (mDNSResponder-98.tar.gz) = 1369226
>Index: pkg-plist
>===================================================================
>RCS file: /home/pcvs/ports/net/mDNSResponder/pkg-plist,v
>retrieving revision 1.3
>diff -u -r1.3 pkg-plist
>--- pkg-plist	17 Apr 2004 00:01:54 -0000	1.3
>+++ pkg-plist	14 Feb 2005 14:48:42 -0000
>@@ -5,6 +5,7 @@
> bin/mDNSResponderPosix
> etc/rc.d/mdns.sh
> include/dns_sd.h
>-lib/libmdns.so
>-lib/libmdns.so.1
>+lib/libdns_sd.so
>+lib/libdns_sd.so.1
>+sbin/dnsextd
> sbin/mdnsd
>Index: files/patch-mDNSCore::mDNSClientAPI.h
>===================================================================
>RCS file: files/patch-mDNSCore::mDNSClientAPI.h
>diff -N files/patch-mDNSCore::mDNSClientAPI.h
>--- files/patch-mDNSCore::mDNSClientAPI.h	19 Mar 2004 23:44:07 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,16 +0,0 @@
>---- 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;
>Index: files/patch-mDNSPosix::Makefile
>===================================================================
>RCS file: files/patch-mDNSPosix::Makefile
>diff -N files/patch-mDNSPosix::Makefile
>--- files/patch-mDNSPosix::Makefile	3 Mar 2004 02:31:36 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,78 +0,0 @@
>---- mDNSPosix/Makefile.old	Wed Mar  3 01:39:05 2004
>-+++ mDNSPosix/Makefile	Wed Mar  3 01:54:39 2004
>-@@ -137,6 +137,7 @@
>- STRIP = strip -S 
>- endif
>- 
>-+INSTBASE=/usr
>- # Configure per-OS peculiarities
>- ifeq ($(os),solaris)
>- CFLAGS_OS = -DNOT_HAVE_DAEMON -DNOT_HAVE_SA_LEN -D_XPG4_2 -D__EXTENSIONS__ -DHAVE_BROKEN_RECVIF_NAME -lsocket -lnsl
>-@@ -149,6 +150,11 @@
>- LDCONFIG = ldconfig
>- else
>- ifeq ($(os),freebsd)
>-+ifndef LOCALBASE
>-+LOCALBASE=/usr/local
>-+endif
>-+INSTSCRIPT=mdns.sh
>-+INSTBASE=$(LOCALBASE)
>- CFLAGS_OS =
>- LDCONFIG = ldconfig
>- else
>-@@ -177,6 +183,7 @@
>- endif
>- endif
>- endif
>-+INSTSCRIPT?=mdns
>- 
>- ifeq ($(HAVE_IPV6),1)
>- CFLAGS_OS += -DHAVE_IPV6=1
>-@@ -197,7 +204,7 @@
>- RUNLEVELSCRIPTSDIR = /etc
>- else
>- # else install into /etc/rc.d/ (*BSD)
>--STARTUPSCRIPTDIR = /etc/rc.d
>-+STARTUPSCRIPTDIR = $(INSTBASE)/etc/rc.d
>- endif
>- endif
>- 
>-@@ -246,30 +253,30 @@
>- #############################################################################
>- 
>- # The Install targets place built stuff in their proper places
>--InstalledDaemon: /usr/sbin/mdnsd
>-+InstalledDaemon: $(INSTBASE)/sbin/mdnsd
>- 	@echo $< " installed"
>- 
>--InstalledLib: /usr/lib/libmdns.$(LDSUFFIX).$(LIBVERS) /usr/include/dns_sd.h
>-+InstalledLib: $(INSTBASE)/lib/libmdns.$(LDSUFFIX).$(LIBVERS) $(INSTBASE)/include/dns_sd.h
>- 	@echo $< " installed"
>- 
>--InstalledStartup: $(STARTUPSCRIPTDIR)/mdns
>-+InstalledStartup: $(STARTUPSCRIPTDIR)/$(INSTSCRIPT)
>- 	@echo $< " installed"
>- 
>--/usr/sbin/mdnsd: $(BUILDDIR)/mdnsd
>-+$(INSTBASE)/sbin/mdnsd: $(BUILDDIR)/mdnsd
>- 	$(CP) $< $@
>- 
>--/usr/lib/libmdns.$(LDSUFFIX).$(LIBVERS): $(BUILDDIR)/libmdns.$(LDSUFFIX)
>-+$(INSTBASE)/lib/libmdns.$(LDSUFFIX).$(LIBVERS): $(BUILDDIR)/libmdns.$(LDSUFFIX)
>- 	$(CP) $< $@
>--	$(LN) $@ /usr/lib/libmdns.$(LDSUFFIX)
>-+	$(LN) $@ $(INSTBASE)/lib/libmdns.$(LDSUFFIX)
>- ifdef LDCONFIG
>-     # -m means 'merge into existing database', -R means 'rescan directories'
>- 	$(LDCONFIG) -mR
>- endif
>- 
>--/usr/include/dns_sd.h: $(SHAREDDIR)/dns_sd.h
>-+$(INSTBASE)/include/dns_sd.h: $(SHAREDDIR)/dns_sd.h
>- 	$(CP) $< $@
>- 
>--$(STARTUPSCRIPTDIR)/mdns: mdnsd.sh $(STARTUPSCRIPTDIR)
>-+$(STARTUPSCRIPTDIR)/$(INSTSCRIPT): mdnsd.sh $(STARTUPSCRIPTDIR)
>- 	$(CP) $< $@
>- 	chmod ugo+x $@
>- ifdef RUNLEVELSCRIPTSDIR
>Index: files/patch-mDNSPosix::mDNSUNP.h
>===================================================================
>RCS file: files/patch-mDNSPosix::mDNSUNP.h
>diff -N files/patch-mDNSPosix::mDNSUNP.h
>--- files/patch-mDNSPosix::mDNSUNP.h	19 Mar 2004 23:44:07 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,14 +0,0 @@
>---- 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 <stdint.h>
>-+#elif !defined(__FreeBSD__)
>-+#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: /home/pcvs/ports/net/mDNSResponder/files/patch-mDNSShared::dns_sd.h,v
>retrieving revision 1.1
>diff -u -r1.1 patch-mDNSShared::dns_sd.h
>--- files/patch-mDNSShared::dns_sd.h	19 Mar 2004 23:44:07 -0000	1.1
>+++ files/patch-mDNSShared::dns_sd.h	14 Feb 2005 14:48:42 -0000
>@@ -1,14 +1,10 @@
>---- 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 @@
>+--- mDNSShared/dns_sd.h.orig	Sat Dec 18 04:14:23 2004
>++++ mDNSShared/dns_sd.h	Mon Feb 14 13:52:41 2005
>+@@ -39,6 +39,7 @@
>+ #define DNSSD_API
>+ #endif
>  
>++#include <osreldate.h>
>+ #if defined(__FreeBSD_version) && (__FreeBSD_version < 500000)
>+ /* stdint.h does not exist on FreeBSD 4.x; its types are defined in sys/types.h instead */
>  #include <sys/types.h>
>- #include <sys/socket.h>
>-+#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
>- #include <stdint.h>
>-+#elif !defined(__FreeBSD__)
>-+#include <stdint.h>
>-+#endif
>- #include <netinet/in.h>
>- 
>-

Actions: View | Diff

Attachments on bug 77514: 50948