Update to 6.1.6.

5 files changed, 163 insertions, 53 deletions

diff --git a/databases/virtuoso/Makefile b/databases/virtuoso/Makefile
index 729253c3aa67..c09581bc4098 100644
--- a/databases/virtuoso/Makefile
+++ b/databases/virtuoso/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	virtuoso
-PORTVERSION=	6.1.4
-PORTREVISION=	1
+PORTVERSION=	6.1.6
 CATEGORIES=	databases
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-opensource-${PORTVERSION}
diff --git a/databases/virtuoso/distinfo b/databases/virtuoso/distinfo
index 1890c141b0de..ca406714c78d 100644
--- a/databases/virtuoso/distinfo
+++ b/databases/virtuoso/distinfo
@@ -1,2 +1,2 @@
-SHA256 (virtuoso-opensource-6.1.4.tar.gz) = 153f92211a23e05dcf4bde4c94d2963d06321d00f213c50025d740b96140154e
-SIZE (virtuoso-opensource-6.1.4.tar.gz) = 100595847
+SHA256 (virtuoso-opensource-6.1.6.tar.gz) = c6bfa6817b3dad5f87577b68f4cf554d1bfbff48178a734084ac3dcbcea5a037
+SIZE (virtuoso-opensource-6.1.6.tar.gz) = 113255048
diff --git a/databases/virtuoso/files/patch-gawk-4.0.diff b/databases/virtuoso/files/patch-gawk-4.0.diff
deleted file mode 100644
index deb6f09508be..000000000000
--- a/databases/virtuoso/files/patch-gawk-4.0.diff
+++ /dev/null
@@ -1,34 +0,0 @@
---- binsrc/cached_resources/res_to_c.awk.orig	2011-10-26 20:53:59.000000000 +0700
-+++ binsrc/cached_resources/res_to_c.awk	2012-06-16 16:36:20.000000000 +0700
-@@ -30,13 +30,7 @@
- 	}
- 	{
- 	  fun = $0
--	  # was: gsub ( /\\/, "\\\\", fun)
--	  q = "\\\\"
--	  if (PROCINFO["version"] ~ /^4/)
--	    gsub ( q, q q, fun)
--	  else
--	    gsub ( q, q, fun)
--
-+          gsub ( "\\\\", "&&", fun)
- 	  gsub ( /"/, "\\\"", fun)
- 	  gsub ( /\$/, "\\044", fun)
- 	  gsub ( /.*/, "\"&\\n\",", fun)
---- libsrc/Wi/sql_to_c.awk.orig	2011-10-26 20:54:20.000000000 +0700
-+++ libsrc/Wi/sql_to_c.awk	2012-06-16 16:41:30.000000000 +0700
-@@ -343,13 +343,7 @@
- 
-                 # does escape the symbols
- 		fun = $0
--		q = "\\\\"
--		if (PROCINFO["version"] ~ /^4/)
--		    gsub ( q, q q, fun)
--		else
--		    gsub ( q, q, fun)
--
--	        #WAS: gsub ( /\\/, "\\\\", fun)
-+		gsub ( "\\\\", "&&", fun)
- 
- 		# remove whitespace except when there is just a semicolon
- 		if ((in_xsl_mode == 0) && (in_xsd_mode == 0))
diff --git a/databases/virtuoso/files/patch-libsrc-Wi-lib_file.c b/databases/virtuoso/files/patch-libsrc-Wi-lib_file.c
deleted file mode 100644
index 3d1702f8e6dc..000000000000
--- a/databases/virtuoso/files/patch-libsrc-Wi-lib_file.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libsrc/Wi/bif_file.c-old	2011-10-26 15:54:19.000000000 +0200
-+++ libsrc/Wi/bif_file.c	2012-01-16 17:27:07.294200532 +0100
-@@ -6161,7 +6161,7 @@
- }
- 
- 
--#if defined(__APPLE__)
-+#if defined(__APPLE__) || defined(__FreeBSD__)
- #define fseeko64 fseeko
- #define ftello64 ftello
- #define fopen64  fopen
diff --git a/databases/virtuoso/pkg-plist b/databases/virtuoso/pkg-plist
index 80d658041968..0a1770b45c6d 100644
--- a/databases/virtuoso/pkg-plist
+++ b/databases/virtuoso/pkg-plist
@@ -56,6 +56,7 @@ virtuoso/doc/LICENSE
 virtuoso/doc/NEWS
 virtuoso/doc/README
 virtuoso/doc/README.CVS
