Attachment 186209 Details for Bug 222176 – [patch] fix 'make stage' (missed STAGEDIR) + freebsd netstat usage in launch.sh

[patch] [patch] fix 'make stage' (missed STAGEDIR) + freebsd netstat usage in launch.sh

pr-fix-build+launch.sh.diff (text/plain), 1.30 KB, created by John Hein on 2017-09-09 21:54:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Hein

Created: 2017-09-09 21:54:42 UTC

Size: 1.30 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 449486)
>+++ Makefile	(working copy)
>@@ -20,7 +20,7 @@
> 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}
> 	
>Index: files/patch-utils_launch.sh
>===================================================================
>--- files/patch-utils_launch.sh	(nonexistent)
>+++ files/patch-utils_launch.sh	(working copy)
>@@ -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
>
>Property changes on: files/patch-utils_launch.sh
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 222176: 186209