Attachment #50948 for bug #77514

View | Details | Raw Unified | Return to bug 77514
Collapse All | Expand All




#

PORTNAME=	mDNSResponder
PORTVERSION=	98
CATEGORIES=	net dns
CATEGORIES=	net
MASTER_SITES=	http://darwinsource.opendarwin.org/tarballs/apsl/
DISTNAME=	${PORTNAME}-${PORTVERSION}


INSTALLS_SHLIB=	YES

USE_GMAKE=	YES
USE_REINPLACE=	YES
MAKE_ARGS+=	os=freebsd LOCALBASE=${PREFIX} MANPATH=${MANPREFIX}/man
BUILD_WRKSRC=	${WRKSRC}/mDNSPosix
INSTALL_WRKSRC=	${WRKSRC}/mDNSPosix
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_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>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	MD5 (mDNSResponder-62.tar.gz) = 345da920880bcc028eacf4d11d96cc61	1	MD5 (mDNSResponder-98.tar.gz) = 26ddb6f2ed2c451704d26e80da5fdcb9
2	SIZE (mDNSResponder-62.tar.gz) = 767255	2	SIZE (mDNSResponder-98.tar.gz) = 1369226

Lines 5-10 Link Here

(-)pkg-plist (-2 / +3 lines)
5	bin/mDNSResponderPosix	5	bin/mDNSResponderPosix
6	etc/rc.d/mdns.sh	6	etc/rc.d/mdns.sh
7	include/dns_sd.h	7	include/dns_sd.h
8	lib/libmdns.so	8	lib/libdns_sd.so
9	lib/libmdns.so.1	9	lib/libdns_sd.so.1
		10	sbin/dnsextd
10	sbin/mdnsd	11	sbin/mdnsd




--- 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;




--- 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




--- 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>

Lines 1-14 Link Here

(-)files/patch-mDNSShared::dns_sd.h (-12 / +8 lines)
1	--- mDNSShared/dns_sd.h.old Fri Mar 19 15:38:48 2004	1	--- mDNSShared/dns_sd.h.orig Sat Dec 18 04:14:23 2004
2	+++ mDNSShared/dns_sd.h Fri Mar 19 15:38:58 2004	2	+++ mDNSShared/dns_sd.h Mon Feb 14 13:52:41 2005
3	@@ -46,7 +46,11 @@	3	@@ -39,6 +39,7 @@
		4	#define DNSSD_API
		5	#endif
4		6
		7	+#include <osreldate.h>
		8	#if defined(__FreeBSD_version) && (__FreeBSD_version < 500000)
		9	/* stdint.h does not exist on FreeBSD 4.x; its types are defined in sys/types.h instead */
5	#include <sys/types.h>	10	#include <sys/types.h>
6	#include <sys/socket.h>
7	+#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
8	#include <stdint.h>
9	+#elif !defined(__FreeBSD__)
10	+#include <stdint.h>
11	+#endif
12	#include <netinet/in.h>
13
14

Return to bug 77514

Lines 7-15 Link Here

(-)Makefile (-6 / +21 lines)
7	#	7	#
8		8
9	PORTNAME= mDNSResponder	9	PORTNAME= mDNSResponder
10	PORTVERSION= 62	10	PORTVERSION= 98
11	PORTREVISION= 1	11	CATEGORIES= net dns
12	CATEGORIES= net
13	MASTER_SITES= http://darwinsource.opendarwin.org/tarballs/apsl/	12	MASTER_SITES= http://darwinsource.opendarwin.org/tarballs/apsl/
14	DISTNAME= ${PORTNAME}-${PORTVERSION}	13	DISTNAME= ${PORTNAME}-${PORTVERSION}
15		14
Lines 19-35 Link Here
19	INSTALLS_SHLIB= YES	18	INSTALLS_SHLIB= YES
20		19
21	USE_GMAKE= YES	20	USE_GMAKE= YES
22	MAKE_ARGS+= os=freebsd	21	USE_REINPLACE= YES
		22	MAKE_ARGS+= os=freebsd LOCALBASE=${PREFIX} MANPATH=${MANPREFIX}/man
