From nobody Mon Nov 27 11:14:04 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 4Sf2z06yXWz52LcS; Mon, 27 Nov 2023 11:14:04 +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 4Sf2z04k3Zz3Zxj; Mon, 27 Nov 2023 11:14:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701083644; 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=7gCtVhbRmajPxAlDa1XXpEGCDirm5FibqRY56H2xN2Q=; b=hfykF0k8eMKsJe+h6iHJSPsw+yI6pWiExj+CCam0ZRkT4XxOkE85jgafKkOQXydVt2iSzq VbMorLjr1/qnW2NmbL0n8oVsde44J8ZsbtK2zpNzwjwD9R6nbfjp0seEms5wXpyGFnsSVi copSJtfr/3dTaVJr0hwr8iFRMvTgOj8WeY0+8GfIrwwSj3XO8KZ0WpLF3TJCo4N+1gbsft +hJEzVCjfrkXeAeo4UkTrCnWChKJECEpHYlUOLdGcK+z9cbNqtBrF1FTIet+7/IZdaA4CH ZC6SdQGRqCi0R7uUES5nlL286O59fBAJqUDi1Skf+BVmJFysVXnIwnhzInyRaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701083644; 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=7gCtVhbRmajPxAlDa1XXpEGCDirm5FibqRY56H2xN2Q=; b=meE7L5yVqvsSGESdzQjWwzZUCKhN3eY2ytKrN/CjSH5bElMD1GU8wXhZRLfr2pbvdHCjqF E9/S46CPU+MkkaFA2vwFB+ISd9Nk3hchYsdHRPavbyA7lETljn9FC8BRieXBXVcU/ZBUXy hnUWXgBIjE7wtKQ6echYaJtwDR2sgI+APl1M0gyPgbI/tZE33lWQBo/pwSuxjYg+1tTMNo OHR9S8jN7zn3WrveT/3PWCNkO/e0DglKG5WOvy3dZcced9/a8FtqJnx5GFeOowDupYdatt 11Fnxgm2uH40jZCFbdwdkpydfCuXoa6u0BE0SpEDZ4EKZS/08T4wgtnveh1JVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701083644; a=rsa-sha256; cv=none; b=baIVZx/N36M+rT2JriMyrFlCnjRgbhdQ4OQQ336Po7kLBISTFlthOXC4CBVvpAPgVRNbmu Mw+Oe6IPA1T8myZ4x8HlW0i42IXgfcI0IxgtGt5zIRWYmqf7nlz0HPs+G9z6Ck8yjB7lus F4RmAGjaVwhJt51xv+SKTkHV/NYD9iCtjoPv+oEkQV+FWIJ72xK0M3QR39dYMOWv4v0rzI Wz+MYLs0SIOULcjuy+Y7AcjZw6HnXnh6DwToKCdOck8L79mr7gj41GY/r9zD8CotzCziaC 8dXp+SzdWHTXmkqLax7Mr3ICfpQark0oqC91KBsLiL6vcNnBgTbKHvdMBlzg2g== 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 4Sf2z03pn1zc5q; Mon, 27 Nov 2023 11:14:04 +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 3ARBE42E079016; Mon, 27 Nov 2023 11:14:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ARBE4P3079013; Mon, 27 Nov 2023 11:14:04 GMT (envelope-from git) Date: Mon, 27 Nov 2023 11:14:04 GMT Message-Id: <202311271114.3ARBE4P3079013@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: c36bd0394bac - main - graphics/ocaml-images: restore FREETYPE option to unbreak packaging 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: c36bd0394bac08c2f5568b368e733f4f933d7e11 Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=c36bd0394bac08c2f5568b368e733f4f933d7e11 commit c36bd0394bac08c2f5568b368e733f4f933d7e11 Author: Alexey Dokuchaev AuthorDate: 2023-11-27 11:13:22 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-11-27 11:13:22 +0000 graphics/ocaml-images: restore FREETYPE option to unbreak packaging Fixes: b7193b2f2a7e --- graphics/ocaml-images/Makefile | 4 ++-- graphics/ocaml-images/pkg-plist | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/graphics/ocaml-images/Makefile b/graphics/ocaml-images/Makefile index fd24db68a0f5..25a2ad4f295e 100644 --- a/graphics/ocaml-images/Makefile +++ b/graphics/ocaml-images/Makefile @@ -36,8 +36,8 @@ WRKSRC= ${WRKDIR}/camlspotter-camlimages-c803efa9d5d3 MAKE_JOBS_UNSAFE= yes -OPTIONS_DEFINE= PNG JPEG TIFF XPM GIF GHOSTSCRIPT GTK2 DOCS -OPTIONS_DEFAULT=PNG JPEG TIFF XPM GIF GHOSTSCRIPT +OPTIONS_DEFINE= PNG JPEG TIFF XPM GIF FREETYPE GHOSTSCRIPT GTK2 DOCS +OPTIONS_DEFAULT=PNG JPEG TIFF XPM GIF FREETYPE GHOSTSCRIPT OPTIONS_SUB= yes PNG_CONFIGURE_WITH= png diff --git a/graphics/ocaml-images/pkg-plist b/graphics/ocaml-images/pkg-plist index 7efe825a7f46..695d08fae127 100644 --- a/graphics/ocaml-images/pkg-plist +++ b/graphics/ocaml-images/pkg-plist @@ -12,9 +12,9 @@ lib/ocaml/site-lib/camlimages/camlimages_all.cmxa lib/ocaml/site-lib/camlimages/camlimages_core.a lib/ocaml/site-lib/camlimages/camlimages_core.cma lib/ocaml/site-lib/camlimages/camlimages_core.cmxa -lib/ocaml/site-lib/camlimages/camlimages_freetype.a -lib/ocaml/site-lib/camlimages/camlimages_freetype.cma -lib/ocaml/site-lib/camlimages/camlimages_freetype.cmxa +%%FREETYPE%%lib/ocaml/site-lib/camlimages/camlimages_freetype.a +%%FREETYPE%%lib/ocaml/site-lib/camlimages/camlimages_freetype.cma +%%FREETYPE%%lib/ocaml/site-lib/camlimages/camlimages_freetype.cmxa %%GIF%%lib/ocaml/site-lib/camlimages/camlimages_gif.a %%GIF%%lib/ocaml/site-lib/camlimages/camlimages_gif.cma %%GIF%%lib/ocaml/site-lib/camlimages/camlimages_gif.cmxa @@ -49,18 +49,18 @@ lib/ocaml/site-lib/camlimages/color.mli lib/ocaml/site-lib/camlimages/colorhist.cmi lib/ocaml/site-lib/camlimages/colorhist.mli lib/ocaml/site-lib/camlimages/dllcamlimages_all.so -lib/ocaml/site-lib/camlimages/dllcamlimages_freetype.so +%%FREETYPE%%lib/ocaml/site-lib/camlimages/dllcamlimages_freetype.so lib/ocaml/site-lib/camlimages/dllcamlimages_gif.so lib/ocaml/site-lib/camlimages/dllcamlimages_jpeg.so lib/ocaml/site-lib/camlimages/dllcamlimages_png.so lib/ocaml/site-lib/camlimages/dllcamlimages_supported.so lib/ocaml/site-lib/camlimages/dllcamlimages_tiff.so lib/ocaml/site-lib/camlimages/dllcamlimages_xpm.so -lib/ocaml/site-lib/camlimages/freetype.cmi +%%FREETYPE%%lib/ocaml/site-lib/camlimages/freetype.cmi lib/ocaml/site-lib/camlimages/freetype.mli -lib/ocaml/site-lib/camlimages/ftlow.cmi +%%FREETYPE%%lib/ocaml/site-lib/camlimages/ftlow.cmi lib/ocaml/site-lib/camlimages/ftlow.mli -lib/ocaml/site-lib/camlimages/fttext.cmi +%%FREETYPE%%lib/ocaml/site-lib/camlimages/fttext.cmi lib/ocaml/site-lib/camlimages/fttext.mli lib/ocaml/site-lib/camlimages/genimage.cmi lib/ocaml/site-lib/camlimages/genimage.mli @@ -88,7 +88,7 @@ lib/ocaml/site-lib/camlimages/jis_unicode.mli lib/ocaml/site-lib/camlimages/jpeg.cmi lib/ocaml/site-lib/camlimages/jpeg.mli lib/ocaml/site-lib/camlimages/libcamlimages_all.a -lib/ocaml/site-lib/camlimages/libcamlimages_freetype.a +%%FREETYPE%%lib/ocaml/site-lib/camlimages/libcamlimages_freetype.a lib/ocaml/site-lib/camlimages/libcamlimages_gif.a lib/ocaml/site-lib/camlimages/libcamlimages_jpeg.a lib/ocaml/site-lib/camlimages/libcamlimages_png.a @@ -100,7 +100,7 @@ lib/ocaml/site-lib/camlimages/mstring.mli lib/ocaml/site-lib/camlimages/oBmp.cmi lib/ocaml/site-lib/camlimages/oColor.cmi lib/ocaml/site-lib/camlimages/oColor.mli -lib/ocaml/site-lib/camlimages/oFreetype.cmi +%%FREETYPE%%lib/ocaml/site-lib/camlimages/oFreetype.cmi lib/ocaml/site-lib/camlimages/oGif.cmi lib/ocaml/site-lib/camlimages/oGraphic.cmi lib/ocaml/site-lib/camlimages/oImages.cmi