From owner-svn-ports-head@FreeBSD.ORG Mon Sep 16 16:37:01 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 10487941; Mon, 16 Sep 2013 16:37:01 +0000 (UTC) (envelope-from gahr@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id F09F42AB0; Mon, 16 Sep 2013 16:37:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8GGb069072465; Mon, 16 Sep 2013 16:37:00 GMT (envelope-from gahr@svn.freebsd.org) Received: (from gahr@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8GGaxPj072442; Mon, 16 Sep 2013 16:36:59 GMT (envelope-from gahr@svn.freebsd.org) Message-Id: <201309161636.r8GGaxPj072442@svn.freebsd.org> From: Pietro Cerutti Date: Mon, 16 Sep 2013 16:36:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r327413 - in head/devel/ucommon: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Sep 2013 16:37:01 -0000 Author: gahr Date: Mon Sep 16 16:36:59 2013 New Revision: 327413 URL: http://svnweb.freebsd.org/changeset/ports/327413 Log: - Update to 6.0.7 - Fix build with libc++ [1] - Switch build type to CMake Change log: from ucommon 6.0.6 to 6.0.7 - error state in fsys open fixed - fsys error reset inline added from ucommon 6.0.5 to 6.0.6 - small cleanup of useless validator assignments - fix gnutls casting and warnings - modernized automake support from ucommon 6.0.4 to 6.0.5 - additional constructors to pass pre-allocated memory from ucommon 6.0.3 to 6.0.4 - fix for address list comparison issue Reported by: pkg-fallout [1] Added: head/devel/ucommon/files/patch-CMakeLists.txt (contents, props changed) head/devel/ucommon/files/patch-commoncpp_address.cpp (contents, props changed) Modified: head/devel/ucommon/Makefile head/devel/ucommon/distinfo head/devel/ucommon/pkg-plist Modified: head/devel/ucommon/Makefile ============================================================================== --- head/devel/ucommon/Makefile Mon Sep 16 16:34:10 2013 (r327412) +++ head/devel/ucommon/Makefile Mon Sep 16 16:36:59 2013 (r327413) @@ -2,34 +2,27 @@ # $FreeBSD$ PORTNAME= ucommon -PORTVERSION= 6.0.3 +PORTVERSION= 6.0.7 CATEGORIES= devel -MASTER_SITES= http://www.gnutelephony.org/dist/tarballs/ \ - http://www.da3m0n8t3r.com/gnutelephony/www.gnutelephony.org/dist/tarballs/ +MASTER_SITES= ${MASTER_SITE_GNU} +MASTER_SITE_SUBDIR= commoncpp MAINTAINER= gahr@FreeBSD.org COMMENT= Very lightweight C++ design pattern library LICENSE= LGPL3 -USES= pathfix pkgconfig +USES= pathfix pkgconfig cmake:outsource +CMAKE_ARGS+= -DBUILD_TESTING:BOOL=ON \ + -DINSTALL_BINDIR:STRING=bin/${PORTNAME} USE_LDCONFIG= yes -GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--bindir=${PREFIX}/bin/${PORTNAME} MAN1= args.1 car.1 commoncpp-config.1 mdsum.1 pdetach.1 \ scrub-files.1 sockaddr.1 ucommon-config.1 zerofill.1 .include -.if ${OSVERSION} < 1000000 -post-patch: - ${REINPLACE_CMD} -e '/HAVE_OPENSSL_FIPS_H/s/define/undef/' \ - ${WRKSRC}/${CONFIGURE_SCRIPT} - -.endif - regression-test: build - cd ${WRKSRC}/test && ${MAKE} check + cd ${BUILD_WRKSRC}/test && ${MAKE} test .include Modified: head/devel/ucommon/distinfo ============================================================================== --- head/devel/ucommon/distinfo Mon Sep 16 16:34:10 2013 (r327412) +++ head/devel/ucommon/distinfo Mon Sep 16 16:36:59 2013 (r327413) @@ -1,2 +1,2 @@ -SHA256 (ucommon-6.0.3.tar.gz) = 228f3a0fa78173e9fa43e154250a7ed4f1e5be720a81fd2768506c088190c432 -SIZE (ucommon-6.0.3.tar.gz) = 806841 +SHA256 (ucommon-6.0.7.tar.gz) = 7d5cc5385c4d04e092c4e159522bc42d44cc0105fb499c0e960863f32a649be6 +SIZE (ucommon-6.0.7.tar.gz) = 826102 Added: head/devel/ucommon/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ucommon/files/patch-CMakeLists.txt Mon Sep 16 16:36:59 2013 (r327413) @@ -0,0 +1,36 @@ +--- CMakeLists.txt.orig 2013-07-28 12:32:06.000000000 +0200 ++++ CMakeLists.txt 2013-09-16 18:29:12.000000000 +0200 +@@ -30,7 +30,9 @@ + # when we override default install prefix, assume full path is used... + + set(INSTALL_INCLUDEDIR include) +-set(INSTALL_BINDIR bin) ++if (NOT INSTALL_BINDIR) ++ set(INSTALL_BINDIR bin) ++endif () + + if(WIN32) + set(INSTALL_MANDIR man) +@@ -50,7 +52,7 @@ + endif() + endif() + set(INSTALL_SBINDIR sbin) +- set(INSTALL_MANDIR share/man) ++ set(INSTALL_MANDIR man) + set(INSTALL_LOCALE share/locale) + set(INSTALL_DOCDIR share/doc/${PROJECT_NAME}) + set(INSTALL_INFODIR share/info) +@@ -566,11 +568,11 @@ + endif() + + if(NOT WIN32) +- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${INSTALL_LIBDIR}/pkgconfig) ++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION libdata/pkgconfig) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ucommon-config DESTINATION ${INSTALL_BINDIR}) + if(BUILD_STDLIB) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/commoncpp-config DESTINATION ${INSTALL_BINDIR}) +- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/commoncpp.pc DESTINATION ${INSTALL_LIBDIR}/pkgconfig) ++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/commoncpp.pc DESTINATION libdata/pkgconfig) + endif() + endif(NOT WIN32) + Added: head/devel/ucommon/files/patch-commoncpp_address.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ucommon/files/patch-commoncpp_address.cpp Mon Sep 16 16:36:59 2013 (r327413) @@ -0,0 +1,20 @@ +--- commoncpp/address.cpp.orig 2013-09-16 17:58:54.000000000 +0200 ++++ commoncpp/address.cpp 2013-09-16 17:59:55.000000000 +0200 +@@ -1062,7 +1062,7 @@ + #endif + + memset(&netmask, 0, sizeof(netmask)); +- bitset((bit_t *)&netmask, getMask(cp)); ++ ::bitset((bit_t *)&netmask, getMask(cp)); + setString(cbuf, sizeof(cbuf), cp); + + ep = (char *)strchr(cp, '/'); +@@ -1192,7 +1192,7 @@ + char *ep; + + memset(&netmask, 0, sizeof(netmask)); +- bitset((bit_t *)&netmask, getMask(cp)); ++ ::bitset((bit_t *)&netmask, getMask(cp)); + setString(cbuf, sizeof(cbuf), cp); + ep = (char *)strchr(cp, '/'); + if(ep) Modified: head/devel/ucommon/pkg-plist ============================================================================== --- head/devel/ucommon/pkg-plist Mon Sep 16 16:34:10 2013 (r327412) +++ head/devel/ucommon/pkg-plist Mon Sep 16 16:36:59 2013 (r327413) @@ -61,18 +61,15 @@ include/ucommon/ucommon.h include/ucommon/unicode.h include/ucommon/vector.h include/ucommon/xml.h -lib/libcommoncpp.a -lib/libcommoncpp.la lib/libcommoncpp.so lib/libcommoncpp.so.6 -lib/libucommon.a -lib/libucommon.la +lib/libcommoncpp.so.6.0.7 lib/libucommon.so lib/libucommon.so.6 -lib/libusecure.a -lib/libusecure.la +lib/libucommon.so.6.0.7 lib/libusecure.so lib/libusecure.so.6 +lib/libusecure.so.6.0.7 libdata/pkgconfig/commoncpp.pc libdata/pkgconfig/ucommon.pc @dirrm include/ucommon