Attachment #80862 for bug #115898

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




#

PORTNAME=	nut
PORTVERSION=	2.2.0
PORTREVISION=	1
CATEGORIES=	sysutils
MASTER_SITES=	http://eu1.networkupstools.org/source/${PORTVERSION:R}/ \
		http://us1.networkupstools.org/source/${PORTVERSION:R}/

EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}

MAINTAINER=	Joerg.Pulz@frm2.tum.de
COMMENT=	Network UPS Tools

SUBSYS?=	base
.if ${SUBSYS} != base
PKGNAMESUFFIX=	-${SUBSYS}
.endif

GNU_CONFIGURE=	yes
USE_GMAKE=	yes
		--localstatedir=${STATEDIR} \
		--datadir=${PREFIX}/etc/nut \
		--with-drvpath=${PREFIX}/libexec/nut \
		--with-statepath=${STATEDIR} \
		--with-altpidpath=${STATEDIR} \
		--with-pidpath=${STATEDIR} \
		--with-linux-hiddev=no \
		--with-user=${NUT_USER}

NUT_USER?=	uucp
NUT_GROUP?=	uucp
STATEDIR?=	/var/db/nut

OPTIONS=	USB		"USB support"	on \
		SNMP		"SNMP support"	on \
		LIBUPSCLIENT	"Include the libupsclient library"	off \
		CGI		"Web CGI interface"	off \

.if ${SUBSYS} == base
USE_RC_SUBR=	nut.sh nut_upsmon.sh nut_upslog.sh
SUB_LIST+=	STATEDIR=${STATEDIR}
PLIST_SUB+=	STATEDIR=${STATEDIR}

		upssched.conf.5
MAN8=		al175.8 apcsmart.8 bcmxcp.8 belkin.8 belkinunv.8 \
		bestuferrups.8 bestups.8 bestfcom.8 cpsups.8 cyberpower.8 \
		dummy-ups.8 etapro.8 everups.8 gamatronic.8 genericups.8 \
		isbmex.8 liebert.8 masterguard.8 megatec.8 metasys.8 \
		mge-shut.8 mge-utalk.8 nitram.8 nutupsdrv.8 oneac.8 optiups.8 \
		powercom.8 powerpanel.8 rhino.8 safenet.8 solis.8 tripplite.8 \
		tripplitesu.8 upsc.8 upscmd.8 upscode2.8 upsd.8 upsdrvctl.8 \
		upslog.8 upsmon.8 upsrw.8 upssched.8 victronups.8

PORTDOCS=	*

.include <bsd.port.pre.mk>
INSTALL_TARGET=	install install-conf

CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/nut \
		--program-transform-name="" \
		--localstatedir=${STATEDIR} \
		--datadir=${PREFIX}/etc/nut \
		--with-drvpath=${PREFIX}/libexec/nut \
		--with-statepath=${STATEDIR} \
		--with-altpidpath=${STATEDIR} \
		--with-pidpath=${STATEDIR} \
		--with-linux-hiddev=no \
		--with-user=${NUT_USER} \
		--with-group=${NUT_GROUP}

.if defined(WITH_CGI)
LIB_DEPENDS+=	gd.4:${PORTSDIR}/graphics/gd
ALL_TARGET+=	cgi
INSTALL_TARGET+=install-cgi install-cgi-conf
MAN5+=		hosts.conf.5 upsset.conf.5 upsstats.html.5
MAN8+=		upsset.cgi.8 upsstats.cgi.8 upsimage.cgi.8
.if !exists(${PREFIX}/www) && exists(${PREFIX}/share/apache)

			--with-htmlpath=${PREFIX}/${WWWDIR}/nut \
			--with-gd-includes=-I${PREFIX}/include \
			--with-gd-libs="-L${PREFIX}/lib -lgd"
PLIST_SUB+=	NUT_CGI=""
PLIST_SUB+=	WWWDIR="${WWWDIR}"
PLIST_SUB+=	CGIDIR="${CGIDIR}"
PLIST_SUB+=	CGIETCDIR="etc/nut/"
PLIST_SUB+=	CGIETC="etc/nut/"
.else
CONFIGURE_ARGS+=	--without-cgi
PLIST_SUB+=	NUT_CGI="@comment "
PLIST_SUB+=	CGIFILES="@comment "
PLIST_SUB+=	CGIDIRRM="@comment "
PLIST_SUB+=	CGIETC="@comment "
.endif
.endif

.if !defined(WITHOUT_USB)
LIB_DEPENDS+=	usb-0.1.8:${PORTSDIR}/devel/libusb
CONFIGURE_ARGS+=	--with-usb=auto
MAN8+=		bcmxcp_usb.8 megatec_usb.8 tripplite_usb.8 usbhid-ups.8
PLIST_SUB+=	NUT_USB=""
.else
CONFIGURE_ARGS+=	--without-usb
PLIST_SUB+=	NUT_USB="@comment "
.endif

.if !defined(WITHOUT_SNMP)
LIB_DEPENDS+=	netsnmp.10:${PORTSDIR}/net-mgmt/net-snmp
CONFIGURE_ARGS+=	--with-snmp
MAN8+=		snmp-ups.8
PLIST_SUB+=	NUT_SNMP=""
.else
CONFIGURE_ARGS+=	--without-snmp
PLIST_SUB+=	NUT_SNMP="@comment "
.endif

.if defined(WITH_LIBUPSCLIENT)
CONFIGURE_ARGS+=	--with-lib --enable-pkg-config \
			--with-pkgconfig-dir=${PREFIX}/libdata/pkgconfig
ALL_TARGET=	lib
INSTALL_TARGET=	install-lib

MAN3+=		upscli_connect.3 upscli_disconnect.3 upscli_readline.3 \
		upscli_sendline.3 upscli_splitname.3 upscli_strerror.3

