[25231] trunk/dports/x11/tightvnc
source_changes at macosforge.org
source_changes at macosforge.org
Tue May 15 23:33:43 PDT 2007
Revision: 25231
http://trac.macosforge.org/projects/macports/changeset/25231
Author: boeyms at macports.org
Date: 2007-05-15 23:33:43 -0700 (Tue, 15 May 2007)
Log Message:
-----------
x11/tightvnc:
* Update to latest version (1.3.9).
* Delete redundant extract.suffix from Portfile.
* Fix a lot of bugs so that latest version will work:
* Make vncserver look in the correct location for its classes files
(${prefix}/share/classes) (change to patch-vncserver);
* Fix paths in which it looks for fonts (change to patch-vncserver);
* Increase the pause in vncserver between launching Xvnc and checking for its
pid file so that it is less likely to erroneously report that Xvnc has
failed to start (change to patch-vncserver);
* Remove upstream change that adds -lcrypt flag that is unnecessary (and
causes error) on Mac OS X (change to patch to Xvnc/config/cf/vnclibs.def in
patch-Xvnc);
* Restructure #ifdef testing to avoid warnings about DEFAULT_CPP being
redefined by ensuring that it is set only once on Mac OS X (change to patch
to Xvnc/config/imake/imakemdep.h in patch-Xvnc);
* Add symbols defined by the Mac OS X preprocessor to predefs as requested
by the source code (change to patch to Xvnc/config/imake/imakemdep.h in
patch-Xvnc);
* Change the declared extern prototype of malloc, realloc to match that on
Mac OS X (new patch to Xvnc/lib/Xdmcp/Alloc.c in patch-Xvnc);
* Add headers to correctly prototype printf(), sprintf() and strlen() on
Mac OS X (new patch to
Xvnc/lib/font/Type1/{objects,spaces,t1malloc,t1stub}.c in patch-Xvnc);
* Change the patch applied to cope with Mac OS X on Intel as well as
PowerPC (change to patch to Xvnc/programs/Xserver/include/servermd.h),
resolves #7198;
* Add headers to correctly prototype exit() and strlen() on Mac OS X (new
patch (patch-vncconnect__vncconnect.c) to vncconnect/vncconnect.c);
* Add prototype for function added upstream to libvncauth/vncauth.c (new
patch (patch-include__vncauth.h) to include/vncauth.h).
Modified Paths:
--------------
trunk/dports/x11/tightvnc/Portfile
trunk/dports/x11/tightvnc/files/patch-Xvnc
trunk/dports/x11/tightvnc/files/patch-vncserver
Added Paths:
-----------
trunk/dports/x11/tightvnc/files/patch-include__vncauth.h
trunk/dports/x11/tightvnc/files/patch-vncconnect__vncconnect.c
Modified: trunk/dports/x11/tightvnc/Portfile
===================================================================
--- trunk/dports/x11/tightvnc/Portfile 2007-05-16 06:32:45 UTC (rev 25230)
+++ trunk/dports/x11/tightvnc/Portfile 2007-05-16 06:33:43 UTC (rev 25231)
@@ -2,7 +2,7 @@
PortSystem 1.0
name tightvnc
-version 1.2.9
+version 1.3.9
categories x11 vnc
maintainers nomaintainer at macports.org
description Enhanced version of VNC
@@ -16,9 +16,8 @@
homepage http://www.tightvnc.com/
master_sites sourceforge:vnc-tight
distname ${name}-${version}_unixsrc
-extract.suffix .tar.bz2
use_bzip2 yes
-checksums md5 f804b26c098625e3a2675a0aa7709e31
+checksums md5 49a0748ea52793f2e3069e05af28f716
platforms darwin
depends_lib lib:libX11.6:XFree86 \
@@ -30,7 +29,9 @@
patchfiles patch-Xvnc \
patch-vncviewer \
- patch-vncserver
+ patch-vncserver \
+ patch-vncconnect__vncconnect.c \
+ patch-include__vncauth.h
post-patch {
cd ${worksrcpath}
reinplace "s|@PREFIX@|${prefix}|g" \
Modified: trunk/dports/x11/tightvnc/files/patch-Xvnc
===================================================================
--- trunk/dports/x11/tightvnc/files/patch-Xvnc 2007-05-16 06:32:45 UTC (rev 25230)
+++ trunk/dports/x11/tightvnc/files/patch-Xvnc 2007-05-16 06:33:43 UTC (rev 25231)
@@ -1,30 +1,35 @@
-diff -urN ../vnc_unixsrc.orig/Xvnc/config/cf/vnclibs.def ./Xvnc/config/cf/vnclibs.def
---- ../vnc_unixsrc.orig/Xvnc/config/cf/vnclibs.def Thu Jun 27 22:53:19 2002
-+++ ./Xvnc/config/cf/vnclibs.def Wed Mar 3 21:14:18 2004
+diff -Naur ../vnc_unixsrc/Xvnc/config/cf/vnclibs.def Xvnc/config/cf/vnclibs.def
+--- ../vnc_unixsrc/Xvnc/config/cf/vnclibs.def 2003-05-03 09:31:55.000000000 +0000
++++ Xvnc/config/cf/vnclibs.def 2007-05-15 02:18:22.000000000 +0000
@@ -11,7 +11,7 @@
/* Avoid linking with different libjpeg in /usr/shlib under Tru64. */
- VNCSYSLIBS = /usr/local/lib/libjpeg.a /usr/local/lib/libz.a
+ VNCSYSLIBS = /usr/local/lib/libjpeg.a /usr/local/lib/libz.a -lcrypt
#else
--VNCSYSLIBS = -L/usr/local/lib -ljpeg -lz
+-VNCSYSLIBS = -L/usr/local/lib -ljpeg -lz -lcrypt
+VNCSYSLIBS = -L at PREFIX@/lib -ljpeg -lz
#endif
-VNCCPPFLAGS = -I$(TOP)/../include -I/usr/local/include
+VNCCPPFLAGS = -I$(TOP)/../include -I at PREFIX@/include
-diff -urN ../vnc_unixsrc.orig/Xvnc/config/imake/imakemdep.h ./Xvnc/config/imake/imakemdep.h
---- ../vnc_unixsrc.orig/Xvnc/config/imake/imakemdep.h Wed Feb 19 08:39:54 2003
-+++ ./Xvnc/config/imake/imakemdep.h Wed Mar 3 21:14:18 2004
-@@ -272,6 +272,9 @@
+diff -Naur ../vnc_unixsrc/Xvnc/config/imake/imakemdep.h Xvnc/config/imake/imakemdep.h
+--- ../vnc_unixsrc/Xvnc/config/imake/imakemdep.h 2003-02-19 16:39:54.000000000 +0000
++++ Xvnc/config/imake/imakemdep.h 2007-05-15 03:59:11.000000000 +0000
+@@ -270,8 +270,12 @@
+ #define DEFAULT_CPP "cpp"
+ #endif
#ifdef __MACH__
- #define DEFAULT_CPP "/usr/bin/cpp"
- #endif
-+#if defined(__APPLE__)
-+#define DEFAULT_CPP "cpp"
-+#endif
+-#define DEFAULT_CPP "/usr/bin/cpp"
+-#endif
++# ifdef __APPLE__
++# define DEFAULT_CPP "cpp"
++# else
++# define DEFAULT_CPP "/usr/bin/cpp"
++# endif /* __APPLE__ */
++#endif /* __MACH__ */
/*
* Step 5: cpp_argv
-@@ -555,6 +558,9 @@
+@@ -555,6 +559,9 @@
"-traditional",
"-Demxos2",
#endif
@@ -34,7 +39,7 @@
};
-@@ -614,6 +620,12 @@
+@@ -614,6 +621,12 @@
# define DEFAULT_OS_MINOR_REV "r %*d.%[0-9]"
# define DEFAULT_OS_TEENY_REV "r %*d.%*d.%[0-9]"
# define DEFAULT_OS_NAME "srm %[^\n]"
@@ -47,22 +52,129 @@
#elif defined(ISC)
/* ISC all Versions ? */
/* uname -r returns "x.y", e.g. "3.2" ,uname -v returns "x" e.g. "2" */
-@@ -922,6 +934,12 @@
- #endif
+@@ -923,6 +936,33 @@
#ifdef __EMX__
{"__EMX__", "1"},
+ #endif
++#ifdef __APPLE__
++ {"__APPLE__", "1"},
+#endif
-+#if defined(__ppc__)
++#ifdef __MACH__
++ {"__MACH__", "1"},
++#endif
++#ifdef __ppc__
+ {"__ppc__", "1"},
+#endif
-+#if defined(__BIG_ENDIAN__)
++#ifdef __ppc__
++ {"__ppc__", "1"},
++#endif
++#ifdef __ppc64__
++ {"__ppc64__", "1"},
++#endif
++#ifdef __i386__
++ {"__i386__", "1"},
++#endif
++#ifdef __x86_64__
++ {"__x86_64__", "1"},
++#endif
++#ifdef __BIG_ENDIAN__
+ {"__BIG_ENDIAN__", "1"},
- #endif
++#endif
++#ifdef __LITTLE_ENDIAN__
++ {"__LITTLE_ENDIAN__", "1"},
++#endif
/* add any additional symbols before this line */
{NULL, NULL}
-diff -urN ../vnc_unixsrc.orig/Xvnc/programs/Xserver/include/os.h ./Xvnc/programs/Xserver/include/os.h
---- ../vnc_unixsrc.orig/Xvnc/programs/Xserver/include/os.h Sun Jun 11 05:00:52 2000
-+++ ./Xvnc/programs/Xserver/include/os.h Wed Mar 3 21:14:18 2004
+ };
+diff -Naur ../vnc_unixsrc/Xvnc/lib/Xdmcp/Alloc.c Xvnc/lib/Xdmcp/Alloc.c
+--- ../vnc_unixsrc/Xvnc/lib/Xdmcp/Alloc.c 2000-06-11 12:00:51.000000000 +0000
++++ Xvnc/lib/Xdmcp/Alloc.c 2007-05-15 06:13:59.000000000 +0000
+@@ -31,7 +31,7 @@
+
+ /* stubs for use when Xalloc, Xrealloc and Xfree are not defined */
+
+-extern char *malloc (), *realloc ();
++extern void *malloc (), *realloc ();
+
+ unsigned long *
+ Xalloc (amount)
+diff -Naur ../vnc_unixsrc/Xvnc/lib/font/Type1/objects.c Xvnc/lib/font/Type1/objects.c
+--- ../vnc_unixsrc/Xvnc/lib/font/Type1/objects.c 2000-06-11 12:00:51.000000000 +0000
++++ Xvnc/lib/font/Type1/objects.c 2007-05-15 05:23:46.000000000 +0000
+@@ -57,6 +57,14 @@
+ #include <ctype.h>
+
+ /*
++The following is to include the function prototypes for printf and sprintf
++on Mac OS X and Darwin.
++*/
++#if defined(__APPLE__) || defined(__DARWIN__)
++# include <stdio.h>
++#endif
++
++/*
+ override incorrect system functions; for example you might define
+ a macro for "strcpy" that diverts it to "my_strcpy".
+ */
+diff -Naur ../vnc_unixsrc/Xvnc/lib/font/Type1/spaces.c Xvnc/lib/font/Type1/spaces.c
+--- ../vnc_unixsrc/Xvnc/lib/font/Type1/spaces.c 2000-06-11 12:00:51.000000000 +0000
++++ Xvnc/lib/font/Type1/spaces.c 2007-05-15 05:57:29.000000000 +0000
+@@ -37,6 +37,16 @@
+
+ :h3.Include Files
+ */
++
++/*
++The following is to include the function prototype for sprintf and strlen on
++Mac OS X and Darwin.
++*/
++#if defined(__APPLE__) || defined(__DARWIN__)
++# include <stdio.h>
++# include <string.h>
++#endif
++
+ #include "objects.h"
+ #include "spaces.h"
+ #include "paths.h"
+diff -Naur ../vnc_unixsrc/Xvnc/lib/font/Type1/t1malloc.c Xvnc/lib/font/Type1/t1malloc.c
+--- ../vnc_unixsrc/Xvnc/lib/font/Type1/t1malloc.c 2000-06-11 12:00:51.000000000 +0000
++++ Xvnc/lib/font/Type1/t1malloc.c 2007-05-15 05:25:45.000000000 +0000
+@@ -37,6 +37,14 @@
+
+ */
+
++/*
++The following is to include the function prototype for printf on Mac OS X
++and Darwin.
++*/
++#if defined(__APPLE__) || defined(__DARWIN__)
++# include <stdio.h>
++#endif
++
+ #include "objects.h" /* get #define for abort() */
+
+ static combine();
+diff -Naur ../vnc_unixsrc/Xvnc/lib/font/Type1/t1stub.c Xvnc/lib/font/Type1/t1stub.c
+--- ../vnc_unixsrc/Xvnc/lib/font/Type1/t1stub.c 2000-06-11 12:00:51.000000000 +0000
++++ Xvnc/lib/font/Type1/t1stub.c 2007-05-15 05:26:32.000000000 +0000
+@@ -28,6 +28,14 @@
+ * SOFTWARE.
+ */
+
++/*
++The following is to include the function prototype for printf on Mac OS X
++and Darwin.
++*/
++#if defined(__APPLE__) || defined(__DARWIN__)
++# include <stdio.h>
++#endif
++
+ #include "objects.h" /* get #define for abort() */
+
+ xiStub()
+diff -Naur ../vnc_unixsrc/Xvnc/programs/Xserver/include/os.h Xvnc/programs/Xserver/include/os.h
+--- ../vnc_unixsrc/Xvnc/programs/Xserver/include/os.h 2000-06-11 12:00:51.000000000 +0000
++++ Xvnc/programs/Xserver/include/os.h 2007-05-14 14:52:35.000000000 +0000
@@ -51,6 +51,9 @@
#ifndef OS_H
@@ -73,17 +185,24 @@
#include "misc.h"
#define ALLOCATE_LOCAL_FALLBACK(_size) Xalloc((unsigned long)(_size))
#define DEALLOCATE_LOCAL_FALLBACK(_ptr) Xfree((pointer)(_ptr))
-diff -urN ../vnc_unixsrc.orig/Xvnc/programs/Xserver/include/servermd.h ./Xvnc/programs/Xserver/include/servermd.h
---- ../vnc_unixsrc.orig/Xvnc/programs/Xserver/include/servermd.h Wed Feb 19 08:39:54 2003
-+++ ./Xvnc/programs/Xserver/include/servermd.h Wed Mar 3 21:14:18 2004
-@@ -132,6 +132,22 @@
+diff -Naur ../vnc_unixsrc/Xvnc/programs/Xserver/include/servermd.h Xvnc/programs/Xserver/include/servermd.h
+--- ../vnc_unixsrc/Xvnc/programs/Xserver/include/servermd.h 2006-12-23 12:07:55.000000000 +0000
++++ Xvnc/programs/Xserver/include/servermd.h 2007-05-15 02:05:38.000000000 +0000
+@@ -132,6 +132,29 @@
#endif /* vax */
-+#ifdef __DARWIN__
++#if defined(__APPLE__) || defined(__DARWIN__)
+
-+#define IMAGE_BYTE_ORDER MSBFirst
-+#define BITMAP_BIT_ORDER MSBFirst
++# if defined(__ppc__) || defined(__ppc64__)
++# define IMAGE_BYTE_ORDER MSBFirst
++# define BITMAP_BIT_ORDER MSBFirst /* __ppc__ || __ppc64__ */
++
++# elif defined(__i386__) || defined(__x86_64__)
++# define IMAGE_BYTE_ORDER LSBFirst
++# define BITMAP_BIT_ORDER LSBFirst
++# endif /* __i386__ || __x86_64__ */
++
+#define GLYPHPADBYTES 4
+#define GETLEFTBITS_ALIGNMENT 1
+
@@ -94,14 +213,14 @@
+
+#define FAST_MEMCPY
+
-+#endif /* __DARWIN__ */
++#endif /* __APPLE__ || __DARWIN__ */
+
#if (defined(Lynx) && defined(__powerpc__))
/* For now this is for Xvfb only */
-diff -urN ../vnc_unixsrc.orig/Xvnc/programs/Xserver/os/access.c ./Xvnc/programs/Xserver/os/access.c
---- ../vnc_unixsrc.orig/Xvnc/programs/Xserver/os/access.c Sun Jun 11 05:00:52 2000
-+++ ./Xvnc/programs/Xserver/os/access.c Wed Mar 3 21:14:18 2004
+diff -Naur ../vnc_unixsrc/Xvnc/programs/Xserver/os/access.c Xvnc/programs/Xserver/os/access.c
+--- ../vnc_unixsrc/Xvnc/programs/Xserver/os/access.c 2000-06-11 12:00:51.000000000 +0000
++++ Xvnc/programs/Xserver/os/access.c 2007-05-14 14:52:35.000000000 +0000
@@ -103,7 +103,7 @@
#endif
Added: trunk/dports/x11/tightvnc/files/patch-include__vncauth.h
===================================================================
--- trunk/dports/x11/tightvnc/files/patch-include__vncauth.h (rev 0)
+++ trunk/dports/x11/tightvnc/files/patch-include__vncauth.h 2007-05-16 06:33:43 UTC (rev 25231)
@@ -0,0 +1,10 @@
+--- ../vnc_unixsrc/include/vncauth.h 2000-06-11 12:00:51.000000000 +0000
++++ include/vncauth.h 2007-05-15 10:20:58.000000000 +0000
+@@ -25,6 +25,7 @@
+ #define CHALLENGESIZE 16
+
+ extern int vncEncryptAndStorePasswd(char *passwd, char *fname);
++extern int vncEncryptAndStorePasswd2(char *passwd, char *passwdViewOnly, char *fname);
+ extern char *vncDecryptPasswdFromFile(char *fname);
+ extern void vncRandomBytes(unsigned char *bytes);
+ extern void vncEncryptBytes(unsigned char *bytes, char *passwd);
Property changes on: trunk/dports/x11/tightvnc/files/patch-include__vncauth.h
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/dports/x11/tightvnc/files/patch-vncconnect__vncconnect.c
===================================================================
--- trunk/dports/x11/tightvnc/files/patch-vncconnect__vncconnect.c (rev 0)
+++ trunk/dports/x11/tightvnc/files/patch-vncconnect__vncconnect.c 2007-05-16 06:33:43 UTC (rev 25231)
@@ -0,0 +1,15 @@
+--- ../vnc_unixsrc/vncconnect/vncconnect.c 2000-11-10 10:20:07.000000000 +0000
++++ vncconnect/vncconnect.c 2007-05-15 13:09:59.000000000 +0000
+@@ -2,6 +2,12 @@
+ * vncconnect.c
+ */
+
++/* On Darwin, exit() is prototyped in <stdlib.h> and strlen() in <string.h> */
++#if defined(__DARWIN__) || defined(__APPLE__)
++#include <string.h>
++#include <stdlib.h>
++#endif /* __DARWIN__ || __APPLE__ */
++
+ #include <stdio.h>
+ #include <X11/Xlib.h>
+ #include <X11/Xatom.h>
Property changes on: trunk/dports/x11/tightvnc/files/patch-vncconnect__vncconnect.c
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/dports/x11/tightvnc/files/patch-vncserver
===================================================================
--- trunk/dports/x11/tightvnc/files/patch-vncserver 2007-05-16 06:32:45 UTC (rev 25230)
+++ trunk/dports/x11/tightvnc/files/patch-vncserver 2007-05-16 06:33:43 UTC (rev 25231)
@@ -1,18 +1,40 @@
-diff -urN ../vnc_unixsrc.orig/vncserver ./vncserver
---- ../vnc_unixsrc.orig/vncserver Thu Jul 31 07:19:37 2003
-+++ ./vncserver Wed Mar 3 21:16:02 2004
+--- ../vnc_unixsrc/vncserver 2007-04-26 10:57:06.000000000 +0000
++++ vncserver 2007-05-15 06:21:54.000000000 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!@PERL@
#
- # Copyright (C) 2002 Constantin Kaplinsky. All Rights Reserved.
+ # Copyright (C) 2002-2003 Constantin Kaplinsky. All Rights Reserved.
# Copyright (C) 1999 AT&T Laboratories Cambridge. All Rights Reserved.
-@@ -36,7 +36,7 @@
+@@ -36,12 +36,14 @@
$geometry = "1024x768";
$depth = 24;
$desktopName = "X";
-$vncClasses = "/usr/local/vnc/classes";
-+$vncClasses = "@PREFIX@/vnc/classes";
++$vncClasses = "@PREFIX@/share/vnc/classes";
$vncUserDir = "$ENV{HOME}/.vnc";
$fontPath = "unix/:7100";
+ $authType = "-rfbauth $vncUserDir/passwd";
+ # Here is another example of setting the font path:
++$fontRoot = "/usr/lib/X11/fonts";
++$fontPath = "$fontRoot/Type1/,$fontRoot/TTF/,$fontRoot/Speedo/,$fontRoot/misc/,$fontRoot/100dpi/,$fontRoot/75dpi/";
+ # $fontPath = "/usr/lib/X11/fonts/misc/,/usr/lib/X11/fonts/75dpi/";
+
+ # X colors database path is optional, uncomment and edit to use:
+@@ -194,13 +196,13 @@
+
+ # Give Xvnc a chance to start up
+
+-sleep(1);
++sleep(5);
+ unless (kill 0, `cat $pidFile`) {
+ warn "Couldn't start Xvnc; trying default font path.\n";
+ warn "Please set correct fontPath in the $prog script.\n";
+ $cmd =~ s at -fp [^ ]+@@;
+ system("$cmd & echo \$! >$pidFile");
+- sleep(1);
++ sleep(5);
+ }
+ unless (kill 0, `cat $pidFile`) {
+ warn "Couldn't start Xvnc process.\n\n";
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070515/4707c0f3/attachment.html
More information about the macports-changes
mailing list