diff options
| author | wiz <wiz@pkgsrc.org> | 2021-03-24 11:01:55 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2021-03-24 11:01:55 +0000 |
| commit | e0fcef3b5fddb9f89f6a7241fb441a1b127a0f27 (patch) | |
| tree | ba449c671c1c0a5b6bcc8fb0652a6c9854ec011d | |
| parent | 4c190ee1a08e1450e589658cfc5285532ddc7394 (diff) | |
| download | pkgsrc-e0fcef3b5fddb9f89f6a7241fb441a1b127a0f27.tar.gz | |
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.
| -rw-r--r-- | sysutils/ups-nut/Makefile | 11 | ||||
| -rw-r--r-- | sysutils/ups-nut/buildlink3.mk | 8 | ||||
| -rw-r--r-- | sysutils/ups-nut/options.mk | 10 |
3 files changed, 18 insertions, 11 deletions
diff --git a/sysutils/ups-nut/Makefile b/sysutils/ups-nut/Makefile index 749ea0d8538..a17ed18390c 100644 --- a/sysutils/ups-nut/Makefile +++ b/sysutils/ups-nut/Makefile @@ -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 diff --git a/sysutils/ups-nut/buildlink3.mk b/sysutils/ups-nut/buildlink3.mk index 2ad67be7a0f..559ccf472b7 100644 --- a/sysutils/ups-nut/buildlink3.mk +++ b/sysutils/ups-nut/buildlink3.mk @@ -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?= ../../sysutils/ups-nut 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" diff --git a/sysutils/ups-nut/options.mk b/sysutils/ups-nut/options.mk index 0c7cf09de8d..a0896834280 100644 --- a/sysutils/ups-nut/options.mk +++ b/sysutils/ups-nut/options.mk @@ -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 |