Page MenuHomeFreeBSD
Files F163310376

D11290.id30576.diff
No OneTemporary
Actions

D11290.id30576.diff
View Options

Index: MOVED
===================================================================
--- MOVED
+++ MOVED
@@ -9459,3 +9459,5 @@
x11-toolkits/qt5-declarative||2017-07-01|Has expired: Has not been released since Qt 5.5 -- installation can lead to runtime conflicts with qt5-quick
deskutils/california|deskutils/gnome-calendar|2017-07-02|Has expired: Orphaned upstream, replaced by gnome-calendar
devel/etcd3|devel/etcd31|2017-07-07|Version 3.2 introduces breaking changes
+devel/libbrotli|archivers/brotli|2017-07-08|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-static/Makefile
===================================================================
--- /dev/null
+++ archivers/brotli-static/Makefile
@@ -0,0 +1,16 @@
+# Created by: Bernard Spil <brnrd@FreeBSD.org>
+# $FreeBSD$
+
+PKGNAMESUFFIX= -static
+
+MASTERDIR= ${.CURDIR}/../brotli
+
+OPTIONS_SLAVE= STATIC
+
+CONFLICTS_INSTALL= brotli-[0-9]*
+
+PLIST_SUB+= SHARED="@comment "
+
+STATIC_ONLY= YES
+
+.include "${MASTERDIR}/Makefile"
Index: archivers/brotli/Makefile
===================================================================
--- archivers/brotli/Makefile
+++ archivers/brotli/Makefile
@@ -1,30 +1,59 @@
# 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
+CONFLICTS_INSTALL= brotli-static-[0-9]*
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
+OPTIONS_DEFINE= STATIC
+OPTIONS_SUB= yes
+
+USES= cmake compiler:c++0x pkgconfig
USE_LDCONFIG= yes
-pre-configure:
- cd ${WRKSRC} && ./autogen.sh
+CMAKE_ARGS= -DBUILD_TESTING:BOOL=OFF
+STATIC_CMAKE_ON= -DBUILD_SHARED_LIBS:BOOL=OFF
+
+post-build-STATIC-on:
+.ifndef STATIC_ONLY
+ ${AR} qc ${WRKSRC}/libbrotlicommon.a ${WRKSRC}/CMakeFiles/brotlicommon.dir/common/dictionary.c.o
+ ${RANLIB} ${WRKSRC}/libbrotlicommon.a
+.for ofile in bit_reader decode huffman state
+ ${AR} qc ${WRKSRC}/libbrotlidec.a ${WRKSRC}/CMakeFiles/brotlidec.dir/dec/${ofile}.c.o
+.endfor
+ ${RANLIB} ${WRKSRC}/libbrotlidec.a
+.for ofile in backward_references backward_references_hq bit_cost block_splitter brotli_bit_stream \
+ cluster compress_fragment compress_fragment_two_pass dictionary_hash encode \
+ entropy_encode histogram literal_cost memory metablock static_dict utf8_util
+ ${AR} qc ${WRKSRC}/libbrotlienc.a ${WRKSRC}/CMakeFiles/brotlienc.dir/enc/${ofile}.c.o
+.endfor
+ ${RANLIB} ${WRKSRC}/libbrotlienc.a
+.endif # ifndef STATIC_ONLY
+
+post-install:
+.ifndef STATIC_ONLY
+ @${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
+.endif
+
+post-install-STATIC-on:
+.ifndef STATIC_ONLY
+ ${INSTALL_LIB} ${WRKSRC}/libbrotlicommon.a ${STAGEDIR}${PREFIX}/lib/
+ ${INSTALL_LIB} ${WRKSRC}/libbrotlidec.a ${STAGEDIR}${PREFIX}/lib/
+ ${INSTALL_LIB} ${WRKSRC}/libbrotlienc.a ${STAGEDIR}${PREFIX}/lib/
+.endif
.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-descr
===================================================================
--- archivers/brotli/pkg-descr
+++ archivers/brotli/pkg-descr
@@ -1,5 +1,9 @@
-Wrapper scripts and code around the brotli code base.
-Builds libraries out of the brotli decode and encode sources.
+Brotli is a generic-purpose lossless compression algorithm that compresses data
+using a combination of a modern variant of the LZ77 algorithm, Huffman coding
+and 2nd order context modeling, with a compression ratio comparable to the best
+currently available general-purpose compression methods. It is similar in speed
+with deflate but offers more dense compression.
+
+The specification of the Brotli Compressed Data Format is defined in RFC 7932.
WWW: https://github.com/google/brotli
-WWW: https://github.com/bagder/libbrotli
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
+%%SHARED%%lib/libbrotlicommon.so
+%%SHARED%%lib/libbrotlicommon.so.0
+%%SHARED%%lib/libbrotlicommon.so.0.6.0
+%%STATIC%%lib/libbrotlidec.a
+%%SHARED%%lib/libbrotlidec.so
+%%SHARED%%lib/libbrotlidec.so.0
+%%SHARED%%lib/libbrotlidec.so.0.6.0
+%%STATIC%%lib/libbrotlienc.a
+%%SHARED%%lib/libbrotlienc.so
+%%SHARED%%lib/libbrotlienc.so.0
+%%SHARED%%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
@@ -1259,7 +1259,6 @@
SUBDIR += libbobcat
SUBDIR += libbonobo
SUBDIR += libbonobo-reference
- SUBDIR += libbrotli
SUBDIR += libbson
SUBDIR += libburn
SUBDIR += libccid
Index: devel/libbrotli/Makefile
===================================================================
--- devel/libbrotli/Makefile
+++ devel/libbrotli/Makefile
@@ -1,30 +0,0 @@
-# Created by: Sergey A. Osokin <osa@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME= libbrotli
-PORTVERSION= 1.0
-DISTVERSIONPREFIX= ${PORTNAME}-
-PORTREVISION= 6
-CATEGORIES= devel archivers
-
-MAINTAINER= osa@FreeBSD.org
-COMMENT= Library for 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
-
-USES= pkgconfig autoreconf libtool compiler:c++0x pathfix
-GNU_CONFIGURE= yes
-USE_LDCONFIG= yes
-
-pre-configure:
- cd ${WRKSRC} && ./autogen.sh
-
-.include <bsd.port.mk>
Index: devel/libbrotli/distinfo
===================================================================
--- devel/libbrotli/distinfo
+++ devel/libbrotli/distinfo
@@ -1,5 +0,0 @@
-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
Index: devel/libbrotli/files/patch-autogen.sh
===================================================================
--- devel/libbrotli/files/patch-autogen.sh
+++ devel/libbrotli/files/patch-autogen.sh
@@ -1,17 +0,0 @@
---- autogen.sh.orig 2016-01-20 21:31:42 UTC
-+++ autogen.sh
-@@ -6,14 +6,6 @@ if test $? -ne 0; then
- exit 1
- fi
-
--GIT=`which git 2>/dev/null`
--if test $? -ne 0; then
-- echo "No 'git' found. You must install the git package."
-- exit 1
--fi
--
--$GIT submodule init
--$GIT submodule update
-
- # create m4 before autoreconf
- mkdir m4 2>/dev/null
Index: devel/libbrotli/pkg-descr
===================================================================
--- devel/libbrotli/pkg-descr
+++ devel/libbrotli/pkg-descr
@@ -1,5 +0,0 @@
-Wrapper scripts and code around the brotli code base.
-Builds libraries out of the brotli decode and encode sources.
-
-WWW: https://github.com/google/brotli
-WWW: https://github.com/bagder/libbrotli
Index: devel/libbrotli/pkg-plist
===================================================================
--- devel/libbrotli/pkg-plist
+++ devel/libbrotli/pkg-plist
@@ -1,51 +0,0 @@
-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
-libdata/pkgconfig/libbrotlidec.pc
-libdata/pkgconfig/libbrotlienc.pc

File Metadata

Mime Type
text/plain
Expires
Wed, Jul 22, 11:22 PM (2 h, 38 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35385329
Default Alt Text
D11290.id30576.diff (11 KB)

Event Timeline