--- smage/trunk/extras/tigervnc/tigervnc-1.0.90_svn4262-r1.smage2	2011/02/01 13:21:31	1237
+++ smage/trunk/extras/tigervnc/tigervnc-1.0.90_svn4262-r1.smage2	2011/02/01 13:32:51	1240
@@ -21,14 +21,16 @@
 DEPEND=">= virtual/x11"
 SDEPEND=">= dev-lang/nasm-2"
 
-sminclude alx cleanutils
-
 SRC_URI=(
 	http://mesh.dl.sourceforge.net/project/${PNAME}/${PNAME}/${PVER}/${SRCFILE}
 	mirror://${PNAME}/${SRCFILE}
 	http://ftp.x.org/pub/individual/xserver/${XORG}
 	mirror://xorg-server/${XORG}
 	mirror://${PNAME}/tigervnc_48.png
+	mirror://${PNAME}/${PNAME}-1.0.90-102434.patch
+	mirror://${PNAME}/${PNAME}-1.0.90-cookie.patch
+	mirror://${PNAME}/${PNAME}-0.0.90-viewer-reparent.patch
+	mirror://${PNAME}/${PNAME}-1.0.90-ldnow.patch
 )
 
 src_prepare()
@@ -39,6 +41,14 @@
 	cd ${SRCDIR}
 
 	# patchwork
+	# force vncviewer to read password from stdin
+	mpatch ${PNAME}-1.0.90-102434.patch || die
+	# create X server cookie via mcookie
+	mpatch ${PNAME}-1.0.90-cookie.patch || die
+	# add reparent support for x window
+	mpatch ${PNAME}-0.0.90-viewer-reparent.patch || die
+	# link libvnc.so "now" to catch "undefined symbol" errors during Xorg startup
+	mpatch ${PNAME}-1.0.90-ldnow.patch || die
 
 	# apply the included xorg patch
 	cd ${XORGDDIR}
@@ -59,12 +69,11 @@
 
 src_compile()
 {
-	cd ${SRCDIR}/unix
+	cd ${SRCDIR}
 	mconfigure --disable-static || die
 	# only build neccessary things
-	# fix broken libtool: it calles sed and it ends in an infinite loop
-	mmake -j1 -C ../common LIBTOOL="$(which libtool)" || die
-	mmake -j1 -C vncpasswd LIBTOOL="$(which libtool)" || die
+	mmake -j1 -C common || die
+	mmake -j1 -C vncpasswd || die
 
 	# fix build issues
 	export CFLAGS="$(pkg-config --cflags libdrm)"
@@ -100,17 +109,14 @@
 		--disable-shave \
 		|| die
 
-	# fix broken libtool: it calles sed and it ends in an infinite loop
-	mmake -j1 LIBTOOL="$(which libtool)" || die
+	mmake -j1 || die
 }
 
 src_install()
 {
-	cd ${SRCDIR}/unix
-	# fix broken libtool: it calles sed and it ends in an infinite loop
-	mmake -C vncpasswd DESTDIR=${BINDIR} LIBTOOL="$(which libtool)" install || die
+	cd ${SRCDIR}
+	mmake -C vncpasswd DESTDIR=${BINDIR} install || die
 
 	cd ${XORGDDIR}/hw/vnc
-	# fix broken libtool: it calles sed and it ends in an infinite loop
-	mmake DESTDIR=${BINDIR} LIBTOOL="$(which libtool)" install || die
+	mmake DESTDIR=${BINDIR} install || die
 }