git: 2be648cefd5b - main - graphics/libgphoto2: add CURL option, fix packaging without GD option

The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=2be648cefd5b3215460d7846a075f72df8715b6e

commit 2be648cefd5b3215460d7846a075f72df8715b6e
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2022-02-01 06:04:50 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
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