Date: Tue, 15 Apr 2014 07:34:40 +0000 (UTC) From: Pietro Cerutti <gahr@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351308 - in head/devel/ucommon: . files Message-ID: <201404150734.s3F7Yemd098385@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr Date: Tue Apr 15 07:34:40 2014 New Revision: 351308 URL: http://svnweb.freebsd.org/changeset/ports/351308 QAT: https://qat.redports.org/buildarchive/r351308/ Log: - Update to 6.1.1 Changes: * module flag support for older commoncpp packages * fix for commoncpp pc file * some additional original classes mapped to commoncpp * default Semaphore constructor now valid special case Added: head/devel/ucommon/files/patch-inc-commoncpp_config.h (contents, props changed) head/devel/ucommon/files/patch-inc-ucommon_string.h (contents, props changed) Modified: head/devel/ucommon/Makefile head/devel/ucommon/distinfo head/devel/ucommon/files/patch-ucommon.pc.in head/devel/ucommon/pkg-plist Modified: head/devel/ucommon/Makefile ============================================================================== --- head/devel/ucommon/Makefile Tue Apr 15 07:23:58 2014 (r351307) +++ head/devel/ucommon/Makefile Tue Apr 15 07:34:40 2014 (r351308) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= ucommon -PORTVERSION= 6.1.0 +PORTVERSION= 6.1.1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= commoncpp Modified: head/devel/ucommon/distinfo ============================================================================== --- head/devel/ucommon/distinfo Tue Apr 15 07:23:58 2014 (r351307) +++ head/devel/ucommon/distinfo Tue Apr 15 07:34:40 2014 (r351308) @@ -1,2 +1,2 @@ -SHA256 (ucommon-6.1.0.tar.gz) = 0b1695898d7bf5bfcc0fbffdba9cdc39d2a085359b08312756ce06fec4bdb0dd -SIZE (ucommon-6.1.0.tar.gz) = 826742 +SHA256 (ucommon-6.1.1.tar.gz) = a6dde609c2b9ec08343dce47d2e8895b3b7e54700bc31d715d98bb62f6c55b90 +SIZE (ucommon-6.1.1.tar.gz) = 829129 Added: head/devel/ucommon/files/patch-inc-commoncpp_config.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ucommon/files/patch-inc-commoncpp_config.h Tue Apr 15 07:34:40 2014 (r351308) @@ -0,0 +1,20 @@ +--- inc/commoncpp/config.h.orig 2014-04-14 16:50:21.000000000 +0200 ++++ inc/commoncpp/config.h 2014-04-14 17:02:39.000000000 +0200 +@@ -50,7 +50,7 @@ + * @param string2 to compare. + * @return 0 if equal, > 0 if s2 > s1, < 0 if s2 < s1. + */ +-extern "C" inline int stricmp(const char *string1, const char *string2) ++inline int stricmp(const char *string1, const char *string2) + {return ucommon::String::case_compare(string1, string2);} + + /** +@@ -60,7 +60,7 @@ + * @param max size of string to compare. + * @return 0 if equal, > 0 if s2 > s1, < 0 if s2 < s1. + */ +-extern "C" inline int strnicmp(const char *string1, const char *string2, size_t max) ++inline int strnicmp(const char *string1, const char *string2, size_t max) + {return ucommon::String::case_compare(string1, string2, max);} + + #endif Added: head/devel/ucommon/files/patch-inc-ucommon_string.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ucommon/files/patch-inc-ucommon_string.h Tue Apr 15 07:34:40 2014 (r351308) @@ -0,0 +1,20 @@ +--- inc/ucommon/string.h.orig 2014-04-14 17:03:00.000000000 +0200 ++++ inc/ucommon/string.h 2014-04-14 17:03:09.000000000 +0200 +@@ -1627,7 +1627,7 @@ + * @param string2 to compare. + * @return 0 if equal, > 0 if s2 > s1, < 0 if s2 < s1. + */ +-extern "C" inline int stricmp(const char *string1, const char *string2) ++inline int stricmp(const char *string1, const char *string2) + {return String::case_compare(string1, string2);} + + /** +@@ -1637,7 +1637,7 @@ + * @param max size of string to compare. + * @return 0 if equal, > 0 if s2 > s1, < 0 if s2 < s1. + */ +-extern "C" inline int strnicmp(const char *string1, const char *string2, size_t max) ++inline int strnicmp(const char *string1, const char *string2, size_t max) + {return String::case_compare(string1, string2, max);} + + #endif Modified: head/devel/ucommon/files/patch-ucommon.pc.in ============================================================================== --- head/devel/ucommon/files/patch-ucommon.pc.in Tue Apr 15 07:23:58 2014 (r351307) +++ head/devel/ucommon/files/patch-ucommon.pc.in Tue Apr 15 07:34:40 2014 (r351308) @@ -1,9 +1,9 @@ ---- ucommon.pc.in.orig 2011-03-21 13:02:55.000000000 +0100 -+++ ucommon.pc.in 2011-03-21 13:03:05.000000000 +0100 -@@ -5,5 +5,5 @@ +--- ucommon.pc.in.orig 2014-01-28 20:43:53.000000000 +0100 ++++ ucommon.pc.in 2014-04-14 16:47:29.000000000 +0200 +@@ -6,5 +6,5 @@ Name: ucommon Description: GNU uCommon C++ class framework Version: @VERSION@ --Libs: -lusecure -lucommon @SECURE_LIBS@ @UCOMMON_LINKED@ +-Libs: -lusecure -lucommon @SECURE_LIBS@ @UCOMMON_LINKED@ +Libs: -lusecure -lucommon -lpthread @SECURE_LIBS@ @UCOMMON_LINKED@ - Cflags: @UCOMMON_FLAGS@ + Cflags: @UCOMMON_FLAGS@ Modified: head/devel/ucommon/pkg-plist ============================================================================== --- head/devel/ucommon/pkg-plist Tue Apr 15 07:23:58 2014 (r351307) +++ head/devel/ucommon/pkg-plist Tue Apr 15 07:34:40 2014 (r351308) @@ -17,6 +17,7 @@ include/commoncpp/exception.h include/commoncpp/export.h include/commoncpp/file.h include/commoncpp/mime.h +include/commoncpp/misc.h include/commoncpp/numbers.h include/commoncpp/object.h include/commoncpp/pointer.h @@ -65,13 +66,13 @@ include/ucommon/vector.h include/ucommon/xml.h lib/libcommoncpp.so lib/libcommoncpp.so.6 -lib/libcommoncpp.so.6.1.0 +lib/libcommoncpp.so.6.1.1 lib/libucommon.so lib/libucommon.so.6 -lib/libucommon.so.6.1.0 +lib/libucommon.so.6.1.1 lib/libusecure.so lib/libusecure.so.6 -lib/libusecure.so.6.1.0 +lib/libusecure.so.6.1.1 libdata/pkgconfig/commoncpp.pc libdata/pkgconfig/ucommon.pc man/man1/args.1.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404150734.s3F7Yemd098385>