update to tightvnc-1.2.3, from maintainer Rob Casey <rob@minauros.com>

This commit is contained in:
wilfried 2002-03-25 11:57:45 +00:00
parent d1096dbad6
commit ec9737a041
7 changed files with 53 additions and 57 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.3 2002/03/04 23:35:12 matt Exp $
# $OpenBSD: Makefile,v 1.4 2002/03/25 11:57:45 wilfried Exp $
COMMENT= "cross-platform remote desktop access"
COMMENT-viewer= "client for cross-platform remote desktop access"
VERSION= 1.2.2
VERSION= 1.2.3
PKGNAME= tightvnc-${VERSION}
DISTNAME= ${PKGNAME}_unixsrc
CATEGORIES= net

View File

@ -1,4 +1,4 @@
MD5 (tightvnc-1.2.2_unixsrc.tar.gz) = f3767e26a8c63950b58d6213a971cdc7
MD5 (tightvnc-1.2.3_unixsrc.tar.gz) = e876b509505b4f711d122e3e30fca761
MD5 (vnc-latest_doc.tgz) = IGNORE
RMD160 (tightvnc-1.2.2_unixsrc.tar.gz) = 32dec7a33e581dbdf956ebad211fcdc7dd00a5cc
SHA1 (tightvnc-1.2.2_unixsrc.tar.gz) = d921d19cb03c9d9b84100e2789dfc3dbd9174542
RMD160 (tightvnc-1.2.3_unixsrc.tar.gz) = 016022dcc6af3fd9837e19f9ad7f844bc00fdc10
SHA1 (tightvnc-1.2.3_unixsrc.tar.gz) = 1e16561be950738f3693a258b3da167d544e255c

View File

@ -1,11 +1,11 @@
$OpenBSD: patch-Imakefile,v 1.1.1.1 2001/09/08 00:38:11 lebel Exp $
--- Imakefile.orig Thu Oct 26 15:18:57 2000
+++ Imakefile Wed Sep 5 08:47:31 2001
@@ -11,6 +11,7 @@ World:
$OpenBSD: patch-Imakefile,v 1.2 2002/03/25 11:57:45 wilfried Exp $
--- Imakefile.orig Sun Mar 24 19:19:15 2002
+++ Imakefile Sun Mar 24 19:18:12 2002
@@ -11,6 +11,7 @@
@echo Built $(SUBDIRS).
@echo 'To build Xvnc, do "cd Xvnc", followed by "make World"'
@echo ""
+ (cd Xvnc; make World)
MakeSubdirs($(SUBDIRS))
DependSubdirs($(SUBDIRS))
libs:
@echo 'Building libraries...'

View File

