Upgrade to version 1.0.28

Feature safe:	yes

5 files changed, 21 insertions, 18 deletions

diff --git a/net/ssvnc/Makefile b/net/ssvnc/Makefile
index ff9a8a29baa6..113fd975bc0f 100644
--- a/net/ssvnc/Makefile
+++ b/net/ssvnc/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ssvnc
-PORTVERSION=	1.0.22
-PORTREVISION=	2
+PORTVERSION=	1.0.28
 CATEGORIES=	net security
 MASTER_SITES=	SF
 DISTFILES=	${DISTNAME}.src${EXTRACT_SUFX}
@@ -47,10 +46,10 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|grep Linux|grep ${OPSYS}|' ${WRKSRC}/scripts/util/ss_vncviewer
 	@${REINPLACE_CMD} -e 's|[[:<:]]ssvnc[[:>:]]|ssvnc-gui|' ${WRKSRC}/man/man1/ssvnc.1
 .if !defined(WITH_ULTRAFTP)
-	@${REINPLACE_CMD} -e "s|sh -c 'type javac'||" \
-		-e "s|sh -c 'type jar'||" \
-		-e 's|cd $$(JSRC);|@#|' \
-		-e 's|cp -p $$(ARCHIVE)|@#|' \
+	@${REINPLACE_CMD} -e "s|sh -c 'type javac'|:|" \
+		-e "s|sh -c 'type jar'|:|" \
+		-e 's|cd $$(JSRC);|: |' \
+		-e 's|cp -p $$(ARCHIVE)|:|' \
 		${WRKSRC}/Makefile
 .endif
 
diff --git a/net/ssvnc/distinfo b/net/ssvnc/distinfo
index 780c135e8cb4..582929e58a78 100644
--- a/net/ssvnc/distinfo
+++ b/net/ssvnc/distinfo
@@ -1,3 +1,2 @@
-MD5 (ssvnc-1.0.22.src.tar.gz) = 6273ae862a0e1b1b9dd5aa46eab512dc
-SHA256 (ssvnc-1.0.22.src.tar.gz) = a758ad5f4584f2b7aa170fbae5a99849bbc97ef0500b1ecb7445dcbd01d736d9
-SIZE (ssvnc-1.0.22.src.tar.gz) = 453665
+SHA256 (ssvnc-1.0.28.src.tar.gz) = a4244e81f3e3f2778af1e04d8953576133bb66607d6f3c1457a07594b94c1de1
+SIZE (ssvnc-1.0.28.src.tar.gz) = 542796
diff --git a/net/ssvnc/files/patch-Makefile b/net/ssvnc/files/patch-Makefile
index 07d476e16761..f3182308893a 100644
--- a/net/ssvnc/files/patch-Makefile
+++ b/net/ssvnc/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	2008-11-16 18:31:44.000000000 +0100
-+++ Makefile	2009-05-05 16:24:14.572268630 +0200
+--- Makefile.orig	2011-02-05 00:28:18.000000000 -0800
++++ Makefile	2011-02-05 00:36:51.000000000 -0800
 @@ -29,6 +29,7 @@
  MANDIR  ?= $(MAN)
  APPS    ?= share/applications
@@ -8,12 +8,12 @@
  
  
  VSRC = vnc_unixsrc
-@@ -65,23 +66,28 @@
+@@ -65,23 +66,30 @@
  	cd $(PSRC); $(MAKE) clean
  
  install: all
--	mkdir -p $(ROOT)$(PREFIX)/$(BIN) $(ROOT)$(PREFIX)/$(LIB) $(ROOT)$(PREFIX)/$(MANDIR)
-+	mkdir -p $(ROOT)$(PREFIX)/$(BIN) $(ROOT)$(PREFIX)/$(LIB)/util $(ROOT)$(PREFIX)/$(MANDIR)
+-	mkdir -p $(ROOT)$(PREFIX)/$(BIN) $(ROOT)$(PREFIX)/$(LIB) $(ROOT)$(PREFIX)/$(MANDIR)/man1
++	mkdir -p $(ROOT)$(PREFIX)/$(BIN) $(ROOT)$(PREFIX)/$(LIB)/util $(ROOT)$(PREFIX)/$(MANDIR)/man1
  	strip $(VIEWER)
  	cp -p $(VIEWER) $(ROOT)$(PREFIX)/$(LIB)
  	cp -p $(VNCSPW) $(ROOT)$(PREFIX)/$(LIB)
