Switch to github and take an opportunity to update to 1.14.4.

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: Switch to github and take an opportunity to update to 1.14.4.
From: Alexander Nasonov <alnsn%yandex.ru@localhost>
Date: Sun, 07 Feb 2016 23:06:42 +0000
Module Name:	pkgsrc-wip
Committed By:	Alexander Nasonov <alnsn%yandex.ru@localhost>
Pushed By:	alnsn
Date:		Sun Feb 7 23:06:42 2016 +0000
Changeset:	bdd72134701d2bf053389de949e4566fc2ae5750

Modified Files:
	quickfix/Makefile
	quickfix/distinfo
Added Files:
	quickfix/patches/patch-configure.ac
Removed Files:
	quickfix/patches/patch-configure

Log Message:
Switch to github and take an opportunity to update to 1.14.4.

1.14.3 -> 1.14.4:
	Fixed typo in ruby and python repeating groups example.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=bdd72134701d2bf053389de949e4566fc2ae5750

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 quickfix/Makefile                   |  34 +++++---
 quickfix/distinfo                   |  10 +--
 quickfix/patches/patch-configure    | 168 ------------------------------------
 quickfix/patches/patch-configure.ac |  34 ++++++++
 4 files changed, 60 insertions(+), 186 deletions(-)

diffs:
diff --git a/quickfix/Makefile b/quickfix/Makefile
index 6d6f885..3b24c85 100644
--- a/quickfix/Makefile
+++ b/quickfix/Makefile
@@ -1,26 +1,34 @@
 # $NetBSD: Makefile,v 1.7 2014/10/09 14:06:30 thomasklausner Exp $
 
