Index: head/sysutils/nut-devel/Makefile =================================================================== --- head/sysutils/nut-devel/Makefile (revision 552927) +++ head/sysutils/nut-devel/Makefile (revision 552928) @@ -1,214 +1,215 @@ # Created by: Boris Popov # $FreeBSD$ PORTNAME= nut PORTVERSION= ${NUT_COMMIT_DATE} +PORTREVISION= 1 CATEGORIES= sysutils 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= 79a2f758 NUT_COMMIT_DATE= 2020.10.14 BROKEN_powerpc64= Poudriere builds fail. BROKEN_powerpc= Poudriere builds fail. GNU_CONFIGURE= yes USE_LDCONFIG= yes USES= autoreconf:build gmake libtool pkgconfig python:build NUT_USER?= uucp NUT_GROUP?= uucp STATEDIR?= /var/db/nut PLIST_SUB+= NUT_USER=${NUT_USER} PLIST_SUB+= NUT_GROUP=${NUT_GROUP} OPTIONS_DEFAULT=SERIAL USB SNMP NEON IPMI_OFF SSL_OFF OPTIONS_DEFINE= SERIAL USB SNMP NEON PDU CGI BASH AVAHI DOCS OPTIONS_SINGLE= IPMI SSL OPTIONS_SINGLE_IPMI= IPMI_OFF IPMIPSU FREEIPMI OPTIONS_SINGLE_SSL= SSL_OFF OPENSSL NSS SERIAL_DESC= SERIAL support USB_DESC= USB support SNMP_DESC= SNMP support NEON_DESC= NEON XML/HTTP support PDU_DESC= Powerman PDU support CGI_DESC= Web CGI interface BASH_DESC= Bash Completion support AVAHI_DESC= Avahi support IPMI_OFF_DESC= No IPMI support FREEIPMI_DESC= freeipmi support IPMIPSU_DESC= Use nut-ipmipsu support (experimental) SSL_OFF_DESC= No SSL support USE_RC_SUBR= nut nut_upsmon nut_upslog SUB_LIST+= STATEDIR=${STATEDIR} PLIST_SUB+= STATEDIR=${STATEDIR} PORTDOCS= * .include CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/nut \ --program-transform-name="" \ --localstatedir=${STATEDIR} \ --datadir=${PREFIX}/etc/nut \ --with-devd-dir=${PREFIX}/etc/devd \ --with-drvpath=${PREFIX}/libexec/nut \ --with-statepath=${STATEDIR} \ --with-altpidpath=${STATEDIR} \ --with-pidpath=${STATEDIR} \ --with-pkgconfig-dir=${PREFIX}/libdata/pkgconfig \ --with-user=${NUT_USER} \ --with-group=${NUT_GROUP} \ --with-dev BUILD_DEPENDS= asciidoc:textproc/asciidoc .if ${PORT_OPTIONS:MCGI} LIB_DEPENDS+= libgd.so:graphics/gd CGIDIR?= ${PREFIX}/www/cgi-bin/${PORTNAME} CGIDIR_REL?= ${CGIDIR:S,^${PREFIX}/,,} CONFIGURE_ARGS+= --with-cgi --with-cgipath=${CGIDIR} \ --with-htmlpath=${WWWDIR} \ --with-gd-includes=-I${LOCALBASE}/include \ --with-gd-libs="-L${LOCALBASE}/lib -lgd" PLIST_SUB+= NUT_CGI="" PLIST_SUB+= CGIDIR="${CGIDIR_REL}" PLIST_SUB+= CGIETCDIR="etc/nut/" .else CONFIGURE_ARGS+= --without-cgi PLIST_SUB+= NUT_CGI="@comment " .endif .if ${PORT_OPTIONS:MSERIAL} CONFIGURE_ARGS+= --with-serial PLIST_SUB+= NUT_SERIAL="" .else CONFIGURE_ARGS+= --without-serial PLIST_SUB+= NUT_SERIAL="@comment " .endif .if ${PORT_OPTIONS:MUSB} #EXTRA_PATCHES= ${FILESDIR}/extra-patch-m4_nut_check_libusb.m4 CONFIGURE_ARGS+= --with-usb=auto PLIST_SUB+= NUT_USB="" .else CONFIGURE_ARGS+= --without-usb PLIST_SUB+= NUT_USB="@comment " .endif .if ${PORT_OPTIONS:MSNMP} LIB_DEPENDS+= libnetsnmp.so:net-mgmt/net-snmp CONFIGURE_ARGS+= --with-snmp PLIST_SUB+= NUT_SNMP="" .else CONFIGURE_ARGS+= --without-snmp PLIST_SUB+= NUT_SNMP="@comment " .endif .if ${PORT_OPTIONS:MNEON} LIB_DEPENDS+= libneon.so:www/neon CONFIGURE_ARGS+= --with-neon PLIST_SUB+= NUT_NEON="" .else CONFIGURE_ARGS+= --without-neon CONFIGURE_ARGS+= --disable-neon PLIST_SUB+= NUT_NEON="@comment " .endif .if ${PORT_OPTIONS:MPDU} LIB_DEPENDS+= libpowerman.so:sysutils/powerman CONFIGURE_ARGS+= --with-powerman PLIST_SUB+= NUT_PDU="" .else CONFIGURE_ARGS+= --without-powerman PLIST_SUB+= NUT_PDU="@comment " .endif .if ${PORT_OPTIONS:MBASH} BUILD_DEPENDS+= ${LOCALBASE}/share/bash-completion/bash_completion.sh:shells/bash-completion RUN_DEPENDS+= ${LOCALBASE}/share/bash-completion/bash_completion.sh:shells/bash-completion PLIST_SUB+= BASH="" .else PLIST_SUB+= BASH="@comment " .endif .if ${PORT_OPTIONS:MAVAHI} BUILD_DEPENDS+= ${LOCALBASE}/include/avahi-ui/avahi-ui.h:net/avahi-header BUILD_DEPENDS+= avahi-daemon:net/avahi-app RUN_DEPENDS+= avahi-daemon:net/avahi-app CONFIGURE_ARGS+= --with-avahi .else CONFIGURE_ARGS+= --without-avahi .endif .if ${PORT_OPTIONS:MFREEIPMI} LIB_DEPENDS+= libfreeipmi.so:sysutils/freeipmi CONFIGURE_ARGS+= --with-freeipmi PLIST_SUB+= NUT_FREEIPMI="" .else CONFIGURE_ARGS+= --without-freeipmi PLIST_SUB+= NUT_FREEIPMI="@comment " .endif .if ${PORT_OPTIONS:MIPMIPSU} LIB_DEPENDS+= libfreeipmi.so:sysutils/freeipmi CONFIGURE_ARGS+= --with-ipmi PLIST_SUB+= NUT_IPMIPSU="" .else CONFIGURE_ARGS+= --without-ipmi PLIST_SUB+= NUT_IPMIPSU="@comment " .endif .if ${PORT_OPTIONS:MOPENSSL} USES+= ssl CONFIGURE_ARGS+= --with-openssl .elif ${PORT_OPTIONS:MNSS} LIB_DEPENDS= libnss3.so:security/nss CONFIGURE_ARGS+= --with-nss .else CONFIGURE_ARGS+= --without-openssl --without-ssl .endif post-patch: @${REINPLACE_CMD} -i '' -e 's|python|${PYTHON_CMD}|' ${WRKSRC}/autogen.sh @${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -i '' -e 's|/usr/bin/env python|${PYTHON_CMD}|' pre-configure: cd ${WRKSRC} && ./autogen.sh pre-install: @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/nut @${REINPLACE_CMD} -e 's/device-name\*/cdev/g' ${WRKSRC}/scripts/devd/nut-usb.conf post-install: @${MKDIR} ${STAGEDIR}${STATEDIR} @${MKDIR} ${STAGEDIR}${PREFIX}/etc/syslog.d .if ${PORT_OPTIONS:MBASH} @${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d/ ${INSTALL_DATA} ${WRKSRC}/scripts/misc/nut.bash_completion ${STAGEDIR}${PREFIX}/etc/bash_completion.d/ .endif .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR}/cables ${INSTALL_DATA} ${WRKSRC}/docs/cables/*.txt ${STAGEDIR}${DOCSDIR}/cables ${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/FAQ.txt ${STAGEDIR}${DOCSDIR} .for file in AUTHORS COPYING INSTALL MAINTAINERS NEWS README UPGRADING ${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR} .endfor .endif @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${PATCHDIR}/nut.syslog ${STAGEDIR}${EXAMPLESDIR}/syslog.sample ${INSTALL_DATA} ${PATCHDIR}/nut.newsyslog ${STAGEDIR}${EXAMPLESDIR}/newsyslog.sample ${MKDIR} ${STAGEDIR}/var/log/nut .include Index: head/sysutils/nut-devel/files/patch-drivers_main.c =================================================================== --- head/sysutils/nut-devel/files/patch-drivers_main.c (nonexistent) +++ head/sysutils/nut-devel/files/patch-drivers_main.c (revision 552928) @@ -0,0 +1,44 @@ +diff --git drivers/main.c drivers/main.c +old mode 100755 +new mode 100644 +index f53322e2..0b6759dd +--- drivers/main.c ++++ drivers/main.c +@@ -607,9 +607,9 @@ int main(int argc, char **argv) + + become_user(new_uid); + +- /* Only switch to statepath if we're not powering off or just dumping data, for discovery */ ++ /* Only switch to statepath if we're not powering off */ + /* This avoid case where ie /var is umounted */ +- if ((!do_forceshutdown) && (dump_data < 0) && (chdir(dflt_statepath()))) ++ if ((!do_forceshutdown) && (chdir(dflt_statepath()))) + fatal_with_errno(EXIT_FAILURE, "Can't chdir to %s", dflt_statepath()); + + /* Setup signals to communicate with driver once backgrounded. */ +@@ -642,11 +642,8 @@ int main(int argc, char **argv) + sleep(5); + } + +- /* Only write pid if we're not just dumping data, for discovery */ +- if (dump_data < 0) { +- pidfn = xstrdup(buffer); +- writepid(pidfn); /* before backgrounding */ +- } ++ pidfn = xstrdup(buffer); ++ writepid(pidfn); /* before backgrounding */ + } + + /* clear out callback handler data */ +@@ -701,10 +698,7 @@ int main(int argc, char **argv) + } + + /* now we can start servicing requests */ +- /* Only write pid if we're not just dumping data, for discovery */ +- if (dump_data < 0) { +- dstate_init(progname, upsname); +- } ++ dstate_init(progname, upsname); + + /* The poll_interval may have been changed from the default */ + dstate_setinfo("driver.parameter.pollinterval", "%d", poll_interval); Property changes on: head/sysutils/nut-devel/files/patch-drivers_main.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property