cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bring back static CGIs.

Browse Source 
Load config files from /etc/nut.

ok mbalmer@
This commit is contained in:
kili 2008-02-03 18:06:41 +00:00
parent 6bca4dfbad
commit 1c44a2e934
3 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sysutils/nut/Makefile
View File

@ -1,12 +1,13 @@
# $OpenBSD: Makefile,v 1.25 2008/01/30 20:55:59 mbalmer Exp $
# $OpenBSD: Makefile,v 1.26 2008/02/03 18:06:41 kili Exp $
COMMENT-main= UPS monitoring program supporting many brands
COMMENT-cgi= CGIs for monitoring Nut-based UPSs
COMMENT-snmp= driver for monitoring UPSs via SNMP
DISTNAME= nut-2.2.1
PKGNAME-cgi= ${DISTNAME:S/-/-cgi-/}
PKGNAME-snmp= ${DISTNAME:S/-/-snmp-/}
PKGNAME-main= ${DISTNAME}p0
PKGNAME-cgi= ${DISTNAME:S/-/-cgi-/}p0
PKGNAME-snmp= ${DISTNAME:S/-/-snmp-/}p0
CATEGORIES= sysutils
HOMEPAGE= http://www.networkupstools.org/
@ -26,7 +27,7 @@ NUT_USER= _ups
NUT_ID= 529
SUBST_VARS= WEB_ROOT NUT_USER NUT_ID
CONFIGURE_STYLE= gnu
CONFIGURE_STYLE= gnu old
CONFIGURE_ARGS+= --sysconfdir=${SYSCONFDIR}/nut \
--datadir=${PREFIX}/share/ups \
--mandir=${PREFIX}/man \
@ -35,8 +36,6 @@ CONFIGURE_ARGS+= --sysconfdir=${SYSCONFDIR}/nut \
--with-group=${NUT_USER} \
--with-ssl \
--enable-strip
ALL_TARGET= all
INSTALL_TARGET= install
PSEUDO_FLAVORS= snmp
FLAVOR?=
@ -48,12 +47,7 @@ MULTI_PACKAGES+= -snmp
LIB_DEPENDS-main= usb::devel/libusb
PREFIX-cgi= ${WEB_ROOT}
LIB_DEPENDS-cgi= gd::graphics/gd \
iconv::converters/libiconv \
jpeg::graphics/jpeg
WANTLIB-cgi= X11 Xau Xdmcp c crypto expat fontconfig freetype m
WANTLIB-cgi+= ssl z png
WANTLIB-cgi=
LIB_DEPENDS-snmp= netsnmp::net/net-snmp

16
sysutils/nut/patches/patch-clients_Makefile_in Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-clients_Makefile_in,v 1.7 2008/02/03 18:06:41 kili Exp $
--- clients/Makefile.in.orig Fri Dec 21 13:00:51 2007
+++ clients/Makefile.in Sun Feb 3 15:03:06 2008
@@ -339,9 +339,12 @@ upssched_SOURCES = upssched.c upssched.h
upssched_LDADD = ../common/libcommon.a $(NETLIBS) ../common/parseconf.o
upsimage_cgi_SOURCES = upsimage.c upsclient.h upsimagearg.h cgilib.c cgilib.h
upsimage_cgi_LDADD = $(LDADD) $(LIBGD_LDFLAGS)
+upsimage_cgi_LDFLAGS = $(LDFLAGS) -all-static
upsset_cgi_SOURCES = upsset.c upsclient.h cgilib.c cgilib.h
+upsset_cgi_LDADD = $(LDADD) -all-static
upsstats_cgi_SOURCES = upsstats.c upsclient.h status.h upsstats.h \
upsimagearg.h cgilib.c cgilib.h
+upsstats_cgi_LDADD = $(LDADD) -all-static
# not LDADD.

8
sysutils/nut/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.9 2008/01/30 20:55:59 mbalmer Exp $
--- configure.orig Thu Jul 5 15:21:20 2007
+++ configure Wed Aug 1 12:59:05 2007
@@ -23608,7 +23608,7 @@ cat >>conftest.$ac_ext <<_ACEOF
$OpenBSD: patch-configure,v 1.10 2008/02/03 18:06:41 kili Exp $
--- configure.orig Fri Dec 21 13:00:49 2007
+++ configure Sun Feb 3 13:54:59 2008
@@ -25318,7 +25318,7 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <openssl/ssl.h>
int