Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

--- pkgsrc/x11/x11vnc/Makefile	2007/02/22 19:27:28	1.8
+++ pkgsrc/x11/x11vnc/Makefile	2008/09/18 00:11:30	1.16
@@ -1,20 +1,34 @@
-# $NetBSD: Makefile,v 1.8 2007/02/22 19:27:28 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2008/09/18 00:11:30 obache Exp $
 #
 
-DISTNAME=	x11vnc-0.8.4
+DISTNAME=	x11vnc-0.9.4
 CATEGORIES=	x11 net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libvncserver/}
 
-MAINTAINER=	obata@lins.jp
+MAINTAINER=	obache@NetBSD.org
 HOMEPAGE=	http://www.karlrunge.com/x11vnc/
 COMMENT=	VNC server for real X displays
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=	yes
 
+CONFIGURE_ARGS+=	--with-system-libvncserver
+
+PTHREAD_AUTO_VARS=	yes
+SUBST_CLASSES+=		pthread
+SUBST_STAGE.pthread=	pre-configure
+SUBST_FILES.pthread=	configure
+SUBST_SED.pthread=	-e 's|-lpthread||g'
+
+SUBST_CLASSES+=		libvnc
+SUBST_STAGE.libvnc=	post-configure
+SUBST_FILES.libvnc=	Makefile
+SUBST_SED.libvnc=	-e 's|libvncserver||g'
+SUBST_SED.libvnc+=	-e 's|libvncclient||g'
+
 BUILDLINK_DEPMETHOD.libXt?=	build
 
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXdamage/buildlink3.mk"
@@ -24,5 +38,6 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/libXtst/buildlink3.mk"
 .include "../../x11/xextproto/buildlink3.mk"
+.include "../../net/libvncserver/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"