PLIST_SUB+=	NUT_LIB=""
.else
CONFIGURE_ARGS+=	--without-lib
PLIST_SUB+=	NUT_LIB="@comment "
.endif

.if ${SUBSYS} == base
pre-install:
.if !defined(WITH_NUT_CGI) && !defined(BATCH) && !defined(PACKAGE_BUILDING)
	@${ECHO_MSG} "Type \"make -DWITH_NUT_CGI\" if you want to build CGI scripts."
.endif
	@${MKDIR} ${PREFIX}/libexec/nut
	@${MKDIR} ${STATEDIR}
	@${CHOWN} ${NUT_USER}:${NUT_GROUP} ${STATEDIR}
	@${CHMOD} 0750 ${STATEDIR}

.if !defined(NOPORTDOCS)

	${INSTALL_DATA} ${WRKSRC}/docs/cables/*.txt ${DOCSDIR}/cables
	${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/docs/FAQ ${DOCSDIR}
.for file in AUTHORS COPYING ChangeLog INSTALL MAINTAINERS NEWS README UPGRADING
	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
.endfor
.endif

.endif

.include <bsd.port.post.mk>

Lines 1-6 Link Here

(-)ports/sysutils/nut/distinfo (-6 / +6 lines)
1	MD5 (nut-2.0.5.tar.gz) = b08fde86191154bbcfda860f95a5dca2	1	MD5 (nut-2.2.0.tar.gz) = a3570515d80804051d4e7631e8a3eb12
2	SHA256 (nut-2.0.5.tar.gz) = 5e1bfecfca528104db7025050c81258ee20620df7497ab5988ad461d951c8203	2	SHA256 (nut-2.2.0.tar.gz) = e670ff7b51a652fd61472aa5fa5a1ed4730b5411671068be456551ea46094120
3	SIZE (nut-2.0.5.tar.gz) = 809006	3	SIZE (nut-2.2.0.tar.gz) = 1173801
4	MD5 (nut-2.0.5.tar.gz.sig) = 87e01f70e56e647af64c1a9324525f6c	4	MD5 (nut-2.2.0.tar.gz.sig) = b844a079cd7673f79d87197c189f23fe
5	SHA256 (nut-2.0.5.tar.gz.sig) = e2307cde6369dd9d425758171cc5de36676b419d9d88b76012c9f0acc6ac657d	5	SHA256 (nut-2.2.0.tar.gz.sig) = 6b240886432e0e095c4bf6109a79f4bd1c67e53a14438fe885f7ffd7932e2169
6	SIZE (nut-2.0.5.tar.gz.sig) = 65	6	SIZE (nut-2.2.0.tar.gz.sig) = 65




@unexec %D/etc/rc.d/nut_upslog forcestop 2>/dev/null || true
@unexec %D/etc/rc.d/nut_upsmon forcestop 2>/dev/null || true
@unexec %D/etc/rc.d/nut forcestop 2>/dev/null || true
%%NUT_LIB%%bin/libupsclient-config
bin/upsc
bin/upscmd
bin/upslog
bin/upsrw
bin/upssched-cmd
etc/nut/cmdvartab
etc/nut/driver.list
etc/nut/ups.conf.sample

etc/nut/upsd.users.sample
etc/nut/upsmon.conf.sample
etc/nut/upssched.conf.sample
%%NUT_LIB%%include/parseconf.h
%%NUT_LIB%%include/upsclient.h
%%NUT_LIB%%lib/libupsclient.a
libexec/nut/al175
libexec/nut/apcsmart
libexec/nut/bcmxcp
%%NUT_USB%%libexec/nut/bcmxcp_usb
libexec/nut/belkin
libexec/nut/belkinunv
libexec/nut/bestfcom
libexec/nut/bestuferrups
libexec/nut/bestups
libexec/nut/blazer
libexec/nut/cpsups
libexec/nut/cyberpower
libexec/nut/dummy-ups
libexec/nut/etapro
libexec/nut/everups
libexec/nut/fentonups
libexec/nut/gamatronic
libexec/nut/genericups
libexec/nut/ippon
libexec/nut/isbmex
libexec/nut/liebert
libexec/nut/masterguard
libexec/nut/megatec
%%NUT_USB%%libexec/nut/megatec_usb
libexec/nut/metasys
libexec/nut/mge-shut
libexec/nut/mge-utalk
libexec/nut/newmge-shut
libexec/nut/nitram
libexec/nut/oneac
libexec/nut/optiups

libexec/nut/powerpanel
libexec/nut/rhino
libexec/nut/safenet
%%NUT_SNMP%%libexec/nut/snmp-ups
libexec/nut/skel
libexec/nut/solis
libexec/nut/tripplite
%%NUT_USB%%libexec/nut/tripplite_usb
libexec/nut/tripplitesu
libexec/nut/upscode2
libexec/nut/upsdrvctl
%%NUT_USB%%libexec/nut/usbhid-ups
libexec/nut/victronups
%%NUT_LIB%%libdata/pkgconfig/libupsclient.pc
sbin/upsd
sbin/upsmon
sbin/upssched
%%NUT_CGI%%%%CGIDIR%%/nut/upsimage.cgi
%%NUT_CGI%%%%CGIDIR%%/nut/upsset.cgi
%%NUT_CGI%%%%CGIDIR%%/nut/upsstats.cgi
%%NUT_CGI%%%%CGIDIR%%/nut/hosts.conf.sample
%%NUT_CGI%%%%CGIETCDIR%%/nut/upsset.conf.sample
%%NUT_CGI%%%%CGIETCDIR%%/nut/upsstats.html.sample
%%NUT_CGI%%%%CGIETCDIR%%/nut/upsstats-single.html.sample
%%NUT_CGI%%%%WWWDIR%%/nut/bottom.html
%%NUT_CGI%%%%WWWDIR%%/nut/header.html
%%NUT_CGI%%%%WWWDIR%%/nut/index.html
%%NUT_CGI%%%%WWWDIR%%/nut/nut-banner.png
%%PORTDOCS%%@exec mkdir %D/%%DOCSDIR%%
%%PORTDOCS%%@exec mkdir %D/%%DOCSDIR%%/cables
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
%%PORTDOCS%%%%DOCSDIR%%/CREDITS
%%PORTDOCS%%%%DOCSDIR%%/FAQ
%%PORTDOCS%%%%DOCSDIR%%/INSTALL
%%PORTDOCS%%%%DOCSDIR%%/NEWS
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/UPGRADING
%%PORTDOCS%%%%DOCSDIR%%/acpi.txt
%%PORTDOCS%%%%DOCSDIR%%/al175-vars.txt
%%PORTDOCS%%%%DOCSDIR%%/big-servers.txt
%%PORTDOCS%%%%DOCSDIR%%/cables/apc-rs500-serial.txt
%%PORTDOCS%%%%DOCSDIR%%/cables/apc.txt
%%PORTDOCS%%%%DOCSDIR%%/cables/ge-imv-victron.txt
%%PORTDOCS%%%%DOCSDIR%%/cables/imv.txt
%%PORTDOCS%%%%DOCSDIR%%/cables/mgeups.txt
%%PORTDOCS%%%%DOCSDIR%%/cables/powerware.txt
%%PORTDOCS%%%%DOCSDIR%%/cables/repotec.txt
%%PORTDOCS%%%%DOCSDIR%%/cables/sms.txt
%%PORTDOCS%%%%DOCSDIR%%/chroot.txt
%%PORTDOCS%%%%DOCSDIR%%/commands.txt
%%PORTDOCS%%%%DOCSDIR%%/config-files.txt
%%PORTDOCS%%%%DOCSDIR%%/configure.txt
%%PORTDOCS%%%%DOCSDIR%%/contact-closure.txt
%%PORTDOCS%%%%DOCSDIR%%/data-room.txt
%%PORTDOCS%%%%DOCSDIR%%/design.txt
%%PORTDOCS%%%%DOCSDIR%%/developers.txt
%%PORTDOCS%%%%DOCSDIR%%/ideas.txt
%%PORTDOCS%%%%DOCSDIR%%/hid-subdrivers.txt
%%PORTDOCS%%%%DOCSDIR%%/megatec.txt
%%PORTDOCS%%%%DOCSDIR%%/new-drivers.txt
%%PORTDOCS%%%%DOCSDIR%%/new-names.txt
%%PORTDOCS%%%%DOCSDIR%%/osd-notify.txt
%%PORTDOCS%%%%DOCSDIR%%/pager.txt
%%PORTDOCS%%%%DOCSDIR%%/powersaving.txt
%%PORTDOCS%%%%DOCSDIR%%/protocol.txt
%%PORTDOCS%%%%DOCSDIR%%/shutdown.txt
%%PORTDOCS%%%%DOCSDIR%%/snmp.txt
%%PORTDOCS%%%%DOCSDIR%%/sock-protocol.txt
%%PORTDOCS%%%%DOCSDIR%%/ssl.txt
%%PORTDOCS%%%%DOCSDIR%%/upssched.txt
%%PORTDOCS%%@dirrm %%DOCSDIR%%/cables
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrmtry etc/nut
@dirrmtry libexec/nut
@dirrmtry %%STATEDIR%%
%%NUT_CGI%%@dirrm %%CGIDIR%%/nut
%%NUT_CGI%%@dirrmtry %%CGIDIR%%
%%NUT_CGI%%@dirrm %%WWWDIR%%/nut
%%NUT_CGI%%@dirrmtry %%WWWDIR%%




--- Makefile.in.orig	Mon Oct 10 04:12:51 2005
+++ Makefile.in	Thu Feb 23 19:44:12 2006
@@ -90,6 +90,12 @@
 install-cgi-conf:
 	@cd conf; $(MAKE) install-cgi-conf; cd ..;
 
+lib: build-lib
+
+build-lib:
+	@cd common ; $(MAKE) || exit 1; cd ..;
+	@cd clients; $(MAKE) libupsclient.a || exit 1; cd ..;
+
 install-lib:
 	@cd clients; $(MAKE) install-lib; cd ..;
 	@cd man; $(MAKE) install-lib-man; cd ..;
@@ -98,6 +104,7 @@
 usb: build-usb
 
 build-usb:
+	@cd common ; $(MAKE) || exit 1; cd ..;
 	@cd drivers; $(MAKE) build-usb; cd ..;
 
 install-usb:
@@ -107,7 +114,8 @@
 snmp: build-snmp
 
 build-snmp:
-	@cd drivers; $(MAKE) snmp-ups; cd ..;
+	@cd common ; $(MAKE) || exit 1; cd ..;
+	@cd drivers; $(MAKE) snmp-ups || exit 1; cd ..;
 
 install-snmp: snmp install-snmp-man install-snmp-mgr
 

Added Link Here

(-)ports/sysutils/nut/files/patch-clients-Makefile.in (+11 lines)
1	--- clients/Makefile.in.orig 2007-07-05 15:21:22.000000000 +0200
2	+++ clients/Makefile.in 2007-08-28 15:25:39.000000000 +0200
3	@@ -440,7 +440,7 @@
4	done
5	install-cgiexecPROGRAMS: $(cgiexec_PROGRAMS)
6	@$(NORMAL_INSTALL)
7	- test -z "$(cgiexecdir)" \|\| $(mkdir_p) "$(DESTDIR)$(cgiexecdir)"
8	+ test -z "$(cgiexec_PROGRAMS)" -o -z "$(cgiexecdir)" \|\| $(mkdir_p) "$(DESTDIR)$(cgiexecdir)"
9	@list='$(cgiexec_PROGRAMS)'; for p in $$list; do \
10	p1=`echo $$p\|sed 's/$(EXEEXT)$$//'`; \
11	if test -f $$p \




--- data/html/Makefile.in.orig	2007-07-05 15:21:23.000000000 +0200
+++ data/html/Makefile.in	2007-08-28 15:25:08.000000000 +0200
@@ -285,7 +285,7 @@
 uninstall-info-am:
 install-dist_htmlDATA: $(dist_html_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(htmldir)" || $(mkdir_p) "$(DESTDIR)$(htmldir)"
+	test -z "$(dist_html_DATA)" -o -z "$(htmldir)" || $(mkdir_p) "$(DESTDIR)$(htmldir)"
 	@list='$(dist_html_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -302,7 +302,7 @@
 	done
 install-nodist_htmlDATA: $(nodist_html_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(htmldir)" || $(mkdir_p) "$(DESTDIR)$(htmldir)"
+	test -z "$(nodist_html_DATA)" -o -z "$(htmldir)" || $(mkdir_p) "$(DESTDIR)$(htmldir)"
 	@list='$(nodist_html_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \

Removed Link Here

(-)ports/sysutils/nut/files/patch-drivers_Makefile.in (-11 lines)
1	--- drivers/Makefile.in.orig Thu Feb 23 19:38:14 2006
2	+++ drivers/Makefile.in Thu Feb 23 19:38:43 2006
3	@@ -8,7 +8,7 @@
4
5	# other definitions
6	CC = @CC@
7	-CFLAGS = -I../include @CFLAGS@
8	+CFLAGS = -I../include @CFLAGS@ @LIBUSB_CFLAGS@
9	PROGS = bestups fentonups apcsmart everups belkin masterguard powercom \
10	cyberpower tripplite victronups genericups mge-utalk bestuferrups \
11	isbmex etapro liebert sms esupssmart tripplitesu blazer safenet \

Added Link Here

(-)ports/sysutils/nut/files/patch-include-Makefile.in (+11 lines)
1	--- include/Makefile.in.orig 2007-08-28 15:39:22.000000000 +0200
2	+++ include/Makefile.in 2007-08-28 15:36:52.000000000 +0200
3	@@ -229,7 +229,7 @@
4	BUILT_SOURCES = nut_version.h
5	CLEANFILES = nut_version.h
6	SVNREV = $(shell svnversion -n $(top_srcdir) 2>/dev/null)
7	-NUT_VERSION = $(shell if test "$(SVNREV)" = "exported"; then echo "$(PACKAGE_VERSION)"; else echo "$(PACKAGE_VERSION)-$(SVNREV)"; fi)
8	+NUT_VERSION = $(shell if test "$(SVNREV)" = "exported" -o -z "${SVNREV}"; then echo "$(PACKAGE_VERSION)"; else echo "$(PACKAGE_VERSION)-$(SVNREV)"; fi)
9	all: $(BUILT_SOURCES) config.h
10	$(MAKE) $(AM_MAKEFLAGS) all-am
11

Return to bug 115898

Lines 6-13 Link Here

(-)ports/sysutils/nut/Makefile (-68 / +60 lines)
6	#	6	#
7		7
8	PORTNAME= nut	8	PORTNAME= nut
9	PORTVERSION= 2.0.5	9	PORTVERSION= 2.2.0
10	PORTREVISION= 1
11	CATEGORIES= sysutils	10	CATEGORIES= sysutils
12	MASTER_SITES= http://eu1.networkupstools.org/source/${PORTVERSION:R}/ \	11	MASTER_SITES= http://eu1.networkupstools.org/source/${PORTVERSION:R}/ \
13	http://us1.networkupstools.org/source/${PORTVERSION:R}/	12	http://us1.networkupstools.org/source/${PORTVERSION:R}/
Lines 15-44 Link Here
15	EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}	14	EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
16		15
17	MAINTAINER= Joerg.Pulz@frm2.tum.de	16	MAINTAINER= Joerg.Pulz@frm2.tum.de
18	COMMENT?= Network UPS Tools	17	COMMENT= Network UPS Tools
19
20	SUBSYS?= base
21	.if ${SUBSYS} != base
22	PKGNAMESUFFIX= -${SUBSYS}
23	.endif
24		18
25	GNU_CONFIGURE= yes	19	GNU_CONFIGURE= yes
26	CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/nut \	20	USE_GMAKE= yes
27	--localstatedir=${STATEDIR} \
28	--datadir=${PREFIX}/etc/nut \
29	--with-drvpath=${PREFIX}/libexec/nut \
30	--with-statepath=${STATEDIR} \
31	--with-altpidpath=${STATEDIR} \
32	--with-pidpath=${STATEDIR} \
33	--with-linux-hiddev=no \
34	--with-user=${NUT_USER}
35		21
36	NUT_USER?= uucp	22	NUT_USER?= uucp
37	STATEDIR= /var/db/nut	23	NUT_GROUP?= uucp
		24	STATEDIR?= /var/db/nut
38		25
39	.include <bsd.port.pre.mk>	26	OPTIONS= USB "USB support" on \
		27	SNMP "SNMP support" on \
		28	LIBUPSCLIENT "Include the libupsclient library" off \
		29	CGI "Web CGI interface" off \
40		30
41	.if ${SUBSYS} == base
42	USE_RC_SUBR= nut.sh nut_upsmon.sh nut_upslog.sh	31	USE_RC_SUBR= nut.sh nut_upsmon.sh nut_upslog.sh
43	SUB_LIST+= STATEDIR=${STATEDIR}	32	SUB_LIST+= STATEDIR=${STATEDIR}
44	PLIST_SUB+= STATEDIR=${STATEDIR}	33	PLIST_SUB+= STATEDIR=${STATEDIR}
Lines 47-66 Link Here
47	upssched.conf.5	36	upssched.conf.5
48	MAN8= al175.8 apcsmart.8 bcmxcp.8 belkin.8 belkinunv.8 \	37	MAN8= al175.8 apcsmart.8 bcmxcp.8 belkin.8 belkinunv.8 \
49	bestuferrups.8 bestups.8 bestfcom.8 cpsups.8 cyberpower.8 \	38	bestuferrups.8 bestups.8 bestfcom.8 cpsups.8 cyberpower.8 \
50	dummy-ups.8 etapro.8 everups.8 fentonups.8 genericups.8 \	39	dummy-ups.8 etapro.8 everups.8 gamatronic.8 genericups.8 \
51	ippon.8 isbmex.8 liebert.8 masterguard.8 megatec.8 metasys.8 \	40	isbmex.8 liebert.8 masterguard.8 megatec.8 metasys.8 \
52	mge-shut.8 mge-utalk.8 mustek.8 nitram.8 nutupsdrv.8 oneac.8 \	41	mge-shut.8 mge-utalk.8 nitram.8 nutupsdrv.8 oneac.8 optiups.8 \
53	optiups.8 powercom.8 powerpanel.8 safenet.8 sms.8 solis.8 \	42	powercom.8 powerpanel.8 rhino.8 safenet.8 solis.8 tripplite.8 \
54	tripplite.8 tripplitesu.8 upsc.8 upscmd.8 upscode2.8 upsd.8 \	43	tripplitesu.8 upsc.8 upscmd.8 upscode2.8 upsd.8 upsdrvctl.8 \
55	upsdrvctl.8 upslog.8 upsmon.8 upsrw.8 upssched.8 victronups.8	44	upslog.8 upsmon.8 upsrw.8 upssched.8 victronups.8
		45
		46	PORTDOCS= *
56		47
57	ALL_TARGET= all	48	.include <bsd.port.pre.mk>
58	INSTALL_TARGET= install install-conf
59		49
60	.if defined(WITH_NUT_CGI)	50	CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/nut \
		51	--program-transform-name="" \
		52	--localstatedir=${STATEDIR} \
		53	--datadir=${PREFIX}/etc/nut \
		54	--with-drvpath=${PREFIX}/libexec/nut \
		55	--with-statepath=${STATEDIR} \
		56	--with-altpidpath=${STATEDIR} \
		57	--with-pidpath=${STATEDIR} \
		58	--with-linux-hiddev=no \
		59	--with-user=${NUT_USER} \
		60	--with-group=${NUT_GROUP}
		61
		62	.if defined(WITH_CGI)
61	LIB_DEPENDS+= gd.4:${PORTSDIR}/graphics/gd	63	LIB_DEPENDS+= gd.4:${PORTSDIR}/graphics/gd
62	ALL_TARGET+= cgi
63	INSTALL_TARGET+=install-cgi install-cgi-conf
64	MAN5+= hosts.conf.5 upsset.conf.5 upsstats.html.5	64	MAN5+= hosts.conf.5 upsset.conf.5 upsstats.html.5
65	MAN8+= upsset.cgi.8 upsstats.cgi.8 upsimage.cgi.8	65	MAN8+= upsset.cgi.8 upsstats.cgi.8 upsimage.cgi.8
66	.if !exists(${PREFIX}/www) && exists(${PREFIX}/share/apache)	66	.if !exists(${PREFIX}/www) && exists(${PREFIX}/share/apache)
Lines 74-131 Link Here
74	--with-htmlpath=${PREFIX}/${WWWDIR}/nut \	74	--with-htmlpath=${PREFIX}/${WWWDIR}/nut \
75	--with-gd-includes=-I${PREFIX}/include \	75	--with-gd-includes=-I${PREFIX}/include \
76	--with-gd-libs="-L${PREFIX}/lib -lgd"	76	--with-gd-libs="-L${PREFIX}/lib -lgd"
77	PLIST_SUB+= WWWFILES="${WWWDIR}/nut/"	77	PLIST_SUB+= NUT_CGI=""
78	PLIST_SUB+= WWWDIRRM="@dirrm ${WWWDIR}/nut"	78	PLIST_SUB+= WWWDIR="${WWWDIR}"
79	PLIST_SUB+= CGIFILES="${CGIDIR}/nut/"	79	PLIST_SUB+= CGIDIR="${CGIDIR}"
80	PLIST_SUB+= CGIDIRRM="@dirrm ${CGIDIR}/nut"	80	PLIST_SUB+= CGIETCDIR="etc/nut/"
81	PLIST_SUB+= CGIETC="etc/nut/"
82	.else	81	.else
83	PLIST_SUB+= WWWFILES="@comment "	82	CONFIGURE_ARGS+= --without-cgi
84	PLIST_SUB+= WWWDIRRM="@comment "	83	PLIST_SUB+= NUT_CGI="@comment "
85	PLIST_SUB+= CGIFILES="@comment "
86	PLIST_SUB+= CGIDIRRM="@comment "
87	PLIST_SUB+= CGIETC="@comment "
88	.endif
89	.endif	84	.endif
90		85
91	.if ${SUBSYS} == usb	86	.if !defined(WITHOUT_USB)
92	LIB_DEPENDS+= usb-0.1.8:${PORTSDIR}/devel/libusb	87	LIB_DEPENDS+= usb-0.1.8:${PORTSDIR}/devel/libusb
93	ALL_TARGET= usb	88	CONFIGURE_ARGS+= --with-usb=auto
94	INSTALL_TARGET= install-usb	89	MAN8+= bcmxcp_usb.8 megatec_usb.8 tripplite_usb.8 usbhid-ups.8
95		90	PLIST_SUB+= NUT_USB=""
96	MAN8= bcmxcp_usb.8 newhidups.8 tripplite_usb.8	91	.else
		92	CONFIGURE_ARGS+= --without-usb
		93	PLIST_SUB+= NUT_USB="@comment "
97	.endif	94	.endif
98		95
99	.if ${SUBSYS} == snmp	96	.if !defined(WITHOUT_SNMP)
100	LIB_DEPENDS+= netsnmp.10:${PORTSDIR}/net-mgmt/net-snmp	97	LIB_DEPENDS+= netsnmp.10:${PORTSDIR}/net-mgmt/net-snmp
101	ALL_TARGET= snmp	98	CONFIGURE_ARGS+= --with-snmp
102	INSTALL_TARGET= install-snmp	99	MAN8+= snmp-ups.8
103		100	PLIST_SUB+= NUT_SNMP=""
104	MAN8= snmp-ups.8	101	.else
		102	CONFIGURE_ARGS+= --without-snmp
		103	PLIST_SUB+= NUT_SNMP="@comment "
105	.endif	104	.endif
106		105
107	.if ${SUBSYS} == libupsclient	106	.if defined(WITH_LIBUPSCLIENT)
108	CONFIGURE_ARGS+= --enable-pkg-config \	107	CONFIGURE_ARGS+= --with-lib --enable-pkg-config \
109	--with-pkgconfig-dir=${PREFIX}/libdata/pkgconfig	108	--with-pkgconfig-dir=${PREFIX}/libdata/pkgconfig
110	ALL_TARGET= lib
111	INSTALL_TARGET= install-lib
112		109
113	MAN3= upscli_connect.3 upscli_disconnect.3 upscli_readline.3 \	110	MAN3+= upscli_connect.3 upscli_disconnect.3 upscli_readline.3 \
114	upscli_sendline.3 upscli_splitname.3 upscli_strerror.3	111	upscli_sendline.3 upscli_splitname.3 upscli_strerror.3
115		112
116	post-patch:	113	PLIST_SUB+= NUT_LIB=""
117	@${REINPLACE_CMD} -e "s#@PKG_CFG_DIR@#${PREFIX}/libdata/pkgconfig#g" \	114	.else
118	${WRKSRC}/lib/Makefile.in	115	CONFIGURE_ARGS+= --without-lib
		116	PLIST_SUB+= NUT_LIB="@comment "
119	.endif	117	.endif
120		118
121	.if ${SUBSYS} == base
122	pre-install:	119	pre-install:
123	.if !defined(WITH_NUT_CGI) && !defined(BATCH) && !defined(PACKAGE_BUILDING)
124	@${ECHO_MSG} "Type \"make -DWITH_NUT_CGI\" if you want to build CGI scripts."
125	.endif
126	@${MKDIR} ${PREFIX}/libexec/nut	120	@${MKDIR} ${PREFIX}/libexec/nut
127	@${MKDIR} ${STATEDIR}	121	@${MKDIR} ${STATEDIR}
128	@${CHOWN} ${NUT_USER}:wheel ${STATEDIR}	122	@${CHOWN} ${NUT_USER}:${NUT_GROUP} ${STATEDIR}
129	@${CHMOD} 0750 ${STATEDIR}	123	@${CHMOD} 0750 ${STATEDIR}
130		124
131	.if !defined(NOPORTDOCS)	125	.if !defined(NOPORTDOCS)
Lines 134-144 Link Here
134	${INSTALL_DATA} ${WRKSRC}/docs/cables/*.txt ${DOCSDIR}/cables	128	${INSTALL_DATA} ${WRKSRC}/docs/cables/*.txt ${DOCSDIR}/cables
135	${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${DOCSDIR}	129	${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${DOCSDIR}
136	${INSTALL_DATA} ${WRKSRC}/docs/FAQ ${DOCSDIR}	130	${INSTALL_DATA} ${WRKSRC}/docs/FAQ ${DOCSDIR}
137	.for file in ChangeLog CREDITS INSTALL NEWS README UPGRADING	131	.for file in AUTHORS COPYING ChangeLog INSTALL MAINTAINERS NEWS README UPGRADING
138	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}	132	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
139	.endfor	133	.endfor
140	.endif	134	.endif
141		135
142	.endif
143
144	.include <bsd.port.post.mk>	136	.include <bsd.port.post.mk>

Lines 4-13 Link Here

(-)ports/sysutils/nut/pkg-plist (-63 / +29 lines)
4	@unexec %D/etc/rc.d/nut_upslog forcestop 2>/dev/null \|\| true	4	@unexec %D/etc/rc.d/nut_upslog forcestop 2>/dev/null \|\| true
5	@unexec %D/etc/rc.d/nut_upsmon forcestop 2>/dev/null \|\| true	5	@unexec %D/etc/rc.d/nut_upsmon forcestop 2>/dev/null \|\| true
6	@unexec %D/etc/rc.d/nut forcestop 2>/dev/null \|\| true	6	@unexec %D/etc/rc.d/nut forcestop 2>/dev/null \|\| true
		7	%%NUT_LIB%%bin/libupsclient-config
7	bin/upsc	8	bin/upsc
8	bin/upscmd	9	bin/upscmd
9	bin/upslog	10	bin/upslog
10	bin/upsrw	11	bin/upsrw
		12	bin/upssched-cmd
11	etc/nut/cmdvartab	13	etc/nut/cmdvartab
12	etc/nut/driver.list	14	etc/nut/driver.list
13	etc/nut/ups.conf.sample	15	etc/nut/ups.conf.sample
Lines 15-46 Link Here
15	etc/nut/upsd.users.sample	17	etc/nut/upsd.users.sample
16	etc/nut/upsmon.conf.sample	18	etc/nut/upsmon.conf.sample
17	etc/nut/upssched.conf.sample	19	etc/nut/upssched.conf.sample
		20	%%NUT_LIB%%include/parseconf.h
		21	%%NUT_LIB%%include/upsclient.h
		22	%%NUT_LIB%%lib/libupsclient.a
18	libexec/nut/al175	23	libexec/nut/al175
19	libexec/nut/apcsmart	24	libexec/nut/apcsmart
20	libexec/nut/bcmxcp	25	libexec/nut/bcmxcp
		26	%%NUT_USB%%libexec/nut/bcmxcp_usb
21	libexec/nut/belkin	27	libexec/nut/belkin
22	libexec/nut/belkinunv	28	libexec/nut/belkinunv
23	libexec/nut/bestfcom	29	libexec/nut/bestfcom
24	libexec/nut/bestuferrups	30	libexec/nut/bestuferrups
25	libexec/nut/bestups	31	libexec/nut/bestups
26	libexec/nut/blazer
27	libexec/nut/cpsups	32	libexec/nut/cpsups
28	libexec/nut/cyberpower	33	libexec/nut/cyberpower
29	libexec/nut/esupssmart	34	libexec/nut/dummy-ups
30	libexec/nut/etapro	35	libexec/nut/etapro
31	libexec/nut/everups	36	libexec/nut/everups
32	libexec/nut/fentonups
33	libexec/nut/gamatronic	37	libexec/nut/gamatronic
34	libexec/nut/genericups	38	libexec/nut/genericups
35	libexec/nut/ippon
36	libexec/nut/isbmex	39	libexec/nut/isbmex
37	libexec/nut/liebert	40	libexec/nut/liebert
38	libexec/nut/masterguard	41	libexec/nut/masterguard
39	libexec/nut/megatec	42	libexec/nut/megatec
		43	%%NUT_USB%%libexec/nut/megatec_usb
40	libexec/nut/metasys	44	libexec/nut/metasys
41	libexec/nut/mge-shut	45	libexec/nut/mge-shut
42	libexec/nut/mge-utalk	46	libexec/nut/mge-utalk
43	libexec/nut/mustek	47	libexec/nut/newmge-shut
44	libexec/nut/nitram	48	libexec/nut/nitram
45	libexec/nut/oneac	49	libexec/nut/oneac
46	libexec/nut/optiups	50	libexec/nut/optiups
Lines 48-120 Link Here
48	libexec/nut/powerpanel	52	libexec/nut/powerpanel
49	libexec/nut/rhino	53	libexec/nut/rhino
50	libexec/nut/safenet	54	libexec/nut/safenet
51	libexec/nut/sms	55	%%NUT_SNMP%%libexec/nut/snmp-ups
		56	libexec/nut/skel
52	libexec/nut/solis	57	libexec/nut/solis
53	libexec/nut/tripplite	58	libexec/nut/tripplite
		59	%%NUT_USB%%libexec/nut/tripplite_usb
54	libexec/nut/tripplitesu	60	libexec/nut/tripplitesu
55	libexec/nut/upscode2	61	libexec/nut/upscode2
56	libexec/nut/upsdrvctl	62	libexec/nut/upsdrvctl
		63	%%NUT_USB%%libexec/nut/usbhid-ups
57	libexec/nut/victronups	64	libexec/nut/victronups
		65	%%NUT_LIB%%libdata/pkgconfig/libupsclient.pc
58	sbin/upsd	66	sbin/upsd
59	sbin/upsmon	67	sbin/upsmon
60	sbin/upssched	68	sbin/upssched
61	%%CGIFILES%%upsimage.cgi	69	%%NUT_CGI%%%%CGIDIR%%/nut/upsimage.cgi
62	%%CGIFILES%%upsset.cgi	70	%%NUT_CGI%%%%CGIDIR%%/nut/upsset.cgi
63	%%CGIFILES%%upsstats.cgi	71	%%NUT_CGI%%%%CGIDIR%%/nut/upsstats.cgi
64	%%CGIETC%%hosts.conf.sample	72	%%NUT_CGI%%%%CGIDIR%%/nut/hosts.conf.sample
65	%%CGIETC%%upsset.conf.sample	73	%%NUT_CGI%%%%CGIETCDIR%%/nut/upsset.conf.sample
66	%%CGIETC%%upsstats.html.sample	74	%%NUT_CGI%%%%CGIETCDIR%%/nut/upsstats.html.sample
67	%%CGIETC%%upsstats-single.html.sample	75	%%NUT_CGI%%%%CGIETCDIR%%/nut/upsstats-single.html.sample
68	%%WWWFILES%%bottom.html	76	%%NUT_CGI%%%%WWWDIR%%/nut/bottom.html
69	%%WWWFILES%%header.html	77	%%NUT_CGI%%%%WWWDIR%%/nut/header.html
70	%%WWWFILES%%index.html	78	%%NUT_CGI%%%%WWWDIR%%/nut/index.html
71	%%WWWFILES%%nut-banner.png	79	%%NUT_CGI%%%%WWWDIR%%/nut/nut-banner.png
72	%%PORTDOCS%%@exec mkdir %D/%%DOCSDIR%%
73	%%PORTDOCS%%@exec mkdir %D/%%DOCSDIR%%/cables
74	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
75	%%PORTDOCS%%%%DOCSDIR%%/CREDITS
76	%%PORTDOCS%%%%DOCSDIR%%/FAQ
77	%%PORTDOCS%%%%DOCSDIR%%/INSTALL
78	%%PORTDOCS%%%%DOCSDIR%%/NEWS
79	%%PORTDOCS%%%%DOCSDIR%%/README
80	%%PORTDOCS%%%%DOCSDIR%%/UPGRADING
81	%%PORTDOCS%%%%DOCSDIR%%/acpi.txt
82	%%PORTDOCS%%%%DOCSDIR%%/al175-vars.txt
83	%%PORTDOCS%%%%DOCSDIR%%/big-servers.txt
84	%%PORTDOCS%%%%DOCSDIR%%/cables/apc-rs500-serial.txt
85	%%PORTDOCS%%%%DOCSDIR%%/cables/apc.txt
86	%%PORTDOCS%%%%DOCSDIR%%/cables/ge-imv-victron.txt
87	%%PORTDOCS%%%%DOCSDIR%%/cables/imv.txt
88	%%PORTDOCS%%%%DOCSDIR%%/cables/mgeups.txt
89	%%PORTDOCS%%%%DOCSDIR%%/cables/powerware.txt
90	%%PORTDOCS%%%%DOCSDIR%%/cables/repotec.txt
91	%%PORTDOCS%%%%DOCSDIR%%/cables/sms.txt
92	%%PORTDOCS%%%%DOCSDIR%%/chroot.txt
93	%%PORTDOCS%%%%DOCSDIR%%/commands.txt
94	%%PORTDOCS%%%%DOCSDIR%%/config-files.txt
95	%%PORTDOCS%%%%DOCSDIR%%/configure.txt
96	%%PORTDOCS%%%%DOCSDIR%%/contact-closure.txt
97	%%PORTDOCS%%%%DOCSDIR%%/data-room.txt
98	%%PORTDOCS%%%%DOCSDIR%%/design.txt
99	%%PORTDOCS%%%%DOCSDIR%%/developers.txt
100	%%PORTDOCS%%%%DOCSDIR%%/ideas.txt
101	%%PORTDOCS%%%%DOCSDIR%%/hid-subdrivers.txt
102	%%PORTDOCS%%%%DOCSDIR%%/megatec.txt
103	%%PORTDOCS%%%%DOCSDIR%%/new-drivers.txt
104	%%PORTDOCS%%%%DOCSDIR%%/new-names.txt
105	%%PORTDOCS%%%%DOCSDIR%%/osd-notify.txt
106	%%PORTDOCS%%%%DOCSDIR%%/pager.txt
107	%%PORTDOCS%%%%DOCSDIR%%/powersaving.txt
108	%%PORTDOCS%%%%DOCSDIR%%/protocol.txt
109	%%PORTDOCS%%%%DOCSDIR%%/shutdown.txt
110	%%PORTDOCS%%%%DOCSDIR%%/snmp.txt
111	%%PORTDOCS%%%%DOCSDIR%%/sock-protocol.txt
112	%%PORTDOCS%%%%DOCSDIR%%/ssl.txt
113	%%PORTDOCS%%%%DOCSDIR%%/upssched.txt
114	%%PORTDOCS%%@dirrm %%DOCSDIR%%/cables
115	%%PORTDOCS%%@dirrm %%DOCSDIR%%
116	@dirrmtry etc/nut	80	@dirrmtry etc/nut
117	@dirrmtry libexec/nut	81	@dirrmtry libexec/nut
118	@dirrmtry %%STATEDIR%%	82	@dirrmtry %%STATEDIR%%
119	%%CGIDIRRM%%	83	%%NUT_CGI%%@dirrm %%CGIDIR%%/nut
120	%%WWWDIRRM%%	84	%%NUT_CGI%%@dirrmtry %%CGIDIR%%
		85	%%NUT_CGI%%@dirrm %%WWWDIR%%/nut
		86	%%NUT_CGI%%@dirrmtry %%WWWDIR%%

Removed Link Here

(-)ports/sysutils/nut/files/patch-Makefile.in (-33 lines)
1	--- Makefile.in.orig Mon Oct 10 04:12:51 2005
2	+++ Makefile.in Thu Feb 23 19:44:12 2006
3	@@ -90,6 +90,12 @@
4	install-cgi-conf:
5	@cd conf; $(MAKE) install-cgi-conf; cd ..;
6
7	+lib: build-lib
8	+
9	+build-lib:
10	+ @cd common ; $(MAKE) \|\| exit 1; cd ..;
11	+ @cd clients; $(MAKE) libupsclient.a \|\| exit 1; cd ..;
12	+
13	install-lib:
14	@cd clients; $(MAKE) install-lib; cd ..;
15	@cd man; $(MAKE) install-lib-man; cd ..;
16	@@ -98,6 +104,7 @@
17	usb: build-usb
18
19	build-usb:
20	+ @cd common ; $(MAKE) \|\| exit 1; cd ..;
21	@cd drivers; $(MAKE) build-usb; cd ..;
22
23	install-usb:
24	@@ -107,7 +114,8 @@
25	snmp: build-snmp
26
27	build-snmp:
28	- @cd drivers; $(MAKE) snmp-ups; cd ..;
29	+ @cd common ; $(MAKE) \|\| exit 1; cd ..;
30	+ @cd drivers; $(MAKE) snmp-ups \|\| exit 1; cd ..;
31
32	install-snmp: snmp install-snmp-man install-snmp-mgr
33

Added Link Here

(-)ports/sysutils/nut/files/patch-data-html-Makefile.in (+20 lines)
1	--- data/html/Makefile.in.orig 2007-07-05 15:21:23.000000000 +0200
2	+++ data/html/Makefile.in 2007-08-28 15:25:08.000000000 +0200
3	@@ -285,7 +285,7 @@
4	uninstall-info-am:
5	install-dist_htmlDATA: $(dist_html_DATA)
6	@$(NORMAL_INSTALL)
7	- test -z "$(htmldir)" \|\| $(mkdir_p) "$(DESTDIR)$(htmldir)"
8	+ test -z "$(dist_html_DATA)" -o -z "$(htmldir)" \|\| $(mkdir_p) "$(DESTDIR)$(htmldir)"
9	@list='$(dist_html_DATA)'; for p in $$list; do \
10	if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
11	f=$(am__strip_dir) \
12	@@ -302,7 +302,7 @@
13	done
14	install-nodist_htmlDATA: $(nodist_html_DATA)
15	@$(NORMAL_INSTALL)
16	- test -z "$(htmldir)" \|\| $(mkdir_p) "$(DESTDIR)$(htmldir)"
17	+ test -z "$(nodist_html_DATA)" -o -z "$(htmldir)" \|\| $(mkdir_p) "$(DESTDIR)$(htmldir)"
18	@list='$(nodist_html_DATA)'; for p in $$list; do \
19	if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
20	f=$(am__strip_dir) \