Mikolaj Kucharski wrote:
Hi,
x11vnc is using tcl/tk toolkit for -gui switch. See x11vnc(1) man page
and search for `-gui' option for description or grep the srouces for
`wish' string.
p2 is p1 + Makefile cleanup
cvs server: Diffing inside x11/x11vnc/
Index: x11/x11vnc//Makefile
===================================================================
RCS file: /cvs/ports/x11/x11vnc/Makefile,v
retrieving revision 1.5
diff -N -u -p x11/x11vnc//Makefile
--- x11/x11vnc//Makefile 2 Feb 2009 23:27:48 -0000 1.5
+++ x11/x11vnc//Makefile 15 Feb 2009 07:37:27 -0000
@@ -3,7 +3,7 @@
COMMENT= VNC server for real X displays
DISTNAME= x11vnc-0.9.6
-PKGNAME= ${DISTNAME}p0
+PKGNAME= ${DISTNAME}p1
CATEGORIES= x11
HOMEPAGE= http://www.karlrunge.com/x11vnc/
@@ -19,18 +19,23 @@ PERMIT_DISTFILES_FTP= Yes
WANTLIB= X11 Xext Xinerama Xtst c pthread z
WANTLIB+= Xdamage Xfixes Xrandr crypto ssl
-RUN_DEPENDS= ::devel/desktop-file-utils
+MODULES = x11/tk
+
+RUN_DEPENDS= ::devel/desktop-file-utils \
+ ${MODTK_RUN_DEPENDS}
+
LIB_DEPENDS= jpeg::graphics/jpeg
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libvncserver/}
-USE_X11= Yes
-
CONFIGURE_STYLE=gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS+=--with-x \
--without-avahi
+
+post-patch:
+ ${SUBST_CMD} ${WRKSRC}/x11vnc/gui.c
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/x11vnc
cvs server: Diffing inside x11/x11vnc//patches
Index: x11/x11vnc//patches/patch-x11vnc_gui_c
===================================================================
RCS file: x11/x11vnc//patches/patch-x11vnc_gui_c
diff -N -u -p x11/x11vnc//patches/patch-x11vnc_gui_c
--- /dev/null 15 Feb 2009 07:37:27 -0000
+++ x11/x11vnc//patches/patch-x11vnc_gui_c 15 Feb 2009 07:37:27 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- x11vnc/gui.c.orig Mon Dec 8 22:41:01 2008
++++ x11vnc/gui.c Sun Feb 15 02:07:06 2009
+@@ -231,7 +231,7 @@ static void sigusr1 (int sig) {
+
+ static char *extra_path = ":/usr/local/bin:/usr/bin/X11:/usr/sfw/bin"
+ ":/usr/X11R6/bin:/usr/openwin/bin:/usr/dt/bin";
+-static char *wishes[] = {"wish8.4", "wish", "wish8.3", "wish8.5", "wish8.0",
NULL};
++static char *wishes[] = {"wish${MODTK_VERSION}", "wish8.5", "wish8.4",
"wish", NULL};
+
+ static void run_gui(char *gui_xdisplay, int connect_to_x11vnc, int
start_x11vnc,
+ int simple_gui, pid_t parent, char *gui_opts) {
cvs server: Diffing inside x11/x11vnc//pkg
cvs server: Diffing inside x11/x11vnc/
Index: x11/x11vnc//Makefile
===================================================================
RCS file: /cvs/ports/x11/x11vnc/Makefile,v
retrieving revision 1.5
diff -N -u -p x11/x11vnc//Makefile
--- x11/x11vnc//Makefile 2 Feb 2009 23:27:48 -0000 1.5
+++ x11/x11vnc//Makefile 15 Feb 2009 07:49:45 -0000
@@ -1,36 +1,37 @@
# $OpenBSD: Makefile,v 1.5 2009/02/02 23:27:48 ajacoutot Exp $
-COMMENT= VNC server for real X displays
+COMMENT = VNC server for real X displays
-DISTNAME= x11vnc-0.9.6
-PKGNAME= ${DISTNAME}p0
-CATEGORIES= x11
+DISTNAME = x11vnc-0.9.6
+PKGNAME = ${DISTNAME}p1
+CATEGORIES = x11
+HOMEPAGE = http://www.karlrunge.com/x11vnc/
-HOMEPAGE= http://www.karlrunge.com/x11vnc/
+MAINTAINER = Craig Barraclough <crai...@creative.com.au>
-MAINTAINER= Craig Barraclough <crai...@creative.com.au>
-
# GPLv2
-PERMIT_PACKAGE_CDROM= Yes
-PERMIT_PACKAGE_FTP= Yes
-PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP= Yes
+PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE_FTP = Yes
+PERMIT_DISTFILES_CDROM =Yes
+PERMIT_DISTFILES_FTP = Yes
-WANTLIB= X11 Xext Xinerama Xtst c pthread z
-WANTLIB+= Xdamage Xfixes Xrandr crypto ssl
+WANTLIB = X11 Xext Xinerama Xtst c pthread z \
+ Xdamage Xfixes Xrandr crypto ssl
-RUN_DEPENDS= ::devel/desktop-file-utils
-LIB_DEPENDS= jpeg::graphics/jpeg
+MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=libvncserver/}
+MODULES = x11/tk
+RUN_DEPENDS = ::devel/desktop-file-utils \
+ ${MODTK_RUN_DEPENDS}
+LIB_DEPENDS = jpeg::graphics/jpeg
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libvncserver/}
+CONFIGURE_STYLE = gnu
+CONFIGURE_ARGS += ${CONFIURE_SHARED} \
+ --with-x --without-avahi
+CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
-USE_X11= Yes
-
-CONFIGURE_STYLE=gnu
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS+=--with-x \
- --without-avahi
+post-patch:
+ ${SUBST_CMD} ${WRKSRC}/x11vnc/gui.c
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/x11vnc
cvs server: Diffing inside x11/x11vnc//patches
Index: x11/x11vnc//patches/patch-x11vnc_gui_c
===================================================================
RCS file: x11/x11vnc//patches/patch-x11vnc_gui_c
diff -N -u -p x11/x11vnc//patches/patch-x11vnc_gui_c
--- /dev/null 15 Feb 2009 07:49:45 -0000
+++ x11/x11vnc//patches/patch-x11vnc_gui_c 15 Feb 2009 07:49:45 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- x11vnc/gui.c.orig Mon Dec 8 22:41:01 2008
++++ x11vnc/gui.c Sun Feb 15 02:07:06 2009
+@@ -231,7 +231,7 @@ static void sigusr1 (int sig) {
+
+ static char *extra_path = ":/usr/local/bin:/usr/bin/X11:/usr/sfw/bin"
+ ":/usr/X11R6/bin:/usr/openwin/bin:/usr/dt/bin";
+-static char *wishes[] = {"wish8.4", "wish", "wish8.3", "wish8.5", "wish8.0",
NULL};
++static char *wishes[] = {"wish${MODTK_VERSION}", "wish8.5", "wish8.4",
"wish", NULL};
+
+ static void run_gui(char *gui_xdisplay, int connect_to_x11vnc, int
start_x11vnc,
+ int simple_gui, pid_t parent, char *gui_opts) {
cvs server: Diffing inside x11/x11vnc//pkg
