Attachment #126108 for bug #169827

View | Details | Raw Unified | Return to bug 169827
Collapse All | Expand All

Lines 6-12 Link Here

(-)Makefile (-19 / +22 lines)
6	#	6	#
7		7
8	PORTNAME= nut	8	PORTNAME= nut
9	PORTVERSION= 2.6.1	9	PORTVERSION= 2.6.4
10	CATEGORIES= sysutils	10	CATEGORIES= sysutils
11	MASTER_SITES= http://www.networkupstools.org/source/${PORTVERSION:R}/	11	MASTER_SITES= http://www.networkupstools.org/source/${PORTVERSION:R}/
12	DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig	12	DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig
Lines 25-38 Link Here
25	NUT_GROUP?= uucp	25	NUT_GROUP?= uucp
26	STATEDIR?= /var/db/nut	26	STATEDIR?= /var/db/nut
27		27
28	OPTIONS= SERIAL "SERIAL support" on \	28	OPTIONS_DEFINE= SERIAL USB SNMP NEON PDU HAL CGI BASH
29	USB "USB support" on \	29	OPTIONS_DEFAULT=SERIAL USB SNMP NEON
30	SNMP "SNMP support" on \	30
31	NEON "NEON XML/HTTP support" on \	31	SERIAL_DESC= SERIAL support
32	PDU "Powerman PDU support" off \	32	USB_DESC= USB support
33	HAL "HAL support" off \	33	SNMP_DESC= SNMP support
34	CGI "Web CGI interface" off \	34	NEON_DESC= NEON XML/HTTP support
35	BASH "Bash Completion support" off	35	PDU_DESC= Powerman PDU support
		36	CGI_DESC= Web CGI interface
		37	BASH_DESC= Bash Completion support
