Update to 5.600.r2

PR:             ports/65792, ports/66900
Submitted by:   Doug Silver / Urchin.com

6 files changed, 35 insertions, 12 deletions

diff --git a/www/urchin5/Makefile b/www/urchin5/Makefile
index f49570c..60084dc 100644
--- a/www/urchin5/Makefile
+++ b/www/urchin5/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	urchin
-PORTVERSION=	5.501
+PORTVERSION=	5.600.r2
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.urchin.com/pub/urchin5/
-DISTNAME=	urchin5501_freebsd4x
+DISTNAME=	urchin5600r2_freebsd4x
 
 MAINTAINER=	freebsd@urchin.com
 COMMENT=	The most powerful web traffic analysis program available
@@ -20,8 +20,7 @@ RESTRICTED=	"Commercial software, also comes bundled with Apache-SSL"
 NO_BUILD=	YES
 NO_CDROM=	"Our installer must be run for proper permissions to be set"
 NO_PACKAGE=	"Our installer must be run for proper permissions to be set"
-
-BROKEN=		"Does not build with a read-only ports tree"
+WRKSRC=		${WRKDIR}
 
 # Feel free to change this to the user you want Urchin 5 to
 # run as and the files to be owned by (except root).  It's *strongly*
@@ -35,22 +34,21 @@ QUIET=		-q
 START_SERVERS=	yes
 
 do-configure:
-	${CP} ${FILESDIR}/install.sh ./work
+	${CP} ${FILESDIR}/install.sh ${WRKSRC}
 
 do-install:
 	@if test -f ${INSTALLDIR}/data/conf/uconf.uni; then \
 		${ECHO_CMD} "The Urchin configuration files already exist,"; \
 		${ECHO_CMD} "so I will attempt to do an upgrade instead of a new installation."; \
 		${ECHO_CMD} ; \
-	 	cd ./work; \
+	 	cd ${WRKSRC}; \
 		${SH} ./install.sh ${QUIET} -d ${INSTALLDIR} -p ${PORT} -u ${USER} -g ${GROUP} -s ${START_SERVERS} -m; \
 	else \
-	 	cd ./work; \
+	 	cd ${WRKSRC}; \
 		${SH} ./install.sh ${QUIET} -d ${INSTALLDIR} -p ${PORT} -u ${USER} -g ${GROUP} -s ${START_SERVERS} -n; \
 	fi
 
 post-install:
-	${INSTALL_DATA} ${INSTALLDIR}/util/urchin_daemons ${PREFIX}/etc/rc.d/urchin5_daemons.sh-dist
 	@if [ ! -f ${PREFIX}/etc/rc.d/urchin5_daemons.sh ]; then \
 		${ECHO} "Installing ${PREFIX}/etc/rc.d/urchin5_daemons.sh startup file."; \
 		${INSTALL_SCRIPT} ${INSTALLDIR}/util/urchin_daemons ${PREFIX}/etc/rc.d/urchin5_daemons.sh; \
diff --git a/www/urchin5/distinfo b/www/urchin5/distinfo
index 08497b5..8554f9e 100644
--- a/www/urchin5/distinfo
+++ b/www/urchin5/distinfo
@@ -1 +1,2 @@
-MD5 (urchin5501_freebsd4x.tar.gz) = 84179aa712a3c18c97e1e47dcade5213
+MD5 (urchin5600r2_freebsd4x.tar.gz) = b5067fdf6e74796f6febe190769d14fa
+SIZE (urchin5600r2_freebsd4x.tar.gz) = 12635435
diff --git a/www/urchin5/files/install.sh b/www/urchin5/files/install.sh
index d8318ed..364e21a 100644
--- a/www/urchin5/files/install.sh
+++ b/www/urchin5/files/install.sh
@@ -995,7 +995,7 @@ else
    "$GUNZIP" -c "$DIST" | (cd "$INSTALLDIR"; tar xf - bin doc etc htdocs lib util)
    "$GUNZIP" -c "$DIST" | (cd "$INSTALLERDIR/tmp.$NOW.$$"; tar xf - data var)
    cd "$INSTALLERDIR/tmp.$NOW.$$/data"
