Date: Sat, 30 May 2015 17:03:02 +0000 (UTC) From: Thomas Zander <riggs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r387974 - in head/devel/poco-devel: . files Message-ID: <201505301703.t4UH32cR003366@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: riggs Date: Sat May 30 17:03:01 2015 New Revision: 387974 URL: https://svnweb.freebsd.org/changeset/ports/387974 Log: Update to upstream version 1.6.0 While on it: - Modernise github handling: GH_* is used now - Pet portlint PR: 199741 Submitted by: joe@thrallingpenguin.com (maintainer) Added: head/devel/poco-devel/files/patch-Foundation_include_Poco_RegularExpression.h - copied, changed from r387912, head/devel/poco-devel/files/patch-pcre head/devel/poco-devel/files/patch-Foundation_src_pcre__internal.h - copied, changed from r387912, head/devel/poco-devel/files/patch-pcre_internal.h Deleted: head/devel/poco-devel/files/patch-pcre head/devel/poco-devel/files/patch-pcre_internal.h Modified: head/devel/poco-devel/Makefile head/devel/poco-devel/distinfo head/devel/poco-devel/files/patch-Data-MySQL-testsuite-Makefile head/devel/poco-devel/files/patch-Data-ODBC-testsuite-Makefile head/devel/poco-devel/files/patch-Foundation-Makefile head/devel/poco-devel/files/patch-Foundation-testsuite-src-StringTest.cpp head/devel/poco-devel/files/patch-JSON-testsuite-src-JSONTest.cpp head/devel/poco-devel/files/patch-build-config-FreeBSD head/devel/poco-devel/files/patch-configure head/devel/poco-devel/pkg-plist Modified: head/devel/poco-devel/Makefile ============================================================================== --- head/devel/poco-devel/Makefile Sat May 30 17:02:42 2015 (r387973) +++ head/devel/poco-devel/Makefile Sat May 30 17:03:01 2015 (r387974) @@ -2,10 +2,8 @@ # $FreeBSD$ PORTNAME= poco -PORTVERSION= 1.5.4 -PORTREVISION= 1 +PORTVERSION= 1.6.0 CATEGORIES= devel net -MASTER_SITES= https://codeload.github.com/pocoproject/poco/legacy.tar.gz/poco-${PORTVERSION}-release?dummy=/ PKGNAMESUFFIX= -devel MAINTAINER= joe@thrallingpenguin.com @@ -19,6 +17,11 @@ LIB_DEPENDS= libpcre.so:${PORTSDIR}/deve CONFLICTS= poco-ssl-[0-9]* poco-[0-9]* +USE_GITHUB= yes +GH_ACCOUNT= pocoproject +GH_PROJECT= poco +GH_TAGNAME= poco-${PORTVERSION}-release + OPTIONS_DEFAULT= MYSQL IODBC SQLITE OPTIONS_DEFINE= MYSQL SQLITE @@ -31,13 +34,12 @@ OPTIONS_RADIO_ODBC= UODBC IODBC ODBC_DESC= ODBC Driver GNU_CONFIGURE= yes -CONFIGURE_ARGS= --config=FreeBSD --unbundled +CONFIGURE_ARGS= --config=FreeBSD --unbundled --no-tests --no-samples USES= gmake USE_LDCONFIG= yes USE_OPENSSL= yes MAKE_JOBS_UNSAFE=true -WRKSRC= ${WRKDIR}/pocoproject-poco-a64ebba MAKE_ARGS= CXX=c++ CC=cc POCO_ODBC_LIB=${LOCALBASE}/lib .include <bsd.port.options.mk> Modified: head/devel/poco-devel/distinfo ============================================================================== --- head/devel/poco-devel/distinfo Sat May 30 17:02:42 2015 (r387973) +++ head/devel/poco-devel/distinfo Sat May 30 17:03:01 2015 (r387974) @@ -1,2 +1,2 @@ -SHA256 (poco-1.5.4.tar.gz) = 8f8ff6d8392217f5e622bbb096e78c6d4f84d996196e9bc2edfc38064bcf9688 -SIZE (poco-1.5.4.tar.gz) = 7485330 +SHA256 (pocoproject-poco-1.6.0-poco-1.6.0-release_GH0.tar.gz) = 378d5874545876d95b25a551adf55b80622817f6d6f142485c150698eb2177b8 +SIZE (pocoproject-poco-1.6.0-poco-1.6.0-release_GH0.tar.gz) = 7405786 Modified: head/devel/poco-devel/files/patch-Data-MySQL-testsuite-Makefile ============================================================================== --- head/devel/poco-devel/files/patch-Data-MySQL-testsuite-Makefile Sat May 30 17:02:42 2015 (r387973) +++ head/devel/poco-devel/files/patch-Data-MySQL-testsuite-Makefile Sat May 30 17:03:01 2015 (r387974) @@ -1,6 +1,6 @@ ---- Data/MySQL/testsuite/Makefile.orig 2014-06-22 05:25:25.000000000 -0700 -+++ Data/MySQL/testsuite/Makefile 2014-06-22 05:25:45.000000000 -0700 -@@ -11,7 +11,7 @@ +--- Data/MySQL/testsuite/Makefile.orig 2014-12-21 23:06:53 UTC ++++ Data/MySQL/testsuite/Makefile +@@ -11,7 +11,7 @@ include $(POCO_BASE)/build/rules/global INCLUDE += -I./../include -I/usr/local/include/mysql -I/usr/include/mysql/ -I/usr/mysql/include/mysql -I/usr/local/mysql/include # Note: linking order is important, do not change it. Modified: head/devel/poco-devel/files/patch-Data-ODBC-testsuite-Makefile ============================================================================== --- head/devel/poco-devel/files/patch-Data-ODBC-testsuite-Makefile Sat May 30 17:02:42 2015 (r387973) +++ head/devel/poco-devel/files/patch-Data-ODBC-testsuite-Makefile Sat May 30 17:03:01 2015 (r387974) @@ -1,6 +1,6 @@ ---- Data/ODBC/testsuite/Makefile.orig 2014-04-30 11:19:31.000000000 -0700 -+++ Data/ODBC/testsuite/Makefile 2014-04-30 11:20:13.000000000 -0700 -@@ -20,9 +20,6 @@ +--- Data/ODBC/testsuite/Makefile.orig 2014-12-21 23:06:53 UTC ++++ Data/ODBC/testsuite/Makefile +@@ -20,9 +20,6 @@ include $(POCO_BASE)/Data/ODBC/ODBC.make # Note: # # Do not change linking order or move this line up, these libs have to be linked in this order. # ################################################################################################## Modified: head/devel/poco-devel/files/patch-Foundation-Makefile ============================================================================== --- head/devel/poco-devel/files/patch-Foundation-Makefile Sat May 30 17:02:42 2015 (r387973) +++ head/devel/poco-devel/files/patch-Foundation-Makefile Sat May 30 17:03:01 2015 (r387974) @@ -1,6 +1,6 @@ ---- Foundation/Makefile.orig 2014-10-16 05:16:40.000000000 -0700 -+++ Foundation/Makefile 2014-10-17 15:28:45.000000000 -0700 -@@ -46,6 +46,7 @@ +--- Foundation/Makefile.orig 2014-12-21 23:06:53 UTC ++++ Foundation/Makefile +@@ -46,6 +46,7 @@ pcre_utf8_objects = pcre_ucd pcre_tables ifdef POCO_UNBUNDLED SYSLIBS += -lpcre -lz Modified: head/devel/poco-devel/files/patch-Foundation-testsuite-src-StringTest.cpp ============================================================================== --- head/devel/poco-devel/files/patch-Foundation-testsuite-src-StringTest.cpp Sat May 30 17:02:42 2015 (r387973) +++ head/devel/poco-devel/files/patch-Foundation-testsuite-src-StringTest.cpp Sat May 30 17:03:01 2015 (r387974) @@ -1,6 +1,6 @@ ---- Foundation/testsuite/src/StringTest.cpp.orig 2014-07-07 20:36:25.000000000 -0700 -+++ Foundation/testsuite/src/StringTest.cpp 2014-07-08 07:44:54.000000000 -0700 -@@ -922,11 +922,11 @@ +--- Foundation/testsuite/src/StringTest.cpp.orig 2014-12-21 23:06:53 UTC ++++ Foundation/testsuite/src/StringTest.cpp +@@ -926,11 +926,11 @@ void StringTest::testIntToString() assert (uIntToStr(0xF0F0F0F0, 2, result)); assert (result == "11110000111100001111000011110000"); #if defined(POCO_HAVE_INT64) @@ -17,7 +17,7 @@ #endif // octal -@@ -954,15 +954,15 @@ +@@ -958,15 +958,15 @@ void StringTest::testIntToString() assert (result == "0x499602D2"); assert (uIntToStr(1234567890, 0x10, result, true, 15, '0')); assert (result == "0x00000499602D2"); Copied and modified: head/devel/poco-devel/files/patch-Foundation_include_Poco_RegularExpression.h (from r387912, head/devel/poco-devel/files/patch-pcre) ============================================================================== --- head/devel/poco-devel/files/patch-pcre Sat May 30 01:48:31 2015 (r387912, copy source) +++ head/devel/poco-devel/files/patch-Foundation_include_Poco_RegularExpression.h Sat May 30 17:03:01 2015 (r387974) @@ -1,5 +1,5 @@ ---- Foundation/include/Poco/RegularExpression.h.orig 2014-10-17 13:48:55.000000000 -0700 -+++ Foundation/include/Poco/RegularExpression.h 2014-10-17 13:49:30.000000000 -0700 +--- Foundation/include/Poco/RegularExpression.h.orig 2014-12-21 23:06:53 UTC ++++ Foundation/include/Poco/RegularExpression.h @@ -34,7 +34,7 @@ extern "C" { Copied and modified: head/devel/poco-devel/files/patch-Foundation_src_pcre__internal.h (from r387912, head/devel/poco-devel/files/patch-pcre_internal.h) ============================================================================== --- head/devel/poco-devel/files/patch-pcre_internal.h Sat May 30 01:48:31 2015 (r387912, copy source) +++ head/devel/poco-devel/files/patch-Foundation_src_pcre__internal.h Sat May 30 17:03:01 2015 (r387974) @@ -1,6 +1,6 @@ ---- Foundation/src/pcre_internal.h.orig 2014-10-16 05:16:40.000000000 -0700 -+++ Foundation/src/pcre_internal.h 2014-10-17 13:20:20.000000000 -0700 -@@ -2636,6 +2636,16 @@ +--- Foundation/src/pcre_internal.h.orig 2014-12-21 23:06:53 UTC ++++ Foundation/src/pcre_internal.h +@@ -2636,6 +2636,16 @@ typedef struct { } ucp_type_table; @@ -17,7 +17,7 @@ /* Internal shared data tables. These are tables that are used by more than one of the exported public functions. They have to be "external" in the C sense, but are not part of the PCRE public API. The data for these tables is in the -@@ -2749,6 +2759,11 @@ +@@ -2749,6 +2759,11 @@ typedef struct { pcre_int32 other_case; /* offset to other case, or zero if none */ } ucd_record; Modified: head/devel/poco-devel/files/patch-JSON-testsuite-src-JSONTest.cpp ============================================================================== --- head/devel/poco-devel/files/patch-JSON-testsuite-src-JSONTest.cpp Sat May 30 17:02:42 2015 (r387973) +++ head/devel/poco-devel/files/patch-JSON-testsuite-src-JSONTest.cpp Sat May 30 17:03:01 2015 (r387974) @@ -1,6 +1,6 @@ ---- JSON/testsuite/src/JSONTest.cpp.orig 2014-07-08 09:22:19.000000000 -0700 -+++ JSON/testsuite/src/JSONTest.cpp 2014-07-08 09:23:15.000000000 -0700 -@@ -269,23 +269,23 @@ +--- JSON/testsuite/src/JSONTest.cpp.orig 2014-12-21 23:06:53 UTC ++++ JSON/testsuite/src/JSONTest.cpp +@@ -232,23 +232,23 @@ void JSONTest::testNumber64Property() Var test = object.get("test"); assert(test.isInteger()); Poco::Int64 value = test; Modified: head/devel/poco-devel/files/patch-build-config-FreeBSD ============================================================================== --- head/devel/poco-devel/files/patch-build-config-FreeBSD Sat May 30 17:02:42 2015 (r387973) +++ head/devel/poco-devel/files/patch-build-config-FreeBSD Sat May 30 17:03:01 2015 (r387974) @@ -1,6 +1,6 @@ ---- build/config/FreeBSD.orig 2014-04-29 20:44:44.000000000 -0700 -+++ build/config/FreeBSD 2014-04-29 20:50:10.000000000 -0700 -@@ -15,57 +15,57 @@ +--- build/config/FreeBSD.orig 2014-12-21 23:06:53 UTC ++++ build/config/FreeBSD +@@ -15,57 +15,57 @@ LINKMODE ?= SHARED # # Define Tools # @@ -94,5 +94,5 @@ # # System Specific Libraries # --SYSLIBS ?= -lpthread -L /usr/local/lib +-SYSLIBS = -lpthread +SYSLIBS ?= -lpthread -L/usr/local/lib Modified: head/devel/poco-devel/files/patch-configure ============================================================================== --- head/devel/poco-devel/files/patch-configure Sat May 30 17:02:42 2015 (r387973) +++ head/devel/poco-devel/files/patch-configure Sat May 30 17:03:01 2015 (r387974) @@ -1,6 +1,6 @@ ---- configure.orig 2014-04-29 17:39:17.000000000 -0700 -+++ configure 2014-04-29 17:42:42.000000000 -0700 -@@ -187,12 +187,16 @@ +--- configure.orig 2014-12-21 23:06:53 UTC ++++ configure +@@ -205,12 +205,16 @@ while [ $# -ge 1 ]; do --shared) shared=1 ;; Modified: head/devel/poco-devel/pkg-plist ============================================================================== --- head/devel/poco-devel/pkg-plist Sat May 30 17:02:42 2015 (r387973) +++ head/devel/poco-devel/pkg-plist Sat May 30 17:03:01 2015 (r387974) @@ -808,8 +808,10 @@ include/Poco/Net/NTPClient.h include/Poco/Net/NTPEventArgs.h include/Poco/Net/NTPPacket.h include/Poco/PBKDF2Engine.h -lib/libPocoFoundationd.so.24 -lib/libPocoFoundation.so.24 +include/Poco/Net/OAuth10Credentials.h +include/Poco/Net/OAuth20Credentials.h +lib/libPocoFoundationd.so.30 +lib/libPocoFoundation.so.30 lib/libPocoFoundationd.so lib/libPocoFoundation.so lib/libPocoXMLd.so @@ -818,53 +820,53 @@ lib/libPocoUtild.so lib/libPocoUtil.so lib/libPocoNetd.so lib/libPocoNet.so -lib/libPocoXMLd.so.24 -lib/libPocoXML.so.24 -lib/libPocoUtild.so.24 -lib/libPocoUtil.so.24 -lib/libPocoNetd.so.24 -lib/libPocoNet.so.24 -lib/libPocoJSONd.so.24 -lib/libPocoJSON.so.24 +lib/libPocoXMLd.so.30 +lib/libPocoXML.so.30 +lib/libPocoUtild.so.30 +lib/libPocoUtil.so.30 +lib/libPocoNetd.so.30 +lib/libPocoNet.so.30 +lib/libPocoJSONd.so.30 +lib/libPocoJSON.so.30 lib/libPocoJSON.so lib/libPocoJSONd.so -lib/libPocoCryptod.so.24 -lib/libPocoCrypto.so.24 +lib/libPocoCryptod.so.30 +lib/libPocoCrypto.so.30 lib/libPocoCrypto.so lib/libPocoCryptod.so -lib/libPocoNetSSLd.so.24 -lib/libPocoNetSSL.so.24 +lib/libPocoNetSSLd.so.30 +lib/libPocoNetSSL.so.30 lib/libPocoNetSSLd.so lib/libPocoNetSSL.so -lib/libPocoDatad.so.24 -lib/libPocoData.so.24 +lib/libPocoDatad.so.30 +lib/libPocoData.so.30 lib/libPocoDatad.so lib/libPocoData.so -lib/libPocoDataSQLited.so.24 +lib/libPocoDataSQLited.so.30 lib/libPocoDataSQLited.so -lib/libPocoDataSQLite.so.24 +lib/libPocoDataSQLite.so.30 lib/libPocoDataSQLite.so -lib/libPocoDataODBCd.so.24 +lib/libPocoDataODBCd.so.30 lib/libPocoDataODBCd.so -lib/libPocoDataODBC.so.24 +lib/libPocoDataODBC.so.30 lib/libPocoDataODBC.so -lib/libPocoDataMySQLd.so.24 +lib/libPocoDataMySQLd.so.30 lib/libPocoDataMySQLd.so -lib/libPocoDataMySQL.so.24 +lib/libPocoDataMySQL.so.30 lib/libPocoDataMySQL.so -lib/libPocoMongoDBd.so.24 +lib/libPocoMongoDBd.so.30 lib/libPocoMongoDBd.so -lib/libPocoMongoDB.so.24 +lib/libPocoMongoDB.so.30 lib/libPocoMongoDB.so -lib/libPocoZipd.so.24 +lib/libPocoZipd.so.30 lib/libPocoZipd.so -lib/libPocoZip.so.24 +lib/libPocoZip.so.30 lib/libPocoZip.so -lib/libPocoCppParserd.so.24 +lib/libPocoCppParserd.so.30 lib/libPocoCppParserd.so -lib/libPocoCppParser.so.24 +lib/libPocoCppParser.so.30 lib/libPocoCppParser.so -lib/libPocoPDFd.so.24 +lib/libPocoPDFd.so.30 lib/libPocoPDFd.so -lib/libPocoPDF.so.24 +lib/libPocoPDF.so.30 lib/libPocoPDF.so
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505301703.t4UH32cR003366>