ports/net/xrdp/files/patch-configure.ac
Koichiro Iwao 1d4cdcc6ff net/xrdp{,-devel}: Update to 0.9.6
* mark -devel port as IGNORE since net/xrdp has been updated
* s/XRDP/xrdp/ in pkg-message, upstream usually spell it lowercase

x11-servers/x11rdp: remove port

This port is only required by net/xrdp 0.6.2. Since net/xrdp has been
updated to 0.9.6, it is no longer required any other port and not useful
with standalone at all. 0.9.1 or later uses x11-drivers/xorgxrdp instead.

Approved by:	hrs (mentor, via email)
Relnotes:	https://github.com/neutrinolabs/xrdp/releases/tag/v0.9.1
		https://github.com/neutrinolabs/xrdp/releases/tag/v0.9.2
		https://github.com/neutrinolabs/xrdp/releases/tag/v0.9.3
		https://github.com/neutrinolabs/xrdp/releases/tag/v0.9.4
		https://github.com/neutrinolabs/xrdp/releases/tag/v0.9.5
		https://github.com/neutrinolabs/xrdp/releases/tag/v0.9.6
Differential Revision:	https://reviews.freebsd.org/D15375
2018-05-13 07:25:24 +00:00

40 lines
1.3 KiB
Text

--- configure.ac.orig 2017-12-27 14:40:24 UTC
+++ configure.ac
@@ -159,11 +159,35 @@ AC_CHECK_FUNC(dlopen, [],
AC_SUBST(DLOPEN_LIBS)
# checking for openssl
-PKG_CHECK_MODULES([OPENSSL], [openssl >= 0.9.8], [],
+if test "x$freebsd" = "xyes"; then
+ # FreeBSD may have two OpenSSL, base and port however
+ # base OpenSSL doesn.t have openssl.pc file.
+ PKG_CHECK_MODULES(
+ [OPENSSL],
+ [openssl >= 0],
+ [freebsd_openssl=port],
+ [
+ AC_CHECK_HEADER(
+ [openssl/rc4.h],
+ [freebsd_openssl=base],
+ [AC_MSG_ERROR([please install libssl-dev or openssl-devel])],
+ [#include <stdlib.h>])
+ ]
+ )
+
+ if test "x$freebsd_openssl" = "xport"; then
+ OPENSSL_BIN=`$PKG_CONFIG --variable=exec_prefix openssl`/bin
+ elif test "x$freebsd_openssl" = "xbase"; then
+ OPENSSL_BIN=/usr/bin
+ fi
+else
+ # OpenSSL detection for other OS
+ PKG_CHECK_MODULES([OPENSSL], [openssl >= 0], [],
[AC_MSG_ERROR([please install libssl-dev or openssl-devel])])
+ OPENSSL_BIN=`$PKG_CONFIG --variable=exec_prefix openssl`/bin
+fi
# look for openssl binary
-OPENSSL_BIN=`$PKG_CONFIG --variable=exec_prefix openssl`/bin
AC_PATH_PROGS([OPENSSL], [openssl], [:], [$OPENSSL_BIN:$PATH])
# checking for pam variation