CVS commit: pkgsrc/sysutils/gkrellm

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Sat Nov 27 05:37:59 UTC 2021

Modified Files:
        pkgsrc/sysutils/gkrellm: Makefile Makefile.common buildlink3.mk
            options.mk

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.106 -r1.107 pkgsrc/sysutils/gkrellm/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/sysutils/gkrellm/Makefile.common
cvs rdiff -u -r1.52 -r1.53 pkgsrc/sysutils/gkrellm/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/gkrellm/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/sysutils/gkrellm/Makefile
diff -u pkgsrc/sysutils/gkrellm/Makefile:1.106 pkgsrc/sysutils/gkrellm/Makefile:1.107
--- pkgsrc/sysutils/gkrellm/Makefile:1.106      Sat Nov 27 04:43:02 2021
+++ pkgsrc/sysutils/gkrellm/Makefile    Sat Nov 27 05:37:59 2021
@@ -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 @@ USE_TOOLS+=           pkg-config
 
 # 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 @@ NOT_FOR_PLATFORM=     IRIX-*-*
 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 @@ INSTALL_MAKE_FLAGS+=        SMANDIR=${DESTDIR}$
 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
 

Index: pkgsrc/sysutils/gkrellm/Makefile.common
diff -u pkgsrc/sysutils/gkrellm/Makefile.common:1.18 pkgsrc/sysutils/gkrellm/Makefile.common:1.19
--- pkgsrc/sysutils/gkrellm/Makefile.common:1.18        Sun Oct  5 16:41:08 2014
+++ pkgsrc/sysutils/gkrellm/Makefile.common     Sat Nov 27 05:37:59 2021
@@ -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 @@ EXTRACT_SUFX= .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://gkrellm.net/
-
-CONFLICTS+=    gkrellm-1*
+LICENSE=       gnu-gpl-v2
 
 USE_TOOLS+=            gmake
 USE_PKGLOCALEDIR=      YES

Index: pkgsrc/sysutils/gkrellm/buildlink3.mk
diff -u pkgsrc/sysutils/gkrellm/buildlink3.mk:1.52 pkgsrc/sysutils/gkrellm/buildlink3.mk:1.53
--- pkgsrc/sysutils/gkrellm/buildlink3.mk:1.52  Mon Aug 17 20:17:43 2020
+++ pkgsrc/sysutils/gkrellm/buildlink3.mk       Sat Nov 27 05:37:59 2021
@@ -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_ABI_DEPENDS.gkrellm+=      gkrellm>
 BUILDLINK_PKGSRCDIR.gkrellm?=  ../../sysutils/gkrellm
 
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../security/openssl/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"
+.endif
+
+.if ${PKG_BUILD_OPTIONS.gkrellm:Mgnutls}
+.include "../../security/gnutls/buildlink3.mk"
+.endif
+
 .endif # GKRELLM_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -gkrellm

Index: pkgsrc/sysutils/gkrellm/options.mk
diff -u pkgsrc/sysutils/gkrellm/options.mk:1.1 pkgsrc/sysutils/gkrellm/options.mk:1.2
--- pkgsrc/sysutils/gkrellm/options.mk:1.1      Thu Sep  8 13:19:56 2005
+++ pkgsrc/sysutils/gkrellm/options.mk  Sat Nov 27 05:37:59 2021
@@ -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