View | Details | Raw Unified | Return to bug 134236
Collapse All | Expand All

(-)ssvnc/Makefile (-32 / +39 lines)
Lines 6-56 Link Here
6
#
6
#
7
7
8
PORTNAME=	ssvnc
8
PORTNAME=	ssvnc
9
PORTVERSION=	1.0.20
9
PORTVERSION=	1.0.22
10
PORTREVISION=	7
11
CATEGORIES=	net security
10
CATEGORIES=	net security
12
MASTER_SITES=	http://www.karlrunge.com/x11vnc/etv/
11
MASTER_SITES=	SF
12
DISTFILES=	${DISTNAME}.src${EXTRACT_SUFX}
13
13
14
MAINTAINER=	alepulver@FreeBSD.org
14
MAINTAINER=	alepulver@FreeBSD.org
15
COMMENT=	Enhanced TightVNC Viewer (SSVNC: SSL/SSH VNC viewer)
15
COMMENT=	Enhanced TightVNC Viewer (SSVNC: SSL/SSH VNC viewer)
16
16
17
BUILD_DEPENDS=	imake:${PORTSDIR}/devel/imake
17
BUILD_DEPENDS=	imake:${PORTSDIR}/devel/imake
18
LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
18
LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
19
RUN_DEPENDS=	stunnel:${PORTSDIR}/security/stunnel
19
RUN_DEPENDS=	stunnel:${PORTSDIR}/security/stunnel \
20
		xterm:${PORTSDIR}/x11/xterm
20
21
21
USE_XORG=	xi xmu xt xaw
22
OPTIONS=	ULTRAFTP "UltraVNC File Transfer support (Java required)"	off
23
24
USE_GMAKE=	yes
25
USE_XORG=	xi xmu xt xaw ice xpm xext sm
22
USE_TCL_RUN=	84
26
USE_TCL_RUN=	84
23
USE_TK_RUN=	84
27
USE_TK_RUN=	84
24
WRKSRC=		${WRKDIR}/${PORTNAME}
28
USE_PERL5_RUN=	yes
29
30
.if defined(WITH_ULTRAFTP)
31
USE_JAVA=	yes
32
PLIST_SUB+=	ULTRAFTP=""
33
.else
34
PLIST_SUB+=	ULTRAFTP="@comment "
35
.endif
36
.if defined(NOPORTDOCS)
37
MAKE_ARGS+=	DOCS=""
38
.endif
39
40
MAN1=	ssvnc-gui.1 \
41
	ssvncviewer.1
42
43
PLIST_SUB+=	LIBDIR=lib/${PORTNAME} DESKTOPDIR=${_DESKTOPDIR_REL}
25
44
26
post-patch:
45
post-patch:
27
	@${REINPLACE_CMD} -e \
46
	@${REINPLACE_CMD} -e 's|exec wish|exec ${WISH}|' ${WRKSRC}/scripts/util/ssvnc.tcl
28
		's|/usr/local|${LOCALBASE}|g; s|/usr/X11R6|${LOCALBASE}|g' \
47
	@${REINPLACE_CMD} -e 's|grep Linux|grep ${OPSYS}|' ${WRKSRC}/scripts/util/ss_vncviewer
29
		${WRKSRC}/build.unix
48
	@${REINPLACE_CMD} -e 's|[[:<:]]ssvnc[[:>:]]|ssvnc-gui|' ${WRKSRC}/man/man1/ssvnc.1
30
	@${REINPLACE_CMD} -e \
49
.if !defined(WITH_ULTRAFTP)
31
		's|exec wish|exec ${WISH}|; \
50
	@${REINPLACE_CMD} -e "s|sh -c 'type javac'||" \
32
		 303,$$s|ss_vncviewer|ssvnc-stunnel|; \
51
		-e "s|sh -c 'type jar'||" \
33
		 s|ssvnc_cmd|ssvnc-stunnel|' \
52
		-e 's|cd $$(JSRC);|@#|' \
34
		 ${WRKSRC}/bin/util/ssvnc.tcl
53
		-e 's|cp -p $$(ARCHIVE)|@#|' \
35
	@${REINPLACE_CMD} -e \
54
		${WRKSRC}/Makefile
36
		's|ss_vncviewer|ssvnc-stunnel|; \
37
		 s|-vncviewer|-ssvnc|; \
38
		 s|grep Linux|grep ${OPSYS}|' \
39
		 ${WRKSRC}/bin/util/ss_vncviewer
40
41
do-build:
42
	@cd ${WRKSRC} && ${SETENV} UNAME="${OPSYS}" ${SH} build.unix
43
44
do-install:
45
	${INSTALL_PROGRAM} ${WRKSRC}/bin/${OPSYS}/vncviewer ${PREFIX}/bin/ssvnc
46
	${INSTALL_SCRIPT} ${WRKSRC}/bin/util/ss_vncviewer \
47
		${PREFIX}/bin/ssvnc-stunnel
48
	${INSTALL_SCRIPT} ${WRKSRC}/bin/util/ssvnc.tcl ${PREFIX}/bin/ssvnc-gui
