3 files changed, 70 insertions, 24 deletions

diff --git a/www/urchin5/Makefile b/www/urchin5/Makefile
index d960225f63a3..6e8a416ddc1b 100644
--- a/www/urchin5/Makefile
+++ b/www/urchin5/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	urchin
-PORTVERSION=	5.101
+PORTVERSION=	5.500
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.urchin.com/pub/urchin5/
-DISTNAME=	urchin5101_freebsd4x
+DISTNAME=	urchin5500_freebsd4x
 
 MAINTAINER=	freebsd@urchin.com
 COMMENT=	The most powerful web traffic analysis program available
@@ -22,11 +22,11 @@ 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"
 
 # Feel free to change this to the user you want Urchin 5 to
-# run as and the files to be owned by.  It's *strongly* advised
-# to make this a non-privileged user.  The port can be changed later
-# if desired.
-USER?=		nobody
-GROUP?=		nobody
+# run as and the files to be owned by (except root).  It's *strongly*
+# advised to make this a non-privileged user.  The port can be changed
+# later if desired.
+USER=		nobody
+GROUP=		nobody
 PORT=		9999
 INSTALLDIR=	${PREFIX}/urchin
 QUIET=		-q
diff --git a/www/urchin5/distinfo b/www/urchin5/distinfo
index edccc62619aa..f7206d76fdc8 100644
--- a/www/urchin5/distinfo
+++ b/www/urchin5/distinfo
@@ -1 +1 @@
-MD5 (urchin5101_freebsd4x.tar.gz) = 39e554595c6f404dd98c18759e557eda
+MD5 (urchin5500_freebsd4x.tar.gz) = 7c9d99e20a331c0b83cf9828cbd15f6f
diff --git a/www/urchin5/pkg-plist b/www/urchin5/pkg-plist
index 06367226a447..febc97b7a443 100644
--- a/www/urchin5/pkg-plist
+++ b/www/urchin5/pkg-plist
@@ -63,6 +63,7 @@ urchin/htdocs/uicons/default/add1.gif
 urchin/htdocs/uicons/default/aff.gif
 urchin/htdocs/uicons/default/alert.gif
 urchin/htdocs/uicons/default/arrow.gif
+urchin/htdocs/uicons/default/arrow_close.gif
 urchin/htdocs/uicons/default/arrow_l.gif
 urchin/htdocs/uicons/default/arrow_open.gif
 urchin/htdocs/uicons/default/arrow_r.gif
@@ -75,17 +76,21 @@ urchin/htdocs/uicons/default/blue.gif
 urchin/htdocs/uicons/default/blue_arrow.gif
 urchin/htdocs/uicons/default/blue_book.gif
 urchin/htdocs/uicons/default/bottom_shadow.gif
+urchin/htdocs/uicons/default/bullet_dot.gif
+urchin/htdocs/uicons/default/bullet_plus.gif
 urchin/htdocs/uicons/default/brushed_aluminum.gif
-urchin/htdocs/uicons/default/cal.gif
-urchin/htdocs/uicons/default/bullet_red.gif
 urchin/htdocs/uicons/default/bullet_green.gif
+urchin/htdocs/uicons/default/bullet_minus.gif
+urchin/htdocs/uicons/default/bullet_red.gif
 urchin/htdocs/uicons/default/button_left.gif
 urchin/htdocs/uicons/default/button_right.gif
+urchin/htdocs/uicons/default/cal.gif
 urchin/htdocs/uicons/default/calendar_back.gif
 urchin/htdocs/uicons/default/calendar_back2.gif
 urchin/htdocs/uicons/default/calendar_back3.gif
 urchin/htdocs/uicons/default/calendar_back4.gif
 urchin/htdocs/uicons/default/calendar_back5.gif
+urchin/htdocs/uicons/default/camp.gif
 urchin/htdocs/uicons/default/check.gif
 urchin/htdocs/uicons/default/click_from.gif
 urchin/htdocs/uicons/default/click_to.gif
@@ -114,6 +119,8 @@ urchin/htdocs/uicons/default/fout_active.gif
 urchin/htdocs/uicons/default/fout_inactive.gif
 urchin/htdocs/uicons/default/glossary.gif
 urchin/htdocs/uicons/default/gochinese.gif
+urchin/htdocs/uicons/default/graph.gif
+urchin/htdocs/uicons/default/green.gif
 urchin/htdocs/uicons/default/goenglish.gif
 urchin/htdocs/uicons/default/gofrench.gif
 urchin/htdocs/uicons/default/gogerman.gif