+virtuoso/doc/README.GIT
 virtuoso/doc/README.UPGRADE
 virtuoso/doc/README.WINDOWS
 virtuoso/doc/README.hibernate
@@ -132,6 +133,7 @@ virtuoso/doc/html/errors.html
 virtuoso/doc/html/expwsmodules.html
 virtuoso/doc/html/fault.html
 virtuoso/doc/html/fn_GROUP_CONCAT.html
+virtuoso/doc/html/fn_GROUP_DIGEST.html
 virtuoso/doc/html/fn_REPL_ADD_CR.html
 virtuoso/doc/html/fn_REPL_ADD_DAV_CR.html
 virtuoso/doc/html/fn_REPL_ADD_SNAPSHOT_CR.html
@@ -143,6 +145,7 @@ virtuoso/doc/html/fn_REPL_INIT_SNAPSHOT.html
 virtuoso/doc/html/fn_REPL_SERVER_NAME.html
 virtuoso/doc/html/fn_REPL_SNP_SERVER.html
 virtuoso/doc/html/fn_REPL_UPDATE_SNAPSHOT.html
+virtuoso/doc/html/fn_SAMPLE.html
 virtuoso/doc/html/fn_SYS_DB_STAT.html
 virtuoso/doc/html/fn_USER_CHANGE_PASSWORD.html
 virtuoso/doc/html/fn_USER_CREATE.html
@@ -189,6 +192,9 @@ virtuoso/doc/html/fn_XMLUpdate.html
 virtuoso/doc/html/fn___any_grants.html
 virtuoso/doc/html/fn___xml_get_ns_prefix.html
 virtuoso/doc/html/fn___xml_get_ns_uri.html
+virtuoso/doc/html/fn___xml_ns_iristr.html
+virtuoso/doc/html/fn___xml_ns_uname.html
+virtuoso/doc/html/fn___xml_nsexpand_iristr.html
 virtuoso/doc/html/fn_abs.html
 virtuoso/doc/html/fn_acos.html
 virtuoso/doc/html/fn_ann_phrase_class_add.html
@@ -506,6 +512,7 @@ virtuoso/doc/html/fn_rdf_suo_diff_ttl.html
 virtuoso/doc/html/fn_rdf_triples_to_rdf_xml_text.html
 virtuoso/doc/html/fn_rdf_triples_to_ttl.html
 virtuoso/doc/html/fn_rdf_ttl2hash.html
+virtuoso/doc/html/fn_rdf_view_sync_to_physical.html
 virtuoso/doc/html/fn_rdf_void_store.html
 virtuoso/doc/html/fn_rdfs_rule_set.html
 virtuoso/doc/html/fn_regexp_instr.html
@@ -564,7 +571,6 @@ virtuoso/doc/html/fn_row_count.html
 virtuoso/doc/html/fn_rowvector_digit_sort.html
 virtuoso/doc/html/fn_rstmtexec.html
 virtuoso/doc/html/fn_rtrim.html
-virtuoso/doc/html/fn_sample.html
 virtuoso/doc/html/fn_search_excerpt.html
 virtuoso/doc/html/fn_second.html
 virtuoso/doc/html/fn_sequence_get_all.html
@@ -582,6 +588,7 @@ virtuoso/doc/html/fn_ses_write.html
 virtuoso/doc/html/fn_set_identity_column.html
 virtuoso/doc/html/fn_set_row_count.html
 virtuoso/doc/html/fn_set_user_id.html
+virtuoso/doc/html/fn_sha1_digest.html
 virtuoso/doc/html/fn_sign.html
 virtuoso/doc/html/fn_signal.html
 virtuoso/doc/html/fn_sinv_create_inverse.html
@@ -703,6 +710,7 @@ virtuoso/doc/html/fn_vad_check_uninstallability.html
 virtuoso/doc/html/fn_vad_fail_check.html
 virtuoso/doc/html/fn_vad_install.html
 virtuoso/doc/html/fn_vad_load_file.html
