- Update to 7.2.4.2

- Fix ownership of installed files

4 files changed, 41 insertions, 26 deletions

diff --git a/databases/virtuoso/Makefile b/databases/virtuoso/Makefile
index 88a492d8a0a..6942f95cb70 100644
--- a/databases/virtuoso/Makefile
+++ b/databases/virtuoso/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	virtuoso
-PORTVERSION=	7.1.0
-PORTREVISION=	5
+PORTVERSION=	7.2.4.2
+PORTREVISION=	0
 CATEGORIES=	databases
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-opensource-${PORTVERSION}
@@ -20,7 +20,8 @@ BUILD_DEPENDS=	gawk:lang/gawk\
 		htmldoc:textproc/htmldoc\
 		flex>2.5.4:textproc/flex\
 		gperf>=3.0.3:devel/gperf
-LIB_DEPENDS=	libxml2.so:textproc/libxml2
+LIB_DEPENDS=	libxml2.so:textproc/libxml2\
+		libexecinfo.so:devel/libexecinfo
 
 USES=		gmake libtool readline uidfix
 USE_AUTOTOOLS=	autoheader aclocal
@@ -41,7 +42,7 @@ CONFIGURE_ARGS=	--with-readline\
 		--datadir="${PREFIX}"\
 		--localstatedir="${PREFIX}"
 CPPFLAGS+=	-std=gnu89 ${IODBC_CPPFLAGS} -I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LDFLAGS+=	-L${LOCALBASE}/lib -lexecinfo
 MAKE_ENV=	PATH=${LOCALBASE}/bin:${PATH}\
 		ISQL=isql-vt
 USE_RC_SUBR=	virtuoso
diff --git a/databases/virtuoso/distinfo b/databases/virtuoso/distinfo
index d5f5cfc879e..5d94a644a5f 100644
--- a/databases/virtuoso/distinfo
+++ b/databases/virtuoso/distinfo
@@ -1,2 +1,3 @@
-SHA256 (virtuoso-opensource-7.1.0.tar.gz) = 07105a144ffa01891d1b2f40d4902bf992e8babc283089dde45edcf6c332ad96
-SIZE (virtuoso-opensource-7.1.0.tar.gz) = 118144492
+TIMESTAMP = 1475600214
+SHA256 (virtuoso-opensource-7.2.4.2.tar.gz) = 028075d3cf1970dbb9b79f660c833771de8be5be7403b9001d6907f64255b889
+SIZE (virtuoso-opensource-7.2.4.2.tar.gz) = 120144913
diff --git a/databases/virtuoso/files/patch-binsrc-tests-Makefile.in b/databases/virtuoso/files/patch-binsrc-tests-Makefile.in
index 32867190019..66c1cde5d88 100644
--- a/databases/virtuoso/files/patch-binsrc-tests-Makefile.in
+++ b/databases/virtuoso/files/patch-binsrc-tests-Makefile.in
@@ -1,6 +1,6 @@
---- binsrc/tests/Makefile.in	2010-07-09 11:17:05.000000000 -0500
-+++ binsrc/tests/Makefile.in	2010-08-15 01:57:14.000000000 -0500
-@@ -56,7 +56,7 @@
+--- binsrc/tests/Makefile.in.orig	2016-04-25 16:12:58.000000000 +0000
++++ binsrc/tests/Makefile.in	2016-10-04 17:37:15.132578000 +0000
+@@ -100,7 +100,7 @@
  POST_UNINSTALL = :
  build_triplet = @build@
  host_triplet = @host@
@@ -9,19 +9,21 @@
  	$(am__EXEEXT_1)
  noinst_PROGRAMS = M2$(EXEEXT) paramstats$(EXEEXT) ins$(EXEEXT) \
  	blobs$(EXEEXT) blobs2$(EXEEXT) blobnulls$(EXEEXT) \
-@@ -763,13 +763,13 @@
- ins-iodbc$(EXEEXT): $(ins_iodbc_OBJECTS) $(ins_iodbc_DEPENDENCIES) 
+@@ -903,7 +903,7 @@
  	@rm -f ins-iodbc$(EXEEXT)
- 	$(ins_iodbc_LINK) $(ins_iodbc_OBJECTS) $(ins_iodbc_LDADD) $(LIBS)
--isql$(EXEEXT): $(isql_OBJECTS) $(isql_DEPENDENCIES) 
-+isql-vt$(EXEEXT): $(isql_OBJECTS) $(isql_DEPENDENCIES) 
+ 	$(AM_V_CCLD)$(ins_iodbc_LINK) $(ins_iodbc_OBJECTS) $(ins_iodbc_LDADD) $(LIBS)
+ 
+-isql$(EXEEXT): $(isql_OBJECTS) $(isql_DEPENDENCIES) $(EXTRA_isql_DEPENDENCIES) 
++isql-vt$(EXEEXT): $(isql_OBJECTS) $(isql_DEPENDENCIES) $(EXTRA_isql_DEPENDENCIES) 
  	@rm -f isql$(EXEEXT)