23	BUILD_WRKSRC= ${WRKSRC}/mDNSPosix	23	BUILD_WRKSRC= ${WRKSRC}/mDNSPosix
24	INSTALL_WRKSRC= ${WRKSRC}/mDNSPosix	24	INSTALL_WRKSRC= ${WRKSRC}/mDNSPosix
25	EXTRA_PROGS= mDNSClientPosix \	25	EXTRA_PROGS_BIN=mDNSClientPosix \
26	mDNSIdentify \	26	mDNSIdentify \
27	mDNSNetMonitor \	27	mDNSNetMonitor \
28	mDNSProxyResponderPosix \	28	mDNSProxyResponderPosix \
29	mDNSResponderPosix	29	mDNSResponderPosix
		30	EXTRA_PROGS_SBIN=dnsextd
		31
		32	EXTRAMAN8= dnsextd.8 mDNSResponder.8
		33
		34	MAN8= mdnsd.8 ${EXTRAMAN8}
		35
		36	pre-build:
		37	@${REINPLACE_CMD} -e 's\|-lpthread\|${PTHREAD_LIBS}\|g' \
		38	${WRKSRC}/mDNSPosix/Makefile
30		39
31	post-install:	40	post-install:
32	cd ${INSTALL_WRKSRC}/build/prod && \	41	cd ${INSTALL_WRKSRC}/build/prod && \
33	${INSTALL_PROGRAM} ${EXTRA_PROGS} ${PREFIX}/bin	42	${INSTALL_PROGRAM} ${EXTRA_PROGS_BIN} ${PREFIX}/bin && \
		43	${INSTALL_PROGRAM} ${EXTRA_PROGS_SBIN} ${PREFIX}/sbin
		44	. for section in 1 2 3 4 5 6 7 8
		45	. for page in ${EXTRAMAN${section}}
		46	${INSTALL_MAN} ${WRKSRC}/mDNSShared/${page} ${MAN${section}PREFIX}/man/man${page:E}/
		47	. endfor
		48	. endfor
34		49
35	.include <bsd.port.mk>	50	.include <bsd.port.mk>

Removed Link Here

(-)files/patch-mDNSCore::mDNSClientAPI.h (-16 lines)
1	--- mDNSCore/mDNSClientAPI.h.old Tue Mar 2 15:01:04 2004
2	+++ mDNSCore/mDNSClientAPI.h Fri Mar 19 15:26:43 2004
3	@@ -618,9 +618,12 @@
4	typedef unsigned char mDNSu8;
5	typedef signed short mDNSs16;
6	typedef unsigned short mDNSu16;
7	-#if _LP64
8	+#if defined(_LP64) \|\| defined(__LP64__)
9	typedef signed int mDNSs32;
10	typedef unsigned int mDNSu32;
11	+#elif defined(_ILP64) \|\| defined(__ILP64__)
12	+typedef signed int32 mDNSs32;
13	+typedef unsigned int32 mDNSu32;
14	#else
15	typedef signed long mDNSs32;
16	typedef unsigned long mDNSu32;

Removed Link Here