+virtuoso/doc/html/fn_vad_load_sql_file.html
 virtuoso/doc/html/fn_vad_pack.html
 virtuoso/doc/html/fn_vad_safe_exec.html
 virtuoso/doc/html/fn_vad_uninstall.html
@@ -822,6 +830,7 @@ virtuoso/doc/html/htmlconductorbar.html
 virtuoso/doc/html/index.html
 virtuoso/doc/html/inprocess.html
 virtuoso/doc/html/insertSTMT.html
+virtuoso/doc/html/installallplatforms.html
 virtuoso/doc/html/installation.html
 virtuoso/doc/html/installcrweb.html
 virtuoso/doc/html/installmacosx.html
@@ -866,6 +875,7 @@ virtuoso/doc/html/newadminui.html
 virtuoso/doc/html/nntpnewsgroups.html
 virtuoso/doc/html/odbcimplementation.html
 virtuoso/doc/html/omissionsexcp.html
+virtuoso/doc/html/oplmgr.html
 virtuoso/doc/html/otherfactors.html
 virtuoso/doc/html/overview.html
 virtuoso/doc/html/perlhosting.html
@@ -888,9 +898,9 @@ virtuoso/doc/html/qswebservices.html
 virtuoso/doc/html/queryingftcols.html
 virtuoso/doc/html/queryingxmldata.html
 virtuoso/doc/html/quicktours.html
+virtuoso/doc/html/r2rml.html
 virtuoso/doc/html/rdfandsparql.html
 virtuoso/doc/html/rdfdatarepresentation.html
-virtuoso/doc/html/rdfgraphreplication.html
 virtuoso/doc/html/rdfgraphsecurity.html
 virtuoso/doc/html/rdfinsertmethods.html
 virtuoso/doc/html/rdfiridereferencing.html
@@ -898,10 +908,9 @@ virtuoso/doc/html/rdfnativestorageproviders.html
 virtuoso/doc/html/rdfperformancetuning.html
 virtuoso/doc/html/rdfrdfviewgnr.html
 virtuoso/doc/html/rdfsparql.html
-virtuoso/doc/html/rdfsparqlgeospat.html
 virtuoso/doc/html/rdfsparqlrule.html
-virtuoso/doc/html/rdfviews.html
 virtuoso/doc/html/rdfviewsenterpr.html
+virtuoso/doc/html/rdfviewsrdbms.html
 virtuoso/doc/html/repl.html
 virtuoso/doc/html/replexamples.html
 virtuoso/doc/html/replintro.html
@@ -1325,6 +1334,8 @@ virtuoso/doc/images/rdf14.png
 virtuoso/doc/images/rdf15.png
 virtuoso/doc/images/rdf16.png
 virtuoso/doc/images/rdf17.png
+virtuoso/doc/images/rdf18.png
+virtuoso/doc/images/rdf19.png
 virtuoso/doc/images/rdf2.png
 virtuoso/doc/images/rdf3.png
 virtuoso/doc/images/rdf4.png
@@ -1504,6 +1515,14 @@ virtuoso/doc/images/ui/adow5.png
 virtuoso/doc/images/ui/adow6.png
 virtuoso/doc/images/ui/adow8.png
 virtuoso/doc/images/ui/adow9.png
+virtuoso/doc/images/ui/ag1.png
+virtuoso/doc/images/ui/ag2.png
+virtuoso/doc/images/ui/ag3.png
+virtuoso/doc/images/ui/auth1.png
+virtuoso/doc/images/ui/auth3.png
+virtuoso/doc/images/ui/auth4.png
+virtuoso/doc/images/ui/auth5.png
+virtuoso/doc/images/ui/auth6.png
 virtuoso/doc/images/ui/bd1.png
 virtuoso/doc/images/ui/bd10.png
 virtuoso/doc/images/ui/bd11.png
@@ -1559,23 +1578,49 @@ virtuoso/doc/images/ui/blog011.jpg
 virtuoso/doc/images/ui/blog012.jpg
 virtuoso/doc/images/ui/blog013.jpg
 virtuoso/doc/images/ui/cartrapikey.png
