Attachment #188409 for bug #223966




# $FreeBSD$

PORTNAME=	brotli
PORTVERSION=	1.0.2
PORTREVISION=	1
DISTVERSIONPREFIX=	v
PORTEPOCH=	1
CATEGORIES=	archivers devel

USE_GITHUB=	yes
GH_ACCOUNT=	google

USES=		autoreconf compiler:c++0x gmake libtool pkgconfig
USE_LDCONFIG=	yes
GNU_CONFIGURE=	yes

INSTALL_TARGET=	install-strip

# Replicate behavior of bootstrap (requires bash)
BROTLI_ABI_VERSION=	1:2:0
BROTLI_VERSION=		1.0.2
post-patch:
	${MKDIR} ${WRKSRC}/m4
	${REINPLACE_CMD} 's/0:0:0/${BROTLI_ABI_VERSION}/' ${WRKSRC}/Makefile.am
	${REINPLACE_CMD} 's/0\.0\.0/${BROTLI_VERSION}/' ${WRKSRC}/configure.ac

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)archivers/brotli/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1498054439	1	TIMESTAMP = 1511961437
2	SHA256 (google-brotli-v0.6.0_GH0.tar.gz) = 69cdbdf5709051dd086a2f020f5abf9e32519eafe0ad6be820c667c3a9c9ee0f	2	SHA256 (google-brotli-v1.0.2_GH0.tar.gz) = c2cf2a16646b44771a4109bb21218c8e2d952babb827796eb8a800c1f94b7422
3	SIZE (google-brotli-v0.6.0_GH0.tar.gz) = 19838761	3	SIZE (google-brotli-v1.0.2_GH0.tar.gz) = 23736359




--- Makefile.am.orig	2017-11-28 14:37:28 UTC
+++ Makefile.am
@@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign nostdinc subd
 ACLOCAL_AMFLAGS = -I m4
 
 # Actual ABI version is substituted by bootstrap
-LIBBROTLI_VERSION_INFO = -version-info 0:0:0
+LIBBROTLI_VERSION_INFO = -version-info 1:2:0
 
 bin_PROGRAMS = brotli
 lib_LTLIBRARIES = libbrotlicommon.la libbrotlidec.la libbrotlienc.la
