cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- add dependency on Tk for the gui; diff from Mikolaj Kucharski,

Browse Source 
reworked to use MODULES=x11/tk (suggested by steven@) and Makefile
cleanup by Stuart Cassoff, thanks to both

- take MAINTAINER, previous maintainer didn't respond to my past emails
This commit is contained in:
sthen 2009-02-15 09:47:48 +00:00
parent 787e6f6d53
commit a520652879
2 changed files with 37 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
x11/x11vnc/Makefile
View File

@ -1,36 +1,37 @@
# $OpenBSD: Makefile,v 1.5 2009/02/02 23:27:48 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.6 2009/02/15 09:47:48 sthen 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 <craigba@creative.com.au>
MAINTAINER = Stuart Henderson <sthen@openbsd.org>
# 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 Xdamage Xext Xfixes Xinerama Xrandr Xtst c crypto
WANTLIB += pthread ssl z
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
pre-configure:
${SUBST_CMD} ${WRKSRC}/x11vnc/gui.c
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/x11vnc

12
x11/x11vnc/patches/patch-x11vnc_gui_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-x11vnc_gui_c,v 1.1 2009/02/15 09:47:48 sthen Exp $
--- 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) {