aboutsummaryrefslogtreecommitdiff
path: root/net/tridiavnc
diff options
context:
space:
mode:
authorCy Schubert <cy@FreeBSD.org>2011-05-20 19:51:37 +0000
committerCy Schubert <cy@FreeBSD.org>2011-05-20 19:51:37 +0000
commitd47240c27277162d0f49fe603603fae638c8d68e (patch)
tree38e2800d45a06f57b5354e6f708b5b22681c7c75 /net/tridiavnc
parentd7b0faf6484e28bf62783f3412a9bafece14c6dd (diff)
downloadports-d47240c27277162d0f49fe603603fae638c8d68e.tar.gz
ports-d47240c27277162d0f49fe603603fae638c8d68e.zip
Notes
Diffstat (limited to 'net/tridiavnc')
-rw-r--r--net/tridiavnc/files/patch-Imakefile14
-rw-r--r--net/tridiavnc/files/patch-Xvnc::config::cf::Imake.cf14
-rw-r--r--net/tridiavnc/files/patch-Xvnc::config::cf::Imake.tmpl11
-rw-r--r--net/tridiavnc/files/patch-Xvnc::config::cf::vnclibs.def10
-rw-r--r--net/tridiavnc/files/patch-Xvnc::config::cf::xfree86.cf11
-rw-r--r--net/tridiavnc/files/patch-Xvnc::config::imake::imakemdep.h21
-rw-r--r--net/tridiavnc/files/patch-Xvnc::include::Xos.h10
-rw-r--r--net/tridiavnc/files/patch-Xvnc::programs::Xserver::dix::Imakefile17
-rw-r--r--net/tridiavnc/files/patch-Xvnc::programs::Xserver::hw::vnc::rfb.h10
-rw-r--r--net/tridiavnc/files/patch-Xvnc::programs::Xserver::hw::vnc::sockets.c18
-rw-r--r--net/tridiavnc/files/patch-vncviewer::Imakefile32
11 files changed, 168 insertions, 0 deletions
diff --git a/net/tridiavnc/files/patch-Imakefile b/net/tridiavnc/files/patch-Imakefile
new file mode 100644
index 000000000000..825c39d8a00a
--- /dev/null
+++ b/net/tridiavnc/files/patch-Imakefile
@@ -0,0 +1,14 @@
+--- Imakefile.orig Thu Nov 9 02:41:59 2000
++++ Imakefile Wed Nov 20 01:27:33 2002
+@@ -10,10 +10,7 @@
+ XCOMM END TridiaVNC_Source_Internal
+ make depend
+ make all
+- @echo ""
+- @echo Built $(SUBDIRS).
+- @echo 'To build Xvnc, do "cd Xvnc", followed by "make World"'
+- @echo ""
++ cd Xvnc; make World
+
+ MakeSubdirs($(SUBDIRS))
+ DependSubdirs($(SUBDIRS))
diff --git a/net/tridiavnc/files/patch-Xvnc::config::cf::Imake.cf b/net/tridiavnc/files/patch-Xvnc::config::cf::Imake.cf
new file mode 100644
index 000000000000..65bdc1a4dd2d
--- /dev/null
+++ b/net/tridiavnc/files/patch-Xvnc::config::cf::Imake.cf
@@ -0,0 +1,14 @@
+--- Xvnc/config/cf/Imake.cf.orig Thu Feb 8 03:49:57 2001
++++ Xvnc/config/cf/Imake.cf Wed Nov 20 21:32:23 2002
+@@ -154,6 +154,11 @@
+ # define i386Architecture
+ # undef i386
+ # endif
++# ifdef __alpha__
++# define AlphaBsdArchitecture
++# define AlphaArchitecture
++# undef __alpha__
++# endif
+ #endif /* __FreeBSD__ */
+
+ #ifdef AMOEBA
diff --git a/net/tridiavnc/files/patch-Xvnc::config::cf::Imake.tmpl b/net/tridiavnc/files/patch-Xvnc::config::cf::Imake.tmpl
new file mode 100644
index 000000000000..0ce721d855ac
--- /dev/null
+++ b/net/tridiavnc/files/patch-Xvnc::config::cf::Imake.tmpl
@@ -0,0 +1,11 @@
+--- Xvnc/config/cf/Imake.tmpl.orig Thu Apr 13 02:18:19 2000
++++ Xvnc/config/cf/Imake.tmpl Wed Nov 20 21:48:33 2002
+@@ -1254,7 +1254,7 @@
+ LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS)
+ CXXLDOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS)
+
+- LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES)
++ LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES) -L%%PREFIX%%/lib
+ #if HasBrokenCCForLink
+ CCLINK = LdCmd
+ #else
diff --git a/net/tridiavnc/files/patch-Xvnc::config::cf::vnclibs.def b/net/tridiavnc/files/patch-Xvnc::config::cf::vnclibs.def
new file mode 100644
index 000000000000..fd93bb5d35dd
--- /dev/null
+++ b/net/tridiavnc/files/patch-Xvnc::config::cf::vnclibs.def
@@ -0,0 +1,10 @@
+--- Xvnc/config/cf/vnclibs.def.orig Wed Apr 19 01:18:53 2000
++++ Xvnc/config/cf/vnclibs.def Wed Nov 20 22:05:54 2002
+@@ -5,5 +5,5 @@
+ * and programs/Xserver/hw/vnc whenever you change this file.
+ */
+
+-VNCLIBS = $(TOP)/../libvncauth/libvncauth.a $(TOP)/../zlib/libz.a
+-VNCCPPFLAGS = -I$(TOP)/../include -I$(TOP)/../zlib
++VNCLIBS = $(TOP)/../libvncauth/libvncauth.a -lz
++VNCCPPFLAGS = -I$(TOP)/../include -I%%PREFIX%%/include
diff --git a/net/tridiavnc/files/patch-Xvnc::config::cf::xfree86.cf b/net/tridiavnc/files/patch-Xvnc::config::cf::xfree86.cf
new file mode 100644
index 000000000000..5a19e04ef80d
--- /dev/null
+++ b/net/tridiavnc/files/patch-Xvnc::config::cf::xfree86.cf
@@ -0,0 +1,11 @@
+--- Xvnc/config/cf/xfree86.cf.orig Thu Apr 13 02:18:21 2000
++++ Xvnc/config/cf/xfree86.cf Wed Nov 20 21:32:23 2002
+@@ -782,7 +782,7 @@
+ #endif
+
+ #ifndef XFree86ConsoleDefines
+-#ifdef i386BsdArchitecture
++#if defined(i386BsdArchitecture) || defined(AlphaBsdArchitecture)
+ #define XFree86ConsoleDefines -DPCCONS_SUPPORT -DSYSCONS_SUPPORT -DPCVT_SUPPORT
+ #else
+ #define XFree86ConsoleDefines /**/
diff --git a/net/tridiavnc/files/patch-Xvnc::config::imake::imakemdep.h b/net/tridiavnc/files/patch-Xvnc::config::imake::imakemdep.h
new file mode 100644
index 000000000000..cc31a339f11d
--- /dev/null
+++ b/net/tridiavnc/files/patch-Xvnc::config::imake::imakemdep.h
@@ -0,0 +1,21 @@
+--- Xvnc/config/imake/imakemdep.h.orig Thu Nov 21 16:49:39 2002
++++ Xvnc/config/imake/imakemdep.h Thu Nov 21 16:50:09 2002
+@@ -225,6 +225,9 @@
+ #ifdef hpux
+ #define USE_CC_E
+ #endif
++#if defined(__FreeBSD__)
++#define USE_CC_E
++#endif
+ #ifdef WIN32
+ #define USE_CC_E
+ #define DEFAULT_CC "cl"
+@@ -253,7 +256,7 @@
+ #ifdef _CRAY
+ #define DEFAULT_CPP "/lib/pcpp"
+ #endif
+-#if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
++#if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+ #define DEFAULT_CPP "/usr/libexec/cpp"
+ #endif
+ #if defined(__sgi) && defined(__ANSI_CPP__)
diff --git a/net/tridiavnc/files/patch-Xvnc::include::Xos.h b/net/tridiavnc/files/patch-Xvnc::include::Xos.h
new file mode 100644
index 000000000000..3ea59e29a87f
--- /dev/null
+++ b/net/tridiavnc/files/patch-Xvnc::include::Xos.h
@@ -0,0 +1,10 @@
+--- Xvnc/include/Xos.h.orig Thu Apr 13 02:18:22 2000
++++ Xvnc/include/Xos.h Wed Nov 20 20:42:00 2002
+@@ -151,7 +151,6 @@
+ #endif /* X_NOT_POSIX else */
+
+ #ifdef CSRG_BASED
+-#include <stdlib.h>
+ #include <unistd.h>
+ #endif /* CSRG_BASED */
+
diff --git a/net/tridiavnc/files/patch-Xvnc::programs::Xserver::dix::Imakefile b/net/tridiavnc/files/patch-Xvnc::programs::Xserver::dix::Imakefile
new file mode 100644
index 000000000000..12392d7656a2
--- /dev/null
+++ b/net/tridiavnc/files/patch-Xvnc::programs::Xserver::dix::Imakefile
@@ -0,0 +1,17 @@
+--- Xvnc/programs/Xserver/dix/Imakefile.orig Thu Apr 13 02:18:32 2000
++++ Xvnc/programs/Xserver/dix/Imakefile Wed Nov 20 20:44:05 2002
+@@ -37,12 +37,12 @@
+ */
+
+ #ifdef DefaultFontPath
+-DEFAULTFONTPATH = DefaultFontPath
++DEFAULTFONTPATH = ${PREFIX}/lib/X11/fonts/misc
+ SITE_FONT_PATH = -DCOMPILEDDEFAULTFONTPATH=\"$(DEFAULTFONTPATH)\"
+ #endif
+
+ #ifdef DefaultRGBDatabase
+-DEFAULTRGBDATABASE = DefaultRGBDatabase
++DEFAULTRGBDATABASE = ${PREFIX}/lib/X11/rgb
+ SITE_RGB_DB = -DRGB_DB=\"$(DEFAULTRGBDATABASE)\"
+ #endif
+
diff --git a/net/tridiavnc/files/patch-Xvnc::programs::Xserver::hw::vnc::rfb.h b/net/tridiavnc/files/patch-Xvnc::programs::Xserver::hw::vnc::rfb.h
new file mode 100644
index 000000000000..e09799ea6dcf
--- /dev/null
+++ b/net/tridiavnc/files/patch-Xvnc::programs::Xserver::hw::vnc::rfb.h
@@ -0,0 +1,10 @@
+--- Xvnc/programs/Xserver/hw/vnc/rfb.h.orig Fri Feb 9 05:37:33 2001
++++ Xvnc/programs/Xserver/hw/vnc/rfb.h Wed Nov 20 21:14:27 2002
+@@ -23,6 +23,7 @@
+ * USA.
+ */
+
++#include <sys/types.h>
+ #include <netinet/in.h>
+ #include "scrnintstr.h"
+ #include "colormapst.h"
diff --git a/net/tridiavnc/files/patch-Xvnc::programs::Xserver::hw::vnc::sockets.c b/net/tridiavnc/files/patch-Xvnc::programs::Xserver::hw::vnc::sockets.c
new file mode 100644
index 000000000000..7e555741b9a6
--- /dev/null
+++ b/net/tridiavnc/files/patch-Xvnc::programs::Xserver::hw::vnc::sockets.c
@@ -0,0 +1,18 @@
+--- Xvnc/programs/Xserver/hw/vnc/sockets.c.orig Fri Nov 10 21:41:53 2000
++++ Xvnc/programs/Xserver/hw/vnc/sockets.c Wed Nov 20 22:08:01 2002
+@@ -38,6 +38,7 @@
+ */
+
+ #include <stdio.h>
++#include <string.h>
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <sys/socket.h>
+@@ -541,6 +542,7 @@
+ int sock;
+ int one = 1;
+
++ memset(&addr, 0, sizeof(addr));
+ addr.sin_family = AF_INET;
+ addr.sin_port = htons(port);
+ addr.sin_addr.s_addr = interface.s_addr;
diff --git a/net/tridiavnc/files/patch-vncviewer::Imakefile b/net/tridiavnc/files/patch-vncviewer::Imakefile
new file mode 100644
index 000000000000..077ad0a1cbe8
--- /dev/null
+++ b/net/tridiavnc/files/patch-vncviewer::Imakefile
@@ -0,0 +1,32 @@
+--- vncviewer/Imakefile.orig Wed Oct 11 23:53:21 2000
++++ vncviewer/Imakefile Wed Nov 20 22:16:14 2002
+@@ -8,9 +8,9 @@
+
+ #if defined(HPArchitecture)
+ INCLUDES = -I/usr/include/X11R6 -I/usr/contrib/X11R6/include \
+- -I../include -I. -I../zlib
++ -I../include -I. -I/usr/local/include
+ #else
+-INCLUDES = -I../include -I. -I../zlib
++INCLUDES = -I../include -I. -I/usr/local/include
+ #endif
+
+ #if defined(AIXArchitecture)
+@@ -18,9 +18,9 @@
+ #endif
+
+ VNCAUTH_LIB = ../libvncauth/libvncauth.a
+-ZLIB_LIB = ../zlib/libz.a
++ZLIB_LIB = -lz
+
+-DEPLIBS = XawClientDepLibs $(VNCAUTH_LIB) $(ZLIB_LIB)
++DEPLIBS = XawClientDepLibs $(VNCAUTH_LIB)
+ LOCAL_LIBRARIES = XawClientLibs $(VNCAUTH_LIB) $(ZLIB_LIB) $(LOCAL_LIBPATH_OPTION)
+
+ SRCS = \
+@@ -41,4 +41,4 @@
+
+ OBJS = $(SRCS:.c=.o)
+
+-ComplexProgramTarget(vncviewer)
++ComplexProgramTargetNoMan(vncviewer)