From f0d6b930db2df9976a935377bccd8df9f8c91be3 Mon Sep 17 00:00:00 2001 From: Marcelo Araujo Date: Fri, 22 Sep 2017 04:56:37 +0000 Subject: [PATCH] - Fix stage and fix netstat invocation in launch.sh. PR: ports/222176 Submitted by: John Hein --- www/novnc/Makefile | 3 ++- www/novnc/files/patch-utils_launch.sh | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 www/novnc/files/patch-utils_launch.sh diff --git a/www/novnc/Makefile b/www/novnc/Makefile index d5cd250eb8d2..48f8e21cc0e8 100644 --- a/www/novnc/Makefile +++ b/www/novnc/Makefile @@ -2,6 +2,7 @@ PORTNAME= novnc PORTVERSION= 0.6.2 +PORTREVISION= 1 CATEGORIES= www MAINTAINER= araujo@FreeBSD.org @@ -20,7 +21,7 @@ NO_ARCH= yes TARGET_DIR= ${PREFIX}/libexec/novnc do-install: - ${MKDIR} ${TARGET_DIR} + ${MKDIR} ${STAGEDIR}${TARGET_DIR} cd ${WRKSRC} && ${RM} .gitignore .gitmodules .travis.yml cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${TARGET_DIR} diff --git a/www/novnc/files/patch-utils_launch.sh b/www/novnc/files/patch-utils_launch.sh new file mode 100644 index 000000000000..ae59adbf8a5b --- /dev/null +++ b/www/novnc/files/patch-utils_launch.sh @@ -0,0 +1,11 @@ +--- utils/launch.sh.orig 2017-01-12 19:36:42 UTC ++++ utils/launch.sh +@@ -69,7 +69,7 @@ done + which netstat >/dev/null 2>&1 \ + || die "Must have netstat installed" + +-netstat -ltn | grep -qs "${PORT} .*LISTEN" \ ++netstat -a -p tcp -n | grep -qs "${PORT} .*LISTEN" \ + && die "Port ${PORT} in use. Try --listen PORT" + + trap "cleanup" TERM QUIT INT EXIT