- Change maintainer's email

- Remove dependence on apache
- Mark BROKEN on ${OSVERSION} >= 700000 only when using mysql
- Use ${COPYTREE_SHARE}, ${INSTALL_DATA} to replace ${CP} -r
- Use explicit pkg-plist
- Tweak pgsql cdr template
- Bump PORTREVISION

Approved by:	maintainer
Pointed out by:	sat
Suggested by:	dougb, pav, rafan, danfe

3 files changed, 146 insertions, 20 deletions

diff --git a/www/asterisk-stat/Makefile b/www/asterisk-stat/Makefile
index 42b54b828dcb..31e2a83bd3b0 100644
--- a/www/asterisk-stat/Makefile
+++ b/www/asterisk-stat/Makefile
@@ -7,17 +7,17 @@
 
 PORTNAME=	asterisk-stat
 PORTVERSION=	2.0.1
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.areski.net/${SITE_SUBDIR}/
 DISTNAME=	${PORTNAME}-v${PORTVERSION:S/./_/g}
 
-MAINTAINER=	jfkimura@yahoo.com
+MAINTAINER=	jfkimura@yahoo.co.jp
 COMMENT=	ASTERISK Call Detail Records Analizer
 
 LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 
 NO_BUILD=	yes
-USE_APACHE=	yes
 USE_PHP=	session gd pcre
 WANT_PHP_WEB=	yes
 ASTERISKDIR?=	${WWWDIR}
@@ -30,21 +30,21 @@ OPTIONS=	PGSQL "Use PostgreSQL instead of MySQL" off
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 700000
-BROKEN=	Depends on net/asterisk-addons which does not build on 7-CURRENT
-.endif
-
 .if defined(WITH_PGSQL)
 ASTERISKSTATDB=	pgsql
 .else
+.	if ${OSVERSION} >= 700000
+BROKEN=	Depends on net/asterisk-addons which does not build on 7-CURRENT
+.	endif
 ASTERISKSTATDB=	mysql
-# net/asterisk-addons
 RUN_DEPENDS+=	${LOCALBASE}/lib/asterisk/modules/cdr_addon_mysql.so:${PORTSDIR}/net/asterisk-addons
 .endif
 
 USE_PHP+=	${ASTERISKSTATDB}
 EXTRA_PATCHES+=	${FILESDIR}/${ASTERISKSTATDB}__patch-cdr.php \
 		${FILESDIR}/${ASTERISKSTATDB}__patch-defines.php
+PLIST_SUB+=	ASTERISKDIR=${ASTERISKDIR:S,^${PREFIX}/,,} \
+		ASTERISKSTATDB=${ASTERISKSTATDB}
 
 post-patch:
 	@${MV} ${WRKSRC}/images/print.css ${WRKSRC}/css
@@ -58,16 +58,9 @@ post-patch:
 do-install:
 	@${MKDIR} ${ASTERISKDIR}
 	@${MV} ${WRKSRC}/lib/defines.php ${WRKSRC}/lib/defines.php-dist
-	${CP} -r ${WRKSRC}/ ${ASTERISKDIR}
-	${CP} ${FILESDIR}/cdr_${ASTERISKSTATDB}.tbl ${PREFIX}/etc/asterisk
+	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} \* ${ASTERISKDIR})
+	${MKDIR} ${PREFIX}/etc/asterisk
+	${INSTALL_DATA} ${FILESDIR}/cdr_${ASTERISKSTATDB}.tbl ${PREFIX}/etc/asterisk
 	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${ASTERISKDIR}
 