36		38
37	USE_RC_SUBR= nut.sh nut_upsmon.sh nut_upslog.sh	39	USE_RC_SUBR= nut.sh nut_upsmon.sh nut_upslog.sh
38	SUB_LIST+= STATEDIR=${STATEDIR}	40	SUB_LIST+= STATEDIR=${STATEDIR}
Lines 67-73 Link Here
67	--with-group=${NUT_GROUP} \	69	--with-group=${NUT_GROUP} \
68	--with-dev	70	--with-dev
69		71
70	.if defined(WITH_CGI)	72	.if ${PORT_OPTIONS:MCGI}
71	LIB_DEPENDS+= gd.4:${PORTSDIR}/graphics/gd	73	LIB_DEPENDS+= gd.4:${PORTSDIR}/graphics/gd
72	MAN5+= hosts.conf.5 upsset.conf.5 upsstats.html.5	74	MAN5+= hosts.conf.5 upsset.conf.5 upsstats.html.5
73	MAN8+= upsset.cgi.8 upsstats.cgi.8 upsimage.cgi.8	75	MAN8+= upsset.cgi.8 upsstats.cgi.8 upsimage.cgi.8
Lines 85-91 Link Here
85	PLIST_SUB+= NUT_CGI="@comment "	87	PLIST_SUB+= NUT_CGI="@comment "
86	.endif	88	.endif
87		89
88	.if !defined(WITHOUT_SERIAL)	90	.if ${PORT_OPTIONS:MSERIAL}
89	CONFIGURE_ARGS+= --with-serial	91	CONFIGURE_ARGS+= --with-serial
90	MAN8+= apcsmart.8 bestfortress.8 bcmxcp.8 belkin.8 belkinunv.8 \	92	MAN8+= apcsmart.8 bestfortress.8 bcmxcp.8 belkin.8 belkinunv.8 \
91	bestuferrups.8 bestups.8 bestfcom.8 blazer.8 clone.8 \	93	bestuferrups.8 bestups.8 bestfcom.8 blazer.8 clone.8 \
Lines 100-106 Link Here
100	PLIST_SUB+= NUT_SERIAL="@comment "	102	PLIST_SUB+= NUT_SERIAL="@comment "
101	.endif	103	.endif
102		104
103	.if !defined(WITHOUT_USB)	105	.if ${PORT_OPTIONS:MUSB}
104	. if ${OSVERSION} < 800069	106	. if ${OSVERSION} < 800069
105	LIB_DEPENDS+= usb-0.1.8:${PORTSDIR}/devel/libusb	107	LIB_DEPENDS+= usb-0.1.8:${PORTSDIR}/devel/libusb
106	. else	108	. else
Lines 114-120 Link Here
114	PLIST_SUB+= NUT_USB="@comment "	116	PLIST_SUB+= NUT_USB="@comment "
115	.endif	117	.endif
116		118
117	.if !defined(WITHOUT_SNMP)	119	.if ${PORT_OPTIONS:MSNMP}
118	LIB_DEPENDS+= netsnmp.30:${PORTSDIR}/net-mgmt/net-snmp	120	LIB_DEPENDS+= netsnmp.30:${PORTSDIR}/net-mgmt/net-snmp
119	CONFIGURE_ARGS+= --with-snmp	121	CONFIGURE_ARGS+= --with-snmp
120	MAN8+= snmp-ups.8	122	MAN8+= snmp-ups.8
Lines 124-130 Link Here
124	PLIST_SUB+= NUT_SNMP="@comment "	126	PLIST_SUB+= NUT_SNMP="@comment "
125	.endif	127	.endif
126		128
127	.if !defined(WITHOUT_NEON)	129	.if ${PORT_OPTIONS:MNEON}
128	LIB_DEPENDS+= neon.27:${PORTSDIR}/www/neon29	130	LIB_DEPENDS+= neon.27:${PORTSDIR}/www/neon29
129	CONFIGURE_ARGS+= --with-neonxml	131	CONFIGURE_ARGS+= --with-neonxml
130	MAN8+= netxml-ups.8	132	MAN8+= netxml-ups.8
Lines 134-140 Link Here
134	PLIST_SUB+= NUT_NEON="@comment "	136	PLIST_SUB+= NUT_NEON="@comment "
135	.endif	137	.endif
136		138
137	.if defined(WITH_PDU)	139	.if ${PORT_OPTIONS:MPDU}
138	LIB_DEPENDS+= powerman.0:${PORTSDIR}/sysutils/powerman	140	LIB_DEPENDS+= powerman.0:${PORTSDIR}/sysutils/powerman
139	CONFIGURE_ARGS+= --with-powerman	141	CONFIGURE_ARGS+= --with-powerman
140	MAN8+= powerman-pdu.8	142	MAN8+= powerman-pdu.8
Lines 144-151 Link Here
144	PLIST_SUB+= NUT_PDU="@comment "	146	PLIST_SUB+= NUT_PDU="@comment "
145	.endif	147	.endif
146		148
147	.if defined(WITH_HAL)	149	.if ${PORT_OPTIONS:MHAL}
148	. if defined(WITHOUT_USB)	150	. if empty(PORT_OPTIONS:MUSB)
149	BROKEN= HAL is only usable with USB support enabled. Run 'make config' again!	151	BROKEN= HAL is only usable with USB support enabled. Run 'make config' again!
150	. endif	152	. endif
151	LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal	153	LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal
Lines 158-164 Link Here
158	PLIST_SUB+= NUT_HAL="@comment "	160	PLIST_SUB+= NUT_HAL="@comment "
159	.endif	161	.endif
160		162
161	.if defined(WITH_BASH)	163	.if ${PORT_OPTIONS:MBASH}
162	RUN_DEPENDS+= ${LOCALBASE}/bin/bash_completion.sh:${PORTSDIR}/shells/bash-completion	164	RUN_DEPENDS+= ${LOCALBASE}/bin/bash_completion.sh:${PORTSDIR}/shells/bash-completion
163	PLIST_SUB+= BASH=""	165	PLIST_SUB+= BASH=""
164	.else	166	.else
Lines 177-183 Link Here
177		179
178	.if !defined(NOPORTDOCS)	180	.if !defined(NOPORTDOCS)
179	post-install:	181	post-install:
180	.if defined(WITH_BASH)	182	.if ${PORT_OPTIONS:MBASH}
		183	@${MKDIR} ${PREFIX}/etc/bash_completion.d/