49
.if !defined(NOPORTDOCS)
50
	${MKDIR} ${DOCSDIR}
51
	cd ${WRKSRC} && ${INSTALL_DATA} README bin/util/stunnel-server.conf \
52
		${DOCSDIR}
53
.endif
55
.endif
56
57
do-configure:
58
	@cd ${WRKSRC} && ${GMAKE} config
59
60
post-install:
54
	@${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD}
61
	@${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD}
55
62
56
.include <bsd.port.mk>
63
.include <bsd.port.mk>
(-)ssvnc/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (ssvnc-1.0.20.tar.gz) = 9d4b1531cac07df5a9975d6760b426c1
1
MD5 (ssvnc-1.0.22.src.tar.gz) = 6273ae862a0e1b1b9dd5aa46eab512dc
2
SHA256 (ssvnc-1.0.20.tar.gz) = 27edb3bec4cd48a899bec3bcbee437c9ee3514cdd29eb21c3a2b16546780e0f1
2
SHA256 (ssvnc-1.0.22.src.tar.gz) = a758ad5f4584f2b7aa170fbae5a99849bbc97ef0500b1ecb7445dcbd01d736d9
3
SIZE (ssvnc-1.0.20.tar.gz) = 13191851
3
SIZE (ssvnc-1.0.22.src.tar.gz) = 453665
(-)ssvnc/files/patch-Makefile (+45 lines)
Line 0 Link Here
1
--- Makefile.orig	2008-11-16 18:31:44.000000000 +0100
2
+++ Makefile	2009-05-05 16:24:14.572268630 +0200
3
@@ -29,6 +29,7 @@
4
 MANDIR  ?= $(MAN)
5
 APPS    ?= share/applications
6
 BINNAME ?= ssvncviewer
7
+DOCS    ?= share/doc/ssvnc
8
 
9
 
10
 VSRC = vnc_unixsrc
11
@@ -65,23 +66,28 @@
12
 	cd $(PSRC); $(MAKE) clean
13
 
14
 install: all
15
-	mkdir -p $(ROOT)$(PREFIX)/$(BIN) $(ROOT)$(PREFIX)/$(LIB) $(ROOT)$(PREFIX)/$(MANDIR)
16
+	mkdir -p $(ROOT)$(PREFIX)/$(BIN) $(ROOT)$(PREFIX)/$(LIB)/util $(ROOT)$(PREFIX)/$(MANDIR)
17
 	strip $(VIEWER)
18
 	cp -p $(VIEWER) $(ROOT)$(PREFIX)/$(LIB)
19
 	cp -p $(VNCSPW) $(ROOT)$(PREFIX)/$(LIB)
20
 	cp -p $(UNWRAP) $(ROOT)$(PREFIX)/$(LIB)
21
 	cp -p $(LIMACC) $(ROOT)$(PREFIX)/$(LIB)
22
 	cp -p $(ULTDSM) $(ROOT)$(PREFIX)/$(LIB)
