[32792] trunk/dports/x11/tightvnc
ryandesign at macports.org
ryandesign at macports.org
Sun Jan 13 04:41:18 PST 2008
Revision: 32792
http://trac.macosforge.org/projects/macports/changeset/32792
Author: ryandesign at macports.org
Date: 2008-01-13 04:41:10 -0800 (Sun, 13 Jan 2008)
Log Message:
-----------
tightvnc: fix names of patchfiles to match recommendations
Modified Paths:
--------------
trunk/dports/x11/tightvnc/Portfile
Added Paths:
-----------
trunk/dports/x11/tightvnc/files/patch-Xvnc.diff
trunk/dports/x11/tightvnc/files/patch-include_vncauth.h.diff
trunk/dports/x11/tightvnc/files/patch-no_server.diff
trunk/dports/x11/tightvnc/files/patch-vncconnect_vncconnect.c.diff
trunk/dports/x11/tightvnc/files/patch-vncserver.diff
trunk/dports/x11/tightvnc/files/patch-vncviewer.diff
Removed Paths:
-------------
trunk/dports/x11/tightvnc/files/patch-Xvnc
trunk/dports/x11/tightvnc/files/patch-include__vncauth.h
trunk/dports/x11/tightvnc/files/patch-no_server
trunk/dports/x11/tightvnc/files/patch-vncconnect__vncconnect.c
trunk/dports/x11/tightvnc/files/patch-vncserver
trunk/dports/x11/tightvnc/files/patch-vncviewer
Modified: trunk/dports/x11/tightvnc/Portfile
===================================================================
--- trunk/dports/x11/tightvnc/Portfile 2008-01-13 12:37:59 UTC (rev 32791)
+++ trunk/dports/x11/tightvnc/Portfile 2008-01-13 12:41:10 UTC (rev 32792)
@@ -27,11 +27,11 @@
worksrcdir vnc_unixsrc
-patchfiles patch-Xvnc \
- patch-vncviewer \
- patch-vncserver \
- patch-vncconnect__vncconnect.c \
- patch-include__vncauth.h
+patchfiles patch-Xvnc.diff \
+ patch-vncviewer.diff \
+ patch-vncserver.diff \
+ patch-vncconnect_vncconnect.c.diff \
+ patch-include_vncauth.h.diff
post-patch {
reinplace "s|@PREFIX@|${prefix}|g" \
${worksrcpath}/Xvnc/config/cf/vnclibs.def \
@@ -45,7 +45,7 @@
variant no_server {
depends_run-delete bin:perl:perl5.8
- patchfiles-append patch-no_server
+ patchfiles-append patch-no_server.diff
}
use_xmkmf yes
Deleted: trunk/dports/x11/tightvnc/files/patch-Xvnc
===================================================================
--- trunk/dports/x11/tightvnc/files/patch-Xvnc 2008-01-13 12:37:59 UTC (rev 32791)
+++ trunk/dports/x11/tightvnc/files/patch-Xvnc 2008-01-13 12:41:10 UTC (rev 32792)
@@ -1,241 +0,0 @@
-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 -lcrypt
- #else
--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 -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
-+# ifdef __APPLE__
-+# define DEFAULT_CPP "cpp"
-+# else
-+# define DEFAULT_CPP "/usr/bin/cpp"
-+# endif /* __APPLE__ */
-+#endif /* __MACH__ */
-
- /*
- * Step 5: cpp_argv
-@@ -555,6 +559,9 @@
- "-traditional",
- "-Demxos2",
- #endif
-+#if defined(__APPLE__)
-+ "-D__APPLE__",
-+#endif
-
- };
-
-@@ -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]"
-+#elif defined(__APPLE__)
-+/* uname -v returns "x.yz" or "x.y.z", e.g. "2.02" or "2.1.2". */
-+# define DEFAULT_OS_MAJOR_REV "r %[0-9]"
-+# define DEFAULT_OS_MINOR_REV "r %*d.%[0-9]"
-+# define DEFAULT_OS_TEENY_REV "r %*d.%*d.%[0-9]" /* this will just get 0 */
-+# define DEFAULT_OS_NAME "s %[^\n]"
- #elif defined(ISC)
- /* ISC all Versions ? */
- /* uname -r returns "x.y", e.g. "3.2" ,uname -v returns "x" e.g. "2" */
-@@ -923,6 +936,33 @@
- #ifdef __EMX__
- {"__EMX__", "1"},
- #endif
-+#ifdef __APPLE__
-+ {"__APPLE__", "1"},
-+#endif
-+#ifdef __MACH__
-+ {"__MACH__", "1"},
-+#endif
-+#ifdef __ppc__
-+ {"__ppc__", "1"},
-+#endif
-+#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
-+#ifdef __LITTLE_ENDIAN__
-+ {"__LITTLE_ENDIAN__", "1"},
-+#endif
- /* add any additional symbols before this line */
- {NULL, NULL}
- };
-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
- #define OS_H
-+#ifdef __APPLE__
-+#include <stdlib.h>
-+#endif
- #include "misc.h"
- #define ALLOCATE_LOCAL_FALLBACK(_size) Xalloc((unsigned long)(_size))
- #define DEALLOCATE_LOCAL_FALLBACK(_ptr) Xfree((pointer)(_ptr))
-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 */
-
-+#if defined(__APPLE__) || defined(__DARWIN__)
-+
-+# 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
-+
-+#define LARGE_INSTRUCTION_CACHE
-+#define FAST_CONSTANT_OFFSET_MODE
-+#define PLENTIFUL_REGISTERS
-+#define AVOID_MEMORY_READ
-+
-+#define FAST_MEMCPY
-+
-+#endif /* __APPLE__ || __DARWIN__ */
-+
- #if (defined(Lynx) && defined(__powerpc__))
-
- /* For now this is for Xvfb only */
-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
-
- #if !defined(AMOEBA)
--#ifdef hpux
-+#if defined(hpux) || defined(__DARWIN__)
- # include <sys/utsname.h>
- # ifdef HAS_IFREQ
- # include <net/if.h>
-@@ -480,7 +480,7 @@
-
- #else /* WINTCP */
-
--#if !defined(SIOCGIFCONF) || (defined (hpux) && ! defined (HAS_IFREQ))
-+#if !defined(SIOCGIFCONF) || (defined (hpux) && ! defined (HAS_IFREQ)) || defined(__DARWIN__)
- void
- DefineSelf (fd)
- int fd;
Copied: trunk/dports/x11/tightvnc/files/patch-Xvnc.diff (from rev 32740, trunk/dports/x11/tightvnc/files/patch-Xvnc)
===================================================================
--- trunk/dports/x11/tightvnc/files/patch-Xvnc.diff (rev 0)
+++ trunk/dports/x11/tightvnc/files/patch-Xvnc.diff 2008-01-13 12:41:10 UTC (rev 32792)
@@ -0,0 +1,241 @@
+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 -lcrypt
+ #else
+-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 -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
++# ifdef __APPLE__
++# define DEFAULT_CPP "cpp"
++# else
++# define DEFAULT_CPP "/usr/bin/cpp"
++# endif /* __APPLE__ */
++#endif /* __MACH__ */
+
+ /*
+ * Step 5: cpp_argv
+@@ -555,6 +559,9 @@
+ "-traditional",
+ "-Demxos2",
+ #endif
++#if defined(__APPLE__)
++ "-D__APPLE__",
++#endif
+
+ };
+
+@@ -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]"
++#elif defined(__APPLE__)
++/* uname -v returns "x.yz" or "x.y.z", e.g. "2.02" or "2.1.2". */
++# define DEFAULT_OS_MAJOR_REV "r %[0-9]"
++# define DEFAULT_OS_MINOR_REV "r %*d.%[0-9]"
++# define DEFAULT_OS_TEENY_REV "r %*d.%*d.%[0-9]" /* this will just get 0 */
++# define DEFAULT_OS_NAME "s %[^\n]"
+ #elif defined(ISC)
+ /* ISC all Versions ? */
+ /* uname -r returns "x.y", e.g. "3.2" ,uname -v returns "x" e.g. "2" */
+@@ -923,6 +936,33 @@
+ #ifdef __EMX__
+ {"__EMX__", "1"},
+ #endif
++#ifdef __APPLE__
++ {"__APPLE__", "1"},
++#endif
++#ifdef __MACH__
++ {"__MACH__", "1"},
++#endif
++#ifdef __ppc__
++ {"__ppc__", "1"},
++#endif
++#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
++#ifdef __LITTLE_ENDIAN__
++ {"__LITTLE_ENDIAN__", "1"},
++#endif
+ /* add any additional symbols before this line */
+ {NULL, NULL}
+ };
+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
+ #define OS_H
++#ifdef __APPLE__
++#include <stdlib.h>
++#endif
+ #include "misc.h"
+ #define ALLOCATE_LOCAL_FALLBACK(_size) Xalloc((unsigned long)(_size))
+ #define DEALLOCATE_LOCAL_FALLBACK(_ptr) Xfree((pointer)(_ptr))
+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 */
+
++#if defined(__APPLE__) || defined(__DARWIN__)
++
++# 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
++
++#define LARGE_INSTRUCTION_CACHE
++#define FAST_CONSTANT_OFFSET_MODE
++#define PLENTIFUL_REGISTERS
++#define AVOID_MEMORY_READ
++
++#define FAST_MEMCPY
++
++#endif /* __APPLE__ || __DARWIN__ */
++
+ #if (defined(Lynx) && defined(__powerpc__))
+
+ /* For now this is for Xvfb only */
+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
+
+ #if !defined(AMOEBA)
+-#ifdef hpux
++#if defined(hpux) || defined(__DARWIN__)
+ # include <sys/utsname.h>
+ # ifdef HAS_IFREQ
+ # include <net/if.h>
+@@ -480,7 +480,7 @@
+
+ #else /* WINTCP */
+
+-#if !defined(SIOCGIFCONF) || (defined (hpux) && ! defined (HAS_IFREQ))
++#if !defined(SIOCGIFCONF) || (defined (hpux) && ! defined (HAS_IFREQ)) || defined(__DARWIN__)
+ void
+ DefineSelf (fd)
+ int fd;
Deleted: trunk/dports/x11/tightvnc/files/patch-include__vncauth.h
===================================================================
--- trunk/dports/x11/tightvnc/files/patch-include__vncauth.h 2008-01-13 12:37:59 UTC (rev 32791)
+++ trunk/dports/x11/tightvnc/files/patch-include__vncauth.h 2008-01-13 12:41:10 UTC (rev 32792)
@@ -1,10 +0,0 @@
---- ../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);
Copied: trunk/dports/x11/tightvnc/files/patch-include_vncauth.h.diff (from rev 32740, trunk/dports/x11/tightvnc/files/patch-include__vncauth.h)
===================================================================
--- trunk/dports/x11/tightvnc/files/patch-include_vncauth.h.diff (rev 0)
+++ trunk/dports/x11/tightvnc/files/patch-include_vncauth.h.diff 2008-01-13 12:41:10 UTC (rev 32792)
@@ -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);
Deleted: trunk/dports/x11/tightvnc/files/patch-no_server
===================================================================
--- trunk/dports/x11/tightvnc/files/patch-no_server 2008-01-13 12:37:59 UTC (rev 32791)
+++ trunk/dports/x11/tightvnc/files/patch-no_server 2008-01-13 12:41:10 UTC (rev 32792)
@@ -1,53 +0,0 @@
-diff -urN ../vnc_unixsrc/Imakefile ./Imakefile
---- ../vnc_unixsrc/Imakefile Tue Apr 30 06:07:30 2002
-+++ ./Imakefile Wed Mar 3 20:58:06 2004
-@@ -1,7 +1,7 @@
- #define IHaveSubdirs
- #define PassCDebugFlags
-
--SUBDIRS = libvncauth vncviewer vncpasswd vncconnect
-+SUBDIRS = libvncauth vncviewer
-
- World:
- make Makefiles
-diff -urN ../vnc_unixsrc/Xvnc/Makefile ./Xvnc/Makefile
---- ../vnc_unixsrc/Xvnc/Makefile Sun Jun 11 05:00:51 2000
-+++ ./Xvnc/Makefile Wed Mar 3 21:07:09 2004
-@@ -37,8 +37,9 @@
-
- World:
- @echo ""
-- @echo Building $(RELEASE) of the X Window System.
-+ @echo NOT Building $(RELEASE) of the X Window System.
- @echo ""
-+World-disabled:
- @case "x$(BOOTSTRAPCFLAGS)" in x) \
- echo I hope you checked the configuration parameters in $(IRULESRC) ; \
- echo to see if you need to pass BOOTSTRAPCFLAGS. ; \
-diff -urN ../vnc_unixsrc/Xvnc/configure ./Xvnc/configure
---- ../vnc_unixsrc/Xvnc/configure Wed Feb 19 08:39:30 2003
-+++ ./Xvnc/configure Wed Mar 3 21:07:35 2004
-@@ -8,6 +8,10 @@
- # Tru64 4.0F & 5.1 (OSF1, V4.0 or V5.1)
- # Linux 2.4 (Linux, 2.4.0-4GB)
- # Irix 6.2 (IRIX, 6.2)
-+echo ""
-+echo NOT Configuring Xvnc.
-+echo ""
-+exit 0
-
- SYSNAME=`uname -s`
-
-diff -urN ../vnc_unixsrc/vncinstall ./vncinstall
---- ../vnc_unixsrc/vncinstall Tue Mar 19 03:44:02 2002
-+++ ./vncinstall Wed Mar 3 20:58:06 2004
-@@ -38,8 +38,7 @@
- man_dst="$2/man1"
- fi
-
--for f in Xvnc/programs/Xserver/Xvnc vncviewer/vncviewer \
-- vncpasswd/vncpasswd vncconnect/vncconnect vncserver; do
-+for f in vncviewer/vncviewer; do
-
- # Installing binaries
- if cmp -s $f $bin_dst/`basename $f`; then
Copied: trunk/dports/x11/tightvnc/files/patch-no_server.diff (from rev 32740, trunk/dports/x11/tightvnc/files/patch-no_server)
===================================================================
--- trunk/dports/x11/tightvnc/files/patch-no_server.diff (rev 0)
+++ trunk/dports/x11/tightvnc/files/patch-no_server.diff 2008-01-13 12:41:10 UTC (rev 32792)
@@ -0,0 +1,53 @@
+diff -urN ../vnc_unixsrc/Imakefile ./Imakefile
+--- ../vnc_unixsrc/Imakefile Tue Apr 30 06:07:30 2002
++++ ./Imakefile Wed Mar 3 20:58:06 2004
+@@ -1,7 +1,7 @@
+ #define IHaveSubdirs
+ #define PassCDebugFlags
+
+-SUBDIRS = libvncauth vncviewer vncpasswd vncconnect
++SUBDIRS = libvncauth vncviewer
+
+ World:
+ make Makefiles
+diff -urN ../vnc_unixsrc/Xvnc/Makefile ./Xvnc/Makefile
+--- ../vnc_unixsrc/Xvnc/Makefile Sun Jun 11 05:00:51 2000
++++ ./Xvnc/Makefile Wed Mar 3 21:07:09 2004
+@@ -37,8 +37,9 @@
+
+ World:
+ @echo ""
+- @echo Building $(RELEASE) of the X Window System.
++ @echo NOT Building $(RELEASE) of the X Window System.
+ @echo ""
++World-disabled:
+ @case "x$(BOOTSTRAPCFLAGS)" in x) \
+ echo I hope you checked the configuration parameters in $(IRULESRC) ; \
+ echo to see if you need to pass BOOTSTRAPCFLAGS. ; \
+diff -urN ../vnc_unixsrc/Xvnc/configure ./Xvnc/configure
+--- ../vnc_unixsrc/Xvnc/configure Wed Feb 19 08:39:30 2003
++++ ./Xvnc/configure Wed Mar 3 21:07:35 2004
+@@ -8,6 +8,10 @@
+ # Tru64 4.0F & 5.1 (OSF1, V4.0 or V5.1)
+ # Linux 2.4 (Linux, 2.4.0-4GB)
+ # Irix 6.2 (IRIX, 6.2)
++echo ""
++echo NOT Configuring Xvnc.
++echo ""
++exit 0
+
+ SYSNAME=`uname -s`
+
+diff -urN ../vnc_unixsrc/vncinstall ./vncinstall
+--- ../vnc_unixsrc/vncinstall Tue Mar 19 03:44:02 2002
++++ ./vncinstall Wed Mar 3 20:58:06 2004
+@@ -38,8 +38,7 @@
+ man_dst="$2/man1"
+ fi
+
+-for f in Xvnc/programs/Xserver/Xvnc vncviewer/vncviewer \
+- vncpasswd/vncpasswd vncconnect/vncconnect vncserver; do
++for f in vncviewer/vncviewer; do
+
+ # Installing binaries
+ if cmp -s $f $bin_dst/`basename $f`; then
Deleted: trunk/dports/x11/tightvnc/files/patch-vncconnect__vncconnect.c
===================================================================
--- trunk/dports/x11/tightvnc/files/patch-vncconnect__vncconnect.c 2008-01-13 12:37:59 UTC (rev 32791)
+++ trunk/dports/x11/tightvnc/files/patch-vncconnect__vncconnect.c 2008-01-13 12:41:10 UTC (rev 32792)
@@ -1,15 +0,0 @@
---- ../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>
Copied: trunk/dports/x11/tightvnc/files/patch-vncconnect_vncconnect.c.diff (from rev 32740, trunk/dports/x11/tightvnc/files/patch-vncconnect__vncconnect.c)
===================================================================
--- trunk/dports/x11/tightvnc/files/patch-vncconnect_vncconnect.c.diff (rev 0)
+++ trunk/dports/x11/tightvnc/files/patch-vncconnect_vncconnect.c.diff 2008-01-13 12:41:10 UTC (rev 32792)
@@ -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>
Deleted: trunk/dports/x11/tightvnc/files/patch-vncserver
===================================================================
--- trunk/dports/x11/tightvnc/files/patch-vncserver 2008-01-13 12:37:59 UTC (rev 32791)
+++ trunk/dports/x11/tightvnc/files/patch-vncserver 2008-01-13 12:41:10 UTC (rev 32792)
@@ -1,40 +0,0 @@
---- ../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-2003 Constantin Kaplinsky. All Rights Reserved.
- # Copyright (C) 1999 AT&T Laboratories Cambridge. All Rights Reserved.
-@@ -36,12 +36,14 @@
- $geometry = "1024x768";
- $depth = 24;
- $desktopName = "X";
--$vncClasses = "/usr/local/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";
Copied: trunk/dports/x11/tightvnc/files/patch-vncserver.diff (from rev 32740, trunk/dports/x11/tightvnc/files/patch-vncserver)
===================================================================
--- trunk/dports/x11/tightvnc/files/patch-vncserver.diff (rev 0)
+++ trunk/dports/x11/tightvnc/files/patch-vncserver.diff 2008-01-13 12:41:10 UTC (rev 32792)
@@ -0,0 +1,40 @@
+--- ../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-2003 Constantin Kaplinsky. All Rights Reserved.
+ # Copyright (C) 1999 AT&T Laboratories Cambridge. All Rights Reserved.
+@@ -36,12 +36,14 @@
+ $geometry = "1024x768";
+ $depth = 24;
+ $desktopName = "X";
+-$vncClasses = "/usr/local/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";
Deleted: trunk/dports/x11/tightvnc/files/patch-vncviewer
===================================================================
--- trunk/dports/x11/tightvnc/files/patch-vncviewer 2008-01-13 12:37:59 UTC (rev 32791)
+++ trunk/dports/x11/tightvnc/files/patch-vncviewer 2008-01-13 12:41:10 UTC (rev 32792)
@@ -1,24 +0,0 @@
-diff -urN ../vnc_unixsrc.orig/vncviewer/Imakefile ./vncviewer/Imakefile
---- ../vnc_unixsrc.orig/vncviewer/Imakefile Thu Jun 27 22:53:19 2002
-+++ ./vncviewer/Imakefile Wed Mar 3 21:14:18 2004
-@@ -10,16 +10,16 @@
- DEFINES = -DMITSHM
- #endif
-
--ZLIB_INC = -I/usr/local/include
--JPEG_INC = -I/usr/local/include
-+ZLIB_INC = -I at PREFIX@/include
-+JPEG_INC = -I at PREFIX@/include
- INCLUDES = -I../include -I. $(ZLIB_INC) $(JPEG_INC) -I/usr/include
- VNCAUTH_LIB = ../libvncauth/libvncauth.a
--ZLIB_LIB = -L/usr/local/lib -lz
-+ZLIB_LIB = -L at PREFIX@/lib -lz
- #ifdef OSF1Architecture
- XCOMM Avoid linking with different libjpeg in /usr/shlib under Tru64.
- JPEG_LIB = /usr/local/lib/libjpeg.a
- #else
--JPEG_LIB = -L/usr/local/lib -ljpeg
-+JPEG_LIB = -L at PREFIX@/lib -ljpeg
- #endif
-
- DEPLIBS = XawClientDepLibs $(VNCAUTH_LIB)
Copied: trunk/dports/x11/tightvnc/files/patch-vncviewer.diff (from rev 32740, trunk/dports/x11/tightvnc/files/patch-vncviewer)
===================================================================
--- trunk/dports/x11/tightvnc/files/patch-vncviewer.diff (rev 0)
+++ trunk/dports/x11/tightvnc/files/patch-vncviewer.diff 2008-01-13 12:41:10 UTC (rev 32792)
@@ -0,0 +1,24 @@
+diff -urN ../vnc_unixsrc.orig/vncviewer/Imakefile ./vncviewer/Imakefile
+--- ../vnc_unixsrc.orig/vncviewer/Imakefile Thu Jun 27 22:53:19 2002
++++ ./vncviewer/Imakefile Wed Mar 3 21:14:18 2004
+@@ -10,16 +10,16 @@
+ DEFINES = -DMITSHM
+ #endif
+
+-ZLIB_INC = -I/usr/local/include
+-JPEG_INC = -I/usr/local/include
++ZLIB_INC = -I at PREFIX@/include
++JPEG_INC = -I at PREFIX@/include
+ INCLUDES = -I../include -I. $(ZLIB_INC) $(JPEG_INC) -I/usr/include
+ VNCAUTH_LIB = ../libvncauth/libvncauth.a
+-ZLIB_LIB = -L/usr/local/lib -lz
++ZLIB_LIB = -L at PREFIX@/lib -lz
+ #ifdef OSF1Architecture
+ XCOMM Avoid linking with different libjpeg in /usr/shlib under Tru64.
+ JPEG_LIB = /usr/local/lib/libjpeg.a
+ #else
+-JPEG_LIB = -L/usr/local/lib -ljpeg
++JPEG_LIB = -L at PREFIX@/lib -ljpeg
+ #endif
+
+ DEPLIBS = XawClientDepLibs $(VNCAUTH_LIB)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080113/968db1f9/attachment-0001.html
More information about the macports-changes
mailing list