Date: Wed, 15 Jan 2014 05:06:21 GMT From: Koichiro IWAO <meta+ports@vmeta.jp> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/185793: New port: x11-servers/x11rdp Message-ID: <201401150506.s0F56LJc057181@oldred.freebsd.org> Resent-Message-ID: <201401150510.s0F5A0nT029220@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 185793 >Category: ports >Synopsis: New port: x11-servers/x11rdp >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Jan 15 05:10:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Koichiro IWAO >Release: 9.2-STABLE >Organization: >Environment: FreeBSD porting 9.2-STABLE FreeBSD 9.2-STABLE #9: Tue Nov 5 00:15:08 JST 2013 root@icepick.vmeta.jp:/usr/obj/usr/src/sys/VIMAGE amd64 >Description: X11 server for xrdp. WWW: http://www.xrdp.org/ >How-To-Repeat: >Fix: Patch attached with submission follows: # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # x11rdp # x11rdp/pkg-descr # x11rdp/distinfo # x11rdp/Makefile # x11rdp/files # x11rdp/files/patch-xorg-server-X11R7.1-1.1.0__hw__rdp__Makefile # x11rdp/files/patch-buildx_sh # x11rdp/files/patch-xorg-server-X11R7.1-1.1.0__hw__common__compiler.h # x11rdp/files/patch-xorg-server-X11R7.1-1.1.0__hw__rdp__rdp.h # echo c - x11rdp mkdir -p x11rdp > /dev/null 2>&1 echo x - x11rdp/pkg-descr sed 's/^X//' >x11rdp/pkg-descr << 'b62f2eaa1b543c7c34e5455991c30a6c' XX11rdp is an X server for xrdp. X XWWW: http://www.xrdp.org/ b62f2eaa1b543c7c34e5455991c30a6c echo x - x11rdp/distinfo sed 's/^X//' >x11rdp/distinfo << '06ab8d331e26d0b4a91e1557cdceed3f' XSHA256 (xrdp/x11rdp_xorg71_r299.tar.gz) = 0a7bde7ef146b54686d6b42fa0497e563d1e6e98119bae80aa6020dbbde86bfc XSIZE (xrdp/x11rdp_xorg71_r299.tar.gz) = 51051954 06ab8d331e26d0b4a91e1557cdceed3f echo x - x11rdp/Makefile sed 's/^X//' >x11rdp/Makefile << '15bcb12fa8a1ae3a79d43278319a7125' X# Created by: Koichiro IWAO <meta+ports@vmeta.jp> X# $FreeBSD$ X XPORTNAME= x11rdp XPORTVERSION= 0.5.0.${X11RDPREVISION} XCATEGORIES= x11-servers XMASTER_SITES= http://www.club.kyutech.ac.jp/~meta/distfiles/:x11rdp XDISTNAME= ${PORTNAME}_xorg71 XDISTFILES= ${PORTNAME}_xorg71_r${X11RDPREVISION}.tar.gz:x11rdp XDIST_SUBDIR= xrdp X XMAINTAINER= meta+ports@vmeta.jp XCOMMENT= X11 server for xrdp X XLICENSE= MIT X XRUN_DEPENDS= xorg-fonts>=0:${PORTSDIR}/x11-fonts/xorg-fonts X X# SVN revision of x11rdp XX11RDPREVISION=299 X XUSES= gmake pkgconfig perl5 XUSE_OPENSSL= yes XCONFLICTS_INSTALL= xrdp-devel-[0-9]* x11rdp-devel-[0-9]* X XPLIST_FILES= bin/X11rdp X Xpost-extract: X @${MKDIR} ${WRKSRC}/build_dir X Xpost-patch: X @${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/buildx.sh X @${REINPLACE_CMD} -e "s|%%CC%%|${CC}|g" ${WRKSRC}/buildx.sh X @${REINPLACE_CMD} -e "s|%%CXX%%|${CXX}|g" ${WRKSRC}/buildx.sh X @${REINPLACE_CMD} -e "s|%%CPP%%|${CPP}|g" ${WRKSRC}/buildx.sh X @${REINPLACE_CMD} -e "s|%%GMAKE%%|${GMAKE}|g" ${WRKSRC}/buildx.sh X Xdo-build: X @cd ${WRKSRC} && GNUMAKE=${GMAKE} ${SH} ${WRKSRC}/buildx.sh ${WRKSRC}/build_dir X Xdo-install: X ${INSTALL_PROGRAM} ${WRKSRC}/build_dir/bin/X11rdp ${STAGEDIR}${PREFIX}/bin/ X X.include <bsd.port.mk> 15bcb12fa8a1ae3a79d43278319a7125 echo c - x11rdp/files mkdir -p x11rdp/files > /dev/null 2>&1 echo x - x11rdp/files/patch-xorg-server-X11R7.1-1.1.0__hw__rdp__Makefile sed 's/^X//' >x11rdp/files/patch-xorg-server-X11R7.1-1.1.0__hw__rdp__Makefile << '757722a60aa13793fbed7fb6e293ae16' X--- xorg-server-X11R7.1-1.1.0/hw/rdp/Makefile.orig 2013-01-28 16:28:24.000000000 +0000 X+++ xorg-server-X11R7.1-1.1.0/hw/rdp/Makefile 2013-11-13 05:21:49.199495983 +0000 X@@ -25,7 +25,7 @@ X librdp.a \ X -lfreetype -lz -lm -lXfont -lXau -lXdmcp X X-CFLAGS = -O2 -fno-strength-reduce -ansi -pedantic \ X+CFLAGS = -O2 -fno-strength-reduce -ansi -pedantic \ X -I../../include \ X -I../../cfb \ X -I../../mfb \ X@@ -37,6 +37,7 @@ X -I$(INCBASE)/xorg \ X -I../../os \ X -I../../render \ X+ -I../../randr \ X -I../xfree86/common \ X -I../xfree86/os-support \ X -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_REENTRANT \ 757722a60aa13793fbed7fb6e293ae16 echo x - x11rdp/files/patch-buildx_sh sed 's/^X//' >x11rdp/files/patch-buildx_sh << '5b1feff51e87d23be706f112c1e83c9c' X--- buildx.sh.orig 2013-01-28 16:29:10.000000000 +0000 X+++ buildx.sh 2013-11-13 03:40:47.787496851 +0000 X@@ -1,6 +1,10 @@ X #!/bin/sh X X-export CPPFLAGS=-D_GNU_SOURCE X+export CPPFLAGS=-D_BSD_SOURCE X+export CC=%%CC%% X+export CXX=%%CXX%% X+export CPP=%%CPP%% X+export GMAKE=%%GMAKE%% X X print_help() X { X@@ -48,8 +52,8 @@ X echo "error xf86dri" X exit 1 X fi X- make X- make install X+ ${GMAKE} X+ ${GMAKE} install X cd .. X else X echo "skipping xf86driproto" X@@ -65,8 +69,8 @@ X echo "error glproto" X exit 1 X fi X- make X- make install X+ ${GMAKE} X+ ${GMAKE} install X cd .. X else X echo "skipping glproto" X@@ -82,8 +86,8 @@ X echo "error randrproto" X exit 1 X fi X- make X- make install X+ ${GMAKE} X+ ${GMAKE} install X cd .. X else X echo "skipping randrproto" X@@ -99,8 +103,8 @@ X echo "error renderproto" X exit 1 X fi X- make X- make install X+ ${GMAKE} X+ ${GMAKE} install X cd .. X else X echo "skipping renderproto" X@@ -116,8 +120,8 @@ X echo "error fixesproto" X exit 1 X fi X- make X- make install X+ ${GMAKE} X+ ${GMAKE} install X cd .. X else X echo "skipping fixesproto" X@@ -133,8 +137,8 @@ X echo "error damageproto" X exit 1 X fi X- make X- make install X+ ${GMAKE} X+ ${GMAKE} install X cd .. X else X echo "skipping damageproto" X@@ -150,8 +154,8 @@ X echo "error xcmiscproto" X exit 1 X fi X- make X- make install X+ ${GMAKE} X+ ${GMAKE} install X cd .. X else X echo "skipping xcmiscproto" X@@ -167,8 +171,8 @@ X echo "error xextproto" X exit 1 X fi X- make X- make install X+ ${GMAKE} X+ ${GMAKE} install X cd .. X else X echo "skipping xextproto" X@@ -184,8 +188,8 @@ X echo "error xproto" X exit 1 X fi X- make X- make install X+ ${GMAKE} X+ ${GMAKE} install X cd .. X else X echo "skipping xproto" X@@ -201,8 +205,8 @@ X echo "error xtrans" X exit 1 X fi X- make X- make install X+ ${GMAKE} X+ ${GMAKE} install X cd .. X else X echo "skipping xtrans" X@@ -218,8 +222,8 @@ X echo "error xf86miscproto" X exit 1 X fi X- make X- make install X+ ${GMAKE} X+ ${GMAKE} install X cd .. X else X echo "skipping xf86miscproto" X@@ -235,8 +239,8 @@ X echo "error xf86vidmodeproto" X exit 1 X fi X- make X- make install X+ ${GMAKE} X+ ${GMAKE} install X cd .. X else X echo "skipping xf86vidmodeproto" X@@ -252,8 +256,8 @@ X echo "error xf86bigfontproto" X exit 1 X fi X- make X- make install X+ ${GMAKE} X+ ${GMAKE} install X cd .. X else X echo "skipping xf86bigfontproto" X@@ -269,8 +273,8 @@ X echo "error scrnsaverproto" X exit 1 X fi X- make X- make install X+ ${GMAKE} X+ ${GMAKE} install X cd .. X else X echo "skipping scrnsaverproto" X@@ -286,8 +290,8 @@ X echo "error bigreqsproto" X exit 1 X fi X- make X- make install X+ ${GMAKE} X+ ${GMAKE} install X cd .. X else X echo "skipping bigreqsproto" X@@ -303,8 +307,8 @@ X echo "error resourceproto" X exit 1 X fi X- make X- make install X+ ${GMAKE} X+ ${GMAKE} install X cd .. X else X echo "skipping resourceproto" X@@ -320,8 +324,8 @@ X echo "error fontsproto" X exit 1 X fi X- make X- make install X+ ${GMAKE} X+ ${GMAKE} install X cd .. X else X echo "skipping fontsproto" X@@ -337,8 +341,8 @@ X echo "error inputproto" X exit 1 X fi X- make X- make install X+ ${GMAKE} X+ ${GMAKE} install X cd .. X else X echo "skipping inputproto" X@@ -354,8 +358,8 @@ X echo "error xf86dgaproto" X exit 1 X fi X- make X- make install X+ ${GMAKE} X+ ${GMAKE} install X cd .. X else X echo "skipping xf86dgaproto" X@@ -371,8 +375,8 @@ X echo "error videoproto" X exit 1 X fi X- make X- make install X+ ${GMAKE} X+ ${GMAKE} install X cd .. X else X echo "skipping videoproto" X@@ -388,8 +392,8 @@ X echo "error compositeproto" X exit 1 X fi X- make X- make install X+ ${GMAKE} X+ ${GMAKE} install X cd .. X else X echo "skipping compositeproto" X@@ -405,8 +409,8 @@ X echo "error trapproto" X exit 1 X fi X- make X- make install X+ ${GMAKE} X+ ${GMAKE} install X cd .. X else X echo "skipping trapproto" X@@ -422,8 +426,8 @@ X echo "error recordproto" X exit 1 X fi X- make X- make install X+ ${GMAKE} X+ ${GMAKE} install X cd .. X else X echo "skipping recordproto" X@@ -439,8 +443,8 @@ X echo "error xineramaproto" X exit 1 X fi X- make X- make install X+ ${GMAKE} X+ ${GMAKE} install X cd .. X else X echo "skipping xineramaproto" X@@ -456,8 +460,8 @@ X echo "error ice" X exit 1 X fi X- make X- make install X+ ${GMAKE} X+ ${GMAKE} install X cd .. X else X echo "skipping ice" X@@ -473,8 +477,8 @@ X echo "error sm" X exit 1 X fi X- make X- make install X+ ${GMAKE} X+ ${GMAKE} install X cd .. X else X echo "skipping sm" X@@ -490,8 +494,8 @@ X echo "error xau" X exit 1 X fi X- make X- make install X+ ${GMAKE} X+ ${GMAKE} install X cd .. X else X echo "skipping xau" X@@ -507,8 +511,8 @@ X echo "error kbproto" X exit 1 X fi X- make X- make install X+ ${GMAKE} X+ ${GMAKE} install X cd .. X else X echo "skipping kbproto" X@@ -524,28 +528,28 @@ X echo "error Xdmcp" X exit 1 X fi X- make X- make install X+ ${GMAKE} X+ ${GMAKE} install X cd .. X else X echo "skipping xdmcp" X fi X X-# x11 X-if ! test -f $PCFILEDIR/x11.pc X+# X11 X+if ! test -f $PCFILEDIR/X11.pc X then X cd libX11-X11R7.1-1.0.1 X ./configure --prefix=$PREFIXDIR X if ! test $? -eq 0 X then X- echo "error x11" X+ echo "error X11" X exit 1 X fi X- make X- make install X+ ${GMAKE} X+ ${GMAKE} install X cd .. X else X- echo "skipping x11" X+ echo "skipping X11" X fi X X # xt X@@ -558,8 +562,8 @@ X echo "error xt" X exit 1 X fi X- make X- make install X+ ${GMAKE} X+ ${GMAKE} install X cd .. X else X echo "skipping xt" X@@ -575,8 +579,8 @@ X echo "error evieext" X exit 1 X fi X- make X- make install X+ ${GMAKE} X+ ${GMAKE} install X cd .. X else X echo "skipping evieproto" X@@ -592,8 +596,8 @@ X echo "error xkbfile" X exit 1 X fi X- make X- make install X+ ${GMAKE} X+ ${GMAKE} install X cd .. X else X echo "skipping xkbfile" X@@ -609,8 +613,8 @@ X echo "error fontcacheproto" X exit 1 X fi X- make X- make install X+ ${GMAKE} X+ ${GMAKE} install X cd .. X else X echo "skipping fontcacheproto" X@@ -626,8 +630,8 @@ X echo "error fontenc" X exit 1 X fi X- make X- make install X+ ${GMAKE} X+ ${GMAKE} install X cd .. X else X echo "skipping fontenc" X@@ -643,8 +647,8 @@ X echo "error freetype" X exit 1 X fi X- make X- make install X+ ${GMAKE} X+ ${GMAKE} install X cd .. X else X echo "skipping freetype" X@@ -660,13 +664,13 @@ X echo "error xfont" X exit 1 X fi X- make X+ ${GMAKE} X if ! test $? -eq 0 X then X echo "error make xfont" X exit 1 X fi X- make install X+ ${GMAKE} install X cd .. X else X echo "skipping xfont" X@@ -682,8 +686,8 @@ X echo "error Xext" X exit 1 X fi X- make X- make install X+ ${GMAKE} X+ ${GMAKE} install X cd .. X else X echo "skipping xext" X@@ -699,8 +703,8 @@ X echo "error xmu" X exit 1 X fi X- make X- make install X+ ${GMAKE} X+ ${GMAKE} install X cd .. X else X echo "skipping xmu" X@@ -716,8 +720,8 @@ X echo "error xkbui" X exit 1 X fi X- make X- make install X+ ${GMAKE} X+ ${GMAKE} install X cd .. X else X echo "skipping xkbui" X@@ -733,8 +737,8 @@ X echo "error xxf86misc" X exit 1 X fi X- make X- make install X+ ${GMAKE} X+ ${GMAKE} install X cd .. X else X echo "skipping xxf86misc" X@@ -750,8 +754,8 @@ X echo "error xxf86vm" X exit 1 X fi X- make X- make install X+ ${GMAKE} X+ ${GMAKE} install X cd .. X else X echo "skipping xxf86vm" X@@ -767,8 +771,8 @@ X echo "error xpm" X exit 1 X fi X- make X- make install X+ ${GMAKE} X+ ${GMAKE} install X cd .. X else X echo "skipping xpm" X@@ -784,8 +788,8 @@ X echo "error xaw7" X exit 1 X fi X- make X- make install X+ ${GMAKE} X+ ${GMAKE} install X cd .. X else X echo "skipping xaw7" X@@ -801,8 +805,8 @@ X echo "error libdrm" X exit 1 X fi X- make X- make install X+ ${GMAKE} X+ ${GMAKE} install X cd .. X else X echo "skipping libdrm" X@@ -812,19 +816,28 @@ X if ! test -f $PCFILEDIR/xorg-server.pc X then X cd xorg-server-X11R7.1-1.1.0 X- ./configure --prefix=$PREFIXDIR --enable-xglx --with-mesa-source=$SRCDIR/Mesa-6.5 --disable-dmx X+ ./configure \ X+ --prefix=$PREFIXDIR \ X+ --enable-static \ X+ --enable-xglx \ X+ --with-mesa-source=$SRCDIR/Mesa-6.5 \ X+ --disable-dmx \ X+ --enable-xprint=no \ X+ --with-fontdir=%%LOCALBASE%%/lib/X11/fonts \ X+ --with-xkb-path=%%LOCALBASE%%/share/X11/xkb X+ find . -name Makefile|xargs sed -i".bak" -e "s|-I%%LOCALBASE%%/include||g" X if ! test $? -eq 0 X then X echo "error xorg-server" X exit 1 X fi X- make X+ ${GMAKE} X if ! test $? -eq 0 X then X echo "error make xorg-server" X exit 1 X fi X- make install X+# ${GMAKE} install X cd .. X else X echo "skipping xorg-server" X@@ -833,7 +846,7 @@ X # X11rdp X cd xorg-server-X11R7.1-1.1.0/hw/rdp X export X11RDPBASE=$PREFIXDIR X-make X+${GMAKE} X if ! test $? -eq 0 X then X echo "error make X11rdp" X@@ -844,31 +857,31 @@ X X # this will copy the build X server with the other X server binaries X cp $SRCDIR/xorg-server-X11R7.1-1.1.0/hw/rdp/X11rdp $X11RDPBASE/bin X-strip $X11RDPBASE/bin/X11rdp X+#strip $X11RDPBASE/bin/X11rdp X X # make a symboloc link to your local xkbcomp X-if ! test -f $X11RDPBASE/bin/xkbcomp X-then X- if test -f /usr/bin/xkbcomp X- then X- ln -s /usr/bin/xkbcomp $X11RDPBASE/bin/xkbcomp X- elif test -f /usr/X11R6/bin/xkbcomp X- then X- ln -s /usr/X11R6/bin/xkbcomp $X11RDPBASE/bin/xkbcomp X- fi X-fi X+#if ! test -f $X11RDPBASE/bin/xkbcomp X+#then X+# if test -f /usr/bin/xkbcomp X+# then X+# ln -s /usr/bin/xkbcomp $X11RDPBASE/bin/xkbcomp X+# elif test -f /usr/X11R6/bin/xkbcomp X+# then X+# ln -s /usr/X11R6/bin/xkbcomp $X11RDPBASE/bin/xkbcomp X+# fi X+#fi X X # make a symbolic link to your local font directory X-if ! test -d $X11RDPBASE/lib/X11/fonts X-then X- if test -d /usr/share/fonts/X11 X- then X- ln -s /usr/share/fonts/X11 $X11RDPBASE/lib/X11/fonts X- elif test -d /usr/share/X11/fonts X- then X- ln -s /usr/share/X11/fonts $X11RDPBASE/lib/X11/fonts X- elif test -d /usr/X11R6/lib/X11/fonts X- then X- ln -s /usr/X11R6/lib/X11/fonts $X11RDPBASE/lib/X11/fonts X- fi X-fi X+#if ! test -d $X11RDPBASE/lib/X11/fonts X+#then X+# if test -d /usr/share/fonts/X11 X+# then X+# ln -s /usr/share/fonts/X11 $X11RDPBASE/lib/X11/fonts X+# elif test -d /usr/share/X11/fonts X+# then X+# ln -s /usr/share/X11/fonts $X11RDPBASE/lib/X11/fonts X+# elif test -d /usr/X11R6/lib/X11/fonts X+# then X+# ln -s /usr/X11R6/lib/X11/fonts $X11RDPBASE/lib/X11/fonts X+# fi X+#fi 5b1feff51e87d23be706f112c1e83c9c echo x - x11rdp/files/patch-xorg-server-X11R7.1-1.1.0__hw__common__compiler.h sed 's/^X//' >x11rdp/files/patch-xorg-server-X11R7.1-1.1.0__hw__common__compiler.h << 'e3cbcbea29321e58336cb0dcd761f862' X--- xorg-server-X11R7.1-1.1.0/hw/xfree86/common/compiler.h.orig 2013-12-19 04:09:03.884558740 +0000 X+++ xorg-server-X11R7.1-1.1.0/hw/xfree86/common/compiler.h 2013-12-19 04:10:29.576270046 +0000 X@@ -1364,7 +1364,7 @@ X X # if !defined(__SUNPRO_C) X # if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) X-# ifdef GCCUSESGAS X+# ifdef __GNUC__ X X /* X * If gcc uses gas rather than the native assembler, the syntax of these e3cbcbea29321e58336cb0dcd761f862 echo x - x11rdp/files/patch-xorg-server-X11R7.1-1.1.0__hw__rdp__rdp.h sed 's/^X//' >x11rdp/files/patch-xorg-server-X11R7.1-1.1.0__hw__rdp__rdp.h << '9afef3766bfe5c3206067b7386a18188' X--- xorg-server-X11R7.1-1.1.0/hw/rdp/rdp.h.orig 2013-01-28 10:50:46.908229086 +0000 X+++ xorg-server-X11R7.1-1.1.0/hw/rdp/rdp.h 2013-01-28 11:01:31.760225231 +0000 X@@ -23,6 +23,11 @@ X #define __arm32__ X #endif X X+#ifdef __FreeBSD__ X+#undef _POSIX_SOURCE X+#define PF_INET AF_INET X+#endif X+ X #include "xorg-server.h" X #include <stdio.h> X #include <stdarg.h> 9afef3766bfe5c3206067b7386a18188 exit >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401150506.s0F56LJc057181>