From nobody Tue Feb 14 11:56:45 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 4PGKSF6WjTz3rrl8; Tue, 14 Feb 2023 11:56:45 +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 4PGKSF60czz3rQ0; Tue, 14 Feb 2023 11:56:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676375805; 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=/2r0rGuK3eKns4oMj++d9X6Ji58Ve5ChoAn8ZHAg/hU=; b=Y/A410eshF7xRyw5zIn2IOA8zyDTsi18EjvA8BWx+JjTZhQMEzzIqnJnC/n+5GAUmdzN2g U3lXx3x/l3c35zRh3/6AT/SZcunh4ka8C1sas7obKzEw/OabMVEeY1o/ajEdjSv3Qknp69 4vPvUHb6apefqKcg61Nnqx0bt9eOBODuwCnQH8vltzlUo0K5FAjjz4DGFas9pxio8k58nT Axtje52kSjtC1n9oEaNwnuY+x85xm7mK2881FvwJhCck0YUMBAtvm95z+OHn3K+nhwGB+d lHcqNJuVtlcN+nmC9F0xZ0k4ct7+41klnGlfby1dii+Rs3jmmvNMOgNKBY0Z1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676375805; 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=/2r0rGuK3eKns4oMj++d9X6Ji58Ve5ChoAn8ZHAg/hU=; b=Tdl2nwt2tpCceHZ5mmhJ7SD9Nb4lhddaQUzsWmODKelzhPnKkGwl11YEXBGzQ6HNrOfYSs DJUB1hioHdVfnmw+yURhu9iU7vFVn6uQejG1lH7CGYhsBNSDJgyYWCiNjlfFGILa37OSe4 z5tc5p/C55anCgPt7PaEGvtETcN4nMNrsfsTK1M8qM/Rs2We/qkEBPcpUA/WlCOyyWJEYf xs+h9YXiUyxTEIeRhtRhAdQ1H9f63OjM+RwPz9DD7KLHvc7Sc2P0gthk0Di19A5ae2sBnP htGA5Py4i6ON8uqDVj9jaI4i03Mwo4esaXn8DJagHbytSmtMQ8fiBM12vxx1nA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676375805; a=rsa-sha256; cv=none; b=eJUNEpnNz4DLTHPxRd9u5bwJd7+RgOxbURSgs9XIhzjwUTdiBB6VxQe5W/SnrQwZYYkGgl Ou0s/ysMT97Snvovc6IHoVsdJDMnT5bMWz9aQ1uEYkzp/qNzuyiCwd99l1uggm/ud/mbJh 8KRfdWGWYNP28aDNPOJZehZFlAdRQ2rPHT/CGrVdXKW1J3dzSERMzq91VRTTFjAsoOfLee uO3UciEVLLAnkFh+YEstO3yDmSgvCYBq+QBFKalKICVFNCY4URpd45B3BF7pbme23dsuuQ XmoNf7Na75gouHhf5XTquIPN8mpmwRybUJTMawESeR3Jxs/z+SnaMHZpvu6ZdQ== 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 4PGKSF563kzy5G; Tue, 14 Feb 2023 11:56:45 +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 31EBujF3028556; Tue, 14 Feb 2023 11:56:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31EBuj1b028555; Tue, 14 Feb 2023 11:56:45 GMT (envelope-from git) Date: Tue, 14 Feb 2023 11:56:45 GMT Message-Id: <202302141156.31EBuj1b028555@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: ed007f226a80 - main - net/xrdp{,-devel}: Reformat with portfmt 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: meta X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ed007f226a808ca22835c913cd79fd34580b3bee Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by meta: URL: https://cgit.FreeBSD.org/ports/commit/?id=ed007f226a808ca22835c913cd79fd34580b3bee commit ed007f226a808ca22835c913cd79fd34580b3bee Author: Koichiro Iwao AuthorDate: 2023-02-14 11:49:00 +0000 Commit: Koichiro Iwao CommitDate: 2023-02-14 11:56:32 +0000 net/xrdp{,-devel}: Reformat with portfmt --- net/xrdp-devel/Makefile | 50 ++++++++++++++++++++++++++----------------------- net/xrdp/Makefile | 50 ++++++++++++++++++++++++++----------------------- 2 files changed, 54 insertions(+), 46 deletions(-) diff --git a/net/xrdp-devel/Makefile b/net/xrdp-devel/Makefile index cf1b6c5b0648..b4c1f0b76de9 100644 --- a/net/xrdp-devel/Makefile +++ b/net/xrdp-devel/Makefile @@ -16,13 +16,13 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/bin/nasm:devel/nasm -RUN_DEPENDS= xterm:x11/xterm \ +RUN_DEPENDS= ${LOCALBASE}/lib/pulse-14.2/modules/module-xrdp-sink.so:audio/pulseaudio-module-xrdp \ ${LOCALBASE}/lib/xorg/modules/libxorgxrdp.so:x11-drivers/xorgxrdp-devel \ - ${LOCALBASE}/lib/pulse-14.2/modules/module-xrdp-sink.so:audio/pulseaudio-module-xrdp + xterm:x11/xterm LIB_DEPENDS= libImlib2.so:graphics/imlib2 -USES= autoreconf:build compiler:c11 cpe jpeg localbase libtool pkgconfig \ - ssl xorg +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 @@ -35,36 +35,40 @@ GH_TUPLE= neutrinolabs:librfxcodec:79619b6:librfxcodec/librfxcodec \ neutrinolabs:libpainter:v0.1.1:libpainter/libpainter \ neutrinolabs:ulalaca-xrdp:f683d17:ulalaca/ulalaca -CONFIGURE_ARGS= --localstatedir=/var --enable-strict-locations \ - --with-pkgconfigdir=${LOCALBASE}/libdata/pkgconfig \ +CONFIGURE_ARGS= --enable-imlib2 \ + --enable-jpeg \ + --enable-painter \ --enable-pam-config=freebsd \ - --enable-jpeg --enable-pixman --enable-rfxcodec --enable-painter \ - --enable-imlib2 + --enable-pixman \ + --enable-rfxcodec \ + --enable-strict-locations \ + --localstatedir=/var \ + --with-pkgconfigdir=${LOCALBASE}/libdata/pkgconfig LDFLAGS+= -lssl CONFLICTS= xrdp INSTALL_TARGET= install-strip SUB_FILES= pkg-deinstall pkg-install pkg-message SUB_LIST= OPENSSLBASE=${OPENSSLBASE} -OPTIONS_DEFINE= DEBUG FUSE IPV6 -OPTIONS_DEFAULT= FDKAAC OPUS -OPTIONS_GROUP= AUDIO_CODEC +OPTIONS_DEFINE= DEBUG FUSE IPV6 +OPTIONS_DEFAULT= FDKAAC OPUS +OPTIONS_GROUP= AUDIO_CODEC OPTIONS_GROUP_AUDIO_CODEC= FDKAAC MP3LAME OPUS -FDKAAC_DESC= Enable Fraunhofer FDK AAC for audio redirection -FUSE_DESC= Enable drive redirection via FUSE (experimental) -MP3LAME_DESC= Enable MP3 Lame for audio redirection -OPUS_DESC= Enable Opus for audio redirection +FDKAAC_DESC= Enable Fraunhofer FDK AAC for audio redirection +FUSE_DESC= Enable drive redirection via FUSE (experimental) +MP3LAME_DESC= Enable MP3 Lame for audio redirection +OPUS_DESC= Enable Opus for audio redirection -DEBUG_CONFIGURE_ENABLE= devel-debug devel-logging +DEBUG_CONFIGURE_ENABLE= devel-debug devel-logging FDKAAC_CONFIGURE_ENABLE= fdkaac -FDKAAC_LIB_DEPENDS= libfdk-aac.so:audio/fdk-aac -FUSE_CONFIGURE_ENABLE= fuse -FUSE_USES= fuse -IPV6_CONFIGURE_ENABLE= ipv6 +FDKAAC_LIB_DEPENDS= libfdk-aac.so:audio/fdk-aac +FUSE_CONFIGURE_ENABLE= fuse +FUSE_USES= fuse +IPV6_CONFIGURE_ENABLE= ipv6 MP3LAME_CONFIGURE_ENABLE= mp3lame -MP3LAME_LIB_DEPENDS= libmp3lame.so:audio/lame -OPUS_CONFIGURE_ENABLE= opus -OPUS_LIB_DEPENDS= libopus.so:audio/opus +MP3LAME_LIB_DEPENDS= libmp3lame.so:audio/lame +OPUS_CONFIGURE_ENABLE= opus +OPUS_LIB_DEPENDS= libopus.so:audio/opus .include diff --git a/net/xrdp/Makefile b/net/xrdp/Makefile index 5b5c38958193..ecd9598b3cf4 100644 --- a/net/xrdp/Makefile +++ b/net/xrdp/Makefile @@ -15,13 +15,13 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/bin/nasm:devel/nasm -RUN_DEPENDS= xterm:x11/xterm \ +RUN_DEPENDS= ${LOCALBASE}/lib/pulse-14.2/modules/module-xrdp-sink.so:audio/pulseaudio-module-xrdp \ ${LOCALBASE}/lib/xorg/modules/libxorgxrdp.so:x11-drivers/xorgxrdp \ - ${LOCALBASE}/lib/pulse-14.2/modules/module-xrdp-sink.so:audio/pulseaudio-module-xrdp + xterm:x11/xterm LIB_DEPENDS= libImlib2.so:graphics/imlib2 -USES= autoreconf:build compiler:c11 cpe jpeg localbase libtool pkgconfig \ - ssl xorg +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 @@ -32,36 +32,40 @@ GH_ACCOUNT= neutrinolabs GH_TUPLE= neutrinolabs:librfxcodec:v0.1.6:librfxcodec/librfxcodec \ neutrinolabs:libpainter:v0.1.1:libpainter/libpainter -CONFIGURE_ARGS= --localstatedir=/var --enable-strict-locations \ - --with-pkgconfigdir=${LOCALBASE}/libdata/pkgconfig \ +CONFIGURE_ARGS= --enable-imlib2 \ + --enable-jpeg \ + --enable-painter \ --enable-pam-config=freebsd \ - --enable-jpeg --enable-pixman --enable-rfxcodec --enable-painter \ - --enable-imlib2 + --enable-pixman \ + --enable-rfxcodec \ + --enable-strict-locations \ + --localstatedir=/var \ + --with-pkgconfigdir=${LOCALBASE}/libdata/pkgconfig LDFLAGS+= -lssl CONFLICTS= xrdp-devel INSTALL_TARGET= install-strip SUB_FILES= pkg-deinstall pkg-install pkg-message SUB_LIST= OPENSSLBASE=${OPENSSLBASE} -OPTIONS_DEFINE= DEBUG FUSE IPV6 -OPTIONS_DEFAULT= FDKAAC OPUS -OPTIONS_GROUP= AUDIO_CODEC +OPTIONS_DEFINE= DEBUG FUSE IPV6 +OPTIONS_DEFAULT= FDKAAC OPUS +OPTIONS_GROUP= AUDIO_CODEC OPTIONS_GROUP_AUDIO_CODEC= FDKAAC MP3LAME OPUS -FDKAAC_DESC= Enable Fraunhofer FDK AAC for audio redirection -FUSE_DESC= Enable drive redirection via FUSE (experimental) -MP3LAME_DESC= Enable MP3 Lame for audio redirection -OPUS_DESC= Enable Opus for audio redirection +FDKAAC_DESC= Enable Fraunhofer FDK AAC for audio redirection +FUSE_DESC= Enable drive redirection via FUSE (experimental) +MP3LAME_DESC= Enable MP3 Lame for audio redirection +OPUS_DESC= Enable Opus for audio redirection -DEBUG_CONFIGURE_ENABLE= devel-debug devel-logging +DEBUG_CONFIGURE_ENABLE= devel-debug devel-logging FDKAAC_CONFIGURE_ENABLE= fdkaac -FDKAAC_LIB_DEPENDS= libfdk-aac.so:audio/fdk-aac -FUSE_CONFIGURE_ENABLE= fuse -FUSE_USES= fuse -IPV6_CONFIGURE_ENABLE= ipv6 +FDKAAC_LIB_DEPENDS= libfdk-aac.so:audio/fdk-aac +FUSE_CONFIGURE_ENABLE= fuse +FUSE_USES= fuse +IPV6_CONFIGURE_ENABLE= ipv6 MP3LAME_CONFIGURE_ENABLE= mp3lame -MP3LAME_LIB_DEPENDS= libmp3lame.so:audio/lame -OPUS_CONFIGURE_ENABLE= opus -OPUS_LIB_DEPENDS= libopus.so:audio/opus +MP3LAME_LIB_DEPENDS= libmp3lame.so:audio/lame +OPUS_CONFIGURE_ENABLE= opus +OPUS_LIB_DEPENDS= libopus.so:audio/opus .include