@@ -23,8 +23,10 @@ libbrotlicommon_la_SOURCES = $(BROTLI_CO
 libbrotlicommon_la_LDFLAGS = $(AM_LDFLAGS) $(LIBBROTLI_VERSION_INFO) $(LDFLAGS)
 libbrotlidec_la_SOURCES = $(BROTLI_DEC_C) $(BROTLI_DEC_H)
 libbrotlidec_la_LDFLAGS = $(AM_LDFLAGS) $(LIBBROTLI_VERSION_INFO) $(LDFLAGS)
+libbrotlidec_la_LIBADD = libbrotlicommon.la -lm
 libbrotlienc_la_SOURCES = $(BROTLI_ENC_C) $(BROTLI_ENC_H)
 libbrotlienc_la_LDFLAGS = $(AM_LDFLAGS) $(LIBBROTLI_VERSION_INFO) $(LDFLAGS)
+libbrotlienc_la_LIBADD = libbrotlicommon.la -lm
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = \




bin/brotli
include/brotli/decode.h
include/brotli/encode.h
include/brotli/port.h
include/brotli/types.h
lib/libbrotlicommon.a
lib/libbrotlicommon.so
lib/libbrotlicommon.so.1
lib/libbrotlicommon.so.1.0.2
lib/libbrotlidec.a
lib/libbrotlidec.so
lib/libbrotlidec.so.1
lib/libbrotlidec.so.1.0.2
lib/libbrotlienc.a
lib/libbrotlienc.so
lib/libbrotlienc.so.1
lib/libbrotlienc.so.1.0.2
libdata/pkgconfig/libbrotlicommon.pc
libdata/pkgconfig/libbrotlidec.pc
libdata/pkgconfig/libbrotlienc.pc
%%PORTDOCS%%%%PORTDOCS%%%%DOCSDIR%%/README

Return to bug 223966

Lines 2-9 Link Here

(-)archivers/brotli/Makefile (-8 / +11 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= brotli	4	PORTNAME= brotli
5	PORTVERSION= 0.6.0	5	PORTVERSION= 1.0.2
6	PORTREVISION= 1
7	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
8	PORTEPOCH= 1	7	PORTEPOCH= 1
9	CATEGORIES= archivers devel	8	CATEGORIES= archivers devel
Lines 16-29 Link Here
16	USE_GITHUB= yes	15	USE_GITHUB= yes
17	GH_ACCOUNT= google	16	GH_ACCOUNT= google
18		17
19	USES= cmake compiler:c++0x pkgconfig	18	USES= autoreconf compiler:c++0x gmake libtool pkgconfig
20	USE_LDCONFIG= yes	19	USE_LDCONFIG= yes
		20	GNU_CONFIGURE= yes
21		21
22	CMAKE_ARGS= -DBUILD_TESTING:BOOL=OFF	22	INSTALL_TARGET= install-strip
23		23
24	post-install:	24	# Replicate behavior of bootstrap (requires bash)
25	@${LN} -s libbrotlicommon.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libbrotlicommon.so.0	25	BROTLI_ABI_VERSION= 1:2:0
26	@${LN} -s libbrotlidec.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libbrotlidec.so.0	26	BROTLI_VERSION= 1.0.2
27	@${LN} -s libbrotlienc.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libbrotlienc.so.0	27	post-patch:
		28	${MKDIR} ${WRKSRC}/m4
		29	${REINPLACE_CMD} 's/0:0:0/${BROTLI_ABI_VERSION}/' ${WRKSRC}/Makefile.am
		30	${REINPLACE_CMD} 's/0\.0\.0/${BROTLI_VERSION}/' ${WRKSRC}/configure.ac
28		31
29	.include <bsd.port.mk>	32	.include <bsd.port.mk>

Line 0 Link Here

(-)archivers/brotli/files/patch-Makefile.am (+22 lines)
	1	--- Makefile.am.orig 2017-11-28 14:37:28 UTC
	2	+++ Makefile.am
	3	@@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign nostdinc subd
	4	ACLOCAL_AMFLAGS = -I m4
	5
	6	# Actual ABI version is substituted by bootstrap
	7	-LIBBROTLI_VERSION_INFO = -version-info 0:0:0
	8	+LIBBROTLI_VERSION_INFO = -version-info 1:2:0
	9
	10	bin_PROGRAMS = brotli
	11	lib_LTLIBRARIES = libbrotlicommon.la libbrotlidec.la libbrotlienc.la
	12	@@ -23,8 +23,10 @@ libbrotlicommon_la_SOURCES = $(BROTLI_CO
	13	libbrotlicommon_la_LDFLAGS = $(AM_LDFLAGS) $(LIBBROTLI_VERSION_INFO) $(LDFLAGS)
	14	libbrotlidec_la_SOURCES = $(BROTLI_DEC_C) $(BROTLI_DEC_H)
	15	libbrotlidec_la_LDFLAGS = $(AM_LDFLAGS) $(LIBBROTLI_VERSION_INFO) $(LDFLAGS)
	16	+libbrotlidec_la_LIBADD = libbrotlicommon.la -lm
	17	libbrotlienc_la_SOURCES = $(BROTLI_ENC_C) $(BROTLI_ENC_H)
	18	libbrotlienc_la_LDFLAGS = $(AM_LDFLAGS) $(LIBBROTLI_VERSION_INFO) $(LDFLAGS)
	19	+libbrotlienc_la_LIBADD = libbrotlicommon.la -lm
	20
	21	pkgconfigdir = $(libdir)/pkgconfig
	22	pkgconfig_DATA = \

Lines 1-17 Link Here

(-)archivers/brotli/pkg-plist (-7 / +11 lines)
1	bin/bro	1	bin/brotli
2	include/brotli/decode.h	2	include/brotli/decode.h
3	include/brotli/encode.h	3	include/brotli/encode.h
4	include/brotli/port.h	4	include/brotli/port.h
5	include/brotli/types.h	5	include/brotli/types.h
		6	lib/libbrotlicommon.a
6	lib/libbrotlicommon.so	7	lib/libbrotlicommon.so
7	lib/libbrotlicommon.so.0	8	lib/libbrotlicommon.so.1
8	lib/libbrotlicommon.so.0.6.0	9	lib/libbrotlicommon.so.1.0.2
		10	lib/libbrotlidec.a
9	lib/libbrotlidec.so	11	lib/libbrotlidec.so
10	lib/libbrotlidec.so.0	12	lib/libbrotlidec.so.1
11	lib/libbrotlidec.so.0.6.0	13	lib/libbrotlidec.so.1.0.2
		14	lib/libbrotlienc.a
12	lib/libbrotlienc.so	15	lib/libbrotlienc.so
13	lib/libbrotlienc.so.0	16	lib/libbrotlienc.so.1
14	lib/libbrotlienc.so.0.6.0	17	lib/libbrotlienc.so.1.0.2
15	libdata/pkgconfig/libbrotlicommon.pc	18	libdata/pkgconfig/libbrotlicommon.pc
16	libdata/pkgconfig/libbrotlidec.pc	19	libdata/pkgconfig/libbrotlidec.pc
17	libdata/pkgconfig/libbrotlienc.pc	20	libdata/pkgconfig/libbrotlienc.pc
		21	%%PORTDOCS%%%%PORTDOCS%%%%DOCSDIR%%/README