-   tar cf - cache conf geodata history logs reports session | (cd "$INSTALLERDIR"; cd "$INSTALLDATADIR"; tar xf -)
+   tar cf - admin cache conf geodata history logs reports session | (cd "$INSTALLERDIR"; cd "$INSTALLDATADIR"; tar xf -)
    cd "$INSTALLERDIR/tmp.$NOW.$$/var"
    tar cf - * | (cd "$INSTALLERDIR"; cd "$INSTALLVARDIR"; tar xf -)
    cd "$INSTALLERDIR"
diff --git a/www/urchin5/pkg-deinstall b/www/urchin5/pkg-deinstall
new file mode 100644
index 0000000..18b0422
--- /dev/null
+++ b/www/urchin5/pkg-deinstall
@@ -0,0 +1,13 @@
+#!/bin/sh
+# $FreeBSD: ports/local/urchin5/pkg-deinstall
+#
+
+if [ "$2" != "POST-DEINSTALL" ]; then
+    exit 0
+fi
+
+if [ -d "${PKG_PREFIX}/urchin" ]; then
+	echo "To remove all Urchin files, including license and data files, delete the ${PKG_PREFIX}/urchin directory"
+fi
+
+exit 0
diff --git a/www/urchin5/pkg-descr b/www/urchin5/pkg-descr
index 64fa371..7d84caa 100644
--- a/www/urchin5/pkg-descr
+++ b/www/urchin5/pkg-descr
@@ -3,9 +3,9 @@ files and produces usage reports.  Urchin uses Adobe's SVG graphics
 technology to generate gorgeous, quick-rendering, interactive graphs that
 can be easily pasted into common Office applications.  Urchin achieves a
 high level of accuracy and captures a wealth of visitor parameters via the
-Urchin Tracking Module (UTM2), a client-side data collection component that
+Urchin Traffic Monitor (UTM), a client-side data collection component that
 transparently sends additional data back to the server and into the log
-file.  The UTM2 uses a first-party cookie to overcome the effects of caches,
+file.  The UTM uses a first-party cookie to overcome the effects of caches,
 proxies, and IP-recycling to provide the most accurate and complete
 reporting available from ANY analytics solution.
 
diff --git a/www/urchin5/pkg-plist b/www/urchin5/pkg-plist
index c39c2c9..f1c64c7 100644
--- a/www/urchin5/pkg-plist
+++ b/www/urchin5/pkg-plist
@@ -1,4 +1,6 @@
 @unexec %D/urchin/bin/urchinctl stop > /dev/null 2>&1 || true
+@unexec rm -f %D/urchin/var/urchinwebd.conf.template.dist 2>/dev/null || true
+etc/rc.d/urchin5_daemons.sh
 urchin/bin/admin
 urchin/bin/auth
 urchin/bin/rollup.cgi
@@ -349,6 +351,7 @@ urchin/lib/admin/templates/form_aff2.tpl
 urchin/lib/admin/templates/form_auto1.tpl
 urchin/lib/admin/templates/form_auto2.tpl
 urchin/lib/admin/templates/form_browser.tpl
+urchin/lib/admin/templates/form_ctmpending.tpl
 urchin/lib/admin/templates/form_dbrowser.tpl
 urchin/lib/admin/templates/form_filter1.tpl
 urchin/lib/admin/templates/form_filter2.tpl
@@ -453,6 +456,7 @@ urchin/lib/admin/templates/wizard_profile1.tpl
 urchin/lib/admin/templates/wizard_profile2.tpl
 urchin/lib/admin/templates/wizard_profile3.tpl
 urchin/lib/admin/templates/wizard_profile4.tpl
+urchin/lib/admin/templates/wizard_profilectm.tpl
 urchin/lib/admin/templates/wizard_profiled1.tpl
 urchin/lib/admin/templates/wizard_profiled2.tpl
 urchin/lib/admin/templates/wizard_settings1.tpl
