svn commit: r411419 - branches/2016Q1/net/tigervnc

[Mark Felder]

Author: feld
Date: Sat Mar 19 17:54:27 2016
New Revision: 411419
URL: https://svnweb.freebsd.org/changeset/ports/411419

Log:
  MFH: r411418
  
  net/tigervnc: Remove HPJPG option
  
  The HPJPG option has been broken and irrelevant since the ports tree
  changed to make jpeg-turbo the default jpeg provider in r397084
  
  PR:		208088
  Approved by:	maintainer
  Approved by:	ports-secteam (with hat)

Modified:
  branches/2016Q1/net/tigervnc/Makefile
Directory Properties:
  branches/2016Q1/   (props changed)

Modified: branches/2016Q1/net/tigervnc/Makefile
==============================================================================
--- branches/2016Q1/net/tigervnc/Makefile	Sat Mar 19 17:53:43 2016	(r411418)
+++ branches/2016Q1/net/tigervnc/Makefile	Sat Mar 19 17:54:27 2016	(r411419)
@@ -3,6 +3,7 @@
 
 PORTNAME=	tigervnc
 PORTVERSION=	1.5.0
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 PORTREVISION=	1
 CATEGORIES=	net x11-servers
@@ -25,7 +26,7 @@ CONFLICTS=	tridiavnc-[0-9]* \
 		tightvnc-[0-9]* \
 		vnc-[0-9]*
 
-USES=		autoreconf:build cmake cpe gmake libtool pkgconfig python
+USES=		autoreconf:build cmake cpe gmake jpeg libtool pkgconfig python
 USE_GL=		gl
 USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
@@ -39,10 +40,9 @@ USE_XORG+=	bigreqsproto compositeproto d
 
 CFLAGS+=	-fPIC
 
-OPTIONS_DEFINE=		GNUTLS NLS PAM VIEWER HPJPG DOCS
+OPTIONS_DEFINE=		GNUTLS NLS PAM VIEWER DOCS
 OPTIONS_DEFAULT=	GNUTLS NLS PAM VIEWER
 VIEWER_DESC=		Build vncviewer
-HPJPG_DESC=		Build with High-Performance JPEG support
 
 .include <bsd.port.options.mk>
 
@@ -90,12 +90,6 @@ CMAKE_ARGS+=	-DBUILD_VIEWER=0
 PLIST_SUB+=	VIEWER="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MHPJPG}
-LIB_DEPENDS+=	libturbojpeg.so:${PORTSDIR}/graphics/libjpeg-turbo
-.else
-USES+=		jpeg
-.endif
-
 MAKE_ARGS+=	TIGERVNC_SRCDIR=${WRKSRC}
 CONFIGURE_ARGS+=	\
 		--prefix=${PREFIX} --mandir=${PREFIX}/man/ \