* Updated to 0.9.3

* Cleanup Makefile
* Regenerated patch for portlint

Changes: https://github.com/neutrinolabs/xrdp/releases/tag/v0.9.3Changes: https://github.com/neutrinolabs/xrdp/releases/tag/v0.9.3

PR:		220820
Submitted by:	Koichiro IWAO (maintainer)
Reviewed by:	lifanov (mentor)
Approved by:	lifanov (mentor)
MFH:		2017Q3
Differential Revision:	https://reviews.freebsd.org/D11956

3 files changed, 35 insertions, 53 deletions

diff --git a/net/xrdp-devel/files/patch-configure.ac b/net/xrdp-devel/files/patch-configure.ac
index 7d46d6c5062d..fe1670e6d4f0 100644
--- a/net/xrdp-devel/files/patch-configure.ac
+++ b/net/xrdp-devel/files/patch-configure.ac
@@ -1,22 +1,40 @@
-diff --git configure.ac configure.ac
-index 5c73168a..abbf4135 100644
---- configure.ac
+--- configure.ac.orig	2017-07-14 12:22:02 UTC
 +++ configure.ac
-@@ -138,8 +138,15 @@ AC_CHECK_FUNC(dlopen, [],
+@@ -152,11 +152,35 @@ AC_CHECK_FUNC(dlopen, [],
  AC_SUBST(DLOPEN_LIBS)
-
+ 
  # checking for openssl
--PKG_CHECK_MODULES([OPENSSL], [openssl >= 0], [],
--  [AC_MSG_ERROR([please install libssl-dev or openssl-devel])])
+-PKG_CHECK_MODULES([OPENSSL], [openssl >= 0.9.8], [],
 +if test "x$freebsd" = "xyes"; then
-+  # FreeBSD base doesn't supply "*.pc"
-+  AC_CHECK_HEADER([openssl/rc4.h], [],
-+    [AC_MSG_ERROR([please install libssl-dev or openssl-devel])],
-+    [#include <stdlib.h>])
++  # 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])])
+   [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
- # Linux-PAM is used in Linux systems
diff --git a/net/xrdp-devel/files/patch-sesman_sesman.ini b/net/xrdp-devel/files/patch-sesman_sesman.ini
index b305be8257a8..5d02badf7c03 100644
--- a/net/xrdp-devel/files/patch-sesman_sesman.ini
+++ b/net/xrdp-devel/files/patch-sesman_sesman.ini
@@ -1,8 +1,6 @@
-diff --git sesman/sesman.ini sesman/sesman.ini
-index 674665e9..45929d6d 100644
---- sesman/sesman.ini
+--- sesman/sesman.ini.orig	2017-07-14 12:22:02 UTC
 +++ sesman/sesman.ini
-@@ -84,8 +84,8 @@ param=xrdp/xorg.conf
+@@ -77,8 +77,8 @@ param=xrdp/xorg.conf
  param=-noreset
  param=-nolisten
  param=tcp
@@ -10,6 +8,6 @@ index 674665e9..45929d6d 100644
 -param=.xorgxrdp.%s.log
 +#param=-logfile
 +#param=.xorgxrdp.%s.log
-
+ 
  [Chansrv]
  ; drive redirection, defaults to xrdp_client if not set
diff --git a/net/xrdp-devel/files/patch-xrdp_xrdp.ini b/net/xrdp-devel/files/patch-xrdp_xrdp.ini
deleted file mode 100644
index 70efb6413798..000000000000
--- a/net/xrdp-devel/files/patch-xrdp_xrdp.ini
+++ /dev/null
@@ -1,34 +0,0 @@
---- xrdp/xrdp.ini.orig	2016-12-22 17:04:29 UTC
-+++ xrdp/xrdp.ini
-@@ -147,24 +147,24 @@ tcutils=true
- ; Session types
- ;
- 
--[X11rdp]
--name=X11rdp
-+[Xorg]
-+name=Xorg
- lib=libxup.so
- username=ask
- password=ask
- ip=127.0.0.1
- port=-1
--xserverbpp=24
--code=10
-+code=20
- 
--[Xorg]
--name=Xorg
-+[X11rdp]
-+name=X11rdp
- lib=libxup.so
- username=ask
- password=ask
- ip=127.0.0.1
- port=-1
--code=20
-+xserverbpp=24
-+code=10
- 
- [Xvnc]
- name=Xvnc