svn commit: r417202 - in head/www: . calamaris-devel calamaris-devel/files

[Dmitry Sivachenko]

Author: demon
Date: Tue Jun 21 12:05:39 2016
New Revision: 417202
URL: https://svnweb.freebsd.org/changeset/ports/417202

Log:
  Add devel version of calamaris port (which is able to parse fresh squid logs)

Added:
  head/www/calamaris-devel/
     - copied from r417201, head/www/calamaris/
Deleted:
  head/www/calamaris-devel/files/
Modified:
  head/www/Makefile
  head/www/calamaris-devel/Makefile
  head/www/calamaris-devel/pkg-plist

Modified: head/www/Makefile
==============================================================================
--- head/www/Makefile	Tue Jun 21 11:20:48 2016	(r417201)
+++ head/www/Makefile	Tue Jun 21 12:05:39 2016	(r417202)
@@ -60,6 +60,7 @@
     SUBDIR += c-icap-modules
     SUBDIR += cadaver
     SUBDIR += calamaris
+    SUBDIR += calamaris-devel
     SUBDIR += caldavzap
     SUBDIR += calendarserver
     SUBDIR += castget

Modified: head/www/calamaris-devel/Makefile
==============================================================================
--- head/www/calamaris/Makefile	Tue Jun 21 11:20:48 2016	(r417201)
+++ head/www/calamaris-devel/Makefile	Tue Jun 21 12:05:39 2016	(r417202)
@@ -1,9 +1,8 @@
-# Created by: Dima Sivachenko <dima at Chg.RU>
+# Created by: Dmitry Sivachenko <mitya at yandex-team.ru>
 # $FreeBSD$
 
 PORTNAME=	calamaris
-PORTVERSION=	2.59
-PORTREVISION=	1
+PORTVERSION=	2.99.4.5
 CATEGORIES=	www textproc
 MASTER_SITES=	http://cord.de/files/calamaris/
 
@@ -12,15 +11,23 @@ COMMENT=	Perl script to produce statisti
 
 LICENSE=	GPLv2
 
+CONFLICTS_INSTALL=	calamaris-[0-9]*
+
 USES=		shebangfix perl5
 NO_BUILD=	yes
-SHEBANG_FILES=	calamaris
+SHEBANG_FILES=	calamaris calamaris-cache-convert
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/calamaris-cache-convert ${STAGEDIR}${PREFIX}/bin
+	${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}
+	${INSTALL_DATA} ${WRKSRC}/calAxestype.pm ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}
+	${INSTALL_DATA} ${WRKSRC}/calAxestype3d.pm ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}
+	${INSTALL_DATA} ${WRKSRC}/calBars3d.pm ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}
+	${INSTALL_DATA} ${WRKSRC}/calamaris.conf ${STAGEDIR}${PREFIX}/etc/calamaris.conf.sample
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/EXAMPLES ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}

Modified: head/www/calamaris-devel/pkg-plist
==============================================================================
--- head/www/calamaris/pkg-plist	Tue Jun 21 11:20:48 2016	(r417201)
+++ head/www/calamaris-devel/pkg-plist	Tue Jun 21 12:05:39 2016	(r417202)
@@ -1,4 +1,10 @@
 bin/calamaris
+bin/calamaris-cache-convert
 man/man1/calamaris.1.gz
+%%SITE_ARCH%%/calAxestype.pm
+%%SITE_ARCH%%/calAxestype3d.pm
+%%SITE_ARCH%%/calBars3d.pm
 %%PORTDOCS%%share/doc/calamaris/EXAMPLES
+%%PORTDOCS%%share/doc/calamaris/EXAMPLES.v3
 %%PORTDOCS%%share/doc/calamaris/README
+ at sample etc/calamaris.conf.sample