- -main and -doc subpackages do not change whatever flavor is used, so

use fullpkgname
"definitely" ok for sthen@

- while here, fix some substitutions, ownerships and a typo (reported by
jdixon@)
This commit is contained in:
ajacoutot 2009-07-13 17:13:01 +00:00
parent 9a331ab71d
commit 175b28a355
5 changed files with 16 additions and 15 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.8 2009/07/13 07:21:01 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.9 2009/07/13 17:13:01 ajacoutot Exp $
COMMENT-main = network and application monitoring - agent
COMMENT-server = network and application monitoring - server
@ -8,9 +8,9 @@ COMMENT-doc = network and application monitoring - non-free documentation
VERSION = 1.6.4
MAJOR = ${VERSION:R}
DISTNAME = zabbix-${VERSION}
PKGNAME-main = zabbix-agent-${VERSION}p4
FULLPKGNAME-main = zabbix-agent-${VERSION}p5
PKGNAME-server = zabbix-server-${VERSION}p5
PKGNAME-doc = zabbix-doc-${VERSION}p1
FULLPKGNAME-doc = zabbix-doc-${VERSION}p2
PKGNAME-web = zabbix-web-${VERSION}p4
CATEGORIES = net
@ -124,11 +124,9 @@ post-install:
# Script to easy upgrading from previous major version
cd ${WRKSRC}/upgrades/ && tar -cf - dbpatches | \
tar -C ${PREFIX}/share/zabbix -xf -
touch ${WRKINST}/${PREFIX-web}/zabbix/conf/zabbix.conf.php
chown ${SHAREOWN}:${SHAREGRP} \
${PREFIX}/share/doc/zabbix/README.OpenBSD \
${DESTDIR}${PREFIX-web}/conf/modules.sample/zabbix.conf \
${DESTDIR}${PREFIX-web}/conf/php5.sample/zabbix.ini \
${DESTDIR}/${PREFIX-web}/zabbix/conf/zabbix.conf.php
${DESTDIR}${PREFIX-web}/conf/php5.sample/zabbix.ini
.include <bsd.port.mk>

View File

@ -1,4 +1,4 @@
$OpenBSD: README.OpenBSD,v 1.2 2009/07/12 19:51:51 ajacoutot Exp $
$OpenBSD: README.OpenBSD,v 1.3 2009/07/13 17:13:01 ajacoutot Exp $
This document gives information relevant to using ZABBIX on OpenBSD.
The original documentation is available as a PDF file at
@ -23,7 +23,7 @@ PHP modules are installed.
- the PDF document, a package which must be 'built' locally because it
can not be redistributed.
Next, you ou have to adapt the configuration files under
Next, you have to adapt the configuration files under
${SYSCONFDIR}/zabbix/
To have the ZABBIX server start at boot time, insert the following into
@ -86,7 +86,7 @@ Connect to MySQL, and create a user and database for ZABBIX;
mysql> quit
Then initialize the database from the files installed in
${PREFIX}/share/examples/zabbix:
${TRUEPREFIX}/share/examples/zabbix:
$ cd ${TRUEPREFIX}/share/zabbix/schema
$ mysql -uzabbix -p[password] zabbix < mysql.sql

View File

@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST-doc,v 1.1 2009/05/03 22:32:01 sthen Exp $
@comment $OpenBSD: PLIST-doc,v 1.2 2009/07/13 17:13:01 ajacoutot Exp $
@conflict zabbix-server-<1.6.4p2
@pkgpath net/zabbix,-doc,mysql
@pkgpath net/zabbix,-doc,pgsql
share/doc/zabbix/
share/doc/zabbix/ZABBIX_Manual_v${MAJOR}_rev17.pdf

View File

@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST-main,v 1.4 2009/07/12 19:51:51 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.5 2009/07/13 17:13:01 ajacoutot Exp $
@pkgpath net/zabbix,-main,mysql
@pkgpath net/zabbix,-main,pgsql
@newgroup _zabbix:623
@newuser _zabbix:623:_zabbix:daemon:zabbix user:/nonexistent:/sbin/nologin
@bin sbin/zabbix_agent

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-web,v 1.5 2009/07/13 07:21:01 ajacoutot Exp $
@comment $OpenBSD: PLIST-web,v 1.6 2009/07/13 17:13:01 ajacoutot Exp $
conf/modules.sample/zabbix.conf
@comment conf/php5.sample/
conf/php5.sample/zabbix.ini
@ -23,12 +23,11 @@ zabbix/chart6.php
zabbix/chart7.php
zabbix/chart_sla.php
zabbix/charts.php
@owner www
zabbix/conf/
@owner
zabbix/conf/COPYING
zabbix/conf/maintenance.inc.php
@owner www
zabbix/conf/zabbix.conf.php
@owner
zabbix/config.php
zabbix/create/
zabbix/create/data.sql