Re: CVS commit: pkgsrc/security/gnupg2

[Adam <adam%netbsd.org@localhost>]

> Module Name:  pkgsrc
> Committed By: tm
> Date:         Tue May  8 11:56:21 UTC 2018
> 
> Modified Files:
>       pkgsrc/security/gnupg2: Makefile options.mk
> 
> Log Message:
> gnupg2: add options for bzip2 and zlib
> 
> 
> To generate a diff of this commit:
> cvs rdiff -u -r1.85 -r1.86 pkgsrc/security/gnupg2/Makefile
> cvs rdiff -u -r1.11 -r1.12 pkgsrc/security/gnupg2/options.mk
> 
> Please note that diffs are not public domain; they are subject to the
> copyright notices on the relevant files.
> 
> Modified files:
> 
> Index: pkgsrc/security/gnupg2/Makefile
> diff -u pkgsrc/security/gnupg2/Makefile:1.85 pkgsrc/security/gnupg2/Makefile:1.86
> --- pkgsrc/security/gnupg2/Makefile:1.85      Fri May  4 06:08:40 2018
> +++ pkgsrc/security/gnupg2/Makefile   Tue May  8 11:56:21 2018
> @@ -1,7 +1,8 @@
> -# $NetBSD: Makefile,v 1.85 2018/05/04 06:08:40 adam Exp $
> +# $NetBSD: Makefile,v 1.86 2018/05/08 11:56:21 tm Exp $
> 
> DISTNAME=     gnupg-2.2.7
> PKGNAME=      ${DISTNAME:S/gnupg-/gnupg2-/}
> +PKGREVISION= 1
> CATEGORIES=   security
> MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/gnupg/
> EXTRACT_SUFX= .tar.bz2
> 
> Index: pkgsrc/security/gnupg2/options.mk
> diff -u pkgsrc/security/gnupg2/options.mk:1.11 pkgsrc/security/gnupg2/options.mk:1.12
> --- pkgsrc/security/gnupg2/options.mk:1.11    Tue Aug 29 12:11:35 2017
> +++ pkgsrc/security/gnupg2/options.mk Tue May  8 11:56:21 2018
> @@ -1,11 +1,18 @@
> -# $NetBSD: options.mk,v 1.11 2017/08/29 12:11:35 wiz Exp $
> +# $NetBSD: options.mk,v 1.12 2018/05/08 11:56:21 tm Exp $
> 
> PKG_OPTIONS_VAR=      PKG_OPTIONS.gnupg2
> -PKG_SUPPORTED_OPTIONS=       ldap libusb-1
> +PKG_SUPPORTED_OPTIONS=       bzip2 ldap libusb-1 zlib
> PKG_SUGGESTED_OPTIONS=        libusb-1
> 
> .include "../../mk/bsd.options.mk"
> 
> +.if !empty(PKG_OPTIONS:Mbzip2)
> +CONFIGURE_ARGS+=       --with-bzip2=${BUILDLINK_PREFIX.bzip2}
> +.include "../../archivers/bzip2/buildlink3.mk"
> +.else
> +CONFIGURE_ARGS+=       --disable-bzip2
> +.endif
> +
> PLIST_VARS+=          ldap
> .if !empty(PKG_OPTIONS:Mldap)
> CONFIGURE_ARGS+=      --with-ldap=${BUILDLINK_PREFIX.openldap-client}
> @@ -23,3 +30,10 @@ CONFIGURE_ARGS+=   LDFLAGS="${LDFLAGS} ${C
> .else
> CONFIGURE_ARGS+=      --disable-ccid-driver
> .endif
> +
> +.if !empty(PKG_OPTIONS:Mzlib)
> +CONFIGURE_ARGS+=       --with-zlib=${BUILDLINK_PREFIX.zlib}
> +.include "../../devel/zlib/buildlink3.mk"
> +.else
> +CONFIGURE_ARGS+=       --disable-zip
> +.endif
> 

Please, don't bump revisions for changes that do not make any difference to the default behaviour. In this case, you've added options, that are disabled by default.

I would rather enable zip and bzip2 unconditionally (as all systems should have these two), add the buildlink3.mk's, and then leave the revision=1.

What do you think? :)

Kind regards,
Adam