Closing #677565, #63596, #71295 and #69277.

4 files changed, 103 insertions, 19 deletions

diff --git a/net-misc/vnc/files/digest-vnc-4.0-r1 b/net-misc/vnc/files/digest-vnc-4.0-r1
new file mode 100644
index 000000000000..fdd7c356f4cf
--- /dev/null
+++ b/net-misc/vnc/files/digest-vnc-4.0-r1
@@ -0,0 +1,4 @@
+MD5 e8e79964b76e09e3a19c35cceb9e24b3 vnc-4.0-unixsrc.tar.gz 482518
+MD5 e352319d423391ff2c03bb7f81fe8d2b X11R6.8.1-src1.tar.gz 30562401
+MD5 6ba36becf1133c61a88c92e1d60c19ed X11R6.8.1-src2.tar.gz 5808949
+MD5 8578e566e909e7c40300f44b6f0e88d3 X11R6.8.1-src3.tar.gz 10014808
diff --git a/net-misc/vnc/files/vnc-4.0/imake-tmpdir.patch b/net-misc/vnc/files/vnc-4.0/imake-tmpdir.patch
new file mode 100644
index 000000000000..209cb15bf543
--- /dev/null
+++ b/net-misc/vnc/files/vnc-4.0/imake-tmpdir.patch
@@ -0,0 +1,37 @@
+--- xc/config/imake/imake.c.orig	2001-12-14 20:53:18.000000000 +0100
++++ xc/config/imake/imake.c	2003-09-12 15:00:10.000000000 +0200
+@@ -985,13 +985,23 @@
+ static void
+ get_libc_version(FILE *inFile)
+ {
+-  char aout[] = "/tmp/imakeXXXXXX";
++  char aout[4096], *tmpdir;
+   FILE *fp;
+   const char *format = "%s -o %s -x c -";
+   char *cc;
+   int len;
+   char *command;
+ 
++  /* If $TMPDIR is defined and has an acceptable length,
++   * use that as tmp dir, else use /tmp.  That fixes 
++   * problems with /tmp mounted "noexec".
++   */
++  if((tmpdir = getenv("TMPDIR")) != NULL && strlen(tmpdir) < (4096-13))
++    strcpy(aout, tmpdir);
++  else
++    strcpy(aout, "/tmp");
++  strcat(aout, "/imakeXXXXXX");
++
+   /* Pre-create temp file safely */
+   {
+     /* Linux + ELF has mkstemp() */
+@@ -1007,7 +1017,8 @@
+     cc = "gcc";
+   len = strlen (aout) + strlen (format) + strlen (cc);
+   if (len < 128) len = 128;
+-  command = alloca (len);
++  if((command = alloca (len)) == NULL)
++    abort();
+ 
+   if (snprintf (command , len, format, cc, aout) == len)
+     abort ();
diff --git a/net-misc/vnc/files/vnc-4.0/vnc-xorg-x11-fixes.patch b/net-misc/vnc/files/vnc-4.0/vnc-xorg-x11-fixes.patch
new file mode 100644
index 000000000000..a4cb39e32d0e
--- /dev/null
+++ b/net-misc/vnc/files/vnc-4.0/vnc-xorg-x11-fixes.patch
@@ -0,0 +1,22 @@
+--- vnc-4.0-unixsrc/xc/programs/Xserver/hw/xfree86/Imakefile.xorg-x11-fixes	2004-11-18 16:17:02.808464254 +0000
++++ vnc-4.0-unixsrc/xc/programs/Xserver/hw/xfree86/Imakefile	2004-11-18 16:17:03.925252687 +0000
+@@ -92,7 +92,7 @@
+           $(XF8_32BPPDIR) $(XF8_16BPPDIR) $(XF24_32BPPDIR) $(SHADOWFBDIR) \
+ 	  drivers $(LOADERDIR) $(VGAHWDIR) $(FBDEVHWDIR) $(RAMDACDIR) \
+ 	  $(RACDIR) $(DDCDIR) $(INPUTDIR) $(INT10DIR) $(VBEDIR) parser \
+-          scanpci doc dummylib $(XF86CFGDIRS) etc $(DRIVERSDK) \
++          scanpci doc dummylib $(XF86CFGDIRS) $(DRIVERSDK) \
+ 	  $(XF8_32WIDDIR) getconfig
+ 
+ #if !defined(OS2Architecture) && !defined(cygwinArchitecture)
+--- vnc-4.0-unixsrc/xc/extras/rman/rman.c.xorg-x11-fixes	2004-04-23 19:42:56.000000000 +0100
++++ vnc-4.0-unixsrc/xc/extras/rman/rman.c	2004-11-18 09:53:56.000000000 +0000
+@@ -211,7 +211,7 @@
+ const char TABLEOFCONTENTS[] = "Table of Contents";
+ const char HEADERANDFOOTER[] = "Header and Footer";
+ char manName[80] = "man page";
+-char manSect[10] = "1";
++char manSect[30] = "1";
+ const char PROVENANCE[] =
+ 	"manual page source format generated by PolyglotMan v" POLYGLOTMANVERSION;
+ const char HOME[] = "available at http://polyglotman.sourceforge.net/";
diff --git a/net-misc/vnc/files/vnc-4.0/vnc-xorg.patch b/net-misc/vnc/files/vnc-4.0/vnc-xorg.patch
index d7a46223ab3c..cd749c5398c3 100644
--- a/net-misc/vnc/files/vnc-4.0/vnc-xorg.patch
+++ b/net-misc/vnc/files/vnc-4.0/vnc-xorg.patch
@@ -37,25 +37,6 @@
  #endif
  
  #if BuildXprint
---- vnc-4.0b4-unixsrc/xc.patch.xorg	2004-03-23 10:53:05.000000000 +0000
-+++ vnc-4.0b4-unixsrc/xc.patch	2004-03-23 10:53:42.000000000 +0000
-@@ -8,11 +8,11 @@
- + XCOMM
- + XCOMM X VNC server
- + XCOMM
--+ MFBDIR = mfb
--+ CFB8DIR = cfb
--+ CFB16DIR = cfb16
--+ CFB24DIR = cfb24
--+ CFB32DIR = cfb32
-++ MFBSUBDIR = mfb
-++ CFB8SUBDIR = cfb
-++ CFB16SUBDIR = cfb16
-++ CFB24SUBDIR = cfb24
-++ CFB32SUBDIR = cfb32
- + XVNCDDXDIR = vnc/Xvnc
- + XVNCDIRS = $(STDDIRS) $(MFBDIR) \
- + 	    $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) \
 --- vnc-4.0b5-unixsrc/xc/programs/Xserver/vnc/RegionHelper.h.xorg	2003-05-30 11:42:38.000000000 +0100
 +++ vnc-4.0b5-unixsrc/xc/programs/Xserver/vnc/RegionHelper.h	2004-05-27 11:26:06.499536143 +0100
 @@ -36,7 +36,7 @@
@@ -78,3 +59,43 @@
      } else {
        REGION_INIT(pScreen, reg, rect, size);
      }
