diff -ruN /usr/ports/net/xrdp-devel/distinfo net/xrdp-devel/distinfo --- /usr/ports/net/xrdp-devel/distinfo 2017-07-18 16:47:26.409150000 +0900 +++ net/xrdp-devel/distinfo 2017-08-02 11:00:43.999843000 +0900 @@ -1,7 +1,7 @@ -TIMESTAMP = 1482726509 -SHA256 (xrdp/neutrinolabs-xrdp-v0.9.1_GH0.tar.gz) = 9bfafb0277b07e8242bfdbede2928423d28c5714efb0c226118759fab06c42ab -SIZE (xrdp/neutrinolabs-xrdp-v0.9.1_GH0.tar.gz) = 1885192 -SHA256 (xrdp/neutrinolabs-librfxcodec-v0.1.0_GH0.tar.gz) = b05c1812e2daef373bf5e647bc86ee11f136adbe7ea999b5109180f406071f0a -SIZE (xrdp/neutrinolabs-librfxcodec-v0.1.0_GH0.tar.gz) = 38590 -SHA256 (xrdp/neutrinolabs-libpainter-v0.1.0_GH0.tar.gz) = 9fd2a3a85ba4f3e311cea34e9824bd38f3673e60951906c06744cf6b8f73397a -SIZE (xrdp/neutrinolabs-libpainter-v0.1.0_GH0.tar.gz) = 9859 +TIMESTAMP = 1500361123 +SHA256 (xrdp/neutrinolabs-xrdp-v0.9.3_GH0.tar.gz) = 36f096d013b2cf09324cc1bf9c27caadc733001f2bcbe24e67f93233260afe5b +SIZE (xrdp/neutrinolabs-xrdp-v0.9.3_GH0.tar.gz) = 1866654 +SHA256 (xrdp/neutrinolabs-librfxcodec-v0.1.2_GH0.tar.gz) = f4aa7f4247a42f6f5e49fc56eb70589a1d26cae7c8d5d4e32f75200d5c473a42 +SIZE (xrdp/neutrinolabs-librfxcodec-v0.1.2_GH0.tar.gz) = 46139 +SHA256 (xrdp/neutrinolabs-libpainter-v0.1.1_GH0.tar.gz) = 6caee8444fbd72677ac5e125c7ac99490688474975451668e751a9d9187ee5e6 +SIZE (xrdp/neutrinolabs-libpainter-v0.1.1_GH0.tar.gz) = 13929 diff -ruN /usr/ports/net/xrdp-devel/files/patch-configure.ac net/xrdp-devel/files/patch-configure.ac --- /usr/ports/net/xrdp-devel/files/patch-configure.ac 2017-06-02 00:12:54.966576000 +0900 +++ net/xrdp-devel/files/patch-configure.ac 2017-08-02 11:05:31.346162000 +0900 @@ -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 ]) ++ # 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 ]) ++ ] ++ ) ++ ++ 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 -ruN /usr/ports/net/xrdp-devel/files/patch-xrdp_xrdp.ini net/xrdp-devel/files/patch-xrdp_xrdp.ini --- /usr/ports/net/xrdp-devel/files/patch-xrdp_xrdp.ini 2017-06-02 00:12:54.981767000 +0900 +++ net/xrdp-devel/files/patch-xrdp_xrdp.ini 1970-01-01 09:00:00.000000000 +0900 @@ -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 diff -ruN /usr/ports/net/xrdp-devel/Makefile net/xrdp-devel/Makefile --- /usr/ports/net/xrdp-devel/Makefile 2017-07-18 16:47:26.395720000 +0900 +++ net/xrdp-devel/Makefile 2017-08-03 22:21:59.158073000 +0900 @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= xrdp -PORTVERSION= 0.9.1 +PORTVERSION= 0.9.3 DISTVERSIONPREFIX= v -PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= net PKGNAMESUFFIX= -devel @@ -21,20 +20,19 @@ ${LOCALBASE}/bin/nasm:devel/nasm RUN_DEPENDS= ${LOCALBASE}/lib/xorg/modules/libxorgxrdp.so:x11-drivers/xorgxrdp -USES= autoreconf:build jpeg libtool pkgconfig ssl +USES= autoreconf:build jpeg libtool localbase pkgconfig ssl USE_XORG= ice pixman sm x11 xfixes xrandr GNU_CONFIGURE= yes USE_LDCONFIG= ${PREFIX}/lib/xrdp USE_GITHUB= yes GH_ACCOUNT= neutrinolabs GH_PROJECT= xrdp librfxcodec:librfxcodec libpainter:libpainter -GH_TAGNAME= v0.1.0:librfxcodec v0.1.0:libpainter +GH_TAGNAME= v0.1.2:librfxcodec v0.1.1:libpainter -CONFIGURE_ARGS= --localstatedir=/var \ +CONFIGURE_ARGS= --localstatedir=/var --enable-strict-locations \ --with-pkgconfigdir=${LOCALBASE}/libdata/pkgconfig \ --enable-jpeg --enable-pixman --enable-rfxcodec --enable-painter -LDFLAGS+= -L${LOCALBASE}/lib -L${OPENSSLLIB} -lssl -CFLAGS+= -I${LOCALBASE}/include -L${OPENSSLINC} +LDFLAGS+= -lssl CONFLICTS= xrdp-[0-9]* INSTALL_TARGET= install-strip SUB_FILES= pkg-install pkg-message @@ -49,6 +47,7 @@ IPV6_CONFIGURE_ENABLE= ipv6 DEBUG_CONFIGURE_ENABLE= xrdpdebug FUSE_CONFIGURE_ENABLE= fuse +FUSE_USES= fuse MP3LAME_CONFIGURE_ENABLE= mp3lame MP3LAME_LIB_DEPENDS= libmp3lame.so:audio/lame OPUS_CONFIGURE_ENABLE= opus @@ -60,10 +59,6 @@ .include -.if ${PORT_OPTIONS:MFUSE} -USES+= fuse -.endif - post-extract: # librfxcodec is provided as git submodule @${CP} -r ${WRKSRC_librfxcodec}/ ${WRKSRC}/librfxcodec/ diff -ruN /usr/ports/net/xrdp-devel/pkg-plist net/xrdp-devel/pkg-plist --- /usr/ports/net/xrdp-devel/pkg-plist 2017-07-18 16:47:26.438000000 +0900 +++ net/xrdp-devel/pkg-plist 2017-08-02 11:00:44.042038000 +0900 @@ -3,7 +3,6 @@ bin/xrdp-keygen bin/xrdp-sesadmin bin/xrdp-sesrun -bin/rfxcodectest lib/libpainter.a lib/libpainter.so lib/libpainter.so.0 @@ -19,6 +18,7 @@ include/xrdp_client_info.h include/xrdp_constants.h include/xrdp_rail.h +include/xrdp_sockets.h lib/pulse-%%PULSE_VERSION%%/modules/module-xrdp-sink.so lib/pulse-%%PULSE_VERSION%%/modules/module-xrdp-source.so libdata/pkgconfig/libpainter.pc @@ -30,28 +30,18 @@ lib/xrdp/libcommon.so.0.0.0 lib/xrdp/libmc.a lib/xrdp/libmc.so -lib/xrdp/libmc.so.0 -lib/xrdp/libmc.so.0.0.0 -lib/xrdp/librdp.a -lib/xrdp/librdp.so -lib/xrdp/librdp.so.0 -lib/xrdp/librdp.so.0.0.0 lib/xrdp/libscp.a lib/xrdp/libscp.so lib/xrdp/libscp.so.0 lib/xrdp/libscp.so.0.0.0 lib/xrdp/libvnc.a lib/xrdp/libvnc.so -lib/xrdp/libvnc.so.0 -lib/xrdp/libvnc.so.0.0.0 lib/xrdp/libxrdp.a lib/xrdp/libxrdp.so lib/xrdp/libxrdp.so.0 lib/xrdp/libxrdp.so.0.0.0 lib/xrdp/libxup.a lib/xrdp/libxup.so -lib/xrdp/libxup.so.0 -lib/xrdp/libxup.so.0.0.0 lib/xrdp/libxrdpapi.so lib/xrdp/libxrdpapi.a lib/xrdp/libxrdpapi.so.0 @@ -98,11 +88,9 @@ man/man8/xrdp-sesadmin.8.gz man/man8/xrdp-sesman.8.gz man/man8/xrdp-sesrun.8.gz -man/man8/xrdp-sessvc.8.gz sbin/xrdp sbin/xrdp-chansrv sbin/xrdp-sesman -sbin/xrdp-sessvc %%DATADIR%%/ad24b.bmp %%DATADIR%%/ad256.bmp %%DATADIR%%/cursor0.cur