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,7 @@
     SUBDIR += ark
     SUBDIR += atool
     SUBDIR += bicom
+    SUBDIR += brotli
     SUBDIR += bzip
     SUBDIR += bzip2
     SUBDIR += cabextract
Index: archivers/brotli/Makefile
===================================================================
--- archivers/brotli/Makefile
+++ archivers/brotli/Makefile
@@ -1,30 +1,28 @@
 # Created by: Sergey A. Osokin <osa@FreeBSD.org>
 # $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
 
-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
+
+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 <bsd.port.mk>
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,17 @@
-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
+bin/bro
+include/brotli/decode.h
+include/brotli/encode.h
+include/brotli/port.h
+include/brotli/types.h
+lib/libbrotlicommon.so
+lib/libbrotlicommon.so.0
+lib/libbrotlicommon.so.0.6.0
 lib/libbrotlidec.so
-lib/libbrotlidec.so.1
-lib/libbrotlidec.so.1.0.0
-lib/libbrotlienc.a
+lib/libbrotlidec.so.0
+lib/libbrotlidec.so.0.6.0
 lib/libbrotlienc.so
-lib/libbrotlienc.so.1
-lib/libbrotlienc.so.1.0.0
+lib/libbrotlienc.so.0
+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