+virtuoso/doc/images/ui/cfolder.png
 virtuoso/doc/images/ui/cn1.png
 virtuoso/doc/images/ui/cn2.png
 virtuoso/doc/images/ui/cr1.png
+virtuoso/doc/images/ui/cr10.png
 virtuoso/doc/images/ui/cr11.png
 virtuoso/doc/images/ui/cr11a.png
+virtuoso/doc/images/ui/cr11b.png
 virtuoso/doc/images/ui/cr12.png
+virtuoso/doc/images/ui/cr12a.png
 virtuoso/doc/images/ui/cr13.png
 virtuoso/doc/images/ui/cr14.png
 virtuoso/doc/images/ui/cr15.png
 virtuoso/doc/images/ui/cr16.png
 virtuoso/doc/images/ui/cr17.png
+virtuoso/doc/images/ui/cr17a.png
 virtuoso/doc/images/ui/cr18.png
 virtuoso/doc/images/ui/cr19.png
 virtuoso/doc/images/ui/cr2.png
 virtuoso/doc/images/ui/cr20.png
 virtuoso/doc/images/ui/cr21.png
 virtuoso/doc/images/ui/cr3.png
+virtuoso/doc/images/ui/cr4.png
+virtuoso/doc/images/ui/cr5.png
+virtuoso/doc/images/ui/cr6.png
+virtuoso/doc/images/ui/cr7.png
+virtuoso/doc/images/ui/cr8.png
+virtuoso/doc/images/ui/cr9.png
+virtuoso/doc/images/ui/cra1.png
+virtuoso/doc/images/ui/cra10.png
+virtuoso/doc/images/ui/cra11.png
+virtuoso/doc/images/ui/cra12.png
+virtuoso/doc/images/ui/cra13.png
+virtuoso/doc/images/ui/cra14.png
+virtuoso/doc/images/ui/cra15.png
+virtuoso/doc/images/ui/cra2.png
+virtuoso/doc/images/ui/cra3.png
+virtuoso/doc/images/ui/cra4.png
+virtuoso/doc/images/ui/cra5.png
+virtuoso/doc/images/ui/cra6.png
+virtuoso/doc/images/ui/cra7.png
+virtuoso/doc/images/ui/cra8.png
+virtuoso/doc/images/ui/cra9.png
 virtuoso/doc/images/ui/d1.png
 virtuoso/doc/images/ui/d2.png
 virtuoso/doc/images/ui/d3.png
@@ -1612,12 +1657,75 @@ virtuoso/doc/images/ui/demodbinstall_04.png
 virtuoso/doc/images/ui/dora1.png
 virtuoso/doc/images/ui/dora10.png
 virtuoso/doc/images/ui/dora9.png
+virtuoso/doc/images/ui/editres.png
 virtuoso/doc/images/ui/einf4.png
 virtuoso/doc/images/ui/eora2.png
 virtuoso/doc/images/ui/eora3.png
 virtuoso/doc/images/ui/eora5.png
 virtuoso/doc/images/ui/eora6.png
 virtuoso/doc/images/ui/exmp1.png
