From owner-svn-ports-all@freebsd.org Fri Mar 15 03:44:39 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 53966153AD4F; Fri, 15 Mar 2019 03:44:39 +0000 (UTC) (envelope-from meta@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E63BD85B19; Fri, 15 Mar 2019 03:44:38 +0000 (UTC) (envelope-from meta@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D336548A2; Fri, 15 Mar 2019 03:44:38 +0000 (UTC) (envelope-from meta@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2F3ic2v028861; Fri, 15 Mar 2019 03:44:38 GMT (envelope-from meta@FreeBSD.org) Received: (from meta@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2F3icNV028860; Fri, 15 Mar 2019 03:44:38 GMT (envelope-from meta@FreeBSD.org) Message-Id: <201903150344.x2F3icNV028860@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: meta set sender to meta@FreeBSD.org using -f From: Koichiro Iwao Date: Fri, 15 Mar 2019 03:44:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r495759 - head/net/tigervnc X-SVN-Group: ports-head X-SVN-Commit-Author: meta X-SVN-Commit-Paths: head/net/tigervnc X-SVN-Commit-Revision: 495759 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: E63BD85B19 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.973,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Mar 2019 03:44:39 -0000 Author: meta Date: Fri Mar 15 03:44:38 2019 New Revision: 495759 URL: https://svnweb.freebsd.org/changeset/ports/495759 Log: net/tigervnc: Switch to options helpers - Cleanup unnecessary CFLAGS - Switch shell substitution from `` to $() - Switch to ImageMagick 7 (used only to create icons during build) - s/XORG_WRKDIR/XORG_WRKSRC/ as the variable actually refers WRKSRC - Use relative path to refer other ports as many other ports do that Reviewed by: adamw Differential Revision: https://reviews.freebsd.org/D19585 Modified: head/net/tigervnc/Makefile Modified: head/net/tigervnc/Makefile ============================================================================== --- head/net/tigervnc/Makefile Fri Mar 15 03:27:35 2019 (r495758) +++ head/net/tigervnc/Makefile Fri Mar 15 03:44:38 2019 (r495759) @@ -3,7 +3,7 @@ PORTNAME= tigervnc PORTVERSION= 1.9.0 DISTVERSIONPREFIX= v -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net x11-servers MAINTAINER= meta@FreeBSD.org @@ -36,58 +36,30 @@ GH_ACCOUNT= TigerVNC USE_XORG+= ice pixman sm x11 xau xdamage xdmcp xext xfixes xfont xkbfile \ xorg-macros xorgproto xrandr xrender xtrans xtst -CFLAGS+= -fPIC - OPTIONS_DEFINE= GNUTLS NLS PAM VIEWER DOCS OPTIONS_DEFAULT= GNUTLS PAM VIEWER +OPTIONS_SUB= yes VIEWER_DESC= Build vncviewer -.include +GNUTLS_CMAKE_BOOL= ENABLE_GNUTLS +GNUTLS_CONFIGURE_ARGS= --enable-glx-tls +GNUTLS_LIB_DEPENDS= libtasn1.so:security/libtasn1 \ + libgcrypt.so:security/libgcrypt \ + libgpg-error.so:security/libgpg-error \ + libgnutls.so:security/gnutls +PAM_CMAKE_BOOL= ENABLE_PAM +VIEWER_CMAKE_BOOL= BUILD_VIEWER +VIEWER_BUILD_DEPENDS= convert:graphics/ImageMagick7 # to generate icons during build +VIEWER_LIB_DEPENDS= libpng.so:graphics/png \ + libfltk.so:x11-toolkits/fltk +VIEWER_INSTALLS_ICONS= yes +VIEWER_DESKTOP_ENTRIES= "TigerVNC viewer" "Connect to VNC server and display remote desktop" \ + "${PORTNAME}" "vncviewer" "Network;" false +VIEWER_USE= xorg=xcursor,xfixes,xft,xinerama +NLS_CMAKE_BOOL= ENABLE_NLS +NLS_USES= gettext -CMAKE_ARGS= -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=${STAGE}${PREFIX} - -.if ${PORT_OPTIONS:MGNUTLS} -LIB_DEPENDS+= libtasn1.so:security/libtasn1 \ - libgcrypt.so:security/libgcrypt \ - libgpg-error.so:security/libgpg-error \ - libgnutls.so:security/gnutls -CONFIGURE_ARGS+= --enable-glx-tls -CMAKE_ARGS+= -DENABLE_GNUTLS=1 -.else -CMAKE_ARGS+= -DENABLE_GNUTLS=0 -.endif - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -CMAKE_ARGS+= -DENABLE_NLS=1 -PLIST_SUB+= NLS="" -.else -CMAKE_ARGS+= -DENABLE_NLS=0 -PLIST_SUB+= NLS="@comment " -.endif - -.if ${PORT_OPTIONS:MPAM} -CMAKE_ARGS+= -DENABLE_PAM=1 -.else -CMAKE_ARGS+= -DENABLE_PAM=0 -.endif - -.if ${PORT_OPTIONS:MVIEWER} -CMAKE_ARGS+= -DBUILD_VIEWER=1 -LIB_DEPENDS+= libpng.so:graphics/png \ - libfltk.so:x11-toolkits/fltk -# ImageMagick is required to generate icons during build process -BUILD_DEPENDS+= ${LOCALBASE}/bin/convert:graphics/ImageMagick6 -USE_XORG+= xcursor xfixes xft xinerama -PLIST_SUB+= VIEWER="" -INSTALLS_ICONS= yes -DESKTOP_ENTRIES= "TigerVNC viewer" "Connect to VNC server and display remote desktop" \ - "${PORTNAME}" "vncviewer" "Network;" false -.else -CMAKE_ARGS+= -DBUILD_VIEWER=0 -PLIST_SUB+= VIEWER="@comment " -.endif - +CMAKE_ARGS+= -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=${STAGE}${PREFIX} MAKE_ARGS+= TIGERVNC_SRCDIR=${WRKSRC} CONFIGURE_ARGS+= \ --prefix=${PREFIX} --mandir=${PREFIX}/man/ \ @@ -112,7 +84,8 @@ CONFIGURE_ARGS+= \ LIB_DEPENDS+= libunwind.so:devel/libunwind .endif -TIGERVNC_XORG_PATCH_VER= ${MAKE} -C "${PORTSDIR}/x11-servers/xorg-server" -V PORTVERSION:R:S,\.,,g +TIGERVNC_XORG_PATCH_VER= ${MAKE} -C "${.CURDIR}/../../x11-servers/xorg-server" -V PORTVERSION:R:S,\.,,g +XORG_WRKSRC= ${MAKE} -C ${.CURDIR}/../../x11-servers/xorg-server -VWRKSRC # import from x11-server/xorg-server/Makefile .if ${SSL_DEFAULT} == base @@ -123,13 +96,11 @@ TIGERVNC_XORG_PATCH_VER= ${MAKE} -C "${PORTSDIR}/x11-s CONFIGURE_ENV= SHA1_LIB="-L/usr/lib -lcrypto" SHA1_CFLAGS="-I/usr/include" .endif -XORG_WRKDIR= ${MAKE} -C ${PORTSDIR}/x11-servers/xorg-server -VWRKSRC - pre-patch: - @${CP} -R `${XORG_WRKDIR}`/ ${WRKSRC}/unix/xserver/ + @${CP} -R $$(${XORG_WRKSRC})/ ${WRKSRC}/unix/xserver/ post-patch: - @cd ${WRKSRC}/unix/xserver/ && ${PATCH} -p1 < ${WRKSRC}/unix/xserver`${TIGERVNC_XORG_PATCH_VER}`.patch + @cd ${WRKSRC}/unix/xserver/ && ${PATCH} -p1 < ${WRKSRC}/unix/xserver$$(${TIGERVNC_XORG_PATCH_VER}).patch post-configure: @cd ${WRKSRC}/unix/xserver/ && ${SETENV} ${CONFIGURE_ENV} ${MAKE_ENV} ${AUTORECONF} -fiv