FreeBSD Bugzilla – Attachment 131914 Details for
Bug 176091
databases/virtuoso: OptionNG'ify, make libiodbc dependency optional...
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 4.02 KB, created by
Dima Panov
on 2013-02-13 03:20:00 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
Dima Panov
Created:
2013-02-13 03:20:00 UTC
Size:
4.02 KB
patch
obsolete
>Index: databases/virtuoso/Makefile >=================================================================== >--- databases/virtuoso/Makefile (revision 312019) >+++ databases/virtuoso/Makefile (working copy) >@@ -23,20 +23,21 @@ > flex>2.5.4:${PORTSDIR}/textproc/flex\ > gperf>=3.0.3:${PORTSDIR}/devel/gperf\ > unzip:${PORTSDIR}/archivers/unzip >-LIB_DEPENDS= iodbc.3:${PORTSDIR}/databases/libiodbc\ >- xml2.5:${PORTSDIR}/textproc/libxml2 >+LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 > > USE_AUTOTOOLS= libtool > CONFIGURE_ARGS= --with-readline\ > --without-jdk2\ > --without-jdk3\ > --without-jdk4\ >- --with-iodbc=${LOCALBASE}\ >+ --disable-hslookup\ >+ --disable-wbxml2\ > --enable-bpel-vad\ >+ --with-xml-prefix=${LOCALBASE}\ > --with-layout=freebsd\ > --datadir="${PREFIX}"\ > --localstatedir="${PREFIX}" >-CPPFLAGS+= -std=gnu89 -I${LOCALBASE}/include ${PTHREAD_CFLAGS} >+CPPFLAGS+= -std=gnu89 ${IODBC_FLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS} > LDFLAGS+= -L${LOCALBASE}/lib > MAKE_ENV= PATH=${LOCALBASE}/bin:${PATH}\ > ISQL=isql-vt >@@ -47,15 +48,8 @@ > > CHECK_PORT= /usr/bin/nc -z localhost $$\1 2>\&1 > >-OPTIONS= IMAGEMAGICK "ImageMagick support" off\ >- KERBEROS "Kerberos extension" off\ >- OPENLDAP "OpenLDAP support" off >-# PERL "Perl hosting" off >-# PYTHON "Python hosting" off >-# MONO "Mono extension" off\ >-# PHP4 "PHP4 extension" off\ >-# PHP5 "PHP5 extension" off\ >-# RUBY "Ruby hosting" off\ >+OPTIONS_DEFINE= IMAGEMAGICK KERBEROS LDAP IODBC >+#OPTIONS_DEFINE+= MONO PERL PHP4 PHP5 PYTHON RUBY > > post-patch: > ${REINPLACE_CMD}\ >@@ -75,7 +69,7 @@ > > .include <bsd.port.pre.mk> > >-.if defined(WITH_IMAGEMAGICK) >+.if ${PORT_OPTIONS:MIMAGEMAGICK} > CONFIGURE_ARGS+=--enable-imagemagick=${LOCALBASE} > LIB_DEPENDS+= MagickWand:${PORTSDIR}/graphics/ImageMagick > PLIST_SUB+= WITH_IMAGEMAGICK="" >@@ -84,39 +78,50 @@ > PLIST_SUB+= WITH_IMAGEMAGICK="@comment " > .endif > >-.if defined(WITH_KERBEROS) >+.if ${PORT_OPTIONS:MIODBC} >+CONFIGURE_ARGS+=--with-iodbc=${LOCALBASE} >+LIB_DEPENDS+= iodbc:${PORTSDIR}/databases/libiodbc >+IODBC_FLAGS= "" >+PLIST_SUB+= WITH_IODBC="" >+.else >+IODBC_FLAGS= "-I../../libsrc/odbcsdk/include" >+PLIST_SUB+= WITH_IODBC="@comment " >+.endif >+ >+.if ${PORT_OPTIONS:MKERBEROS} > CONFIGURE_ARGS+=--enable-krb=${LOCALBASE} > LIB_DEPENDS+= krb5.3:${PORTSDIR}/security/krb5 > .endif > >+.if ${PORT_OPTIONS:MLDAP} >+CONFIGURE_ARGS+=--enable-openldap=${LOCALBASE} >+USE_OPENLDAP= yes >+.endif >+ > # XXX broken (does not build, requires gc.h) >-#.if defined(WITH_MONO) >+#.if ${PORT_OPTIONS:MMONO} > #CONFIGURE_ARGS+=--enable-mono > #.endif > >-.if defined(WITH_OPENLDAP) >-CONFIGURE_ARGS+=--enable-openldap=${LOCALBASE} >-USE_OPENLDAP= yes >-.endif >- > # XXX broken (requires perl to be built with -Dusemultiplicity) >+#.if ${PORT_OPTIONS:MPERL} > #.if defined(WITH_PERL) > #CONFIGURE_ARGS+=--enable-perl > #USE_PERL5= yes > #.endif > > # XXX broken (no libphp) >-#.if defined(WITH_PHP4) >+#.if ${PORT_OPTIONS:MPHP4} > #CONFIGURE_ARGS+=--enable-php4 > #.endif > > # XXX broken (no libphp) >-#.if defined(WITH_PHP5) >+#.if ${PORT_OPTIONS:MPHP5} > #CONFIGURE_ARGS+=--enable-php5 > #.endif > > # XXX broken (USE_PYTHON does not work with OPTIONS) >-#.if defined(WITH_PYTHON) >+#.if ${PORT_OPTIONS:MPYTHON} > #CONFIGURE_ARGS+=--enable-python > #USE_PYTHON= yes > #.endif >Index: databases/virtuoso/pkg-plist >=================================================================== >--- databases/virtuoso/pkg-plist (revision 312019) >+++ databases/virtuoso/pkg-plist (working copy) >@@ -1,11 +1,11 @@ > bin/inifile >-bin/isql-iodbc >+%%WITH_IODBC%%bin/isql-iodbc > bin/isql-vt >-bin/isqlw-iodbc >+%%WITH_IODBC%%bin/isqlw-iodbc > bin/isqlw-vt >-bin/odbc_mail >+%%WITH_IODBC%%bin/odbc_mail > bin/virt_mail >-bin/virtuoso-iodbc-t >+%%WITH_IODBC%%bin/virtuoso-iodbc-t > bin/virtuoso-t > lib/hibernate/virt_dialect.jar > lib/jdbc-2.0/virtjdbc2.jar >@@ -14,8 +14,8 @@ > lib/jdbc-4.0/virtjdbc4.jar > lib/jdbc-4.0/virtjdbc4ssl.jar > lib/jena/virt_jena.jar >-lib/libvirtuoso-iodbc-t.a >-lib/libvirtuoso-iodbc-t.la >+%%WITH_IODBC%%lib/libvirtuoso-iodbc-t.a >+%%WITH_IODBC%%lib/libvirtuoso-iodbc-t.la > lib/libvirtuoso-t.a > lib/libvirtuoso-t.la > lib/sesame/create-virtuoso.xsl
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 176091
: 131914 |
131915