diff options
| author | amdmi3 <amdmi3@FreeBSD.org> | 2016-12-23 18:07:10 +0800 |
|---|---|---|
| committer | amdmi3 <amdmi3@FreeBSD.org> | 2016-12-23 18:07:10 +0800 |
| commit | c2fde8169f10f2153752089b98b236573d9e41ee (patch) | |
| tree | da6e3b505a1f207ece75147d78192b62075c7a96 /net | |
| parent | 3fc4c2325afc9638d71b4c38fa28abf30cdb7bf2 (diff) | |
| download | freebsd-ports-gnome-c2fde8169f10f2153752089b98b236573d9e41ee.tar.gz freebsd-ports-gnome-c2fde8169f10f2153752089b98b236573d9e41ee.tar.zst freebsd-ports-gnome-c2fde8169f10f2153752089b98b236573d9e41ee.zip | |
- Fix build by fixing iconv handling on 11+
- Demove redundant OPTIONS_DEFAULT
Approved by: portmgr blanket
Diffstat (limited to 'net')
| -rw-r--r-- | net/softethervpn/Makefile | 3 | ||||
| -rw-r--r-- | net/softethervpn/files/patch-src-makefiles-freebsd_32bit.mak | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/net/softethervpn/Makefile b/net/softethervpn/Makefile index 772a09de3a31..0e4356896d00 100644 --- a/net/softethervpn/Makefile +++ b/net/softethervpn/Makefile @@ -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 \ diff --git a/net/softethervpn/files/patch-src-makefiles-freebsd_32bit.mak b/net/softethervpn/files/patch-src-makefiles-freebsd_32bit.mak index 6bd85c70ad2a..6324c81bdbe2 100644 --- a/net/softethervpn/files/patch-src-makefiles-freebsd_32bit.mak +++ b/net/softethervpn/files/patch-src-makefiles-freebsd_32bit.mak @@ -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/ |