@@ -473,9 +477,11 @@ urchin/lib/admin/views/view_s1.vw
 urchin/lib/admin/views/view_s2.vw
 urchin/lib/custom/cobrands/cobrand_admin.tpl.sample
 urchin/lib/custom/cobrands/cobrand_report.tpl.sample
+urchin/lib/custom/cobrands/cobrand_session.tpl.sample
 urchin/lib/custom/languages/en.txt.sample
 urchin/lib/custom/logformats/custom.lf.sample
 urchin/lib/custom/logformats/fieldlist.txt.sample
+urchin/lib/custom/lookuptables/campaign.lt.sample
 urchin/lib/custom/profiletypes/Campaign_Website/All_Reports.rs.sample
 urchin/lib/custom/profiletypes/Campaign_with_E-Commerce_Website/All_Reports.rs.sample
 urchin/lib/custom/profiletypes/E-Commerce_Website/All_Reports.rs.sample
@@ -495,6 +501,7 @@ urchin/lib/reporting/languages/sp.txt
 urchin/lib/reporting/languages/sw.db
 urchin/lib/reporting/languages/sw.txt
 urchin/lib/reporting/logformats/auto.lf
+urchin/lib/reporting/logformats/campaign.lf
 urchin/lib/reporting/logformats/elf.lf
 urchin/lib/reporting/logformats/elf2.lf
 urchin/lib/reporting/logformats/fieldlist.txt
@@ -503,6 +510,7 @@ urchin/lib/reporting/logformats/ncsa.lf
 urchin/lib/reporting/logformats/netscape.lf
 urchin/lib/reporting/logformats/overture.lf
 urchin/lib/reporting/logformats/w3c.lf
+urchin/lib/reporting/lookuptables/phone_models.lt
 urchin/lib/reporting/profiletypes/Campaign_Website/Basic_All.rs
 urchin/lib/reporting/profiletypes/Campaign_Website/Basic_IT.rs
 urchin/lib/reporting/profiletypes/Campaign_Website/Basic_Lite.rs
@@ -612,6 +620,7 @@ urchin/var/server.key.sample
 urchin/var/urchinwebd.conf
 urchin/var/urchinwebd.conf.template
 @dirrm urchin/bin
+@unexec rmdir %D/urchin/data/admin 2>/dev/null || true
 @unexec rm -rf %D/urchin/data/cache 2>/dev/null
 @unexec rmdir %D/urchin/data/history 2>/dev/null || true
 @unexec rmdir %D/urchin/data/logs 2>/dev/null || true
@@ -634,6 +643,7 @@ urchin/var/urchinwebd.conf.template
 @unexec rmdir %D/urchin/lib/custom/cobrands 2>/dev/null || true
 @unexec rmdir %D/urchin/lib/custom/languages 2>/dev/null || true
 @unexec rmdir %D/urchin/lib/custom/logformats 2>/dev/null || true
+@unexec rmdir %D/urchin/lib/custom/lookuptables 2>/dev/null || true
 @unexec rmdir %D/urchin/lib/custom/profiletypes/Campaign_Website 2>/dev/null || true
 @unexec rmdir %D/urchin/lib/custom/profiletypes/Campaign_with_E-Commerce_Website 2>/dev/null || true
 @unexec rmdir %D/urchin/lib/custom/profiletypes/E-Commerce_Website 2>/dev/null || true
@@ -642,6 +652,7 @@ urchin/var/urchinwebd.conf.template
 @unexec rmdir %D/urchin/lib/custom 2>/dev/null || true
 @dirrm urchin/lib/reporting/languages
 @dirrm urchin/lib/reporting/logformats
+@dirrm urchin/lib/reporting/lookuptables
 @dirrm urchin/lib/reporting/profiletypes/Campaign_Website
 @dirrm urchin/lib/reporting/profiletypes/Campaign_with_E-Commerce_Website
 @dirrm urchin/lib/reporting/profiletypes/E-Commerce_Website