Attachment 243000 Details for Bug 256955 – unified net/mDNSResponder and dns/mDNSResponder_nss master/slave convertion v3

[patch] unified net/mDNSResponder and dns/mDNSResponder_nss master/slave convertion v3

slave.diff (text/plain), 3.24 KB, created by Matthieu Volat on 2023-06-26 05:25:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthieu Volat

Created: 2023-06-26 05:25:04 UTC

Size: 3.24 KB

patch

obsolete

>diff --git a/dns/mDNSResponder_nss/Makefile b/dns/mDNSResponder_nss/Makefile
>index 4db810662aa9..5f01897f96df 100644
>--- a/dns/mDNSResponder_nss/Makefile
>+++ b/dns/mDNSResponder_nss/Makefile
>@@ -1,38 +1,30 @@
>-PORTNAME=	mDNSResponder
>-PORTVERSION=	1310.40.42
> CATEGORIES=	dns net
>-MASTER_SITES=	http://opensource.apple.com/tarballs/mDNSResponder/
>+MASTERDIR=	${.CURDIR}/../../net/mDNSResponder
> PKGNAMESUFFIX=	_nss
> 
> MAINTAINER=	mazhe@alkumuna.eu
> COMMENT=	Apple mDNS responder - FreeBSD nsswitch module
> WWW=		https://opensource.apple.com/tarballs/mDNSResponder/
> 
>-LICENSE=	APACHE20 BSD3CLAUSE
>-LICENSE_COMB=	dual
>-
> LIB_DEPENDS=	libdns_sd.so:net/mDNSResponder
> 
>-USES=		cpe
>-
>-CPE_VENDOR=	apple
>-
> CONFLICTS_INSTALL=	nss_mdns
> 
>-WRKSRC=		${WRKDIR}/${PORTNAME:S/_nss//}-${PORTVERSION}
>-
>-.include <bsd.port.pre.mk>
>+EXTRA_PATCHES=	${.CURDIR}/files/patch-mDNSPosix__nss_mdns.c
>+PLIST=		${.CURDIR}/pkg-plist
>+PKGMESSAGE=	${.CURDIR}/pkg-message
> 
>-LD=${CC}
>+# Disable some master port targets
>+TARGET_ORDER_OVERRIDE=	-1:post-install -1:install-rc-script
> 
> post-extract:
>-	@${CP} ${FILESDIR}/nss_mdns_freebsd.c ${WRKSRC}/mDNSPosix
>+	@${CP} ${.CURDIR}/files/nss_mdns_freebsd.c ${WRKSRC}/mDNSPosix
> 
> do-build:
> 	(cd ${WRKSRC}/mDNSPosix && ${CC} ${CFLAGS} -c -std=c99 -Wall -fPIC \
> 		-I. -I${PREFIX}/include -DPREFIX=\"${PREFIX}\" \
> 		nss_mdns.c nss_mdns_freebsd.c)
>-	(cd ${WRKSRC}/mDNSPosix && ${LD} -shared -Wl,-soname=nss_mdns.so.1 nss_mdns.o nss_mdns_freebsd.o \
>+	(cd ${WRKSRC}/mDNSPosix && ${CC} -shared -Wl,-soname=nss_mdns.so.1 nss_mdns.o nss_mdns_freebsd.o \
> 		-o nss_mdns.so.1 -L${PREFIX}/lib -R${PREFIX}/lib -ldns_sd)
> 
> post-build:
>@@ -52,4 +44,4 @@ do-install:
> 	${INSTALL_DATA} ${WRKSRC}/mDNSPosix/nss_mdns.conf \
> 		${STAGEDIR}${PREFIX}/etc/nss_mdns.conf.sample
> 
>-.include <bsd.port.post.mk>
>+.include "${MASTERDIR}/Makefile"
>diff --git a/dns/mDNSResponder_nss/distinfo b/dns/mDNSResponder_nss/distinfo
>deleted file mode 100644
>index ec649a959f84..000000000000
>--- a/dns/mDNSResponder_nss/distinfo
>+++ /dev/null
>@@ -1,3 +0,0 @@
>-TIMESTAMP = 1612128021
>-SHA256 (mDNSResponder-1310.40.42.tar.gz) = bea29e1616cd56ccb8f88c0fad2bcdc4031f4deb2d899c793e2f27a8384f0b34
>-SIZE (mDNSResponder-1310.40.42.tar.gz) = 2626867
>diff --git a/net/mDNSResponder/Makefile b/net/mDNSResponder/Makefile
>index a22cc563e361..cd8bb5213ebd 100644
>--- a/net/mDNSResponder/Makefile
>+++ b/net/mDNSResponder/Makefile
>@@ -1,12 +1,12 @@
> PORTNAME=	mDNSResponder
>-PORTVERSION=	1790.80.10
>-PORTREVISION=	1
>-CATEGORIES=	net dns
>+PORTVERSION=	1790.80.10	# Reset PORTREVISION on slave port (dns/mDNSResponder_nss) after upgrade
>+PORTREVISION?=	1
>+CATEGORIES?=	net dns
> MASTER_SITES=	https://opensource.apple.com/tarballs/mDNSResponder/
> 
>-MAINTAINER=	sunpoet@FreeBSD.org
>-COMMENT=	Bonjour (zero-configuration networking) by Apple
>-WWW=		https://developer.apple.com/bonjour/ \
>+MAINTAINER?=	sunpoet@FreeBSD.org
>+COMMENT?=	Bonjour (zero-configuration networking) by Apple
>+WWW?=		https://developer.apple.com/bonjour/ \
> 		https://github.com/apple-oss-distributions/mDNSResponder
> 
> LICENSE=	APACHE20 BSD3CLAUSE
>@@ -31,7 +31,7 @@ EXTRA_MAN8=	dnsextd.8 mDNSResponderPosix.8
> EXTRA_SBIN=	dnsextd
> 
> # lib/libdns_sd.so.1 sbin/mdnsd
>-CONFLICTS_INSTALL=	avahi-libdns openmdns
>+CONFLICTS_INSTALL?=	avahi-libdns openmdns
> 
> OPTIONS_DEFINE=	IPV6
>

Actions: View | Diff

Attachments on bug 256955: 226191 | 239942 | 242567 | 242572 | 242576 | 242973 | 242974 | 242983 | 243000