CVS commit: pkgsrc/net/mDNSResponder

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Mon Nov 25 21:33:23 UTC 2024

Modified Files:
        pkgsrc/net/mDNSResponder: Makefile distinfo
Added Files:
        pkgsrc/net/mDNSResponder/patches: patch-Clients_Makefile

Log Message:
mDNSResponder: try to fix fallout


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 pkgsrc/net/mDNSResponder/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/net/mDNSResponder/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/mDNSResponder/patches/patch-Clients_Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/mDNSResponder/Makefile
diff -u pkgsrc/net/mDNSResponder/Makefile:1.47 pkgsrc/net/mDNSResponder/Makefile:1.48
--- pkgsrc/net/mDNSResponder/Makefile:1.47      Mon Nov 25 12:13:00 2024
+++ pkgsrc/net/mDNSResponder/Makefile   Mon Nov 25 21:33:23 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2024/11/25 12:13:00 hauke Exp $
+# $NetBSD: Makefile,v 1.48 2024/11/25 21:33:23 tnn Exp $
 
 DISTNAME=      ${GITHUB_PROJECT}-${PKGVER}
 GITHUB_PROJECT=        mDNSResponder
@@ -23,9 +23,9 @@ WRKSRC=                       ${WRKDIR}/mDNSResponder-mDNSRe
 BUILD_DIRS=            mDNSPosix
 BUILDDIR=              ${WRKSRC}/mDNSPosix/build/prod
 
-CFLAGS+=               -Wno-missing-braces
 CFLAGS+=               -DPID_FILE=\"${VARBASE}/run/mdnsd/mdnsd.pid\"
 CFLAGS+=               -DMDNS_UDS_SERVERPATH=\"${VARBASE}/run/mdnsd/mdnsd\"
+BUILDLINK_TRANSFORM+=  rm:-Werror
 
 USE_GCC_RUNTIME=       yes
 
@@ -95,6 +95,12 @@ SUBST_MESSAGE.user=  Fixing unprivileged 
 SUBST_FILES.user=      mDNSPosix/PosixDaemon.c
 SUBST_SED.user=                -e 's,nobody,${MDNS_USER},g'
 
+SUBST_CLASSES+=                prefix
+SUBST_MESSAGE.prefix=  Setting prefix path
+SUBST_STAGE.prefix=    pre-configure
+SUBST_FILES.prefix=     Clients/Makefile
+SUBST_VARS.prefix=      PREFIX
+
 .if !empty(PKG_OPTIONS:Minet6)
 MAKE_ENV+=     HAVE_IPV6=1
 .endif
@@ -114,6 +120,11 @@ do-install:
        ${INSTALL_MAN} ${WRKSRC}/mDNSShared/mDNSResponder.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/mdnsd.8
        ${INSTALL_DATA} ${WRKSRC}/mDNSShared/dns_sd.h ${DESTDIR}${PREFIX}/include
        ${INSTALL_LIB} ${BUILDDIR}/libdns_sd.${SO_SUFFIX} ${DESTDIR}${PREFIX}/lib
+.if ${OPSYS} == "Darwin"
+       cd ${DESTDIR}${PREFIX}/lib && install_name_tool                                 \
+               -change build/prod/libdns_sd.dylib ${PREFIX}/lib/libdns_sd.dylib        \
+               -id ${PREFIX}/lib/libdns_sd.dylib libdns_sd.dylib
+.endif
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/mDNSResponder/distinfo
diff -u pkgsrc/net/mDNSResponder/distinfo:1.41 pkgsrc/net/mDNSResponder/distinfo:1.42
--- pkgsrc/net/mDNSResponder/distinfo:1.41      Mon Nov 25 09:25:42 2024
+++ pkgsrc/net/mDNSResponder/distinfo   Mon Nov 25 21:33:23 2024
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.41 2024/11/25 09:25:42 hauke Exp $
+$NetBSD: distinfo,v 1.42 2024/11/25 21:33:23 tnn Exp $
 
 BLAKE2s (mDNSResponder-2559.1.1.tar.gz) = e72fbea9df78d0cf811e1af6d08483973487210594e165b7b075f0b32f595d97
 SHA512 (mDNSResponder-2559.1.1.tar.gz) = 1112d78e3a46115ffdae4849d847a6cfe1052d6e4a6af3afa6058eb900ac7f7c8fee20874b479ff3d40af2da95a371241f2c821a193f148f844bf9efc06fcc79
 Size (mDNSResponder-2559.1.1.tar.gz) = 3362635 bytes
+SHA1 (patch-Clients_Makefile) = 5a967c6f86132ec42bff7ebf3507971d45073b65
 SHA1 (patch-mDNSPosix_Makefile) = 3e91025e5e878d0f2552d3f82839db31c67b31d7
 SHA1 (patch-mDNSPosix_mDNSPosix.c) = bfefa8d1252d0ba9afdf6506dd6686492dd1f10b
 SHA1 (patch-mDNSPosix_mDNSUNP.c) = a900ad9991aaee21fbe9094a65900b1d172c2abc

Added files:

Index: pkgsrc/net/mDNSResponder/patches/patch-Clients_Makefile
diff -u /dev/null pkgsrc/net/mDNSResponder/patches/patch-Clients_Makefile:1.1
--- /dev/null   Mon Nov 25 21:33:23 2024
+++ pkgsrc/net/mDNSResponder/patches/patch-Clients_Makefile     Mon Nov 25 21:33:23 2024
@@ -0,0 +1,23 @@
+$NetBSD: patch-Clients_Makefile,v 1.1 2024/11/25 21:33:23 tnn Exp $
+
+Fix libdns_sd linkage
+
+--- Clients/Makefile.orig      2024-11-25 21:14:43.703499765 +0000
++++ Clients/Makefile
+@@ -37,12 +37,13 @@ DEBUGFLAGS = -Os
+ BUILDDIR = build/prod
+ endif
+ 
+-ifneq "$(wildcard /usr/lib/libSystem.dylib)" ""
+-TARGETS = build/dns-sd build/dns-sd64
++SYSTEM := $(shell uname -s)
++ifeq ($(SYSTEM), Darwin)
++TARGETS = build/dns-sd
+ LIBS =
+ else
+ TARGETS = build/dns-sd
+-LIBS = -L../mDNSPosix/$(BUILDDIR)/ -ldns_sd
++LIBS = -Wl,-R@PREFIX@/lib -L../mDNSPosix/$(BUILDDIR)/ -ldns_sd
+ endif
+ 
+ all: $(TARGETS)