Attachment #188498 for bug #224062

View | Details | Raw Unified | Return to bug 224062
Collapse All | Expand All




# $FreeBSD: head/devel/poco/Makefile 446500 2017-07-23 17:21:37Z riggs $

PORTNAME=	poco
PORTVERSION=	1.8.0.1
DISTVERSIONSUFFIX=	-all
PORTREVISION=	1
CATEGORIES=	devel net
MASTER_SITES=	http://pocoproject.org/releases/${PORTNAME}-${PORTVERSION}/


CMAKE_ARGS=	-DPOCO_UNBUNDLED:BOOL=ON
USE_LDCONFIG=	yes

SHLIB_MAJOR=	50
PLIST_SUB=	SHLIB_MAJOR=${SHLIB_MAJOR}

OPTIONS_DEFINE=		MYSQL REDIS SQLITE SSL TEST
OPTIONS_RADIO=		ODBC
OPTIONS_RADIO_ODBC=	IODBC UNIXODBC
OPTIONS_DEFAULT=	MYSQL REDIS SQLITE SSL
OPTIONS_SUB=		yes

MYSQL_USES=		mysql

			-DODBC_LIBRARIES:FILEPATH=${LOCALBASE}/lib/libodbc.so
TEST_CMAKE_ON=		-DENABLE_TESTS:BOOL=ON
TEST_IMPLIES=		SQLITE
REDIS_CMAKE_OFF=	-DENABLE_REDIS:BOOL=OFF

.include <bsd.port.options.mk>


Lines 1-3 Link Here

(-)b/devel/poco/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1488777811	1	TIMESTAMP = 1512335210
2	SHA256 (poco-1.7.8-all.tar.gz) = 4e426b4870a79fb42511f6aeadbb688b4047bdc3c9a21ac31deb364ce49ec69f	2	SHA256 (poco-1.8.0.1-all.tar.gz) = cb891540b44b74e844fd0787c796f2699a894dba690329660e29b57efb8f80dd
3	SIZE (poco-1.7.8-all.tar.gz) = 6175164	3	SIZE (poco-1.8.0.1-all.tar.gz) = 6333309

Removed Link Here

(-)a/devel/poco/files/patch-Net_src_SocketImpl.cpp (-11 lines)
1	--- Net/src/SocketImpl.cpp.orig 2017-03-06 05:45:17 UTC
2	+++ Net/src/SocketImpl.cpp
3	@@ -473,7 +473,7 @@ bool SocketImpl::poll(const Poco::Timesp
4	}
5	}
6	while (rc < 0 && lastError() == POCO_EINTR);
7	- if (rc < 0) error(errorCode);
8	+ if (rc < 0) error();
9	return rc > 0;
10
11	#else

Lines 64-69 include/Poco/CountingStream.h Link Here

(-)b/devel/poco/pkg-plist (-11 / +34 lines)
64	%%SSL%%include/Poco/Crypto/RSAKey.h	64	%%SSL%%include/Poco/Crypto/RSAKey.h
65	%%SSL%%include/Poco/Crypto/RSAKeyImpl.h	65	%%SSL%%include/Poco/Crypto/RSAKeyImpl.h
66	%%SSL%%include/Poco/Crypto/X509Certificate.h	66	%%SSL%%include/Poco/Crypto/X509Certificate.h
		67	%%SSL%%include/Poco/Crypto/CryptoException.h
		68	%%SSL%%include/Poco/Crypto/ECDSADigestEngine.h
		69	%%SSL%%include/Poco/Crypto/ECKey.h
		70	%%SSL%%include/Poco/Crypto/ECKeyImpl.h
		71	%%SSL%%include/Poco/Crypto/EVPPKey.h
		72	%%SSL%%include/Poco/Crypto/KeyPair.h
		73	%%SSL%%include/Poco/Crypto/KeyPairImpl.h
		74	%%SSL%%include/Poco/Crypto/PKCS12Container.h