(-)files/patch-mDNSPosix::Makefile (-78 lines)
1	--- mDNSPosix/Makefile.old Wed Mar 3 01:39:05 2004
2	+++ mDNSPosix/Makefile Wed Mar 3 01:54:39 2004
3	@@ -137,6 +137,7 @@
4	STRIP = strip -S
5	endif
6
7	+INSTBASE=/usr
8	# Configure per-OS peculiarities
9	ifeq ($(os),solaris)
10	CFLAGS_OS = -DNOT_HAVE_DAEMON -DNOT_HAVE_SA_LEN -D_XPG4_2 -D__EXTENSIONS__ -DHAVE_BROKEN_RECVIF_NAME -lsocket -lnsl
11	@@ -149,6 +150,11 @@
12	LDCONFIG = ldconfig
13	else
14	ifeq ($(os),freebsd)
15	+ifndef LOCALBASE
16	+LOCALBASE=/usr/local
17	+endif
18	+INSTSCRIPT=mdns.sh
19	+INSTBASE=$(LOCALBASE)
20	CFLAGS_OS =
21	LDCONFIG = ldconfig
22	else
23	@@ -177,6 +183,7 @@
24	endif
25	endif
26	endif
27	+INSTSCRIPT?=mdns
28
29	ifeq ($(HAVE_IPV6),1)
30	CFLAGS_OS += -DHAVE_IPV6=1
31	@@ -197,7 +204,7 @@
32	RUNLEVELSCRIPTSDIR = /etc
33	else
34	# else install into /etc/rc.d/ (*BSD)
35	-STARTUPSCRIPTDIR = /etc/rc.d
36	+STARTUPSCRIPTDIR = $(INSTBASE)/etc/rc.d
37	endif
38	endif
39
40	@@ -246,30 +253,30 @@
41	#############################################################################
42
43	# The Install targets place built stuff in their proper places
44	-InstalledDaemon: /usr/sbin/mdnsd
45	+InstalledDaemon: $(INSTBASE)/sbin/mdnsd
46	@echo $< " installed"
47
48	-InstalledLib: /usr/lib/libmdns.$(LDSUFFIX).$(LIBVERS) /usr/include/dns_sd.h
49	+InstalledLib: $(INSTBASE)/lib/libmdns.$(LDSUFFIX).$(LIBVERS) $(INSTBASE)/include/dns_sd.h
50	@echo $< " installed"
51
52	-InstalledStartup: $(STARTUPSCRIPTDIR)/mdns
53	+InstalledStartup: $(STARTUPSCRIPTDIR)/$(INSTSCRIPT)
54	@echo $< " installed"
55
56	-/usr/sbin/mdnsd: $(BUILDDIR)/mdnsd
57	+$(INSTBASE)/sbin/mdnsd: $(BUILDDIR)/mdnsd
58	$(CP) $< $@
59
60	-/usr/lib/libmdns.$(LDSUFFIX).$(LIBVERS): $(BUILDDIR)/libmdns.$(LDSUFFIX)
61	+$(INSTBASE)/lib/libmdns.$(LDSUFFIX).$(LIBVERS): $(BUILDDIR)/libmdns.$(LDSUFFIX)
62	$(CP) $< $@
63	- $(LN) $@ /usr/lib/libmdns.$(LDSUFFIX)
64	+ $(LN) $@ $(INSTBASE)/lib/libmdns.$(LDSUFFIX)
65	ifdef LDCONFIG
66	# -m means 'merge into existing database', -R means 'rescan directories'
67	$(LDCONFIG) -mR
68	endif
69
70	-/usr/include/dns_sd.h: $(SHAREDDIR)/dns_sd.h
71	+$(INSTBASE)/include/dns_sd.h: $(SHAREDDIR)/dns_sd.h
72	$(CP) $< $@
73
74	-$(STARTUPSCRIPTDIR)/mdns: mdnsd.sh $(STARTUPSCRIPTDIR)
75	+$(STARTUPSCRIPTDIR)/$(INSTSCRIPT): mdnsd.sh $(STARTUPSCRIPTDIR)
76	$(CP) $< $@
77	chmod ugo+x $@
78	ifdef RUNLEVELSCRIPTSDIR

Removed Link Here

(-)files/patch-mDNSPosix::mDNSUNP.h (-14 lines)
1	--- mDNSPosix/mDNSUNP.h.old Fri Mar 19 15:34:56 2004
2	+++ mDNSPosix/mDNSUNP.h Fri Mar 19 15:38:28 2004
3	@@ -67,7 +67,11 @@
4	#ifndef __mDNSUNP_h
5	#define __mDNSUNP_h
6
7	+#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
8	#include <stdint.h>
9	+#elif !defined(__FreeBSD__)
10	+#include <stdint.h>
11	+#endif
12	#include <sys/types.h>
13	#include <sys/socket.h>
14	#include <net/if.h>