Revision: 144353 https://trac.macports.org/changeset/144353 Author: ryandesign@macports.org Date: 2016-01-06 18:53:15 -0800 (Wed, 06 Jan 2016) Log Message: ----------- quickfix: update to 1.14.3 (#49773); add python27, python34 and python35 variants (#39573) Modified Paths: -------------- trunk/dports/devel/quickfix/Portfile Removed Paths: ------------- trunk/dports/devel/quickfix/files/patch-postgresql84.diff trunk/dports/devel/quickfix/files/patch-postgresql90.diff trunk/dports/devel/quickfix/files/patch-python.diff Modified: trunk/dports/devel/quickfix/Portfile =================================================================== --- trunk/dports/devel/quickfix/Portfile 2016-01-07 02:51:35 UTC (rev 144352) +++ trunk/dports/devel/quickfix/Portfile 2016-01-07 02:53:15 UTC (rev 144353) @@ -2,7 +2,7 @@ PortSystem 1.0 name quickfix -version 1.14.0 +version 1.14.3 license Permissive # http://www.quickfixengine.org/quickfix/doc/html/license.html categories devel finance @@ -18,22 +18,23 @@ master_sites sourceforge:project/quickfix/quickfix/${version} worksrcdir ${name} -checksums rmd160 99e808a79acc4cfad924831da6e073c9d1211bdf \ - sha256 1d6906ba828c5ef909199117d992143f117831e4fdb4999f9012f575a0882d90 +checksums rmd160 369d5bf7044fa4c90d2d74e4470e50c0ad82951b \ + sha256 f6e8bdb004eaf45e50f63005b8c2611cb0afd42cf70f110f600c852aa572342d depends_lib port:libxml2 patchfiles patch-UnitTest++-Makefile.diff -variant universal {} - post-patch { - reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/configure reinplace "s|@CXX@|${configure.cxx}|g" ${worksrcpath}/UnitTest++/Makefile reinplace "s|@ARCHFLAGS@|[get_canonical_archflags cxx]|g" ${worksrcpath}/UnitTest++/Makefile } -configure.args --with-java +configure.args --with-java \ + --with-mysql-config=false \ + --without-postgresql \ + --without-python \ + --without-ruby configure.env "JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home" post-destroot { @@ -41,20 +42,33 @@ copy ${worksrcpath}/src/sql/postgresql ${destroot}${prefix}/share/${name}/sql } -variant python description {Include python support} { - depends_lib-append port:python26 - configure.args-append --with-python=${prefix} - patchfiles-append patch-python.diff -} - -variant postgresql84 conflicts postgresql90 description {Include PostGreSQL 8.4 support} { +variant postgresql84 conflicts postgresql90 description {Include PostgreSQL 8.4 support} { depends_lib-append port:postgresql84 - configure.args-append --with-postgresql=${prefix} - patchfiles-append patch-postgresql84.diff + configure.args-replace --without-postgresql --with-postgresql=${prefix}/lib/postgresql84/bin/pg_config } -variant postgresql90 conflicts postgresql84 description {Include PostGreSQL 9.0 support} { +variant postgresql90 conflicts postgresql84 description {Include PostgreSQL 9.0 support} { depends_lib-append port:postgresql90 - configure.args-append --with-postgresql=${prefix} - patchfiles-append patch-postgresql90.diff + configure.args-replace --without-postgresql --with-postgresql=${prefix}/lib/postgresql90/bin/pg_config } + +# To be removed after January 2017 +variant python requires python27 description {Legacy compatibility variant} {} + +variant python27 conflicts python34 python35 description {Include Python 2.7 support} { + depends_lib-append port:python27 + configure.python ${prefix}/bin/python2.7 + configure.args-replace --without-python --with-python +} + +variant python34 conflicts python27 python35 description {Include Python 3.4 support} { + depends_lib-append port:python34 + configure.python ${prefix}/bin/python3.4 + configure.args-replace --without-python --with-python +} + +variant python35 conflicts python27 python34 description {Include Python 3.5 support} { + depends_lib-append port:python35 + configure.python ${prefix}/bin/python3.5 + configure.args-replace --without-python --with-python +} Deleted: trunk/dports/devel/quickfix/files/patch-postgresql84.diff =================================================================== --- trunk/dports/devel/quickfix/files/patch-postgresql84.diff 2016-01-07 02:51:35 UTC (rev 144352) +++ trunk/dports/devel/quickfix/files/patch-postgresql84.diff 2016-01-07 02:53:15 UTC (rev 144353) @@ -1,14 +0,0 @@ ---- configure.orig 2010-04-05 20:00:26.000000000 -0600 -+++ configure 2010-05-02 15:37:33.000000000 -0600 -@@ -14938,9 +14938,9 @@ - - if test $has_postgresql = true - then -- POSTGRESQL_CFLAGS="-I${POSTGRESQL_PREFIX}/include -I${POSTGRESQL_PREFIX}/include/postgresql" -+ POSTGRESQL_CFLAGS="-I${POSTGRESQL_PREFIX}/include -I${POSTGRESQL_PREFIX}/include/postgresql84" - -- POSTGRESQL_LIBS="-L${POSTGRESQL_PREFIX}/lib -lpq" -+ POSTGRESQL_LIBS="-L${POSTGRESQL_PREFIX}/lib/postgresql84 -lpq" - - - $as_echo "#define HAVE_POSTGRESQL 1" >>confdefs.h Deleted: trunk/dports/devel/quickfix/files/patch-postgresql90.diff =================================================================== --- trunk/dports/devel/quickfix/files/patch-postgresql90.diff 2016-01-07 02:51:35 UTC (rev 144352) +++ trunk/dports/devel/quickfix/files/patch-postgresql90.diff 2016-01-07 02:53:15 UTC (rev 144353) @@ -1,14 +0,0 @@ ---- configure.orig 2010-04-05 20:00:26.000000000 -0600 -+++ configure 2010-05-02 15:37:33.000000000 -0600 -@@ -14938,9 +14938,9 @@ - - if test $has_postgresql = true - then -- POSTGRESQL_CFLAGS="-I${POSTGRESQL_PREFIX}/include -I${POSTGRESQL_PREFIX}/include/postgresql" -+ POSTGRESQL_CFLAGS="-I${POSTGRESQL_PREFIX}/include -I${POSTGRESQL_PREFIX}/include/postgresql90" - -- POSTGRESQL_LIBS="-L${POSTGRESQL_PREFIX}/lib -lpq" -+ POSTGRESQL_LIBS="-L${POSTGRESQL_PREFIX}/lib/postgresql90 -lpq" - - - $as_echo "#define HAVE_POSTGRESQL 1" >>confdefs.h Deleted: trunk/dports/devel/quickfix/files/patch-python.diff =================================================================== --- trunk/dports/devel/quickfix/files/patch-python.diff 2016-01-07 02:51:35 UTC (rev 144352) +++ trunk/dports/devel/quickfix/files/patch-python.diff 2016-01-07 02:53:15 UTC (rev 144353) @@ -1,54 +0,0 @@ ---- configure.orig 2010-04-05 20:00:26.000000000 -0600 -+++ configure 2010-05-02 17:52:37.000000000 -0600 -@@ -14971,9 +14971,9 @@ - - if test $has_python = true - then -- PYTHON_CFLAGS="-I${PYTHON_PREFIX}" -+ PYTHON_CFLAGS="-I`@@PREFIX@@/bin/python2.6 -c 'from distutils import sysconfig; print sysconfig.get_python_inc()'`" - -- PYTHON_SITE_PACKAGES=`python -c 'from distutils import sysconfig; print sysconfig.get_python_lib()'` -+ PYTHON_SITE_PACKAGES=`@@PREFIX@@/bin/python2.6 -c 'from distutils import sysconfig; print sysconfig.get_python_lib()'` - - - $as_echo "#define HAVE_PYTHON 1" >>confdefs.h ---- src/python/Makefile.in.orig 2010-04-05 20:00:25.000000000 -0600 -+++ src/python/Makefile.in 2010-05-23 15:38:52.000000000 -0600 -@@ -594,21 +594,22 @@ - rm -rf $(top_builddir)/lib/python - - install-exec-local: -- rm -rf $(PYTHON_SITE_PACKAGES)/python/_quickfix.so -- rm -rf $(PYTHON_SITE_PACKAGES)/python/_quickfix.dylib -- rm -rf $(PYTHON_SITE_PACKAGES)/python/quickfix.py -- rm -rf $(PYTHON_SITE_PACKAGES)/python/quickfix40.py -- rm -rf $(PYTHON_SITE_PACKAGES)/python/quickfix41.py -- rm -rf $(PYTHON_SITE_PACKAGES)/python/quickfix42.py -- rm -rf $(PYTHON_SITE_PACKAGES)/python/quickfix43.py -- rm -rf $(PYTHON_SITE_PACKAGES)/python/quickfix44.py -- rm -rf $(PYTHON_SITE_PACKAGES)/python/quickfix50.py -- rm -rf $(PYTHON_SITE_PACKAGES)/python/quickfix50sp1.py -- rm -rf $(PYTHON_SITE_PACKAGES)/python/quickfix50sp2.py -- rm -rf $(PYTHON_SITE_PACKAGES)/python/quickfixt11.py -- ln -sf $(prefix)/lib/python/_quickfix.so $(PYTHON_SITE_PACKAGES)/_quickfix.so -- ln -sf $(prefix)/lib/python/_quickfix.dylib $(PYTHON_SITE_PACKAGES)/_quickfix.dylib -- cp $(top_builddir)/lib/python/*.py $(PYTHON_SITE_PACKAGES) -+ rm -rf $(DESTDIR)$(PYTHON_SITE_PACKAGES)/python/_quickfix.so -+ rm -rf $(DESTDIR)$(PYTHON_SITE_PACKAGES)/python/_quickfix.dylib -+ rm -rf $(DESTDIR)$(PYTHON_SITE_PACKAGES)/python/quickfix.py -+ rm -rf $(DESTDIR)$(PYTHON_SITE_PACKAGES)/python/quickfix40.py -+ rm -rf $(DESTDIR)$(PYTHON_SITE_PACKAGES)/python/quickfix41.py -+ rm -rf $(DESTDIR)$(PYTHON_SITE_PACKAGES)/python/quickfix42.py -+ rm -rf $(DESTDIR)$(PYTHON_SITE_PACKAGES)/python/quickfix43.py -+ rm -rf $(DESTDIR)$(PYTHON_SITE_PACKAGES)/python/quickfix44.py -+ rm -rf $(DESTDIR)$(PYTHON_SITE_PACKAGES)/python/quickfix50.py -+ rm -rf $(DESTDIR)$(PYTHON_SITE_PACKAGES)/python/quickfix50sp1.py -+ rm -rf $(DESTDIR)$(PYTHON_SITE_PACKAGES)/python/quickfix50sp2.py -+ rm -rf $(DESTDIR)$(PYTHON_SITE_PACKAGES)/python/quickfixt11.py -+ $(mkinstalldirs) $(DESTDIR)$(PYTHON_SITE_PACKAGES) -+ cp $(top_builddir)/lib/python/*.py $(DESTDIR)$(PYTHON_SITE_PACKAGES) -+ cp $(top_builddir)/lib/python/_quickfix.dylib $(DESTDIR)$(PYTHON_SITE_PACKAGES) -+ ln -sf $(PYTHON_SITE_PACKAGES)/_quickfix.dylib $(DESTDIR)$(PYTHON_SITE_PACKAGES)/_quickfix.so - - uninstall-local: - rm -rf $(PYTHON_SITE_PACKAGES)/_quickfix.so