+virtuoso/doc/images/ui/f1.png
+virtuoso/doc/images/ui/f10.png
+virtuoso/doc/images/ui/f11.png
+virtuoso/doc/images/ui/f12.png
+virtuoso/doc/images/ui/f13.png
+virtuoso/doc/images/ui/f14.png
+virtuoso/doc/images/ui/f15.png
+virtuoso/doc/images/ui/f16.png
+virtuoso/doc/images/ui/f17.png
+virtuoso/doc/images/ui/f18.png
+virtuoso/doc/images/ui/f19.png
+virtuoso/doc/images/ui/f2.png
+virtuoso/doc/images/ui/f20.png
+virtuoso/doc/images/ui/f21.png
+virtuoso/doc/images/ui/f22.png
+virtuoso/doc/images/ui/f23.png
+virtuoso/doc/images/ui/f24.png
+virtuoso/doc/images/ui/f3.png
+virtuoso/doc/images/ui/f4.png
+virtuoso/doc/images/ui/f5.png
+virtuoso/doc/images/ui/f6.png
+virtuoso/doc/images/ui/f7.png
+virtuoso/doc/images/ui/f8.png
+virtuoso/doc/images/ui/f9.png
+virtuoso/doc/images/ui/fb1.png
+virtuoso/doc/images/ui/fb10.png
+virtuoso/doc/images/ui/fb11.png
+virtuoso/doc/images/ui/fb12.png
+virtuoso/doc/images/ui/fb13.png
+virtuoso/doc/images/ui/fb14.png
+virtuoso/doc/images/ui/fb15.png
+virtuoso/doc/images/ui/fb16.png
+virtuoso/doc/images/ui/fb17.png
+virtuoso/doc/images/ui/fb18.png
+virtuoso/doc/images/ui/fb19.png
+virtuoso/doc/images/ui/fb2.png
+virtuoso/doc/images/ui/fb20.png
+virtuoso/doc/images/ui/fb21.png
+virtuoso/doc/images/ui/fb22.png
+virtuoso/doc/images/ui/fb23.png
+virtuoso/doc/images/ui/fb24.png
+virtuoso/doc/images/ui/fb25.png
+virtuoso/doc/images/ui/fb26.png
+virtuoso/doc/images/ui/fb27.png
+virtuoso/doc/images/ui/fb28.png
+virtuoso/doc/images/ui/fb29.png
+virtuoso/doc/images/ui/fb3.png
+virtuoso/doc/images/ui/fb30.png
+virtuoso/doc/images/ui/fb31.png
+virtuoso/doc/images/ui/fb32.png
+virtuoso/doc/images/ui/fb33.png
+virtuoso/doc/images/ui/fb34.png
+virtuoso/doc/images/ui/fb35.png
+virtuoso/doc/images/ui/fb36.png
+virtuoso/doc/images/ui/fb37.png
+virtuoso/doc/images/ui/fb38.png
+virtuoso/doc/images/ui/fb4.png
+virtuoso/doc/images/ui/fb5.png
+virtuoso/doc/images/ui/fb6.png
+virtuoso/doc/images/ui/fb7.png
+virtuoso/doc/images/ui/fb8.png
+virtuoso/doc/images/ui/fb9.png
 virtuoso/doc/images/ui/fcapiex1.png
 virtuoso/doc/images/ui/fct1.png
 virtuoso/doc/images/ui/fct10.png
@@ -1746,6 +1854,7 @@ virtuoso/doc/images/ui/ldap5.png
 virtuoso/doc/images/ui/ldap6.png
 virtuoso/doc/images/ui/ldap7.png
 virtuoso/doc/images/ui/ldap8.png
+virtuoso/doc/images/ui/lock_16.png
 virtuoso/doc/images/ui/m1.png
 virtuoso/doc/images/ui/m10.png
 virtuoso/doc/images/ui/m11.png
@@ -1776,6 +1885,7 @@ virtuoso/doc/images/ui/m33.png
 virtuoso/doc/images/ui/m34.png
 virtuoso/doc/images/ui/m35.png
 virtuoso/doc/images/ui/m36.png
+virtuoso/doc/images/ui/m36a.png
 virtuoso/doc/images/ui/m38.png
 virtuoso/doc/images/ui/m4.png
 virtuoso/doc/images/ui/m5.png
@@ -1786,6 +1896,8 @@ virtuoso/doc/images/ui/m9.png
 virtuoso/doc/images/ui/mail_comp_01.jpg
 virtuoso/doc/images/ui/mail_get_01.jpg
 virtuoso/doc/images/ui/mail_messlst_01.jpg
+virtuoso/doc/images/ui/meditres.png
+virtuoso/doc/images/ui/meditres2.png
 virtuoso/doc/images/ui/news_add_01.png
 virtuoso/doc/images/ui/news_addgrp_01.png
 virtuoso/doc/images/ui/news_adm_01.png
@@ -1892,6 +2004,46 @@ virtuoso/doc/images/ui/s2.png
 virtuoso/doc/images/ui/s3.png
 virtuoso/doc/images/ui/s4.png
 virtuoso/doc/images/ui/s5.png
