Attachment #150482 for bug #194441

Lines 2-8 Link Here

(-)b/devel/poco-devel/Makefile (-2 / +8 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= poco	4	PORTNAME= poco
5	PORTVERSION= 1.5.3	5	PORTVERSION= 1.5.4
6	CATEGORIES= devel net	6	CATEGORIES= devel net
7	MASTER_SITES= https://codeload.github.com/pocoproject/poco/legacy.tar.gz/poco-${PORTVERSION}-release?dummy=/	7	MASTER_SITES= https://codeload.github.com/pocoproject/poco/legacy.tar.gz/poco-${PORTVERSION}-release?dummy=/
8	PKGNAMESUFFIX= -devel	8	PKGNAMESUFFIX= -devel
Lines 33-39 MAKE_JOBS_UNSAFE=true Link Here
33		33
34	LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre \	34	LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre \
35	libexpat.so:${PORTSDIR}/textproc/expat2	35	libexpat.so:${PORTSDIR}/textproc/expat2
36	WRKSRC= ${WRKDIR}/pocoproject-poco-23760af	36	WRKSRC= ${WRKDIR}/pocoproject-poco-a64ebba
37	MAKE_ARGS= CXX=c++ CC=cc POCO_ODBC_LIB=${LOCALBASE}/lib	37	MAKE_ARGS= CXX=c++ CC=cc POCO_ODBC_LIB=${LOCALBASE}/lib
38		38
39	.include <bsd.port.options.mk>	39	.include <bsd.port.options.mk>
Lines 70-73 USE_LDCONFIG= yes Link Here
70	post-patch:	70	post-patch:
71	@${REINPLACE_CMD} -e "s/ =/ ?=/g" ${WRKSRC}/build/config/FreeBSD	71	@${REINPLACE_CMD} -e "s/ =/ ?=/g" ${WRKSRC}/build/config/FreeBSD
72		72
		73	post-install:
		74	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cpspcd
		75	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/f2cpspd
		76	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/f2cpspd
		77	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/d.so.
		78
73	.include <bsd.port.mk>	79	.include <bsd.port.mk>

Lines 1-2 Link Here

(-)b/devel/poco-devel/distinfo (-2 / +2 lines)
1	SHA256 (poco-1.5.3.tar.gz) = 50bfafb7984b4cd226b4bf5f02fd302da7354e017549aee2347d65ac834f253b	1	SHA256 (poco-1.5.4.tar.gz) = 8f8ff6d8392217f5e622bbb096e78c6d4f84d996196e9bc2edfc38064bcf9688
2	SIZE (poco-1.5.3.tar.gz) = 7016903	2	SIZE (poco-1.5.4.tar.gz) = 7485330

Added Link Here

(-)b/devel/poco-devel/files/patch-Foundation-Makefile (+10 lines)
1	--- Foundation/Makefile.orig 2014-10-16 05:16:40.000000000 -0700
2	+++ Foundation/Makefile 2014-10-17 15:28:45.000000000 -0700
3	@@ -46,6 +46,7 @@
4
5	ifdef POCO_UNBUNDLED
6	SYSLIBS += -lpcre -lz
7	+ objects += $(pcre_utf8_objects) # unicode.cpp uses internal pcre tables
8	else
9	objects += $(zlib_objects) $(pcre_objects) $(pcre_utf8_objects)
10	endif




--- 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
@@ -34,7 +34,7 @@
 extern "C"
 {
 	struct real_pcre8_or_16;                 /* declaration; the definition is private  */
-	typedef struct real_pcre8_or_16 pcre;
+	typedef struct real_pcre pcre;
 	struct pcre_extra;
 }
 
 ifdef POCO_UNBUNDLED
 	SYSLIBS += -lpcre -lz
+	objects += $(pcre_utf8_objects) # unicode.cpp uses internal pcre tables
 else
 	objects += $(zlib_objects) $(pcre_objects) $(pcre_utf8_objects)
 endif
diff -ur Foundation/src/pcre_internal.h Foundation/src/pcre_internal.h
--- Foundation/src/pcre_internal.h	2014-04-02 01:13:57.000000000 -0700
+++ Foundation/src/pcre_internal.h	2014-04-08 07:38:07.000000000 -0700
@@ -1109,6 +1109,16 @@
 } ucp_type_table;
 
 
