From 18056e5782fdb7fcd8a0be83a3048b90ced1b6be Mon Sep 17 00:00:00 2001 From: pav Date: Thu, 11 Aug 2005 22:17:34 +0000 Subject: - Unbreak on 6.X PR: ports/84780 Submitted by: Marcus Grando Approved by: portmgr (marcus) --- sysutils/lookupd/Makefile | 5 +---- .../files/patch-modules-dns-resolv-getaddrinfo.c | 18 ++++++++++++++++++ .../files/patch-modules-dns-resolv-res_send.c | 20 ++++++++++++++++++++ 3 files changed, 39 insertions(+), 4 deletions(-) create mode 100644 sysutils/lookupd/files/patch-modules-dns-resolv-getaddrinfo.c create mode 100644 sysutils/lookupd/files/patch-modules-dns-resolv-res_send.c (limited to 'sysutils') diff --git a/sysutils/lookupd/Makefile b/sysutils/lookupd/Makefile index 33a2062436a..312fe83ab2c 100644 --- a/sysutils/lookupd/Makefile +++ b/sysutils/lookupd/Makefile @@ -17,6 +17,7 @@ USE_RC_SUBR= yes PKGMESSAGE= ${WRKDIR}/pkg-message STARTUPSCRIPT= ${WRKDIR}/lookupd.sh +MAKE_ENV= WARNS=0 MAN5= lookupd.conf.5 MAN8= lookupd.8 @@ -33,8 +34,4 @@ post-install: IGNORE= This version of lookupd is only supported on FreeBSD 5.1 or later .endif -.if ${OSVERSION} > 600021 -BROKEN= "Does not compile on FreeBSD >= 6.x" -.endif - .include diff --git a/sysutils/lookupd/files/patch-modules-dns-resolv-getaddrinfo.c b/sysutils/lookupd/files/patch-modules-dns-resolv-getaddrinfo.c new file mode 100644 index 00000000000..5dbc09dd8fc --- /dev/null +++ b/sysutils/lookupd/files/patch-modules-dns-resolv-getaddrinfo.c @@ -0,0 +1,18 @@ +--- modules/dns/resolv/getaddrinfo.c.orig Fri Jul 2 15:28:07 2004 ++++ modules/dns/resolv/getaddrinfo.c Wed Aug 10 18:07:12 2005 +@@ -339,6 +339,7 @@ + #define MATCH(x, y, w) \ + ((x) == (y) || (/*CONSTCOND*/(w) && ((x) == ANY || (y) == ANY))) + ++#if __FreeBSD_version < 501000 + char * + gai_strerror(ecode) + int ecode; +@@ -351,6 +352,7 @@ + } + return "Unknown error"; + } ++#endif + + void + freeaddrinfo(ai) diff --git a/sysutils/lookupd/files/patch-modules-dns-resolv-res_send.c b/sysutils/lookupd/files/patch-modules-dns-resolv-res_send.c new file mode 100644 index 00000000000..439505022b0 --- /dev/null +++ b/sysutils/lookupd/files/patch-modules-dns-resolv-res_send.c @@ -0,0 +1,20 @@ +--- modules/dns/resolv/res_send.c.orig Fri Jul 2 15:31:44 2004 ++++ modules/dns/resolv/res_send.c Wed Aug 10 18:09:22 2005 +@@ -201,7 +201,7 @@ + if (_res.options & RES_DEBUG) { + if (getnameinfo(address, address->sa_len, abuf, sizeof(abuf), + pbuf, sizeof(pbuf), +- NI_NUMERICHOST | NI_NUMERICSERV | NI_WITHSCOPEID) != 0) { ++ NI_NUMERICHOST | NI_NUMERICSERV ) != 0) { + strncpy(abuf, "?", sizeof(abuf)); + strncpy(pbuf, "?", sizeof(pbuf)); + } +@@ -475,7 +475,7 @@ + } + Dprint((_res.options & RES_DEBUG) && + getnameinfo(nsap, salen, abuf, sizeof(abuf), +- NULL, 0, NI_NUMERICHOST | NI_WITHSCOPEID) == 0, ++ NULL, 0, NI_NUMERICHOST ) == 0, + (stdout, ";; Querying server (# %d) address = %s\n", + ns + 1, abuf)); + -- cgit