@@ -127,6 +134,8 @@ urchin/htdocs/uicons/default/graph_bar.gif
 urchin/htdocs/uicons/default/graph_bar1.gif
 urchin/htdocs/uicons/default/graph_bar2.gif
 urchin/htdocs/uicons/default/graph_barline.gif
+urchin/htdocs/uicons/default/graph_hbar1.gif
+urchin/htdocs/uicons/default/graph_hbar2.gif
 urchin/htdocs/uicons/default/graph_line.gif
 urchin/htdocs/uicons/default/graph_line1.gif
 urchin/htdocs/uicons/default/graph_line2.gif
@@ -135,12 +144,10 @@ urchin/htdocs/uicons/default/graph_pie1.gif
 urchin/htdocs/uicons/default/graph_pie2.gif
 urchin/htdocs/uicons/default/graph_sbar1.gif
 urchin/htdocs/uicons/default/graph_sbar2.gif
-urchin/htdocs/uicons/default/green.gif
 urchin/htdocs/uicons/default/green_arrow.gif
 urchin/htdocs/uicons/default/grid2.gif
 urchin/htdocs/uicons/default/group.gif
 urchin/htdocs/uicons/default/harrow.gif
-urchin/htdocs/uicons/default/log.gif
 urchin/htdocs/uicons/default/hbar.gif
 urchin/htdocs/uicons/default/hbar2.gif
 urchin/htdocs/uicons/default/hbar3.gif
@@ -157,14 +164,14 @@ urchin/htdocs/uicons/default/highlight2.gif
 urchin/htdocs/uicons/default/icon_add.gif
 urchin/htdocs/uicons/default/icon_add2.gif
 urchin/htdocs/uicons/default/icon_config.gif
+urchin/htdocs/uicons/default/log.gif
+urchin/htdocs/uicons/default/ind10.gif
 urchin/htdocs/uicons/default/icon_config2.gif
 urchin/htdocs/uicons/default/icon_delete.gif
 urchin/htdocs/uicons/default/icon_delete2.gif
 urchin/htdocs/uicons/default/icon_edit.gif
 urchin/htdocs/uicons/default/icon_edit2.gif
 urchin/htdocs/uicons/default/icon_import.gif
-urchin/htdocs/uicons/default/tod.gif
-urchin/htdocs/uicons/default/ind10.gif
 urchin/htdocs/uicons/default/icon_import2.gif
 urchin/htdocs/uicons/default/icon_prefs.gif
 urchin/htdocs/uicons/default/icon_prefs2.gif
@@ -186,10 +193,10 @@ urchin/htdocs/uicons/default/info_button.gif
 urchin/htdocs/uicons/default/lbigtab.gif
 urchin/htdocs/uicons/default/lbigtab2.gif
 urchin/htdocs/uicons/default/left_arrow.gif
-urchin/htdocs/uicons/default/lscale.gif
-urchin/htdocs/uicons/default/minirun.gif
 urchin/htdocs/uicons/default/left_grey_arrow.gif
 urchin/htdocs/uicons/default/log_out2.gif
+urchin/htdocs/uicons/default/lscale.gif
+urchin/htdocs/uicons/default/minirun.gif
 urchin/htdocs/uicons/default/minirun1.gif
 urchin/htdocs/uicons/default/minus.gif
 urchin/htdocs/uicons/default/nav_back_b.gif
@@ -207,13 +214,12 @@ urchin/htdocs/uicons/default/orange.gif
 urchin/htdocs/uicons/default/page.gif
 urchin/htdocs/uicons/default/panel_bottom.gif
 urchin/htdocs/uicons/default/panel_left.gif
-urchin/htdocs/uicons/default/up.gif
-urchin/htdocs/uicons/default/plus.gif
 urchin/htdocs/uicons/default/panel_right.gif
 urchin/htdocs/uicons/default/panel_top.gif
 urchin/htdocs/uicons/default/plate_left.gif
 urchin/htdocs/uicons/default/plate_middle.gif
 urchin/htdocs/uicons/default/plate_right.gif
+urchin/htdocs/uicons/default/plus.gif
 urchin/htdocs/uicons/default/printer.gif
 urchin/htdocs/uicons/default/printer2.gif
 urchin/htdocs/uicons/default/question.gif
@@ -222,11 +228,11 @@ urchin/htdocs/uicons/default/rcorner_bleft.gif
 urchin/htdocs/uicons/default/rcorner_bright.gif
 urchin/htdocs/uicons/default/rcorner_tleft.gif
 urchin/htdocs/uicons/default/rcorner_tleft2.gif
