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

better SYSCONFDIR handling, get rid of CONFIGURE_STYLE=...old hack

Browse Source
This commit is contained in:
sthen 2011-11-28 10:52:03 +00:00
parent db0a920335
commit 9ea05cb806
4 changed files with 37 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
net/flow-tools/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.24 2011/09/16 11:13:38 espie Exp $
# $OpenBSD: Makefile,v 1.25 2011/11/28 10:52:03 sthen Exp $
SHARED_LIBS += ft 0.0 # .0.0
@ -6,7 +6,7 @@ COMMENT= cisco NetFlow utilities
DISTNAME= flow-tools-0.68.5.1
EXTRACT_SUFX= .tar.bz2
REVISION= 1
REVISION= 2
CATEGORIES= net
MAINTAINER= Stuart Henderson <sthen@openbsd.org>
@ -28,11 +28,10 @@ WANTLIB= c z
MODULES= lang/python
CONFIGURE_STYLE= gnu old # XXX allow sysconfdir to be overridden
CONFIGURE_STYLE= gnu
SEPARATE_BUILD= simple
CONFIGURE_ARGS+= --localstatedir=/var/flow-tools \
--mandir="${LOCALBASE}/man" \
--sysconfdir="${SYSCONFDIR}/flow-tools"
SYSCONFDIR= ${BASESYSCONFDIR}/flow-tools
CONFIGURE_ARGS+= --localstatedir=/var/flow-tools
.if !${FLAVOR:L:Mpgsql}
CONFIGURE_ARGS+= --without-postgresql
@ -53,7 +52,7 @@ USE_GROFF= Yes
pre-configure:
rm -f ${WRKSRC}/lib/ftconfig.h
cd ${WRKSRC}/bin; perl -pi -e 's,/bin/env python,${MODPY_BIN},;' \
-e 's,/usr/local/netflow/var/sym/,${SYSCONFDIR}/flow-tools/sym/,;' \
-e 's,/usr/local/netflow/var/sym/,${SYSCONFDIR}/sym/,;' \
flow-log2rrd flow-rpt2rrd flow-rptfmt
.include <bsd.port.mk>

30
net/flow-tools/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.11 2011/04/16 10:35:58 sthen Exp $
@comment $OpenBSD: PLIST,v 1.12 2011/11/28 10:52:03 sthen Exp $
@newgroup _netflow:575
@newuser _netflow:575:575:daemon:flow-tools user:/var/empty:/sbin/nologin
@bin bin/flow-capture
@ -57,31 +57,31 @@ lib/libft.la
@man man/man1/flow-tools.1
@man man/man1/flow-xlate.1
share/examples/flow-tools/
@sample ${SYSCONFDIR}/flow-tools/
@sample ${SYSCONFDIR}/
share/examples/flow-tools/cfg/
@sample ${SYSCONFDIR}/flow-tools/cfg/
@sample ${SYSCONFDIR}/cfg/
share/examples/flow-tools/cfg/filter.cfg
@sample ${SYSCONFDIR}/flow-tools/cfg/filter.cfg
@sample ${SYSCONFDIR}/cfg/filter.cfg
share/examples/flow-tools/cfg/map.cfg
@sample ${SYSCONFDIR}/flow-tools/cfg/map.cfg
@sample ${SYSCONFDIR}/cfg/map.cfg
share/examples/flow-tools/cfg/mask.cfg
@sample ${SYSCONFDIR}/flow-tools/cfg/mask.cfg
@sample ${SYSCONFDIR}/cfg/mask.cfg
share/examples/flow-tools/cfg/stat.cfg
@sample ${SYSCONFDIR}/flow-tools/cfg/stat.cfg
@sample ${SYSCONFDIR}/cfg/stat.cfg
share/examples/flow-tools/cfg/tag.cfg
@sample ${SYSCONFDIR}/flow-tools/cfg/tag.cfg
@sample ${SYSCONFDIR}/cfg/tag.cfg
share/examples/flow-tools/cfg/xlate.cfg
@sample ${SYSCONFDIR}/flow-tools/cfg/xlate.cfg
@sample ${SYSCONFDIR}/cfg/xlate.cfg
share/examples/flow-tools/sym/
@sample ${SYSCONFDIR}/flow-tools/sym/
@sample ${SYSCONFDIR}/sym/
share/examples/flow-tools/sym/asn.sym
@sample ${SYSCONFDIR}/flow-tools/sym/asn.sym
@sample ${SYSCONFDIR}/sym/asn.sym
share/examples/flow-tools/sym/ip-prot.sym
@sample ${SYSCONFDIR}/flow-tools/sym/ip-prot.sym
@sample ${SYSCONFDIR}/sym/ip-prot.sym
share/examples/flow-tools/sym/ip-type.sym
@sample ${SYSCONFDIR}/flow-tools/sym/ip-type.sym
@sample ${SYSCONFDIR}/sym/ip-type.sym
share/examples/flow-tools/sym/tag.sym
@sample ${SYSCONFDIR}/flow-tools/sym/tag.sym
@sample ${SYSCONFDIR}/sym/tag.sym
share/examples/flow-tools/sym/tcp-port.sym
@sample ${SYSCONFDIR}/flow-tools/sym/tcp-port.sym
@sample ${SYSCONFDIR}/sym/tcp-port.sym
@extraunexec rm -rf /var/flow-tools