- 	$(isql_LINK) $(isql_OBJECTS) $(isql_LDADD) $(LIBS)
- isql-iodbc$(EXEEXT): $(isql_iodbc_OBJECTS) $(isql_iodbc_DEPENDENCIES) 
+ 	$(AM_V_CCLD)$(isql_LINK) $(isql_OBJECTS) $(isql_LDADD) $(LIBS)
+ 
+@@ -911,7 +911,7 @@
  	@rm -f isql-iodbc$(EXEEXT)
- 	$(isql_iodbc_LINK) $(isql_iodbc_OBJECTS) $(isql_iodbc_LDADD) $(LIBS)
--isqlw$(EXEEXT): $(isqlw_OBJECTS) $(isqlw_DEPENDENCIES) 
-+isqlw-vt$(EXEEXT): $(isqlw_OBJECTS) $(isqlw_DEPENDENCIES) 
+ 	$(AM_V_CCLD)$(isql_iodbc_LINK) $(isql_iodbc_OBJECTS) $(isql_iodbc_LDADD) $(LIBS)
+ 
+-isqlw$(EXEEXT): $(isqlw_OBJECTS) $(isqlw_DEPENDENCIES) $(EXTRA_isqlw_DEPENDENCIES) 
++isqlw-vt$(EXEEXT): $(isqlw_OBJECTS) $(isqlw_DEPENDENCIES) $(EXTRA_isqlw_DEPENDENCIES) 
  	@rm -f isqlw$(EXEEXT)
- 	$(isqlw_LINK) $(isqlw_OBJECTS) $(isqlw_LDADD) $(LIBS)
- isqlw-iodbc$(EXEEXT): $(isqlw_iodbc_OBJECTS) $(isqlw_iodbc_DEPENDENCIES) 
+ 	$(AM_V_CCLD)$(isqlw_LINK) $(isqlw_OBJECTS) $(isqlw_LDADD) $(LIBS)
+ 
diff --git a/databases/virtuoso/pkg-plist b/databases/virtuoso/pkg-plist
index 15d676ab8c1..5408b353428 100644
--- a/databases/virtuoso/pkg-plist
+++ b/databases/virtuoso/pkg-plist
@@ -1,5 +1,3 @@
-@owner virtuoso
-@group virtuoso
 bin/inifile
 %%WITH_IODBC%%bin/isql-iodbc
 bin/isql-vt
@@ -7,7 +5,6 @@ bin/isql-vt
 bin/isqlw-vt
 %%WITH_IODBC%%bin/odbc_mail
 bin/virt_mail
-%%WITH_IODBC%%bin/virtuoso-iodbc-t
 bin/virtuoso-t
 lib/hibernate/virt_dialect.jar
 lib/jdbc-2.0/virtjdbc2.jar
@@ -16,16 +13,19 @@ lib/jdbc-3.0/virtjdbc3ssl.jar
 lib/jdbc-4.0/virtjdbc4.jar
 lib/jdbc-4.0/virtjdbc4ssl.jar
 lib/jdbc-4.1/virtjdbc4_1.jar
-lib/jdbc-4.1/virtjdbc4ssl.jar
+lib/jdbc-4.1/virtjdbc4_1ssl.jar
+lib/jdbc-4.2/virtjdbc4_2.jar
+lib/jdbc-4.2/virtjdbc4_2ssl.jar
 lib/jena/virt_jena.jar
 lib/jena2/virt_jena2.jar
-%%WITH_IODBC%%lib/libvirtuoso-iodbc-t.a
+lib/jena3/virt_jena3.jar
 lib/libvirtuoso-t.a
 lib/sesame/create-virtuoso.xsl
 lib/sesame/create.xsl
 lib/sesame/virt_sesame.jar
 lib/sesame/virt_sesame2.jar
 lib/sesame/virt_sesame3.jar
+lib/sesame/virt_sesame4.jar
 lib/virtodbc.a
 lib/virtodbc.so
 lib/virtodbc_r.a
@@ -1211,6 +1211,17 @@ virtuoso/doc/images/ui/virthost3.png
 virtuoso/doc/images/ui/virthost3a.png
 virtuoso/doc/images/ui/virthost4.png
 virtuoso/doc/images/ui/vsmx001.png
+virtuoso/doc/images/ui/win_destination_folder.jpg
+virtuoso/doc/images/ui/win_file_copystart.jpg
+virtuoso/doc/images/ui/win_install_folder.jpg
+virtuoso/doc/images/ui/win_install_type.jpg
+virtuoso/doc/images/ui/win_installer_program.jpg
+virtuoso/doc/images/ui/win_launch_manager.jpg
+virtuoso/doc/images/ui/win_license_agreement.jpg
+virtuoso/doc/images/ui/win_locate_manager.jpg
+virtuoso/doc/images/ui/win_obtain_license.jpg
+virtuoso/doc/images/ui/win_start_service.jpg
+virtuoso/doc/images/ui/win_virt_admin.jpg
 virtuoso/doc/images/ui/winpinst14.png
 virtuoso/doc/images/ui/winpinst15.png
 virtuoso/doc/images/ui/winpinst16.png