diff options
| author | Max Khon <fjoe@FreeBSD.org> | 2015-01-31 13:11:46 +0000 |
|---|---|---|
| committer | Max Khon <fjoe@FreeBSD.org> | 2015-01-31 13:11:46 +0000 |
| commit | 4290678fbb01abf8e16e1210a4e396b78249121f (patch) | |
| tree | aa0c5fc382f1628b6246f71f8e90279bc2f2bbea /databases | |
| parent | - Update to 0.3.1 (diff) | |
- Build with system zlib
- Fix IODBC and IMAGEMAGICK options
- Bump PORTREVISION
Notes
Notes:
svn path=/head/; revision=378206
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/virtuoso/Makefile | 7 | ||||
| -rw-r--r-- | databases/virtuoso/pkg-plist | 7 |
2 files changed, 11 insertions, 3 deletions
diff --git a/databases/virtuoso/Makefile b/databases/virtuoso/Makefile index 2cc875753421..94c88a2abb97 100644 --- a/databases/virtuoso/Makefile +++ b/databases/virtuoso/Makefile @@ -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 diff --git a/databases/virtuoso/pkg-plist b/databases/virtuoso/pkg-plist index 054bdf4e1337..15d676ab8c15 100644 --- a/databases/virtuoso/pkg-plist +++ b/databases/virtuoso/pkg-plist @@ -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 |