+urchin/htdocs/uicons/default/report.gif
 urchin/htdocs/uicons/default/rcorner_tleft_w.gif
 urchin/htdocs/uicons/default/rcorner_tright.gif
 urchin/htdocs/uicons/default/rcorner_tright2.gif
 urchin/htdocs/uicons/default/red_arrow.gif
-urchin/htdocs/uicons/default/report.gif
 urchin/htdocs/uicons/default/report_icons.gif
 urchin/htdocs/uicons/default/right_arrow.gif
 urchin/htdocs/uicons/default/right_grey_arrow.gif
@@ -241,9 +247,13 @@ urchin/htdocs/uicons/default/scale3.gif
 urchin/htdocs/uicons/default/scale4.gif
 urchin/htdocs/uicons/default/scalex.gif
 urchin/htdocs/uicons/default/scalex2.gif
+urchin/htdocs/uicons/default/sorta.gif
+urchin/htdocs/uicons/default/sorta1.gif
 urchin/htdocs/uicons/default/sortarrow.gif
+urchin/htdocs/uicons/default/sortd.gif
 urchin/htdocs/uicons/default/sortarrow2.gif
 urchin/htdocs/uicons/default/sortarrow3.gif
+urchin/htdocs/uicons/default/sortd1.gif
 urchin/htdocs/uicons/default/stop_button.gif
 urchin/htdocs/uicons/default/submitchinese.gif
 urchin/htdocs/uicons/default/submitenglish.gif
@@ -263,6 +273,7 @@ urchin/htdocs/uicons/default/tab_on_right.gif
 urchin/htdocs/uicons/default/tabside1.gif
 urchin/htdocs/uicons/default/tabside2.gif
 urchin/htdocs/uicons/default/taskbar.gif
+urchin/htdocs/uicons/default/tod.gif
 urchin/htdocs/uicons/default/tspace.gif
 urchin/htdocs/uicons/default/u5_base.gif
 urchin/htdocs/uicons/default/u5_camp.gif
@@ -270,6 +281,7 @@ urchin/htdocs/uicons/default/u5_ecom.gif
 urchin/htdocs/uicons/default/u5_lang.gif
 urchin/htdocs/uicons/default/u5_load.gif
 urchin/htdocs/uicons/default/u5_pack.gif
+urchin/htdocs/uicons/default/up.gif
 urchin/htdocs/uicons/default/updir.gif
 urchin/htdocs/uicons/default/urchin5.gif
 urchin/htdocs/uicons/default/urchin_login.gif
@@ -460,6 +472,8 @@ urchin/lib/custom/cobrands/cobrand_report.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/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
 urchin/lib/custom/profiletypes/Standard_Website/All_Reports.rs.sample
 urchin/lib/reporting/languages/en.db
@@ -476,10 +490,28 @@ urchin/lib/reporting/logformats/auto.lf
 urchin/lib/reporting/logformats/elf.lf
 urchin/lib/reporting/logformats/elf2.lf
 urchin/lib/reporting/logformats/fieldlist.txt
+urchin/lib/reporting/logformats/google.lf
 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/profiletypes/rollup.rs
+urchin/lib/reporting/profiletypes/Campaign_Website/default.config
+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
+urchin/lib/reporting/profiletypes/Campaign_Website/UTM-Enabled_All.rs
+urchin/lib/reporting/profiletypes/Campaign_Website/UTM-Enabled_Nopaths.rs
+urchin/lib/reporting/profiletypes/Campaign_Website/UTM-Enabled_Webdesign.rs
+urchin/lib/reporting/profiletypes/Campaign_Website/datamap.dm
+urchin/lib/reporting/profiletypes/Campaign_with_E-Commerce_Website/default.config
+urchin/lib/reporting/profiletypes/Campaign_with_E-Commerce_Website/Basic_All.rs
+urchin/lib/reporting/profiletypes/Campaign_with_E-Commerce_Website/Basic_IT.rs
+urchin/lib/reporting/profiletypes/Campaign_with_E-Commerce_Website/Basic_Lite.rs
+urchin/lib/reporting/profiletypes/Campaign_with_E-Commerce_Website/UTM-Enabled_All.rs
+urchin/lib/reporting/profiletypes/Campaign_with_E-Commerce_Website/UTM-Enabled_Nopaths.rs
+urchin/lib/reporting/profiletypes/Campaign_with_E-Commerce_Website/UTM-Enabled_Webdesign.rs
+urchin/lib/reporting/profiletypes/Campaign_with_E-Commerce_Website/datamap.dm
 urchin/lib/reporting/profiletypes/E-Commerce_Website/default.config
 urchin/lib/reporting/profiletypes/E-Commerce_Website/Basic_All.rs
 urchin/lib/reporting/profiletypes/E-Commerce_Website/Basic_IT.rs