+/* renamed to avoid clashes with system pcre */
+#define _pcre_utf8_table1      _poco__pcre_utf8_table1
+#define _pcre_utf8_table1_size _poco__pcre_utf8_table1_size
+#define _pcre_utf8_table2      _poco__pcre_utf8_table2
+#define _pcre_utf8_table3      _poco__pcre_utf8_table3
+#define _pcre_utf8_table4      _poco__pcre_utf8_table4
+#define _pcre_utt              _poco__pcre_utt
+#define _pcre_utt_size         _poco__pcre_utt_size
+#define _pcre_utt_names        _poco__pcre_utt_names
+#define _pcre_OP_lengths       _poco__pcre_OP_lengths
 /* 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
@@ -1153,6 +1163,11 @@
   pcre_int32 other_case;
 } ucd_record;
 
+/* renamed to avoid clashes with system pcre */
+#define _pcre_ucd_records _poco__pcre_ucd_records
+#define _pcre_ucd_stage1 _poco__pcre_ucd_stage1
+#define _pcre_ucd_stage2 _poco__pcre_ucd_stage2
+#define _pcre_ucp_gentype _poco__pcre_ucp_gentype
 extern const ucd_record  _pcre_ucd_records[];
 extern const uschar      _pcre_ucd_stage1[];
 extern const pcre_uint16 _pcre_ucd_stage2[];




--- 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 @@
 } ucp_type_table;
 
 
+/* renamed to avoid clashes with system pcre */
+#define _pcre_utf8_table1      _poco__pcre_utf8_table1
+#define _pcre_utf8_table1_size _poco__pcre_utf8_table1_size
+#define _pcre_utf8_table2      _poco__pcre_utf8_table2
+#define _pcre_utf8_table3      _poco__pcre_utf8_table3
+#define _pcre_utf8_table4      _poco__pcre_utf8_table4
+#define _pcre_utt              _poco__pcre_utt
+#define _pcre_utt_size         _poco__pcre_utt_size
+#define _pcre_utt_names        _poco__pcre_utt_names
+#define _pcre_OP_lengths       _poco__pcre_OP_lengths
 /* 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 @@
   pcre_int32 other_case; /* offset to other case, or zero if none */
 } ucd_record;
 
+/* renamed to avoid clashes with system pcre */
+#define _pcre_ucd_records _poco__pcre_ucd_records
+#define _pcre_ucd_stage1 _poco__pcre_ucd_stage1
+#define _pcre_ucd_stage2 _poco__pcre_ucd_stage2
+#define _pcre_ucp_gentype _poco__pcre_ucp_gentype
 extern const pcre_uint32 PRIV(ucd_caseless_sets)[];
 extern const ucd_record  PRIV(ucd_records)[];
 extern const pcre_uint8  PRIV(ucd_stage1)[];