181	${INSTALL_DATA} ${WRKSRC}/scripts/misc/nut.bash_completion ${PREFIX}/etc/bash_completion.d/	184	${INSTALL_DATA} ${WRKSRC}/scripts/misc/nut.bash_completion ${PREFIX}/etc/bash_completion.d/
182	.endif	185	.endif
183	@${MKDIR} ${DOCSDIR}/cables	186	@${MKDIR} ${DOCSDIR}/cables

Lines 1-4 Link Here

(-)distinfo (-4 / +4 lines)
1	SHA256 (nut-2.6.1.tar.gz) = f5c46b856c0cf5b7f0e4b22d82b670af64cc98717a90eaac8723dd402a181c00	1	SHA256 (nut-2.6.4.tar.gz) = 4a8455ca7ba2e18b57a39206acc5a496e855d845828e970822bd84afd1178fe5
2	SIZE (nut-2.6.1.tar.gz) = 1776645	2	SIZE (nut-2.6.4.tar.gz) = 1992488
3	SHA256 (nut-2.6.1.tar.gz.sig) = 780be2a54fcd4df1124f8dcec4e49df3c1c7a985e030856dbe63fd77d0e76ea8	3	SHA256 (nut-2.6.4.tar.gz.sig) = a364d09b9c6877c1542183dd7eac35cf189ab9d178532d6fd29a04662560754f
4	SIZE (nut-2.6.1.tar.gz.sig) = 72	4	SIZE (nut-2.6.4.tar.gz.sig) = 72




%%NUT_CGI%%%%CGIDIR%%/upsimage.cgi
%%NUT_CGI%%%%CGIDIR%%/upsset.cgi
%%NUT_CGI%%%%CGIDIR%%/upsstats.cgi
%%NUT_CGI%%%%CGIETCDIR%%/hosts.conf.sample
%%NUT_CGI%%%%CGIETCDIR%%/upsset.conf.sample
%%NUT_CGI%%%%CGIETCDIR%%/upsstats.html.sample
%%NUT_CGI%%%%CGIETCDIR%%/upsstats-single.html.sample
%%NUT_CGI%%%%WWWDIR%%/bottom.html
%%NUT_CGI%%%%WWWDIR%%/header.html
%%NUT_CGI%%%%WWWDIR%%/index.html
%%NUT_CGI%%%%WWWDIR%%/nut-banner.png
%%ETCDIR%%/cmdvartab
%%ETCDIR%%/driver.list
%%ETCDIR%%/nut.conf.sample
%%ETCDIR%%/ups.conf.sample
%%ETCDIR%%/upsd.conf.sample
%%ETCDIR%%/upsd.users.sample
%%ETCDIR%%/upsmon.conf.sample
%%ETCDIR%%/upssched.conf.sample
@stopdaemon nut_upsmon
@stopdaemon nut_upslog
@stopdaemon nut

