From 21c2fea2e08d00014878b3d7e27b9b817a7c6190 Mon Sep 17 00:00:00 2001 From: sthen Date: Tue, 13 Jan 2026 09:28:02 +0000 Subject: [PATCH] update to openmdns-0.9, from Christoph Liebender, small tweak by me maintainer timeout --- net/openmdns/Makefile | 24 ++++++++++++------- net/openmdns/distinfo | 4 ++-- ...-mdnsctl_mdnsl_c => patch-libmdns_mdnsl_c} | 8 ++++--- net/openmdns/patches/patch-mdnsctl_Makefile | 17 +++++++++++++ net/openmdns/patches/patch-mdnsd_Makefile | 17 +++++++++++++ net/openmdns/patches/patch-mdnsd_mdnsd_c | 8 +++---- net/openmdns/patches/patch-mdnsd_mdnsd_h | 2 +- net/openmdns/pkg/PLIST | 3 +++ 8 files changed, 64 insertions(+), 19 deletions(-) rename net/openmdns/patches/{patch-mdnsctl_mdnsl_c => patch-libmdns_mdnsl_c} (89%) create mode 100644 net/openmdns/patches/patch-mdnsctl_Makefile create mode 100644 net/openmdns/patches/patch-mdnsd_Makefile diff --git a/net/openmdns/Makefile b/net/openmdns/Makefile index 8f519886c76..ca8d876bf2a 100644 --- a/net/openmdns/Makefile +++ b/net/openmdns/Makefile @@ -1,26 +1,32 @@ COMMENT = MDNS/DNS-SD daemon -DISTNAME = openmdns-0.7 +GH_ACCOUNT = haesbaert +GH_PROJECT = mdnsd +GH_TAGNAME = 0.9 +PKGNAME = openmdns-${GH_TAGNAME} + +SHARED_LIBS += mdns 0.0 # 0.1 + CATEGORIES = net -REVISION = 3 MAINTAINER = Gonzalo L. R. -HOMEPAGE = http://www.haesbaert.org/openmdns/ +HOMEPAGE = https://www.haesbaert.org/openmdns/ # ISC PERMIT_PACKAGE = Yes -SITES = http://www.haesbaert.org/openmdns/releases/ \ - http://x61.com.ar/mirrors/openmdns/ - WANTLIB += c event util -WRKDIST = ${WRKDIR}/mdnsd - MAKE_FLAGS = BINDIR="${TRUEPREFIX}/bin" \ - MANDIR="${TRUEPREFIX}/man/man" + MANDIR="${TRUEPREFIX}/man/man" \ + LIBDIR="${TRUEPREFIX}/lib" NO_TEST = Yes +pre-configure: + printf 'major=%d\nminor=%d' \ + ${LIBmdns_VERSION:R} ${LIBmdns_VERSION:E} \ + > ${WRKDIST}/libmdns/shlib_version + .include diff --git a/net/openmdns/distinfo b/net/openmdns/distinfo index 8be676c9b7c..2965e741ba2 100644 --- a/net/openmdns/distinfo +++ b/net/openmdns/distinfo @@ -1,2 +1,2 @@ -SHA256 (openmdns-0.7.tar.gz) = 6Qmw5yOWv8XagyWPRSKqebRA9wabCbf9vqL6ZT7Mfuo= -SIZE (openmdns-0.7.tar.gz) = 49299 +SHA256 (mdnsd-0.9.tar.gz) = cOBoUS/JJkijoQ6UhlMng5beq7Kl+wTiFbd9GsZPBUU= +SIZE (mdnsd-0.9.tar.gz) = 2946500 diff --git a/net/openmdns/patches/patch-mdnsctl_mdnsl_c b/net/openmdns/patches/patch-libmdns_mdnsl_c similarity index 89% rename from net/openmdns/patches/patch-mdnsctl_mdnsl_c rename to net/openmdns/patches/patch-libmdns_mdnsl_c index 3994eca5834..78f9ca156b8 100644 --- a/net/openmdns/patches/patch-mdnsctl_mdnsl_c +++ b/net/openmdns/patches/patch-libmdns_mdnsl_c @@ -1,6 +1,8 @@ -Index: mdnsctl/mdnsl.c ---- mdnsctl/mdnsl.c.orig -+++ mdnsctl/mdnsl.c +Fix imsg API usage. + +Index: libmdns/mdnsl.c +--- libmdns/mdnsl.c.orig ++++ libmdns/mdnsl.c @@ -59,7 +59,8 @@ mdns_open(struct mdns *m) bzero(m, sizeof(*m)); if ((sockfd = mdns_connect()) == -1) diff --git a/net/openmdns/patches/patch-mdnsctl_Makefile b/net/openmdns/patches/patch-mdnsctl_Makefile new file mode 100644 index 00000000000..706e74ee799 --- /dev/null +++ b/net/openmdns/patches/patch-mdnsctl_Makefile @@ -0,0 +1,17 @@ +Fix build by not outputting to obj directory. + +Index: mdnsctl/Makefile +--- mdnsctl/Makefile.orig ++++ mdnsctl/Makefile +@@ -12,11 +12,7 @@ CFLAGS+= -Wshadow -Wpointer-arith -Wcast-qual + CFLAGS+= -Wsign-compare + CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../mdnsd + +-.if exists(${.CURDIR}/../libmdns/${__objdir}) +-LDADD+= -L${.CURDIR}/../libmdns/${__objdir} -lmdns +-.else + LDADD+= -L${.CURDIR}/../libmdns -lmdns +-.endif + LDADD+= -lutil + DPADD+= ${LIBUTIL} + diff --git a/net/openmdns/patches/patch-mdnsd_Makefile b/net/openmdns/patches/patch-mdnsd_Makefile new file mode 100644 index 00000000000..61e229a0290 --- /dev/null +++ b/net/openmdns/patches/patch-mdnsd_Makefile @@ -0,0 +1,17 @@ +Fix build by not outputting to obj directory. + +Index: mdnsd/Makefile +--- mdnsd/Makefile.orig ++++ mdnsd/Makefile +@@ -14,11 +14,7 @@ CFLAGS+= -Wmissing-declarations + CFLAGS+= -Wshadow -Wpointer-arith -Wcast-qual + CFLAGS+= -Wsign-compare + +-.if exists(${.CURDIR}/../libmdns/${__objdir}) +-LDADD+= -L${.CURDIR}/../libmdns/${__objdir} -lmdns +-.else + LDADD+= -L${.CURDIR}/../libmdns -lmdns +-.endif + LDADD+= -levent -lutil + DPADD+= ${LIBEVENT} ${LIBUTIL} + diff --git a/net/openmdns/patches/patch-mdnsd_mdnsd_c b/net/openmdns/patches/patch-mdnsd_mdnsd_c index 33da19cbc92..f974f609abc 100644 --- a/net/openmdns/patches/patch-mdnsd_mdnsd_c +++ b/net/openmdns/patches/patch-mdnsd_mdnsd_c @@ -4,16 +4,16 @@ https://svnweb.freebsd.org/ports?view=revision&revision=549579 Index: mdnsd/mdnsd.c --- mdnsd/mdnsd.c.orig +++ mdnsd/mdnsd.c -@@ -45,6 +45,8 @@ int mdns_sock(void); - void fetchmyname(char [MAXHOSTNAMELEN]); - void fetchhinfo(struct hinfo *); +@@ -51,6 +51,8 @@ void fetchmyname(char [MAXHOSTNAMELEN]); + void fetchhinfo(struct hinfo *); + struct reflect_rule *parse_reflect_rule(char *); +ctl_conns_t ctl_conns; + struct mdnsd_conf *conf = NULL; extern char *malloc_options; -@@ -361,12 +363,12 @@ void +@@ -455,12 +457,12 @@ void imsg_event_add(struct imsgev *iev) { if (iev->handler == NULL) { diff --git a/net/openmdns/patches/patch-mdnsd_mdnsd_h b/net/openmdns/patches/patch-mdnsd_mdnsd_h index 33a8cb46935..7a859495614 100644 --- a/net/openmdns/patches/patch-mdnsd_mdnsd_h +++ b/net/openmdns/patches/patch-mdnsd_mdnsd_h @@ -18,7 +18,7 @@ Index: mdnsd/mdnsd.h struct kif { char ifname[IF_NAMESIZE]; -@@ -397,7 +399,8 @@ int rr_send_an(struct rr *); +@@ -425,7 +427,8 @@ int rr_send_an(struct rr *); void conflict_resolve_by_rr(struct rr *); /* control.c */ diff --git a/net/openmdns/pkg/PLIST b/net/openmdns/pkg/PLIST index bb8a2e7307c..eaa62e03611 100644 --- a/net/openmdns/pkg/PLIST +++ b/net/openmdns/pkg/PLIST @@ -3,6 +3,9 @@ @rcscript ${RCDIR}/mdnsd @bin bin/mdnsctl @bin bin/mdnsd +@comment lib/libmdns.a +@lib lib/libmdns.so.${LIBmdns_VERSION} +@comment lib/libmdns_p.a @man man/man8/mdnsctl.8 @man man/man8/mdnsd.8 share/doc/pkg-readmes/${PKGSTEM}