From owner-svn-ports-head@freebsd.org Fri Nov 2 06:31:23 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AF3A010EA909; Fri, 2 Nov 2018 06:31:23 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5BAE47843F; Fri, 2 Nov 2018 06:31:23 +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 3C9EF26DF5; Fri, 2 Nov 2018 06:31:23 +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 wA26VNBq090440; Fri, 2 Nov 2018 06:31:23 GMT (envelope-from meta@FreeBSD.org) Received: (from meta@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA26VMO4090439; Fri, 2 Nov 2018 06:31:22 GMT (envelope-from meta@FreeBSD.org) Message-Id: <201811020631.wA26VMO4090439@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: meta set sender to meta@FreeBSD.org using -f From: Koichiro Iwao Date: Fri, 2 Nov 2018 06:31:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r483774 - head/security/softether X-SVN-Group: ports-head X-SVN-Commit-Author: meta X-SVN-Commit-Paths: head/security/softether X-SVN-Commit-Revision: 483774 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Nov 2018 06:31:23 -0000 Author: meta Date: Fri Nov 2 06:31:22 2018 New Revision: 483774 URL: https://svnweb.freebsd.org/changeset/ports/483774 Log: security/softether: cleanup Makefile I'm working on update security/softether-devel. However, this port and -devel port were created and maintained by other people. So there's no consistency between these ports. I'm going to renew -devel port this port based. Before updating -devel, cleanup existing Makefile issues on this port: * add LICENSE_FILE * add ONLY_FOR_ARCHS_REASON * avoid useless use of += * do patch in post-patch, not post-extract * do everything in do-install * remove MAKE_JOBS_UNSAFE as it actually build now * simplify DOT2UNIX_FILES * use sysrc rather than editing rc.conf in pkg-message * use tab after = Approved by: mentors (implicit) Modified: head/security/softether/Makefile head/security/softether/pkg-message Modified: head/security/softether/Makefile ============================================================================== --- head/security/softether/Makefile Fri Nov 2 06:21:54 2018 (r483773) +++ head/security/softether/Makefile Fri Nov 2 06:31:22 2018 (r483774) @@ -2,6 +2,7 @@ PORTNAME= softether PORTVERSION= 4.25.9656 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= https://www.softether-download.com/files/softether/v4.25-9656-rtm-2018.01.15-tree/Source_Code/ DISTNAME= ${PORTNAME}-src-v4.25-9656-rtm @@ -10,30 +11,18 @@ MAINTAINER= meta@FreeBSD.org COMMENT= Softether VPN solution LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/LICENSE -CONFLICTS_INSTALL= softether-devel +ONLY_FOR_ARCHS= amd64 i386 +ONLY_FOR_ARCHS_REASON= Upstream only supports amd64 and i386: https://www.softether.org/3-spec -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +USES= dos2unix gmake iconv:wchar_t localbase:ldflags ncurses \ + readline ssl +USE_RC_SUBR= softether_bridge softether_client softether_server -PORTDOCS= AUTHORS.TXT ChangeLog LICENSE README THIRD_PARTY.TXT WARNING.TXT -DOS2UNIX_FILES= AUTHORS.TXT ChangeLog LICENSE README THIRD_PARTY.TXT \ - WARNING.TXT \ - src/Cedar/Cedar.h \ - src/Cedar/Cedar.h \ - src/Cedar/Client.h \ - src/Cedar/Nat.h \ - src/Cedar/Server.c \ - src/Cedar/Server.h \ - src/Cedar/Virtual.h \ - src/Mayaqua/Cfg.c \ - src/Mayaqua/Cfg.h \ - src/Mayaqua/Kernel.c \ - src/Mayaqua/Mayaqua.c \ - src/Mayaqua/Network.c \ - src/Mayaqua/Network.h \ - src/Mayaqua/Table.h \ - src/Mayaqua/Unix.c +DOS2UNIX_FILES= ChangeLog LICENSE README *.TXT \ + src/Cedar/*.* src/Mayaqua/*.* +SUB_FILES= vpncmd OPTIONS_DEFINE= DOCS UNLOCK @@ -44,21 +33,19 @@ OPTIONS_DEFINE= DOCS UNLOCK # - Deep-inspect packet logging function # - Source IP address control list function # - syslog transfer function -UNLOCK_DESC= Unlock regional lockout (JP and CN) +UNLOCK_DESC= Unlock regional lockout (JP and CN) UNLOCK_EXTRA_PATCHES= ${FILESDIR}/extra-patch-unrestrict-enterprise-functions -ONLY_FOR_ARCHS= i386 amd64 +CONFLICTS_INSTALL= softether-devel +PORTDOCS= AUTHORS.TXT ChangeLog LICENSE README THIRD_PARTY.TXT WARNING.TXT -USES= dos2unix gmake iconv:wchar_t localbase:ldflags ncurses \ - readline ssl -USE_RC_SUBR= softether_bridge softether_client softether_server -SUB_FILES= vpncmd -MAKE_JOBS_UNSAFE= yes - LOGDIR?= /var/log/softether -PLIST_SUB+= LOGDIR="${LOGDIR}" +PLIST_SUB= LOGDIR="${LOGDIR}" SUB_LIST= LOGDIR="${LOGDIR}" +CPPFLAGS+= -I${LOCALBASE}/includec +LDFLAGS+= -L${LOCALBASE}/lib + # a pity the source directory has such a naming scheme, but well WRKSRC= ${WRKDIR}/v4.25-9656 @@ -66,15 +53,14 @@ ALL_TARGET= build .include -# skip configure at all and copy the corresponding Makefile in place -post-extract: +post-patch: + # skip configure at all and copy the corresponding Makefile in place .if ${ARCH} != "amd64" @${CP} ${WRKSRC}/src/makefiles/freebsd_32bit.mak ${WRKSRC}/Makefile .else @${CP} ${WRKSRC}/src/makefiles/freebsd_64bit.mak ${WRKSRC}/Makefile .endif - -# pull in user specific CFLAGS and LDFLAGS + # pull in user specific CFLAGS and LDFLAGS @${REINPLACE_CMD} -e "s|OPTIONS_COMPILE_RELEASE=|OPTIONS_COMPILE_RELEASE=${CFLAGS} |g" ${WRKSRC}/Makefile @${REINPLACE_CMD} -e "s|OPTIONS_LINK_RELEASE=|OPTIONS_LINK_RELEASE=${LDFLAGS} |g" ${WRKSRC}/Makefile @@ -88,8 +74,6 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/bin/vpnserver/vpnserver ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/vpnserver ${INSTALL_DATA} ${WRKSRC}/bin/vpnserver/hamcore.se2 ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/hamcore.se2 ${INSTALL_SCRIPT} ${WRKDIR}/vpncmd ${STAGEDIR}/${PREFIX}/sbin/vpncmd - -post-install: .for i in vpnbridge vpnclient vpncmd vpnserver @${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/${i} .endfor Modified: head/security/softether/pkg-message ============================================================================== --- head/security/softether/pkg-message Fri Nov 2 06:21:54 2018 (r483773) +++ head/security/softether/pkg-message Fri Nov 2 06:31:22 2018 (r483774) @@ -1,13 +1,13 @@ ************************************************************************** -To run softether vpn client from startup, add -softether_client_enable="YES" in your rc.conf. +To run softether vpn client from startup, run +sysrc softether_client_enable=yes -To run softether vpn server from startup, add -softether_server_enable="YES" in your rc.conf. +To run softether vpn server from startup, run +sysrc softether_server_enable=yes -To run softether vpn bridge from startup, add -softether_bridge_enable="YES" in your rc.conf. +To run softether vpn bridge from startup, run +sysrc softether_bridge_enable=yes Initial and further configuration of all softether services can be done either by using a Windows client to connect to the running