67	include/Poco/DOM/AbstractContainerNode.h	75	include/Poco/DOM/AbstractContainerNode.h
68	include/Poco/DOM/AbstractNode.h	76	include/Poco/DOM/AbstractNode.h
69	include/Poco/DOM/Attr.h	77	include/Poco/DOM/Attr.h
Lines 207-213 include/Poco/DigestStream.h Link Here
207	include/Poco/DirectoryIterator.h	215	include/Poco/DirectoryIterator.h
208	include/Poco/DirectoryIteratorStrategy.h	216	include/Poco/DirectoryIteratorStrategy.h
209	include/Poco/DirectoryIterator_UNIX.h	217	include/Poco/DirectoryIterator_UNIX.h
210	include/Poco/DirectoryIterator_VMS.h
211	include/Poco/DirectoryIterator_WIN32.h	218	include/Poco/DirectoryIterator_WIN32.h
212	include/Poco/DirectoryIterator_WIN32U.h	219	include/Poco/DirectoryIterator_WIN32U.h
213	include/Poco/DirectoryWatcher.h	220	include/Poco/DirectoryWatcher.h
Lines 222-228 include/Poco/DynamicFactory.h Link Here
222	include/Poco/DynamicStruct.h	229	include/Poco/DynamicStruct.h
223	include/Poco/Environment.h	230	include/Poco/Environment.h
224	include/Poco/Environment_UNIX.h	231	include/Poco/Environment_UNIX.h
225	include/Poco/Environment_VMS.h
226	include/Poco/Environment_VX.h	232	include/Poco/Environment_VX.h
227	include/Poco/Environment_WIN32.h	233	include/Poco/Environment_WIN32.h
228	include/Poco/Environment_WIN32U.h	234	include/Poco/Environment_WIN32U.h
Lines 250-255 include/Poco/FPEnvironment.h Link Here
250	include/Poco/FPEnvironment_C99.h	256	include/Poco/FPEnvironment_C99.h
251	include/Poco/FPEnvironment_DEC.h	257	include/Poco/FPEnvironment_DEC.h
252	include/Poco/FPEnvironment_DUMMY.h	258	include/Poco/FPEnvironment_DUMMY.h
		259	include/Poco/FPEnvironment_QNX.h
253	include/Poco/FPEnvironment_SUN.h	260	include/Poco/FPEnvironment_SUN.h
254	include/Poco/FPEnvironment_WIN32.h	261	include/Poco/FPEnvironment_WIN32.h
255	include/Poco/File.h	262	include/Poco/File.h
Lines 259-265 include/Poco/FileStreamFactory.h Link Here
259	include/Poco/FileStream_POSIX.h	266	include/Poco/FileStream_POSIX.h
260	include/Poco/FileStream_WIN32.h	267	include/Poco/FileStream_WIN32.h
261	include/Poco/File_UNIX.h	268	include/Poco/File_UNIX.h
262	include/Poco/File_VMS.h
263	include/Poco/File_VX.h	269	include/Poco/File_VX.h
264	include/Poco/File_WIN32.h	270	include/Poco/File_WIN32.h
265	include/Poco/File_WIN32U.h	271	include/Poco/File_WIN32U.h
Lines 289-299 include/Poco/JSON/JSONException.h Link Here
289	include/Poco/JSON/Object.h	295	include/Poco/JSON/Object.h
290	include/Poco/JSON/ParseHandler.h	296	include/Poco/JSON/ParseHandler.h
291	include/Poco/JSON/Parser.h	297	include/Poco/JSON/Parser.h
		298	include/Poco/JSON/ParserImpl.h
292	include/Poco/JSON/PrintHandler.h	299	include/Poco/JSON/PrintHandler.h
293	include/Poco/JSON/Query.h	300	include/Poco/JSON/Query.h
294	include/Poco/JSON/Stringifier.h	301	include/Poco/JSON/Stringifier.h
295	include/Poco/JSON/Template.h	302	include/Poco/JSON/Template.h
296	include/Poco/JSON/TemplateCache.h	303	include/Poco/JSON/TemplateCache.h
		304	include/Poco/JSONString.h
