Update to 1.2.4

4 files changed, 22 insertions, 20 deletions

diff --git a/net/tightvnc/Makefile b/net/tightvnc/Makefile
index 3a900cbbb0cf..0233cc680a79 100644
--- a/net/tightvnc/Makefile
+++ b/net/tightvnc/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	tightvnc
-PORTVERSION=	1.2.3
+PORTVERSION=	1.2.4
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	vnc-tight
diff --git a/net/tightvnc/distinfo b/net/tightvnc/distinfo
index e8d916f16b15..8076f031e3e6 100644
--- a/net/tightvnc/distinfo
+++ b/net/tightvnc/distinfo
@@ -1 +1 @@
-MD5 (tightvnc-1.2.3_unixsrc.tar.bz2) = 35a2561f83eeabec7b0c91c251fbcfb4
+MD5 (tightvnc-1.2.4_unixsrc.tar.bz2) = 57e4fcb590415797c641c0d15ef60ba8
diff --git a/net/tightvnc/files/patch-Imakefile b/net/tightvnc/files/patch-Imakefile
index 763d07c2d11b..29b65c8b2beb 100644
--- a/net/tightvnc/files/patch-Imakefile
+++ b/net/tightvnc/files/patch-Imakefile
@@ -1,12 +1,10 @@
---- Imakefile.orig	Sat Nov 24 16:41:40 2001
-+++ Imakefile	Sat Nov 24 16:42:20 2001
-@@ -9,8 +9,7 @@
- 	make all
- 	@echo ""
+--- Imakefile.orig	Wed May 22 23:19:15 2002
++++ Imakefile	Wed May 22 23:20:03 2002
+@@ -11,6 +11,7 @@
  	@echo Built $(SUBDIRS).
--	@echo 'To build Xvnc, do "cd Xvnc", followed by "make World"'
--	@echo ""
-+	(cd Xvnc ; make World)
+ 	@echo 'To build Xvnc, do "cd Xvnc", followed by "./configure" then "make"'
+ 	@echo ""
++	( cd Xvnc && ./configure && make )
  
- MakeSubdirs($(SUBDIRS))
- DependSubdirs($(SUBDIRS))
+ libs:
+ 	@echo 'No libraries included.'
diff --git a/net/tightvnc/files/patch-vncviewer::Imakefile b/net/tightvnc/files/patch-vncviewer::Imakefile
index 3f1931aa8c08..41b6f6f53c35 100644
--- a/net/tightvnc/files/patch-vncviewer::Imakefile
+++ b/net/tightvnc/files/patch-vncviewer::Imakefile
@@ -1,19 +1,23 @@
---- vncviewer/Imakefile.orig	Wed Mar 20 05:38:00 2002
-+++ vncviewer/Imakefile	Fri Mar 29 03:26:02 2002
-@@ -11,10 +11,10 @@
+--- vncviewer/Imakefile.orig	Tue Apr 30 09:07:31 2002
++++ vncviewer/Imakefile	Wed May 22 21:48:12 2002
+@@ -10,12 +10,12 @@
  DEFINES = -DMITSHM
  #endif
  
--INCLUDES = -I../include -I. -I../lib/zlib -I../lib/jpeg -I/usr/include
-+INCLUDES = -I../include -I. -I%%LOCALBASE%%/include
+-ZLIB_INC = -I/usr/local/include
+-JPEG_INC = -I/usr/local/include
++ZLIB_INC = -I%%LOCALBASE%%/include
++JPEG_INC = -I%%LOCALBASE%%/include
+ INCLUDES = -I../include -I. $(ZLIB_INC) $(JPEG_INC) -I/usr/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
+-JPEG_LIB = -L/usr/local/lib -ljpeg
++ZLIB_LIB = -L%%LOCALBASE%%/lib -lz
 +JPEG_LIB = -L%%LOCALBASE%%/lib -ljpeg
  
  DEPLIBS = XawClientDepLibs $(VNCAUTH_LIB)
  LOCAL_LIBRARIES = XawClientLibs $(VNCAUTH_LIB) $(ZLIB_LIB) $(JPEG_LIB)
-@@ -38,4 +38,4 @@
+@@ -39,4 +39,4 @@
  
  OBJS = $(SRCS:.c=.o)