From owner-svn-ports-head@freebsd.org Wed Jul 20 19:28:57 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E99DDB9E267; Wed, 20 Jul 2016 19:28:57 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C16AE18CB; Wed, 20 Jul 2016 19:28:57 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6KJSuPh066669; Wed, 20 Jul 2016 19:28:56 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6KJSuZT066666; Wed, 20 Jul 2016 19:28:56 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201607201928.u6KJSuZT066666@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 20 Jul 2016 19:28:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r418849 - in head/devel/avro-c: . 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.22 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: Wed, 20 Jul 2016 19:28:58 -0000 Author: amdmi3 Date: Wed Jul 20 19:28:56 2016 New Revision: 418849 URL: https://svnweb.freebsd.org/changeset/ports/418849 Log: - Add missing depends - Fix liblzma detection on pre 10.3 - Make documentation generation consistent (disable it) - Fix snappy support for FreeBSD (also submitted upstream) Approved by: vg (maintainer) Added: head/devel/avro-c/files/patch-src_codec.c (contents, props changed) Modified: head/devel/avro-c/Makefile head/devel/avro-c/files/patch-src_CMakeLists.txt Modified: head/devel/avro-c/Makefile ============================================================================== --- head/devel/avro-c/Makefile Wed Jul 20 19:18:30 2016 (r418848) +++ head/devel/avro-c/Makefile Wed Jul 20 19:28:56 2016 (r418849) @@ -3,6 +3,7 @@ PORTNAME= avro PORTVERSION= 1.8.1 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= APACHE/${PORTNAME}/stable PKGNAMESUFFIX= -c @@ -11,13 +12,24 @@ DISTNAME= ${PORTNAME}-src-${PORTVERSION} MAINTAINER= vg@FreeBSD.org COMMENT= Data serialization system for ANSI C +LIB_DEPENDS= libjansson.so:devel/jansson \ + libsnappy.so:archivers/snappy + USES= cmake pkgconfig USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${DISTNAME}/lang/c -pre-configure: +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1003000 +CONFIGURE_ENV+= PKG_CONFIG_PATH=${FILESDIR} +.endif + +post-patch: + @${REINPLACE_CMD} '/add_subdirectory(docs)/d' \ + ${WRKSRC}/CMakeLists.txt @${REINPLACE_CMD} 's|/bin/bash|/bin/sh|g' \ ${WRKSRC}/version.sh -.include +.include Modified: head/devel/avro-c/files/patch-src_CMakeLists.txt ============================================================================== --- head/devel/avro-c/files/patch-src_CMakeLists.txt Wed Jul 20 19:18:30 2016 (r418848) +++ head/devel/avro-c/files/patch-src_CMakeLists.txt Wed Jul 20 19:28:56 2016 (r418849) @@ -1,6 +1,6 @@ --- src/CMakeLists.txt.orig 2016-05-15 00:38:52 UTC +++ src/CMakeLists.txt -@@ -82,12 +82,14 @@ source_group(Avro FILES ${AVRO_SRC}) +@@ -82,12 +82,12 @@ source_group(Avro FILES ${AVRO_SRC}) # The version.sh script gives us a SOVERSION that uses colon as a # separator; we need periods. @@ -11,8 +11,6 @@ target_link_libraries(avro-static ${JANSSON_LIBRARIES} ${CODEC_LIBRARIES} ${THREADS_LIBRARIES}) set_target_properties(avro-static PROPERTIES OUTPUT_NAME avro) -+include_directories(/usr/local/include) -+ if (NOT WIN32) # TODO: Create Windows DLLs. See http://www.cmake.org/Wiki/BuildingWinDLL add_library(avro-shared SHARED ${AVRO_SRC}) @@ -21,7 +19,7 @@ configure_file(avro-c.pc.in avro-c.pc) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/avro-c.pc - DESTINATION lib/pkgconfig) -+ DESTINATION ${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig) ++ DESTINATION libdata/pkgconfig) add_executable(avrocat avrocat.c) target_link_libraries(avrocat avro-static) Added: head/devel/avro-c/files/patch-src_codec.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/avro-c/files/patch-src_codec.c Wed Jul 20 19:28:56 2016 (r418849) @@ -0,0 +1,12 @@ +--- src/codec.c.orig 2016-05-15 00:38:52 UTC ++++ src/codec.c +@@ -21,6 +21,9 @@ + # if defined(__APPLE__) + # include + # define __bswap_32 OSSwapInt32 ++# elif defined(__FreeBSD__) ++# include ++# define __bswap_32 bswap32 + # else + # include + # endif