- Update to 6.1.3

- Fix and enable startup script
- Fix permissions after installation

5 files changed, 88 insertions, 27 deletions

diff --git a/databases/virtuoso/Makefile b/databases/virtuoso/Makefile
index 0a749a15b486..30ca4b6d4c93 100644
--- a/databases/virtuoso/Makefile
+++ b/databases/virtuoso/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	virtuoso
-PORTVERSION=	6.1.2
-PORTREVISION=	1
+PORTVERSION=	6.1.3
+PORTREVISION=	0
 CATEGORIES=	databases
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-opensource-${PORTVERSION}
@@ -30,6 +30,7 @@ CONFIGURE_ARGS=	--with-readline\
 		--localstatedir="${PREFIX}"
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}"\
 		LDFLAGS="-L${LOCALBASE}/lib"
+USE_RC_SUBR=	virtuoso.sh
 ONLY_FOR_ARCHS=	i386 amd64
 USERS=		virtuoso
 GROUPS=		virtuoso
@@ -59,6 +60,9 @@ post-patch:
 	    ${XARGS} ${REINPLACE_CMD}\
 		-e 's,-isql,-isql-vt,'
 
+post-install:
+	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_IMAGEMAGICK)
diff --git a/databases/virtuoso/distinfo b/databases/virtuoso/distinfo
index 4ce28af2932b..7c536f1be0cf 100644
--- a/databases/virtuoso/distinfo
+++ b/databases/virtuoso/distinfo
@@ -1,2 +1,2 @@
-SHA256 (virtuoso-opensource-6.1.2.tar.gz) = 6838e41a6ee688f08d92e7299eaf75f9c63a4b9f6f6a27eace9a9921b008ad56
-SIZE (virtuoso-opensource-6.1.2.tar.gz) = 72303185
+SHA256 (virtuoso-opensource-6.1.3.tar.gz) = 420f28d6e639eed6c3c722097b5bb4a6830435fc703dfb15a577452d71124666
+SIZE (virtuoso-opensource-6.1.3.tar.gz) = 75082765
diff --git a/databases/virtuoso/files/virtuoso.sh.in b/databases/virtuoso/files/virtuoso.sh.in
index 136b4ce28f19..47621549aa7e 100644
--- a/databases/virtuoso/files/virtuoso.sh.in
+++ b/databases/virtuoso/files/virtuoso.sh.in
@@ -15,35 +15,25 @@
 #
 # This scripts takes one of the following commands:
 #
-#   start stop restart reload status
+#   start stop restart status
 #
 
-command=%%PREFIX%%/bin/virtuoso
-
 . /etc/rc.subr
 
 load_rc_config virtuoso
 
 # set defaults
 virtuoso_enable=${virtuoso_enable:-"NO"}
+virtuoso_config=${virtuoso_config:-"db/virtuoso.ini"}
 virtuoso_user=virtuoso
-eval virtuoso_config=${virtuoso_config:-"~${virtuoso_user}/db/virtuoso.ini"}
-virtuoso_class=${virtuoso_class:-"default"}
+virtuoso_data=%%PREFIX%%/virtuoso
 
 name=virtuoso
 rcvar=`set_rcvar`
-command_args="-D ${virtuoso_data} ${virtuoso_flags}"
-extra_commands="reload"
-
-start_cmd="virtuoso_command start"
-stop_cmd="virtuoso_command stop"
-restart_cmd="virtuoso_command restart"
-reload_cmd="virtuoso_command reload"
-status_cmd="virtuoso_command status"
-
-virtuoso_command()
-{
-    su -l ${virtuoso_user} -c "exec ${command} ${command_args} ${rc_arg}"
-}
-    
+
+command=%%PREFIX%%/bin/virtuoso-t
+command_args="+configfile ${virtuoso_config} ${virtuoso_flags}"
+
+start_precmd="cd ${virtuoso_data}"
+
 run_rc_command "$1"
diff --git a/databases/virtuoso/pkg-install b/databases/virtuoso/pkg-install
new file mode 100644
index 000000000000..788be22cedb9
--- /dev/null
+++ b/databases/virtuoso/pkg-install
@@ -0,0 +1,10 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+case "$2" in
+POST-INSTALL)
+	chown -R virtuoso:virtuoso ${PKG_PREFIX}/virtuoso
+	;;
+esac
diff --git a/databases/virtuoso/pkg-plist b/databases/virtuoso/pkg-plist
index e57f35bd3319..ba30458a416f 100644
--- a/databases/virtuoso/pkg-plist
+++ b/databases/virtuoso/pkg-plist
@@ -1,8 +1,8 @@
 bin/inifile
-bin/isql-vt
 bin/isql-iodbc
