move vncstorepw to /usr/local/bin in the main package, it's used for

-passwd. use correct path to stunnel.

net/ssvnc/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.27 2013/03/11 11:35:57 espie Exp $
+# $OpenBSD: Makefile,v 1.28 2013/04/20 16:26:25 sthen Exp $
 
 COMMENT-gui =		enhanced TightVNC client GUI and wrappers
 COMMENT-main =		enhanced TightVNC client
@@ -10,7 +10,8 @@ PKGNAME =		ssvnc-$V
 EPOCH =			0
 FULLPKGNAME-gui =	ssvnc-$V
 FULLPKGNAME-main =	ssvnc-viewer-$V
-REVISION-gui =		0
+REVISION-gui =		1
+REVISION-main =		0
 
 CATEGORIES =		net x11
 
@@ -52,7 +53,7 @@ VNCSRC =		${WRKSRC}/vnc_unixsrc/
 VNCLIB =		${PREFIX}/lib/ssvnc/
 
 pre-configure:
-	${SUBST_CMD} ${WRKSRC}/scripts/ssvnc
+	cd ${WRKSRC}/scripts; ${SUBST_CMD} ssvnc util/ss_vncviewer
 
 do-configure:
 	cd ${VNCSRC}/libvncauth; ${XMKMF}
@@ -71,7 +72,7 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/ssvnc.desktop ${PREFIX}/share/applications
 	${INSTALL_PROGRAM} ${VNCSRC}/vncviewer/vncviewer ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/vncstorepw/vncstorepw ${VNCLIB}
+	${INSTALL_PROGRAM} ${WRKSRC}/vncstorepw/vncstorepw ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/vncstorepw/ultravnc_dsm_helper ${VNCLIB}
 .for i in vncstorepw/lim_accept.so vncstorepw/unwrap.so
 	if test -r ${WRKSRC}/$i; then ${INSTALL_DATA} ${WRKSRC}/$i ${VNCLIB}; fi

net/ssvnc/patches/patch-scripts_util_ss_vncviewer

@@ -0,0 +1,44 @@
+$OpenBSD: patch-scripts_util_ss_vncviewer,v 1.1 2013/04/20 16:26:25 sthen Exp $
+--- scripts/util/ss_vncviewer.orig	Fri Feb  8 17:13:50 2013
++++ scripts/util/ss_vncviewer	Fri Feb  8 17:17:45 2013
+@@ -150,37 +150,15 @@ if [ "X$SS_DEBUG" != "X" -a "X$SS_DEBUG" != "X0" ]; th
+ 	set -xv 
+ fi
+ 
+-PATH=$PATH:/usr/sbin:/usr/local/sbin:/dist/sbin; export PATH
++PATH=$PATH:/usr/sbin:${LOCALBASE}/sbin; export PATH
+ 
+ localhost="localhost"
+ if uname | grep Darwin >/dev/null; then
+ 	localhost="127.0.0.1"
+ fi
+ 
+-# work out which stunnel to use (debian installs as stunnel4)
+-stunnel_set_here=""
+-if [ "X$STUNNEL" = "X" ]; then
+-	check_stunnel=1
+-	if [ "X$SSVNC_BASEDIRNAME" != "X" ]; then
+-		if [ -x "$SSVNC_BASEDIRNAME/stunnel" ]; then
+-			type stunnel > /dev/null 2>&1
+-			if [ $? = 0 ]; then
+-				# found ours
+-				STUNNEL=stunnel
+-				check_stunnel=0
+-			fi
+-		fi
+-	fi
+-	if [ "X$check_stunnel" = "X1" ]; then
+-		type stunnel4 > /dev/null 2>&1
+-		if [ $? = 0 ]; then
+-			STUNNEL=stunnel4
+-		else
+-			STUNNEL=stunnel
+-		fi
+-	fi
+-	stunnel_set_here=1
+-fi
++STUNNEL=${LOCALBASE}/sbin/stunnel
++stunnel_set_here=1
+ 
+ help() {
+ 	tail -n +2 "$0" | sed -e '/^$/ q'

net/ssvnc/patches/patch-vnc_unixsrc_vncviewer_vncviewer_man

@@ -0,0 +1,21 @@
+$OpenBSD: patch-vnc_unixsrc_vncviewer_vncviewer_man,v 1.1 2013/04/20 16:26:25 sthen Exp $
+--- vnc_unixsrc/vncviewer/vncviewer.man.orig	Mon Mar  4 16:54:22 2013
++++ vnc_unixsrc/vncviewer/vncviewer.man	Mon Mar  4 16:54:51 2013
+@@ -116,7 +116,7 @@ login authentication over the standard VNC authenticat
+ .TP
+ \fB\-passwd\fR \fIpasswd\-file\fR
+ File from which to get the password (as generated by the
+-\fBvncpasswd\fR(1) program). This option affects only the standard VNC
++\fBvncstorepw\fR(1) program). This option affects only the standard VNC
+ authentication.
+ .TP
+ \fB\-encodings\fR \fIencoding\-list\fR
+@@ -816,7 +816,7 @@ local TCP port number;
+ .B %R
+ remote TCP port number.
+ .SH SEE ALSO
+-\fBvncserver\fR(1), \fBx11vnc\fR(1), \fBssvnc\fR(1), \fBXvnc\fR(1), \fBvncpasswd\fR(1),
++\fBvncserver\fR(1), \fBx11vnc\fR(1), \fBssvnc\fR(1), \fBXvnc\fR(1), \fBvncstorepw\fR(1),
+ \fBvncconnect\fR(1), \fBssh\fR(1), http://www.karlrunge.com/x11vnc, http://www.karlrunge.com/x11vnc/ssvnc.html
+ .SH AUTHORS
+ Original VNC was developed in AT&T Laboratories Cambridge. TightVNC

net/ssvnc/pkg/PLIST-gui

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-gui,v 1.5 2011/09/15 20:24:16 sthen Exp $
+@comment $OpenBSD: PLIST-gui,v 1.6 2013/04/20 16:26:25 sthen Exp $
 bin/sshvnc
 bin/ssvnc
 bin/tsvnc
@@ -15,7 +15,6 @@ lib/ssvnc/util/ss_vncviewer
 lib/ssvnc/util/ssvnc.tcl
 @comment lib/ssvnc/util/ssvnc.tcl.orig
 lib/ssvnc/util/stunnel-server.conf
-@bin lib/ssvnc/vncstorepw
 @man man/man1/ssvnc.1
 %%SHARED%%
 share/applications/ssvnc.desktop

net/ssvnc/pkg/PLIST-main

@@ -1,6 +1,8 @@
-@comment $OpenBSD: PLIST-main,v 1.3 2011/07/02 10:37:05 sthen Exp $
+@comment $OpenBSD: PLIST-main,v 1.4 2013/04/20 16:26:25 sthen Exp $
 @conflict tightvnc-viewer-*
+@conflict ssvnc-<=ssvnc-1.0.29p0v0
 @pkgpath net/tightvnc,-viewer
 @bin bin/vncviewer
+@bin bin/vncstorepw
 @man man/man1/vncviewer.1
 @comment share/applications/