Attachment #238980 for bug #268519

View | Details | Raw Unified | Return to bug 268519
Collapse All | Expand All




PORTNAME=	libdeflate
PORTVERSION=	1.14
DISTVERSIONPREFIX=	v
DISTVERSION=	1.15
CATEGORIES=	archivers

PATCH_SITES=	https://github.com/ebiggers/${PORTNAME}/commit/
PATCHFILES=	98174ac5e6fe2a806923bcb6bfa24cdbf32c79d0.patch:-p1

MAINTAINER=	danfe@FreeBSD.org
COMMENT=	Fast, whole-buffer DEFLATE-based compression library
WWW=		https://github.com/ebiggers/libdeflate

LICENSE=	MIT
LICENSE_FILE=	${WRKSRC}/COPYING

USES=		cmake:testing pathfix
USE_GITHUB=	yes
GH_ACCOUNT=	ebiggers
USE_LDCONFIG=	yes

CMAKE_TESTING_ON=	LIBDEFLATE_BUILD_TESTS

CMAKE_ON=	LIBDEFLATE_USE_SHARED_LIB

PLIST_FILES=	bin/libdeflate-gunzip bin/libdeflate-gzip \
		include/libdeflate.h \
		libdata/pkgconfig/libdeflate.pc \
		lib/libdeflate.a lib/libdeflate.so lib/libdeflate.so.0
PORTDOCS=	NEWS.md README.md

OPTIONS_DEFINE=	DOCS

Lines 1-3 Link Here

(-)b/archivers/libdeflate/distinfo (-3 / +5 lines)
1	TIMESTAMP = 1662862430	1	TIMESTAMP = 1671744385
2	SHA256 (ebiggers-libdeflate-v1.14_GH0.tar.gz) = 89e7df898c37c3427b0f39aadcf733731321a278771d20fc553f92da8d4808ac	2	SHA256 (ebiggers-libdeflate-v1.15_GH0.tar.gz) = 58b95040df7383dc0413defb700d9893c194732474283cc4c8f144b00a68154b
3	SIZE (ebiggers-libdeflate-v1.14_GH0.tar.gz) = 180182	3	SIZE (ebiggers-libdeflate-v1.15_GH0.tar.gz) = 180818
		4	SHA256 (98174ac5e6fe2a806923bcb6bfa24cdbf32c79d0.patch) = 3b80183158aee9c01274258548a938bfa2bf4377ccfb0d6f3277424126068a37
		5	SIZE (98174ac5e6fe2a806923bcb6bfa24cdbf32c79d0.patch) = 1502

Added Link Here

(-)b/archivers/libdeflate/files/patch-CMakeLists.txt (+11 lines)
1	--- CMakeLists.txt.orig 2022-12-22 21:28:37 UTC
2	+++ CMakeLists.txt
3	@@ -61,7 +61,7 @@ if(NOT LIBDEFLATE_BUILD_STATIC_LIB)
4	endif()
5
6	# Set common C compiler flags for all targets (the library and the programs).
7	-set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG")
8	+#set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG")
9	set(CMAKE_C_STANDARD 99)
10	if(NOT MSVC)
11	check_c_compiler_flag(-Wdeclaration-after-statement HAVE_WDECLARATION_AFTER_STATEMENT)




--- Makefile.orig	2022-09-11 02:13:50 UTC
+++ Makefile
@@ -54,7 +54,7 @@ override CFLAGS :=							\
 	      1>&2 2>/dev/null; then echo $(1); fi)
 
 override CFLAGS :=							\
-	-O2 -fomit-frame-pointer -std=c99 -I. -Wall -Wundef		\
+	-std=c99 -I. -Wall -Wundef					\
 	$(call cc-option,-Wdeclaration-after-statement)			\
 	$(call cc-option,-Wimplicit-fallthrough)			\
 	$(call cc-option,-Wmissing-prototypes)				\
@@ -340,7 +340,7 @@ install:all $(PKGCONFBASE)
 		$(DESTDIR)$(BINDIR)
 	install -m644 $(STATIC_LIB) $(DESTDIR)$(LIBDIR)
 	if [ -z "$(DISABLE_SHARED)" ]; then				\
-		install -m755 $(SHARED_LIB) $(DESTDIR)$(LIBDIR);	\
+		install -s -m755 $(SHARED_LIB) $(DESTDIR)$(LIBDIR);	\
 	fi
 	sed -e "s|@PREFIX@|$(PREFIX)|"					\
 	    -e "s|@LIBDIR@|$(LIBDIR)|"					\
@@ -349,7 +349,7 @@ install:all $(PKGCONFBASE)
 	    $(PKGCONFBASE) > $(DESTDIR)$(LIBDIR)/pkgconfig/libdeflate.pc
 	chmod 644 $(DESTDIR)$(LIBDIR)/pkgconfig/libdeflate.pc
 	install -m644 libdeflate.h $(DESTDIR)$(INCDIR)
-	install -m755 gzip$(PROG_SUFFIX) \
+	install -s -m755 gzip$(PROG_SUFFIX) \
 		$(DESTDIR)$(BINDIR)/libdeflate-gzip$(PROG_SUFFIX)
 	if [ -n "$(HARD_LINKS)" ]; then					\
 		ln -f $(DESTDIR)$(BINDIR)/libdeflate-gzip$(PROG_SUFFIX)	\