include/Poco/Net/NTPEventArgs.h
include/Poco/Net/NTPPacket.h
include/Poco/PBKDF2Engine.h
lib/libPocoFoundationd.so.24
lib/libPocoFoundation.so.24
lib/libPocoFoundationd.so
lib/libPocoFoundation.so
lib/libPocoXMLd.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/libPocoJSON.so
lib/libPocoJSONd.so
lib/libPocoCryptod.so.24
lib/libPocoCrypto.so.24
lib/libPocoCrypto.so
lib/libPocoCryptod.so
lib/libPocoNetSSLd.so.24
lib/libPocoNetSSL.so.24
lib/libPocoNetSSLd.so
lib/libPocoNetSSL.so
lib/libPocoDatad.so.24
lib/libPocoData.so.24
lib/libPocoDatad.so
lib/libPocoData.so
lib/libPocoDataSQLited.so.24
lib/libPocoDataSQLited.so
lib/libPocoDataSQLite.so.24
lib/libPocoDataSQLite.so
lib/libPocoDataODBCd.so.24
lib/libPocoDataODBCd.so
lib/libPocoDataODBC.so.24
lib/libPocoDataODBC.so
lib/libPocoDataMySQLd.so.24
lib/libPocoDataMySQLd.so
lib/libPocoDataMySQL.so.24
lib/libPocoDataMySQL.so
lib/libPocoMongoDBd.so.24
lib/libPocoMongoDBd.so
lib/libPocoMongoDB.so.24
lib/libPocoMongoDB.so
lib/libPocoZipd.so.24
lib/libPocoZipd.so
lib/libPocoZip.so.24
lib/libPocoZip.so
lib/libPocoCppParserd.so.24
lib/libPocoCppParserd.so
lib/libPocoCppParser.so.24
lib/libPocoCppParser.so
lib/libPocoPDFd.so.24
lib/libPocoPDFd.so
lib/libPocoPDF.so.24
lib/libPocoPDF.so

Return to bug 194441

Lines 808-815 include/Poco/Net/NTPClient.h Link Here

(-)b/devel/poco-devel/pkg-plist (-30 / +30 lines)
808	include/Poco/Net/NTPEventArgs.h	808	include/Poco/Net/NTPEventArgs.h
809	include/Poco/Net/NTPPacket.h	809	include/Poco/Net/NTPPacket.h
810	include/Poco/PBKDF2Engine.h	810	include/Poco/PBKDF2Engine.h
811	lib/libPocoFoundationd.so.23	811	lib/libPocoFoundationd.so.24
812	lib/libPocoFoundation.so.23	812	lib/libPocoFoundation.so.24
813	lib/libPocoFoundationd.so	813	lib/libPocoFoundationd.so
814	lib/libPocoFoundation.so	814	lib/libPocoFoundation.so
815	lib/libPocoXMLd.so	815	lib/libPocoXMLd.so
Lines 818-870 lib/libPocoUtild.so Link Here
818	lib/libPocoUtil.so	818	lib/libPocoUtil.so
819	lib/libPocoNetd.so	819	lib/libPocoNetd.so
820	lib/libPocoNet.so	820	lib/libPocoNet.so
821	lib/libPocoXMLd.so.23	821	lib/libPocoXMLd.so.24
822	lib/libPocoXML.so.23	822	lib/libPocoXML.so.24
823	lib/libPocoUtild.so.23	823	lib/libPocoUtild.so.24
824	lib/libPocoUtil.so.23	824	lib/libPocoUtil.so.24
825	lib/libPocoNetd.so.23	825	lib/libPocoNetd.so.24
826	lib/libPocoNet.so.23	826	lib/libPocoNet.so.24
827	lib/libPocoJSONd.so.23	827	lib/libPocoJSONd.so.24
828	lib/libPocoJSON.so.23	828	lib/libPocoJSON.so.24
829	lib/libPocoJSON.so	829	lib/libPocoJSON.so
830	lib/libPocoJSONd.so	830	lib/libPocoJSONd.so
831	lib/libPocoCryptod.so.23	831	lib/libPocoCryptod.so.24
832	lib/libPocoCrypto.so.23	832	lib/libPocoCrypto.so.24
833	lib/libPocoCrypto.so	833	lib/libPocoCrypto.so
834	lib/libPocoCryptod.so	834	lib/libPocoCryptod.so
835	lib/libPocoNetSSLd.so.23	835	lib/libPocoNetSSLd.so.24
836	lib/libPocoNetSSL.so.23	836	lib/libPocoNetSSL.so.24
837	lib/libPocoNetSSLd.so	837	lib/libPocoNetSSLd.so
838	lib/libPocoNetSSL.so	838	lib/libPocoNetSSL.so
839	lib/libPocoDatad.so.23	839	lib/libPocoDatad.so.24
840	lib/libPocoData.so.23	840	lib/libPocoData.so.24
841	lib/libPocoDatad.so	841	lib/libPocoDatad.so
842	lib/libPocoData.so	842	lib/libPocoData.so
843	lib/libPocoDataSQLited.so.23	843	lib/libPocoDataSQLited.so.24
844	lib/libPocoDataSQLited.so	844	lib/libPocoDataSQLited.so
845	lib/libPocoDataSQLite.so.23	845	lib/libPocoDataSQLite.so.24
846	lib/libPocoDataSQLite.so	846	lib/libPocoDataSQLite.so
847	lib/libPocoDataODBCd.so.23	847	lib/libPocoDataODBCd.so.24
848	lib/libPocoDataODBCd.so	848	lib/libPocoDataODBCd.so
849	lib/libPocoDataODBC.so.23	849	lib/libPocoDataODBC.so.24
850	lib/libPocoDataODBC.so	850	lib/libPocoDataODBC.so
851	lib/libPocoDataMySQLd.so.23	851	lib/libPocoDataMySQLd.so.24
852	lib/libPocoDataMySQLd.so	852	lib/libPocoDataMySQLd.so
853	lib/libPocoDataMySQL.so.23	853	lib/libPocoDataMySQL.so.24
854	lib/libPocoDataMySQL.so	854	lib/libPocoDataMySQL.so
855	lib/libPocoMongoDBd.so.23	855	lib/libPocoMongoDBd.so.24
856	lib/libPocoMongoDBd.so	856	lib/libPocoMongoDBd.so
857	lib/libPocoMongoDB.so.23	857	lib/libPocoMongoDB.so.24
858	lib/libPocoMongoDB.so	858	lib/libPocoMongoDB.so
859	lib/libPocoZipd.so.23	859	lib/libPocoZipd.so.24
860	lib/libPocoZipd.so	860	lib/libPocoZipd.so
861	lib/libPocoZip.so.23	861	lib/libPocoZip.so.24
862	lib/libPocoZip.so	862	lib/libPocoZip.so
863	lib/libPocoCppParserd.so.23	863	lib/libPocoCppParserd.so.24
864	lib/libPocoCppParserd.so	864	lib/libPocoCppParserd.so
865	lib/libPocoCppParser.so.23	865	lib/libPocoCppParser.so.24
866	lib/libPocoCppParser.so	866	lib/libPocoCppParser.so
867	lib/libPocoPDFd.so.23	867	lib/libPocoPDFd.so.24
868	lib/libPocoPDFd.so	868	lib/libPocoPDFd.so
869	lib/libPocoPDF.so.23	869	lib/libPocoPDF.so.24
870	lib/libPocoPDF.so	870	lib/libPocoPDF.so

