- Fix portlint warnings

- Fix building on -CURRENT[1]
- Regenerate patches with `make makepatch'

Reported by:	pkg-fallout

6 files changed, 29 insertions, 25 deletions

diff --git a/sysutils/squashfs-tools/Makefile b/sysutils/squashfs-tools/Makefile
index bafec3fbde18..e2a8bfcd2609 100644
--- a/sysutils/squashfs-tools/Makefile
+++ b/sysutils/squashfs-tools/Makefile
@@ -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,12 +28,14 @@ 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>
 
 PORTDOCS=	ACKNOWLEDGEMENTS CHANGES COPYING \
diff --git a/sysutils/squashfs-tools/files/patch-squashfs-tools_Makefile b/sysutils/squashfs-tools/files/patch-Makefile
index 22c83391b905..0a4c58c61755 100644
--- a/sysutils/squashfs-tools/files/patch-squashfs-tools_Makefile
+++ b/sysutils/squashfs-tools/files/patch-Makefile
@@ -1,15 +1,15 @@
---- 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 \
@@ -18,7 +18,7 @@
  	-Wall
  
  LIBS = -lpthread -lm
-@@ -253,6 +253,6 @@
+@@ -300,6 +300,6 @@ clean:
  
  .PHONY: install
  install: mksquashfs unsquashfs
diff --git a/sysutils/squashfs-tools/files/patch-action.c b/sysutils/squashfs-tools/files/patch-action.c
index b03bb387b4ee..2c07b6980c84 100644
--- a/sysutils/squashfs-tools/files/patch-action.c
+++ b/sysutils/squashfs-tools/files/patch-action.c
@@ -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"
diff --git a/sysutils/squashfs-tools/files/patch-pseudo.c b/sysutils/squashfs-tools/files/patch-pseudo.c
new file mode 100644
index 000000000000..3639ca3e0c1a
--- /dev/null
+++ b/sysutils/squashfs-tools/files/patch-pseudo.c
@@ -0,0 +1,13 @@
+--- 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"
+ #include "error.h"
+ #include "progressbar.h"
diff --git a/sysutils/squashfs-tools/files/patch-squashfs-tools_pseudo.c b/sysutils/squashfs-tools/files/patch-squashfs-tools_pseudo.c
deleted file mode 100644
index 7d190dc6559e..000000000000
--- a/sysutils/squashfs-tools/files/patch-squashfs-tools_pseudo.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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>
- 
-+#ifdef __FreeBSD__
-+#include <sys/stat.h>
-+#endif
-+
- #include "pseudo.h"
- 
- #ifdef SQUASHFS_TRACE
diff --git a/sysutils/squashfs-tools/files/patch-squashfs-tools_unsquashfs.c b/sysutils/squashfs-tools/files/patch-unsquashfs.c
index f691b8b4e594..c3da83377b97 100644
--- a/sysutils/squashfs-tools/files/patch-squashfs-tools_unsquashfs.c
+++ b/sysutils/squashfs-tools/files/patch-unsquashfs.c
@@ -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"