297	include/Poco/KeyValueArgs.h	305	include/Poco/KeyValueArgs.h
298	include/Poco/LRUCache.h	306	include/Poco/LRUCache.h
299	include/Poco/LRUStrategy.h	307	include/Poco/LRUStrategy.h
Lines 306-312 include/Poco/ListMap.h Link Here
306	include/Poco/LocalDateTime.h	314	include/Poco/LocalDateTime.h
307	include/Poco/LogFile.h	315	include/Poco/LogFile.h
308	include/Poco/LogFile_STD.h	316	include/Poco/LogFile_STD.h
309	include/Poco/LogFile_VMS.h
310	include/Poco/LogFile_WIN32.h	317	include/Poco/LogFile_WIN32.h
311	include/Poco/LogFile_WIN32U.h	318	include/Poco/LogFile_WIN32U.h
312	include/Poco/LogStream.h	319	include/Poco/LogStream.h
Lines 355-367 include/Poco/NObserver.h Link Here
355	include/Poco/NamedEvent.h	362	include/Poco/NamedEvent.h
356	include/Poco/NamedEvent_Android.h	363	include/Poco/NamedEvent_Android.h
357	include/Poco/NamedEvent_UNIX.h	364	include/Poco/NamedEvent_UNIX.h
358	include/Poco/NamedEvent_VMS.h
359	include/Poco/NamedEvent_WIN32.h	365	include/Poco/NamedEvent_WIN32.h
360	include/Poco/NamedEvent_WIN32U.h	366	include/Poco/NamedEvent_WIN32U.h
361	include/Poco/NamedMutex.h	367	include/Poco/NamedMutex.h
362	include/Poco/NamedMutex_Android.h	368	include/Poco/NamedMutex_Android.h
363	include/Poco/NamedMutex_UNIX.h	369	include/Poco/NamedMutex_UNIX.h
364	include/Poco/NamedMutex_VMS.h
365	include/Poco/NamedMutex_WIN32.h	370	include/Poco/NamedMutex_WIN32.h
366	include/Poco/NamedMutex_WIN32U.h	371	include/Poco/NamedMutex_WIN32U.h
367	include/Poco/NamedTuple.h	372	include/Poco/NamedTuple.h
Lines 452-457 include/Poco/Net/ParallelSocketReactor.h Link Here
452	include/Poco/Net/PartHandler.h	457	include/Poco/Net/PartHandler.h
453	include/Poco/Net/PartSource.h	458	include/Poco/Net/PartSource.h
454	include/Poco/Net/PartStore.h	459	include/Poco/Net/PartStore.h
		460	include/Poco/Net/PollSet.h
455	%%SSL%%include/Poco/Net/PrivateKeyFactory.h	461	%%SSL%%include/Poco/Net/PrivateKeyFactory.h
456	%%SSL%%include/Poco/Net/PrivateKeyFactoryMgr.h	462	%%SSL%%include/Poco/Net/PrivateKeyFactoryMgr.h
457	%%SSL%%include/Poco/Net/PrivateKeyPassphraseHandler.h	463	%%SSL%%include/Poco/Net/PrivateKeyPassphraseHandler.h
Lines 511-522 include/Poco/NumberParser.h Link Here
511	include/Poco/NumericString.h	517	include/Poco/NumericString.h
512	include/Poco/ObjectPool.h	518	include/Poco/ObjectPool.h
513	include/Poco/Observer.h	519	include/Poco/Observer.h
514	include/Poco/OpcomChannel.h
515	include/Poco/Optional.h	520	include/Poco/Optional.h
516	include/Poco/PBKDF2Engine.h	521	include/Poco/PBKDF2Engine.h
517	include/Poco/Path.h	522	include/Poco/Path.h
518	include/Poco/Path_UNIX.h	523	include/Poco/Path_UNIX.h
519	include/Poco/Path_VMS.h
520	include/Poco/Path_WIN32.h	524	include/Poco/Path_WIN32.h
521	include/Poco/Path_WIN32U.h	525	include/Poco/Path_WIN32U.h
522	include/Poco/Path_WINCE.h	526	include/Poco/Path_WINCE.h
Lines 529-535 include/Poco/PipeImpl_WIN32.h Link Here
529	include/Poco/PipeStream.h	533	include/Poco/PipeStream.h
530	include/Poco/Platform.h	534	include/Poco/Platform.h
531	include/Poco/Platform_POSIX.h	535	include/Poco/Platform_POSIX.h
532	include/Poco/Platform_VMS.h
533	include/Poco/Platform_VX.h	536	include/Poco/Platform_VX.h
534	include/Poco/Platform_WIN32.h	537	include/Poco/Platform_WIN32.h
535	include/Poco/Poco.h	538	include/Poco/Poco.h
Lines 540-551 include/Poco/PriorityNotificationQueue.h Link Here
540	include/Poco/PriorityStrategy.h	543	include/Poco/PriorityStrategy.h
541	include/Poco/Process.h	544	include/Poco/Process.h
542	include/Poco/Process_UNIX.h	545	include/Poco/Process_UNIX.h
543	include/Poco/Process_VMS.h
544	include/Poco/Process_VX.h	546	include/Poco/Process_VX.h
545	include/Poco/Process_WIN32.h	547	include/Poco/Process_WIN32.h
546	include/Poco/Process_WIN32U.h	548	include/Poco/Process_WIN32U.h
547	include/Poco/Process_WINCE.h	549	include/Poco/Process_WINCE.h
548	include/Poco/PurgeStrategy.h	550	include/Poco/PurgeStrategy.h
		551	%%REDIS%%include/Poco/Redis/Array.h
		552	%%REDIS%%include/Poco/Redis/AsyncReader.h
		553	%%REDIS%%include/Poco/Redis/Client.h
		554	%%REDIS%%include/Poco/Redis/Command.h
		555	%%REDIS%%include/Poco/Redis/Error.h
		556	%%REDIS%%include/Poco/Redis/Exception.h
		557	%%REDIS%%include/Poco/Redis/PoolableConnectionFactory.h
		558	%%REDIS%%include/Poco/Redis/Redis.h
		559	%%REDIS%%include/Poco/Redis/RedisEventArgs.h
		560	%%REDIS%%include/Poco/Redis/RedisStream.h
		561	%%REDIS%%include/Poco/Redis/Type.h