bin/upsrw
bin/upssched-cmd
%%BASH%%etc/bash_completion.d/nut.bash_completion
include/nut-scan.h
include/nutscan-device.h
include/nutscan-init.h
include/nutscan-ip.h
etc/nut/upsd.conf.sample
etc/nut/upsd.users.sample
etc/nut/upsmon.conf.sample
etc/nut/upssched.conf.sample
include/parseconf.h
include/upsclient.h
lib/libupsclient.a
lib/libupsclient.so.1
lib/libupsclient.so
lib/libupsclient.la
lib/libupsclient.so
lib/libupsclient.so.2
libdata/pkgconfig/libnutscan.pc
libdata/pkgconfig/libupsclient.pc
%%NUT_HAL%%libexec/hald-addon-bcmxcp_usb
%%NUT_HAL%%libexec/hald-addon-blazer_usb
%%NUT_HAL%%libexec/hald-addon-tripplite_usb
%%NUT_HAL%%libexec/hald-addon-usbhid-ups
%%NUT_SERIAL%%libexec/nut/apcsmart
%%NUT_SERIAL%%libexec/nut/apcsmart-old
%%NUT_SERIAL%%libexec/nut/bcmxcp
%%NUT_USB%%libexec/nut/bcmxcp_usb
%%NUT_SERIAL%%libexec/nut/belkin
%%NUT_SERIAL%%libexec/nut/belkinunv
%%NUT_SERIAL%%libexec/nut/bestfcom
%%NUT_SERIAL%%libexec/nut/bestfortress
%%NUT_SERIAL%%libexec/nut/bestuferrups
%%NUT_SERIAL%%libexec/nut/bestups
%%NUT_SERIAL%%libexec/nut/blazer_ser

%%NUT_SERIAL%%libexec/nut/rhino
%%NUT_USB%%libexec/nut/richcomm_usb
%%NUT_SERIAL%%libexec/nut/safenet
%%NUT_SNMP%%libexec/nut/snmp-ups
%%NUT_SERIAL%%libexec/nut/skel
%%NUT_SNMP%%libexec/nut/snmp-ups
%%NUT_SERIAL%%libexec/nut/solis
%%NUT_SERIAL%%libexec/nut/tripplite
%%NUT_USB%%libexec/nut/tripplite_usb

libexec/nut/upsdrvctl
%%NUT_USB%%libexec/nut/usbhid-ups
%%NUT_SERIAL%%libexec/nut/victronups
libdata/pkgconfig/libupsclient.pc
sbin/upsd
sbin/upsmon
sbin/upssched
%%NUT_HAL%%share/hal/fdi/information/20thirdparty/20-ups-nut-device.fdi
@dirrmtry share/hal/fdi/information/20thirdparty
@dirrmtry %%CGIDIR%%
@dirrmtry %%ETCDIR%%
@dirrmtry %%WWWDIR%%
@dirrmtry etc/bash_completion.d
%%NUT_CGI%%%%CGIETCDIR%%/upsstats.html.sample
%%NUT_CGI%%%%CGIETCDIR%%/upsstats-single.html.sample
%%NUT_CGI%%%%WWWDIR%%/bottom.html
%%NUT_CGI%%%%WWWDIR%%/header.html
%%NUT_CGI%%%%WWWDIR%%/index.html
%%NUT_CGI%%%%WWWDIR%%/nut-banner.png
@dirrmtry etc/nut
@dirrmtry libdata/pkgconfig
@dirrmtry libexec/nut
@dirrmtry %%STATEDIR%%
%%NUT_CGI%%@dirrm %%CGIDIR%%
%%NUT_CGI%%@dirrmtry www/cgi-bin
%%NUT_CGI%%@dirrm %%WWWDIR%%

Return to bug 169827

Lines 1-3 Link Here

(-)pkg-plist (-31 / +36 lines)
		1	%%NUT_CGI%%%%CGIDIR%%/upsimage.cgi
		2	%%NUT_CGI%%%%CGIDIR%%/upsset.cgi
		3	%%NUT_CGI%%%%CGIDIR%%/upsstats.cgi
		4	%%NUT_CGI%%%%CGIETCDIR%%/hosts.conf.sample
		5	%%NUT_CGI%%%%CGIETCDIR%%/upsset.conf.sample
		6	%%NUT_CGI%%%%CGIETCDIR%%/upsstats.html.sample
		7	%%NUT_CGI%%%%CGIETCDIR%%/upsstats-single.html.sample
		8	%%NUT_CGI%%%%WWWDIR%%/bottom.html
		9	%%NUT_CGI%%%%WWWDIR%%/header.html
		10	%%NUT_CGI%%%%WWWDIR%%/index.html
		11	%%NUT_CGI%%%%WWWDIR%%/nut-banner.png
		12	%%ETCDIR%%/cmdvartab
		13	%%ETCDIR%%/driver.list
		14	%%ETCDIR%%/nut.conf.sample
		15	%%ETCDIR%%/ups.conf.sample
		16	%%ETCDIR%%/upsd.conf.sample
		17	%%ETCDIR%%/upsd.users.sample
		18	%%ETCDIR%%/upsmon.conf.sample
		19	%%ETCDIR%%/upssched.conf.sample
