From owner-svn-ports-all@freebsd.org Fri May 22 10:35:50 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5688932CCA2; Fri, 22 May 2020 10:35:50 +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) 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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49T2vV1fbJz46st; Fri, 22 May 2020 10:35:50 +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 341791CED4; Fri, 22 May 2020 10:35:50 +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 04MAZoo2077273; Fri, 22 May 2020 10:35:50 GMT (envelope-from meta@FreeBSD.org) Received: (from meta@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04MAZo7L077272; Fri, 22 May 2020 10:35:50 GMT (envelope-from meta@FreeBSD.org) Message-Id: <202005221035.04MAZo7L077272@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: meta set sender to meta@FreeBSD.org using -f From: Koichiro Iwao Date: Fri, 22 May 2020 10:35:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r536193 - head/security/softether5 X-SVN-Group: ports-head X-SVN-Commit-Author: meta X-SVN-Commit-Paths: head/security/softether5 X-SVN-Commit-Revision: 536193 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 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, 22 May 2020 10:35:50 -0000 Author: meta Date: Fri May 22 10:35:49 2020 New Revision: 536193 URL: https://svnweb.freebsd.org/changeset/ports/536193 Log: security/softether5: Fix log, pid, db directory Fix SE_{LOG,PID,DB}DIR weren't reintroduced properly after r532611. While here, omit nolonger needed post-patch. Modified: head/security/softether5/Makefile Modified: head/security/softether5/Makefile ============================================================================== --- head/security/softether5/Makefile Fri May 22 09:32:48 2020 (r536192) +++ head/security/softether5/Makefile Fri May 22 10:35:49 2020 (r536193) @@ -2,6 +2,7 @@ PORTNAME= softether DISTVERSION= 5.01.9674 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= security net-vpn PKGNAMESUFFIX= 5 @@ -26,7 +27,10 @@ USE_GITHUB= yes GH_ACCOUNT= SoftEtherVPN GH_PROJECT= SoftEtherVPN -CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=RelWithDebInfo +CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DSE_DBDIR="${SE_DBDIR}" \ + -DSE_LOGDIR="${SE_LOGDIR}" \ + -DSE_PIDDIR="${SE_PIDDIR}" OPTIONS_DEFINE= DOCS UNLOCK @@ -59,15 +63,6 @@ CMAKE_BOOL_ON+= SKIP_CPU_FEATURES .else BUILD_DEPENDS+= ${LOCALBASE}/include/cpu_features_macros.h:devel/cpu_features .endif - -post-patch: - # SoftEther scatters logs, config files and PID files in PREFIX/libexec - # directory. To write them in the right place, replace it. - ${REINPLACE_CMD} \ - -e "s|%%SE_DBDIR%%|${SE_DBDIR}|g" \ - -e "s|%%SE_LOGDIR%%|${SE_LOGDIR}|g" \ - -e "s|%%SE_PIDDIR%%|${SE_PIDDIR}|g" \ - ${WRKSRC}/src/Mayaqua/FileIO.c post-install: @${MKDIR} ${STAGEDIR}${SE_LOGDIR} ${STAGEDIR}${SE_DBDIR} ${STAGEDIR}${SE_PIDDIR}