Lines 1-43 Link Here

(-)b/devel/poco-devel/files/patch-pcre (-42 / +10 lines)
1	diff -ur Foundation/Makefile Foundation/Makefile	1	--- Foundation/include/Poco/RegularExpression.h.orig 2014-10-17 13:48:55.000000000 -0700
2	--- Foundation/Makefile 2014-04-02 01:13:57.000000000 -0700	2	+++ Foundation/include/Poco/RegularExpression.h 2014-10-17 13:49:30.000000000 -0700
3	+++ Foundation/Makefile 2014-04-08 07:38:07.000000000 -0700	3	@@ -34,7 +34,7 @@
4	@@ -44,6 +44,7 @@	4	extern "C"
		5	{
		6	struct real_pcre8_or_16; /* declaration; the definition is private */
		7	- typedef struct real_pcre8_or_16 pcre;
		8	+ typedef struct real_pcre pcre;
		9	struct pcre_extra;
		10	}
5		11
6	ifdef POCO_UNBUNDLED
7	SYSLIBS += -lpcre -lz
8	+ objects += $(pcre_utf8_objects) # unicode.cpp uses internal pcre tables
9	else
10	objects += $(zlib_objects) $(pcre_objects) $(pcre_utf8_objects)
11	endif
12	diff -ur Foundation/src/pcre_internal.h Foundation/src/pcre_internal.h
13	--- Foundation/src/pcre_internal.h 2014-04-02 01:13:57.000000000 -0700
14	+++ Foundation/src/pcre_internal.h 2014-04-08 07:38:07.000000000 -0700
15	@@ -1109,6 +1109,16 @@
16	} ucp_type_table;
17
18
19	+/* renamed to avoid clashes with system pcre */
20	+#define _pcre_utf8_table1 _poco__pcre_utf8_table1
21	+#define _pcre_utf8_table1_size _poco__pcre_utf8_table1_size
22	+#define _pcre_utf8_table2 _poco__pcre_utf8_table2
23	+#define _pcre_utf8_table3 _poco__pcre_utf8_table3
24	+#define _pcre_utf8_table4 _poco__pcre_utf8_table4
25	+#define _pcre_utt _poco__pcre_utt
26	+#define _pcre_utt_size _poco__pcre_utt_size
27	+#define _pcre_utt_names _poco__pcre_utt_names
28	+#define _pcre_OP_lengths _poco__pcre_OP_lengths
29	/* Internal shared data tables. These are tables that are used by more than one
30	of the exported public functions. They have to be "external" in the C sense,
31	but are not part of the PCRE public API. The data for these tables is in the
32	@@ -1153,6 +1163,11 @@
33	pcre_int32 other_case;
34	} ucd_record;
35
36	+/* renamed to avoid clashes with system pcre */
37	+#define _pcre_ucd_records _poco__pcre_ucd_records
38	+#define _pcre_ucd_stage1 _poco__pcre_ucd_stage1
39	+#define _pcre_ucd_stage2 _poco__pcre_ucd_stage2
40	+#define _pcre_ucp_gentype _poco__pcre_ucp_gentype
41	extern const ucd_record _pcre_ucd_records[];
42	extern const uschar _pcre_ucd_stage1[];
43	extern const pcre_uint16 _pcre_ucd_stage2[];

