From owner-svn-ports-all@FreeBSD.ORG  Sun Aug 10 12:24:05 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 6F0CE945
 for <svn-ports-all@freebsd.org>; Sun, 10 Aug 2014 12:24:05 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 46A682D59
 for <svn-ports-all@freebsd.org>; Sun, 10 Aug 2014 12:24:05 +0000 (UTC)
Received: from antoine (uid 1152) (envelope-from antoine@FreeBSD.org) id 2405
 by svn.freebsd.org (DragonFly Mail Agent v0.9+);
 Sun, 10 Aug 2014 12:24:04 +0000
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Sun, 10 Aug 2014 12:24:04 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r364530 - in head/databases/monetdb: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <53e76465.2405.343dbbf1@svn.freebsd.org>
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 10 Aug 2014 12:24:05 -0000

Author: antoine
Date: Sun Aug 10 12:24:04 2014
New Revision: 364530
URL: http://svnweb.freebsd.org/changeset/ports/364530
QAT: https://qat.redports.org/buildarchive/r364530/

Log:
  Allow building on freebsd 8 and 9

Modified:
  head/databases/monetdb/Makefile
  head/databases/monetdb/files/patch-configure

Modified: head/databases/monetdb/Makefile
==============================================================================
--- head/databases/monetdb/Makefile	Sun Aug 10 12:20:18 2014	(r364529)
+++ head/databases/monetdb/Makefile	Sun Aug 10 12:24:04 2014	(r364530)
@@ -208,7 +208,8 @@ CONFIGURE_ARGS+=	-with-password-backend=
 # Compile chokes with  version of flex on FreeBSD 8 and 9
 # with "unknown flag '-'"
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
-BUILD_DEPENDS+=	flex:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
+CONFIGURE_ENV+=	LEX=${LOCALBASE}/bin/flex
 .endif
 
 pre-install:

Modified: head/databases/monetdb/files/patch-configure
==============================================================================
--- head/databases/monetdb/files/patch-configure	Sun Aug 10 12:20:18 2014	(r364529)
+++ head/databases/monetdb/files/patch-configure	Sun Aug 10 12:24:04 2014	(r364530)
@@ -1,6 +1,14 @@
---- configure.orig	2014-02-02 18:41:42.664332968 +0100
-+++ configure	2014-02-02 18:41:59.346331204 +0100
- 
+--- configure.orig	2013-11-20 11:27:41.000000000 +0000
++++ configure	2014-08-10 12:16:46.974210130 +0000
+@@ -17262,7 +17262,7 @@
+ 	;;
+ esac
+ case "$LEX" in
+-	flex*) : ;;
++	*flex*) : ;;
+ 	*)
+ 		if test "x$enable_jaql" = xyes; then
+ 			as_fn_error $? "MonetDB/JAQL requires flex" "$LINENO" 5
 @@ -17802,6 +17802,7 @@
  /* end confdefs.h.  */
  #include <stdio.h>
@@ -87,3 +95,4 @@
 +if  x"$have_zlib" = x"yes" ; then
  
  $as_echo "#define HAVE_LIBZ 1" >>confdefs.h
+