From 9ff14ac2119c8a5cda0e9aa5236c9ecbadebdaf0 Mon Sep 17 00:00:00 2001 From: fgsch Date: Mon, 24 Oct 2005 05:14:13 +0000 Subject: [PATCH] fix more breakage and regen plist. sturm@ ok. --- sysutils/nut/Makefile | 10 +++++----- sysutils/nut/pkg/PLIST | 5 +++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile index 2e12f5c4be4..66c72a74a9e 100644 --- a/sysutils/nut/Makefile +++ b/sysutils/nut/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.17 2005/09/16 09:51:28 espie Exp $ +# $OpenBSD: Makefile,v 1.18 2005/10/24 05:14:13 fgsch Exp $ COMMENT= "UPS monitoring program supporting many brands" COMMENT-cgi= "CGIs for monitoring Nut-based UPSs" @@ -6,9 +6,9 @@ COMMENT-snmp= "driver for monitoring UPSs via SNMP" VERSION= 2.0.0 DISTNAME= nut-${VERSION} -PKGNAME= ${DISTNAME}p0 -PKGNAME-cgi= nut-cgi-${VERSION} -PKGNAME-snmp= nut-snmp-${VERSION} +PKGNAME= ${DISTNAME}p1 +PKGNAME-cgi= nut-cgi-${VERSION}p0 +PKGNAME-snmp= nut-snmp-${VERSION}p0 CATEGORIES= sysutils HOMEPAGE= http://www.networkupstools.org/ MAINTAINER= Marc Balmer @@ -62,7 +62,7 @@ BUILD_DEPENDS+= :gd->=1.8.3:graphics/gd CONFIGURE_ARGS+= --with-cgi CONFIGURE_ARGS+= --with-cgipath="${WEB_ROOT}/cgi-bin/nut" -CONFIGURE_ARGS+= --with-gd-libs="-L${LOCALBASE}/lib -lgd -lpng -lz -ljpeg -lttf -lm" +CONFIGURE_ARGS+= --with-gd-libs="-L${LOCALBASE}/lib -lgd -lpng -lz -ljpeg -lm" CONFIGURE_ARGS+= --with-gd-includes="-I${LOCALBASE}/include" ALL_TARGET+= cgi diff --git a/sysutils/nut/pkg/PLIST b/sysutils/nut/pkg/PLIST index 9ba4d303a8a..0218ef7297d 100644 --- a/sysutils/nut/pkg/PLIST +++ b/sysutils/nut/pkg/PLIST @@ -1,8 +1,8 @@ -@comment $OpenBSD: PLIST,v 1.9 2005/09/16 09:51:28 espie Exp $ +@comment $OpenBSD: PLIST,v 1.10 2005/10/24 05:14:13 fgsch Exp $ +@conflict upsd-* @pkgpath sysutils/nut,no_cgi @pkgpath sysutils/nut,snmp @pkgpath sysutils/nut,no_cgi,snmp -@conflict upsd-* @newuser ${NUT_USER}:${NUT_ID}:::UPS User:/var/empty:/sbin/nologin bin/apcsmart bin/belkin @@ -65,6 +65,7 @@ bin/victronups @man man/man8/powercom.8 @man man/man8/safenet.8 @man man/man8/sms.8 +@man man/man8/snmp-ups.8 @man man/man8/tripplite.8 @man man/man8/tripplitesu.8 @man man/man8/upsc.8