3 files changed, 33 insertions, 20 deletions
diff --git a/x11/x11vnc/Makefile b/x11/x11vnc/Makefile
index 5f0873bfed5..1dcdf569a2e 100644
--- a/x11/x11vnc/Makefile
+++ b/x11/x11vnc/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2008/09/18 00:11:30 obache Exp $
+# $NetBSD: Makefile,v 1.17 2008/10/25 06:12:06 obache Exp $
 #
 
-DISTNAME=	x11vnc-0.9.4
+DISTNAME=	x11vnc-0.9.5
 CATEGORIES=	x11 net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libvncserver/}
 
@@ -21,23 +21,12 @@ 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'
+.include "options.mk"
 
-BUILDLINK_DEPMETHOD.libXt?=	build
+BUILD_DIRS=	x11vnc
+INSTALL_DIRS=	x11vnc classes
 
 .include "../../security/openssl/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXdamage/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXinerama/buildlink3.mk"
-.include "../../x11/libXrandr/buildlink3.mk"
-.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"
diff --git a/x11/x11vnc/distinfo b/x11/x11vnc/distinfo
index ffa1e8a9f29..97994f1c54d 100644
--- a/x11/x11vnc/distinfo
+++ b/x11/x11vnc/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.10 2008/09/18 00:11:30 obache Exp $
+$NetBSD: distinfo,v 1.11 2008/10/25 06:12:06 obache Exp $
 
-SHA1 (x11vnc-0.9.4.tar.gz) = 142b6af81dee5825c993b25cfe1ed7aa7e515b0d
-RMD160 (x11vnc-0.9.4.tar.gz) = 398c2e789d164cc69f209cbe35f0f4b1efc845b6
-Size (x11vnc-0.9.4.tar.gz) = 2346158 bytes
+SHA1 (x11vnc-0.9.5.tar.gz) = 236f7b3ba6a33422cf7593de7d7843c233143129
+RMD160 (x11vnc-0.9.5.tar.gz) = ba225af1b003c4c258a0fabad5d5c792e2149770
+Size (x11vnc-0.9.5.tar.gz) = 2413415 bytes
diff --git a/x11/x11vnc/options.mk b/x11/x11vnc/options.mk
new file mode 100644
index 00000000000..3dd56a5c046
--- /dev/null
+++ b/x11/x11vnc/options.mk
@@ -0,0 +1,24 @@
+# $NetBSD: options.mk,v 1.1 2008/10/25 06:12:06 obache Exp $
+#
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.x11vnc
+PKG_SUPPORTED_OPTIONS=	x11
+PKG_SUGGESTED_OPTIONS=	x11
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mx11)
+CONFIGURE_ARGS+=		--with-x
+BUILDLINK_DEPMETHOD.libXt?=	build
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXdamage/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXfixes/buildlink3.mk"
+.include "../../x11/libXinerama/buildlink3.mk"
+.include "../../x11/libXrandr/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/libXtst/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-x
+.endif