Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Use standard WRKSRC to allow patches against common/

Adapt Makefile variables for this.

While here, fix some build problems on NetBSD-6.99.15 with modular
xorg.

But:
Build on NetBSD-6.99.15/amd64 with modular xorg fails with:
gcc -O2 -ansi -Dasm=__asm GccWarningOptions   -I../../include -I../../exports/include/X11  -I../.. -I../../exports/include -I/usr/X11R6/include  -DCSRG_BASED  -DFUNCPROTO=15 -DNARROWPROTO     -DCPP_PROGRAM="\"cpp\"" -DHAS_MERGE_CONSTANTS=`if gcc -fmerge-constants -xc /dev/null -S -o /dev/null 2> /dev/null 1> /dev/null; then echo 1; else echo 0; fi`            -c imake.c
gcc: GccWarningOptions: No such file or directory
*** Error code 1
  • Loading branch information...
commit 204011dae38ed36b1c448c28ebd4a99511c34222 1 parent 4cfb78d
thomasklausner authored
View
36 realvnc/Makefile
@@ -21,7 +21,7 @@ CONFLICTS+= vnc-[0-9]*
CONFLICTS+= vncviewer-[0-9]*
CONFLICTS+= vncviewer4-[0-9]*
-WRKSRC= ${WRKDIR}/${DISTNAME}/unix
+CONFIGURE_DIRS= unix
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-installed-zlib
@@ -29,7 +29,7 @@ NO_INSTALL_MANPAGES= yes
USE_LANGUAGES= c c++
USE_TOOLS+= perl:run tar
-REPLACE_PERL= vncserver
+REPLACE_PERL= unix/vncserver
SUBST_CLASSES+= pl
SUBST_STAGE.pl= pre-install
@@ -49,32 +49,32 @@ pre-fetch:
# This is also lifted from FreeBSD Ports.
post-extract:
- cd ${WRKSRC} && ${TAR} -cf - -C ${WRKDIR} xc | ${TAR} -xf - && \
+ cd ${WRKSRC}/unix && ${TAR} -cf - -C ${WRKDIR} xc | ${TAR} -xf - && \
${RM} -rf ${WRKDIR}/xc
post-patch:
- cd ${WRKSRC} && ${TOOLS_PLATFORM.patch} -Np0 <xc.patch
+ cd ${WRKSRC}/unix && ${TOOLS_PLATFORM.patch} -Np0 <xc.patch
post-build:
- cd ${WRKSRC}/xc && ${MAKE} World
+ cd ${WRKSRC}/unix/xc && ${MAKE} World
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/vncserver ${DESTDIR}${PREFIX}/bin/vncserver
- ${INSTALL_PROGRAM} ${WRKSRC}/vncpasswd/vncpasswd ${DESTDIR}${PREFIX}/bin/vncpasswd
- ${INSTALL_PROGRAM} ${WRKSRC}/vncviewer/vncviewer ${DESTDIR}${PREFIX}/bin/vncviewer
- ${INSTALL_PROGRAM} ${WRKSRC}/vncconfig/vncconfig ${DESTDIR}${PREFIX}/bin/vncconfig
- ${INSTALL_PROGRAM} ${WRKSRC}/x0vncserver/x0vncserver ${DESTDIR}${PREFIX}/bin/x0vncserver
- ${INSTALL_PROGRAM} ${WRKSRC}/xc/programs/Xserver/Xvnc ${DESTDIR}${PREFIX}/bin/Xvnc
- ${INSTALL_PROGRAM} ${WRKSRC}/xc/programs/Xserver/Xvnc ${DESTDIR}${PREFIX}/bin/Xvnc
+ ${INSTALL_SCRIPT} ${WRKSRC}/unix/vncserver ${DESTDIR}${PREFIX}/bin/vncserver
+ ${INSTALL_PROGRAM} ${WRKSRC}/unix/vncpasswd/vncpasswd ${DESTDIR}${PREFIX}/bin/vncpasswd
+ ${INSTALL_PROGRAM} ${WRKSRC}/unix/vncviewer/vncviewer ${DESTDIR}${PREFIX}/bin/vncviewer
+ ${INSTALL_PROGRAM} ${WRKSRC}/unix/vncconfig/vncconfig ${DESTDIR}${PREFIX}/bin/vncconfig
+ ${INSTALL_PROGRAM} ${WRKSRC}/unix/x0vncserver/x0vncserver ${DESTDIR}${PREFIX}/bin/x0vncserver
+ ${INSTALL_PROGRAM} ${WRKSRC}/unix/xc/programs/Xserver/Xvnc ${DESTDIR}${PREFIX}/bin/Xvnc
+ ${INSTALL_PROGRAM} ${WRKSRC}/unix/xc/programs/Xserver/Xvnc ${DESTDIR}${PREFIX}/bin/Xvnc
${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/lib/modules/extensions
- ${INSTALL_PROGRAM} ${WRKSRC}/xc/programs/Xserver/vnc/module/vnc.so ${DESTDIR}${PREFIX}/lib/modules/extensions/vnc.so
- ${INSTALL_MAN} ${WRKSRC}/vncviewer/vncviewer.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/vncviewer.1
- ${INSTALL_MAN} ${WRKSRC}/x0vncserver/x0vncserver.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/x0vncserver.1
- ${INSTALL_MAN} ${WRKSRC}/vncpasswd/vncpasswd.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/vncpasswd.1
- ${INSTALL_MAN} ${WRKSRC}/vncconfig/vncconfig.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/vncconfig.1
- ${INSTALL_MAN} ${WRKSRC}/vncserver.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/vncserver.1
+ ${INSTALL_PROGRAM} ${WRKSRC}/unix/xc/programs/Xserver/vnc/module/vnc.so ${DESTDIR}${PREFIX}/lib/modules/extensions/vnc.so
+ ${INSTALL_MAN} ${WRKSRC}/unix/vncviewer/vncviewer.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/vncviewer.1
+ ${INSTALL_MAN} ${WRKSRC}/unix/x0vncserver/x0vncserver.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/x0vncserver.1
+ ${INSTALL_MAN} ${WRKSRC}/unix/vncpasswd/vncpasswd.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/vncpasswd.1
+ ${INSTALL_MAN} ${WRKSRC}/unix/vncconfig/vncconfig.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/vncconfig.1
+ ${INSTALL_MAN} ${WRKSRC}/unix/vncserver.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/vncserver.1
${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/vnc/classes
${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/common/javabin/* ${DESTDIR}${PREFIX}/share/vnc/classes
View
5 realvnc/TODO
@@ -9,3 +9,8 @@
- Still havn't looked into IPv6 support.
- This package has a known vulnerability, please investigate and fix if possible. (see: http://www.realvnc.com/products/free/4.1/release-notes.html).
+
+- Build on NetBSD-6.99.15/amd64 with modular xorg fails with:
+gcc -O2 -ansi -Dasm=__asm GccWarningOptions -I../../include -I../../exports/include/X11 -I../.. -I../../exports/include -I/usr/X11R6/include -DCSRG_BASED -DFUNCPROTO=15 -DNARROWPROTO -DCPP_PROGRAM="\"cpp\"" -DHAS_MERGE_CONSTANTS=`if gcc -fmerge-constants -xc /dev/null -S -o /dev/null 2> /dev/null 1> /dev/null; then echo 1; else echo 0; fi` -c imake.c
+gcc: GccWarningOptions: No such file or directory
+*** Error code 1
View
10 realvnc/distinfo
@@ -12,6 +12,10 @@ Size (X430src-2.tgz) = 7962239 bytes
SHA1 (X430src-3.tgz) = a11e619ba0b628d9e2e39e838379658b3b347f66
RMD160 (X430src-3.tgz) = fd585512ec26fec1c70d79954376e79c3d53248b
Size (X430src-3.tgz) = 12366363 bytes
-SHA1 (patch-aa) = 2bf5f3390fe68c9294b1310cca62df9c9dbc6809
-SHA1 (patch-ab) = d4f40dd4db875ff2724c525cf717399b16c70f28
-SHA1 (patch-ac) = f8d56d119130ac00de17ea1d2052a4aedc13bc6e
+SHA1 (patch-aa) = 977c3c337e6778e8538b6c7daeece4a5b98aa8a4
+SHA1 (patch-ab) = c15d57e253f42cafae6de1da6e3960190857a22d
+SHA1 (patch-ac) = 92aa4a3012e615e29c0625ea8197120fec695f18
+SHA1 (patch-common_network_TcpSocket.cxx) = 2f7e4893995e537a72447d94ce54eeb79ef40358
+SHA1 (patch-unix_tx_TXDialog.h) = 612e4f61b4ee908ae5870f073d194ee7f166eaf4
+SHA1 (patch-unix_tx_TXImage.cxx) = df65cdafb74bab45d1e7f44ef9eb73d29143ac77
+SHA1 (patch-unix_x0vncserver_Image.cxx) = c3baddd4d5a0807b1bf91375c0bf227e6a466885
View
4 realvnc/patches/patch-aa
@@ -1,7 +1,7 @@
$NetBSD$
---- xc/programs/Xserver/hw/xfree86/parser/scan.c.orig 2003-01-04 15:20:23.000000000 -0500
-+++ xc/programs/Xserver/hw/xfree86/parser/scan.c
+--- unix/xc/programs/Xserver/hw/xfree86/parser/scan.c.orig 2003-01-04 15:20:23.000000000 -0500
++++ unix/xc/programs/Xserver/hw/xfree86/parser/scan.c
@@ -425,7 +425,8 @@ xf86pathIsSafe(const char *path)
#ifndef XCONFENV
#define XCONFENV "XF86CONFIG"
View
4 realvnc/patches/patch-ab
@@ -1,7 +1,7 @@
$NetBSD$
---- xc/programs/Xserver/dix/main.c.orig 2003-02-17 11:55:31.000000000 -0500
-+++ xc/programs/Xserver/dix/main.c
+--- unix/xc/programs/Xserver/dix/main.c.orig 2003-02-17 11:55:31.000000000 -0500
++++ unix/xc/programs/Xserver/dix/main.c
@@ -505,7 +505,7 @@ CreateConnectionBlock()
/* Leave off the ridBase and ridMask, these must be sent with
connection */
View
4 realvnc/patches/patch-ac
@@ -1,7 +1,7 @@
$NetBSD$
---- xc/programs/Xserver/vnc/Xvnc/xvnc.cc.orig 2005-03-10 10:52:58.000000000 -0500
-+++ xc/programs/Xserver/vnc/Xvnc/xvnc.cc
+--- unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc.orig 2005-03-10 10:52:58.000000000 -0500
++++ unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc
@@ -216,8 +216,8 @@ extern "C" {
void ddxUseMsg()
{
View
14 realvnc/patches/patch-common_network_TcpSocket.cxx
@@ -0,0 +1,14 @@
+$NetBSD$
+
+atoi() prototype.
+
+--- common/network/TcpSocket.cxx.orig 2006-05-15 16:56:20.000000000 +0000
++++ common/network/TcpSocket.cxx
+@@ -33,6 +33,7 @@
+ #include <unistd.h>
+ #include <errno.h>
+ #include <string.h>
++#include <stdlib.h>
+ #include <signal.h>
+ #include <fcntl.h>
+ #endif
View
14 realvnc/patches/patch-unix_tx_TXDialog.h
@@ -0,0 +1,14 @@
+$NetBSD$
+
+select() prototype.
+
+--- unix/tx/TXDialog.h.orig 2006-05-15 16:56:20.000000000 +0000
++++ unix/tx/TXDialog.h
+@@ -30,6 +30,7 @@
+
+ #include "TXWindow.h"
+ #include <errno.h>
++#include <sys/select.h>
+
+ class TXDialog : public TXWindow, public TXDeleteWindowCallback {
+ public:
View
14 realvnc/patches/patch-unix_tx_TXImage.cxx
@@ -0,0 +1,14 @@
+$NetBSD$
+
+malloc() prototype.
+
+--- unix/tx/TXImage.cxx.orig 2006-05-15 16:56:20.000000000 +0000
++++ unix/tx/TXImage.cxx
+@@ -21,6 +21,7 @@
+
+
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <strings.h>
+ #include <sys/types.h>
+ #include <sys/ipc.h>
View
14 realvnc/patches/patch-unix_x0vncserver_Image.cxx
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Another missing prototype.
+
+--- unix/x0vncserver/Image.cxx.orig 2006-05-15 16:56:20.000000000 +0000
++++ unix/x0vncserver/Image.cxx
+@@ -21,6 +21,7 @@
+
+
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/ipc.h>
+ #include <sys/shm.h>
Please sign in to comment.
Something went wrong with that request. Please try again.