From nobody Tue Feb 01 06:06:03 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 9EB7819A9335; Tue, 1 Feb 2022 06:06:03 +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 4JnvZ33gkFz4gVJ; Tue, 1 Feb 2022 06:06:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643695563; 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=5yvwuZxpZ7/sQ/mP7KEEiPtRj8qNVjpwMMODtPfKS/M=; b=jJSKhAiWSJD6voPIClbfKemfxJnaktgCtFARdbfG4mbcsHHYo6Rgvrg18cLF8E2sQTRNTZ LAnKEOOe8G+ydHpxadKcWodMk9h8h/V6fZw5RqxowHdRw7VTZ6KXeko1/JjrIhS9dS/CDC YQXSHHHaMef/EhY/Xp+6b4v22wZ1GvbKMkvj3xEg2spv8h8n798yi166C3n0cYMDWIXPpE mG07Qp+mPQ5AJyHQ6OR7K33AuVgP9wNox1LaDmsnquBXx9QM7dULxpHJ+hPbRYCj3k0SS8 jSUYWXE1GY5ZN0UApPSVxwLqx7Ir4xJMaH3DxpME9WB13Y9JCbkjAHPijDoaGw== 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 4BD3C2D33; Tue, 1 Feb 2022 06:06:03 +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 21166395002403; Tue, 1 Feb 2022 06:06:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 211663TI002402; Tue, 1 Feb 2022 06:06:03 GMT (envelope-from git) Date: Tue, 1 Feb 2022 06:06:03 GMT Message-Id: <202202010606.211663TI002402@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: 2be648cefd5b - main - graphics/libgphoto2: add CURL option, fix packaging without GD option 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: 2be648cefd5b3215460d7846a075f72df8715b6e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643695563; 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=5yvwuZxpZ7/sQ/mP7KEEiPtRj8qNVjpwMMODtPfKS/M=; b=KXUWzgiEyU/ZxNTj6CaO8lhmezWtuOXzf3Ba4LIiV2DiPGfelcHjfgZtuXQJl/aIzisYXM T5qhFLhk1GpKxnbW+S1a7ZQerKe9m8j3fFM4V/TtlPoUD0UZk8/qiSbepu+NseFTaOHgvo HinM3PbErig0lMxcxRnROMEF3wnTrNuiaVJfG6isbEYuvnTDZs8ZtGZmBJwj92f3fv77DH MxA7uVSyxrnnzITV6ma4Z7VMTdsvQoZwmMY8ZQpNkbQmy9D+JwGBAb3oaYxnavUU4HckQN +aj1A8butErWTBfh5x3wN3oX99Ugdys9QUiAeurjW5OH/Z7K92nKoIHHVKmLTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643695563; a=rsa-sha256; cv=none; b=kWsp71EX4RmEoEvYwDz/paPTYtyIo1myVZDuo5wMwsjO3fbZvhv/fPLWylX0WrvsPni6fK Lgeak6+iNyqVtPNhKAeZhf+PwHc5aKaxL9ItKOkFqr9dJdIgazbw5hDX7VGBQ8AGoTVzuS bCkzteBq0jzHJTleF7yAJwFg4BP/FzBgVbXoXjZQpCffzMMgtk8Oef0ZK2AXIyTfdEaDb0 85PvwnDMVtiee9gE1984ah+gsq4R3lrGuupTe9mdqfDahkvAxfIHUVJVMF3fUa8DVI71Ak qNfuGA88Nj2PA04FMFsDHkcMI4B+ULnLl6aPw10jjeQ/sy/EyFLXiSh5F+wftg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=2be648cefd5b3215460d7846a075f72df8715b6e commit 2be648cefd5b3215460d7846a075f72df8715b6e Author: Alexey Dokuchaev AuthorDate: 2022-02-01 06:04:50 +0000 Commit: Alexey Dokuchaev CommitDate: 2022-02-01 06:04:50 +0000 graphics/libgphoto2: add CURL option, fix packaging without GD option Assign more accurate descriptions of the optional features as default descriptions are a bit too generic and might not give the user enough information to decide whether she needs them or not. --- graphics/libgphoto2/Makefile | 18 +++++++++++++----- graphics/libgphoto2/pkg-plist | 4 ++-- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/graphics/libgphoto2/Makefile b/graphics/libgphoto2/Makefile index 9ba9025dd501..4be8acb20c44 100644 --- a/graphics/libgphoto2/Makefile +++ b/graphics/libgphoto2/Makefile @@ -11,8 +11,7 @@ COMMENT= Universal digital camera control library LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libltdl.so:devel/libltdl \ - libcurl.so:ftp/curl +LIB_DEPENDS= libltdl.so:devel/libltdl USES= compiler:c11 gmake gnome iconv libtool localbase pathfix \ pkgconfig tar:bzip2 @@ -35,16 +34,25 @@ PATHFIX_MAKEFILEIN= Makefile.in \ PLIST_SUB= VERSION="${PORTVERSION}" VERSION_PORT=0.12.0 -OPTIONS_DEFINE= DOCS GD JPEG LIBEXIF NLS -OPTIONS_DEFAULT= GD JPEG LIBEXIF -OPTIONS_SUB= yes +OPTIONS_DEFINE= CURL DOCS GD JPEG LIBEXIF NLS +OPTIONS_DEFAULT= CURL GD JPEG LIBEXIF +OPTIONS_SUB= yes +CURL_DESC= Lumix WiFi support via cURL +CURL_LIB_DEPENDS= libcurl.so:ftp/curl +CURL_CONFIGURE_OFF= --with-libcurl=no + +GD_DESC= libGD conversion support GD_LIB_DEPENDS= libgd.so:graphics/gd GD_CONFIGURE_OFF= --with-gdlib=no + +JPEG_DESC= JPEG image mangling support JPEG_USES= jpeg JPEG_CONFIGURE_WITH= jpeg + LIBEXIF_LIB_DEPENDS= libexif.so:graphics/libexif LIBEXIF_CONFIGURE_OFF= --with-libexif=no + NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls diff --git a/graphics/libgphoto2/pkg-plist b/graphics/libgphoto2/pkg-plist index f7ef1bbe8b7a..57b16dfb1d2f 100644 --- a/graphics/libgphoto2/pkg-plist +++ b/graphics/libgphoto2/pkg-plist @@ -26,11 +26,11 @@ lib/libgphoto2/%%VERSION%%/canon.so lib/libgphoto2/%%VERSION%%/digigr8.so lib/libgphoto2/%%VERSION%%/dimagev.so lib/libgphoto2/%%VERSION%%/directory.so -lib/libgphoto2/%%VERSION%%/docupen.so +%%GD%%lib/libgphoto2/%%VERSION%%/docupen.so lib/libgphoto2/%%VERSION%%/jl2005a.so lib/libgphoto2/%%VERSION%%/jl2005c.so lib/libgphoto2/%%VERSION%%/kodak_dc240.so -lib/libgphoto2/%%VERSION%%/lumix.so +%%CURL%%lib/libgphoto2/%%VERSION%%/lumix.so lib/libgphoto2/%%VERSION%%/mars.so lib/libgphoto2/%%VERSION%%/pentax.so lib/libgphoto2/%%VERSION%%/ptp2.so