@@ -23,20 +23,22 @@
 -	cp -pR scripts/* $(ROOT)$(PREFIX)/$(LIB)
 +	cp -p scripts/ssvnc $(ROOT)$(PREFIX)/$(LIB)
 +	cp -p scripts/ssvnc_cmd $(ROOT)$(PREFIX)/$(LIB)
++	cp -p scripts/tsvnc $(ROOT)$(PREFIX)/$(LIB)
 +	cp -p scripts/util/ssvnc.tcl $(ROOT)$(PREFIX)/$(LIB)/util
 +	cp -p scripts/util/ss_vncviewer $(ROOT)$(PREFIX)/$(LIB)/util
- 	cp -p $(ARCHIVE) $(ROOT)$(PREFIX)/$(LIB)/util
--	cp -p $(MAN)/ssvnc.1 $(ROOT)$(PREFIX)/$(MANDIR)
+ 	if [ "X$(JSRC)" != "X" ]; then cp -p $(ARCHIVE) $(ROOT)$(PREFIX)/$(LIB)/util; fi
+-	cp -p $(MAN)/man1/ssvnc.1 $(ROOT)$(PREFIX)/$(MANDIR)/man1
 -	./wr_tool $(ROOT)$(PREFIX)/$(BIN)/ssvnc  $(PREFIX)/$(LIB)/ssvnc
 -	./wr_tool $(ROOT)$(PREFIX)/$(BIN)/tsvnc  $(PREFIX)/$(LIB)/tsvnc
 -	./wr_tool $(ROOT)$(PREFIX)/$(BIN)/sshvnc $(PREFIX)/$(LIB)/sshvnc
-+	cp -p $(MAN)/ssvnc.1 $(ROOT)$(PREFIX)/$(MANDIR)/ssvnc-gui.1
++	cp -p $(MAN)/man1/ssvnc.1 $(ROOT)$(PREFIX)/$(MANDIR)/man1/ssvnc-gui.1
 +	./wr_tool $(ROOT)$(PREFIX)/$(BIN)/ssvnc-gui  $(PREFIX)/$(LIB)/ssvnc
++	./wr_tool $(ROOT)$(PREFIX)/$(BIN)/ssvnc-ts  $(PREFIX)/$(LIB)/tsvnc
 +	./wr_tool $(ROOT)$(PREFIX)/$(BIN)/ssvnc-stunnel  $(PREFIX)/$(LIB)/util/ss_vncviewer
  	if [ "X$(APPS)" != X ]; then mkdir -p $(ROOT)$(PREFIX)/$(APPS); fi
  	if [ "X$(APPS)" != X ]; then cp -p ssvnc.desktop $(ROOT)$(PREFIX)/$(APPS); fi
  	if [ "X$(BINNAME)" != X ]; then cp -p $(VIEWER) $(ROOT)$(PREFIX)/$(BIN)/$(BINNAME); fi
- 	if [ "X$(BINNAME)" != X ]; then cp -p $(MAN)/ssvncviewer.1 $(ROOT)$(PREFIX)/$(MANDIR)/$(BINNAME).1; fi
+ 	if [ "X$(BINNAME)" != X ]; then cp -p $(MAN)/man1/ssvncviewer.1 $(ROOT)$(PREFIX)/$(MANDIR)/man1/$(BINNAME).1; fi
 +	if [ "X$(DOCS)" != X ]; then mkdir -p $(ROOT)$(PREFIX)/$(DOCS); fi
 +	if [ "X$(DOCS)" != X ]; then cp -p scripts/util/stunnel-server.conf $(ROOT)$(PREFIX)/$(DOCS); fi
 +	if [ "X$(DOCS)" != X ]; then cp -p README $(ROOT)$(PREFIX)/$(DOCS); fi
diff --git a/net/ssvnc/pkg-message b/net/ssvnc/pkg-message
index fd1596af8682..fd7c0b86750f 100644
--- a/net/ssvnc/pkg-message
+++ b/net/ssvnc/pkg-message
@@ -3,6 +3,7 @@
 SSVNC has been installed, and the following commands are available:
 
 ssvncviewer	- SSVNC viewer
+ssvnc-ts	- Wrapper script for Terminal Services mode
 ssvnc-stunnel	- Wrapper script for SSVNC + stunnel (SSH/SSL tunnels)
 ssvnc-gui	- GUI for the previous commands
 
diff --git a/net/ssvnc/pkg-plist b/net/ssvnc/pkg-plist
index f1bce1666fdd..c485752f9e01 100644
--- a/net/ssvnc/pkg-plist
+++ b/net/ssvnc/pkg-plist
@@ -1,9 +1,11 @@
 bin/ssvnc-gui
 bin/ssvnc-stunnel
+bin/ssvnc-ts
 bin/ssvncviewer
 lib/ssvnc/lim_accept.so
 lib/ssvnc/ssvnc
 lib/ssvnc/ssvnc_cmd
+lib/ssvnc/tsvnc
 lib/ssvnc/ultravnc_dsm_helper
 lib/ssvnc/unwrap.so
 lib/ssvnc/util/ss_vncviewer