- Add "check" target to run Virtuoso tests [1]

- Add build dependency on "unzip" (required by "check") [1]
- Do not patch isql executable name: override it using ISQL env var

Submitted by:	Patrick van Kleef [1]
Prodded by:	Patrick van Kleef [1]

databases/virtuoso/Makefile

@@ -21,7 +21,8 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BUILD_DEPENDS=	gawk:${PORTSDIR}/lang/gawk\
 		htmldoc:${PORTSDIR}/textproc/htmldoc\
 		flex>2.5.4:${PORTSDIR}/textproc/flex\
- 		gperf>=3.0.3:${PORTSDIR}/devel/gperf
+ 		gperf>=3.0.3:${PORTSDIR}/devel/gperf\
+		unzip:${PORTSDIR}/archivers/unzip
 LIB_DEPENDS=	iodbc.3:${PORTSDIR}/databases/libiodbc\
 		xml2.5:${PORTSDIR}/textproc/libxml2
 
@@ -37,7 +38,8 @@ CONFIGURE_ARGS=	--with-readline\
 		--localstatedir="${PREFIX}"
 CPPFLAGS+=	-std=gnu89 -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib
-MAKE_ENV=	PATH=${LOCALBASE}/bin:${PATH}
+MAKE_ENV=	PATH=${LOCALBASE}/bin:${PATH}\
+		ISQL=isql-vt
 USE_RC_SUBR=	virtuoso.sh
 ONLY_FOR_ARCHS=	i386 amd64
 USERS=		virtuoso
@@ -64,13 +66,13 @@ post-patch:
 	    ${XARGS} ${REINPLACE_CMD}\
 		-e 's,expr \$$,expr -- $$,'\
 		-e 's,netstat -an.*grep.*$$\([a-zA-Z0-9]*\).*grep LISTEN,${CHECK_PORT},'
-	${FIND} -E ${WRKSRC} -type f -name "mkvad.sh" -o -name "make_vad.sh" -o -name "mkdoc.sh" |\
-	    ${XARGS} ${REINPLACE_CMD}\
-		-e 's,-isql,-isql-vt,'
 
 post-install:
 	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
+check:
+	${SETENV} -u HOST ${MAKE_ENV} ${MAKE} -C ${WRKSRC} check
+
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_IMAGEMAGICK)

databases/virtuoso/files/patch-binsrc-tests-biftest-thook.sh

@@ -0,0 +1,12 @@
+--- binsrc/tests/biftest/thook.sh.orig	2012-06-15 17:48:39.000000000 +0700
++++ binsrc/tests/biftest/thook.sh	2012-06-15 17:52:34.000000000 +0700
+@@ -22,7 +22,8 @@
+ #
+ 
+ OUTPUT=thook.output
+-ISQL=../isql
++ISQL=${ISQL-isql}
++ISQL=../$ISQL
+ TIMEOUT=1000
+ HOST_OS=`uname -s | grep WIN`
+ SERVER=./virtuoso-iodbc-sample-t