Update tightvnc to 1.2.7; Ok by maintainer and sturm@

This commit is contained in:
millert 2003-01-12 21:37:49 +00:00
parent 6e513cdd43
commit 3195601d1b
7 changed files with 45 additions and 33 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.7 2002/12/29 21:30:57 fgsch Exp $
# $OpenBSD: Makefile,v 1.8 2003/01/12 21:37:49 millert Exp $
COMMENT= "cross-platform remote desktop access"
COMMENT-viewer= "client for cross-platform remote desktop access"
VERSION= 1.2.3
VERSION= 1.2.7
PKGNAME= tightvnc-${VERSION}
DISTNAME= ${PKGNAME}_unixsrc
CATEGORIES= net

View File

@ -1,4 +1,4 @@
MD5 (tightvnc-1.2.3_unixsrc.tar.gz) = e876b509505b4f711d122e3e30fca761
MD5 (tightvnc-1.2.7_unixsrc.tar.gz) = dfc99ab9c104459d6168c25c9fa1ee1e
MD5 (vnc-latest_doc.tgz) = IGNORE
RMD160 (tightvnc-1.2.3_unixsrc.tar.gz) = 016022dcc6af3fd9837e19f9ad7f844bc00fdc10
SHA1 (tightvnc-1.2.3_unixsrc.tar.gz) = 1e16561be950738f3693a258b3da167d544e255c
RMD160 (tightvnc-1.2.7_unixsrc.tar.gz) = 1f5021d7faa03d61ca35c6e7253ad088f39e9786
SHA1 (tightvnc-1.2.7_unixsrc.tar.gz) = 95a258a5752fcd24518426288121c03bbc0bac01

View File

@ -1,11 +1,10 @@
$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
--- Imakefile.orig Tue Apr 30 07:07:30 2002
+++ Imakefile Sat Jan 4 13:19:29 2003
@@ -11,6 +11,7 @@
@echo Built $(SUBDIRS).
@echo 'To build Xvnc, do "cd Xvnc", followed by "make World"'
@echo 'To build Xvnc, do "cd Xvnc", followed by "./configure" then "make"'
@echo ""
+ (cd Xvnc; make World)
+ (cd Xvnc; ./configure; make)
libs:
@echo 'Building libraries...'
@echo 'No libraries included.'

View File

@ -1,12 +1,18 @@
$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 @@
--- Xvnc/config/cf/vnclibs.def.orig Thu Jun 27 23:53:19 2002
+++ Xvnc/config/cf/vnclibs.def Sat Jan 4 13:13:24 2003
@@ -5,13 +5,5 @@
* and programs/Xserver/hw/vnc whenever you change this file.
*/
-VNCLIBS = $(TOP)/../libvncauth/libvncauth.a
-VNCSYSLIBS = -L$(TOP)/../lib/jpeg -ljpeg
-VNCCPPFLAGS = -I$(TOP)/../include -I$(TOP)/../lib/zlib -I$(TOP)/../lib/jpeg
-
-#ifdef OSF1Architecture
-/* Avoid linking with different libjpeg in /usr/shlib under Tru64. */
-VNCSYSLIBS = /usr/local/lib/libjpeg.a /usr/local/lib/libz.a
-#else
-VNCSYSLIBS = -L/usr/local/lib -ljpeg -lz
-#endif
-
-VNCCPPFLAGS = -I$(TOP)/../include -I/usr/local/include
+VNCLIBS = $(TOP)/../libvncauth/libvncauth.a ${LOCALBASE}/lib/libjpeg.a
+VNCCPPFLAGS = -I$(TOP)/../include -I${LOCALBASE}/include

View File

@ -1,15 +1,21 @@
$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 @@
--- vncviewer/Imakefile.orig Thu Jun 27 23:53:19 2002
+++ vncviewer/Imakefile Sat Jan 4 12:53:10 2003
@@ -10,17 +10,10 @@
DEFINES = -DMITSHM
#endif
-INCLUDES = -I../include -I. -I../lib/zlib -I../lib/jpeg -I/usr/include
-ZLIB_INC = -I/usr/local/include
-JPEG_INC = -I/usr/local/include
-INCLUDES = -I../include -I. $(ZLIB_INC) $(JPEG_INC) -I/usr/include
+INCLUDES = -I../include -I. -I/usr/include -I${LOCALBASE}/include
VNCAUTH_LIB = ../libvncauth/libvncauth.a
-ZLIB_LIB = -L../lib/zlib -lz
-JPEG_LIB = -L../lib/jpeg -ljpeg
-ZLIB_LIB = -L/usr/local/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
-#endif
+ZLIB_LIB = -lz
+JPEG_LIB = -ljpeg

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.6 2002/04/15 06:55:57 espie Exp $
@comment $OpenBSD: PLIST,v 1.7 2003/01/12 21:37:49 millert Exp $
@pkgcfl vnc-*
@pkgcfl tightvnc-viewer-*
bin/Xvnc
@ -6,7 +6,6 @@ bin/vncconnect
bin/vncpasswd
bin/vncserver
bin/vncviewer
man/cat1/vncviewer.0
man/man1/Xvnc.1
man/man1/vncconnect.1
man/man1/vncpasswd.1
@ -121,6 +120,7 @@ share/doc/vnc/vnc_docs/vnchistory.html
share/doc/vnc/vnc_docs/vncpeople.html
share/doc/vnc/vnc_docs/vncpeoplebutton.gif
share/doc/vnc/vnc_docs/vnctitle.gif
share/doc/vnc/vnc_docs/vnctm.gif
share/doc/vnc/vnc_docs/winhistory.html
share/doc/vnc/vnc_docs/winviewer1.gif
share/doc/vnc/vnc_docs/winviewer1_small.gif
@ -136,16 +136,15 @@ share/vnc/classes/ButtonPanel.class
share/vnc/classes/ClipboardFrame.class
share/vnc/classes/DesCipher.class
share/vnc/classes/OptionsFrame.class
share/vnc/classes/RecordingFrame.class
share/vnc/classes/ReloginPanel.class
share/vnc/classes/RfbProto.class
share/vnc/classes/SessionRecorder.class
share/vnc/classes/SocketFactory.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/shared.vnc
share/vnc/classes/tight.vnc
share/vnc/classes/zlib.vnc
@dirrm share/vnc/classes
@dirrm share/vnc
@dirrm share/doc/vnc/vnc_docs

View File

@ -1,7 +1,8 @@
@comment $OpenBSD: PLIST-viewer,v 1.3 2002/03/25 17:49:26 matt Exp $
@comment $OpenBSD: PLIST-viewer,v 1.4 2003/01/12 21:37:49 millert Exp $
@pkgcfl vnc-*
@pkgcfl tightvnc-*
bin/vncviewer
man/man1/vncviewer.1
share/doc/vnc/vnc_docs/Xvnc.gif
share/doc/vnc/vnc_docs/ach.jpg
share/doc/vnc/vnc_docs/alicebobcharlie.gif
@ -112,6 +113,7 @@ share/doc/vnc/vnc_docs/vnchistory.html
share/doc/vnc/vnc_docs/vncpeople.html
share/doc/vnc/vnc_docs/vncpeoplebutton.gif
share/doc/vnc/vnc_docs/vnctitle.gif
share/doc/vnc/vnc_docs/vnctm.gif
share/doc/vnc/vnc_docs/winhistory.html
share/doc/vnc/vnc_docs/winviewer1.gif
share/doc/vnc/vnc_docs/winviewer1_small.gif