23
-	cp -pR scripts/* $(ROOT)$(PREFIX)/$(LIB)
24
+	cp -p scripts/ssvnc $(ROOT)$(PREFIX)/$(LIB)
25
+	cp -p scripts/ssvnc_cmd $(ROOT)$(PREFIX)/$(LIB)
26
+	cp -p scripts/util/ssvnc.tcl $(ROOT)$(PREFIX)/$(LIB)/util
27
+	cp -p scripts/util/ss_vncviewer $(ROOT)$(PREFIX)/$(LIB)/util
28
 	cp -p $(ARCHIVE) $(ROOT)$(PREFIX)/$(LIB)/util
29
-	cp -p $(MAN)/ssvnc.1 $(ROOT)$(PREFIX)/$(MANDIR)
30
-	./wr_tool $(ROOT)$(PREFIX)/$(BIN)/ssvnc  $(PREFIX)/$(LIB)/ssvnc
31
-	./wr_tool $(ROOT)$(PREFIX)/$(BIN)/tsvnc  $(PREFIX)/$(LIB)/tsvnc
32
-	./wr_tool $(ROOT)$(PREFIX)/$(BIN)/sshvnc $(PREFIX)/$(LIB)/sshvnc
33
+	cp -p $(MAN)/ssvnc.1 $(ROOT)$(PREFIX)/$(MANDIR)/ssvnc-gui.1
34
+	./wr_tool $(ROOT)$(PREFIX)/$(BIN)/ssvnc-gui  $(PREFIX)/$(LIB)/ssvnc
35
+	./wr_tool $(ROOT)$(PREFIX)/$(BIN)/ssvnc-stunnel  $(PREFIX)/$(LIB)/util/ss_vncviewer
36
 	if [ "X$(APPS)" != X ]; then mkdir -p $(ROOT)$(PREFIX)/$(APPS); fi
37
 	if [ "X$(APPS)" != X ]; then cp -p ssvnc.desktop $(ROOT)$(PREFIX)/$(APPS); fi
38
 	if [ "X$(BINNAME)" != X ]; then cp -p $(VIEWER) $(ROOT)$(PREFIX)/$(BIN)/$(BINNAME); fi
39
 	if [ "X$(BINNAME)" != X ]; then cp -p $(MAN)/ssvncviewer.1 $(ROOT)$(PREFIX)/$(MANDIR)/$(BINNAME).1; fi
40
+	if [ "X$(DOCS)" != X ]; then mkdir -p $(ROOT)$(PREFIX)/$(DOCS); fi
41
+	if [ "X$(DOCS)" != X ]; then cp -p scripts/util/stunnel-server.conf $(ROOT)$(PREFIX)/$(DOCS); fi
42
+	if [ "X$(DOCS)" != X ]; then cp -p README $(ROOT)$(PREFIX)/$(DOCS); fi
43
 
44
 
45
 #internal use only, a test install:
(-)ssvnc/files/patch-build.unix (-47 lines)
Lines 1-47 Link Here
1
--- ./build.unix.orig	Sat Apr 21 20:10:49 2007
2
+++ ./build.unix	Mon Apr 23 21:43:58 2007
3
@@ -77,12 +77,13 @@
4
 
5
 # Create a tmp dir for this build:
6
 #
7
-tmp=./src/tmp/$name.$$
8
+tmp=./src/tmp/$name
9
 if [ "X$TMPDIR" != "X" ]; then
10
 	tmp="$TMPDIR/$tmp"
11
 fi
12
 mkdir -p $tmp || exit 1
13
 
14
+if false; then
15
 # Try to find some static archives of various libraries:
16
 #
17
 libs="$tmp/libs"
18
@@ -108,6 +109,7 @@
19
 ls -ld $libs
20
 ls -l $libs
21
 echo
22
+fi
23
 
24
 have_gcc=""
25
 if type gcc > /dev/null; then
26
@@ -203,7 +205,7 @@
27
 xmkmf
28
 make Makefiles
29
 mv vncviewer/Makefile vncviewer/Makefile.orig
30
-sed -e "s,EXTRA_LDOPTIONS =,EXTRA_LDOPTIONS = -L$start/$libs $LDFLAGS_OS," \
31
+sed -e "s,EXTRA_LDOPTIONS =,EXTRA_LDOPTIONS = $LDFLAGS_OS," \
32
     -e "s,CCOPTIONS =,CCOPTIONS = $CPPFLAGS_OS," \
33
 	vncviewer/Makefile.orig > vncviewer/Makefile
34
 
35
@@ -245,6 +247,7 @@
36
 $LDD $dest/vncviewer$suff
37
 echo ""
38
 
39
+if false; then
40
 # Do stunnel:
41
 #
42
 stunnel_src=`ls -td ./src/stunnel* | head -1`
43
@@ -322,3 +325,4 @@
44
 
45
 $dest/vncviewer$suff -h
46
 $LDD $dest/vncviewer$suff
47
+fi
(-)ssvnc/pkg-message (-1 / +1 lines)
Lines 2-8 Link Here
2
2
3
SSVNC has been installed, and the following commands are available:
3
SSVNC has been installed, and the following commands are available:
4
4
5
ssvnc		- SSVNC viewer
5
ssvncviewer	- SSVNC viewer
6
ssvnc-stunnel	- Wrapper script for SSVNC + stunnel (SSH/SSL tunnels)
6
ssvnc-stunnel	- Wrapper script for SSVNC + stunnel (SSH/SSL tunnels)
7
ssvnc-gui	- GUI for the previous commands
7
ssvnc-gui	- GUI for the previous commands
8
8
(-)ssvnc/pkg-plist (-1 / +14 lines)
Lines 1-6 Link Here
1
bin/ssvnc
2
bin/ssvnc-gui
1
bin/ssvnc-gui
3
bin/ssvnc-stunnel
2
bin/ssvnc-stunnel
3
bin/ssvncviewer
4
%%DESKTOPDIR%%ssvnc.desktop
5
%%LIBDIR%%/lim_accept.so
6
%%LIBDIR%%/ssvnc
7
%%LIBDIR%%/ssvnc_cmd
8
%%LIBDIR%%/ultravnc_dsm_helper
9
%%LIBDIR%%/unwrap.so
10
%%LIBDIR%%/util/ss_vncviewer
11
%%LIBDIR%%/util/ssvnc.tcl
12
%%LIBDIR%%/vncstorepw
13
%%LIBDIR%%/vncviewer
14
%%ULTRAFTP%%%%LIBDIR%%/ultraftp.jar
4
%%PORTDOCS%%%%DOCSDIR%%/README
15
%%PORTDOCS%%%%DOCSDIR%%/README
5
%%PORTDOCS%%%%DOCSDIR%%/stunnel-server.conf
16
%%PORTDOCS%%%%DOCSDIR%%/stunnel-server.conf
6
%%PORTDOCS%%@dirrm %%DOCSDIR%%
17
%%PORTDOCS%%@dirrm %%DOCSDIR%%
18
@dirrmtry %%LIBDIR%%/util
19
@dirrmtry %%LIBDIR%%

Return to bug 134236