1	@stopdaemon nut_upsmon	20	@stopdaemon nut_upsmon
2	@stopdaemon nut_upslog	21	@stopdaemon nut_upslog
3	@stopdaemon nut	22	@stopdaemon nut
Lines 7-37 Link Here
7	bin/upsrw	26	bin/upsrw
8	bin/upssched-cmd	27	bin/upssched-cmd
9	%%BASH%%etc/bash_completion.d/nut.bash_completion	28	%%BASH%%etc/bash_completion.d/nut.bash_completion
10	etc/nut/cmdvartab	29	include/nut-scan.h
11	etc/nut/driver.list	30	include/nutscan-device.h
12	etc/nut/nut.conf.sample	31	include/nutscan-init.h
13	etc/nut/ups.conf.sample	32	include/nutscan-ip.h
14	etc/nut/upsd.conf.sample
15	etc/nut/upsd.users.sample
16	etc/nut/upsmon.conf.sample
17	etc/nut/upssched.conf.sample
18	include/parseconf.h	33	include/parseconf.h
19	include/upsclient.h	34	include/upsclient.h
20	lib/libupsclient.a	35	lib/libupsclient.a
21	lib/libupsclient.so.1
22	lib/libupsclient.so
23	lib/libupsclient.la	36	lib/libupsclient.la
24	%%NUT_HAL%%libexec/hald-addon-blazer_usb	37	lib/libupsclient.so
		38	lib/libupsclient.so.2
		39	libdata/pkgconfig/libnutscan.pc
		40	libdata/pkgconfig/libupsclient.pc
25	%%NUT_HAL%%libexec/hald-addon-bcmxcp_usb	41	%%NUT_HAL%%libexec/hald-addon-bcmxcp_usb
		42	%%NUT_HAL%%libexec/hald-addon-blazer_usb
26	%%NUT_HAL%%libexec/hald-addon-tripplite_usb	43	%%NUT_HAL%%libexec/hald-addon-tripplite_usb
27	%%NUT_HAL%%libexec/hald-addon-usbhid-ups	44	%%NUT_HAL%%libexec/hald-addon-usbhid-ups
28	%%NUT_SERIAL%%libexec/nut/apcsmart	45	%%NUT_SERIAL%%libexec/nut/apcsmart
29	%%NUT_SERIAL%%libexec/nut/bestfortress	46	%%NUT_SERIAL%%libexec/nut/apcsmart-old
30	%%NUT_SERIAL%%libexec/nut/bcmxcp	47	%%NUT_SERIAL%%libexec/nut/bcmxcp
31	%%NUT_USB%%libexec/nut/bcmxcp_usb	48	%%NUT_USB%%libexec/nut/bcmxcp_usb
32	%%NUT_SERIAL%%libexec/nut/belkin	49	%%NUT_SERIAL%%libexec/nut/belkin
33	%%NUT_SERIAL%%libexec/nut/belkinunv	50	%%NUT_SERIAL%%libexec/nut/belkinunv
34	%%NUT_SERIAL%%libexec/nut/bestfcom	51	%%NUT_SERIAL%%libexec/nut/bestfcom
		52	%%NUT_SERIAL%%libexec/nut/bestfortress