Added Link Here

(-)b/devel/poco-devel/files/patch-pcre_internal.h (+31 lines)
1	--- Foundation/src/pcre_internal.h.orig 2014-10-16 05:16:40.000000000 -0700
2	+++ Foundation/src/pcre_internal.h 2014-10-17 13:20:20.000000000 -0700
3	@@ -2636,6 +2636,16 @@
4	} ucp_type_table;
5
6
7	+/* renamed to avoid clashes with system pcre */
8	+#define _pcre_utf8_table1 _poco__pcre_utf8_table1
9	+#define _pcre_utf8_table1_size _poco__pcre_utf8_table1_size
10	+#define _pcre_utf8_table2 _poco__pcre_utf8_table2
11	+#define _pcre_utf8_table3 _poco__pcre_utf8_table3
12	+#define _pcre_utf8_table4 _poco__pcre_utf8_table4
13	+#define _pcre_utt _poco__pcre_utt
14	+#define _pcre_utt_size _poco__pcre_utt_size
15	+#define _pcre_utt_names _poco__pcre_utt_names
16	+#define _pcre_OP_lengths _poco__pcre_OP_lengths
17	/* Internal shared data tables. These are tables that are used by more than one
18	of the exported public functions. They have to be "external" in the C sense,
19	but are not part of the PCRE public API. The data for these tables is in the
20	@@ -2749,6 +2759,11 @@
21	pcre_int32 other_case; /* offset to other case, or zero if none */
22	} ucd_record;
23
24	+/* renamed to avoid clashes with system pcre */
25	+#define _pcre_ucd_records _poco__pcre_ucd_records
26	+#define _pcre_ucd_stage1 _poco__pcre_ucd_stage1
27	+#define _pcre_ucd_stage2 _poco__pcre_ucd_stage2
28	+#define _pcre_ucp_gentype _poco__pcre_ucp_gentype
29	extern const pcre_uint32 PRIV(ucd_caseless_sets)[];
30	extern const ucd_record PRIV(ucd_records)[];
31	extern const pcre_uint8 PRIV(ucd_stage1)[];