svn commit: r489510 - in head/net/x11vnc: . files

[Dirk Meyer]

Author: dinoex
Date: Sun Jan  6 16:52:48 2019
New Revision: 489510
URL: https://svnweb.freebsd.org/changeset/ports/489510

Log:
  x11vnc
  - update to 0.9.15
  - new upstream

Added:
  head/net/x11vnc/files/patch-configure.ac   (contents, props changed)
Deleted:
  head/net/x11vnc/files/patch-x11vnc_enc.h
Modified:
  head/net/x11vnc/Makefile
  head/net/x11vnc/distinfo
  head/net/x11vnc/pkg-descr
  head/net/x11vnc/pkg-plist

Modified: head/net/x11vnc/Makefile
==============================================================================
--- head/net/x11vnc/Makefile	Sun Jan  6 16:51:20 2019	(r489509)
+++ head/net/x11vnc/Makefile	Sun Jan  6 16:52:48 2019	(r489510)
@@ -2,10 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	x11vnc
-PORTVERSION=	0.9.13
-PORTREVISION=	6
+PORTVERSION=	0.9.15
 CATEGORIES=	net
-MASTER_SITES=	SF/libvncserver/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	dinoex at FreeBSD.org
 COMMENT=	VNC server for use with real X displays
@@ -13,17 +11,21 @@ COMMENT=	VNC server for use with real X displays
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:devel/libpthread-stubs
-LIB_DEPENDS=	libdbus-1.so:devel/dbus
+LIB_DEPENDS=	libvncserver.so:net/libvncserver
 
 USE_XORG=	x11 xcb xdamage xfixes xrandr xinerama xext xtst xau xrender \
-		xdmcp xorgproto
+		xdmcp xi xorgproto
 # Sets LDFLAGS and adds to CONFIGURE_ENV, therefore we set LDFLAGS
 LDFLAGS+=	-L${LOCALBASE}/lib
-USES=		iconv pkgconfig jpeg ssl
+USES=		iconv pkgconfig jpeg ssl gmake autoreconf
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-ssl=${OPENSSLBASE}
 CPPFLAGS+=	-I${LOCALBASE}/include
+USE_GITHUB=	yes
+GH_ACCOUNT=	LibVNC
+#DEFAULT_VERSIONS=	ssl=openssl
 
-PORTDOCS=	AUTHORS COPYING ChangeLog NEWS README README.LibVNCServer TODO
+PORTDOCS=	AUTHORS ChangeLog NEWS README
 
 OPTIONS_DEFINE=	NLS AVAHI DOCS
 OPTIONS_DEFAULT=AVAHI
@@ -31,11 +33,6 @@ NO_OPTIONS_SORT=yes
 NLS_USES=	gettext
 AVAHI_LIB_DEPENDS=	libavahi-common.so:net/avahi-app
 AVAHI_CONFIGURE_OFF=	--without-avahi
-
-post-patch:
-	${REINPLACE_CMD} -e 's|include_HEADERS = |noinst_HEADERS = |' \
-		-e 's|am__include_HEADERS_DIST|am__noinst_HEADERS_DIST|' \
-		-e 's|/include/rfb|/include|' ${WRKSRC}/Makefile.in
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}

Modified: head/net/x11vnc/distinfo
==============================================================================
--- head/net/x11vnc/distinfo	Sun Jan  6 16:51:20 2019	(r489509)
+++ head/net/x11vnc/distinfo	Sun Jan  6 16:52:48 2019	(r489510)
@@ -1,2 +1,3 @@
-SHA256 (x11vnc-0.9.13.tar.gz) = f6829f2e629667a5284de62b080b13126a0736499fe47cdb447aedb07a59f13b
-SIZE (x11vnc-0.9.13.tar.gz) = 2853769
+TIMESTAMP = 1546374247
+SHA256 (LibVNC-x11vnc-0.9.15_GH0.tar.gz) = 3e43bd875edc3c7f52a0d3676c4ec7de910fcd210240ee20b4522deb2bf84cff
+SIZE (LibVNC-x11vnc-0.9.15_GH0.tar.gz) = 1701821

Added: head/net/x11vnc/files/patch-configure.ac
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/x11vnc/files/patch-configure.ac	Sun Jan  6 16:52:48 2019	(r489510)
@@ -0,0 +1,16 @@
+--- configure.ac.orig	2018-02-04 21:43:38 UTC
++++ configure.ac
+@@ -62,11 +62,11 @@ AC_SUBST(CRYPT_LIBS)
+ AH_TEMPLATE(HAVE_X509_PRINT_EX_FP, [open ssl X509_print_ex_fp available])
+ if test "x$with_ssl" != "xno"; then
+ 	if test "x$HAVE_LIBCRYPTO" = "xtrue"; then
+-		PKG_CHECK_MODULES(OPENSSL, [openssl >= 1.0.0],
++		AC_CHECK_LIB(ssl, SSL_free,
+ 			SSL_LIBS="-lssl -lcrypto"
+ 			[AC_DEFINE(HAVE_LIBSSL) HAVE_LIBSSL="true"], ,)
+ 	else
+-		PKG_CHECK_MODULES(OPENSSL, [openssl >= 1.0.0],
++		AC_CHECK_LIB(ssl, SSL_free,
+ 			SSL_LIBS="-lssl"
+ 			[AC_DEFINE(HAVE_LIBSSL) HAVE_LIBSSL="true"], ,)
+ 	fi

Modified: head/net/x11vnc/pkg-descr
==============================================================================
--- head/net/x11vnc/pkg-descr	Sun Jan  6 16:51:20 2019	(r489509)
+++ head/net/x11vnc/pkg-descr	Sun Jan  6 16:52:48 2019	(r489510)
@@ -7,4 +7,4 @@ to connect to.
 
 LICENSE: GPL2 or later
 
-WWW: http://www.karlrunge.com/x11vnc/
+WWW: https://github.com/LibVNC/x11vnc

Modified: head/net/x11vnc/pkg-plist
==============================================================================
--- head/net/x11vnc/pkg-plist	Sun Jan  6 16:51:20 2019	(r489509)
+++ head/net/x11vnc/pkg-plist	Sun Jan  6 16:52:48 2019	(r489510)
@@ -1,15 +1,4 @@
 bin/x11vnc
+bin/Xdummy
 man/man1/x11vnc.1.gz
-%%DATADIR%%/classes/ssl/README
-%%DATADIR%%/classes/ssl/SignedUltraViewerSSL.jar
-%%DATADIR%%/classes/ssl/SignedVncViewer.jar
-%%DATADIR%%/classes/ssl/UltraViewerSSL.jar
-%%DATADIR%%/classes/ssl/VncViewer.jar
-%%DATADIR%%/classes/ssl/index.vnc
-%%DATADIR%%/classes/ssl/proxy.vnc
-%%DATADIR%%/classes/ssl/ss_vncviewer
-%%DATADIR%%/classes/ssl/ultra.vnc
-%%DATADIR%%/classes/ssl/ultrasigned.vnc
-%%DATADIR%%/classes/VncViewer.jar
-%%DATADIR%%/classes/index.vnc
 share/applications/x11vnc.desktop