Index: head/net/libvncserver/Makefile =================================================================== --- head/net/libvncserver/Makefile +++ head/net/libvncserver/Makefile @@ -2,11 +2,9 @@ # $FreeBSD$ PORTNAME= libvncserver -PORTVERSION= 0.9.9 -PORTREVISION= 12 +PORTVERSION= 0.9.10 +DISTVERSIONPREFIX= LibVNCServer- CATEGORIES= net devel -MASTER_SITES= SF -DISTNAME= LibVNCServer-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Provide an easy API to a custom vnc server @@ -15,33 +13,36 @@ LIB_DEPENDS= libpng.so:graphics/png -USES= jpeg libtool pathfix +USE_GITHUB= yes +GH_ACCOUNT= LibVNC + +USES= autoreconf jpeg libtool pathfix pkgconfig +PATHFIX_MAKEFILEIN= Makefile.am USE_LDCONFIG= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ARGS= --without-x INSTALL_TARGET= install-strip -OPTIONS_DEFINE= GNUTLS OPENSSL GCRYPT IPV6 -OPTIONS_DEFAULT=OPENSSL -GCRYPT_DESC= libgcrypt support +OPTIONS_DEFINE= GCRYPT IPV6 +OPTIONS_SINGLE= SSL +OPTIONS_SINGLE_SSL= GNUTLS OPENSSL +OPTIONS_DEFAULT= OPENSSL +GCRYPT_DESC= libgcrypt support +GNUTLS_IMPLIES= GCRYPT GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls GNUTLS_CONFIGURE_WITH= gnutls OPENSSL_CONFIGURE_WITH= crypto ssl OPENSSL_USE= OPENSSL=yes -GCRYPT_LIB_DEPENDS= libgcrypt.so:security/libgcrypt +GCRYPT_LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ + libgpg-error.so:security/libgpg-error GCRYPT_CONFIGURE_WITH= gcrypt IPV6_CONFIGURE_WITH= ipv6 -post-patch: - @${REINPLACE_CMD} -e \ - '/^SUBDIRS/s|x11vnc||g' ${WRKSRC}/Makefile.in - post-install: ${INSTALL_DATA} ${WRKSRC}/rfb/default8x16.h ${STAGEDIR}${PREFIX}/include/rfb Index: head/net/libvncserver/distinfo =================================================================== --- head/net/libvncserver/distinfo +++ head/net/libvncserver/distinfo @@ -1,2 +1,3 @@ -SHA256 (LibVNCServer-0.9.9.tar.gz) = cf060d3525c2fb92be2fa18bbc697fb355592b52484e60745f3bcac5c3f803f9 -SIZE (LibVNCServer-0.9.9.tar.gz) = 1678609 +TIMESTAMP = 1466709748 +SHA256 (LibVNC-libvncserver-LibVNCServer-0.9.10_GH0.tar.gz) = ed10819a5bfbf269969f97f075939cc38273cc1b6d28bccfb0999fba489411f7 +SIZE (LibVNC-libvncserver-LibVNCServer-0.9.10_GH0.tar.gz) = 1415191 Index: head/net/libvncserver/files/patch-configure =================================================================== --- head/net/libvncserver/files/patch-configure +++ head/net/libvncserver/files/patch-configure @@ -1,10 +0,0 @@ ---- ./configure.orig 2011-10-14 10:10:19.219720000 +0200 -+++ ./configure 2011-10-14 10:16:40.505588294 +0200 -@@ -22008,7 +22008,6 @@ - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo in -lws2_32" >&5 - $as_echo_n "checking for getaddrinfo in -lws2_32... " >&6; } -- LIBS="$LIBS -lws2_32" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include Index: head/net/libvncserver/files/patch-libvncserver__sockets.c =================================================================== --- head/net/libvncserver/files/patch-libvncserver__sockets.c +++ head/net/libvncserver/files/patch-libvncserver__sockets.c @@ -1,14 +0,0 @@ ---- ./libvncserver/sockets.c.orig 2012-05-04 16:19:00.000000000 +0200 -+++ ./libvncserver/sockets.c 2012-06-07 01:13:31.179964830 +0200 -@@ -402,9 +402,9 @@ - rfbLogPerror("rfbProcessNewConnection: error in select"); - return FALSE; - } -- if (FD_ISSET(rfbScreen->listenSock, &listen_fds)) -+ if (rfbScreen->listenSock >= 0 && FD_ISSET(rfbScreen->listenSock, &listen_fds)) - chosen_listen_sock = rfbScreen->listenSock; -- if (FD_ISSET(rfbScreen->listen6Sock, &listen_fds)) -+ if (rfbScreen->listen6Sock >= 0 && FD_ISSET(rfbScreen->listen6Sock, &listen_fds)) - chosen_listen_sock = rfbScreen->listen6Sock; - - if ((sock = accept(chosen_listen_sock, Index: head/net/libvncserver/files/patch-libvncserver_rfbregion.c =================================================================== --- head/net/libvncserver/files/patch-libvncserver_rfbregion.c +++ head/net/libvncserver/files/patch-libvncserver_rfbregion.c @@ -1,11 +0,0 @@ ---- ./libvncserver/rfbregion.c.orig 2014-07-01 23:00:03.428441834 +1000 -+++ ./libvncserver/rfbregion.c 2014-07-01 23:00:14.275274256 +1000 -@@ -751,7 +751,7 @@ - i->ptrSize += DEFSTEP; - i->sPtrs = (sraSpan**)realloc(i->sPtrs, sizeof(sraSpan*)*i->ptrSize); - } -- i->ptrPos =+ 2; -+ i->ptrPos += 2; - if(sraReverse(i)) { - i->sPtrs[i->ptrPos] = i->sPtrs[i->ptrPos-2]->subspan->back._prev; - i->sPtrs[i->ptrPos+1] = &(i->sPtrs[i->ptrPos-2]->subspan->front); Index: head/net/libvncserver/pkg-descr =================================================================== --- head/net/libvncserver/pkg-descr +++ head/net/libvncserver/pkg-descr @@ -1,4 +1,4 @@ LibVNCServer is ripped out of Xvnc to provide an easy API to write one's own vnc server. -WWW: http://libvncserver.sourceforge.net/ +WWW: http://libvnc.github.io/