Added Link Here

(-)b/archivers/libdeflate/pkg-plist (+11 lines)
1	bin/libdeflate-gunzip
2	bin/libdeflate-gzip
3	include/libdeflate.h
4	lib/cmake/libdeflate/libdeflate-config-version.cmake
5	lib/cmake/libdeflate/libdeflate-config.cmake
6	lib/cmake/libdeflate/libdeflate-targets-%%CMAKE_BUILD_TYPE%%.cmake
7	lib/cmake/libdeflate/libdeflate-targets.cmake
8	lib/libdeflate.a
9	lib/libdeflate.so
10	lib/libdeflate.so.0
11	libdata/pkgconfig/libdeflate.pc

Return to bug 268519

Lines 1-8 Link Here

(-)b/archivers/libdeflate/Makefile (-8 / +8 lines)
1	PORTNAME= libdeflate	1	PORTNAME= libdeflate
2	PORTVERSION= 1.14
3	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
		3	DISTVERSION= 1.15
4	CATEGORIES= archivers	4	CATEGORIES= archivers
5		5
		6	PATCH_SITES= https://github.com/ebiggers/${PORTNAME}/commit/
		7	PATCHFILES= 98174ac5e6fe2a806923bcb6bfa24cdbf32c79d0.patch:-p1
		8
6	MAINTAINER= danfe@FreeBSD.org	9	MAINTAINER= danfe@FreeBSD.org
7	COMMENT= Fast, whole-buffer DEFLATE-based compression library	10	COMMENT= Fast, whole-buffer DEFLATE-based compression library
8	WWW= https://github.com/ebiggers/libdeflate	11	WWW= https://github.com/ebiggers/libdeflate
Lines 10-27 WWW= https://github.com/ebiggers/libdeflate Link Here
10	LICENSE= MIT	13	LICENSE= MIT
11	LICENSE_FILE= ${WRKSRC}/COPYING	14	LICENSE_FILE= ${WRKSRC}/COPYING
12		15
13	USES= gmake	16	USES= cmake:testing pathfix
14	USE_GITHUB= yes	17	USE_GITHUB= yes
15	GH_ACCOUNT= ebiggers	18	GH_ACCOUNT= ebiggers
16	USE_LDCONFIG= yes	19	USE_LDCONFIG= yes
17		20
18	MAKE_ARGS= V=1	21	CMAKE_TESTING_ON= LIBDEFLATE_BUILD_TESTS
19	TEST_TARGET= check	22
		23	CMAKE_ON= LIBDEFLATE_USE_SHARED_LIB
20		24
21	PLIST_FILES= bin/libdeflate-gunzip bin/libdeflate-gzip \
22	include/libdeflate.h \
23	libdata/pkgconfig/libdeflate.pc \
24	lib/libdeflate.a lib/libdeflate.so lib/libdeflate.so.0
25	PORTDOCS= NEWS.md README.md	25	PORTDOCS= NEWS.md README.md
26		26
27	OPTIONS_DEFINE= DOCS	27	OPTIONS_DEFINE= DOCS

Removed Link Here

(-)a/archivers/libdeflate/files/patch-Makefile (-29 lines)
1	--- Makefile.orig 2022-09-11 02:13:50 UTC
2	+++ Makefile
3	@@ -54,7 +54,7 @@ override CFLAGS := \
4	1>&2 2>/dev/null; then echo $(1); fi)
5
6	override CFLAGS := \
7	- -O2 -fomit-frame-pointer -std=c99 -I. -Wall -Wundef \
8	+ -std=c99 -I. -Wall -Wundef \
9	$(call cc-option,-Wdeclaration-after-statement) \
10	$(call cc-option,-Wimplicit-fallthrough) \
11	$(call cc-option,-Wmissing-prototypes) \
12	@@ -340,7 +340,7 @@ install:all $(PKGCONFBASE)
13	$(DESTDIR)$(BINDIR)
14	install -m644 $(STATIC_LIB) $(DESTDIR)$(LIBDIR)
15	if [ -z "$(DISABLE_SHARED)" ]; then \
16	- install -m755 $(SHARED_LIB) $(DESTDIR)$(LIBDIR); \
17	+ install -s -m755 $(SHARED_LIB) $(DESTDIR)$(LIBDIR); \
18	fi
19	sed -e "s\|@PREFIX@\|$(PREFIX)\|" \
20	-e "s\|@LIBDIR@\|$(LIBDIR)\|" \
21	@@ -349,7 +349,7 @@ install:all $(PKGCONFBASE)
22	$(PKGCONFBASE) > $(DESTDIR)$(LIBDIR)/pkgconfig/libdeflate.pc
23	chmod 644 $(DESTDIR)$(LIBDIR)/pkgconfig/libdeflate.pc
24	install -m644 libdeflate.h $(DESTDIR)$(INCDIR)
25	- install -m755 gzip$(PROG_SUFFIX) \
26	+ install -s -m755 gzip$(PROG_SUFFIX) \
27	$(DESTDIR)$(BINDIR)/libdeflate-gzip$(PROG_SUFFIX)
28	if [ -n "$(HARD_LINKS)" ]; then \
29	ln -f $(DESTDIR)$(BINDIR)/libdeflate-gzip$(PROG_SUFFIX) \