summaryrefslogtreecommitdiff
path: root/net/tightvnc/patches
diff options
context:
space:
mode:
authortnn <tnn>2009-06-08 15:23:26 +0000
committertnn <tnn>2009-06-08 15:23:26 +0000
commit99093429250b0fd3c84d12a686c3bc4c8d39683c (patch)
tree362afaa67675b271de3d72e62433cd85175c140c /net/tightvnc/patches
parent5c86a74f936f2a9f95416fb3eb07184220647fd3 (diff)
downloadpkgsrc-99093429250b0fd3c84d12a686c3bc4c8d39683c.tar.gz
Update to tightvnc-1.3.10.
* Unix Server: Applied fixes for 64-bit Linux issues * Unix Server: Made the vncserver script read configuration from files * Other minor improvements and bugfixes. While here, do the DESTDIR thing.
Diffstat (limited to 'net/tightvnc/patches')
-rw-r--r--net/tightvnc/patches/patch-ag16
-rw-r--r--net/tightvnc/patches/patch-al8
2 files changed, 17 insertions, 7 deletions
diff --git a/net/tightvnc/patches/patch-ag b/net/tightvnc/patches/patch-ag
index b63cb44b75b..0bc9194e5c0 100644
--- a/net/tightvnc/patches/patch-ag
+++ b/net/tightvnc/patches/patch-ag
@@ -1,8 +1,18 @@
-$NetBSD: patch-ag,v 1.3 2003/11/27 17:27:29 abs Exp $
+$NetBSD: patch-ag,v 1.4 2009/06/08 15:23:26 tnn Exp $
---- Xvnc/programs/Xserver/Imakefile.orig 2000-06-11 13:00:51.000000000 +0100
+--- Xvnc/programs/Xserver/Imakefile.orig 2000-06-11 14:00:51.000000000 +0200
+++ Xvnc/programs/Xserver/Imakefile
-@@ -1712,7 +1712,7 @@ XVNCOBJS =
+@@ -11,7 +11,8 @@ XCOMM $XFree86: xc/programs/Xserver/Imak
+ INSTPGMFLAGS =
+ #endif
+
+-#define PreFbLibs $(DIX) $(OS) $(FONT) $(XPDDX)
++/* XXX libos and libdix seem to cross-depend on eachother, what about ordering? */
++#define PreFbLibs $(DIX) $(OS) $(DIX) $(FONT) $(XPDDX)
+ #define BarePostFbLibs $(MFB) $(XPFBLIBS) $(MI)
+ #define PostFbLibs BarePostFbLibs $(EXTENSIONS)
+ #define NoMfbBarePostFbLibs $(XPFBLIBS) $(MI)
+@@ -1712,7 +1713,7 @@ XVNCOBJS =
XVNC = hw/vnc/libvnc.a $(VNCLIBS)
XVNCLIBS = PreFbLibs $(XVNC) $(CFB) PostFbLibs
XVNCSYSLIBS = $(SYSLIBS) $(VNCSYSLIBS)
diff --git a/net/tightvnc/patches/patch-al b/net/tightvnc/patches/patch-al
index 0e24fc2e0d8..f071f6976da 100644
--- a/net/tightvnc/patches/patch-al
+++ b/net/tightvnc/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.3 2007/07/01 00:13:32 tnn Exp $
+$NetBSD: patch-al,v 1.4 2009/06/08 15:23:26 tnn Exp $
---- vncserver.orig 2007-06-30 23:05:23.000000000 +0200
+--- vncserver.orig 2009-02-12 05:27:18.000000000 +0100
+++ vncserver
-@@ -38,7 +38,7 @@ $depth = 24;
+@@ -34,7 +34,7 @@ $depth = 24;
$desktopName = "X";
$vncClasses = "/usr/local/vnc/classes";
$vncUserDir = "$ENV{HOME}/.vnc";
@@ -10,4 +10,4 @@ $NetBSD: patch-al,v 1.3 2007/07/01 00:13:32 tnn Exp $
+#$fontPath = "unix/:7100";
$authType = "-rfbauth $vncUserDir/passwd";
- # Here is another example of setting the font path:
+ # Read configuration from the system-wide and user files if present.