549	include/Poco/RWLock.h	562	include/Poco/RWLock.h
550	include/Poco/RWLock_Android.h	563	include/Poco/RWLock_Android.h
551	include/Poco/RWLock_POSIX.h	564	include/Poco/RWLock_POSIX.h
Lines 591-597 include/Poco/Semaphore_WIN32.h Link Here
591	include/Poco/SharedLibrary.h	604	include/Poco/SharedLibrary.h
592	include/Poco/SharedLibrary_HPUX.h	605	include/Poco/SharedLibrary_HPUX.h
593	include/Poco/SharedLibrary_UNIX.h	606	include/Poco/SharedLibrary_UNIX.h
594	include/Poco/SharedLibrary_VMS.h
595	include/Poco/SharedLibrary_VX.h	607	include/Poco/SharedLibrary_VX.h
596	include/Poco/SharedLibrary_WIN32.h	608	include/Poco/SharedLibrary_WIN32.h
597	include/Poco/SharedLibrary_WIN32U.h	609	include/Poco/SharedLibrary_WIN32U.h
Lines 703-715 include/Poco/Windows1250Encoding.h Link Here
703	include/Poco/Windows1251Encoding.h	715	include/Poco/Windows1251Encoding.h
704	include/Poco/Windows1252Encoding.h	716	include/Poco/Windows1252Encoding.h
705	include/Poco/WindowsConsoleChannel.h	717	include/Poco/WindowsConsoleChannel.h
		718	include/Poco/XML/Content.h
706	include/Poco/XML/Name.h	719	include/Poco/XML/Name.h
707	include/Poco/XML/NamePool.h	720	include/Poco/XML/NamePool.h
708	include/Poco/XML/NamespaceStrategy.h	721	include/Poco/XML/NamespaceStrategy.h
709	include/Poco/XML/ParserEngine.h	722	include/Poco/XML/ParserEngine.h
		723	include/Poco/XML/QName.h
		724	include/Poco/XML/ValueTraits.h
710	include/Poco/XML/XML.h	725	include/Poco/XML/XML.h
711	include/Poco/XML/XMLException.h	726	include/Poco/XML/XMLException.h
712	include/Poco/XML/XMLStream.h	727	include/Poco/XML/XMLStream.h
		728	include/Poco/XML/XMLStreamParser.h
		729	include/Poco/XML/XMLStreamParserException.h
713	include/Poco/XML/XMLString.h	730	include/Poco/XML/XMLString.h
714	include/Poco/XML/XMLWriter.h	731	include/Poco/XML/XMLWriter.h
715	include/Poco/XML/expat.h	732	include/Poco/XML/expat.h
Lines 793-798 lib/cmake/Poco/PocoZipConfig.cmake Link Here
793	lib/cmake/Poco/PocoZipConfigVersion.cmake	810	lib/cmake/Poco/PocoZipConfigVersion.cmake
794	lib/cmake/Poco/PocoZipTargets.cmake	811	lib/cmake/Poco/PocoZipTargets.cmake
795	lib/cmake/Poco/PocoZipTargets-%%CMAKE_BUILD_TYPE%%.cmake	812	lib/cmake/Poco/PocoZipTargets-%%CMAKE_BUILD_TYPE%%.cmake
		813	%%REDIS%%lib/cmake/Poco/PocoRedisConfig.cmake
		814	%%REDIS%%lib/cmake/Poco/PocoRedisConfigVersion.cmake
		815	%%REDIS%%lib/cmake/Poco/PocoRedisTargets-%%CMAKE_BUILD_TYPE%%.cmake
		816	%%REDIS%%lib/cmake/Poco/PocoRedisTargets.cmake
