svn commit: r317727 - head/databases/virtuoso

[Max Khon]

Author: fjoe
Date: Thu May  9 09:06:30 2013
New Revision: 317727
URL: http://svnweb.freebsd.org/changeset/ports/317727

Log:
  - optionsNG'ify
  - make libiodbc dependency optional
  - disable hidden dependencies on hslookup, wbxml2 and openldap
  
  PR:		176091
  Submitted by:	Dima Panov

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

Modified: head/databases/virtuoso/Makefile
==============================================================================
--- head/databases/virtuoso/Makefile	Thu May  9 08:58:07 2013	(r317726)
+++ head/databases/virtuoso/Makefile	Thu May  9 09:06:30 2013	(r317727)
@@ -19,8 +19,7 @@ BUILD_DEPENDS=	gawk:${PORTSDIR}/lang/gaw
 		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
 
 .if defined(.PARSEDIR)
 USE_GMAKE=	yes
@@ -31,7 +30,8 @@ CONFIGURE_ARGS=	--with-readline\
 		--without-jdk2\
 		--without-jdk3\
 		--without-jdk4\
-		--with-iodbc=${LOCALBASE}\
+		--disable-hslookup\
+		--disable-wbxml2\
 		--enable-bpel-vad\
 		--with-layout=freebsd\
 		--datadir="${PREFIX}"\
@@ -47,13 +47,8 @@ GROUPS=		virtuoso
 
 CHECK_PORT=	/usr/bin/nc -z localhost $$\1 2>\&1
 
-OPTIONS_DEFINE=	IMAGEMAGICK KERBEROS LDAP
-#		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}\
@@ -82,9 +77,27 @@ CONFIGURE_ARGS+=--disable-imagemagick
 PLIST_SUB+=	WITH_IMAGEMAGICK="@comment "
 .endif
 
+.if ${PORT_OPTIONS:MIODBC}
+CONFIGURE_ARGS+=--with-iodbc=${LOCALBASE}
+LIB_DEPENDS+=	iodbc:${PORTSDIR}/databases/libiodbc
+PLIST_SUB+=	WITH_IODBC=""
+.else
+#CPPFLAGS+=	-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
+.else
+CONFIGURE_ARGS+=--disable-krb
+.endif
+
+.if ${PORT_OPTIONS:MLDAP}
+CONFIGURE_ARGS+=--enable-openldap=${LOCALBASE}
+USE_OPENLDAP=	yes
+.else
+CONFIGURE_ARGS+=--disable-openldap
 .endif
 
 # XXX broken (does not build, requires gc.h)
@@ -92,11 +105,6 @@ LIB_DEPENDS+=	krb5.3:${PORTSDIR}/securit
 #CONFIGURE_ARGS+=--enable-mono
 #.endif
 
-.if ${PORT_OPTIONS:MOPENLDAP}
-CONFIGURE_ARGS+=--enable-openldap=${LOCALBASE}
-USE_OPENLDAP=	yes
-.endif
-
 # XXX broken (requires perl to be built with -Dusemultiplicity)
 #.if ${PORT_OPTIONS:MPERL}
 #CONFIGURE_ARGS+=--enable-perl

Modified: head/databases/virtuoso/pkg-plist
==============================================================================
--- head/databases/virtuoso/pkg-plist	Thu May  9 08:58:07 2013	(r317726)
+++ head/databases/virtuoso/pkg-plist	Thu May  9 09:06:30 2013	(r317727)
@@ -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-3.0/virtjdbc3ssl.jar
 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