From nobody Thu Dec 26 23:27:20 2024 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 4YK4Xn2D65z5hX1R; Thu, 26 Dec 2024 23:27:21 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YK4Xn07kZz4RgC; Thu, 26 Dec 2024 23:27:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735255641; 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=Chxzd039SK53GmCCtnDf56IQmBTpcA1zm+2vFH4BRMI=; b=AFqi3y5kHNeI7qhqhkBxRDuh2nPFh9G+ZNlILkKinzbKFaFwwkfSiw5gevcgEM/DafhaBB nunWY3IN7tCj6oafWN3WxpqEIxaG9lzyh1rEvmmHeZpetWfRIJH/nk5QlF3+HFoyUJ1SVL PewGgCX3CHJ6u20IuaFoAluYoNc0ogog5WM/CuFOfdbGS4BC8Ed8XzAsAtjyZStx2OgFj2 iZtw9CQx+EKoHsinmOoCb6qEEhuALcONzs4BAX5pOw78yvLvqidUBznrYsk3Nn9Nr2G6Q5 x0KqYe9re2ppKgtTjBBbedb6ER3BOuPiIX8L84IEOGlhoGfoFI9ZlT7qK4k6xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735255641; 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=Chxzd039SK53GmCCtnDf56IQmBTpcA1zm+2vFH4BRMI=; b=iRfvUnSn83kmpU9TGS6+1R6oR33S0IfgmPHzqfkDy7+J80kM0w50LsCA9OKVMVk8sdy1EP UTvMuwqZmSNUp6WENbvHf4t0awtd4aqtRLsKOA5BtkYcjaUCm/Iah1hQFnlW27IQ8Yaqlv QoggESvt7f0zvMrfxRHuFqSJxvyYUrdJzM80GP1D6trW1FJ6nbMnpefW0yUrZZIpYwjgCH cecUFFloX2xXCs83grU4B/wlQ9xd4WsA1Js+ojitAgIoryVbqLSnI7J4qb0eeLTW72S7bt wUvff2/vMN1Niza93wR6RNWAiu8mFLzaGj66cY3wgysebxCFnmuWkYsu/lym8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735255641; a=rsa-sha256; cv=none; b=cxdnlZxq9MOIDpNL3m2U5x63o1vFSOTDO/yKriIvH2nWLu9KY0kCqJUtEj7VzP9dAJ7oE2 9fk2fx5jUvc86C4Rm9LilkmzYKFhlRGcRiaaJCFPs57P+7qslyh32gn8wm30kr0A3bwEEj L2aPb5QfPP89TQ0dTA4yEpXynPE+9i52nC3EhWRp1nM+oHRqWjMrMXxZOEolbNlH3W+arB whsA6TKD50wXquLt40wHhmRa30GfY9UgluijJp2sx/1YIHS6ge2ZNiLmtTJUJPfZkri2X6 PvwfM3nq0PJDZTJ6+X9ok0L0tZwwSO7A+mzx4rht6VsyppB++MDgsMDaRw+noQ== 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 4YK4Xm6rt1zFKy; Thu, 26 Dec 2024 23:27:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BQNRK6a056392; Thu, 26 Dec 2024 23:27:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BQNRKiL056389; Thu, 26 Dec 2024 23:27:20 GMT (envelope-from git) Date: Thu, 26 Dec 2024 23:27:20 GMT Message-Id: <202412262327.4BQNRKiL056389@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Koichiro Iwao Subject: git: cf3b464ef8a7 - main - net/xrdp: Pet portclippy/portfmt and bump PORTREVISION 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: meta X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cf3b464ef8a746b4109e3176b1a6c92b52c4e338 Auto-Submitted: auto-generated The branch main has been updated by meta: URL: https://cgit.FreeBSD.org/ports/commit/?id=cf3b464ef8a746b4109e3176b1a6c92b52c4e338 commit cf3b464ef8a746b4109e3176b1a6c92b52c4e338 Author: Anton Saietskii AuthorDate: 2024-12-26 14:31:42 +0000 Commit: Koichiro Iwao CommitDate: 2024-12-26 23:24:36 +0000 net/xrdp: Pet portclippy/portfmt and bump PORTREVISION after OPTIONS changes in the previous commit. PR: 283627 Approved by: meta@ (myself, maintainer) --- net/xrdp/Makefile | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/net/xrdp/Makefile b/net/xrdp/Makefile index 5f915324c226..3fdb08df40c3 100644 --- a/net/xrdp/Makefile +++ b/net/xrdp/Makefile @@ -15,19 +15,17 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/bin/nasm:devel/nasm +LIB_DEPENDS= libImlib2.so:graphics/imlib2 RUN_DEPENDS= ${LOCALBASE}/lib/xorg/modules/libxorgxrdp.so:x11-drivers/xorgxrdp \ xterm:x11/xterm -LIB_DEPENDS= libImlib2.so:graphics/imlib2 USES= autoreconf:build compiler:c11 cpe jpeg libtool localbase \ pkgconfig ssl xorg CPE_VENDOR= neutrinolabs -USE_XORG= ice pixman sm x11 xfixes xrandr USE_LDCONFIG= ${PREFIX}/lib/xrdp +USE_XORG= ice pixman sm x11 xfixes xrandr GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share - CONFIGURE_ARGS= --enable-imlib2 \ --enable-jpeg \ --enable-painter \ @@ -38,15 +36,14 @@ CONFIGURE_ARGS= --enable-imlib2 \ --enable-vsock \ --localstatedir=/var \ --with-pkgconfigdir=${LOCALBASE}/libdata/pkgconfig + +INSTALL_TARGET= install-strip + LDFLAGS+= -lssl CONFLICTS= xrdp-devel -INSTALL_TARGET= install-strip SUB_FILES= pkg-deinstall pkg-install pkg-message SUB_LIST= OPENSSLBASE=${OPENSSLBASE} -USER= _xrdp -GROUP= _xrdp - OPTIONS_DEFINE= DEBUG FUSE IPV6 OPTIONS_DEFAULT= FDKAAC OPENH264 OPUS X264 OPTIONS_GROUP= AUDIO_CODEC VIDEO_CODEC @@ -59,19 +56,24 @@ OPENH264_DESC= H.264 video codec support via OpenH264 OPUS_DESC= Enable Opus for audio redirection DEBUG_CONFIGURE_ENABLE= devel-debug devel-logging -FDKAAC_CONFIGURE_ENABLE= fdkaac FDKAAC_LIB_DEPENDS= libfdk-aac.so:audio/fdk-aac -FUSE_CONFIGURE_ENABLE= fuse +FDKAAC_CONFIGURE_ENABLE= fdkaac FUSE_USES= fuse +FUSE_CONFIGURE_ENABLE= fuse IPV6_CONFIGURE_ENABLE= ipv6 -MP3LAME_CONFIGURE_ENABLE= mp3lame MP3LAME_LIB_DEPENDS= libmp3lame.so:audio/lame -OPENH264_CONFIGURE_ENABLE= openh264 +MP3LAME_CONFIGURE_ENABLE= mp3lame OPENH264_LIB_DEPENDS= libopenh264.so:multimedia/openh264 -OPUS_CONFIGURE_ENABLE= opus +OPENH264_CONFIGURE_ENABLE= openh264 OPUS_LIB_DEPENDS= libopus.so:audio/opus -X264_CONFIGURE_ENABLE= x264 +OPUS_CONFIGURE_ENABLE= opus X264_LIB_DEPENDS= libx264.so:multimedia/libx264 +X264_CONFIGURE_ENABLE= x264 + +GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share + +GROUP= _xrdp +USER= _xrdp .include @@ -97,7 +99,8 @@ post-stage: @${RM} ${STAGEDIR}${PREFIX}/etc/xrdp/rsakeys.ini @${RM} ${STAGEDIR}${PREFIX}/etc/xrdp/cert.pem @${RM} ${STAGEDIR}${PREFIX}/etc/xrdp/key.pem -.for f in sesman.ini startwm.sh reconnectwm.sh xrdp.ini xrdp_keyboard.ini gfx.toml +.for f in sesman.ini startwm.sh reconnectwm.sh xrdp.ini xrdp_keyboard.ini \ + gfx.toml @${MV} ${STAGEDIR}${PREFIX}/etc/xrdp/$f ${STAGEDIR}${PREFIX}/etc/xrdp/$f.sample .endfor