From nobody Mon Nov 27 12:36:21 2023 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 4Sf4ny1D05z529YK; Mon, 27 Nov 2023 12:36:22 +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 4Sf4ny0pBfz4TQL; Mon, 27 Nov 2023 12:36:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701088582; 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=fw+PSeRXlRuEkjqVr3zormowrXSu5vY0e5yTL3FZYQ8=; b=vZFztCjONXOoIFcRnefFQ7t5BzoOAY/+qeElsgXBHUgGhnG/iyTCvjbmqsLlWV21B6vILN 1fE0ceVrYsTKme76eIIW61G0yZaONT4c/3p62S3SdxAolQGflRUQqY4p4dFffVZdTqA9eI EeMiQacRlci1xmW8oc+WzbvOHFBzlV7OGO8QxVTo4OHnc88l/w45abp9fMkkcT7lKAeUU4 pGPnU0hyI6mpn6et6IpqSpbJYkbBoHEwcbyJf6da4/g3/gDO0Hbl1LhKnUot4WixA6eDVu hhSzlFn56O3yRe46HxKVbtXT7qNI2wu/ZmEuM1oL/MbTJ4B2IxVCAQfw1kzxog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701088582; 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=fw+PSeRXlRuEkjqVr3zormowrXSu5vY0e5yTL3FZYQ8=; b=JS28vVbTS4lvGowCsmoeokkDbI1RYNDL8ZhOI0RXhOjc7gBk6ZbEslQTCmbA4SQ9tsk/iV hTYilVDphCapZLozHZ2LJSoaLFCFO6RE3K54vd1lWCTnVW3P8mTQ9YAWpVdrkWA/gt+lf1 OLl0gsJkrjAVkh518Ld2W+mbCWqeloFozpQnA9HujM5MlNPd7CeqxxMVHXuCtIDSaTerJf ZO+PPG480JoxWLJl2G3/oT0LL4cXJ83NQbKw6vVnUhlArawOprzLI3sPDarzZ71R7PLVOw aUMpoNMQv73e5EGNG86VGepuybnFaExENJvc19G4s/HLtp8Uc+lp8QZoKaytYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701088582; a=rsa-sha256; cv=none; b=s8ILM83NFqcNhYY2AQVAXHelhKbz/6zm7jKSLgMFdTW4tuEifgkNCzdXfWpZoVU0kuFKQs +lxothgpEkHaLW6r0JrgD4Br0nXI3QiF3XoMEweXW+3lIrymqCKNZ4AnjfETALFf0msk6u wMdszZASunYHYageovaFwF+Li2gl9Ssz23H96AYMj7bqaKSNthrXRgbYTvlR95Jf9Pyz/f N6+ANo6UqJphHMLcK267eicTrIYjMx8WUpSUDUVXadxixkfhZioRSXwoSK1RV77E+DFmNq G1SKlM32YZsY1/vl//kBdlrb1YaXyjZlfunQTlZumrxMd4lvOhO4DEdXOI4WgQ== 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 4Sf4nx702qzfCP; Mon, 27 Nov 2023 12:36:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ARCaLhd012419; Mon, 27 Nov 2023 12:36:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ARCaLKt012416; Mon, 27 Nov 2023 12:36:21 GMT (envelope-from git) Date: Mon, 27 Nov 2023 12:36:21 GMT Message-Id: <202311271236.3ARCaLKt012416@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 1ab547de8726 - main - graphics/ocaml-images: unbreak the build and undeprecate the port 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: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1ab547de8726da676dec333669974977b613a45b Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=1ab547de8726da676dec333669974977b613a45b commit 1ab547de8726da676dec333669974977b613a45b Author: Alexey Dokuchaev AuthorDate: 2023-11-27 12:35:02 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-11-27 12:35:02 +0000 graphics/ocaml-images: unbreak the build and undeprecate the port OMake's shell-success-null() function had been removed in version 0.10.5: after using $(NULL_DEVICE), it no longer needed a special name and had replaced shell-success() function. --- graphics/ocaml-images/Makefile | 8 ++++---- graphics/ocaml-images/files/patch-src_bitmap.ml | 11 +++++++++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/graphics/ocaml-images/Makefile b/graphics/ocaml-images/Makefile index 25a2ad4f295e..d26cadbe1c0c 100644 --- a/graphics/ocaml-images/Makefile +++ b/graphics/ocaml-images/Makefile @@ -12,10 +12,6 @@ MAINTAINER= michael.grunewald@laposte.net COMMENT= Objective Caml image processing library WWW= http://pauillac.inria.fr/camlimages/ -BROKEN= does not build: broken plist -DEPRECATED= Fails to package and marked broken over a year ago -EXPIRATION_DATE=2023-11-30 - BUILD_DEPENDS= ${LOCALBASE}/share/aclocal/ocaml.m4:lang/ocaml-autoconf BUILD_DEPENDS+= omake:devel/omake @@ -74,6 +70,10 @@ USES+= xorg USE_XORG= xpm .endif +post-patch: + @${REINPLACE_CMD} -e 's,shell-success-null,shell-success,' \ + ${WRKSRC}/OMyMakeroot + do-configure: @(cd ${WRKSRC} && ${REINPLACE_CMD} ${OMAKESUBS} OMakefile) (cd ${WRKSRC} && ${OMAKE} ${OMARGS} configure) diff --git a/graphics/ocaml-images/files/patch-src_bitmap.ml b/graphics/ocaml-images/files/patch-src_bitmap.ml new file mode 100644 index 000000000000..eec47155e7a5 --- /dev/null +++ b/graphics/ocaml-images/files/patch-src_bitmap.ml @@ -0,0 +1,11 @@ +--- src/bitmap.ml.orig 2011-06-22 18:04:32 UTC ++++ src/bitmap.ml +@@ -186,7 +186,7 @@ module Make(B:Bitdepth) = struct + + let swap_out_eldest words = + let sorted = +- Sort.list (fun b1 b2 -> b1.last_used < b2.last_used) !swappable_blocks in ++ List.sort (fun b1 b2 -> compare b1.last_used b2.last_used) !swappable_blocks in + let rec swapper sorted i = + match sorted with + | [] -> ()