Index: head/net/ssvnc/Makefile
===================================================================
--- head/net/ssvnc/Makefile	(revision 422016)
+++ head/net/ssvnc/Makefile	(revision 422017)
@@ -1,61 +1,62 @@
 # Created by: Alejandro Pulver <alepulver@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	ssvnc
 PORTVERSION=	1.0.29
 PORTREVISION=	2
 CATEGORIES=	net security
 MASTER_SITES=	SF
 DISTFILES=	${DISTNAME}.src${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Enhanced TightVNC Viewer (SSVNC: SSL/SSH VNC viewer)
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	stunnel:security/stunnel \
 		xterm:x11/xterm
 
-OPTIONS_DEFINE=	DOCS ULTRAFTP
-ULTRAFTP_DESC=	UltraVNC File Transfer support (Java required)
-
-USES=		gmake imake:env jpeg perl5 tk:wrapper
-USE_OPENSSL=	yes
+USES=		gmake imake:env jpeg perl5 ssl tk:wrapper
 USE_PERL5=	run
 USE_XORG=	xi xmu xt xaw ice xpm xext sm
+CFLAGS+=	-I${OPENSSLINC}
+LDFLAGS+=	-L${OPENSSLLIB}
 
+OPTIONS_DEFINE=	DOCS ULTRAFTP
+OPTIONS_SUB=	yes
+
+ULTRAFTP_DESC=	UltraVNC File Transfer support (Java required)
+ULTRAFTP_USE=	JAVA=yes
+
 MAKE_ENV+=	ROOT=${STAGEDIR}
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MULTRAFTP}
-USE_JAVA=	yes
-PLIST_SUB+=	ULTRAFTP=""
-.else
+.if ! ${PORT_OPTIONS:MULTRAFTP}
 MAKE_ARGS+=	JSRC=""
-PLIST_SUB+=	ULTRAFTP="@comment "
 .endif
 
 .if ! ${PORT_OPTIONS:MDOCS}
 MAKE_ARGS+=	DOCS=""
 .endif
 
 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
-	@${REINPLACE_CMD} -e 's|/usr/local/bin|${LOCALBASE}/bin|' \
-		-e 's|^CC =|CC ?=|' ${WRKSRC}/vncstorepw/Makefile
+	@${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
 
 do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} config
+	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
+		${MAKE_CMD} ${MAKE_ARGS} config)
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ssvnc/*.so
 	@${MKDIR} ${STAGEDIR}${MAN1PREFIX}/man/man1
 .for man in ssvnc.1 ssvncviewer.1
 	${INSTALL_MAN} ${WRKSRC}/man/man1/${man} \
 		${STAGEDIR}${MAN1PREFIX}/man/man1
 .endfor
 
 .include <bsd.port.mk>
Index: head/net/ssvnc/files/patch-vncstorepw_Makefile
===================================================================
--- head/net/ssvnc/files/patch-vncstorepw_Makefile	(nonexistent)
+++ head/net/ssvnc/files/patch-vncstorepw_Makefile	(revision 422017)
@@ -0,0 +1,38 @@
+--- vncstorepw/Makefile.orig	2010-04-22 03:22:40 UTC
++++ vncstorepw/Makefile
+@@ -7,8 +7,6 @@ UNWRAP = unwrap.so
+ LIMACC = lim_accept.so
+ ULTDSM = ultravnc_dsm_helper
+ 
+-# gcc must be used:
+-CC = gcc
+ 
+ all: $(CMD) $(UNWRAP) $(LIMACC) $(ULTDSM)
+ 
+@@ -21,7 +19,7 @@ $(UNWRAP): unwrap.c
+ 	if [ `uname` = "Darwin" ]; then \
+ 		PATH=$$PATH:$(EPATH) $(CC) -o $(UNWRAP) -dynamiclib -fPIC unwrap.c; \
+ 	else \
+-		PATH=$$PATH:$(EPATH) $(CC) -o $(UNWRAP) -shared     -fPIC unwrap.c; \
++		PATH=$$PATH:$(EPATH) $(CC) -o $(UNWRAP) -shared     $(CFLAGS) -fPIC unwrap.c; \
+ 	fi
+ 	@ls -l $(UNWRAP)
+ 
+@@ -29,7 +27,7 @@ $(LIMACC): lim_accept.c
+ 	if [ `uname` = "Darwin" ]; then \
+ 		PATH=$$PATH:$(EPATH) $(CC) -o $(LIMACC) -dynamiclib -fPIC -nostartfiles lim_accept.c; \
+ 	else \
+-		PATH=$$PATH:$(EPATH) $(CC) -o $(LIMACC) -shared     -fPIC -nostartfiles lim_accept.c; \
++		PATH=$$PATH:$(EPATH) $(CC) -o $(LIMACC) -shared     $(CFLAGS) -fPIC -nostartfiles lim_accept.c; \
+ 	fi
+ 	@ls -l $(LIMACC)
+ 
+@@ -39,7 +37,7 @@ $(ULTDSM): ultravnc_dsm_helper.c
+ 	if [ `uname` = "SunOS" ]; then \
+ 		PATH=$$PATH:$(EPATH) $(CC) -o $(ULTDSM) $(CPP_SSL) ultravnc_dsm_helper.c $(LD_SSL) -lssl -lcrypto -lsocket -lnsl; \
+ 	else \
+-		PATH=$$PATH:$(EPATH) $(CC) -o $(ULTDSM) $(CPP_SSL) ultravnc_dsm_helper.c $(LD_SSL) -lssl -lcrypto; \
++		PATH=$$PATH:$(EPATH) $(CC) -o $(ULTDSM) $(CPP_SSL) ultravnc_dsm_helper.c $(CFLAGS) $(LDFLAGS) -lssl -lcrypto; \
+ 	fi
+ 	PATH=$$PATH:$(EPATH) strip $(ULTDSM)
+ 	@ls -l $(ULTDSM)

Property changes on: head/net/ssvnc/files/patch-vncstorepw_Makefile
___________________________________________________________________
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
Index: head/net/ssvnc/files/patch-vncstorepw_ultravnc__dsm__helper.c
===================================================================
--- head/net/ssvnc/files/patch-vncstorepw_ultravnc__dsm__helper.c	(nonexistent)
+++ head/net/ssvnc/files/patch-vncstorepw_ultravnc__dsm__helper.c	(revision 422017)
@@ -0,0 +1,13 @@
+--- vncstorepw/ultravnc_dsm_helper.c.orig	2010-04-23 04:29:43 UTC
++++ vncstorepw/ultravnc_dsm_helper.c
+@@ -413,8 +413,10 @@ void enc_do(char *ciph, char *keyfile, c
+ 		p++;
+ 		if (strstr(p, "md5+") == p) {
+ 			Digest = EVP_md5();        p += strlen("md5+");
++#ifndef OPENSSL_NO_SHA0
+ 		} else if (strstr(p, "sha+") == p) {
+ 			Digest = EVP_sha();        p += strlen("sha+");
++#endif
+ 		} else if (strstr(p, "sha1+") == p) {
+ 			Digest = EVP_sha1();       p += strlen("sha1+");
+ 		} else if (strstr(p, "ripe+") == p) {

Property changes on: head/net/ssvnc/files/patch-vncstorepw_ultravnc__dsm__helper.c
___________________________________________________________________
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