[pkgsrc/trunk]: pkgsrc/sysutils/gkrellm Apply some suggestions by pkglint

[pho <pho%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1d64363a0f88
branches:  trunk
changeset: 770183:1d64363a0f88
user:      pho <pho%pkgsrc.org@localhost>
date:      Sat Nov 27 05:37:59 2021 +0000

description:
Apply some suggestions by pkglint

Also renamed the option "ssl" to "openssl" because asking users to
choose between "ssl" and "gnutls" is very confusing. TLS support is
now optional too, as gkrellm can be built fine without any TLS
libraries.

diffstat:

 sysutils/gkrellm/Makefile        |  10 +++++-----
 sysutils/gkrellm/Makefile.common |   5 ++---
 sysutils/gkrellm/buildlink3.mk   |  16 ++++++++++++++--
 sysutils/gkrellm/options.mk      |  13 +++++++------
 4 files changed, 28 insertions(+), 16 deletions(-)

diffs (118 lines):

diff -r 6b6c7ce76201 -r 1d64363a0f88 sysutils/gkrellm/Makefile
--- a/sysutils/gkrellm/Makefile Sat Nov 27 04:43:02 2021 +0000
+++ b/sysutils/gkrellm/Makefile Sat Nov 27 05:37:59 2021 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.106 2021/11/27 04:43:02 pho Exp $
+# $NetBSD: Makefile,v 1.107 2021/11/27 05:37:59 pho Exp $
 .include "Makefile.common"
 
-PKGREVISION=           45
+PKGREVISION=           46
 
 GKRELLM_PKGBASE=       gkrellm
 WRKSRC=                        ${GKRELLM_SRCDIR}
@@ -16,7 +16,7 @@
 
 # NetBSD 3.99.1 and above don't have to be installed setgid.
 .if (${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "DragonFly" || \
-    (${OPSYS} == "NetBSD" && (!empty(OS_VERSION:M[123]*) && empty(OS_VERSION:M3.99.*))))
+    (${OPSYS} == "NetBSD" && (!empty(OS_VERSION:M[123].*) && empty(OS_VERSION:M3.99.*))))
 SPECIAL_PERMS+=                ${PREFIX}/bin/gkrellm ${BINOWN} kmem 2555
 .endif
 
@@ -27,7 +27,7 @@
 MAKE_ENV+=             MODULES=src LINK_FLAGS=${EXPORT_SYMBOLS_LDFLAGS:Q}
 MAKE_ENV+=             SSL_TYPE=${GKRELLM_SSL_TYPE:Q}
 MAKE_ENV+=             PKG_INCLUDE=-I${BUILDLINK_PREFIX.${GKRELLM_SSL_TYPE}}/include
-MAKE_ENV+=             PKG_LIBS="-L${BUILDLINK_PREFIX.${GKRELLM_SSL_TYPE}}/lib -Wl,-R${BUILDLINK_PREFIX.${GKRELLM_SSL_TYPE}}/lib"
+MAKE_ENV+=             PKG_LIBS="-L${BUILDLINK_PREFIX.${GKRELLM_SSL_TYPE}}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.${GKRELLM_SSL_TYPE}}/lib"
 MAKE_ENV+=             MANDIR=${PREFIX}/${PKGMANDIR}/man1
 MAKE_ENV+=             SMANDIR=${PREFIX}/${PKGMANDIR}/man8
 MAKE_FLAGS+=           BINOWNER=${BINOWN} BINGROUP=${BINGRP}
@@ -39,10 +39,10 @@
 LDFLAGS+=      -Wl,-export-dynamic
 .endif
 
+SUBST_CLASSES+=                gkprefix
 SUBST_STAGE.gkprefix=  pre-configure
 SUBST_FILES.gkprefix=  src/gkrellm.h
 SUBST_SED.gkprefix=    -e '/SYSTEM_/{s!/usr!${PREFIX}!;}'
-SUBST_CLASSES+=                gkprefix
 
 REQD_DIRS=     lib/gkrellm2/plugins lib/gkrellm2 include/gkrellm2
 
diff -r 6b6c7ce76201 -r 1d64363a0f88 sysutils/gkrellm/Makefile.common
--- a/sysutils/gkrellm/Makefile.common  Sat Nov 27 04:43:02 2021 +0000
+++ b/sysutils/gkrellm/Makefile.common  Sat Nov 27 05:37:59 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2014/10/05 16:41:08 wiz Exp $
+# $NetBSD: Makefile.common,v 1.19 2021/11/27 05:37:59 pho Exp $
 #
 # used by sysutils/gkrellm-share/Makefile
 # used by sysutils/gkrellm-server/Makefile
@@ -11,8 +11,7 @@
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://gkrellm.net/
-
-CONFLICTS+=    gkrellm-1*
+LICENSE=       gnu-gpl-v2
 
 USE_TOOLS+=            gmake
 USE_PKGLOCALEDIR=      YES
diff -r 6b6c7ce76201 -r 1d64363a0f88 sysutils/gkrellm/buildlink3.mk
--- a/sysutils/gkrellm/buildlink3.mk    Sat Nov 27 04:43:02 2021 +0000
+++ b/sysutils/gkrellm/buildlink3.mk    Sat Nov 27 05:37:59 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.52 2020/08/17 20:17:43 leot Exp $
+# $NetBSD: buildlink3.mk,v 1.53 2021/11/27 05:37:59 pho Exp $
 
 BUILDLINK_TREE+=       gkrellm
 
@@ -10,8 +10,20 @@
 BUILDLINK_PKGSRCDIR.gkrellm?=  ../../sysutils/gkrellm
 
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
+
+pkgbase := gkrellm
+.include "../../mk/pkg-build-options.mk"
+
+.if ${PKG_BUILD_OPTIONS.gkrellm:Mopenssl}
 .include "../../security/openssl/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
+.endif
+
+.if ${PKG_BUILD_OPTIONS.gkrellm:Mgnutls}
+.include "../../security/gnutls/buildlink3.mk"
+.endif
+
 .endif # GKRELLM_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -gkrellm
diff -r 6b6c7ce76201 -r 1d64363a0f88 sysutils/gkrellm/options.mk
--- a/sysutils/gkrellm/options.mk       Sat Nov 27 04:43:02 2021 +0000
+++ b/sysutils/gkrellm/options.mk       Sat Nov 27 05:37:59 2021 +0000
@@ -1,14 +1,15 @@
-# $NetBSD: options.mk,v 1.1 2005/09/08 13:19:56 cube Exp $
+# $NetBSD: options.mk,v 1.2 2021/11/27 05:37:59 pho Exp $
 
-PKG_OPTIONS_VAR=               PKG_OPTIONS.${GKRELLM_PKGBASE}
-PKG_OPTIONS_REQUIRED_GROUPS=   tls
-PKG_OPTIONS_GROUP.tls=         gnutls ssl
+PKG_OPTIONS_VAR=               PKG_OPTIONS.gkrellm
+PKG_OPTIONS_OPTIONAL_GROUPS=   tls
+PKG_OPTIONS_GROUP.tls=         gnutls openssl
 
-PKG_SUGGESTED_OPTIONS=         ssl
+PKG_OPTIONS_LEGACY_OPTS+=      ssl:openssl
+PKG_SUGGESTED_OPTIONS=         openssl
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mssl)
+.if !empty(PKG_OPTIONS:Mopenssl)
 .include "../../security/openssl/buildlink3.mk"
 GKRELLM_SSL_TYPE=      openssl
 .endif