From nobody Sat Jan 7 16:08:04 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Nq4qm5btYz2qwGd; Sat, 7 Jan 2023 16:08:04 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Nq4qm4qllz3DDs; Sat, 7 Jan 2023 16:08:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673107684; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kGMwA7UFCgQavDdBwHkQvsTg4xINQCNI54Ed0uw+RJk=; b=GxtSOmTkQVsWBXpsY1a7SuAqGsHbqf+zAVD8IFv6Czf+GJSZw24HV+pJeseIvJSL0h3nF+ 0+kVBpr/4FvYeIhgmyq1cdtBM8BspO+ls9PiIx0QQJfxKkkyaliZYYPFZTAk9O/F5lEnbX 8xTZIukO/c5n0qhJBE/k7CzYw1YCj/BI2zr8Q1pcfC+c2CHJssLruoTg/jr+QdKpCHVUWV CkJGWBqccqSS/uM2ykUVxKd6bxwUGrUY/XDT0A5/ZHxUp3qFdwyqRXSuygOacKjtO9CGx3 16dXeOCFb8A7PeKRkwkRHrTCT808n/9d2kPPUWrP+lOptBtsKGtq1v+cSLmHQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673107684; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kGMwA7UFCgQavDdBwHkQvsTg4xINQCNI54Ed0uw+RJk=; b=aITiPKU8Ma/VR3hdSCS5iRyRFIgKPq8fOuk5Vc/Hv6eW3E2cpCC/fADgKAjF075D7mq5MB jahxIwFyGQ8gWxwWkRkCxyw9dDBrxIFT89ZPrz2ifQh7L1U8ICOdFAsbJPNw596MqWS9Fx SjptTXJrplEnpXeiH5ZazVyZUmMnCgVkKD0l3iL6hwE083wkji1rQZJs3DJmsGRqWqxGHe VMrKROBAyvRlPFpYUoaYD0WiXxgENxNFRj4wHi9rynNCpJqswKoLSXxvDHcgvpjXUfmdqa wqaE1g0DiqlMrISr9w1WBVLQvRjOajX16M8md1TuMNihVj6YrmrpAL5l+8GdfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673107684; a=rsa-sha256; cv=none; b=H6UMiI8l0s/1N82kNj2Im07PLmOOkiXOiWuNJwv2Vm9FnOOTEo7s3w6rgLmN94CaDyWySU GulM/5kA/Xbsdzl15zf4i0szHL9U92V2VZ2TER4k10yYNz8XwVFaHJ3JhIrxgHNRZbhhdc FRj/94UI79IlomcNV0kqURNg2eq/WmMllp8IPlgX9//2dMC32U5K/XVEmWmk9RRBHN75wB BVVm5zavGWNtKze+zgYsGd2IjQnSGrkXVtAOo6LSJ+ssHh4V5cPcDfjbRhukWlsahokBI2 3WzKTw1rFdl/dBg/OflB+zwsz+0ToHHDshSg74fWq8gO72wfP8mnFx9+EVXJ8g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Nq4qm3vd0zFqN; Sat, 7 Jan 2023 16:08:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 307G84Xb098344; Sat, 7 Jan 2023 16:08:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 307G84cp098343; Sat, 7 Jan 2023 16:08:04 GMT (envelope-from git) Date: Sat, 7 Jan 2023 16:08:04 GMT Message-Id: <202301071608.307G84cp098343@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Hiroki Sato Subject: git: 813eb0a4f014 - main - net/tigervnc-server: Use the same default fp for Xvnc as xorg-server List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: hrs X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 813eb0a4f014592b5875b4d6fff6877c641f552b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by hrs: URL: https://cgit.FreeBSD.org/ports/commit/?id=813eb0a4f014592b5875b4d6fff6877c641f552b commit 813eb0a4f014592b5875b4d6fff6877c641f552b Author: Hiroki Sato AuthorDate: 2023-01-07 16:05:50 +0000 Commit: Hiroki Sato CommitDate: 2023-01-07 16:07:18 +0000 net/tigervnc-server: Use the same default fp for Xvnc as xorg-server Minor style fixes: - Respect ${_MAKE_JOBS} in the post-build target, and - Remove an extra strip(1) invocation in the post-install target. Approved by: meta (maintainer) Differential Revision: https://reviews.freebsd.org/D37927 --- net/tigervnc-server/Makefile | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/net/tigervnc-server/Makefile b/net/tigervnc-server/Makefile index 28dea70ceaeb..ed43c982d47d 100644 --- a/net/tigervnc-server/Makefile +++ b/net/tigervnc-server/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 5 +PORTREVISION= 6 PKGNAMESUFFIX= -server COMMENT= TigerVNC Server @@ -23,7 +23,6 @@ USE_GL+= gl USE_XORG+= ice pixman sm x11 xau xdamage xdmcp xext xfixes xfont2 \ xkbfile xorg-macros xorgproto xrandr xrender xtrans xtst -SHEBANG_LANG= bash SHEBANG_FILES= unix/vncserver/vncsession-start.in BINARY_WRAPPERS= gm4 @@ -39,14 +38,13 @@ GNUTLS_LIB_DEPENDS= libtasn1.so:security/libtasn1 \ PAM_CMAKE_BOOL= ENABLE_PAM CONFIGURE_ARGS+= \ - --prefix=${PREFIX} --mandir=${PREFIX}/share/man/ \ + --prefix=${PREFIX} --mandir=${MANPREFIX}/share/man \ --docdir=${PREFIX}/share/doc/${PORTNAME}/ --with-pic --without-dtrace \ --disable-static --disable-dri --disable-unit-tests \ --disable-xinerama --disable-xvfb --disable-xnest --disable-xorg \ --disable-dmx --disable-xwin --disable-xephyr --disable-kdrive \ --disable-config-dbus --disable-config-hal \ --disable-dri2 --enable-install-libxf86config --enable-glx \ - --with-default-font-path="catalogue:${LOCALBASE}/share/fonts,built-ins" \ --with-xkb-path=${LOCALBASE}/share/X11/xkb \ --with-xkb-bin-directory=${LOCALBASE}/bin \ --with-serverconfig-path=${LOCALBASE}/lib/X11 \ @@ -54,6 +52,18 @@ CONFIGURE_ARGS+= \ --disable-xwayland \ --with-fontrootdir=${LOCALBASE}/share/fonts +FONTPATH_ROOT?= ${LOCALBASE}/share/fonts +FONTPATHD?= ${PREFIX}/etc/X11/fontpath.d +DEFAULT_FONTPATH_LIST= \ + ${FONTPATH_ROOT}/misc/ \ + ${FONTPATH_ROOT}/TTF/ \ + ${FONTPATH_ROOT}/OTF/ \ + ${FONTPATH_ROOT}/Type1/ \ + ${FONTPATH_ROOT}/100dpi/ \ + ${FONTPATH_ROOT}/75dpi/ \ + catalogue:${FONTPATHD} +CONFIGURE_ARGS+= --with-default-font-path="${DEFAULT_FONTPATH_LIST:ts,}" + CFLAGS+= -I${LOCALBASE}/include/libdrm # This is server port, disabling some features @@ -77,12 +87,13 @@ post-configure: @cd ${WRKSRC}/unix/xserver/ && ${SETENV} ${CONFIGURE_ENV} ${MAKE_ENV} ./configure ${CONFIGURE_ARGS} post-build: - @cd ${WRKSRC}/unix/xserver/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} SHELL=${LOCALBASE}/bin/bash + @cd ${WRKSRC}/unix/xserver/ && \ + ${DO_MAKE_BUILD} SHELL=${LOCALBASE}/bin/bash ${ALL_TARGET} post-install: - @cd ${WRKSRC}/unix/xserver/hw/vnc/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/Xvnc ${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/libvnc.so - @${INSTALL_SCRIPT} ${FILESDIR}/vncserver.ports ${STAGEDIR}${PREFIX}/bin/vncserver + cd ${WRKSRC}/unix/xserver/hw/vnc/ && \ + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-strip + ${INSTALL_SCRIPT} ${FILESDIR}/vncserver.ports ${STAGEDIR}${PREFIX}/bin/vncserver .include "${.CURDIR}/Makefile.common.mk"