Date: Sun, 30 Aug 2020 09:31:01 +0000 (UTC) From: Ashish SHUKLA <ashish@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r547041 - in head/sysutils/squashfs-tools: . files Message-ID: <202008300931.07U9V14n093676@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ashish Date: Sun Aug 30 09:31:00 2020 New Revision: 547041 URL: https://svnweb.freebsd.org/changeset/ports/547041 Log: - Fix portlint warnings - Fix building on -CURRENT[1] - Regenerate patches with `make makepatch' Reported by: pkg-fallout Added: head/sysutils/squashfs-tools/files/patch-Makefile - copied, changed from r547040, head/sysutils/squashfs-tools/files/patch-squashfs-tools_Makefile head/sysutils/squashfs-tools/files/patch-pseudo.c - copied, changed from r547040, head/sysutils/squashfs-tools/files/patch-squashfs-tools_pseudo.c head/sysutils/squashfs-tools/files/patch-unsquashfs.c - copied, changed from r547040, head/sysutils/squashfs-tools/files/patch-squashfs-tools_unsquashfs.c Deleted: head/sysutils/squashfs-tools/files/patch-squashfs-tools_Makefile head/sysutils/squashfs-tools/files/patch-squashfs-tools_pseudo.c head/sysutils/squashfs-tools/files/patch-squashfs-tools_unsquashfs.c Modified: head/sysutils/squashfs-tools/Makefile head/sysutils/squashfs-tools/files/patch-action.c Modified: head/sysutils/squashfs-tools/Makefile ============================================================================== --- head/sysutils/squashfs-tools/Makefile Sun Aug 30 09:30:57 2020 (r547040) +++ head/sysutils/squashfs-tools/Makefile Sun Aug 30 09:31:00 2020 (r547041) @@ -15,6 +15,8 @@ COMMENT= Set of tools to manipulate squashfs images LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/../COPYING +USES= alias cpe gmake + PLIST_FILES= bin/mksquashfs \ bin/unsquashfs @@ -26,11 +28,13 @@ LZMA_DESC= Build with LZMA support WRKSRC= ${WRKDIR}/${DISTNAME}/squashfs-tools -USE_CSTD= gnu89 - -USES= alias cpe gmake CPE_PRODUCT= squashfs CPE_VENDOR= phillip_lougher + +USE_CSTD= gnu89 + +# Fix build with clang11 +CFLAGS+= -fcommon .include <bsd.port.options.mk> Copied and modified: head/sysutils/squashfs-tools/files/patch-Makefile (from r547040, head/sysutils/squashfs-tools/files/patch-squashfs-tools_Makefile) ============================================================================== --- head/sysutils/squashfs-tools/files/patch-squashfs-tools_Makefile Sun Aug 30 09:30:57 2020 (r547040, copy source) +++ head/sysutils/squashfs-tools/files/patch-Makefile Sun Aug 30 09:31:00 2020 (r547041) @@ -1,16 +1,16 @@ ---- Makefile.orig 2011-02-28 17:04:15.000000000 -0300 -+++ Makefile 2014-05-08 11:03:24.000000000 -0300 -@@ -38,7 +38,7 @@ +--- Makefile.orig 2014-05-11 18:56:00 UTC ++++ Makefile +@@ -38,7 +38,7 @@ GZIP_SUPPORT = 1 # installation prefix. # #LZO_SUPPORT = 1 -#LZO_DIR = /usr/local +#LZO_DIR = $(LOCALBASE) - ########### Building LZMA support ############# - # -@@ -103,7 +103,7 @@ + ########### Building LZ4 support ############# +@@ -119,7 +119,7 @@ UNSQUASHFS_OBJS = unsquashfs.o unsquash-1.o unsquash-2 + CFLAGS ?= -O2 CFLAGS += $(EXTRA_CFLAGS) $(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 \ - -D_LARGEFILE_SOURCE -D_GNU_SOURCE -DCOMP_DEFAULT=\"$(COMP_DEFAULT)\" \ @@ -18,7 +18,7 @@ -Wall LIBS = -lpthread -lm -@@ -253,6 +253,6 @@ +@@ -300,6 +300,6 @@ clean: .PHONY: install install: mksquashfs unsquashfs Modified: head/sysutils/squashfs-tools/files/patch-action.c ============================================================================== --- head/sysutils/squashfs-tools/files/patch-action.c Sun Aug 30 09:30:57 2020 (r547040) +++ head/sysutils/squashfs-tools/files/patch-action.c Sun Aug 30 09:31:00 2020 (r547041) @@ -1,6 +1,6 @@ Hack for lack of strdupa() in BSD libc ---- action.c.orig +--- action.c.orig 2014-05-10 04:54:13 UTC +++ action.c @@ -44,6 +44,12 @@ #include "action.h" Copied and modified: head/sysutils/squashfs-tools/files/patch-pseudo.c (from r547040, head/sysutils/squashfs-tools/files/patch-squashfs-tools_pseudo.c) ============================================================================== --- head/sysutils/squashfs-tools/files/patch-squashfs-tools_pseudo.c Sun Aug 30 09:30:57 2020 (r547040, copy source) +++ head/sysutils/squashfs-tools/files/patch-pseudo.c Sun Aug 30 09:31:00 2020 (r547041) @@ -1,13 +1,13 @@ ---- pseudo.c 2009-04-05 04:01:58.000000000 +0200 -+++ pseudo.c 2010-04-29 17:45:49.000000000 +0200 -@@ -31,6 +31,10 @@ - #include <stdlib.h> - #include <sys/types.h> +--- pseudo.c.orig 2014-05-10 04:54:13 UTC ++++ pseudo.c +@@ -34,6 +34,10 @@ + #include <sys/wait.h> + #include <ctype.h> +#ifdef __FreeBSD__ +#include <sys/stat.h> +#endif + #include "pseudo.h" - - #ifdef SQUASHFS_TRACE + #include "error.h" + #include "progressbar.h" Copied and modified: head/sysutils/squashfs-tools/files/patch-unsquashfs.c (from r547040, head/sysutils/squashfs-tools/files/patch-squashfs-tools_unsquashfs.c) ============================================================================== --- head/sysutils/squashfs-tools/files/patch-squashfs-tools_unsquashfs.c Sun Aug 30 09:30:57 2020 (r547040, copy source) +++ head/sysutils/squashfs-tools/files/patch-unsquashfs.c Sun Aug 30 09:31:00 2020 (r547041) @@ -1,4 +1,4 @@ ---- unsquashfs.c.orig +--- unsquashfs.c.orig 2014-05-12 22:18:35 UTC +++ unsquashfs.c @@ -31,7 +31,14 @@ #include "unsquashfs_info.h"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008300931.07U9V14n093676>