From 713275e77417d6a49504d8bba0dfbe99e34b3005 Mon Sep 17 00:00:00 2001
From: Larry Rosenman <ler@FreeBSD.org>
Date: Tue, 7 May 2019 15:09:59 +0000
Subject: [PATCH] sysutils/lsof: move to GitHub, update to 4.93.1

Changes since 4.92:

4.93.0    May 7, 2019

    [freebsd] Made FreeBSD 13 adjustment.
    [darwin] Fix a typo causing a build error.
    Fix a potential memory leak.
    [linux] use tirpc for rpc if libc doesn't provide rpc.h.
    Fix a typo in man page.
    [linux] fix memory leaks detected by valgrind about unix
    endpoint information.
    Update the description about -fg and -fG options on linux.

4.93.1    May 7, 2019

    Fix a broken symbolic link.

The new features developed at lsof-org/lsof-linux repository is not
merged yet.
---
 sysutils/lsof/Makefile              | 59 ++++++++++++-----------------
 sysutils/lsof/distinfo              |  6 +--
 sysutils/lsof/files/patch-Configure | 13 -------
 3 files changed, 28 insertions(+), 50 deletions(-)
 delete mode 100644 sysutils/lsof/files/patch-Configure

diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile
index 86298ddb1e26..a33b9534a2d9 100644
--- a/sysutils/lsof/Makefile
+++ b/sysutils/lsof/Makefile
@@ -2,14 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	lsof
-DISTVERSION=	4.92B
-PORTREVISION=	1
+DISTVERSION=	4.93.1
 PORTEPOCH=	8
 CATEGORIES=	sysutils
-MASTER_SITES=	ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ \
-		ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/NEW/ \
-		LOCAL/ler/lsof 
-DISTNAME=	${PORTNAME}_${DISTVERSION}${DISTNAME_SUFFIX}
 
 MAINTAINER=	ler@FreeBSD.org
 COMMENT=	Lists information about open files (similar to fstat(1))
@@ -19,47 +14,43 @@ LICENSE_NAME=	lsof
 LICENSE_FILE=	${FILESDIR}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-#Please leave the below line in for the next clean up.
-FIXUP_RELEASE=	YES
-.if defined(FIXUP_RELEASE)
-DISTNAME_SUFFIX=.freebsd
-.else
-SRCBALL_NAME=	${DISTNAME:S/_W$//}_src
-WRKSRC=		${WRKDIR}/${DISTNAME}/${SRCBALL_NAME}
-.endif
+USES=		shebangfix tar:bzip2
+
 HAS_CONFIGURE=	yes
 
-USES=		shebangfix tar:bzip2
+USE_GITHUB=	yes
+GH_ACCOUNT=	lsof-org
+
 SHEBANG_FILES=	scripts/sort_res.perl5
 
+.if !exists(${SRC_BASE}/sys/kern/kern_lockf.c)
+IGNORE=		requires kernel sources
+.endif
+
 .include <bsd.port.pre.mk>
 
 CONFIGURE_SCRIPT=	Configure
 CONFIGURE_ARGS=	-n freebsd
 CONFIGURE_ENV=	LSOF_CC="${CC}" FREEBSD_SYS="${SRC_BASE}/sys"
 
-.if !exists(${SRC_BASE}/sys/kern/kern_lockf.c)
-IGNORE=		requires kernel sources
-.endif
-
-.if !defined(FIXUP_RELEASE)
-post-extract:
-	@( cd ${WRKDIR}/${DISTNAME} ; \
-	EXPMD5=`${SED} -n 's/^[[:blank:]]*\(MD5*=*\)/\1/p' README.${DISTNAME}` ; \
-	CALCMD5=`${MD5} ${SRCBALL_NAME}.tar` ; \
-	if [ "$${EXPMD5}"X != "$${CALCMD5}"X ]; then \
-		${ECHO} "Expected and calculated MD5 signatures don't agree." ; \
-		${ECHO} "($$EXPMD5 != $$CALCMD5)" ; \
-		exit 1 ; \
-	fi ; \
-	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${SRCBALL_NAME}.tar ${EXTRACT_AFTER_ARGS} \
-	)
-	@( cd ${WRKSRC} ; ${ECHO_CMD} "y" | ./Inventory || exit 1 )
-.endif
+# .if !defined(FIXUP_RELEASE)
+# post-extract:
+# 	@( cd ${WRKDIR}/${DISTNAME} ; \
+# 	EXPMD5=`${SED} -n 's/^[[:blank:]]*\(MD5*=*\)/\1/p' README.${DISTNAME}` ; \
+# 	CALCMD5=`${MD5} ${SRCBALL_NAME}.tar` ; \
+# 	if [ "$${EXPMD5}"X != "$${CALCMD5}"X ]; then \
+# 		${ECHO} "Expected and calculated MD5 signatures don't agree." ; \
+# 		${ECHO} "($$EXPMD5 != $$CALCMD5)" ; \
+# 		exit 1 ; \
+# 	fi ; \
+# 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${SRCBALL_NAME}.tar ${EXTRACT_AFTER_ARGS} \
+# 	)
+# 	@( cd ${WRKSRC} ; ${ECHO_CMD} "y" | ./Inventory || exit 1 )
+# .endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/lsof ${STAGEDIR}${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/lsof.8 ${STAGEDIR}${MAN8PREFIX}/man/man8/lsof.8
+	${INSTALL_MAN} ${WRKSRC}/Lsof.8 ${STAGEDIR}${MAN8PREFIX}/man/man8/lsof.8
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/lsof
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/* ${STAGEDIR}${PREFIX}/share/lsof
 	@${CHMOD} 0444 ${STAGEDIR}${PREFIX}/share/lsof/00*
diff --git a/sysutils/lsof/distinfo b/sysutils/lsof/distinfo
index 5dbbe751b3e6..ce4ff971f97a 100644
--- a/sysutils/lsof/distinfo
+++ b/sysutils/lsof/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1528308653
-SHA256 (lsof_4.92B.freebsd.tar.bz2) = 7abcc69c265acf13e77573ca5e105cc647119e95199650f7af714f0239e092b4
-SIZE (lsof_4.92B.freebsd.tar.bz2) = 491292
+TIMESTAMP = 1557240808
+SHA256 (lsof-org-lsof-4.93.1_GH0.tar.gz) = ae522562e94bde45ef16d401f374ac4399b44443d1aa91cb0c7900857ea771ca
+SIZE (lsof-org-lsof-4.93.1_GH0.tar.gz) = 1319055
diff --git a/sysutils/lsof/files/patch-Configure b/sysutils/lsof/files/patch-Configure
deleted file mode 100644
index 719dfd2c0d7c..000000000000
--- a/sysutils/lsof/files/patch-Configure
+++ /dev/null
@@ -1,13 +0,0 @@
---- Configure.orig	2018-10-21 14:19:32 UTC
-+++ Configure
-@@ -1624,6 +1624,10 @@ kernel generation process.
- 	LSOF_TSTBIGF=" "
- 	LSOF_VERS=12000
- 	;;
-+      13*)
-+	LSOF_TSTBIGF=" "
-+	LSOF_VERS=13000
-+	;;
-       *)
- 	echo Unknown FreeBSD release: `uname -r`
- 	rm -f $LSOF_HLP