@@ -509,40 +541,50 @@ urchin/lib/reporting/templates/main_comps.tpl
 urchin/lib/reporting/templates/main_popup.tpl
 urchin/lib/reporting/templates/main_report.tpl
 urchin/lib/reporting/templates/main_simple.tpl
+urchin/lib/reporting/templates/report_campsum.tpl
 urchin/lib/reporting/templates/report_clicktree.tpl
 urchin/lib/reporting/templates/report_graph.tpl
 urchin/lib/reporting/templates/report_graph2.tpl
+urchin/lib/reporting/templates/svg.tpl
 urchin/lib/reporting/templates/report_summary.tpl
 urchin/lib/reporting/templates/report_text.tpl
-urchin/lib/reporting/templates/svg.tpl
 urchin/lib/reporting/templates/report_topdate.tpl
 urchin/lib/reporting/templates/report_topten.tpl
+urchin/lib/reporting/templates/report_topten2.tpl
+urchin/lib/reporting/templates/report_topten3.tpl
 urchin/lib/reporting/templates/svg2.tpl
 urchin/lib/reporting/templates/view_about.tpl
 urchin/lib/reporting/templates/view_export.tpl
 urchin/lib/reporting/templates/view_print.tpl
+urchin/lib/reporting/templates/xe_report_campsum.tpl
 urchin/lib/reporting/templates/xe_report_clicktree.tpl
 urchin/lib/reporting/templates/xe_report_graph.tpl
 urchin/lib/reporting/templates/xe_report_graph2.tpl
 urchin/lib/reporting/templates/xe_report_summary.tpl
 urchin/lib/reporting/templates/xe_report_topdate.tpl
 urchin/lib/reporting/templates/xe_report_topten.tpl
+urchin/lib/reporting/templates/xe_report_topten2.tpl
+urchin/lib/reporting/templates/xe_report_topten3.tpl
+urchin/lib/reporting/templates/xw_report_campsum.tpl
 urchin/lib/reporting/templates/xw_report_clicktree.tpl
 urchin/lib/reporting/templates/xw_report_graph.tpl
 urchin/lib/reporting/templates/xw_report_graph2.tpl
 urchin/lib/reporting/templates/xw_report_summary.tpl
 urchin/lib/reporting/templates/xw_report_topdate.tpl
 urchin/lib/reporting/templates/xw_report_topten.tpl
+urchin/lib/reporting/templates/xw_report_topten2.tpl
+urchin/lib/reporting/templates/xw_report_topten3.tpl
 urchin/lib/session/languages/en.db
 urchin/lib/session/languages/en.txt
-urchin/lib/session/languages/ja.db
 urchin/lib/session/languages/ja.txt
+urchin/lib/session/languages/ja.db
 urchin/lib/session/templates/comps.tpl
 urchin/lib/session/templates/template.tpl
 urchin/util/utm/__utm.gif
 urchin/util/utm/__utm.js
+urchin/util/zip
+urchin/util/curl-ca-bundle.crt
 urchin/util/geo-update
-urchin/util/initialdb.config
 urchin/util/inspector
 urchin/util/u3importer
 urchin/util/uconf-driver
@@ -550,10 +592,12 @@ urchin/util/uconf-export
 urchin/util/uconf-import
 urchin/util/uconf-schedule
 urchin/util/udb-sanitizer
+urchin/util/initialdb.config
 urchin/util/urchin_daemons.template
-urchin/util/urchin_daemons
+urchin/util/curl
+urchin/util/iconv
 urchin/util/unzip
-urchin/util/zip
+urchin/util/urchin_daemons
 urchin/var/manifest.txt
 urchin/var/server.crt.sample
 urchin/var/server.key.sample
@@ -588,6 +632,8 @@ 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/profiletypes/Campaign_Website
+@dirrm urchin/lib/reporting/profiletypes/Campaign_with_E-Commerce_Website
 @dirrm urchin/lib/reporting/profiletypes/E-Commerce_Website
 @dirrm urchin/lib/reporting/profiletypes/Standard_Website
 @dirrm urchin/lib/reporting/profiletypes