ports/56265: [new port] net/cacti - Frontend for RRDTOOL

[Sergey Akifyev]

The following reply was made to PR ports/56265; it has been noted by GNATS.

From: Sergey Akifyev <asa at gascom.ru>
To: freebsd-gnats-submit at FreeBSD.org
Cc:  
Subject: Re: ports/56265: [new port] net/cacti - Frontend for RRDTOOL
Date: Wed, 26 Nov 2003 10:41:44 +0300

 This diff does the following:
 * bumps port version to 0.8.3a
 * corrects dependencies
 * allows to pass parameters to mysql client suring initial setup
 * minor fixes
 
 ==== begin cacti.diff
 diff -ruN cacti.orig/Makefile cacti/Makefile
 --- cacti.orig/Makefile	Wed Oct 15 10:18:16 2003
 +++ cacti/Makefile	Wed Nov 26 07:01:02 2003
 @@ -6,29 +6,42 @@
  #
 
  PORTNAME=	cacti
 -PORTVERSION=	0.8.2a
 +PORTVERSION=	0.8.3a
  CATEGORIES=	net
  MASTER_SITES=	http://www.raxnet.net/downloads/
 
  MAINTAINER=	asa at gascom.ru
  COMMENT=	Frontend for RRDTOOL
 
 -RUN_DEPENDS=	safe_mysqld:${PORTSDIR}/databases/mysql323-server \
 -		mysql:${PORTSDIR}/databases/mysql323-client \
 -		snmpget:${PORTSDIR}/net/net-snmp \
 -		rrdtool:${PORTSDIR}/net/rrdtool \
 +BUILD_DEPENDS=	netsnmp.6:${PORTSDIR}/net/net-snmp
 +RUN_DEPENDS=	rrdtool:${PORTSDIR}/net/rrdtool \
  		php:${PORTSDIR}/lang/php4
 
 -NO_BUILD=	yes
 +USE_MYSQL=	yes
 +USE_GMAKE=	yes
 +GNU_CONFIGURE=	yes
 +CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include
 +CONFIGURE_WRKSRC=${WRKSRC}/cactid
 +BUILD_WRKSRC=	${CONFIGURE_WRKSRC}
 +INSTALL_WRKSRC=	${CONFIGURE_WRKSRC}
 
  CACTIDIR?=	share/cacti
  CRONTAB?=	/usr/bin/crontab
  PLIST_SUB=	CACTIDIR=${CACTIDIR}
 
 -do-install:
 -	@${SH} ${PKGINSTALL}
 +post-install:
 +	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
  	@${MKDIR} ${LOCALBASE}/${CACTIDIR}
 -	@${CP} -R ${WRKSRC}/* ${LOCALBASE}/${CACTIDIR}/
 +	@${MKDIR} ${LOCALBASE}/${CACTIDIR}/htdocs
 +	@${CP} -R ${WRKSRC}/docs ${LOCALBASE}/${CACTIDIR}
 +	@${CP} -R ${WRKSRC}/images ${LOCALBASE}/${CACTIDIR}/htdocs
 +	@${CP} -R ${WRKSRC}/include ${LOCALBASE}/${CACTIDIR}/htdocs
 +	@${CP} -R ${WRKSRC}/install ${LOCALBASE}/${CACTIDIR}/htdocs
 +	@${CP} -R ${WRKSRC}/resource ${LOCALBASE}/${CACTIDIR}/htdocs
 +	@${CP} ${WRKSRC}/*.php ${LOCALBASE}/${CACTIDIR}/htdocs
 +	@${INSTALL_DATA} ${WRKSRC}/LICENSE ${LOCALBASE}/${CACTIDIR}/
 +	@${INSTALL_DATA} ${WRKSRC}/README ${LOCALBASE}/${CACTIDIR}/
 +	@${INSTALL_DATA} ${WRKSRC}/cacti.sql ${LOCALBASE}/${CACTIDIR}/
  	@${SED} -e 's|%LOCALBASE%|${LOCALBASE}|g' \
  		-e 's|%CACTIDIR%|${LOCALBASE}/${CACTIDIR}|g' \
  		${FILESDIR}/cacti.cron \
 @@ -36,8 +49,10 @@
  	@${SED} -e 's|%CACTIDIR%|${LOCALBASE}/${CACTIDIR}|g' \
  		${FILESDIR}/cacti_db.sh \
  		> ${LOCALBASE}/${CACTIDIR}/cacti_db.sh
 -	@${CHOWN} -R cacti:cacti ${LOCALBASE}/${CACTIDIR}/rra \
 -		${LOCALBASE}/${CACTIDIR}/log
 +	@${MKDIR} -p /var/db/cacti/rra
 +	@${MKDIR} -p /var/log/cacti
 +	@${CHOWN} -R cacti:cacti /var/db/cacti/rra \
 +		/var/log/cacti
  	@${CRONTAB} -u cacti ${LOCALBASE}/${CACTIDIR}/cacti.cron
  	@${SED} -e 's|%CACTIDIR%|${LOCALBASE}/${CACTIDIR}|g'  
 ${PKGMESSAGE}
 
 diff -ruN cacti.orig/distinfo cacti/distinfo
 --- cacti.orig/distinfo	Wed Oct 15 10:18:16 2003
 +++ cacti/distinfo	Wed Oct 15 10:19:14 2003
 @@ -1 +1 @@
 -MD5 (cacti-0.8.2a.tar.gz) = 2f10bfc2b01f1b11866f319fe74b93e7
 +MD5 (cacti-0.8.3a.tar.gz) = 3a0a0af817868892d78ff9243b321858
 diff -ruN cacti.orig/files/cacti_db.sh cacti/files/cacti_db.sh
 --- cacti.orig/files/cacti_db.sh	Wed Oct 15 10:18:16 2003
 +++ cacti/files/cacti_db.sh	Sat Nov 15 06:38:14 2003
 @@ -2,7 +2,9 @@
  # Created by Sergey Akifyev <asa at gascom.ru>
  #
 
 -echo "CREATE DATABASE cacti;
 -GRANT ALL ON cacti.* TO cactiuser at localhost IDENTIFIED BY 'cactiuser';
 -FLUSH PRIVILEGES;" | mysql &&
 -mysql cacti < %CACTIDIR%/cacti.sql
 +{
 +	echo "CREATE DATABASE cacti;
 +	GRANT ALL ON cacti.* TO cactiuser at localhost IDENTIFIED BY  
 'cactiuser';
 +	FLUSH PRIVILEGES; use cacti;"
 +	cat %CACTIDIR%/cacti.sql
 +} | mysql ${*}
 diff -ruN cacti.orig/pkg-plist cacti/pkg-plist
 --- cacti.orig/pkg-plist	Wed Oct 15 10:18:16 2003
 +++ cacti/pkg-plist	Sat Nov 15 07:34:03 2003
 @@ -1,3 +1,12 @@
 +bin/cactid
 +include/cactid.h
 +include/common.h
 +include/snmp.h
 +include/rrd.h
 +include/locks.h
 +include/sql.h
 +include/util.h
 +include/poller.h
  %%CACTIDIR%%/LICENSE
  %%CACTIDIR%%/README
  %%CACTIDIR%%/about.php
 @@ -206,8 +215,6 @@
  %%CACTIDIR%%/resource/snmp_queries/net-snmp_disk.xml
  %%CACTIDIR%%/resource/snmp_queries/netware_cpu.xml
  %%CACTIDIR%%/resource/snmp_queries/netware_disk.xml
 -%%CACTIDIR%%/rra.php
 -%%CACTIDIR%%/rra/.placeholder
  %%CACTIDIR%%/scripts/3com_cable_modem.pl
  %%CACTIDIR%%/scripts/diskfree.pl
  %%CACTIDIR%%/scripts/linux_memory.pl
 ==== end cacti.diff