6 files changed, 58 insertions, 29 deletions

diff --git a/www/mysar/Makefile b/www/mysar/Makefile
index 16c6f38f7933..6b88ff45ee55 100644
--- a/www/mysar/Makefile
+++ b/www/mysar/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	mySAR
-PORTVERSION=	2.0.12
-PORTREVISION=	1
+PORTVERSION=	2.1.4
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	mysar
@@ -17,10 +16,13 @@ DISTNAME=	${PORTNAME:L}-${PORTVERSION}
 MAINTAINER=	edwin@mavetju.org
 COMMENT=	MySQL Squid Access Report
 
-WRKSRC=		${WRKDIR}/${PORTNAME:L}
+BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
+
+WRKROOT=	${WRKDIR}/${PORTNAME:L}
+WRKSRC=		${WRKROOT}/bin/mysar-binary-importer/
+GNU_CONFIGURE=	yes
 USE_MYSQL=	yes
 USE_PHP=	mysql pcre
-NO_BUILD=	yes
 
 MYSARPREFIX=	mysar
 MYSARDIR?=	${PREFIX}/${MYSARPREFIX}
@@ -30,21 +32,39 @@ SUB_FILES=	pkg-message
 SUB_LIST=	MYSARDIR=${MYSARDIR}
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
+post-extract:
+	${CHMOD} +x ${WRKSRC}/config/*
+
 post-patch:
-	${REINPLACE_CMD} -e 's,%%MYSARDIR%%,${MYSARDIR},g' \
-		${WRKSRC}/etc/*
-	${REINPLACE_CMD} -e 's,%%PHP%%,${LOCALBASE}/bin/php,g' \
-		${WRKSRC}/bin/*
+	${REINPLACE_CMD} \
+		-e 's,/usr/local/mysar/,${MYSARDIR},g' \
+		${WRKROOT}/etc/mysar.cron
+	${REINPLACE_CMD} \
+		-e 's,/usr/local/mysar/,${MYSARDIR},g' \
+		${WRKROOT}/etc/mysar.apache
 
-	${FIND} ${WRKSRC} -name *.orig -delete
-	${FIND} ${WRKSRC} -name *.bak -delete
+	${REINPLACE_CMD} \
+		-e 's,%%MYSARDIR%%,${MYSARDIR},g' \
+		`find ${WRKROOT}/etc -type f`
+	${REINPLACE_CMD} \
+		-e 's,%%PHP%%,${LOCALBASE}/bin/php,g' \
+		`find ${WRKROOT}/bin -type f`
+	${REINPLACE_CMD} \
+		-e 's,/bin/sh,${LOCALBASE}/bin/bash,g' \
+		`find ${WRKROOT}/bin/mysar-binary-importer -type f`
+
+	${FIND} ${WRKROOT} -name *.orig -delete
+	${FIND} ${WRKROOT} -name *.bak -delete
 
 do-install:
+	${MV} ${WRKSRC} ${WRKROOT}
 	${MKDIR} ${MYSARDIR}
-	${CP} -R ${WRKSRC}/* ${MYSARDIR}
+	${CP} -R `find ${WRKROOT} -mindepth 1 -maxdepth 1 ! -name mysar-binary-importer` ${MYSARDIR}
+	${INSTALL_PROGRAM} ${WRKROOT}/mysar-binary-importer/src/mysar ${MYSARDIR}/bin
+	${INSTALL_DATA} ${WRKROOT}/mysar-binary-importer/mysar.conf ${MYSARDIR}/etc
 	${CHOWN} -R ${WWWOWN} ${MYSARDIR}/www-templates
 	${CHOWN} -R ${WWWOWN} ${MYSARDIR}/smarty-tmp
 
-post-install:
 	${CAT} ${PKGMESSAGE}
+
 .include <bsd.port.mk>
diff --git a/www/mysar/distinfo b/www/mysar/distinfo
index 4cd99e731514..a8798aa752aa 100644
--- a/www/mysar/distinfo
+++ b/www/mysar/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysar-2.0.12.tar.gz) = 6cc3e2db7b362b46840b14cf886d1041
-SHA256 (mysar-2.0.12.tar.gz) = 4166a0aa21d7fadfd0d49e956f23d29554c03d39690c540cc0586c356f68ea52
-SIZE (mysar-2.0.12.tar.gz) = 132057
+MD5 (mysar-2.1.4.tar.gz) = 4b570ace1b46ec3c13e0a048e9d6cf37
+SHA256 (mysar-2.1.4.tar.gz) = cb66d6216bb786a761370a1f5dda895552a63e575e01a9c7fba91aa3885b32ec
+SIZE (mysar-2.1.4.tar.gz) = 253591
diff --git a/www/mysar/files/patch-bin_mysar-binary-importer_configure b/www/mysar/files/patch-bin_mysar-binary-importer_configure
new file mode 100644
index 000000000000..6d661d89ed20
--- /dev/null
+++ b/www/mysar/files/patch-bin_mysar-binary-importer_configure
@@ -0,0 +1,11 @@
+--- configure.orig	2008-04-28 12:03:38.000000000 +0000
++++ configure	2008-04-28 12:03:54.000000000 +0000
+@@ -569,7 +569,7 @@
+ subdirs=
+ MFLAGS=
+ MAKEFLAGS=
+-SHELL=${CONFIG_SHELL-/bin/sh}
++SHELL=/bin/sh
+ 
+ # Identity of this package.
+ PACKAGE_NAME='mysar'
diff --git a/www/mysar/files/patch-etc_mysar.apache b/www/mysar/files/patch-etc_mysar.apache
deleted file mode 100644
index 0268a26173ad..000000000000
--- a/www/mysar/files/patch-etc_mysar.apache
+++ /dev/null
@@ -1,5 +0,0 @@
---- etc/mysar.apache.orig	Tue Jan 10 10:33:30 2006
-+++ etc/mysar.apache	Tue Jan 10 10:33:38 2006
-@@ -1 +1 @@
--Alias /mysar /usr/local/mysar/www
-+Alias /mysar %%LOCALBASE%%/mysar/www
diff --git a/www/mysar/files/patch-etc_mysar.cron b/www/mysar/files/patch-etc_mysar.cron
deleted file mode 100644
index ea40d96a9cd4..000000000000
--- a/www/mysar/files/patch-etc_mysar.cron
+++ /dev/null
@@ -1,9 +0,0 @@
---- etc/mysar.cron.orig	Tue Jan 10 10:33:43 2006
-+++ etc/mysar.cron	Tue Jan 10 10:34:26 2006
-@@ -1,3 +1,3 @@
--* * * * *	root	/usr/local/mysar/bin/mysar-importer.php > /usr/local/mysar/log/mysar-importer.log 2>&1
--* * * * *	root	/usr/local/mysar/bin/mysar-resolver.php > /usr/local/mysar/log/mysar-resolver.log 2>&1
--0 0 * * *	root	/usr/local/mysar/bin/mysar-maintenance.php /usr/local/mysar/log/mysar-maintenance.log 2>&1
-+* * * * *	root	%%MYSARDIR%%/bin/mysar-importer.php > %%MYSARDIR%%/log/mysar-importer.log 2>&1
-+* * * * *	root	%%MYSARDIR%%/bin/mysar-resolver.php > %%MYSARDIR%%/log/mysar-resolver.log 2>&1
-+0 0 * * *	root	%%MYSARDIR%%/bin/mysar-maintenance.php %%MYSARDIR%%/log/mysar-maintenance.log 2>&1
diff --git a/www/mysar/pkg-plist b/www/mysar/pkg-plist
index 792b75bb9576..0c91614e7744 100644
--- a/www/mysar/pkg-plist
+++ b/www/mysar/pkg-plist
@@ -1,3 +1,5 @@
+%%MYSAR%%/bin/mysar
+%%MYSAR%%/etc/mysar.conf
 %%MYSAR%%/CHANGELOG
 %%MYSAR%%/COPYING
 %%MYSAR%%/INSTALL
@@ -111,6 +113,15 @@
 %%MYSAR%%/www-templates.pt_BR/IPSitesSummary.tpl
 %%MYSAR%%/www-templates.pt_BR/footer.tpl
 %%MYSAR%%/www-templates.pt_BR/administration.tpl
+%%MYSAR%%/www-templates.ru_RU/header.tpl
+%%MYSAR%%/www-templates.ru_RU/IPSummary.tpl
+%%MYSAR%%/www-templates.ru_RU/details.tpl
+%%MYSAR%%/www-templates.ru_RU/allsites.tpl
+%%MYSAR%%/www-templates.ru_RU/siteusers.tpl
+%%MYSAR%%/www-templates.ru_RU/index.tpl
+%%MYSAR%%/www-templates.ru_RU/IPSitesSummary.tpl
+%%MYSAR%%/www-templates.ru_RU/footer.tpl
+%%MYSAR%%/www-templates.ru_RU/administration.tpl
 %%MYSAR%%/www/dfl.css
 %%MYSAR%%/www/images/down-arrow.gif
 %%MYSAR%%/www/images/splash_main.gif
@@ -125,6 +136,7 @@
 @dirrmtry %%MYSAR%%/inc
 @dirrmtry %%MYSAR%%/smarty-tmp
 @dirrmtry %%MYSAR%%/log
+@dirrmtry %%MYSAR%%/www-templates.ru_RU
 @dirrmtry %%MYSAR%%/www-templates.fr_FR
 @dirrmtry %%MYSAR%%/www-templates.pt_BR
 @dirrmtry %%MYSAR%%/www-templates