From owner-svn-ports-head@freebsd.org Fri Dec 23 10:07:11 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7AFF1C8DA2F; Fri, 23 Dec 2016 10:07:11 +0000 (UTC) (envelope-from amdmi3@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 mx1.freebsd.org (Postfix) with ESMTPS id 3BF6313D5; Fri, 23 Dec 2016 10:07:11 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBNA7AtR066719; Fri, 23 Dec 2016 10:07:10 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBNA7AWh066717; Fri, 23 Dec 2016 10:07:10 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201612231007.uBNA7AWh066717@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Fri, 23 Dec 2016 10:07:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r429241 - in head/net/softethervpn: . files X-SVN-Group: ports-head 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.23 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, 23 Dec 2016 10:07:11 -0000 Author: amdmi3 Date: Fri Dec 23 10:07:10 2016 New Revision: 429241 URL: https://svnweb.freebsd.org/changeset/ports/429241 Log: - Fix build by fixing iconv handling on 11+ - Demove redundant OPTIONS_DEFAULT Approved by: portmgr blanket Modified: head/net/softethervpn/Makefile head/net/softethervpn/files/patch-src-makefiles-freebsd_32bit.mak Modified: head/net/softethervpn/Makefile ============================================================================== --- head/net/softethervpn/Makefile Fri Dec 23 10:03:48 2016 (r429240) +++ head/net/softethervpn/Makefile Fri Dec 23 10:07:10 2016 (r429241) @@ -16,13 +16,12 @@ GH_ACCOUNT= SoftEtherVPN GH_PROJECT= SoftEtherVPN GH_TAGNAME= 1e17c9b ALL_TARGET= build -MAKE_ENV= STAGEDIR=${STAGEDIR} +MAKE_ENV= STAGEDIR=${STAGEDIR} ICONV_LIB=${ICONV_LIB} USE_RC_SUBR= vpnserver vpnclient vpnbridge PORTDOCS= AUTHORS.TXT BUILD_UNIX.TXT ChangeLog README THIRD_PARTY.TXT \ WARNING.TXT OPTIONS_DEFINE= DOCS -OPTIONS_DEFAULT=DOCS post-patch: ${INSTALL_DATA} ${WRKSRC}/src/makefiles/freebsd_32bit.mak \ Modified: head/net/softethervpn/files/patch-src-makefiles-freebsd_32bit.mak ============================================================================== --- head/net/softethervpn/files/patch-src-makefiles-freebsd_32bit.mak Fri Dec 23 10:03:48 2016 (r429240) +++ head/net/softethervpn/files/patch-src-makefiles-freebsd_32bit.mak Fri Dec 23 10:07:10 2016 (r429241) @@ -8,13 +8,13 @@ +OPTIONS_COMPILE_DEBUG=-D_DEBUG -DDEBUG -DUNIX -DUNIX_BSD -DBRIDGE_BPF -DNO_VLAN -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -g -fsigned-char -OPTIONS_LINK_DEBUG=-g -fsigned-char -L/usr/local/lib -L/usr/lib -lm -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz -+OPTIONS_LINK_DEBUG=-g -fsigned-char -lm -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz ++OPTIONS_LINK_DEBUG=-g -fsigned-char -lm -lpthread -lssl -lcrypto ${ICONV_LIB} -lreadline -lncurses -lz -OPTIONS_COMPILE_RELEASE=-DNDEBUG -DVPN_SPEED -DUNIX -DUNIX_BSD -DBRIDGE_BPF -DNO_VLAN -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -I/usr/local/include -I/usr/include -O2 -fsigned-char +OPTIONS_COMPILE_RELEASE=-DNDEBUG -DVPN_SPEED -DUNIX -DUNIX_BSD -DBRIDGE_BPF -DNO_VLAN -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -fsigned-char ${CFLAGS} -OPTIONS_LINK_RELEASE=-O2 -fsigned-char -L/usr/local/lib -L/usr/lib -lm -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz -+OPTIONS_LINK_RELEASE=-fsigned-char ${LDFLAGS} ${LIBS} -lm -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz ++OPTIONS_LINK_RELEASE=-fsigned-char ${LDFLAGS} ${LIBS} -lm -lpthread -lssl -lcrypto ${ICONV_LIB} -lreadline -lncurses -lz -INSTALL_BINDIR=/usr/bin/ -INSTALL_VPNSERVER_DIR=/usr/vpnserver/