svn commit: r429241 - in head/net/softethervpn: . files
Dmitry Marakasov
amdmi3 at FreeBSD.org
Fri Dec 23 10:07:11 UTC 2016
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/
More information about the svn-ports-head
mailing list