Attachment 188409 Details for Bug 223966 – svn diff for archivers/brotli

[patch] svn diff for archivers/brotli

patch-archivers_brotli-1.0.2 (text/plain), 4.21 KB, created by Bernard Spil on 2017-11-29 21:24:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernard Spil

Created: 2017-11-29 21:24:19 UTC

Size: 4.21 KB

patch

obsolete

>Index: archivers/brotli/Makefile
>===================================================================
>--- archivers/brotli/Makefile	(revision 453750)
>+++ archivers/brotli/Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	brotli
>-PORTVERSION=	0.6.0
>-PORTREVISION=	1
>+PORTVERSION=	1.0.2
> DISTVERSIONPREFIX=	v
> PORTEPOCH=	1
> CATEGORIES=	archivers devel
>@@ -16,14 +15,18 @@
> USE_GITHUB=	yes
> GH_ACCOUNT=	google
> 
>-USES=		cmake compiler:c++0x pkgconfig
>+USES=		autoreconf compiler:c++0x gmake libtool pkgconfig
> USE_LDCONFIG=	yes
>+GNU_CONFIGURE=	yes
> 
>-CMAKE_ARGS=		-DBUILD_TESTING:BOOL=OFF
>+INSTALL_TARGET=	install-strip
> 
>-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
>+# 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>
>Index: archivers/brotli/distinfo
>===================================================================
>--- archivers/brotli/distinfo	(revision 453750)
>+++ archivers/brotli/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1498054439
>-SHA256 (google-brotli-v0.6.0_GH0.tar.gz) = 69cdbdf5709051dd086a2f020f5abf9e32519eafe0ad6be820c667c3a9c9ee0f
>-SIZE (google-brotli-v0.6.0_GH0.tar.gz) = 19838761
>+TIMESTAMP = 1511961437
>+SHA256 (google-brotli-v1.0.2_GH0.tar.gz) = c2cf2a16646b44771a4109bb21218c8e2d952babb827796eb8a800c1f94b7422
>+SIZE (google-brotli-v1.0.2_GH0.tar.gz) = 23736359
>Index: archivers/brotli/files/patch-Makefile.am
>===================================================================
>--- archivers/brotli/files/patch-Makefile.am	(nonexistent)
>+++ archivers/brotli/files/patch-Makefile.am	(working copy)
>@@ -0,0 +1,22 @@
>+--- 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 = \
>
>Property changes on: archivers/brotli/files/patch-Makefile.am
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: archivers/brotli/pkg-plist
>===================================================================
>--- archivers/brotli/pkg-plist	(revision 453750)
>+++ archivers/brotli/pkg-plist	(working copy)
>@@ -1,17 +1,21 @@
>-bin/bro
>+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.0
>-lib/libbrotlicommon.so.0.6.0
>+lib/libbrotlicommon.so.1
>+lib/libbrotlicommon.so.1.0.2
>+lib/libbrotlidec.a
> lib/libbrotlidec.so
>-lib/libbrotlidec.so.0
>-lib/libbrotlidec.so.0.6.0
>+lib/libbrotlidec.so.1
>+lib/libbrotlidec.so.1.0.2
>+lib/libbrotlienc.a
> lib/libbrotlienc.so
>-lib/libbrotlienc.so.0
>-lib/libbrotlienc.so.0.6.0
>+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

Actions: View | Diff

Attachments on bug 223966: 188392 | 188409 | 188682