796	%%SSL%%lib/libPocoCrypto.so	817	%%SSL%%lib/libPocoCrypto.so
797	%%SSL%%lib/libPocoCrypto.so.%%SHLIB_MAJOR%%	818	%%SSL%%lib/libPocoCrypto.so.%%SHLIB_MAJOR%%
798	lib/libPocoData.so	819	lib/libPocoData.so
Lines 819-821 lib/libPocoXML.so Link Here
819	lib/libPocoXML.so.%%SHLIB_MAJOR%%	840	lib/libPocoXML.so.%%SHLIB_MAJOR%%
820	lib/libPocoZip.so	841	lib/libPocoZip.so
821	lib/libPocoZip.so.%%SHLIB_MAJOR%%	842	lib/libPocoZip.so.%%SHLIB_MAJOR%%
		843	%%REDIS%%lib/libPocoRedis.so
		844	%%REDIS%%lib/libPocoRedis.so.%%SHLIB_MAJOR%%

Return to bug 224062

Lines 2-10 Link Here

(-)b/devel/poco/Makefile (-5 / +5 lines)
2	# $FreeBSD: head/devel/poco/Makefile 446500 2017-07-23 17:21:37Z riggs $	2	# $FreeBSD: head/devel/poco/Makefile 446500 2017-07-23 17:21:37Z riggs $
3		3
4	PORTNAME= poco	4	PORTNAME= poco
5	PORTVERSION= 1.7.8	5	PORTVERSION= 1.8.0.1
6	DISTVERSIONSUFFIX= -all	6	DISTVERSIONSUFFIX= -all
7	PORTREVISION= 1
8	CATEGORIES= devel net	7	CATEGORIES= devel net
9	MASTER_SITES= http://pocoproject.org/releases/${PORTNAME}-${PORTVERSION}/	8	MASTER_SITES= http://pocoproject.org/releases/${PORTNAME}-${PORTVERSION}/
10		9
Lines 23-35 USES= cmake localbase pkgconfig Link Here
23	CMAKE_ARGS= -DPOCO_UNBUNDLED:BOOL=ON	22	CMAKE_ARGS= -DPOCO_UNBUNDLED:BOOL=ON
24	USE_LDCONFIG= yes	23	USE_LDCONFIG= yes
25		24
26	SHLIB_MAJOR= 48	25	SHLIB_MAJOR= 50
27	PLIST_SUB= SHLIB_MAJOR=${SHLIB_MAJOR}	26	PLIST_SUB= SHLIB_MAJOR=${SHLIB_MAJOR}
28		27
29	OPTIONS_DEFINE= MYSQL SQLITE SSL TEST	28	OPTIONS_DEFINE= MYSQL REDIS SQLITE SSL TEST
30	OPTIONS_RADIO= ODBC	29	OPTIONS_RADIO= ODBC
31	OPTIONS_RADIO_ODBC= IODBC UNIXODBC	30	OPTIONS_RADIO_ODBC= IODBC UNIXODBC
32	OPTIONS_DEFAULT= MYSQL SQLITE SSL	31	OPTIONS_DEFAULT= MYSQL REDIS SQLITE SSL
33	OPTIONS_SUB= yes	32	OPTIONS_SUB= yes
34		33
35	MYSQL_USES= mysql	34	MYSQL_USES= mysql
Lines 47-52 UNIXODBC_CMAKE_ON= -DODBC_INCLUDE_DIRECTORIES:PATH=${LOCALBASE}/include \ Link Here
47	-DODBC_LIBRARIES:FILEPATH=${LOCALBASE}/lib/libodbc.so	46	-DODBC_LIBRARIES:FILEPATH=${LOCALBASE}/lib/libodbc.so
48	TEST_CMAKE_ON= -DENABLE_TESTS:BOOL=ON	47	TEST_CMAKE_ON= -DENABLE_TESTS:BOOL=ON
49	TEST_IMPLIES= SQLITE	48	TEST_IMPLIES= SQLITE
		49	REDIS_CMAKE_OFF= -DENABLE_REDIS:BOOL=OFF
50		50
51	.include <bsd.port.options.mk>	51	.include <bsd.port.options.mk>
52		52