From nobody Fri Sep 30 22:29:38 2022 X-Original-To: dev-commits-ports-all@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 4MfPzk6tQJz4d2dT; Fri, 30 Sep 2022 22:29:38 +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 4MfPzk6BKqz3jl7; Fri, 30 Sep 2022 22:29:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664576978; 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=ohf78gDojqlxYcl5v7Ca9Vho3Ty1jrNLxYHgSRCqiZI=; b=IzalD3i/RefsyRwRydTsB8vky1SlAxXmUYGnBNJ9ZztHItEQEIK9S2+vKhF1OOCZZukMjM WVzKG7NFvVgUz+AyxREXzWf13DMpmlg8kIU9lVBERUnoRXL2ErTFcGiSOoy2Ke4zn486a9 1kPRp1Qfj4ldo7Anpevsgy+CGUErLmQ0/HdCAkU4lCyx+yycsr02YcSvSEQzmsVcPMt2LK 5eU30B5J26L0a/IAZi5+YdhwQMyOfLbG/K+2yv+1tRHE35WZ9XwLaJpjA9N6AUZjVr/Vf6 J0z4sjY/y4zYXXwVG36OklF76UadNuyJ/s4gIAUUX2mLF75DYUbh6b0BcwUuFg== 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 4MfPzk5DwszKMD; Fri, 30 Sep 2022 22:29:38 +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 28UMTcG6019521; Fri, 30 Sep 2022 22:29:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28UMTc0l019520; Fri, 30 Sep 2022 22:29:38 GMT (envelope-from git) Date: Fri, 30 Sep 2022 22:29:38 GMT Message-Id: <202209302229.28UMTc0l019520@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Xin LI Subject: git: cd28784c67bf - main - textproc/raptor2: Improve sort_r(3) API detection. List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cd28784c67bfe64bd95afc8136732dba6750bf27 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664576978; 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=ohf78gDojqlxYcl5v7Ca9Vho3Ty1jrNLxYHgSRCqiZI=; b=qP62y+azxhocXSetrxP4YU2Y4h0seIY6ViGcWXPgtJcBRZfECbFfSUs9FUdUQdnDlzoAjL 7H3Ww+Y+I5mJ41uEg25l1NtohoH8K3N4T4zlstIpCudlqn5tZB3V/Qg/maSXvzNejlLmLp ISUlLb4nGcI3iMvYn8sG/Tf+Y8nvlXlOjVr8uCc4Bmy+09SygYZ5k1RBm/l99vteoS0RsF IJMPjxFyR9+NvUMuBmJ/i3qnAv8r2HjPGC4S9A5XJqubmKH33KPamDVqMA3hfJ2jftYFSk jRTyvi0Gc4o8MEB18/gwLbyyEbEwiXNZS+w2ncNeNHsIk1BHr6/WjY+m6xxVQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664576978; a=rsa-sha256; cv=none; b=oHtGDKjZtks0oUv0JXf4U/BFlXGN/T0yB4V/Jxv0xgzc9qq6DbaclnqOeLOZ4Q16aIB1qW Db9VJRqsMME3yasCChQ1PmWRyh/2YAuw4QHPJ91TqaZus0sKEUluWeNQOrA8ZxC3N5/jpy 58gSkR8RaRFMp2KkMajT1nlfK+d35ZUCMUMVkdr7baHsHCj895KzmvfAxw23fxw7OgtFG4 OXvTy5H0gfchdLLfDK02mXLb5lSAej6FdVAcrZf9vJyXlc7Oz4XRrV4ZrL+qFGYFA+ifGw 15GxghrCrAVmor2flFVTU7vi7ANHIAZYVCMsF0c8Bo0HuZfroZHjMHHdLwPVGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/ports/commit/?id=cd28784c67bfe64bd95afc8136732dba6750bf27 commit cd28784c67bfe64bd95afc8136732dba6750bf27 Author: Ed Schouten AuthorDate: 2022-09-30 16:59:40 +0000 Commit: Xin LI CommitDate: 2022-09-30 22:28:02 +0000 textproc/raptor2: Improve sort_r(3) API detection. In a future version of FreeBSD, we would adopt POSIX qsort_r(3) API which is different from traditional FreeBSD qsort_r(3). PR: ports/231256 Exp-run by: antoine Approved by: portmgr --- textproc/raptor2/Makefile | 2 +- textproc/raptor2/files/patch-src_sort__r.h | 34 ++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/textproc/raptor2/Makefile b/textproc/raptor2/Makefile index 8f5297f37eb0..5b39c66d0c21 100644 --- a/textproc/raptor2/Makefile +++ b/textproc/raptor2/Makefile @@ -1,6 +1,6 @@ PORTNAME= raptor2 PORTVERSION= 2.0.15 -PORTREVISION= 22 +PORTREVISION= 23 CATEGORIES= textproc MASTER_SITES= http://download.librdf.org/source/ \ SF/librdf/${PORTNAME}/${PORTVERSION} diff --git a/textproc/raptor2/files/patch-src_sort__r.h b/textproc/raptor2/files/patch-src_sort__r.h new file mode 100644 index 000000000000..70878740f4a6 --- /dev/null +++ b/textproc/raptor2/files/patch-src_sort__r.h @@ -0,0 +1,34 @@ +--- src/sort_r.h.orig 2014-10-09 23:00:44 UTC ++++ src/sort_r.h +@@ -24,10 +24,11 @@ void sort_r(void *base, size_t nel, size_t width, + defined OpenBSD3_1 || defined OpenBSD3_9 || defined __OpenBSD__ || \ + defined __NetBSD__ || \ + defined __DragonFly__ || \ +- defined AMIGA) ++ defined AMIGA) && !defined(qsort_r) + # define _SORT_R_BSD + #elif (defined _GNU_SOURCE || defined __gnu_hurd__ || defined __GNU__ || \ +- defined __linux__ || defined __MINGW32__ || defined __GLIBC__) ++ defined __linux__ || defined __MINGW32__ || defined __GLIBC__) || \ ++ defined(qsort_r) + # define _SORT_R_LINUX + #elif (defined _WIN32 || defined _WIN64 || defined __WINDOWS__) + # define _SORT_R_WINDOWS +@@ -64,7 +65,7 @@ void sort_r(void *base, size_t nel, size_t width, + #if defined _SORT_R_BSD + + /* BSD requires argument swap */ +- extern void qsort_r(void *base, size_t nel, size_t width, void *thunk, ++ extern void (qsort_r)(void *base, size_t nel, size_t width, void *thunk, + int (*compar)(void *_thunk, const void *_a, const void *_b)); + + struct sort_r_data +@@ -82,7 +83,7 @@ void sort_r(void *base, size_t nel, size_t width, + #elif defined _SORT_R_LINUX + + typedef int(* __compar_d_fn_t)(const void *, const void *, void *); +- extern void qsort_r(void *base, size_t nel, size_t width, ++ extern void (qsort_r)(void *base, size_t nel, size_t width, + __compar_d_fn_t __compar, void *arg) + __attribute__((nonnull (1, 4))); +