Date: Wed, 13 Feb 2013 14:15:58 +1100 (VLAT) From: Dima Panov <fluffy@Fluffy.Khv.RU> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/176091: databases/virtuoso: OptionNG'ify, make libiodbc dependency optional... Message-ID: <201302130315.r1D3FwJ9019149@Beastie.Fluffy.Khv.RU> Resent-Message-ID: <201302130320.r1D3K1d1044306@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <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
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302130315.r1D3FwJ9019149>