@ -1,11 +1,12 @@
$OpenBSD: patch-Xvnc_config_cf_vnclibs_def,v 1.1.1.1 2001/09/08 00:38:11 lebel Exp $
--- Xvnc/config/cf/vnclibs.def.orig Mon Jan 29 16:23:52 2001
+++ Xvnc/config/cf/vnclibs.def Wed Sep 5 08:47:31 2001
@@ -5,5 +5,5 @@
$OpenBSD: patch-Xvnc_config_cf_vnclibs_def,v 1.2 2002/03/25 11:57:45 wilfried Exp $
--- Xvnc/config/cf/vnclibs.def.orig Wed Mar 20 05:38:00 2002
+++ Xvnc/config/cf/vnclibs.def Sun Mar 24 20:12:40 2002
@@ -5,6 +5,5 @@
* and programs/Xserver/hw/vnc whenever you change this file.
*/
-VNCLIBS = $(TOP)/../libvncauth/libvncauth.a /usr/lib/libjpeg.a
-VNCCPPFLAGS = -I$(TOP)/../include
-VNCLIBS = $(TOP)/../libvncauth/libvncauth.a
-VNCSYSLIBS = -L$(TOP)/../lib/jpeg -ljpeg
-VNCCPPFLAGS = -I$(TOP)/../include -I$(TOP)/../lib/zlib -I$(TOP)/../lib/jpeg
+VNCLIBS = $(TOP)/../libvncauth/libvncauth.a ${LOCALBASE}/lib/libjpeg.a
+VNCCPPFLAGS = -I$(TOP)/../include -I${LOCALBASE}/include

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-vncserver,v 1.1.1.1 2001/09/08 00:38:11 lebel Exp $
--- vncserver.orig Mon Jun 25 03:52:14 2001
+++ vncserver Wed Sep 5 08:47:31 2001
@@ -48,13 +48,23 @@ $defaultXStartup
$OpenBSD: patch-vncserver,v 1.2 2002/03/25 11:57:45 wilfried Exp $
--- vncserver.orig Wed Mar 20 00:40:46 2002
+++ vncserver Sun Mar 24 19:42:20 2002
@@ -56,13 +56,23 @@
"xterm -geometry 80x24+10+10 -ls -title \"\$VNCDESKTOP Desktop\" &\n".
"twm &\n");
@ -26,7 +26,7 @@ $OpenBSD: patch-vncserver,v 1.1.1.1 2001/09/08 00:38:11 lebel Exp $
&Usage() if ($opt{'-help'} || $opt{'-h'} || $opt{'--help'});
@@ -77,6 +87,25 @@ if ($opt{'-pixelformat'}) {
@@ -85,6 +95,25 @@
&CheckGeometryAndDepth();
@ -52,16 +52,7 @@ $OpenBSD: patch-vncserver,v 1.1.1.1 2001/09/08 00:38:11 lebel Exp $
if ($opt{'-name'}) {
$desktopName = $opt{'-name'};
}
@@ -152,6 +181,8 @@ $cmd .= " -rfbport $vncPort";
# $cmd .= " -fp /usr/lib/X11/fonts/misc/,/usr/lib/X11/fonts/75dpi/";
# $cmd .= " -co /usr/lib/X11/rgb";
#
+# bmah: Bring in the fontpath we computed earlier.
+$cmd .= " -fp $fontPath";
foreach $arg (@ARGV) {
$cmd .= " " . &quotedString($arg);
@@ -193,6 +224,7 @@ if (-e "/tmp/.X11-unix/X$displayNumber")
@@ -210,6 +239,7 @@
$ENV{DISPLAY}= "$host:$displayNumber";
}
$ENV{VNCDESKTOP}= $desktopName;
@ -69,3 +60,12 @@ $OpenBSD: patch-vncserver,v 1.1.1.1 2001/09/08 00:38:11 lebel Exp $
system("$vncUserDir/xstartup >> " . &quotedString($desktopLog) . " 2>&1 &");
@@ -221,6 +251,8 @@
# CheckGeometryAndDepth simply makes sure that the geometry and depth values
# are sensible.
#
+# bmah: Bring in the fontpath we computed earlier.
+$cmd .= " -fp $fontPath";
sub CheckGeometryAndDepth
{

View File

@ -1,22 +1,17 @@
$OpenBSD: patch-vncviewer_Imakefile,v 1.2 2002/03/04 23:35:12 matt Exp $
--- vncviewer/Imakefile.orig Tue Nov 13 06:31:34 2001
+++ vncviewer/Imakefile Sun Mar 3 18:20:11 2002
@@ -13,10 +13,10 @@ XCOMM seems to cause problems on Digital
$OpenBSD: patch-vncviewer_Imakefile,v 1.3 2002/03/25 11:57:45 wilfried Exp $
--- vncviewer/Imakefile.orig Wed Mar 20 05:38:00 2002
+++ vncviewer/Imakefile Sun Mar 24 19:51:29 2002
@@ -11,10 +11,10 @@
DEFINES = -DMITSHM
#endif
-INCLUDES = -I../include -I. -I/usr/include
-INCLUDES = -I../include -I. -I../lib/zlib -I../lib/jpeg -I/usr/include
+INCLUDES = -I../include -I. -I/usr/include -I${LOCALBASE}/include
VNCAUTH_LIB = ../libvncauth/libvncauth.a
ZLIB_LIB = /usr/lib/libz.a
-JPEG_LIB = /usr/lib/libjpeg.a
+JPEG_LIB = ${LOCALBASE}/lib/libjpeg.a
-ZLIB_LIB = -L../lib/zlib -lz
-JPEG_LIB = -L../lib/jpeg -ljpeg
+ZLIB_LIB = -lz
+JPEG_LIB = -ljpeg
DEPLIBS = XawClientDepLibs $(VNCAUTH_LIB) $(ZLIB_LIB) $(JPEG_LIB)
DEPLIBS = XawClientDepLibs $(VNCAUTH_LIB)
LOCAL_LIBRARIES = XawClientLibs $(VNCAUTH_LIB) $(ZLIB_LIB) $(JPEG_LIB)
@@ -40,4 +40,4 @@ SRCS = \
OBJS = $(SRCS:.c=.o)
-ComplexProgramTarget(vncviewer)
+ComplexProgramTargetNoMan(vncviewer)

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2002/03/25 11:51:42 wilfried Exp $
@comment $OpenBSD: PLIST,v 1.4 2002/03/25 11:57:45 wilfried Exp $
@pkgcfl tightvnc-viewer-*
bin/Xvnc
bin/vncconnect
@ -125,20 +125,20 @@ share/doc/vnc/vnc_docs/xlibvncviewer.html
share/doc/vnc/vnc_docs/xvnc.html
share/doc/vnc/vnc_docs/xvnchistory.html
share/doc/vnc/vnc_docs/xvncviewer.html
share/vnc/classes/AuthPanel.class
share/vnc/classes/ButtonPanel.class
share/vnc/classes/ClipboardFrame.class
share/vnc/classes/DesCipher.class
share/vnc/classes/animatedMemoryImageSource.class
share/vnc/classes/authenticationPanel.class
share/vnc/classes/clipboardFrame.class
share/vnc/classes/OptionsFrame.class
share/vnc/classes/RfbProto.class
share/vnc/classes/VncCanvas.class
share/vnc/classes/VncViewer.class
share/vnc/classes/VncViewer.jar
share/vnc/classes/hextile.vnc
share/vnc/classes/index.vnc
share/vnc/classes/noshared.vnc
share/vnc/classes/optionsFrame.class
share/vnc/classes/rfbProto.class
share/vnc/classes/shared.vnc
share/vnc/classes/tight.vnc
share/vnc/classes/vncCanvas.class
share/vnc/classes/vncviewer.class
share/vnc/classes/vncviewer.jar
share/vnc/classes/zlib.vnc
@dirrm share/vnc/classes
@dirrm share/vnc