15
sysutils/nut/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.52 2011/11/14 15:57:21 sthen Exp $
# $OpenBSD: Makefile,v 1.53 2011/11/28 10:56:13 sthen Exp $
COMMENT-main= UPS monitoring program supporting many brands
COMMENT-cgi= CGIs for monitoring Nut-based UPSs
@ -7,10 +7,10 @@ COMMENT-xml= driver for monitoring UPS via XML/HTTP
COMMENT-scanner= UPS scanning tool for nut
DISTNAME= nut-2.6.2
REVISION-main= 1
REVISION-xml= 1
REVISION-cgi= 1
REVISION-scanner= 0
REVISION-main= 2
REVISION-xml= 2
REVISION-cgi= 2
REVISION-scanner= 1
PKGNAME-main= ${DISTNAME}
PKGNAME-cgi= ${DISTNAME:S/-/-cgi-/}
@ -56,11 +56,10 @@ NUT_ID= 529
SUBST_VARS= WEB_ROOT NUT_USER NUT_ID
USE_GROFF= Yes
CONFIGURE_STYLE= gnu old
CONFIGURE_STYLE= gnu
SYSCONFDIR= ${BASESYSCONFDIR}/nut
CONFIGURE_ARGS+= A2X=${LOCALBASE}/bin/a2x.py \
--sysconfdir=${SYSCONFDIR}/nut \
--datadir=${PREFIX}/share/ups \
--mandir=${PREFIX}/man \
--with-doc=html-single \
--with-ssl \
--with-statepath=/var/db/nut \

18
sysutils/nut/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.12 2011/11/14 08:58:07 sthen Exp $
@comment $OpenBSD: PLIST-main,v 1.13 2011/11/28 10:56:13 sthen Exp $
@conflict upsd-*
@pkgpath sysutils/nut
@pkgpath sysutils/nut,no_cgi
@ -176,35 +176,35 @@ share/doc/nut/images/warning.png
share/doc/nut/packager-guide.html
share/doc/nut/user-manual.html
share/examples/nut/
@sample ${SYSCONFDIR}/nut/
@sample ${SYSCONFDIR}/
@comment share/examples/nut/hosts.conf.sample
@owner ${NUT_USER}
share/examples/nut/nut.conf.sample
@sample ${SYSCONFDIR}/nut/nut.conf
@sample ${SYSCONFDIR}/nut.conf
share/examples/nut/nut.service
@sample ${SYSCONFDIR}/avahi/
@sample ${SYSCONFDIR}/avahi/services/
@sample ${SYSCONFDIR}/avahi/services/nut.service
share/examples/nut/ups.conf.sample
@mode 600
@sample ${SYSCONFDIR}/nut/ups.conf
@sample ${SYSCONFDIR}/ups.conf
@mode
share/examples/nut/upsd.conf.sample
@mode 600
@sample ${SYSCONFDIR}/nut/upsd.conf
@sample ${SYSCONFDIR}/upsd.conf
@mode
share/examples/nut/upsd.users.sample
@mode 600
@sample ${SYSCONFDIR}/nut/upsd.users
@sample ${SYSCONFDIR}/upsd.users
@mode
share/examples/nut/upsmon.conf.sample
@mode 600
@sample ${SYSCONFDIR}/nut/upsmon.conf
@sample ${SYSCONFDIR}/upsmon.conf
@mode
share/examples/nut/upssched.conf.sample
@sample ${SYSCONFDIR}/nut/upssched.conf
@sample ${SYSCONFDIR}/upssched.conf
share/examples/nut/upsset.conf.sample
@sample ${SYSCONFDIR}/nut/upsset.conf
@sample ${SYSCONFDIR}/upsset.conf
@mode 700
@sample /var/db/nut/
@comment share/examples/nut/upsstats-single.html.sample