-post-install:
-	@${FIND} ${WRKSRC}/${file} -not -type d \
-		| ${SED} -ne 's,^${WRKSRC},${ASTERISKDIR:S,^${TARGETDIR}/,,},p' >> ${TMPPLIST}
-	@${FIND} -d ${WRKSRC}/${file} -type d \
-		| ${SED} -ne 's,^${WRKSRC},@dirrm ${ASTERISKDIR:S,^${TARGETDIR}/,,},p' >> ${TMPPLIST}
-	@${ECHO} etc/asterisk/cdr_${ASTERISKSTATDB}.tbl >> ${TMPPLIST}
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.post.mk>
diff --git a/www/asterisk-stat/files/cdr_pgsql.tbl b/www/asterisk-stat/files/cdr_pgsql.tbl
index ff668d27e7eb..b845badb4e99 100644
--- a/www/asterisk-stat/files/cdr_pgsql.tbl
+++ b/www/asterisk-stat/files/cdr_pgsql.tbl
@@ -9,10 +9,10 @@ CREATE TABLE cdr (
   dstchannel varchar(80) NOT NULL default '',
   lastapp varchar(80) NOT NULL default '',
   lastdata varchar(80) NOT NULL default '',
-  duration int(11) NOT NULL default '0',
-  billsec int(11) NOT NULL default '0',
+  duration bigint NOT NULL default '0',
+  billsec bigint NOT NULL default '0',
   disposition varchar(45) NOT NULL default '',
-  amaflags int(11) NOT NULL default '0',
+  amaflags bigint NOT NULL default '0',
   accountcode varchar(20) NOT NULL default '',
   uniqueid varchar(32) NOT NULL default '',
   userfield varchar(255) NOT NULL default ''
diff --git a/www/asterisk-stat/pkg-plist b/www/asterisk-stat/pkg-plist
new file mode 100644
index 000000000000..0ae3aad3b05c
--- /dev/null
+++ b/www/asterisk-stat/pkg-plist
@@ -0,0 +1,133 @@
+etc/asterisk/cdr_%%ASTERISKSTATDB%%.tbl
+%%ASTERISKDIR%%/CHANGELOG.txt
+%%ASTERISKDIR%%/call-comp.php
+%%ASTERISKDIR%%/call-daily-load.php
+%%ASTERISKDIR%%/call-last-month.php
+%%ASTERISKDIR%%/call-log.php
+%%ASTERISKDIR%%/cdr.php
+%%ASTERISKDIR%%/counter.txt
+%%ASTERISKDIR%%/css/content.css
+%%ASTERISKDIR%%/css/docbook.css
+%%ASTERISKDIR%%/css/images/corner-bl.png
+%%ASTERISKDIR%%/css/images/corner-br.png
+%%ASTERISKDIR%%/css/images/corner-tl.png
+%%ASTERISKDIR%%/css/images/corner-tr.png
+%%ASTERISKDIR%%/css/layout.css
+%%ASTERISKDIR%%/css/print.css
+%%ASTERISKDIR%%/encrypt.js
+%%ASTERISKDIR%%/export_csv.php
+%%ASTERISKDIR%%/export_pdf.php
+%%ASTERISKDIR%%/graph_hourdetail.php
+%%ASTERISKDIR%%/graph_pie.php
+%%ASTERISKDIR%%/graph_stat.php
+%%ASTERISKDIR%%/graph_statbar.php
+%%ASTERISKDIR%%/images/asterisk.gif
+%%ASTERISKDIR%%/images/btn_top_12x12.gif
+%%ASTERISKDIR%%/images/button-search.gif
+%%ASTERISKDIR%%/images/clear.gif
+%%ASTERISKDIR%%/images/corner-bl.png
+%%ASTERISKDIR%%/images/corner-br.png
+%%ASTERISKDIR%%/images/corner-tl.png
+%%ASTERISKDIR%%/images/corner-tr.png
+%%ASTERISKDIR%%/images/excel.gif
+%%ASTERISKDIR%%/images/fleche-d.gif
+%%ASTERISKDIR%%/images/fleche-g.gif
+%%ASTERISKDIR%%/images/header-download.png
+%%ASTERISKDIR%%/images/header-faq.png
+%%ASTERISKDIR%%/images/header-projects.png
+%%ASTERISKDIR%%/images/header-search.png
+%%ASTERISKDIR%%/images/icon_down_12x12.GIF
+%%ASTERISKDIR%%/images/icon_up_12x12.GIF
+%%ASTERISKDIR%%/images/icon_up_12x12.gif
+%%ASTERISKDIR%%/images/jukebox_ti60.gif
+%%ASTERISKDIR%%/images/pdf.gif
+%%ASTERISKDIR%%/images/printable.png
+%%ASTERISKDIR%%/images/sidenav-selected.gif
+%%ASTERISKDIR%%/images/spacer.gif
+%%ASTERISKDIR%%/info.txt
+%%ASTERISKDIR%%/jpgraph_lib/imgdata_balls.inc
+%%ASTERISKDIR%%/jpgraph_lib/imgdata_bevels.inc
+%%ASTERISKDIR%%/jpgraph_lib/imgdata_diamonds.inc
+%%ASTERISKDIR%%/jpgraph_lib/imgdata_pushpins.inc
+%%ASTERISKDIR%%/jpgraph_lib/imgdata_squares.inc
+%%ASTERISKDIR%%/jpgraph_lib/imgdata_stars.inc
+%%ASTERISKDIR%%/jpgraph_lib/jpg-config.inc
+%%ASTERISKDIR%%/jpgraph_lib/jpgraph.php
+%%ASTERISKDIR%%/jpgraph_lib/jpgraph_antispam-digits.php
+%%ASTERISKDIR%%/jpgraph_lib/jpgraph_antispam.php
+%%ASTERISKDIR%%/jpgraph_lib/jpgraph_bar.php
+%%ASTERISKDIR%%/jpgraph_lib/jpgraph_canvas.php
+%%ASTERISKDIR%%/jpgraph_lib/jpgraph_canvtools.php
+%%ASTERISKDIR%%/jpgraph_lib/jpgraph_error.php
+%%ASTERISKDIR%%/jpgraph_lib/jpgraph_flags.php
+%%ASTERISKDIR%%/jpgraph_lib/jpgraph_gantt.php
+%%ASTERISKDIR%%/jpgraph_lib/jpgraph_gb2312.php
+%%ASTERISKDIR%%/jpgraph_lib/jpgraph_gradient.php
+%%ASTERISKDIR%%/jpgraph_lib/jpgraph_iconplot.php
+%%ASTERISKDIR%%/jpgraph_lib/jpgraph_imgtrans.php
+%%ASTERISKDIR%%/jpgraph_lib/jpgraph_line.php
+%%ASTERISKDIR%%/jpgraph_lib/jpgraph_log.php
+%%ASTERISKDIR%%/jpgraph_lib/jpgraph_pie.php
+%%ASTERISKDIR%%/jpgraph_lib/jpgraph_pie3d.php
+%%ASTERISKDIR%%/jpgraph_lib/jpgraph_plotband.php
+%%ASTERISKDIR%%/jpgraph_lib/jpgraph_plotmark.inc
+%%ASTERISKDIR%%/jpgraph_lib/jpgraph_polar.php
+%%ASTERISKDIR%%/jpgraph_lib/jpgraph_radar.php
+%%ASTERISKDIR%%/jpgraph_lib/jpgraph_regstat.php
+%%ASTERISKDIR%%/jpgraph_lib/jpgraph_scatter.php
+%%ASTERISKDIR%%/jpgraph_lib/jpgraph_stock.php
+%%ASTERISKDIR%%/lib/Class.Table.php
+%%ASTERISKDIR%%/lib/DB-modules/ciaosql.php
+%%ASTERISKDIR%%/lib/DB-modules/phplib_mssql.php
+%%ASTERISKDIR%%/lib/DB-modules/phplib_mysql.php
+%%ASTERISKDIR%%/lib/DB-modules/phplib_oci8.php
+%%ASTERISKDIR%%/lib/DB-modules/phplib_odbc.php
+%%ASTERISKDIR%%/lib/DB-modules/phplib_oracle.php
+%%ASTERISKDIR%%/lib/DB-modules/phplib_postgres.php
+%%ASTERISKDIR%%/lib/DB-modules/phplib_sybase.php
+%%ASTERISKDIR%%/lib/defines.php-dist
+%%ASTERISKDIR%%/lib/font/courier.php
+%%ASTERISKDIR%%/lib/font/helvetica.php
+%%ASTERISKDIR%%/lib/font/helveticab.php
+%%ASTERISKDIR%%/lib/font/helveticabi.php
+%%ASTERISKDIR%%/lib/font/helveticai.php
+%%ASTERISKDIR%%/lib/font/makefont/cp1250.map
+%%ASTERISKDIR%%/lib/font/makefont/cp1251.map
+%%ASTERISKDIR%%/lib/font/makefont/cp1252.map
+%%ASTERISKDIR%%/lib/font/makefont/cp1253.map
+%%ASTERISKDIR%%/lib/font/makefont/cp1254.map
+%%ASTERISKDIR%%/lib/font/makefont/cp1255.map
+%%ASTERISKDIR%%/lib/font/makefont/cp1257.map
+%%ASTERISKDIR%%/lib/font/makefont/cp1258.map
+%%ASTERISKDIR%%/lib/font/makefont/cp874.map
+%%ASTERISKDIR%%/lib/font/makefont/iso-8859-1.map
+%%ASTERISKDIR%%/lib/font/makefont/iso-8859-11.map
+%%ASTERISKDIR%%/lib/font/makefont/iso-8859-15.map
+%%ASTERISKDIR%%/lib/font/makefont/iso-8859-16.map
+%%ASTERISKDIR%%/lib/font/makefont/iso-8859-2.map
+%%ASTERISKDIR%%/lib/font/makefont/iso-8859-4.map
+%%ASTERISKDIR%%/lib/font/makefont/iso-8859-5.map
+%%ASTERISKDIR%%/lib/font/makefont/iso-8859-7.map
+%%ASTERISKDIR%%/lib/font/makefont/iso-8859-9.map
+%%ASTERISKDIR%%/lib/font/makefont/koi8-r.map
+%%ASTERISKDIR%%/lib/font/makefont/koi8-u.map
+%%ASTERISKDIR%%/lib/font/makefont/makefont.php
+%%ASTERISKDIR%%/lib/font/symbol.php
+%%ASTERISKDIR%%/lib/font/times.php
+%%ASTERISKDIR%%/lib/font/timesb.php
+%%ASTERISKDIR%%/lib/font/timesbi.php
+%%ASTERISKDIR%%/lib/font/timesi.php
+%%ASTERISKDIR%%/lib/font/zapfdingbats.php
+%%ASTERISKDIR%%/lib/fpdf.php
+%%ASTERISKDIR%%/lib/iam_csvdump.php
+%%ASTERISKDIR%%/wiki.html
+@dirrmtry etc/asterisk
+@dirrm %%ASTERISKDIR%%/lib/font/makefont
+@dirrm %%ASTERISKDIR%%/lib/font
+@dirrm %%ASTERISKDIR%%/lib/DB-modules
+@dirrm %%ASTERISKDIR%%/lib
+@dirrm %%ASTERISKDIR%%/jpgraph_lib
+@dirrm %%ASTERISKDIR%%/images
+@dirrm %%ASTERISKDIR%%/css/images
+@dirrm %%ASTERISKDIR%%/css
+@dirrm %%ASTERISKDIR%%