Sat Nov 27 05:37:59 2021 UTC ()
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.


(pho)
diff -r1.106 -r1.107 pkgsrc/sysutils/gkrellm/Makefile
diff -r1.18 -r1.19 pkgsrc/sysutils/gkrellm/Makefile.common
diff -r1.52 -r1.53 pkgsrc/sysutils/gkrellm/buildlink3.mk
diff -r1.1 -r1.2 pkgsrc/sysutils/gkrellm/options.mk
cvs diff -r1.106 -r1.107 pkgsrc/sysutils/gkrellm/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/gkrellm/Makefile 2021/11/27 04:43:02 1.106
+++ pkgsrc/sysutils/gkrellm/Makefile 2021/11/27 05:37:59 1.107
@@ -1,53 +1,53 @@ @@ -1,53 +1,53 @@
1# $NetBSD: Makefile,v 1.106 2021/11/27 04:43:02 pho Exp $ 1# $NetBSD: Makefile,v 1.107 2021/11/27 05:37:59 pho Exp $
2.include "Makefile.common" 2.include "Makefile.common"
3 3
4PKGREVISION= 45 4PKGREVISION= 46
5 5
6GKRELLM_PKGBASE= gkrellm 6GKRELLM_PKGBASE= gkrellm
7WRKSRC= ${GKRELLM_SRCDIR} 7WRKSRC= ${GKRELLM_SRCDIR}
8 8
9COMMENT= GTK2 based system monitor 9COMMENT= GTK2 based system monitor
10 10
11DEPENDS+= gkrellm-share-${GKRELLM_VERSION}:../../sysutils/gkrellm-share 11DEPENDS+= gkrellm-share-${GKRELLM_VERSION}:../../sysutils/gkrellm-share
12 12
13USE_TOOLS+= pkg-config 13USE_TOOLS+= pkg-config
14 14
15.include "../../mk/bsd.prefs.mk" 15.include "../../mk/bsd.prefs.mk"
16 16
17# NetBSD 3.99.1 and above don't have to be installed setgid. 17# NetBSD 3.99.1 and above don't have to be installed setgid.
18.if (${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "DragonFly" || \ 18.if (${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "DragonFly" || \
19 (${OPSYS} == "NetBSD" && (!empty(OS_VERSION:M[123]*) && empty(OS_VERSION:M3.99.*)))) 19 (${OPSYS} == "NetBSD" && (!empty(OS_VERSION:M[123].*) && empty(OS_VERSION:M3.99.*))))
20SPECIAL_PERMS+= ${PREFIX}/bin/gkrellm ${BINOWN} kmem 2555 20SPECIAL_PERMS+= ${PREFIX}/bin/gkrellm ${BINOWN} kmem 2555
21.endif 21.endif
22 22
23NOT_FOR_PLATFORM= IRIX-*-* 23NOT_FOR_PLATFORM= IRIX-*-*
24 24
25.include "options.mk" 25.include "options.mk"
26 26
27MAKE_ENV+= MODULES=src LINK_FLAGS=${EXPORT_SYMBOLS_LDFLAGS:Q} 27MAKE_ENV+= MODULES=src LINK_FLAGS=${EXPORT_SYMBOLS_LDFLAGS:Q}
28MAKE_ENV+= SSL_TYPE=${GKRELLM_SSL_TYPE:Q} 28MAKE_ENV+= SSL_TYPE=${GKRELLM_SSL_TYPE:Q}
29MAKE_ENV+= PKG_INCLUDE=-I${BUILDLINK_PREFIX.${GKRELLM_SSL_TYPE}}/include 29MAKE_ENV+= PKG_INCLUDE=-I${BUILDLINK_PREFIX.${GKRELLM_SSL_TYPE}}/include
30MAKE_ENV+= PKG_LIBS="-L${BUILDLINK_PREFIX.${GKRELLM_SSL_TYPE}}/lib -Wl,-R${BUILDLINK_PREFIX.${GKRELLM_SSL_TYPE}}/lib" 30MAKE_ENV+= PKG_LIBS="-L${BUILDLINK_PREFIX.${GKRELLM_SSL_TYPE}}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.${GKRELLM_SSL_TYPE}}/lib"
31MAKE_ENV+= MANDIR=${PREFIX}/${PKGMANDIR}/man1 31MAKE_ENV+= MANDIR=${PREFIX}/${PKGMANDIR}/man1
32MAKE_ENV+= SMANDIR=${PREFIX}/${PKGMANDIR}/man8 32MAKE_ENV+= SMANDIR=${PREFIX}/${PKGMANDIR}/man8
33MAKE_FLAGS+= BINOWNER=${BINOWN} BINGROUP=${BINGRP} 33MAKE_FLAGS+= BINOWNER=${BINOWN} BINGROUP=${BINGRP}
34INSTALL_MAKE_FLAGS+= MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 34INSTALL_MAKE_FLAGS+= MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
35INSTALL_MAKE_FLAGS+= SMANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}/man8 35INSTALL_MAKE_FLAGS+= SMANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
36 36
37# Fix PR pkg/40047, Thanks to Ondrej Tuma 37# Fix PR pkg/40047, Thanks to Ondrej Tuma
38.if ${OBJECT_FMT} == "ELF" 38.if ${OBJECT_FMT} == "ELF"
39LDFLAGS+= -Wl,-export-dynamic 39LDFLAGS+= -Wl,-export-dynamic
40.endif 40.endif
41 41
 42SUBST_CLASSES+= gkprefix
42SUBST_STAGE.gkprefix= pre-configure 43SUBST_STAGE.gkprefix= pre-configure
43SUBST_FILES.gkprefix= src/gkrellm.h 44SUBST_FILES.gkprefix= src/gkrellm.h
44SUBST_SED.gkprefix= -e '/SYSTEM_/{s!/usr!${PREFIX}!;}' 45SUBST_SED.gkprefix= -e '/SYSTEM_/{s!/usr!${PREFIX}!;}'
45SUBST_CLASSES+= gkprefix 
46 46
47REQD_DIRS= lib/gkrellm2/plugins lib/gkrellm2 include/gkrellm2 47REQD_DIRS= lib/gkrellm2/plugins lib/gkrellm2 include/gkrellm2
48 48
49.include "../../devel/glib2/buildlink3.mk" 49.include "../../devel/glib2/buildlink3.mk"
50.include "../../x11/gtk2/buildlink3.mk" 50.include "../../x11/gtk2/buildlink3.mk"
51.include "../../x11/libSM/buildlink3.mk" 51.include "../../x11/libSM/buildlink3.mk"
52 52
53.include "../../mk/bsd.pkg.mk" 53.include "../../mk/bsd.pkg.mk"
cvs diff -r1.18 -r1.19 pkgsrc/sysutils/gkrellm/Makefile.common (expand / switch to unified diff)

--- pkgsrc/sysutils/gkrellm/Makefile.common 2014/10/05 16:41:08 1.18
+++ pkgsrc/sysutils/gkrellm/Makefile.common 2021/11/27 05:37:59 1.19
@@ -1,28 +1,27 @@ @@ -1,28 +1,27 @@
1# $NetBSD: Makefile.common,v 1.18 2014/10/05 16:41:08 wiz Exp $ 1# $NetBSD: Makefile.common,v 1.19 2021/11/27 05:37:59 pho Exp $
2# 2#
3# used by sysutils/gkrellm-share/Makefile 3# used by sysutils/gkrellm-share/Makefile
4# used by sysutils/gkrellm-server/Makefile 4# used by sysutils/gkrellm-server/Makefile
5 5
6DISTNAME= ${GKRELLM_DISTBASE} 6DISTNAME= ${GKRELLM_DISTBASE}
7PKGNAME= ${GKRELLM_PKGBASE}-${GKRELLM_VERSION} 7PKGNAME= ${GKRELLM_PKGBASE}-${GKRELLM_VERSION}
8CATEGORIES= sysutils 8CATEGORIES= sysutils
9MASTER_SITES= http://members.dslextreme.com/users/billw/gkrellm/ 9MASTER_SITES= http://members.dslextreme.com/users/billw/gkrellm/
10EXTRACT_SUFX= .tar.bz2 10EXTRACT_SUFX= .tar.bz2
11 11
12MAINTAINER= pkgsrc-users@NetBSD.org 12MAINTAINER= pkgsrc-users@NetBSD.org
13HOMEPAGE= http://gkrellm.net/ 13HOMEPAGE= http://gkrellm.net/
14 14LICENSE= gnu-gpl-v2
15CONFLICTS+= gkrellm-1* 
16 15
17USE_TOOLS+= gmake 16USE_TOOLS+= gmake
18USE_PKGLOCALEDIR= YES 17USE_PKGLOCALEDIR= YES
19 18
20MAKE_ENV+= LOCALEDIR=${PREFIX}/${PKGLOCALEDIR}/locale 19MAKE_ENV+= LOCALEDIR=${PREFIX}/${PKGLOCALEDIR}/locale
21MAKE_ENV+= GREP=${GREP:Q} 20MAKE_ENV+= GREP=${GREP:Q}
22 21
23.if defined(GKRELLM_DEBUG) 22.if defined(GKRELLM_DEBUG)
24MAKE_ENV+= DEBUG=yes 23MAKE_ENV+= DEBUG=yes
25.endif 24.endif
26 25
27GKRELLM_VERSION= 2.2.10 26GKRELLM_VERSION= 2.2.10
28GKRELLM_DISTBASE= gkrellm-${GKRELLM_VERSION} 27GKRELLM_DISTBASE= gkrellm-${GKRELLM_VERSION}
cvs diff -r1.52 -r1.53 pkgsrc/sysutils/gkrellm/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/sysutils/gkrellm/buildlink3.mk 2020/08/17 20:17:43 1.52
+++ pkgsrc/sysutils/gkrellm/buildlink3.mk 2021/11/27 05:37:59 1.53
@@ -1,17 +1,29 @@ @@ -1,17 +1,29 @@
1# $NetBSD: buildlink3.mk,v 1.52 2020/08/17 20:17:43 leot Exp $ 1# $NetBSD: buildlink3.mk,v 1.53 2021/11/27 05:37:59 pho Exp $
2 2
3BUILDLINK_TREE+= gkrellm 3BUILDLINK_TREE+= gkrellm
4 4
5.if !defined(GKRELLM_BUILDLINK3_MK) 5.if !defined(GKRELLM_BUILDLINK3_MK)
6GKRELLM_BUILDLINK3_MK:= 6GKRELLM_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.gkrellm+= gkrellm>=2.1.22 8BUILDLINK_API_DEPENDS.gkrellm+= gkrellm>=2.1.22
9BUILDLINK_ABI_DEPENDS.gkrellm+= gkrellm>=2.2.10nb43 9BUILDLINK_ABI_DEPENDS.gkrellm+= gkrellm>=2.2.10nb43
10BUILDLINK_PKGSRCDIR.gkrellm?= ../../sysutils/gkrellm 10BUILDLINK_PKGSRCDIR.gkrellm?= ../../sysutils/gkrellm
11 11
12.include "../../devel/glib2/buildlink3.mk" 12.include "../../devel/glib2/buildlink3.mk"
13.include "../../security/openssl/buildlink3.mk" 
14.include "../../x11/gtk2/buildlink3.mk" 13.include "../../x11/gtk2/buildlink3.mk"
 14.include "../../x11/libSM/buildlink3.mk"
 15
 16pkgbase := gkrellm
 17.include "../../mk/pkg-build-options.mk"
 18
 19.if ${PKG_BUILD_OPTIONS.gkrellm:Mopenssl}
 20.include "../../security/openssl/buildlink3.mk"
 21.endif
 22
 23.if ${PKG_BUILD_OPTIONS.gkrellm:Mgnutls}
 24.include "../../security/gnutls/buildlink3.mk"
 25.endif
 26
15.endif # GKRELLM_BUILDLINK3_MK 27.endif # GKRELLM_BUILDLINK3_MK
16 28
17BUILDLINK_TREE+= -gkrellm 29BUILDLINK_TREE+= -gkrellm
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/gkrellm/options.mk (expand / switch to unified diff)

--- pkgsrc/sysutils/gkrellm/options.mk 2005/09/08 13:19:56 1.1
+++ pkgsrc/sysutils/gkrellm/options.mk 2021/11/27 05:37:59 1.2
@@ -1,19 +1,20 @@ @@ -1,19 +1,20 @@
1# $NetBSD: options.mk,v 1.1 2005/09/08 13:19:56 cube Exp $ 1# $NetBSD: options.mk,v 1.2 2021/11/27 05:37:59 pho Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.${GKRELLM_PKGBASE} 3PKG_OPTIONS_VAR= PKG_OPTIONS.gkrellm
4PKG_OPTIONS_REQUIRED_GROUPS= tls 4PKG_OPTIONS_OPTIONAL_GROUPS= tls
5PKG_OPTIONS_GROUP.tls= gnutls ssl 5PKG_OPTIONS_GROUP.tls= gnutls openssl
6 6
7PKG_SUGGESTED_OPTIONS= ssl 7PKG_OPTIONS_LEGACY_OPTS+= ssl:openssl
 8PKG_SUGGESTED_OPTIONS= openssl
8 9
9.include "../../mk/bsd.options.mk" 10.include "../../mk/bsd.options.mk"
10 11
11.if !empty(PKG_OPTIONS:Mssl) 12.if !empty(PKG_OPTIONS:Mopenssl)
12.include "../../security/openssl/buildlink3.mk" 13.include "../../security/openssl/buildlink3.mk"
13GKRELLM_SSL_TYPE= openssl 14GKRELLM_SSL_TYPE= openssl
14.endif 15.endif
15 16
16.if !empty(PKG_OPTIONS:Mgnutls) 17.if !empty(PKG_OPTIONS:Mgnutls)
17.include "../../security/gnutls/buildlink3.mk" 18.include "../../security/gnutls/buildlink3.mk"
18GKRELLM_SSL_TYPE= gnutls 19GKRELLM_SSL_TYPE= gnutls
19.endif 20.endif