Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 26 Mar 2020 13:52:42 -0700
From:      Cy Schubert <Cy.Schubert@cschubert.com>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   Re: svn commit: r529220 - in head/sysutils: . nut-devel  nut-devel/files
Message-ID:  <202003262052.02QKqgOh001053@slippy.cwsent.com>
In-Reply-To: <202003262048.02QKmSoB030667@repo.freebsd.org>
References:  <202003262048.02QKmSoB030667@repo.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
In message <202003262048.02QKmSoB030667@repo.freebsd.org>, Cy Schubert 
writes:
> Author: cy
> Date: Thu Mar 26 20:48:28 2020
> New Revision: 529220
> URL: https://svnweb.freebsd.org/changeset/ports/529220
>
> Log:
>   Introduce Network UPS Tools nut development port. This port tracks
>   the networkupstools/nut github repo.
>
> Added:
>   head/sysutils/nut-devel/
>      - copied from r528723, head/sysutils/nut/
>   head/sysutils/nut-devel/files/patch-scripts_Makefile   (contents, props cha
> nged)
> Deleted:
>   head/sysutils/nut-devel/files/patch-m4_nut__check__libopenssl.m4
> Modified:
>   head/sysutils/Makefile
>   head/sysutils/nut-devel/Makefile
>   head/sysutils/nut-devel/distinfo
>   head/sysutils/nut-devel/pkg-plist
>
> Modified: head/sysutils/Makefile
> =============================================================================
> =
> --- head/sysutils/Makefile	Thu Mar 26 20:47:39 2020	(r529219)
> +++ head/sysutils/Makefile	Thu Mar 26 20:48:28 2020	(r529220)
> @@ -753,6 +753,7 @@
>      SUBDIR += nsysctl
>      SUBDIR += ntfy
>      SUBDIR += nut
> +    SUBDIR += nut-devel
>      SUBDIR += nvclock
>      SUBDIR += nvme-cli
>      SUBDIR += nvramtool
>
> Modified: head/sysutils/nut-devel/Makefile
> =============================================================================
> =
> --- head/sysutils/nut/Makefile	Thu Mar 19 12:32:42 2020	(r52872
> 3)
> +++ head/sysutils/nut-devel/Makefile	Thu Mar 26 20:48:28 2020	(r52922
> 0)
> @@ -2,19 +2,24 @@
>  # $FreeBSD$
>  
>  PORTNAME=	nut
> -PORTVERSION=	2.7.4
> -PORTREVISION=	13
> +PORTVERSION=	${NUT_COMMIT_DATE}
>  CATEGORIES=	sysutils
> -MASTER_SITES=	http://www.networkupstools.org/source/${PORTVERSION:R}/
> -DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
> -EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
> +PKGNAMESUFFIX=	-devel
> +# MASTER_SITES=	http://www.networkupstools.org/source/${PORTVERSION:R}/
> +# DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
> +# EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
>  
>  MAINTAINER=	cy@FreeBSD.org
>  COMMENT=	Network UPS Tools
>  
> +USE_GITHUB=	yes
> +GH_ACCOUNT=     networkupstools 
> +GH_TAGNAME=     e27f1f9
> +NUT_COMMIT_DATE=	2020.02.09
> +
>  GNU_CONFIGURE=	yes
>  USE_LDCONFIG=	yes
> -USES=		autoreconf gmake pkgconfig libtool
> +USES=		autoreconf:build gmake pkgconfig libtool
>  
>  NUT_USER?=	uucp
>  NUT_GROUP?=	uucp
> @@ -169,6 +174,9 @@ CONFIGURE_ARGS+=	--with-nss
>  CONFIGURE_ARGS+=	--without-openssl --without-ssl
>  .endif
>  
> +pre-configure:
> +	cd ${WRKSRC} && ./autogen.sh
> +
>  pre-install:
>  	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/nut
>  	@${REINPLACE_CMD} -e 's/device-name\*/cdev/g' ${WRKSRC}/scripts/devd/nu
> t-usb.conf
> @@ -184,7 +192,7 @@ post-install:
>  	${INSTALL_DATA} ${WRKSRC}/docs/cables/*.txt ${STAGEDIR}${DOCSDIR}/cable
> s
>  	${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${STAGEDIR}${DOCSDIR}
>  	${INSTALL_DATA} ${WRKSRC}/docs/FAQ.txt ${STAGEDIR}${DOCSDIR}
> -.for file in AUTHORS COPYING ChangeLog INSTALL MAINTAINERS NEWS README UPGRA
> DING
> +.for file in AUTHORS COPYING INSTALL MAINTAINERS NEWS README UPGRADING
>  	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
>  .endfor
>  .endif
>
> Modified: head/sysutils/nut-devel/distinfo
> =============================================================================
> =
> --- head/sysutils/nut/distinfo	Thu Mar 19 12:32:42 2020	(r52872
> 3)
> +++ head/sysutils/nut-devel/distinfo	Thu Mar 26 20:48:28 2020	(r52922
> 0)
> @@ -1,3 +1,3 @@
> -TIMESTAMP = 1540365195
> -SHA256 (nut-2.7.4.tar.gz) = 980e82918c52d364605c0703a5dcf01f74ad2ef06e3d3659
> 49e43b7d406d25a7
> -SIZE (nut-2.7.4.tar.gz) = 2509831
> +TIMESTAMP = 1585101068
> +SHA256 (networkupstools-nut-2020.02.09-e27f1f9_GH0.tar.gz) = 8eb734b4141309d
> c95bec47b21aa890496d8f0c0377c0c4343ca571e6a9c92f5
> +SIZE (networkupstools-nut-2020.02.09-e27f1f9_GH0.tar.gz) = 1938546
>
> Added: head/sysutils/nut-devel/files/patch-scripts_Makefile
> =============================================================================
> =
> --- /dev/null	00:00:00 1970	(empty, because file is newly added)
> +++ head/sysutils/nut-devel/files/patch-scripts_Makefile	Thu Mar 26 20:4
> 8:28 2020	(r529220)
> @@ -0,0 +1,8 @@
> +--- scripts/Makefile.am.orig	2020-02-09 10:44:01.000000000 -0800
> ++++ scripts/Makefile.am	2020-03-24 19:40:01.084978000 -0700
> +@@ -25,4 +25,4 @@
> +     Windows/halt.c \
> +     Windows/Makefile
> + 
> +-SUBDIRS = augeas devd hotplug python systemd udev Solaris upsdrvsvcctl
> ++SUBDIRS = augeas devd hotplug python udev upsdrvsvcctl
>
> Modified: head/sysutils/nut-devel/pkg-plist
> =============================================================================
> =
> --- head/sysutils/nut/pkg-plist	Thu Mar 19 12:32:42 2020	(r52872
> 3)
> +++ head/sysutils/nut-devel/pkg-plist	Thu Mar 26 20:48:28 2020	(r52922
> 0)
> @@ -34,16 +34,17 @@ include/nutclient.h
>  include/nutscan-device.h
>  include/nutscan-init.h
>  include/nutscan-ip.h
> +include/nutscan-serial.h
>  include/parseconf.h
>  include/upsclient.h
>  lib/libnutclient.a
>  lib/libnutclient.so
> -lib/libnutclient.so.0
> -lib/libnutclient.so.0.0.0
> +lib/libnutclient.so.1
> +lib/libnutclient.so.1.0.0
>  lib/libupsclient.a
>  lib/libupsclient.so
> -lib/libupsclient.so.4
> -lib/libupsclient.so.4.0.0
> +lib/libupsclient.so.5
> +lib/libupsclient.so.5.0.0
>  libdata/pkgconfig/libnutclient.pc
>  libdata/pkgconfig/libnutscan.pc
>  libdata/pkgconfig/libupsclient.pc
> @@ -82,10 +83,10 @@ libdata/pkgconfig/libupsclient.pc
>  %%NUT_SERIAL%%libexec/nut/microdowell
>  %%NUT_SERIAL%%libexec/nut/mge-shut
>  %%NUT_NEON%%libexec/nut/netxml-ups
> -%%NUT_SERIAL%%libexec/nut/oldmge-shut
>  %%NUT_SERIAL%%libexec/nut/oneac
>  %%NUT_SERIAL%%libexec/nut/optiups
>  %%NUT_IPMIPSU%%libexec/nut/nut-ipmipsu
> +%%NUT_SERIAL%%libexec/nut/nutdrv_siemens-sitop
>  %%NUT_SERIAL%%libexec/nut/powercom
>  %%NUT_PDU%%libexec/nut/powerman-pdu
>  %%NUT_SERIAL%%libexec/nut/powerpanel
> @@ -162,7 +163,9 @@ man/man3/upscli_init.3.gz
>  man/man3/upscli_list_next.3.gz
>  man/man3/upscli_list_start.3.gz
>  man/man3/upscli_readline.3.gz
> +man/man3/upscli_readline_timeout.3.gz
>  man/man3/upscli_sendline.3.gz
> +man/man3/upscli_sendline_timeout.3.gz
>  man/man3/upscli_splitaddr.3.gz
>  man/man3/upscli_splitname.3.gz
>  man/man3/upscli_ssl.3.gz
> @@ -180,6 +183,7 @@ man/man5/upssched.conf.5.gz
>  %%NUT_SERIAL%%man/man8/blazer_ser.8.gz
>  %%NUT_USB%%man/man8/blazer_usb.8.gz
>  %%NUT_NEON%%man/man8/netxml-ups.8.gz
> +man/man8/nut-driver-enumerator.8.gz
>  man/man8/nut-recorder.8.gz
>  man/man8/nut-scanner.8.gz
>  %%NUT_USB%%man/man8/nutdrv_atcl_usb.8.gz
> @@ -191,6 +195,7 @@ man/man8/upsc.8.gz
>  man/man8/upscmd.8.gz
>  man/man8/upsd.8.gz
>  man/man8/upsdrvctl.8.gz
> +man/man8/upsdrvsvcctl.8.gz
>  man/man8/upslog.8.gz
>  man/man8/upsmon.8.gz
>  man/man8/upsrw.8.gz

This update has resolved a significant number of issues with my UPS.


-- 
Cheers,
Cy Schubert <Cy.Schubert@cschubert.com>
FreeBSD UNIX:  <cy@FreeBSD.org>   Web:  http://www.FreeBSD.org

	The need of the many outweighs the greed of the few.





Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003262052.02QKqgOh001053>