svn commit: r374839 - in head/devel/poco-devel: . files
Bartek Rutkowski
robak at FreeBSD.org
Wed Dec 17 11:23:17 UTC 2014
Author: robak
Date: Wed Dec 17 11:23:14 2014
New Revision: 374839
URL: https://svnweb.freebsd.org/changeset/ports/374839
QAT: https://qat.redports.org/buildarchive/r374839/
Log:
devel/poco-devel: update 1.5.3 -> 1.5.4
PR: 194441
Submitted by: Joseph Benden <joe at thrallingpenguin.com>
Added:
head/devel/poco-devel/files/patch-Foundation-Makefile (contents, props changed)
head/devel/poco-devel/files/patch-pcre_internal.h (contents, props changed)
Modified:
head/devel/poco-devel/Makefile
head/devel/poco-devel/distinfo
head/devel/poco-devel/files/patch-pcre
head/devel/poco-devel/pkg-plist
Modified: head/devel/poco-devel/Makefile
==============================================================================
--- head/devel/poco-devel/Makefile Wed Dec 17 11:15:13 2014 (r374838)
+++ head/devel/poco-devel/Makefile Wed Dec 17 11:23:14 2014 (r374839)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= poco
-PORTVERSION= 1.5.3
+PORTVERSION= 1.5.4
CATEGORIES= devel net
MASTER_SITES= https://codeload.github.com/pocoproject/poco/legacy.tar.gz/poco-${PORTVERSION}-release?dummy=/
PKGNAMESUFFIX= -devel
@@ -33,7 +33,7 @@ MAKE_JOBS_UNSAFE=true
LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre \
libexpat.so:${PORTSDIR}/textproc/expat2
-WRKSRC= ${WRKDIR}/pocoproject-poco-23760af
+WRKSRC= ${WRKDIR}/pocoproject-poco-a64ebba
MAKE_ARGS= CXX=c++ CC=cc POCO_ODBC_LIB=${LOCALBASE}/lib
.include <bsd.port.options.mk>
@@ -70,4 +70,10 @@ USE_LDCONFIG= yes
post-patch:
@${REINPLACE_CMD} -e "s/ =/ ?=/g" ${WRKSRC}/build/config/FreeBSD
+post-install:
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cpspcd
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/f2cpspd
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/f2cpspd
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*d.so.*
+
.include <bsd.port.mk>
Modified: head/devel/poco-devel/distinfo
==============================================================================
--- head/devel/poco-devel/distinfo Wed Dec 17 11:15:13 2014 (r374838)
+++ head/devel/poco-devel/distinfo Wed Dec 17 11:23:14 2014 (r374839)
@@ -1,2 +1,2 @@
-SHA256 (poco-1.5.3.tar.gz) = 50bfafb7984b4cd226b4bf5f02fd302da7354e017549aee2347d65ac834f253b
-SIZE (poco-1.5.3.tar.gz) = 7016903
+SHA256 (poco-1.5.4.tar.gz) = 8f8ff6d8392217f5e622bbb096e78c6d4f84d996196e9bc2edfc38064bcf9688
+SIZE (poco-1.5.4.tar.gz) = 7485330
Added: head/devel/poco-devel/files/patch-Foundation-Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/poco-devel/files/patch-Foundation-Makefile Wed Dec 17 11:23:14 2014 (r374839)
@@ -0,0 +1,10 @@
+--- 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 @@
+
+ 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
Modified: head/devel/poco-devel/files/patch-pcre
==============================================================================
--- head/devel/poco-devel/files/patch-pcre Wed Dec 17 11:15:13 2014 (r374838)
+++ head/devel/poco-devel/files/patch-pcre Wed Dec 17 11:23:14 2014 (r374839)
@@ -1,43 +1,11 @@
-diff -ur Foundation/Makefile Foundation/Makefile
---- Foundation/Makefile 2014-04-02 01:13:57.000000000 -0700
-+++ Foundation/Makefile 2014-04-08 07:38:07.000000000 -0700
-@@ -44,6 +44,7 @@
+--- 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[];
Added: head/devel/poco-devel/files/patch-pcre_internal.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/poco-devel/files/patch-pcre_internal.h Wed Dec 17 11:23:14 2014 (r374839)
@@ -0,0 +1,31 @@
+--- 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)[];
Modified: head/devel/poco-devel/pkg-plist
==============================================================================
--- head/devel/poco-devel/pkg-plist Wed Dec 17 11:15:13 2014 (r374838)
+++ head/devel/poco-devel/pkg-plist Wed Dec 17 11:23:14 2014 (r374839)
@@ -808,8 +808,8 @@ include/Poco/Net/NTPClient.h
include/Poco/Net/NTPEventArgs.h
include/Poco/Net/NTPPacket.h
include/Poco/PBKDF2Engine.h
-lib/libPocoFoundationd.so.23
-lib/libPocoFoundation.so.23
+lib/libPocoFoundationd.so.24
+lib/libPocoFoundation.so.24
lib/libPocoFoundationd.so
lib/libPocoFoundation.so
lib/libPocoXMLd.so
@@ -818,53 +818,53 @@ lib/libPocoUtild.so
lib/libPocoUtil.so
lib/libPocoNetd.so
lib/libPocoNet.so
-lib/libPocoXMLd.so.23
-lib/libPocoXML.so.23
-lib/libPocoUtild.so.23
-lib/libPocoUtil.so.23
-lib/libPocoNetd.so.23
-lib/libPocoNet.so.23
-lib/libPocoJSONd.so.23
-lib/libPocoJSON.so.23
+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.23
-lib/libPocoCrypto.so.23
+lib/libPocoCryptod.so.24
+lib/libPocoCrypto.so.24
lib/libPocoCrypto.so
lib/libPocoCryptod.so
-lib/libPocoNetSSLd.so.23
-lib/libPocoNetSSL.so.23
+lib/libPocoNetSSLd.so.24
+lib/libPocoNetSSL.so.24
lib/libPocoNetSSLd.so
lib/libPocoNetSSL.so
-lib/libPocoDatad.so.23
-lib/libPocoData.so.23
+lib/libPocoDatad.so.24
+lib/libPocoData.so.24
lib/libPocoDatad.so
lib/libPocoData.so
-lib/libPocoDataSQLited.so.23
+lib/libPocoDataSQLited.so.24
lib/libPocoDataSQLited.so
-lib/libPocoDataSQLite.so.23
+lib/libPocoDataSQLite.so.24
lib/libPocoDataSQLite.so
-lib/libPocoDataODBCd.so.23
+lib/libPocoDataODBCd.so.24
lib/libPocoDataODBCd.so
-lib/libPocoDataODBC.so.23
+lib/libPocoDataODBC.so.24
lib/libPocoDataODBC.so
-lib/libPocoDataMySQLd.so.23
+lib/libPocoDataMySQLd.so.24
lib/libPocoDataMySQLd.so
-lib/libPocoDataMySQL.so.23
+lib/libPocoDataMySQL.so.24
lib/libPocoDataMySQL.so
-lib/libPocoMongoDBd.so.23
+lib/libPocoMongoDBd.so.24
lib/libPocoMongoDBd.so
-lib/libPocoMongoDB.so.23
+lib/libPocoMongoDB.so.24
lib/libPocoMongoDB.so
-lib/libPocoZipd.so.23
+lib/libPocoZipd.so.24
lib/libPocoZipd.so
-lib/libPocoZip.so.23
+lib/libPocoZip.so.24
lib/libPocoZip.so
-lib/libPocoCppParserd.so.23
+lib/libPocoCppParserd.so.24
lib/libPocoCppParserd.so
-lib/libPocoCppParser.so.23
+lib/libPocoCppParser.so.24
lib/libPocoCppParser.so
-lib/libPocoPDFd.so.23
+lib/libPocoPDFd.so.24
lib/libPocoPDFd.so
-lib/libPocoPDF.so.23
+lib/libPocoPDF.so.24
lib/libPocoPDF.so
More information about the svn-ports-head
mailing list