+--- vnc-4.0-unixsrc/xc.patch.xorg	2004-08-25 16:10:52.131987786 +0100
++++ vnc-4.0-unixsrc/xc.patch	2004-08-25 16:12:23.896276533 +0100
+@@ -8,11 +8,11 @@
+ + XCOMM
+ + XCOMM X VNC server
+ + XCOMM
+-+ MFBDIR = mfb
+-+ CFB8DIR = cfb
+-+ CFB16DIR = cfb16
+-+ CFB24DIR = cfb24
+-+ CFB32DIR = cfb32
+++ MFBSUBDIR = mfb
+++ CFB8SUBDIR = cfb
+++ CFB16SUBDIR = cfb16
+++ CFB24SUBDIR = cfb24
+++ CFB32SUBDIR = cfb32
+ + XVNCDDXDIR = vnc/Xvnc
+ + XVNCDIRS = $(STDDIRS) $(MFBDIR) \
+ +          $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) \
+--- vnc-4.0-unixsrc/xc/programs/Xserver/vnc/Xvnc/xvnc.cc.xorg	2004-08-31 14:24:12.140503335 +0100
++++ vnc-4.0-unixsrc/xc/programs/Xserver/vnc/Xvnc/xvnc.cc	2004-08-31 14:24:45.189675775 +0100
+@@ -201,6 +201,7 @@
+ }
+ 
+ extern "C" {
++  void ddxInitGlobals() {}
+   void ddxGiveUp()
+   {
+     int i;
+--- vnc-4.0-unixsrc/xc/config/cf/vnc.def	2004-09-29 15:55:57.732303799 +0100
++++ vnc-4.0-unixsrc/xc/config/cf/vnc.def	2004-09-29 15:56:30.495034234 +0100
+@@ -9,6 +9,8 @@
+ #define XnestServer YES
+ #define XF86Server NO
+ #define XprtServer NO
++#define BuildXFree86ConfigTools NO
++#define BuildScanpci NO
+ 
+ #ifdef SunArchitecture
+ #define ProjectRoot /usr/openwin