From nobody Mon Jan 03 10:38:17 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 33E44192F852; Mon, 3 Jan 2022 10:38:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JSBzY6THdz4r0Q; Mon, 3 Jan 2022 10:38:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BE2B4239EB; Mon, 3 Jan 2022 10:38:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 203AcHGk098799; Mon, 3 Jan 2022 10:38:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 203AcH9q098798; Mon, 3 Jan 2022 10:38:17 GMT (envelope-from git) Date: Mon, 3 Jan 2022 10:38:17 GMT Message-Id: <202201031038.203AcH9q098798@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Stefan E=C3=9Fer?= Subject: git: 4141e008d68c - main - www/larbin: fix build on FreeBSD-13 and 14 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: se X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4141e008d68c788f6ac215d4a2299559a74dc686 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641206297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b8j8xprOuZZPXCuPjAuQI2VVuYMShnT3XVFE7p15t60=; b=rC9EN2EAxeiT4nRLcx7I4Ue+IY+1JJLTjHmxTA0dYSGVKajaquBTnKmjsrHrvZTedPbspB 3F6Cv7hi3VP7doqpebNXB7c7UgmTkDecPTT2H4vTcX06njrae12ehT2MNuqCe8E4WYuEE4 BgvV0X9UW/663nm4MHaKUws+gXFdXYINOYtIygaQW0HIB7HDvXcBQgKLDiAESrDuuWuCWi M1SoJUpGjABI8g0dPxbmYDpbIlZmX62Y/GaVk1hun8dlNljn6SuRFfoAFsJr5UCpl/rNja Xs0Saj5oT5D8Kqin9Hoooljxg1/bDCEQopliQGEceLC8PlZ8lgrmAnrnUoIGCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641206297; a=rsa-sha256; cv=none; b=sYcdNooLJwy65dleWbGeZfthDG/+VwH+mYVHAso69KNXQi5lYokXpblRAqUHJKYhDgI+xo HV3AAbPHaO3SI0qNlmOEzjnsyQ3mGOT8PAvKMOvQSaBtInsFOW2htgySwQU/HPLjhPnuVZ Z7ad0PLUkslQDVp6/jj5kr/cT2isWaVktAKZ+ie5xN8BbRJG44YVrqYu8HE6tbA5LNyxxk f2374O52vrW/yO/Et6F+a37WeJ/tieAZU/4Q4yaglOGv8l8AXBbdBPlS4tRzbqLJ//j6Th JQiiOqkxFlp/efgANtbHd32IhPX6YxyHeFwk4Pej2EKcUZDoU1hEW8FxS7+LRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by se: URL: https://cgit.FreeBSD.org/ports/commit/?id=4141e008d68c788f6ac215d4a2299559a74dc686 commit 4141e008d68c788f6ac215d4a2299559a74dc686 Author: Stefan Eßer AuthorDate: 2022-01-03 10:37:54 +0000 Commit: Stefan Eßer CommitDate: 2022-01-03 10:37:54 +0000 www/larbin: fix build on FreeBSD-13 and 14 --- www/larbin/Makefile | 5 +---- www/larbin/files/patch-adns_internal.h | 22 +++++++++++++++++++++- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/www/larbin/Makefile b/www/larbin/Makefile index 782111cbff0f..941d6ffbe1ad 100644 --- a/www/larbin/Makefile +++ b/www/larbin/Makefile @@ -2,7 +2,7 @@ PORTNAME= larbin PORTVERSION= 2.6.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www MASTER_SITES= SF @@ -12,9 +12,6 @@ COMMENT= HTTP crawler with an easy interface LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN_FreeBSD_13= ld: error: duplicate symbol: data -BROKEN_FreeBSD_14= ld: error: duplicate symbol: data - BUILD_DEPENDS= bash:shells/bash \ makedepend:devel/makedepend diff --git a/www/larbin/files/patch-adns_internal.h b/www/larbin/files/patch-adns_internal.h index 41b65d5074b4..a8d7cf8f7525 100644 --- a/www/larbin/files/patch-adns_internal.h +++ b/www/larbin/files/patch-adns_internal.h @@ -1,6 +1,26 @@ --- adns/internal.h.orig 2002-01-02 10:44:52 UTC +++ adns/internal.h -@@ -567,7 +567,7 @@ typedef enum { +@@ -151,15 +151,17 @@ typedef struct allocnode { + struct allocnode *next, *back; + } allocnode; + +-union maxalign { ++typedef union maxalign { + byte d[1]; + struct in_addr ia; + long l; + void *p; + void (*fp)(void); + union maxalign *up; +-} data; ++} data_t; + ++extern data_t data; ++ + typedef struct { + void *ext; + void (*callback)(adns_query parent, adns_query child); +@@ -567,7 +569,7 @@ typedef enum { } parsedomain_flags; adns_status adns__parse_domain(adns_state ads, int serv, adns_query qu,