-bin/isqlw-vt
+bin/isql-vt
 bin/isqlw-iodbc
+bin/isqlw-vt
 bin/odbc_mail
 bin/virt_mail
 bin/virtuoso-iodbc-t
@@ -114,6 +114,7 @@ virtuoso/doc/html/bpel.html
 virtuoso/doc/html/catidentifiers.html
 virtuoso/doc/html/charescaping.html
 virtuoso/doc/html/cinterface.html
+virtuoso/doc/html/clusterstcnf.html
 virtuoso/doc/html/composingxmlinsql.html
 virtuoso/doc/html/conceptarchitecture.html
 virtuoso/doc/html/concepts.html
@@ -469,16 +470,24 @@ virtuoso/doc/html/fn_rdf_64bit_upgrade.html
 virtuoso/doc/html/fn_rdf_audit_metadata.html
 virtuoso/doc/html/fn_rdf_backup_metadata.html
 virtuoso/doc/html/fn_rdf_convert_rdfxml_to_ttl.html
+virtuoso/doc/html/fn_rdf_graph_collect_fp_list.html
+virtuoso/doc/html/fn_rdf_graph_diff.html
 virtuoso/doc/html/fn_rdf_graph_group_create.html
 virtuoso/doc/html/fn_rdf_graph_group_ins.html
 virtuoso/doc/html/fn_rdf_langmatches.html
+virtuoso/doc/html/fn_rdf_load_rdfa.html
 virtuoso/doc/html/fn_rdf_load_rdfxml.html
 virtuoso/doc/html/fn_rdf_load_rdfxml_mt.html
 virtuoso/doc/html/fn_rdf_quad_uri.html
 virtuoso/doc/html/fn_rdf_quad_uri_l.html
 virtuoso/doc/html/fn_rdf_quad_uri_l_typed.html
 virtuoso/doc/html/fn_rdf_regex.html
+virtuoso/doc/html/fn_rdf_repl_graph_del.html
+virtuoso/doc/html/fn_rdf_repl_graph_ins.html
+virtuoso/doc/html/fn_rdf_repl_start.html
 virtuoso/doc/html/fn_rdf_restore_metadata.html
+virtuoso/doc/html/fn_rdf_suo_apply_patch.html
+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
@@ -562,6 +571,8 @@ virtuoso/doc/html/fn_signal.html
 virtuoso/doc/html/fn_sinv_create_inverse.html
 virtuoso/doc/html/fn_sinv_create_key_mapping.html
 virtuoso/doc/html/fn_sinv_drop_inverse.html
+virtuoso/doc/html/fn_smime_decrypt.html
+virtuoso/doc/html/fn_smime_encrypt.html
 virtuoso/doc/html/fn_smime_sign.html
 virtuoso/doc/html/fn_smime_verify.html
 virtuoso/doc/html/fn_smtp_send.html
@@ -580,9 +591,12 @@ virtuoso/doc/html/fn_soap_wsdl_import.html
 virtuoso/doc/html/fn_space.html
 virtuoso/doc/html/fn_sparql_eval.html
 virtuoso/doc/html/fn_sparql_eval_to_array.html
+virtuoso/doc/html/fn_sparql_rdb2rdf_codegen.html
+virtuoso/doc/html/fn_sparql_rdb2rdf_list_tables.html
 virtuoso/doc/html/fn_sparql_rexec.html
 virtuoso/doc/html/fn_sparql_rexec_to_array.html
 virtuoso/doc/html/fn_sparql_rexec_with_meta.html
+virtuoso/doc/html/fn_sparql_select_known_graphs.html
 virtuoso/doc/html/fn_split_and_decode.html
 virtuoso/doc/html/fn_sprintf.html
 virtuoso/doc/html/fn_sprintf_inverse.html
@@ -788,7 +802,15 @@ virtuoso/doc/html/index.html
 virtuoso/doc/html/inprocess.html
 virtuoso/doc/html/insertSTMT.html
 virtuoso/doc/html/installation.html
+virtuoso/doc/html/installcrweb.html
 virtuoso/doc/html/installmacosx.html
+virtuoso/doc/html/installnetriadd.html
+virtuoso/doc/html/installnetriavd.html
+virtuoso/doc/html/installsilver.html
+virtuoso/doc/html/installusado.html
+virtuoso/doc/html/installvsent.html
+virtuoso/doc/html/installvsgrid.html
+virtuoso/doc/html/installwfas.html
 virtuoso/doc/html/installwin32.html
 virtuoso/doc/html/internetservices.html
 virtuoso/doc/html/isql.html
@@ -818,7 +840,6 @@ virtuoso/doc/html/me_uddi_save_binding.html
 virtuoso/doc/html/me_uddi_save_business.html
 virtuoso/doc/html/me_uddi_save_service.html
 virtuoso/doc/html/me_uddi_save_tModel.html
