From owner-svn-ports-all@freebsd.org Fri Sep 22 04:56:38 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E331FE1540C; Fri, 22 Sep 2017 04:56:38 +0000 (UTC) (envelope-from araujo@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AFC3E7D946; Fri, 22 Sep 2017 04:56:38 +0000 (UTC) (envelope-from araujo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8M4ubWT039454; Fri, 22 Sep 2017 04:56:37 GMT (envelope-from araujo@FreeBSD.org) Received: (from araujo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8M4ub1p039452; Fri, 22 Sep 2017 04:56:37 GMT (envelope-from araujo@FreeBSD.org) Message-Id: <201709220456.v8M4ub1p039452@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: araujo set sender to araujo@FreeBSD.org using -f From: Marcelo Araujo Date: Fri, 22 Sep 2017 04:56:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r450315 - in head/www/novnc: . files X-SVN-Group: ports-head X-SVN-Commit-Author: araujo X-SVN-Commit-Paths: in head/www/novnc: . files X-SVN-Commit-Revision: 450315 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Sep 2017 04:56:39 -0000 Author: araujo Date: Fri Sep 22 04:56:37 2017 New Revision: 450315 URL: https://svnweb.freebsd.org/changeset/ports/450315 Log: - Fix stage and fix netstat invocation in launch.sh. PR: ports/222176 Submitted by: John Hein Added: head/www/novnc/files/ head/www/novnc/files/patch-utils_launch.sh (contents, props changed) Modified: head/www/novnc/Makefile Modified: head/www/novnc/Makefile ============================================================================== --- head/www/novnc/Makefile Fri Sep 22 00:51:01 2017 (r450314) +++ head/www/novnc/Makefile Fri Sep 22 04:56:37 2017 (r450315) @@ -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} Added: head/www/novnc/files/patch-utils_launch.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/novnc/files/patch-utils_launch.sh Fri Sep 22 04:56:37 2017 (r450315) @@ -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