From owner-svn-ports-all@freebsd.org  Thu Jun 30 18:57:59 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2F946B87F7D;
 Thu, 30 Jun 2016 18:57:59 +0000 (UTC)
 (envelope-from dinoex@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id F079526C2;
 Thu, 30 Jun 2016 18:57:58 +0000 (UTC)
 (envelope-from dinoex@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5UIvw4V079963;
 Thu, 30 Jun 2016 18:57:58 GMT (envelope-from dinoex@FreeBSD.org)
Received: (from dinoex@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5UIvvNd079961;
 Thu, 30 Jun 2016 18:57:57 GMT (envelope-from dinoex@FreeBSD.org)
Message-Id: <201606301857.u5UIvvNd079961@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dinoex set sender to
 dinoex@FreeBSD.org using -f
From: Dirk Meyer <dinoex@FreeBSD.org>
Date: Thu, 30 Jun 2016 18:57:57 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r417834 - in head/net/x11vnc: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Jun 2016 18:57:59 -0000

Author: dinoex
Date: Thu Jun 30 18:57:57 2016
New Revision: 417834
URL: https://svnweb.freebsd.org/changeset/ports/417834

Log:
  - support build with libressl
  PR:		210700
  Submitted by:	Andris Raugulis
  Obtained from:	https://github.com/Sp1l/freebsd-ports/blob/master/net/x11vnc/files/patch-x11vnc_enc.h

Added:
  head/net/x11vnc/files/
  head/net/x11vnc/files/patch-x11vnc_enc.h   (contents, props changed)
Modified:
  head/net/x11vnc/Makefile

Modified: head/net/x11vnc/Makefile
==============================================================================
--- head/net/x11vnc/Makefile	Thu Jun 30 16:44:10 2016	(r417833)
+++ head/net/x11vnc/Makefile	Thu Jun 30 18:57:57 2016	(r417834)
@@ -20,7 +20,7 @@ USE_XORG=	x11 xcb xdamage xfixes xrandr 
 # Sets LDFLAGS and adds to CONFIGURE_ENV, therefore we set LDFLAGS
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_OPENSSL=	yes
-USES=		iconv jpeg pkgconfig
+USES=		iconv pkgconfig jpeg
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 

Added: head/net/x11vnc/files/patch-x11vnc_enc.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/x11vnc/files/patch-x11vnc_enc.h	Thu Jun 30 18:57:57 2016	(r417834)
@@ -0,0 +1,13 @@
+--- x11vnc/enc.h.orig	2011-08-10 22:31:32 UTC
++++ x11vnc/enc.h
+@@ -454,8 +454,10 @@ extern void enc_do(char *ciph, char *key
+ 		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) {