+virtuoso/doc/images/ui/scp1.png
+virtuoso/doc/images/ui/scp10.png
+virtuoso/doc/images/ui/scp11.png
+virtuoso/doc/images/ui/scp12.png
+virtuoso/doc/images/ui/scp13.png
+virtuoso/doc/images/ui/scp14.png
+virtuoso/doc/images/ui/scp2.png
+virtuoso/doc/images/ui/scp3.png
+virtuoso/doc/images/ui/scp4.png
+virtuoso/doc/images/ui/scp5.png
+virtuoso/doc/images/ui/scp6.png
+virtuoso/doc/images/ui/scp7.png
+virtuoso/doc/images/ui/scp8.png
+virtuoso/doc/images/ui/scp9.png
+virtuoso/doc/images/ui/si1.png
+virtuoso/doc/images/ui/si2.png
+virtuoso/doc/images/ui/si3.png
+virtuoso/doc/images/ui/si4.png
+virtuoso/doc/images/ui/si5.png
+virtuoso/doc/images/ui/si6.png
+virtuoso/doc/images/ui/si7.png
+virtuoso/doc/images/ui/sink1.png
+virtuoso/doc/images/ui/sink2.png
+virtuoso/doc/images/ui/sink3.png
+virtuoso/doc/images/ui/sink4.png
+virtuoso/doc/images/ui/so1.png
+virtuoso/doc/images/ui/so11.png
+virtuoso/doc/images/ui/so12.png
+virtuoso/doc/images/ui/so13.png
+virtuoso/doc/images/ui/so14.png
+virtuoso/doc/images/ui/so15.png
+virtuoso/doc/images/ui/so16.png
+virtuoso/doc/images/ui/so2.png
+virtuoso/doc/images/ui/so3.png
+virtuoso/doc/images/ui/so4.png
+virtuoso/doc/images/ui/so5.png
+virtuoso/doc/images/ui/so6.png
+virtuoso/doc/images/ui/so7.png
+virtuoso/doc/images/ui/so8.png
+virtuoso/doc/images/ui/so9.png
 virtuoso/doc/images/ui/sparqlwinf1.png
 virtuoso/doc/images/ui/sparqlwinf10.png
 virtuoso/doc/images/ui/sparqlwinf11.png
@@ -1957,6 +2109,7 @@ virtuoso/doc/images/ui/sts_idx_01.png
 virtuoso/doc/images/ui/sts_lck_01.jpg
 virtuoso/doc/images/ui/sts_profile_01.png
 virtuoso/doc/images/ui/topo-chain.png
+virtuoso/doc/images/ui/topo-scenario.png
 virtuoso/doc/images/ui/topo-star.png
 virtuoso/doc/images/ui/trs1.png
 virtuoso/doc/images/ui/trs2.png
@@ -1989,6 +2142,7 @@ virtuoso/doc/images/ui/uc4.png
 virtuoso/doc/images/ui/uc5.png
 virtuoso/doc/images/ui/uc6.png
 virtuoso/doc/images/ui/uc7.png
+virtuoso/doc/images/ui/ufile.png
 virtuoso/doc/images/ui/urlrw1.png
 virtuoso/doc/images/ui/usr1.png
 virtuoso/doc/images/ui/usr2.png
@@ -2075,6 +2229,7 @@ virtuoso/doc/images/xmltemplate011.png
 virtuoso/doc/images/xmltemplatediagram.jpg
 virtuoso/vad/bpel_dav.vad
 virtuoso/vad/conductor_dav.vad
+virtuoso/vad/dbpedia_dav.vad
 virtuoso/vad/demo_dav.vad
 virtuoso/vad/doc_dav.vad
 virtuoso/vad/fct_dav.vad
@@ -2092,6 +2247,7 @@ virtuoso/vad/ods_gallery_dav.vad
 virtuoso/vad/ods_polls_dav.vad
 virtuoso/vad/ods_webmail_dav.vad
 virtuoso/vad/ods_wiki_dav.vad
+virtuoso/vad/rdb2rdf_dav.vad
 virtuoso/vad/rdf_mappers_dav.vad
 virtuoso/vad/sparql_demo_dav.vad
 virtuoso/vad/syncml_dav.vad