Update to gecode-3.5.0 and add optional QT and GIST support.

4 files changed, 56 insertions, 41 deletions

diff --git a/devel/gecode/Makefile b/devel/gecode/Makefile
index 7d644f4ee367..241a8e419e9b 100644
--- a/devel/gecode/Makefile
+++ b/devel/gecode/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gecode
-PORTVERSION=	3.4.2
+PORTVERSION=	3.5.0
 CATEGORIES=	devel
 MASTER_SITES=	http://www.gecode.org/download/
 
@@ -25,14 +25,37 @@ USE_PERL5_BUILD=	yes
 MAKE_JOBS_UNSAFE=	yes
 PATCH_STRIP=	-p1
 
+OPTIONS=	GIST "Interactive Search Tool" off \
+		QT "QT interface" off
+
+.include <bsd.port.options.mk>
+
+.if defined(WITH_QT)
+CONFIGURE_ARGS+=	--enable-qt
+USE_QT_VER=		4
+QT_COMPONENTS=		corelib gui moc_build qmake_build
+.else
+CONFIGURE_ARGS+=	--disable-qt
+.endif
+
+.if defined(WITH_GIST)
+.if !defined(WITH_QT)
+IGNORE=			Building GIST requires enabling the QT interface
+.else
+CONFIGURE_ARGS+=	--enable-gist
+PLIST_SUB+=		GIST=""
+.endif
+.else
+CONFIGURE_ARGS+=	--disable-gist
+PLIST_SUB+=		GIST="@comment "
+.endif
+
 CONFIGURE_ARGS+=\
 		--disable-static \
 		--enable-shared \
 		--disable-doc-dot \
 		--disable-doc-tagfile \
 		--disable-doc-chm \
-		--disable-qt \
-		--disable-gist \
 		--enable-driver \
 		--enable-graph \
 		--enable-flatzinc \
diff --git a/devel/gecode/distinfo b/devel/gecode/distinfo
index 5d699d179784..5f250adf9ef1 100644
--- a/devel/gecode/distinfo
+++ b/devel/gecode/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gecode-3.4.2.tar.gz) = c047485dde16495710837289ffec38c9f876abaacb4fa557403ce3348a452de0
-SIZE (gecode-3.4.2.tar.gz) = 1537092
+SHA256 (gecode-3.5.0.tar.gz) = b76cc4a0a198cd241c6aff2f865dde7d25061bf6401e85ba4c97717383c0d48d
+SIZE (gecode-3.5.0.tar.gz) = 1557174
diff --git a/devel/gecode/files/patch-configure b/devel/gecode/files/patch-configure
index c57d3069338f..9a16ccf6b701 100644
--- a/devel/gecode/files/patch-configure
+++ b/devel/gecode/files/patch-configure
@@ -1,24 +1,12 @@
 Description: Let the configure script succeed on FreeBSD.
- Add FreeBSD to the list of supported operating systems.
  Fix a bashism (test = instead of ==).
 Forwarded: yes
 Author: Peter Pentchev <roam@FreeBSD.org>
-Last-Update: 2011-01-24
+Last-Update: 2011-02-10
 
-Index: b/configure
-===================================================================
---- a/configure	2010-10-09 15:01:50.000000000 +0300
-+++ b/configure	2011-01-24 09:24:48.000000000 +0200
-@@ -2675,7 +2675,7 @@
-        guess_host_os=${with_host_os}
-         fi
-           case ${guess_host_os} in
--       GNU/kFreeBSD|*inux*)
-+       GNU/kFreeBSD|*inux*|FreeBSD)
-        host_os=linux
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: Linux" >&5
- $as_echo "Linux" >&6; }
-@@ -10534,9 +10534,9 @@
+--- a/configure
++++ b/configure
+@@ -10531,9 +10531,9 @@
  
  
  ac_gecode_library_architecture=-${VERSION_DASHES}${ac_gecode_library_architecture}
diff --git a/devel/gecode/pkg-plist b/devel/gecode/pkg-plist
index 6353de22ce55..36ea8bbff7ef 100644
--- a/devel/gecode/pkg-plist
+++ b/devel/gecode/pkg-plist
@@ -368,35 +368,38 @@ include/gecode/support/thread/thread.hpp
 include/gecode/support/thread/windows.hpp
 include/gecode/support/timer.hpp
 lib/libgecodedriver.so
-lib/libgecodedriver.so.25
-lib/libgecodedriver.so.25.0
+lib/libgecodedriver.so.27
+lib/libgecodedriver.so.27.0
 lib/libgecodeflatzinc.so
-lib/libgecodeflatzinc.so.25
-lib/libgecodeflatzinc.so.25.0
+lib/libgecodeflatzinc.so.27
+lib/libgecodeflatzinc.so.27.0
+%%GIST%%lib/libgecodegist.so.27.0
+%%GIST%%lib/libgecodegist.so.27
+%%GIST%%lib/libgecodegist.so
 lib/libgecodegraph.so
-lib/libgecodegraph.so.25
-lib/libgecodegraph.so.25.0
+lib/libgecodegraph.so.27
+lib/libgecodegraph.so.27.0
 lib/libgecodeint.so
-lib/libgecodeint.so.25
-lib/libgecodeint.so.25.0
+lib/libgecodeint.so.27
+lib/libgecodeint.so.27.0
 lib/libgecodekernel.so
-lib/libgecodekernel.so.25
-lib/libgecodekernel.so.25.0
+lib/libgecodekernel.so.27
+lib/libgecodekernel.so.27.0
 lib/libgecodeminimodel.so
-lib/libgecodeminimodel.so.25
-lib/libgecodeminimodel.so.25.0
+lib/libgecodeminimodel.so.27
+lib/libgecodeminimodel.so.27.0
 lib/libgecodescheduling.so
-lib/libgecodescheduling.so.25
-lib/libgecodescheduling.so.25.0
+lib/libgecodescheduling.so.27
+lib/libgecodescheduling.so.27.0
 lib/libgecodesearch.so
-lib/libgecodesearch.so.25
-lib/libgecodesearch.so.25.0
+lib/libgecodesearch.so.27
+lib/libgecodesearch.so.27.0
 lib/libgecodeset.so
-lib/libgecodeset.so.25
-lib/libgecodeset.so.25.0
+lib/libgecodeset.so.27
+lib/libgecodeset.so.27.0
 lib/libgecodesupport.so
-lib/libgecodesupport.so.25
-lib/libgecodesupport.so.25.0
+lib/libgecodesupport.so.27
+lib/libgecodesupport.so.27.0
 %%DATADIR%%/mznlib/all_different_int.mzn
 %%DATADIR%%/mznlib/all_equal_int.mzn
 %%DATADIR%%/mznlib/among.mzn
@@ -416,6 +419,7 @@ lib/libgecodesupport.so.25.0
 %%DATADIR%%/mznlib/exactly_set.mzn
 %%DATADIR%%/mznlib/gecode.mzn
 %%DATADIR%%/mznlib/global_cardinality.mzn
+%%DATADIR%%/mznlib/global_cardinality_closed.mzn
 %%DATADIR%%/mznlib/global_cardinality_low_up.mzn
 %%DATADIR%%/mznlib/increasing_bool.mzn
 %%DATADIR%%/mznlib/increasing_int.mzn