Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 31 Jan 2015 13:11:47 +0000 (UTC)
From:      Max Khon <fjoe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r378206 - head/databases/virtuoso
Message-ID:  <201501311311.t0VDBlHt057381@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: fjoe
Date: Sat Jan 31 13:11:46 2015
New Revision: 378206
URL: https://svnweb.freebsd.org/changeset/ports/378206
QAT: https://qat.redports.org/buildarchive/r378206/

Log:
  - Build with system zlib
  - Fix IODBC and IMAGEMAGICK options
  - Bump PORTREVISION

Modified:
  head/databases/virtuoso/Makefile
  head/databases/virtuoso/pkg-plist

Modified: head/databases/virtuoso/Makefile
==============================================================================
--- head/databases/virtuoso/Makefile	Sat Jan 31 12:55:28 2015	(r378205)
+++ head/databases/virtuoso/Makefile	Sat Jan 31 13:11:46 2015	(r378206)
@@ -3,7 +3,7 @@
 
 PORTNAME=	virtuoso
 PORTVERSION=	7.1.0
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-opensource-${PORTVERSION}
@@ -27,6 +27,7 @@ USE_OPENSSL=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-readline\
+		--without-internal-zlib\
 		--without-jdk2\
 		--without-jdk3\
 		--without-jdk4\
@@ -60,7 +61,7 @@ post-patch:
 
 post-install:
 	${FIND} ${STAGEDIR} -name "*.ini" -exec ${MV} {} {}.sample \; -print
-	${RMDIR} ${STAGEDIR}/${PREFIX}/lib/virtuoso/hosting ${STAGEDIR}/${PREFIX}/virtuoso/doc/html
+	${RMDIR} ${STAGEDIR}/${PREFIX}/virtuoso/doc/html
 
 check:
 	${SETENV} -u HOST ${MAKE_ENV} ${MAKE} -C ${WRKSRC} check
@@ -79,7 +80,7 @@ PLIST_SUB+=	WITH_IMAGEMAGICK="@comment "
 .if ${PORT_OPTIONS:MIODBC}
 CONFIGURE_ARGS+=--with-iodbc=${LOCALBASE}
 LIB_DEPENDS+=	libiodbc.so:${PORTSDIR}/databases/libiodbc
-IODBC_CPPFLAGS=
+IODBC_CPPFLAGS=	-I${LOCALBASE}/include/libiodbc
 PLIST_SUB+=	WITH_IODBC=""
 .else
 IODBC_CPPFLAGS=	-I../../libsrc/odbcsdk/include

Modified: head/databases/virtuoso/pkg-plist
==============================================================================
--- head/databases/virtuoso/pkg-plist	Sat Jan 31 12:55:28 2015	(r378205)
+++ head/databases/virtuoso/pkg-plist	Sat Jan 31 13:11:46 2015	(r378206)
@@ -1,9 +1,13 @@
 @owner virtuoso
 @group virtuoso
 bin/inifile
+%%WITH_IODBC%%bin/isql-iodbc
 bin/isql-vt
+%%WITH_IODBC%%bin/isqlw-iodbc
 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
@@ -15,6 +19,7 @@ lib/jdbc-4.1/virtjdbc4_1.jar
 lib/jdbc-4.1/virtjdbc4ssl.jar
 lib/jena/virt_jena.jar
 lib/jena2/virt_jena2.jar
+%%WITH_IODBC%%lib/libvirtuoso-iodbc-t.a
 lib/libvirtuoso-t.a
 lib/sesame/create-virtuoso.xsl
 lib/sesame/create.xsl
@@ -30,6 +35,8 @@ lib/virtodbcu.so
 lib/virtodbcu_r.a
 lib/virtodbcu_r.so
 @sample lib/virtuoso/db/virtuoso.ini.sample
+%%WITH_IMAGEMAGICK%%lib/virtuoso/hosting/im.a
+%%WITH_IMAGEMAGICK%%lib/virtuoso/hosting/im.so
 lib/virtuoso/vsp/admin/index_left.vsp
 lib/virtuoso/vsp/admin_style.html
 lib/virtuoso/vsp/bugsfixed.html



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501311311.t0VDBlHt057381>