From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Feb 13 03:20:01 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id CA19C4FC for ; Wed, 13 Feb 2013 03:20:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id A9511781 for ; Wed, 13 Feb 2013 03:20:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r1D3K1mQ044307 for ; Wed, 13 Feb 2013 03:20:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r1D3K1d1044306; Wed, 13 Feb 2013 03:20:01 GMT (envelope-from gnats) Resent-Date: Wed, 13 Feb 2013 03:20:01 GMT Resent-Message-Id: <201302130320.r1D3K1d1044306@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Dima Panov Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 35EFC4D3 for ; Wed, 13 Feb 2013 03:17:23 +0000 (UTC) (envelope-from fluffy@Fluffy.Khv.RU) Received: from ns.ael.RU (ns.ael.ru [62.76.207.226]) by mx1.freebsd.org (Postfix) with ESMTP id 6F268767 for ; Wed, 13 Feb 2013 03:17:21 +0000 (UTC) Received: from Beastie.Fluffy.Khv.RU (host85.static2.l2tp.ttkdv.ru [46.38.1.85] (may be forged)) by ns.ael.RU (8.14.4/8.14.4/Fluffy/5.3) with ESMTP id r1D3GKlq029857 for ; Wed, 13 Feb 2013 14:16:21 +1100 (VLAT) (envelope-from fluffy@Fluffy.Khv.RU) Received: from Beastie.Fluffy.Khv.RU (localhost [127.0.0.1]) by Beastie.Fluffy.Khv.RU (8.14.5/8.14.5/Fluffy/5.4.1) with ESMTP id r1D3FxIG019150 for ; Wed, 13 Feb 2013 14:15:59 +1100 (VLAT) (envelope-from fluffy@Fluffy.Khv.RU) Received: (from fluffy@localhost) by Beastie.Fluffy.Khv.RU (8.14.5/8.14.5/Submit) id r1D3FwJ9019149; Wed, 13 Feb 2013 14:15:58 +1100 (VLAT) (envelope-from fluffy) Message-Id: <201302130315.r1D3FwJ9019149@Beastie.Fluffy.Khv.RU> Date: Wed, 13 Feb 2013 14:15:58 +1100 (VLAT) From: Dima Panov To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.114 Subject: ports/176091: databases/virtuoso: OptionNG'ify, make libiodbc dependency optional... X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: Dima Panov List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Feb 2013 03:20:01 -0000 >Number: 176091 >Category: ports >Synopsis: databases/virtuoso: OptionNG'ify, make libiodbc dependency optional... >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Feb 13 03:20:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Dima Panov >Release: FreeBSD 10.0-1000025-CURRENT amd64 >Organization: Twilight Zone >Environment: System: FreeBSD Beastie.Fluffy.Khv.RU 10.0-1000025-CURRENT FreeBSD 10.0-1000025-CURRENT #0 r244649M: Tue Dec 25 00:30:13 VLAT 2012 root@Beastie.Fluffy.Khv.RU:/usr/obj/usr/src/sys/Spot amd64 >Description: databases/virtuoso: * OptionNG'ify * make libiodbc dependency optional * disable hidden dependencies on hslookup and wbxml2 >How-To-Repeat: >Fix: 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 -.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 >Release-Note: >Audit-Trail: >Unformatted: