From nobody Mon Nov 01 12:16:52 2021 X-Original-To: dev-commits-ports-all@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 DCDB71821159; Mon, 1 Nov 2021 12:16:52 +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 4HjX8N5mgGz3R6F; Mon, 1 Nov 2021 12:16:52 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 A1B4E11375; Mon, 1 Nov 2021 12:16:52 +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 1A1CGq3Y026025; Mon, 1 Nov 2021 12:16:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1A1CGqnU026024; Mon, 1 Nov 2021 12:16:52 GMT (envelope-from git) Date: Mon, 1 Nov 2021 12:16:52 GMT Message-Id: <202111011216.1A1CGqnU026024@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: 89d9e9320aff - main - security/openvpn: rearrange Makefile List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 89d9e9320aff2d4c61be4c7dfa1b6829717bd034 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=89d9e9320aff2d4c61be4c7dfa1b6829717bd034 commit 89d9e9320aff2d4c61be4c7dfa1b6829717bd034 Author: Matthias Andree AuthorDate: 2021-11-01 12:16:27 +0000 Commit: Matthias Andree CommitDate: 2021-11-01 12:16:37 +0000 security/openvpn: rearrange Makefile to portclippy-reported standard ordering --- security/openvpn/Makefile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/security/openvpn/Makefile b/security/openvpn/Makefile index 8c4bdcae27ac..0c571b012fd6 100644 --- a/security/openvpn/Makefile +++ b/security/openvpn/Makefile @@ -21,9 +21,6 @@ SHEBANG_FILES= sample/sample-scripts/verify-cn \ sample/sample-scripts/auth-pam.pl \ sample/sample-scripts/ucn.pl -USERS= openvpn -GROUPS= openvpn - GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-strict # set PLUGIN_LIBDIR so that unqualified plugin paths are found: @@ -33,6 +30,9 @@ CONFLICTS_INSTALL?= openvpn-2.[!5].* openvpn-devel-[0-9]* openvpn-mbedtls-[0-9]* SUB_FILES= pkg-message openvpn-client +USERS= openvpn +GROUPS= openvpn + PORTDOCS= * PORTEXAMPLES= * @@ -103,6 +103,13 @@ _tlslibs=libssl libcrypto CONFIGURE_ARGS+= --enable-comp-stub .endif +post-patch: + ${REINPLACE_CMD} -E -i '' -e 's/(user|group) nobody/\1 openvpn/' \ + -e 's/"nobody"( after init)/"openvpn" \1/' \ + ${WRKSRC}/sample/sample-config-files/*.conf \ + ${WRKSRC}/sample/sample-config-files/xinetd-*-config \ + ${WRKSRC}/doc/man-sections/generic-options.rst + pre-configure: .ifdef (LOG_OPENVPN) @${ECHO} "Building with LOG_OPENVPN=${LOG_OPENVPN}" @@ -122,13 +129,6 @@ pre-configure: @${ECHO} "### --------------------------------------------------------- ###" .endif -post-patch: - ${REINPLACE_CMD} -E -i '' -e 's/(user|group) nobody/\1 openvpn/' \ - -e 's/"nobody"( after init)/"openvpn" \1/' \ - ${WRKSRC}/sample/sample-config-files/*.conf \ - ${WRKSRC}/sample/sample-config-files/xinetd-*-config \ - ${WRKSRC}/doc/man-sections/generic-options.rst - post-configure: ${REINPLACE_CMD} '/^CFLAGS =/s/$$/ -fPIC/' \ ${WRKSRC}/src/plugins/auth-pam/Makefile \