--- /usr/portage/net-misc/vnc/vnc-4.1.2-r3.ebuild	2007-05-08 11:35:58 -0600
+++ vnc-4.1.2-r3.ebuild	2007-05-13 20:40:54 -0600
@@ -19,7 +19,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="server"
 
 RDEPEND="sys-libs/zlib
@@ -92,18 +92,21 @@
 	eautoreconf
 
 	if use server ; then
-		cp -a xc/programs/Xserver/vnc/Xvnc/xvnc.cc \
+		cp -RPp xc/programs/Xserver/vnc/Xvnc/xvnc.cc \
 			xc/programs/Xserver/Xvnc.man \
 			xc/programs/Xserver/vnc/*.{h,cc} \
 			xorg-x11-server-source/hw/vnc
-		cp -a xorg-x11-server-source/{cfb/cfb.h,hw/vnc}
-		cp -a xorg-x11-server-source/{fb/fb.h,hw/vnc}
-		cp -a xorg-x11-server-source/{fb/fbrop.h,hw/vnc}
+		cp -RPp xorg-x11-server-source/{cfb/cfb.h,hw/vnc}
+		cp -RPp xorg-x11-server-source/{fb/fb.h,hw/vnc}
+		cp -RPp xorg-x11-server-source/{fb/fbrop.h,hw/vnc}
 		sed -i -e 's,xor,c_xor,' -e 's,and,c_and,' \
 			xorg-x11-server-source/hw/vnc/{cfb,fb,fbrop}.h
 		cd xorg-x11-server-source
 		eautoreconf
 	fi
+
+        cd "${S}"
+        epatch ${FILESDIR}/${P}-freebsd.patch
 }
 
 src_compile() {