Re: [RFC] axel 2.17.11

[Ismael Luceno <ismael%iodev.co.uk@localhost>]

On 22/Feb/2022 14:20, Ismael Luceno wrote:
> Hi.
> 
> This is my first package update. I would like some review.
> 
> Also, I'm wondering if it would be possible to implement a ssl option such
> that:
> 
> -ssl overrides any option in the ssl group.
> any option in the ssl group toggles ssl on.
> 
> Otherwise it seems inconsistent...
> 
> Best regards.
> 
> Signed-off-by: Ismael Luceno <ismael%iodev.co.uk@localhost>
> ---
>  axel/Makefile   | 20 ++++++++------------
>  axel/PLIST.nls  | 10 ++++++++++
>  axel/distinfo   |  6 +++---
>  axel/options.mk | 29 +++++++++++++++++++++++++++++
>  4 files changed, 50 insertions(+), 15 deletions(-)
>  create mode 100644 axel/PLIST.nls
>  create mode 100644 axel/options.mk
> 
> diff --git a/axel/Makefile b/axel/Makefile
> index a1727c0b4f31..b61d7ca4cd30 100644
> --- a/axel/Makefile
> +++ b/axel/Makefile
> @@ -1,26 +1,22 @@
>  # $NetBSD: Makefile,v 1.8 2012/09/24 16:56:41 asau Exp $
>  #
>  
> -DISTNAME=		axel-1.0b
> +DISTNAME=		axel-2.17.11
>  CATEGORIES=		net
> -MASTER_SITES=		https://wilmer.gaa.st/downloads/
> +MASTER_SITES=		https://github.com/axel-download-accelerator/axel/releases/download/v${PKGVERSION_NOREV}/
>  
> -MAINTAINER=		alchow%users.sourceforge.net@localhost
> +MAINTAINER=		ismael%iodev.co.uk@localhost
>  HOMEPAGE=		https://github.com/axel-download-accelerator/axel
>  COMMENT=		HTTP/FTP download accelerator
>  
> -HAS_CONFIGURE=		yes
> -USE_TOOLS+=		gmake
> -CONFIGURE_ARGS+=	--prefix=${PREFIX}
> +GNU_CONFIGURE=		yes
>  
> -INSTALLATION_DIRS=	bin etc ${PKGMANDIR}/man1
> +INSTALLATION_DIRS+=	share/examples/axel
>  EGDIR=			${PREFIX}/share/examples/${PKGBASE}
>  CONF_FILES=		${EGDIR}/axelrc.example ${PKG_SYSCONFDIR}/axelrc
>  
> -do-install:
> -	${INSTALL_PROGRAM} ${WRKSRC}/axel ${DESTDIR}${PREFIX}/bin/
> -	${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
> -	${INSTALL_DATA} ${WRKSRC}/axelrc.example ${DESTDIR}${EGDIR}
> -	${INSTALL_MAN} ${WRKSRC}/axel.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
> +post-install:
> +	${INSTALL_DATA} ${WRKSRC}/doc/axelrc.example ${DESTDIR}${EGDIR}
>  
> +.include "options.mk"
>  .include "../../mk/bsd.pkg.mk"
> diff --git a/axel/PLIST.nls b/axel/PLIST.nls
> new file mode 100644
> index 000000000000..7a1964655295
> --- /dev/null
> +++ b/axel/PLIST.nls
> @@ -0,0 +1,10 @@
> +share/locale/de/LC_MESSAGES/axel.mo
> +share/locale/es/LC_MESSAGES/axel.mo
> +share/locale/id_ID/LC_MESSAGES/axel.mo
> +share/locale/it/LC_MESSAGES/axel.mo
> +share/locale/ja/LC_MESSAGES/axel.mo
> +share/locale/nl/LC_MESSAGES/axel.mo
> +share/locale/pt_BR/LC_MESSAGES/axel.mo
> +share/locale/ru/LC_MESSAGES/axel.mo
> +share/locale/tr/LC_MESSAGES/axel.mo
> +share/locale/zh_CN/LC_MESSAGES/axel.mo
> diff --git a/axel/distinfo b/axel/distinfo
> index 4e0aa771f663..5cea4226f41a 100644
> --- a/axel/distinfo
> +++ b/axel/distinfo
> @@ -1,5 +1,5 @@
>  $NetBSD: distinfo,v 1.1.1.1 2007/04/05 20:03:22 alchow Exp $
>  
> -BLAKE2s (axel-1.0b.tar.gz) = 43a234a3f1a817123406a28ad07fa93cbbd3a4687e2fb3bf9f252c892ad13a2d
> -SHA512 (axel-1.0b.tar.gz) = 1732d562f364cd489db7c6d32528dfb72040b4399c620df8b517ca9e696b9bccbe7bedef6ae5e989a158945406d09f10c9c8656c6a0fa3ac5481934235f36386
> -Size (axel-1.0b.tar.gz) = 43293 bytes
> +BLAKE2s (axel-2.17.11.tar.gz) = 0e3e798dd26fef59b8c4e52248181920667413e7817125f9280efeebf9720896
> +SHA512 (axel-2.17.11.tar.gz) = ab84ff9cc4b059b651c93d0298219a8143ed3a8620b53cb614fc99a1f7aa827d66fc24a0de811ffbe6ce42a6eafb945b42093f80a3ada2ef91099a8c6bd3a3a0
> +Size (axel-2.17.11.tar.gz) = 377920 bytes
> diff --git a/axel/options.mk b/axel/options.mk
> new file mode 100644
> index 000000000000..0f7ef681eb03
> --- /dev/null
> +++ b/axel/options.mk
> @@ -0,0 +1,29 @@
> +# $NetBSD$
> +PKG_OPTIONS_VAR=		PKG_OPTIONS.axel
> +PKG_SUPPORTED_OPTIONS=		nls
> +PKG_SUGGESTED_OPTIONS=		nls openssl
> +PKG_OPTIONS_OPTIONAL_GROUPS=	ssl
> +PKG_OPTIONS_GROUP.ssl=		openssl libressl
> +
> +.include "../../mk/bsd.prefs.mk"
> +.include "../../mk/bsd.options.mk"
> +
> +PLIST_SRC=		PLIST
> +.if !empty(PKG_OPTIONS:Mnls)
> +.include "../../devel/gettext-lib/buildlink3.mk"
> +PLIST_SRC+=		PLIST.nls
> +.else
> +CONFIGURE_ARGS+=	--disable-nls
> +.endif
> +
> +.if !empty(PKG_OPTIONS:Mopenssl)
> +.include "../../security/openssl/buildlink3.mk"
> +CONFIGURE_ARGS+=	--with-ssl=${BUILDLINK_PREFIX.openssl}
> +USE_TOOLS+=		pkg-config
> +.elif !empty(PKG_OPTIONS:Mlibressl)
> +.include "../../security/libressl/buildlink3.mk"
> +CONFIGURE_ARGS+=	--with-ssl=${BUILDLINK_PREFIX.libressl}
> +USE_TOOLS+=		pkg-config
> +.else
> +CONFIGURE_ARGS+=	--without-ssl
> +.endif
> -- 
> 2.33.0
> 

As an approximation, I managed to achieve most of what I
intended by adding a ssl option as well, removing openssl from
PKG_SUGGESTED_OPTIONS, and adding the following:

	PKG_SUGGESTED_OPTIONS+=		${PKG_OPTIONS_GROUP.ssl:[1]}
	.if empty(PKG_OPTIONS:Mssl)
	CONFIGURE_ARGS+=	--without-ssl
	PKG_OPTIONS:=		${PKG_OPTIONS:N*ssl}
	.else
	USE_TOOLS+=		pkg-config
	LIBSSL:=		${PKG_OPTIONS:M*?ssl}
	.  if empty(LIBSSL)
	LIBSSL:=		${PKG_OPTIONS_GROUP.ssl:[1]}
	PKG_OPTIONS+=		${LIBSSL}
	.  endif
	.  include "../../security/${LIBSSL}/buildlink3.mk"
	CONFIGURE_ARGS+=	--with-ssl=${BUILDLINK_PREFIX.${LIBSSL}}
	.endif

But this means -ssl overrides all no matter where it appears...

Is there any way to hook into bsd.options.mk to deal with this sort
of problem? or should I filter the options before including it?