35	%%NUT_SERIAL%%libexec/nut/bestuferrups	53	%%NUT_SERIAL%%libexec/nut/bestuferrups
36	%%NUT_SERIAL%%libexec/nut/bestups	54	%%NUT_SERIAL%%libexec/nut/bestups
37	%%NUT_SERIAL%%libexec/nut/blazer_ser	55	%%NUT_SERIAL%%libexec/nut/blazer_ser
Lines 62-69 Link Here
62	%%NUT_SERIAL%%libexec/nut/rhino	80	%%NUT_SERIAL%%libexec/nut/rhino
63	%%NUT_USB%%libexec/nut/richcomm_usb	81	%%NUT_USB%%libexec/nut/richcomm_usb
64	%%NUT_SERIAL%%libexec/nut/safenet	82	%%NUT_SERIAL%%libexec/nut/safenet
65	%%NUT_SNMP%%libexec/nut/snmp-ups
66	%%NUT_SERIAL%%libexec/nut/skel	83	%%NUT_SERIAL%%libexec/nut/skel
		84	%%NUT_SNMP%%libexec/nut/snmp-ups
67	%%NUT_SERIAL%%libexec/nut/solis	85	%%NUT_SERIAL%%libexec/nut/solis
68	%%NUT_SERIAL%%libexec/nut/tripplite	86	%%NUT_SERIAL%%libexec/nut/tripplite
69	%%NUT_USB%%libexec/nut/tripplite_usb	87	%%NUT_USB%%libexec/nut/tripplite_usb
Lines 72-97 Link Here
72	libexec/nut/upsdrvctl	90	libexec/nut/upsdrvctl
73	%%NUT_USB%%libexec/nut/usbhid-ups	91	%%NUT_USB%%libexec/nut/usbhid-ups
74	%%NUT_SERIAL%%libexec/nut/victronups	92	%%NUT_SERIAL%%libexec/nut/victronups
75	libdata/pkgconfig/libupsclient.pc
76	sbin/upsd	93	sbin/upsd
77	sbin/upsmon	94	sbin/upsmon
78	sbin/upssched	95	sbin/upssched
79	%%NUT_HAL%%share/hal/fdi/information/20thirdparty/20-ups-nut-device.fdi	96	%%NUT_HAL%%share/hal/fdi/information/20thirdparty/20-ups-nut-device.fdi
80	%%NUT_CGI%%%%CGIDIR%%/upsimage.cgi	97	@dirrmtry share/hal/fdi/information/20thirdparty
81	%%NUT_CGI%%%%CGIDIR%%/upsset.cgi	98	@dirrmtry %%CGIDIR%%
82	%%NUT_CGI%%%%CGIDIR%%/upsstats.cgi	99	@dirrmtry %%ETCDIR%%
83	%%NUT_CGI%%%%CGIETCDIR%%/hosts.conf.sample	100	@dirrmtry %%WWWDIR%%
84	%%NUT_CGI%%%%CGIETCDIR%%/upsset.conf.sample	101	@dirrmtry etc/bash_completion.d
85	%%NUT_CGI%%%%CGIETCDIR%%/upsstats.html.sample
86	%%NUT_CGI%%%%CGIETCDIR%%/upsstats-single.html.sample
87	%%NUT_CGI%%%%WWWDIR%%/bottom.html
88	%%NUT_CGI%%%%WWWDIR%%/header.html
89	%%NUT_CGI%%%%WWWDIR%%/index.html
90	%%NUT_CGI%%%%WWWDIR%%/nut-banner.png
91	@dirrmtry etc/nut
92	@dirrmtry libdata/pkgconfig
93	@dirrmtry libexec/nut	102	@dirrmtry libexec/nut
94	@dirrmtry %%STATEDIR%%
95	%%NUT_CGI%%@dirrm %%CGIDIR%%
96	%%NUT_CGI%%@dirrmtry www/cgi-bin
97	%%NUT_CGI%%@dirrm %%WWWDIR%%