Index: MOVED =================================================================== --- MOVED +++ MOVED @@ -9439,3 +9439,4 @@ editors/calligra-l10n-sv||2017-06-12|Merged with editors/calligra editors/calligra-l10n-tr||2017-06-12|Merged with editors/calligra editors/calligra-l10n||2017-06-12|Merged with editors/calligra +devel/libbrotli|archivers/brotli|2017-06-21|meta project no longer required to build libs Index: archivers/Makefile =================================================================== --- archivers/Makefile +++ archivers/Makefile @@ -11,6 +11,8 @@ SUBDIR += ark SUBDIR += atool SUBDIR += bicom + SUBDIR += brotli + SUBDIR += brotli-static SUBDIR += bzip SUBDIR += bzip2 SUBDIR += cabextract Index: archivers/brotli/Makefile =================================================================== --- archivers/brotli/Makefile +++ archivers/brotli/Makefile @@ -1,30 +1,33 @@ # Created by: Sergey A. Osokin # $FreeBSD$ -PORTNAME= libbrotli -PORTVERSION= 1.0 -DISTVERSIONPREFIX= ${PORTNAME}- -PORTREVISION= 6 -CATEGORIES= devel archivers +PORTNAME= brotli +PORTVERSION= 0.6.0 +DISTVERSIONPREFIX= v +PORTEPOCH= 1 +CATEGORIES= archivers devel MAINTAINER= osa@FreeBSD.org -COMMENT= Library for generic-purpose lossless compression algorithm +COMMENT= Generic-purpose lossless compression algorithm LICENSE= MIT -BROTLI_VERSION= v0.4.0 - USE_GITHUB= yes -GH_ACCOUNT= bagder google:brotli -GH_PROJECT= brotli:brotli -GH_TAGNAME= ${BROTLI_VERSION}:brotli -GH_SUBDIR= brotli:brotli +GH_ACCOUNT= google + +OPTIONS_DEFINE= STATIC +OPTIONS_EXCLUDE= STATIC +OPTIONS_SUB= yes -USES= pkgconfig autoreconf libtool compiler:c++0x pathfix -GNU_CONFIGURE= yes +USES= cmake:outsource compiler:c++0x pkgconfig USE_LDCONFIG= yes -pre-configure: - cd ${WRKSRC} && ./autogen.sh +CMAKE_ARGS= -DBUILD_TEST=OFF +STATIC_CMAKE_ON= -DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON + +post-install: + @${LN} -s libbrotlicommon.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libbrotlicommon.so.0 + @${LN} -s libbrotlidec.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libbrotlidec.so.0 + @${LN} -s libbrotlienc.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libbrotlienc.so.0 .include Index: archivers/brotli/distinfo =================================================================== --- archivers/brotli/distinfo +++ archivers/brotli/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1490788508 -SHA256 (bagder-libbrotli-libbrotli-1.0_GH0.tar.gz) = 5b7c02eb87017e7b3886c07eca685db95fa21f9c8afbb442469370c251a54dc1 -SIZE (bagder-libbrotli-libbrotli-1.0_GH0.tar.gz) = 3116 -SHA256 (google-brotli-v0.4.0_GH0.tar.gz) = 09aeea757c68a39feb0350a1506b5543ec5ce2c09988711d9e4dc1e9907dac7d -SIZE (google-brotli-v0.4.0_GH0.tar.gz) = 8069842 +TIMESTAMP = 1498054439 +SHA256 (google-brotli-v0.6.0_GH0.tar.gz) = 69cdbdf5709051dd086a2f020f5abf9e32519eafe0ad6be820c667c3a9c9ee0f +SIZE (google-brotli-v0.6.0_GH0.tar.gz) = 19838761 Index: archivers/brotli/pkg-plist =================================================================== --- archivers/brotli/pkg-plist +++ archivers/brotli/pkg-plist @@ -1,51 +1,20 @@ -include/brotli/dec/bit_reader.h -include/brotli/dec/context.h -include/brotli/dec/decode.h -include/brotli/dec/dictionary.h -include/brotli/dec/huffman.h -include/brotli/dec/port.h -include/brotli/dec/prefix.h -include/brotli/dec/state.h -include/brotli/dec/transform.h -include/brotli/dec/types.h -include/brotli/enc/backward_references.h -include/brotli/enc/bit_cost.h -include/brotli/enc/block_splitter.h -include/brotli/enc/brotli_bit_stream.h -include/brotli/enc/cluster.h -include/brotli/enc/command.h -include/brotli/enc/context.h -include/brotli/enc/dictionary.h -include/brotli/enc/dictionary_hash.h -include/brotli/enc/encode.h -include/brotli/enc/encode_parallel.h -include/brotli/enc/entropy_encode.h -include/brotli/enc/fast_log.h -include/brotli/enc/find_match_length.h -include/brotli/enc/hash.h -include/brotli/enc/histogram.h -include/brotli/enc/literal_cost.h -include/brotli/enc/metablock.h -include/brotli/enc/port.h -include/brotli/enc/prefix.h -include/brotli/enc/ringbuffer.h -include/brotli/enc/static_dict.h -include/brotli/enc/static_dict_lut.h -include/brotli/enc/streams.h -include/brotli/enc/transform.h -include/brotli/enc/types.h -include/brotli/enc/utf8_util.h -include/brotli/enc/write_bits.h -include/brotli/enc/compress_fragment.h -include/brotli/enc/compress_fragment_two_pass.h -include/brotli/enc/entropy_encode_static.h -lib/libbrotlidec.a -lib/libbrotlidec.so -lib/libbrotlidec.so.1 -lib/libbrotlidec.so.1.0.0 -lib/libbrotlienc.a -lib/libbrotlienc.so -lib/libbrotlienc.so.1 -lib/libbrotlienc.so.1.0.0 +bin/bro +include/brotli/decode.h +include/brotli/encode.h +include/brotli/port.h +include/brotli/types.h +%%STATIC%%lib/libbrotlicommon.a +%%NO_STATIC%%lib/libbrotlicommon.so +%%NO_STATIC%%lib/libbrotlicommon.so.0 +%%NO_STATIC%%lib/libbrotlicommon.so.0.6.0 +%%STATIC%%lib/libbrotlidec.a +%%NO_STATIC%%lib/libbrotlidec.so +%%NO_STATIC%%lib/libbrotlidec.so.0 +%%NO_STATIC%%lib/libbrotlidec.so.0.6.0 +%%STATIC%%lib/libbrotlienc.a +%%NO_STATIC%%lib/libbrotlienc.so +%%NO_STATIC%%lib/libbrotlienc.so.0 +%%NO_STATIC%%lib/libbrotlienc.so.0.6.0 +libdata/pkgconfig/libbrotlicommon.pc libdata/pkgconfig/libbrotlidec.pc libdata/pkgconfig/libbrotlienc.pc Index: devel/Makefile =================================================================== --- devel/Makefile +++ devel/Makefile @@ -1256,7 +1256,6 @@ SUBDIR += libbobcat SUBDIR += libbonobo SUBDIR += libbonobo-reference - SUBDIR += libbrotli SUBDIR += libbson SUBDIR += libburn SUBDIR += libccid Index: www/nginx-devel/Makefile =================================================================== --- www/nginx-devel/Makefile +++ www/nginx-devel/Makefile @@ -1139,9 +1139,8 @@ .endif .if ${PORT_OPTIONS:MBROTLI} -NGINX_BROTLI_VERSION= ada972b -LIB_DEPENDS+= libbrotlidec.so:devel/libbrotli \ - libbrotlienc.so:devel/libbrotli +NGINX_BROTLI_VERSION= 12529813 +LIB_DEPENDS+= libbrotlicommon.so:archivers/brotli GH_ACCOUNT+= google:brotli GH_PROJECT+= ngx_brotli:brotli GH_TAGNAME+= ${NGINX_BROTLI_VERSION}:brotli Index: www/nginx-devel/distinfo =================================================================== --- www/nginx-devel/distinfo +++ www/nginx-devel/distinfo @@ -125,8 +125,8 @@ SIZE (nginx-njs-753ebe6_GH0.tar.gz) = 191124 SHA256 (openresty-array-var-nginx-module-v0.05_GH0.tar.gz) = c949d4be6f3442c8e2937046448dc8d8def25c0e0fa6f4e805144cea45eabe80 SIZE (openresty-array-var-nginx-module-v0.05_GH0.tar.gz) = 11280 -SHA256 (google-ngx_brotli-ada972b_GH0.tar.gz) = d3d0e22a2629cd017280e05bd3bf05aa7b5c820ebe8c79932ce161243911e776 -SIZE (google-ngx_brotli-ada972b_GH0.tar.gz) = 11128 +SHA256 (google-ngx_brotli-12529813_GH0.tar.gz) = 788b25c4a3285b34d06e48a469fd0d0cb52d43b43edccd2935e22802dcfd2d69 +SIZE (google-ngx_brotli-12529813_GH0.tar.gz) = 10448 SHA256 (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 5c1869d55897075adb3fdf840b21060dc54669a1f840a36d1539acc7e59dd106 SIZE (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 11090 SHA256 (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = b8b9f355c05c0790226512f6732348a2404d48531688a1fc04ce6768163bf462 Index: www/nginx/Makefile =================================================================== --- www/nginx/Makefile +++ www/nginx/Makefile @@ -1126,9 +1126,8 @@ .endif .if ${PORT_OPTIONS:MBROTLI} -NGINX_BROTLI_VERSION= ada972b -LIB_DEPENDS+= libbrotlidec.so:devel/libbrotli \ - libbrotlienc.so:devel/libbrotli +NGINX_BROTLI_VERSION= 12529813 +LIB_DEPENDS+= libbrotlicommon.so:archivers/brotli GH_ACCOUNT+= google:brotli GH_PROJECT+= ngx_brotli:brotli GH_TAGNAME+= ${NGINX_BROTLI_VERSION}:brotli Index: www/nginx/distinfo =================================================================== --- www/nginx/distinfo +++ www/nginx/distinfo @@ -123,8 +123,8 @@ SIZE (nginx-njs-753ebe6_GH0.tar.gz) = 191124 SHA256 (openresty-array-var-nginx-module-v0.05_GH0.tar.gz) = c949d4be6f3442c8e2937046448dc8d8def25c0e0fa6f4e805144cea45eabe80 SIZE (openresty-array-var-nginx-module-v0.05_GH0.tar.gz) = 11280 -SHA256 (google-ngx_brotli-ada972b_GH0.tar.gz) = d3d0e22a2629cd017280e05bd3bf05aa7b5c820ebe8c79932ce161243911e776 -SIZE (google-ngx_brotli-ada972b_GH0.tar.gz) = 11128 +SHA256 (google-ngx_brotli-12529813_GH0.tar.gz) = 788b25c4a3285b34d06e48a469fd0d0cb52d43b43edccd2935e22802dcfd2d69 +SIZE (google-ngx_brotli-12529813_GH0.tar.gz) = 10448 SHA256 (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 5c1869d55897075adb3fdf840b21060dc54669a1f840a36d1539acc7e59dd106 SIZE (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 11090 SHA256 (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = b8b9f355c05c0790226512f6732348a2404d48531688a1fc04ce6768163bf462