Date: Tue, 7 Mar 2017 10:21:01 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r435590 - in head/sysutils/apcupsd: . files Message-ID: <201703071021.v27AL1rt089152@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Tue Mar 7 10:21:01 2017 New Revision: 435590 URL: https://svnweb.freebsd.org/changeset/ports/435590 Log: - Enable SNMP driver by default due to popular demand [1] - Rename option USB -> USB_DRV for consistency with other drivers and provide better option names while I'm here - Remove hand-rolled `post-install' target now that @sample files are installed properly - Reorder some knobs and drop CPPFLAGS/LIBS now that those seem to be detected correctly PR: 215153 [1] Added: head/sysutils/apcupsd/files/patch-platforms_etc_Makefile (contents, props changed) head/sysutils/apcupsd/files/patch-src_cgi_Makefile (contents, props changed) Modified: head/sysutils/apcupsd/Makefile Modified: head/sysutils/apcupsd/Makefile ============================================================================== --- head/sysutils/apcupsd/Makefile Tue Mar 7 10:07:08 2017 (r435589) +++ head/sysutils/apcupsd/Makefile Tue Mar 7 10:21:01 2017 (r435590) @@ -3,6 +3,7 @@ PORTNAME= apcupsd PORTVERSION= 3.14.14 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20-%20Stable/${PORTVERSION} @@ -11,12 +12,8 @@ COMMENT= Set of programs for controlling LICENSE= GPLv2 -USE_RC_SUBR= apcupsd -SUB_FILES= pkg-message - -GNU_CONFIGURE= yes USES= gmake -OPTIONS_SUB= yes +GNU_CONFIGURE= yes CONFIGURE_ARGS= --sbindir=${PREFIX}/sbin \ --with-nologin=/var/run \ --disable-install-distdir \ @@ -25,24 +22,29 @@ CONFIGURE_ARGS= --sbindir=${PREFIX}/sbin CONFIGURE_ENV+= LD="${CXX}" \ ac_cv_path_SHUTDOWN="/sbin/shutdown" -CPPFLAGS+= -I${LOCALBASE}/include -LIBS+= -L${LOCALBASE}/lib -OPTIONS_DEFINE= APCSMART_DRV APCDUMB_DRV CLIENT_ONLY CGI PCNET_DRV USB SNMP_DRV \ - SNMP_DRV_OLD TCP_WRAPPERS TEST_DRV GAPCMON DOCS MODBUS -OPTIONS_DEFAULT= APCSMART_DRV APCDUMB_DRV PCNET_DRV USB TCP_WRAPPERS MODBUS -APCSMART_DRV_DESC= Compile APC SmartUPS serial driver -APCDUMB_DRV_DESC= Compile dumb UPS driver +USE_RC_SUBR= apcupsd +SUB_FILES= pkg-message + +OPTIONS_DEFINE= APCSMART_DRV APCDUMB_DRV CLIENT_ONLY CGI PCNET_DRV USB_DRV \ + SNMP_DRV SNMP_DRV_OLD TCP_WRAPPERS TEST_DRV GAPCMON \ + DOCS MODBUS +OPTIONS_DEFAULT= APCSMART_DRV APCDUMB_DRV PCNET_DRV SNMP_DRV USB_DRV \ + TCP_WRAPPERS MODBUS +OPTIONS_SUB= yes + +APCSMART_DRV_DESC= APC SmartUPS serial driver support +APCDUMB_DRV_DESC= Dumb UPS driver support CLIENT_ONLY_DESC= Only NIS client (no network server or drivers) -CGI_DESC= Compile with CGI programs to show status -PCNET_DRV_DESC= Compile PowerChute Network Shutdown driver -USB_DESC= Compile with USB Support driver -SNMP_DRV_DESC= Compile with SNMP driver -SNMP_DRV_OLD_DESC= Compile with old SNMP driver -TCP_WRAPPERS_DESC= Compile with TCP_WRAPPERS support -TEST_DRV_DESC= Compile TEST driver +CGI_DESC= Build CGI programs to show status +PCNET_DRV_DESC= PowerChute Network Shutdown driver support +USB_DRV_DESC= USB driver support +SNMP_DRV_DESC= SNMP driver support +SNMP_DRV_OLD_DESC= Old SNMP driver support +TCP_WRAPPERS_DESC= ${LIBWRAP_DESC} +TEST_DRV_DESC= Test driver support GAPCMON_DESC= Build GTK GUI front-end -MODBUS_DESC= Compile with MODBUS driver +MODBUS_DESC= MODBUS driver support #PORTDOCS= ${PORTNAME}.pdf @@ -59,7 +61,7 @@ GAPCMON_USES= pkgconfig GAPCMON_USE= GNOME=gconf2 GAPCMON_CONFLICTS= gapcmon-[0-9]* PCNET_DRV_CONFIGURE_ENABLE= pcnet -USB_CONFIGURE_ENABLE= usb +USB_DRV__CONFIGURE_ENABLE= usb SNMP_DRV_CONFIGURE_ENABLE= snmp MODBUS_CONFIGURE_ENABLE= modbus SNMP_DRV_OLD_CONFIGURE_ENABLE= net-snmp @@ -76,7 +78,7 @@ TEST_DRV_CONFIGURE_ENABLE= test pre-configure: .if ${PORT_OPTIONS:MCLIENT_ONLY} && ( ${PORT_OPTIONS:MAPCSMART_DRV} || \ ${PORT_OPTIONS:MAPCDUMB_DRV} || ${PORT_OPTIONS:MPCNET_DRV} || \ - ${PORT_OPTIONS:MUSB} || \ + ${PORT_OPTIONS:MUSB_DRV} || \ ${PORT_OPTIONS:MSNMP_DRV} || ${PORT_OPTIONS:MTEST_DRV} ) @${ECHO_CMD} "It doesn't make sense to build drivers if all you want is" @${ECHO_CMD} "the client; please do make config and select either" @@ -84,13 +86,4 @@ pre-configure: @${FALSE} .endif -post-install: - @${ECHO_CMD} "@unexec if [ -d %D/${ETCDIR_REL} ]; then ${ECHO_CMD} \"If you are permanently removing this port, you should do a ``rm -rf ${ETCDIR}`` to remove config files left.\" | ${FMT} ; fi" >> ${TMPPLIST} -# Install sample startup script - for na in apcupsd.conf apcupsd.css hosts.conf multimon.conf; do \ - if [ -f ${STAGEDIR}${ETCDIR}/$$na ]; then \ - ${MV} ${STAGEDIR}${ETCDIR}/$$na ${STAGEDIR}${ETCDIR}/$$na.sample; \ - fi \ - done - .include <bsd.port.mk> Added: head/sysutils/apcupsd/files/patch-platforms_etc_Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/apcupsd/files/patch-platforms_etc_Makefile Tue Mar 7 10:21:01 2017 (r435590) @@ -0,0 +1,11 @@ +--- platforms/etc/Makefile.orig 2014-04-09 22:15:34 UTC ++++ platforms/etc/Makefile +@@ -8,7 +8,7 @@ all-uninstall: uninstall-etc + + install-etc: + $(call MKDIR,$(sysconfdir)) +- $(call INSTNEW,644,apcupsd.conf,$(sysconfdir)) ++ $(call INSTDATA,644,apcupsd.conf,$(sysconfdir)/apcupsd.conf.sample) + $(call INSTORIG,744,changeme,$(sysconfdir)) + $(call INSTORIG,744,commfailure,$(sysconfdir)) + $(call INSTORIG,744,commok,$(sysconfdir)) Added: head/sysutils/apcupsd/files/patch-src_cgi_Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/apcupsd/files/patch-src_cgi_Makefile Tue Mar 7 10:21:01 2017 (r435590) @@ -0,0 +1,15 @@ +--- src/cgi/Makefile.orig 2014-11-04 19:17:43 UTC ++++ src/cgi/Makefile +@@ -43,9 +43,9 @@ install-cgi: + $(call INSTPROG,755,upsfstats.cgi,$(cgibin)) + $(call INSTPROG,755,upsimage.cgi,$(cgibin)) + $(call MKDIR,$(sysconfdir)) +- $(call INSTNEW,644,apcupsd.css,$(sysconfdir)) +- $(call INSTNEW,644,$(topdir)/platforms/etc/hosts.conf,$(sysconfdir)) +- $(call INSTNEW,644,$(topdir)/platforms/etc/multimon.conf,$(sysconfdir)) ++ $(call INSTDATA,644,apcupsd.css,$(sysconfdir)/apcupsd.css.sample) ++ $(call INSTDATA,644,$(topdir)/platforms/etc/hosts.conf,$(sysconfdir)/hosts.conf.sample) ++ $(call INSTDATA,644,$(topdir)/platforms/etc/multimon.conf,$(sysconfdir)/multimon.conf.sample) + + uninstall-cgi: + $(call UNINST,$(cgibin)/multimon.cgi)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703071021.v27AL1rt089152>