Received: by mail.netbsd.org (Postfix, from userid 605) id 16BE384D53; Wed, 24 Mar 2021 11:01:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 507BA84D50 for ; Wed, 24 Mar 2021 11:01:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id fVcT2JQJOPwh for ; Wed, 24 Mar 2021 11:01:55 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id B7E4D84CBC for ; Wed, 24 Mar 2021 11:01:55 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id AB8EFFA95; Wed, 24 Mar 2021 11:01:55 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1616583715212720" MIME-Version: 1.0 Date: Wed, 24 Mar 2021 11:01:55 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/sysutils/ups-nut To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20210324110155.AB8EFFA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1616583715212720 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="UTF-8" Module Name: pkgsrc Committed By: wiz Date: Wed Mar 24 11:01:55 UTC 2021 Modified Files: pkgsrc/sysutils/ups-nut: Makefile buildlink3.mk options.mk Log Message: ups-nut: fix man page references From Edgar Fuß in private email. Fix some pkglint while here (openssl option disabled because only openssl 1.0 supported). Bump PKGREVISION. To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 pkgsrc/sysutils/ups-nut/Makefile cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/ups-nut/buildlink3.mk cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/ups-nut/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1616583715212720 Content-Disposition: inline Content-Length: 2865 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/sysutils/ups-nut/Makefile diff -u pkgsrc/sysutils/ups-nut/Makefile:1.59 pkgsrc/sysutils/ups-nut/Makefile:1.60 --- pkgsrc/sysutils/ups-nut/Makefile:1.59 Thu Feb 11 10:05:13 2021 +++ pkgsrc/sysutils/ups-nut/Makefile Wed Mar 24 11:01:55 2021 @@ -1,11 +1,18 @@ -# $NetBSD: Makefile,v 1.59 2021/02/11 10:05:13 wiz Exp $ +# $NetBSD: Makefile,v 1.60 2021/03/24 11:01:55 wiz Exp $ .include "Makefile.common" PKGNAME= ups-${DISTNAME} -PKGREVISION= 3 +PKGREVISION= 4 COMMENT= Network UPS Tools +SUBST_CLASSES+= man-so +SUBST_MESSAGE.man-so= Fixing manpage .so references. +SUBST_STAGE.man-so= pre-build +SUBST_FILES.man-so= docs/man/*.[0-9] +SUBST_SED.man-so= -e 's,^\.so \([^/]*\)\.\([0-9]\)$$,.so man\2/\1.\2,' +SUBST_NOOP_OK.man-so= yes + # Don't regenerate any files in tools/. TOOLS_SCRIPT.perl= exit 1 Index: pkgsrc/sysutils/ups-nut/buildlink3.mk diff -u pkgsrc/sysutils/ups-nut/buildlink3.mk:1.2 pkgsrc/sysutils/ups-nut/buildlink3.mk:1.3 --- pkgsrc/sysutils/ups-nut/buildlink3.mk:1.2 Mon Feb 22 17:07:50 2021 +++ pkgsrc/sysutils/ups-nut/buildlink3.mk Wed Mar 24 11:01:55 2021 @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2021/02/22 17:07:50 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2021/03/24 11:01:55 wiz Exp $ BUILDLINK_TREE+= ups-nut @@ -11,10 +11,10 @@ BUILDLINK_PKGSRCDIR.ups-nut?= ../../sysu pkgbase:= ups-nut .include "../../mk/pkg-build-options.mk" -.if ${PKG_BUILD_OPTIONS.ups-nut:Mopenssl} -. include "../../security/openssl/buildlink3.mk" -.elif ${PKG_BUILD_OPTIONS.ups-nut:Mnss} +.if ${PKG_BUILD_OPTIONS.ups-nut:Mnss} . include "../../devel/nss/buildlink3.mk" +#.elif ${PKG_BUILD_OPTIONS.ups-nut:Mopenssl} +#. include "../../security/openssl/buildlink3.mk" .endif .include "../../mk/pthread.buildlink3.mk" Index: pkgsrc/sysutils/ups-nut/options.mk diff -u pkgsrc/sysutils/ups-nut/options.mk:1.1 pkgsrc/sysutils/ups-nut/options.mk:1.2 --- pkgsrc/sysutils/ups-nut/options.mk:1.1 Thu Feb 11 10:05:13 2021 +++ pkgsrc/sysutils/ups-nut/options.mk Wed Mar 24 11:01:55 2021 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2021/02/11 10:05:13 wiz Exp $ +# $NetBSD: options.mk,v 1.2 2021/03/24 11:01:55 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.ups-nut PKG_OPTIONS_OPTIONAL_GROUPS= ssl @@ -7,12 +7,12 @@ PKG_SUGGESTED_OPTIONS= nss .include "../../mk/bsd.options.mk" -.if !empty(PKG_OPTIONS:Mopenssl) -CONFIGURE_ARGS+= --with-ssl=openssl --with-openssl --without-nss -. include "../../security/openssl/buildlink3.mk" -.elif !empty(PKG_OPTIONS:Mnss) +.if !empty(PKG_OPTIONS:Mnss) CONFIGURE_ARGS+= --with-ssl=nss --with-nss --without-openssl . include "../../devel/nss/buildlink3.mk" +#.elif !empty(PKG_OPTIONS:Mopenssl) +#CONFIGURE_ARGS+= --with-ssl=openssl --with-openssl --without-nss +#. include "../../security/openssl/buildlink3.mk" .else CONFIGURE_ARGS+= --without-ssl .endif --_----------=_1616583715212720--