From nobody Sat Oct 14 00:18:12 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S6kVX1tvXz4x1fM; Sat, 14 Oct 2023 00:18:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S6kVX1gK2z3S70; Sat, 14 Oct 2023 00:18:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697242692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jdXWiAVUnylREj2cwp6wbPTVSowxekTwzKfwkhsvoSA=; b=NCf0/qq5SZufOb18A1GmjkJ1DOYsLmFeU2sDMDkvLJWJ3VT441fZPuSu7rCLA9hSUr8tIa ixDxpsxaFjRIQMqRDFLpvV9F2VYj2VLfWs3ovof4u3MhxlVBaTnZy1X1zkuGM1w75yEHtB ax7MbHRzB4SZYUCXvoggQ988+vd4CYo0Is6tL/YzwxdgbCfRY3s5DtfHb3BROnVibPheHV bVRpOqDYEjD6uu/su0BkCHp6K5Hf4ucBus9uxvAI2TYTxx564HCUfMohFOtKSqicGFP2EL ecFjjNdspHgkcJ7rNgOYPPu7XicL2Bf1YGtBtfVSrs87qrrARdvl7hnhnAUGDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697242692; a=rsa-sha256; cv=none; b=r+UR48zD3iEd/m7vcTcfCdK/zrnVYfTJedy7am/YiocgBqZXnysJQObwpYLxvFr5w7ND/c tbqnF7GtXOkB8Wx0z2duKB7O3pJtka88nNP6E9wxC5keY7zf7DUvMO8RvtqyInDLY9Dnj6 ZIo9ockslyxI5NtqqjkN/t8HwsL+qX8vRttq4cDxJWzCcfmL0UOqLmM0NiBmw1YQryDGQu AwnuhraJWtAI12rwVV4Jvxj9ePmNwvbb+TocmZq3WV7NnfA3R++UStOFb5cEwapcIi6OkE /p3VB4xh7I+y3F7Z3wCT39/dHiTp0nqU8CrkCcNzp/3uFKdDsVPlMols/cFUWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697242692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jdXWiAVUnylREj2cwp6wbPTVSowxekTwzKfwkhsvoSA=; b=l7cpKyBcIFvok+TTdHB675KCNAfmyVFEmfAFlAj1yk0q4pLPhwLObD13mVU1UhXpcbqjCr 9nz64X025tPFEFjMod9dXUJ4BJti5Aiw+RP+dbT844bTlxiuwy+i20mqkpINGabyqR+6vB FO3sJ0xyUwckzNZmY4ARC4jQGg8JxgUGyr+m/Qnyek+4DHSwQ59JaoSGrpEDoehkkABXAr cLxNZQklyCPyi4MFrtn5jx977R+xjv0/Ms9JPPrVDizg7bhzC+F/YwzqDCPfVALvxVD/+U pXsUnNhRULpoikQnr2NbyaTSxVrBb8ZI2C1WVx6Kd9rNEZ/hTBa3Fn4fjvmzUw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S6kVX0jNzz18D5; Sat, 14 Oct 2023 00:18:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39E0ICfR067907; Sat, 14 Oct 2023 00:18:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39E0ICKv067904; Sat, 14 Oct 2023 00:18:12 GMT (envelope-from git) Date: Sat, 14 Oct 2023 00:18:12 GMT Message-Id: <202310140018.39E0ICKv067904@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Cy Schubert Subject: git: 7a175c13de00 - 2023Q4 - sysutils/nut*: Optionally install developer files List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q4 X-Git-Reftype: branch X-Git-Commit: 7a175c13de0006f86a98a7ae3257306c969a4bdb Auto-Submitted: auto-generated The branch 2023Q4 has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=7a175c13de0006f86a98a7ae3257306c969a4bdb commit 7a175c13de0006f86a98a7ae3257306c969a4bdb Author: Cy Schubert AuthorDate: 2023-10-11 02:44:01 +0000 Commit: Cy Schubert CommitDate: 2023-10-14 00:01:14 +0000 sysutils/nut*: Optionally install developer files Most users do not need files needed for nut development. Make them optional. PR: 274395 (cherry picked from commit 4da0d4b17cba94ae605f3541234a7436d723c170) --- sysutils/nut-devel/Makefile | 9 ++- sysutils/nut-devel/pkg-plist | 172 +++++++++++++++++++++---------------------- sysutils/nut/Makefile | 12 ++- sysutils/nut/pkg-plist | 166 ++++++++++++++++++++--------------------- 4 files changed, 184 insertions(+), 175 deletions(-) diff --git a/sysutils/nut-devel/Makefile b/sysutils/nut-devel/Makefile index fa7ade470580..8c5d04125209 100644 --- a/sysutils/nut-devel/Makefile +++ b/sysutils/nut-devel/Makefile @@ -1,5 +1,6 @@ PORTNAME= nut PORTVERSION= ${NUT_COMMIT_DATE} +PORTREVISION= 1 CATEGORIES= sysutils PKGNAMESUFFIX= -devel # MASTER_SITES= http://www.networkupstools.org/source/${PORTVERSION:R}/ @@ -42,7 +43,7 @@ OPTIONS_DEFAULT= SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI FREEIPMI DOCS MA OPTIONS_DEFAULT_armv6= SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI DOCS MANPAGES OPENSSL OPTIONS_DEFAULT_armv7= SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI DOCS MANPAGES OPENSSL OPTIONS_DEFAULT_armv64= SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI DOCS MANPAGES OPENSSL -OPTIONS_DEFINE= SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI IPMIPSU FREEIPMI DOCS MANPAGES +OPTIONS_DEFINE= SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI IPMIPSU FREEIPMI DOCS MANPAGES DEV OPTIONS_SINGLE= SSL OPTIONS_SINGLE_SSL= SSL_OFF OPENSSL NSS OPTIONS_SUB= yes @@ -56,6 +57,7 @@ CGI_DESC= Web CGI interface FREEIPMI_DESC= freeipmi support IPMIPSU_DESC= Use nut-ipmipsu support (experimental) SSL_OFF_DESC= No SSL support +DEV_DESC= Install developer tools USE_RC_SUBR= nut nut_upsmon nut_upslog SUB_LIST+= STATEDIR=${STATEDIR} NUT_USER=${NUT_USER} NUT_GROUP=${NUT_GROUP} @@ -80,7 +82,6 @@ CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/nut \ --with-python=${PYTHON_CMD} \ --without-python2 \ --with-python3=${PYTHON_CMD} \ - --with-dev \ --with-ltdl --with-nut-scanner CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib -lpthread @@ -134,6 +135,10 @@ OPENSSL_CONFIGURE_WITH= openssl NSS_LIB_DEPENDS= libnss3.so:security/nss NSS_CONFIGURE_WITH= nss +DEV_CONFIGURE_WITH= dev +DEV_PLIST_SUB= DEV="" +DEV_PLIST_SUB_OFF= DEV="@comment " + .include post-patch: diff --git a/sysutils/nut-devel/pkg-plist b/sysutils/nut-devel/pkg-plist index 194e2e12f483..342e5870cd70 100644 --- a/sysutils/nut-devel/pkg-plist +++ b/sysutils/nut-devel/pkg-plist @@ -28,15 +28,15 @@ bin/upslog bin/upsrw bin/upssched-cmd %%BASH%%etc/bash_completion.d/nut.bash_completion -include/nut-scan.h -include/nutclient.h -include/nutclientmem.h -include/nutscan-device.h -include/nutscan-init.h -include/nutscan-ip.h -include/nutscan-serial.h -include/parseconf.h -include/upsclient.h +%%DEV%%include/nut-scan.h +%%DEV%%include/nutclient.h +%%DEV%%include/nutclientmem.h +%%DEV%%include/nutscan-device.h +%%DEV%%include/nutscan-init.h +%%DEV%%include/nutscan-ip.h +%%DEV%%include/nutscan-serial.h +%%DEV%%include/parseconf.h +%%DEV%%include/upsclient.h lib/libnutclient.a lib/libnutclient.so lib/libnutclient.so.2 @@ -55,10 +55,10 @@ lib/libnutscan.so.2 lib/libnutscan.so.2.0.2 %%PYTHON_SITELIBDIR%%/PyNUT.py %%PYTHON_SITELIBDIR%%/test_nutclient.py -libdata/pkgconfig/libnutclient.pc -libdata/pkgconfig/libnutscan.pc -libdata/pkgconfig/libupsclient.pc -libdata/pkgconfig/libnutclientstub.pc +%%DEV%%libdata/pkgconfig/libnutclient.pc +%%DEV%%libdata/pkgconfig/libnutscan.pc +%%DEV%%libdata/pkgconfig/libupsclient.pc +%%DEV%%libdata/pkgconfig/libnutclientstub.pc %%SERIAL%%libexec/nut/al175 %%SERIAL%%libexec/nut/apcupsd-ups %%USB%%libexec/nut/nutdrv_atcl_usb @@ -120,79 +120,79 @@ libdata/pkgconfig/libnutclientstub.pc %%MODBUS%%libexec/nut/socomec_jbus %%SERIAL%%libexec/nut/victronups libexec/sockdebug -%%MANPAGES%%man/man3/libnutclient.3.gz -%%MANPAGES%%man/man3/libnutclient_commands.3.gz -%%MANPAGES%%man/man3/libnutclient_devices.3.gz -%%MANPAGES%%man/man3/libnutclient_general.3.gz -%%MANPAGES%%man/man3/libnutclient_misc.3.gz -%%MANPAGES%%man/man3/libnutclient_tcp.3.gz -%%MANPAGES%%man/man3/libnutclient_variables.3.gz -%%MANPAGES%%man/man3/nutclient_authenticate.3.gz -%%MANPAGES%%man/man3/nutclient_destroy.3.gz -%%MANPAGES%%man/man3/nutclient_device_forced_shutdown.3.gz -%%MANPAGES%%man/man3/nutclient_device_login.3.gz -%%MANPAGES%%man/man3/nutclient_device_master.3.gz -%%MANPAGES%%man/man3/nutclient_execute_device_command.3.gz -%%MANPAGES%%man/man3/nutclient_get_device_command_description.3.gz -%%MANPAGES%%man/man3/nutclient_get_device_commands.3.gz -%%MANPAGES%%man/man3/nutclient_get_device_description.3.gz -%%MANPAGES%%man/man3/nutclient_get_device_num_logins.3.gz -%%MANPAGES%%man/man3/nutclient_get_device_rw_variables.3.gz -%%MANPAGES%%man/man3/nutclient_get_device_variable_description.3.gz -%%MANPAGES%%man/man3/nutclient_get_device_variable_values.3.gz -%%MANPAGES%%man/man3/nutclient_get_device_variables.3.gz -%%MANPAGES%%man/man3/nutclient_get_devices.3.gz -%%MANPAGES%%man/man3/nutclient_has_device.3.gz -%%MANPAGES%%man/man3/nutclient_has_device_command.3.gz -%%MANPAGES%%man/man3/nutclient_has_device_variable.3.gz -%%MANPAGES%%man/man3/nutclient_logout.3.gz -%%MANPAGES%%man/man3/nutclient_set_device_variable_value.3.gz -%%MANPAGES%%man/man3/nutclient_set_device_variable_values.3.gz -%%MANPAGES%%man/man3/nutclient_tcp_create_client.3.gz -%%MANPAGES%%man/man3/nutclient_tcp_disconnect.3.gz -%%MANPAGES%%man/man3/nutclient_tcp_get_timeout.3.gz -%%MANPAGES%%man/man3/nutclient_tcp_is_connected.3.gz -%%MANPAGES%%man/man3/nutclient_tcp_reconnect.3.gz -%%MANPAGES%%man/man3/nutclient_tcp_set_timeout.3.gz -%%MANPAGES%%man/man3/nutscan.3.gz -%%MANPAGES%%man/man3/nutscan_add_device_to_device.3.gz -%%MANPAGES%%man/man3/nutscan_add_option_to_device.3.gz -%%MANPAGES%%man/man3/nutscan_cidr_to_ip.3.gz -%%MANPAGES%%man/man3/nutscan_display_parsable.3.gz -%%MANPAGES%%man/man3/nutscan_display_sanity_check.3.gz -%%MANPAGES%%man/man3/nutscan_display_sanity_check_serial.3.gz -%%MANPAGES%%man/man3/nutscan_display_ups_conf_with_sanity_check.3.gz -%%MANPAGES%%man/man3/nutscan_display_ups_conf.3.gz -%%MANPAGES%%man/man3/nutscan_free_device.3.gz -%%MANPAGES%%man/man3/nutscan_get_serial_ports_list.3.gz -%%MANPAGES%%man/man3/nutscan_init.3.gz -%%MANPAGES%%man/man3/nutscan_new_device.3.gz -%%MANPAGES%%man/man3/nutscan_scan_avahi.3.gz -%%MANPAGES%%man/man3/nutscan_scan_eaton_serial.3.gz -%%MANPAGES%%man/man3/nutscan_scan_ipmi.3.gz -%%MANPAGES%%man/man3/nutscan_scan_nut.3.gz -%%MANPAGES%%man/man3/nutscan_scan_snmp.3.gz -%%MANPAGES%%man/man3/nutscan_scan_usb.3.gz -%%MANPAGES%%man/man3/nutscan_scan_xml_http_range.3.gz -%%MANPAGES%%man/man3/upscli_add_host_cert.3.gz -%%MANPAGES%%man/man3/upscli_cleanup.3.gz -%%MANPAGES%%man/man3/upscli_connect.3.gz -%%MANPAGES%%man/man3/upscli_disconnect.3.gz -%%MANPAGES%%man/man3/upscli_fd.3.gz -%%MANPAGES%%man/man3/upscli_get.3.gz -%%MANPAGES%%man/man3/upscli_init.3.gz -%%MANPAGES%%man/man3/upscli_list_next.3.gz -%%MANPAGES%%man/man3/upscli_list_start.3.gz -%%MANPAGES%%man/man3/upscli_readline.3.gz -%%MANPAGES%%man/man3/upscli_readline_timeout.3.gz -%%MANPAGES%%man/man3/upscli_sendline.3.gz -%%MANPAGES%%man/man3/upscli_sendline_timeout.3.gz -%%MANPAGES%%man/man3/upscli_splitaddr.3.gz -%%MANPAGES%%man/man3/upscli_splitname.3.gz -%%MANPAGES%%man/man3/upscli_ssl.3.gz -%%MANPAGES%%man/man3/upscli_strerror.3.gz -%%MANPAGES%%man/man3/upscli_upserror.3.gz -%%MANPAGES%%man/man3/upsclient.3.gz +%%MANPAGES%%%%DEV%%man/man3/libnutclient.3.gz +%%MANPAGES%%%%DEV%%man/man3/libnutclient_commands.3.gz +%%MANPAGES%%%%DEV%%man/man3/libnutclient_devices.3.gz +%%MANPAGES%%%%DEV%%man/man3/libnutclient_general.3.gz +%%MANPAGES%%%%DEV%%man/man3/libnutclient_misc.3.gz +%%MANPAGES%%%%DEV%%man/man3/libnutclient_tcp.3.gz +%%MANPAGES%%%%DEV%%man/man3/libnutclient_variables.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_authenticate.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_destroy.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_device_forced_shutdown.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_device_login.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_device_master.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_execute_device_command.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_get_device_command_description.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_get_device_commands.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_get_device_description.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_get_device_num_logins.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_get_device_rw_variables.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_get_device_variable_description.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_get_device_variable_values.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_get_device_variables.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_get_devices.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_has_device.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_has_device_command.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_has_device_variable.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_logout.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_set_device_variable_value.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_set_device_variable_values.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_tcp_create_client.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_tcp_disconnect.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_tcp_get_timeout.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_tcp_is_connected.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_tcp_reconnect.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_tcp_set_timeout.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutscan.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutscan_add_device_to_device.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutscan_add_option_to_device.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutscan_cidr_to_ip.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutscan_display_parsable.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutscan_display_sanity_check.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutscan_display_sanity_check_serial.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutscan_display_ups_conf_with_sanity_check.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutscan_display_ups_conf.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutscan_free_device.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutscan_get_serial_ports_list.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutscan_init.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutscan_new_device.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutscan_scan_avahi.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutscan_scan_eaton_serial.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutscan_scan_ipmi.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutscan_scan_nut.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutscan_scan_snmp.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutscan_scan_usb.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutscan_scan_xml_http_range.3.gz +%%MANPAGES%%%%DEV%%man/man3/upscli_add_host_cert.3.gz +%%MANPAGES%%%%DEV%%man/man3/upscli_cleanup.3.gz +%%MANPAGES%%%%DEV%%man/man3/upscli_connect.3.gz +%%MANPAGES%%%%DEV%%man/man3/upscli_disconnect.3.gz +%%MANPAGES%%%%DEV%%man/man3/upscli_fd.3.gz +%%MANPAGES%%%%DEV%%man/man3/upscli_get.3.gz +%%MANPAGES%%%%DEV%%man/man3/upscli_init.3.gz +%%MANPAGES%%%%DEV%%man/man3/upscli_list_next.3.gz +%%MANPAGES%%%%DEV%%man/man3/upscli_list_start.3.gz +%%MANPAGES%%%%DEV%%man/man3/upscli_readline.3.gz +%%MANPAGES%%%%DEV%%man/man3/upscli_readline_timeout.3.gz +%%MANPAGES%%%%DEV%%man/man3/upscli_sendline.3.gz +%%MANPAGES%%%%DEV%%man/man3/upscli_sendline_timeout.3.gz +%%MANPAGES%%%%DEV%%man/man3/upscli_splitaddr.3.gz +%%MANPAGES%%%%DEV%%man/man3/upscli_splitname.3.gz +%%MANPAGES%%%%DEV%%man/man3/upscli_ssl.3.gz +%%MANPAGES%%%%DEV%%man/man3/upscli_strerror.3.gz +%%MANPAGES%%%%DEV%%man/man3/upscli_upserror.3.gz +%%MANPAGES%%%%DEV%%man/man3/upsclient.3.gz %%MANPAGES%%man/man5/nut.conf.5.gz %%MANPAGES%%man/man5/ups.conf.5.gz %%MANPAGES%%man/man5/upsd.conf.5.gz diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile index e9b3a93efe10..5514f042b979 100644 --- a/sysutils/nut/Makefile +++ b/sysutils/nut/Makefile @@ -1,6 +1,6 @@ PORTNAME= nut PORTVERSION= 2.8.0 -PORTREVISION= 23 +PORTREVISION= 24 CATEGORIES= sysutils MASTER_SITES= http://www.networkupstools.org/source/${PORTVERSION:R}/ @@ -34,7 +34,7 @@ OPTIONS_DEFAULT=SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI FREEIPMI DOCS MAN OPTIONS_DEFAULT_armv6= SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI DOCS MANPAGES OPENSSL OPTIONS_DEFAULT_armv7= SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI DOCS MANPAGES OPENSSL OPTIONS_DEFAULT_armv64= SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI DOCS MANPAGES OPENSSL -OPTIONS_DEFINE= SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI IPMIPSU FREEIPMI DOCS MANPAGES +OPTIONS_DEFINE= SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI IPMIPSU FREEIPMI DOCS MANPAGES DEV OPTIONS_SINGLE= IPMI SSL OPTIONS_SINGLE_SSL= SSL_OFF OPENSSL NSS OPTIONS_SUB= yes @@ -48,6 +48,7 @@ CGI_DESC= Web CGI interface FREEIPMI_DESC= freeipmi support IPMIPSU_DESC= Use nut-ipmipsu support (experimental) SSL_OFF_DESC= No SSL support +DEV_DESC= Install developer tools USE_RC_SUBR= nut nut_upsmon nut_upslog SUB_LIST+= STATEDIR=${STATEDIR} NUT_USER=${NUT_USER} NUT_GROUP=${NUT_GROUP} @@ -68,8 +69,7 @@ CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/nut \ --with-pidpath=${STATEDIR} \ --with-pkgconfig-dir=${PREFIX}/libdata/pkgconfig \ --with-user=${NUT_USER} \ - --with-group=${NUT_GROUP} \ - --with-dev + --with-group=${NUT_GROUP} CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib LIB_DEPENDS+= libltdl.so:devel/libltdl @@ -117,6 +117,10 @@ OPENSSL_CONFIGURE_WITH= openssl NSS_LIB_DEPENDS= libnss3.so:security/nss NSS_CONFIGURE_WITH= nss +DEV_CONFIGURE_WITH= dev +DEV_PLIST_SUB= DEV="" +DEV_PLIST_SUB_OFF= DEV="@comment " + .include post-patch: diff --git a/sysutils/nut/pkg-plist b/sysutils/nut/pkg-plist index d8fbf6fc4567..495030137062 100644 --- a/sysutils/nut/pkg-plist +++ b/sysutils/nut/pkg-plist @@ -28,15 +28,15 @@ bin/upslog bin/upsrw bin/upssched-cmd %%BASH%%etc/bash_completion.d/nut.bash_completion -include/nut-scan.h -include/nutclient.h -include/nutclientmem.h -include/nutscan-device.h -include/nutscan-init.h -include/nutscan-ip.h -include/nutscan-serial.h -include/parseconf.h -include/upsclient.h +%%DEV%%include/nut-scan.h +%%DEV%%include/nutclient.h +%%DEV%%include/nutclientmem.h +%%DEV%%include/nutscan-device.h +%%DEV%%include/nutscan-init.h +%%DEV%%include/nutscan-ip.h +%%DEV%%include/nutscan-serial.h +%%DEV%%include/parseconf.h +%%DEV%%include/upsclient.h lib/libnutclient.a lib/libnutclient.so lib/libnutclient.so.2 @@ -53,10 +53,10 @@ lib/libnutscan.a lib/libnutscan.so lib/libnutscan.so.2 lib/libnutscan.so.2.0.0 -libdata/pkgconfig/libnutclient.pc -libdata/pkgconfig/libnutscan.pc -libdata/pkgconfig/libupsclient.pc -libdata/pkgconfig/libnutclientstub.pc +%%DEV%%libdata/pkgconfig/libnutclient.pc +%%DEV%%libdata/pkgconfig/libnutscan.pc +%%DEV%%libdata/pkgconfig/libupsclient.pc +%%DEV%%libdata/pkgconfig/libnutclientstub.pc %%SERIAL%%libexec/nut/al175 %%SERIAL%%libexec/nut/apcupsd-ups %%USB%%libexec/nut/nutdrv_atcl_usb @@ -117,76 +117,76 @@ libdata/pkgconfig/libnutclientstub.pc %%MODBUS%%libexec/nut/phoenixcontact_modbus %%MODBUS%%libexec/nut/socomec_jbus %%SERIAL%%libexec/nut/victronups -%%MANPAGES%%man/man3/libnutclient.3.gz -%%MANPAGES%%man/man3/libnutclient_commands.3.gz -%%MANPAGES%%man/man3/libnutclient_devices.3.gz -%%MANPAGES%%man/man3/libnutclient_general.3.gz -%%MANPAGES%%man/man3/libnutclient_misc.3.gz -%%MANPAGES%%man/man3/libnutclient_tcp.3.gz -%%MANPAGES%%man/man3/libnutclient_variables.3.gz -%%MANPAGES%%man/man3/nutclient_authenticate.3.gz -%%MANPAGES%%man/man3/nutclient_destroy.3.gz -%%MANPAGES%%man/man3/nutclient_device_forced_shutdown.3.gz -%%MANPAGES%%man/man3/nutclient_device_login.3.gz -%%MANPAGES%%man/man3/nutclient_device_master.3.gz -%%MANPAGES%%man/man3/nutclient_execute_device_command.3.gz -%%MANPAGES%%man/man3/nutclient_get_device_command_description.3.gz -%%MANPAGES%%man/man3/nutclient_get_device_commands.3.gz -%%MANPAGES%%man/man3/nutclient_get_device_description.3.gz -%%MANPAGES%%man/man3/nutclient_get_device_num_logins.3.gz -%%MANPAGES%%man/man3/nutclient_get_device_rw_variables.3.gz -%%MANPAGES%%man/man3/nutclient_get_device_variable_description.3.gz -%%MANPAGES%%man/man3/nutclient_get_device_variable_values.3.gz -%%MANPAGES%%man/man3/nutclient_get_device_variables.3.gz -%%MANPAGES%%man/man3/nutclient_get_devices.3.gz -%%MANPAGES%%man/man3/nutclient_has_device.3.gz -%%MANPAGES%%man/man3/nutclient_has_device_command.3.gz -%%MANPAGES%%man/man3/nutclient_has_device_variable.3.gz -%%MANPAGES%%man/man3/nutclient_logout.3.gz -%%MANPAGES%%man/man3/nutclient_set_device_variable_value.3.gz -%%MANPAGES%%man/man3/nutclient_set_device_variable_values.3.gz -%%MANPAGES%%man/man3/nutclient_tcp_create_client.3.gz -%%MANPAGES%%man/man3/nutclient_tcp_disconnect.3.gz -%%MANPAGES%%man/man3/nutclient_tcp_get_timeout.3.gz -%%MANPAGES%%man/man3/nutclient_tcp_is_connected.3.gz -%%MANPAGES%%man/man3/nutclient_tcp_reconnect.3.gz -%%MANPAGES%%man/man3/nutclient_tcp_set_timeout.3.gz -%%MANPAGES%%man/man3/nutscan.3.gz -%%MANPAGES%%man/man3/nutscan_add_device_to_device.3.gz -%%MANPAGES%%man/man3/nutscan_add_option_to_device.3.gz -%%MANPAGES%%man/man3/nutscan_cidr_to_ip.3.gz -%%MANPAGES%%man/man3/nutscan_display_parsable.3.gz -%%MANPAGES%%man/man3/nutscan_display_ups_conf.3.gz -%%MANPAGES%%man/man3/nutscan_free_device.3.gz -%%MANPAGES%%man/man3/nutscan_get_serial_ports_list.3.gz -%%MANPAGES%%man/man3/nutscan_init.3.gz -%%MANPAGES%%man/man3/nutscan_new_device.3.gz -%%MANPAGES%%man/man3/nutscan_scan_avahi.3.gz -%%MANPAGES%%man/man3/nutscan_scan_eaton_serial.3.gz -%%MANPAGES%%man/man3/nutscan_scan_ipmi.3.gz -%%MANPAGES%%man/man3/nutscan_scan_nut.3.gz -%%MANPAGES%%man/man3/nutscan_scan_snmp.3.gz -%%MANPAGES%%man/man3/nutscan_scan_usb.3.gz -%%MANPAGES%%man/man3/nutscan_scan_xml_http_range.3.gz -%%MANPAGES%%man/man3/upscli_add_host_cert.3.gz -%%MANPAGES%%man/man3/upscli_cleanup.3.gz -%%MANPAGES%%man/man3/upscli_connect.3.gz -%%MANPAGES%%man/man3/upscli_disconnect.3.gz -%%MANPAGES%%man/man3/upscli_fd.3.gz -%%MANPAGES%%man/man3/upscli_get.3.gz -%%MANPAGES%%man/man3/upscli_init.3.gz -%%MANPAGES%%man/man3/upscli_list_next.3.gz -%%MANPAGES%%man/man3/upscli_list_start.3.gz -%%MANPAGES%%man/man3/upscli_readline.3.gz -%%MANPAGES%%man/man3/upscli_readline_timeout.3.gz -%%MANPAGES%%man/man3/upscli_sendline.3.gz -%%MANPAGES%%man/man3/upscli_sendline_timeout.3.gz -%%MANPAGES%%man/man3/upscli_splitaddr.3.gz -%%MANPAGES%%man/man3/upscli_splitname.3.gz -%%MANPAGES%%man/man3/upscli_ssl.3.gz -%%MANPAGES%%man/man3/upscli_strerror.3.gz -%%MANPAGES%%man/man3/upscli_upserror.3.gz -%%MANPAGES%%man/man3/upsclient.3.gz +%%MANPAGES%%%%DEV%%man/man3/libnutclient.3.gz +%%MANPAGES%%%%DEV%%man/man3/libnutclient_commands.3.gz +%%MANPAGES%%%%DEV%%man/man3/libnutclient_devices.3.gz +%%MANPAGES%%%%DEV%%man/man3/libnutclient_general.3.gz +%%MANPAGES%%%%DEV%%man/man3/libnutclient_misc.3.gz +%%MANPAGES%%%%DEV%%man/man3/libnutclient_tcp.3.gz +%%MANPAGES%%%%DEV%%man/man3/libnutclient_variables.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_authenticate.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_destroy.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_device_forced_shutdown.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_device_login.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_device_master.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_execute_device_command.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_get_device_command_description.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_get_device_commands.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_get_device_description.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_get_device_num_logins.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_get_device_rw_variables.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_get_device_variable_description.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_get_device_variable_values.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_get_device_variables.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_get_devices.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_has_device.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_has_device_command.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_has_device_variable.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_logout.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_set_device_variable_value.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_set_device_variable_values.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_tcp_create_client.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_tcp_disconnect.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_tcp_get_timeout.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_tcp_is_connected.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_tcp_reconnect.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutclient_tcp_set_timeout.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutscan.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutscan_add_device_to_device.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutscan_add_option_to_device.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutscan_cidr_to_ip.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutscan_display_parsable.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutscan_display_ups_conf.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutscan_free_device.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutscan_get_serial_ports_list.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutscan_init.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutscan_new_device.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutscan_scan_avahi.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutscan_scan_eaton_serial.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutscan_scan_ipmi.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutscan_scan_nut.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutscan_scan_snmp.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutscan_scan_usb.3.gz +%%MANPAGES%%%%DEV%%man/man3/nutscan_scan_xml_http_range.3.gz +%%MANPAGES%%%%DEV%%man/man3/upscli_add_host_cert.3.gz +%%MANPAGES%%%%DEV%%man/man3/upscli_cleanup.3.gz +%%MANPAGES%%%%DEV%%man/man3/upscli_connect.3.gz +%%MANPAGES%%%%DEV%%man/man3/upscli_disconnect.3.gz +%%MANPAGES%%%%DEV%%man/man3/upscli_fd.3.gz +%%MANPAGES%%%%DEV%%man/man3/upscli_get.3.gz +%%MANPAGES%%%%DEV%%man/man3/upscli_init.3.gz +%%MANPAGES%%%%DEV%%man/man3/upscli_list_next.3.gz +%%MANPAGES%%%%DEV%%man/man3/upscli_list_start.3.gz +%%MANPAGES%%%%DEV%%man/man3/upscli_readline.3.gz +%%MANPAGES%%%%DEV%%man/man3/upscli_readline_timeout.3.gz +%%MANPAGES%%%%DEV%%man/man3/upscli_sendline.3.gz +%%MANPAGES%%%%DEV%%man/man3/upscli_sendline_timeout.3.gz +%%MANPAGES%%%%DEV%%man/man3/upscli_splitaddr.3.gz +%%MANPAGES%%%%DEV%%man/man3/upscli_splitname.3.gz +%%MANPAGES%%%%DEV%%man/man3/upscli_ssl.3.gz +%%MANPAGES%%%%DEV%%man/man3/upscli_strerror.3.gz +%%MANPAGES%%%%DEV%%man/man3/upscli_upserror.3.gz +%%MANPAGES%%%%DEV%%man/man3/upsclient.3.gz %%MANPAGES%%man/man5/nut.conf.5.gz %%MANPAGES%%man/man5/ups.conf.5.gz %%MANPAGES%%man/man5/upsd.conf.5.gz