-DISTNAME=		quickfix-1.14.3
-CATEGORIES=		finance
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=quickfix/}
+DISTNAME=	quickfix-1.14.4
+CATEGORIES=	finance
+MASTER_SITES=	${MASTER_SITE_GITHUB:=quickfix/}
+GITHUB_TAG=	v.${PKGVERSION}
+GITHUB_PROJECT=	${DISTNAME:S/-${PKGVERSION}//}
 
-OWNER=			alnsn%yandex.ru@localhost
-HOMEPAGE=		http://www.quickfixengine.org/
-COMMENT=		FIX engine
-LICENSE=		quickfix
+MAINTAINER=	alnsn%NetBSD.org@localhost
+HOMEPAGE=	http://www.quickfixengine.org/
+COMMENT=	FIX engine
+LICENSE=	quickfix
 
 .include "../../mk/bsd.prefs.mk"
 
-WRKSRC=			${WRKDIR}/quickfix
+WRKSRC=			${WRKDIR}/quickfix-${GITHUB_TAG}
 
-USE_LANGUAGES+=	c c++
-PTHREAD_OPTS+=	native
+USE_LANGUAGES+=		c c++
+USE_TOOLS+=		gmake autoconf automake m4
+GNU_CONFIGURE=		yes
+USE_LIBTOOL=		yes
+CHECK_PORTABILITY_SKIP=	configure # XXX Don't play with fire!
+PTHREAD_OPTS+=		native
 PTHREAD_AUTO_VARS=	yes
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=		gmake bash
+
+pre-configure:
+	cd ${WRKSRC:Q} && ./bootstrap
 
 .include "../../mk/pthread.buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
+.include "../../databases/mysql55-client/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/quickfix/distinfo b/quickfix/distinfo
index 87761d7..857074b 100644
--- a/quickfix/distinfo
+++ b/quickfix/distinfo
@@ -1,8 +1,8 @@
 $NetBSD: distinfo,v 1.4 2010/04/25 13:22:23 alnsn Exp $
 
-SHA1 (quickfix-1.14.3.tar.gz) = a67a8affaf9273f10eb378d63cfdd7f2c653be84
-RMD160 (quickfix-1.14.3.tar.gz) = 369d5bf7044fa4c90d2d74e4470e50c0ad82951b
-SHA512 (quickfix-1.14.3.tar.gz) = aff3676f2c43a9de7dbe86732e1411f9ce42946e2e74e20a3cd2d7c032cc46c1492c97a4a67eb175f118d93f07f94f9297122e3961069537907bf1c4d68f9a09
-Size (quickfix-1.14.3.tar.gz) = 21803784 bytes
+SHA1 (quickfix-1.14.4.tar.gz) = 879a643e6cdc8b8c5bfd037645d766a6358dc1c3
+RMD160 (quickfix-1.14.4.tar.gz) = 13af542f469a5e10e01ea27691f62b11c287a3b4
+SHA512 (quickfix-1.14.4.tar.gz) = b54852365d85c769bd7cf59a972ab722227a2fc5fa760cdc7f5e31d143ece303049e4b05235913072fa8df3061c6fcb5a89f853821c6372e02620cd1ef16b981
+Size (quickfix-1.14.4.tar.gz) = 15710216 bytes
 SHA1 (patch-UnitTest++_Makefile) = 22482a78df02996a7af623148576093441ba140d
-SHA1 (patch-configure) = 831eb5bb24c82549b81c40f7e9896628dcef6ef6
+SHA1 (patch-configure.ac) = 0662d15b3d8e1e2238dfc44491dfb4f5d72749a5
diff --git a/quickfix/patches/patch-configure b/quickfix/patches/patch-configure
deleted file mode 100644
index 497faba..0000000
--- a/quickfix/patches/patch-configure
+++ /dev/null
@@ -1,168 +0,0 @@
-$NetBSD$
-
-Please check-portability.awk.
-
---- configure.orig	2014-09-15 06:24:18.000000000 +0000
-+++ configure
-@@ -15607,7 +15607,7 @@ fi
- 
- # Check whether --with-mysql was given.
- if test "${with_mysql+set}" = set; then :
--  withval=$with_mysql; if test $withval == "no"
-+  withval=$with_mysql; if test $withval = "no"
-          then
-            has_mysql=false
-          else
-@@ -15779,7 +15779,7 @@ has_boost=false
- 
- # Check whether --with-boost was given.
- if test "${with_boost+set}" = set; then :
--  withval=$with_boost; if test $withval == "no"
-+  withval=$with_boost; if test $withval = "no"
-      then
-        has_boost=false
-      else
-@@ -15807,7 +15807,7 @@ has_stlport=false
- 
- # Check whether --with-stlport was given.
- if test "${with_stlport+set}" = set; then :
--  withval=$with_stlport; if test $withval == "no"
-+  withval=$with_stlport; if test $withval = "no"
-      then
-        has_stlport=false
-      else
-@@ -15864,7 +15864,7 @@ fi
- 
- # Check whether --with-allocator was given.
- if test "${with_allocator+set}" = set; then :
--  withval=$with_allocator; if test $withval == "no"
-+  withval=$with_allocator; if test $withval = "no"
-      then
-        has_allocator=false
-      else
-@@ -15885,7 +15885,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- 
- 
- # check for debug allocator
--if test "x$with_allocator" == "xdebug"
-+if test "x$with_allocator" = "xdebug"
- then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __gnu_cxx::debug_allocator" >&5
- $as_echo_n "checking for __gnu_cxx::debug_allocator... " >&6; }
-@@ -15917,7 +15917,7 @@ rm -f core conftest.err conftest.$ac_obj
- fi
- 
- # check for new allocator
--if test "x$with_allocator" == "xnew"
-+if test "x$with_allocator" = "xnew"
- then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __gnu_cxx::new_allocator" >&5
- $as_echo_n "checking for __gnu_cxx::new_allocator... " >&6; }
-@@ -15948,7 +15948,7 @@ rm -f core conftest.err conftest.$ac_obj
- fi
- 
- # check for boost::pool_allocator
--if test "x$with_allocator" == "xboost"
-+if test "x$with_allocator" = "xboost"
- then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for boost::pool_allocator" >&5
- $as_echo_n "checking for boost::pool_allocator... " >&6; }
-@@ -15979,7 +15979,7 @@ rm -f core conftest.err conftest.$ac_obj
- fi
- 
- # check for boost::fast_pool_allocator
--if test "x$with_allocator" == "xboost_fast"
-+if test "x$with_allocator" = "xboost_fast"
- then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for boost::fast_pool_allocator" >&5
- $as_echo_n "checking for boost::fast_pool_allocator... " >&6; }
-@@ -16010,7 +16010,7 @@ rm -f core conftest.err conftest.$ac_obj
- fi
- 
- # check for __gnu_cxx::__pool_alloc
--if test "x$with_allocator" == "xpool"
-+if test "x$with_allocator" = "xpool"
- then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __gnu_cxx::__pool_alloc" >&5
- $as_echo_n "checking for __gnu_cxx::__pool_alloc... " >&6; }
-@@ -16041,7 +16041,7 @@ rm -f core conftest.err conftest.$ac_obj
- fi
- 
- # check for __gnu_cxx::__mt_alloc
--if test "x$with_allocator" == "xmt"
-+if test "x$with_allocator" = "xmt"
- then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __gnu_cxx::__mt_alloc" >&5
- $as_echo_n "checking for __gnu_cxx::__mt_alloc... " >&6; }
-@@ -16072,7 +16072,7 @@ rm -f core conftest.err conftest.$ac_obj
- fi
- 
- # check for __gnu_cxx::bitmap_allocator
--if test "x$with_allocator" == "xbitmap"
-+if test "x$with_allocator" = "xbitmap"
- then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __gnu_cxx::bitmap_allocator" >&5
- $as_echo_n "checking for __gnu_cxx::bitmap_allocator... " >&6; }
-@@ -16103,7 +16103,7 @@ rm -f core conftest.err conftest.$ac_obj
- fi
- 
- # check for tbb::scalable_allocator
--if test "x$with_allocator" == "xtbb"
-+if test "x$with_allocator" = "xtbb"
- then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tbb::scalable_allocator" >&5
- $as_echo_n "checking for tbb::scalable_allocator... " >&6; }
-@@ -16140,7 +16140,7 @@ has_python=false
- 
- # Check whether --with-python was given.
- if test "${with_python+set}" = set; then :
--  withval=$with_python; if test $withval == "no"
-+  withval=$with_python; if test $withval = "no"
-      then
-        has_python=false
-      else
-@@ -16184,7 +16184,7 @@ has_ruby=false
- 
- # Check whether --with-ruby was given.
- if test "${with_ruby+set}" = set; then :
--  withval=$with_ruby; if test $withval == "no"
-+  withval=$with_ruby; if test $withval = "no"
-      then
-        has_ruby=false
-      else
-@@ -16220,7 +16220,7 @@ has_java=false
- 
- # Check whether --with-java was given.
- if test "${with_java+set}" = set; then :
--  withval=$with_java; if test $withval == "no"
-+  withval=$with_java; if test $withval = "no"
-      then
-        has_java=false
-      else
-@@ -16259,7 +16259,7 @@ has_tbb=false
- 
- # Check whether --with-tbb was given.
- if test "${with_tbb+set}" = set; then :
--  withval=$with_tbb; if test $withval == "no"
-+  withval=$with_tbb; if test $withval = "no"
-      then
-        has_tbb=false
-      else
-@@ -16277,7 +16277,7 @@ has_tbb_arch=false
- 
- # Check whether --with-tbb-arch was given.
- if test "${with_tbb_arch+set}" = set; then :
--  withval=$with_tbb_arch; if test $withval == "no"
-+  withval=$with_tbb_arch; if test $withval = "no"
-      then
-        has_tbb_arch=false
-      else
-@@ -16306,7 +16306,7 @@ fi
- # libs
- LIBS="$STLPORT_LIBS $XML_LIBS $MYSQL_LIBS $POSTGRESQL_LDFLAGS $TBB_LIBS $LIBS"
- # gcc flags
--if test `uname` == SunOS; then
-+if test `uname` = SunOS; then
-    	SHAREDFLAGS="$TBB_CFLAGS $BOOST_CFLAGS $STLPORT_CFLAGS $MYSQL_CFLAGS $POSTGRESQL_CFLAGS $XML_CPPFLAGS $XML_CFLAGS $JAVA_CFLAGS $PYTHON_CFLAGS $RUBY_CFLAGS"
- else
- 	SHAREDFLAGS="-Wall -ansi -Wpointer-arith -Wwrite-strings -Wno-overloaded-virtual $TBB_CFLAGS $BOOST_CFLAGS $STLPORT_CFLAGS $MYSQL_CFLAGS $POSTGRESQL_CFLAGS $XML_CPPFLAGS $XML_CFLAGS $PYTHON_CFLAGS $RUBY_CFLAGS"
diff --git a/quickfix/patches/patch-configure.ac b/quickfix/patches/patch-configure.ac
new file mode 100644
index 0000000..724886c
--- /dev/null
+++ b/quickfix/patches/patch-configure.ac
@@ -0,0 +1,34 @@
+$NetBSD$
+
+Replace "==" with "=".
+XXX This patch doesn't help because autoconf generates "==".
+
+--- configure.ac.orig	2014-09-15 17:22:31.000000000 +0000
++++ configure.ac
+@@ -42,7 +42,7 @@ AX_JAVA()
+ has_tbb=false
+ AC_ARG_WITH(tbb,
+     [  --with-tbb=<path>       prefix of Intel Thread Building Blocks (TBB) installation. e.g. /opt/intel/tbb/3.0], 
+-    [if test $withval == "no"
++    [if test $withval = "no"
+      then
+        has_tbb=false
+      else
+@@ -56,7 +56,7 @@ AC_SUBST(TBB_PREFIX)
+ has_tbb_arch=false
+ AC_ARG_WITH(tbb-arch,
+     [  --with-tbb-arch=<arch>  TBB arch subdir, e.g. intel64/cc4.1.0_libc2.4_kernel2.6.16.21 ], 
+-    [if test $withval == "no"
++    [if test $withval = "no"
+      then
+        has_tbb_arch=false
+      else
+@@ -80,7 +80,7 @@ fi
+ # libs
+ LIBS="$STLPORT_LIBS $XML_LIBS $MYSQL_LIBS $POSTGRESQL_LDFLAGS $TBB_LIBS $LIBS"
+ # gcc flags
+-if test `uname` == SunOS; then
++if test `uname` = SunOS; then
+    	SHAREDFLAGS="$TBB_CFLAGS $BOOST_CFLAGS $STLPORT_CFLAGS $MYSQL_CFLAGS $POSTGRESQL_CFLAGS $XML_CPPFLAGS $XML_CFLAGS $JAVA_CFLAGS $PYTHON_CFLAGS $RUBY_CFLAGS"
+ else
+ 	SHAREDFLAGS="-Wall -ansi -Wpointer-arith -Wwrite-strings -Wno-overloaded-virtual $TBB_CFLAGS $BOOST_CFLAGS $STLPORT_CFLAGS $MYSQL_CFLAGS $POSTGRESQL_CFLAGS $XML_CPPFLAGS $XML_CFLAGS $PYTHON_CFLAGS $RUBY_CFLAGS"
Prev by Date: Add -X option
Next by Date: externalize debug flag with -X option
Previous by Thread: Add -X option
Next by Thread: externalize debug flag with -X option
Indexes:
Home | Main Index | Thread Index | Old Index