git: a6dfa43d8f1d - 2021Q3 - net/unfs3: Fix build with -fno-common (FreeBSD 13 or later)

[Yasuhiro Kimura]

The branch 2021Q3 has been updated by yasu:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a6dfa43d8f1d397cc649e85de336555c6b4967bb

commit a6dfa43d8f1d397cc649e85de336555c6b4967bb
Author:     Robert Clausecker <fuz at fuz.su>
AuthorDate: 2021-09-06 22:48:54 +0000
Commit:     Yasuhiro Kimura <yasu at FreeBSD.org>
CommitDate: 2021-09-29 09:34:29 +0000

    net/unfs3: Fix build with -fno-common (FreeBSD 13 or later)
    
    * Update MASTER_SITES and WWW as project has moved to GitHub
    * Pass maintainership to submitter
    * Clean up and reformat Makefile
    
    PR:             258326
    Approved by:    meta (mentor)
    MFH:            2021Q3
    Differential Revision:  https://reviews.freebsd.org/D32220
    
    (cherry picked from commit 4c35fa18e7434733681f5cc05337bf571241dbae)
---
 net/unfs3/Makefile                     | 23 +++++++++++++----------
 net/unfs3/files/patch-Config_exports.h | 11 +++++++++++
 net/unfs3/files/patch-Config_exports.l | 18 ++++++++++++++++++
 net/unfs3/pkg-descr                    |  2 +-
 4 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/net/unfs3/Makefile b/net/unfs3/Makefile
index 401b383ab369..fd87caae14bb 100644
--- a/net/unfs3/Makefile
+++ b/net/unfs3/Makefile
@@ -1,30 +1,33 @@
 # Created by: Clement Laforet <clement at FreeBSD.org>
 
 PORTNAME=	unfs3
-PORTVERSION=	0.9.22
-PORTREVISION=	1
+DISTVERSION=	0.9.22
+PORTREVISION=	2
 CATEGORIES=	net
-MASTER_SITES=	SF
+MASTER_SITES=	https://github.com/unfs3/unfs3/releases/download/unfs3-${DISTVERSION}/
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	fuz at fuz.su
 COMMENT=	User-space implementation of the NFSv3 server specification
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BROKEN_FreeBSD_13=	ld: error: duplicate symbol: export_path
-BROKEN_FreeBSD_14=	ld: error: duplicate symbol: export_path
-
 USES=		autoreconf
 GNU_CONFIGURE=	yes
-INSTALL_TARGET=	install-strip
 CONFIGURE_ENV=	YACC=byacc
 
-PLIST_FILES=	sbin/unfsd man/man7/tags.7.gz man/man8/unfsd.8.gz
-
 MAKE_JOBS_UNSAFE=	yes
+INSTALL_TARGET=	install-strip
+
+PLIST_FILES=	man/man7/tags.7.gz \
+		man/man8/unfsd.8.gz \
+		sbin/unfsd
 
 OPTIONS_DEFINE=	CLUSTER_EXT
+CLUSTER_EXT_DESC=	include clustering extensions
 CLUSTER_EXT_CONFIGURE_ON=	--enable-cluster
 
+post-extract:
+	@${RM} ${WRKSRC}/Config/lex.yy.c
+
 .include <bsd.port.mk>
diff --git a/net/unfs3/files/patch-Config_exports.h b/net/unfs3/files/patch-Config_exports.h
new file mode 100644
index 000000000000..fb11e191d1df
--- /dev/null
+++ b/net/unfs3/files/patch-Config_exports.h
@@ -0,0 +1,11 @@
+--- Config/exports.h.orig	2021-09-06 22:17:18 UTC
++++ Config/exports.h
+@@ -22,7 +22,7 @@
+ extern exports	exports_nfslist;
+ /* Options cache */
+ extern int	exports_opts;
+-const char      *export_path; 
++extern const char      *export_path; 
+ extern uint32 	export_fsid;
+ extern uint32   export_password_hash;
+ 
diff --git a/net/unfs3/files/patch-Config_exports.l b/net/unfs3/files/patch-Config_exports.l
new file mode 100644
index 000000000000..5d4edc546521
--- /dev/null
+++ b/net/unfs3/files/patch-Config_exports.l
@@ -0,0 +1,18 @@
+--- Config/exports.l.orig	2021-09-06 22:20:46 UTC
++++ Config/exports.l
+@@ -14,7 +14,7 @@
+ 
+ #define YY_NO_UNPUT
+ 
+-YYSTYPE yylval;
++extern YYSTYPE yylval;
+ extern int e_error;
+ 
+ /*
+@@ -67,4 +67,4 @@ OLDNET {IP}"/"{IP}
+ 
+ .			{ return *yytext; }
+ \n			{ return '\n'; }
+-   
+\ No newline at end of file
++   
diff --git a/net/unfs3/pkg-descr b/net/unfs3/pkg-descr
index 0f4864839c14..b70b86101249 100644
--- a/net/unfs3/pkg-descr
+++ b/net/unfs3/pkg-descr
@@ -3,4 +3,4 @@ provides a daemon for the MOUNT and NFS protocols, which are used by NFS
 clients for accessing files on the server.
 Since it runs in user-space, you can use it in a jail.
 
-WWW: http://unfs3.sourceforge.net/
+WWW: https://unfs3.github.io/