-virtuoso/doc/html/migrxx.html
 virtuoso/doc/html/mime.html
 virtuoso/doc/html/newadminui.html
 virtuoso/doc/html/nntpnewsgroups.html
@@ -848,6 +869,7 @@ virtuoso/doc/html/queryingxmldata.html
 virtuoso/doc/html/quicktours.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
@@ -856,8 +878,9 @@ virtuoso/doc/html/rdfperformancetuning.html
 virtuoso/doc/html/rdfrdfviewgnr.html
 virtuoso/doc/html/rdfsparql.html
 virtuoso/doc/html/rdfsparqlgeospat.html
-virtuoso/doc/html/rdfsparqlintegrationmiddleware.html
 virtuoso/doc/html/rdfsparqlrule.html
+virtuoso/doc/html/rdfviews.html
+virtuoso/doc/html/rdfviewsenterpr.html
 virtuoso/doc/html/repl.html
 virtuoso/doc/html/replexamples.html
 virtuoso/doc/html/replintro.html
@@ -876,7 +899,9 @@ virtuoso/doc/html/sampleodbcapps.html
 virtuoso/doc/html/sequenceobjects.html
 virtuoso/doc/html/server.html
 virtuoso/doc/html/servphpext.html
+virtuoso/doc/html/signalsandexitcodes.html
 virtuoso/doc/html/soap.html
+virtuoso/doc/html/sparqlextensions.html
 virtuoso/doc/html/spasviewsandtables.html
 virtuoso/doc/html/sqlinverse.html
 virtuoso/doc/html/sqloptimizer.html
@@ -975,6 +1000,10 @@ virtuoso/doc/html/vfoafssl.html
 virtuoso/doc/html/virtclientref.html
 virtuoso/doc/html/virtoledb.html
 virtuoso/doc/html/virtuosofaq.html
+virtuoso/doc/html/virtuososponger.html
+virtuoso/doc/html/virtuosospongerfacent.html
+virtuoso/doc/html/virtuosospongerfacetinstall.html
+virtuoso/doc/html/virtuosotipsandtricks.html
 virtuoso/doc/html/virtwhydoi.html
 virtuoso/doc/html/voauth.html
 virtuoso/doc/html/vseplugins.html
@@ -1259,6 +1288,23 @@ virtuoso/doc/images/note.gif
 virtuoso/doc/images/querytools.jpg
 virtuoso/doc/images/querytools.png
 virtuoso/doc/images/rdf.png
+virtuoso/doc/images/rdf1.png
+virtuoso/doc/images/rdf10.png
+virtuoso/doc/images/rdf11.png
+virtuoso/doc/images/rdf12.png
+virtuoso/doc/images/rdf13.png
+virtuoso/doc/images/rdf14.png
+virtuoso/doc/images/rdf15.png
+virtuoso/doc/images/rdf16.png
+virtuoso/doc/images/rdf17.png
+virtuoso/doc/images/rdf2.png
+virtuoso/doc/images/rdf3.png
+virtuoso/doc/images/rdf4.png
+virtuoso/doc/images/rdf5.png
+virtuoso/doc/images/rdf6.png
+virtuoso/doc/images/rdf7.png
+virtuoso/doc/images/rdf8.png
+virtuoso/doc/images/rdf9.png
 virtuoso/doc/images/replication.png
 virtuoso/doc/images/rmtadd.png
 virtuoso/doc/images/rmtdsnqry.png
@@ -1491,6 +1537,12 @@ virtuoso/doc/images/ui/foafssl6.png
 virtuoso/doc/images/ui/foafssl7.png
 virtuoso/doc/images/ui/foafssl8.png
 virtuoso/doc/images/ui/foafssl9.png
+virtuoso/doc/images/ui/fsp1.png
+virtuoso/doc/images/ui/fsp2.png
+virtuoso/doc/images/ui/fsp3.png
+virtuoso/doc/images/ui/fsp4.png
+virtuoso/doc/images/ui/fsp5.png
+virtuoso/doc/images/ui/fsp6.png
 virtuoso/doc/images/ui/keys1.png
 virtuoso/doc/images/ui/keys10.png
 virtuoso/doc/images/ui/keys11.png
@@ -1580,6 +1632,11 @@ virtuoso/doc/images/ui/rmtconnected_01.png
 virtuoso/doc/images/ui/rth001.png
 virtuoso/doc/images/ui/rth002.png
 virtuoso/doc/images/ui/rth003.png
+virtuoso/doc/images/ui/s1.png
+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/spong1.png
 virtuoso/doc/images/ui/spong2.png
 virtuoso/doc/images/ui/spong3.png