6 files changed, 45 insertions, 20 deletions

diff --git a/net/tightvnc/Makefile b/net/tightvnc/Makefile
index 12d4d7749e1f..c2f244de15cb 100644
--- a/net/tightvnc/Makefile
+++ b/net/tightvnc/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	tightvnc
-PORTVERSION=	1.2.6
-PORTREVISION=	1
+PORTVERSION=	1.2.7
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	vnc-tight
@@ -16,12 +15,13 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}_unixsrc
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/misc/10x20.pcf.gz:${PORTSDIR}/x11-fonts/XFree86-4-fontDefaultBitmaps
 
 USE_BZIP2=	yes
 WRKSRC=		${WRKDIR}/vnc_unixsrc
 USE_IMAKE=	yes
+USE_XPM=	yes
 USE_PERL5=	yes
 ALL_TARGET=	World
 NO_INSTALL_MANPAGES=	yes
@@ -39,13 +39,15 @@ post-patch:
 .endfor
 	@${PERL} -pi -e "s,/usr/local/vnc/classes,${DATADIR}/classes,g ; \
 		s,^#!/usr/bin/perl,#!${PERL},g" ${WRKSRC}/vncserver
+	@${PERL} -pi -e "s,%%CC%%,${CC},g ; \
+		s,%%CFLAGS%%,${CFLAGS},g" ${WRKSRC}/Xvnc/config/cf/FreeBSD.cf
 
 do-install:
 	@(cd ${WRKSRC}; ./vncinstall ${PREFIX}/bin ${PREFIX}/man)
 .for file in Xvnc vncviewer vncpasswd vncconnect
-	@strip ${PREFIX}/bin/${file}
+	@${STRIP_CMD} ${PREFIX}/bin/${file}
 .endfor
-	@${MKDIR} ${DATADIR}
-	${CP} -R ${WRKSRC}/classes ${DATADIR}
+	@${MKDIR} ${DATADIR}/classes
+	${INSTALL_DATA} ${WRKSRC}/classes/*.* ${DATADIR}/classes
 
 .include <bsd.port.mk>
diff --git a/net/tightvnc/distinfo b/net/tightvnc/distinfo
index b1aba4f00800..cc4506112bfd 100644
--- a/net/tightvnc/distinfo
+++ b/net/tightvnc/distinfo
@@ -1 +1 @@
-MD5 (tightvnc-1.2.6_unixsrc.tar.bz2) = 9b48da1465ee78b614f0d26f4a8c7aaf
+MD5 (tightvnc-1.2.7_unixsrc.tar.bz2) = 17f305cbf56af8ce75f6b5dacde1ac5a
diff --git a/net/tightvnc/files/patch-Xvnc::config::cf::FreeBSD.cf b/net/tightvnc/files/patch-Xvnc::config::cf::FreeBSD.cf
new file mode 100644
index 000000000000..4a749bdf16ef
--- /dev/null
+++ b/net/tightvnc/files/patch-Xvnc::config::cf::FreeBSD.cf
@@ -0,0 +1,23 @@
+--- Xvnc/config/cf/FreeBSD.cf.orig	Sun Jun 11 21:00:51 2000
++++ Xvnc/config/cf/FreeBSD.cf	Fri Dec  6 03:21:44 2002
+@@ -49,7 +49,7 @@
+ 
+ #define MkdirHierCmd		mkdir -p
+ 
+-#define CcCmd			cc
++#define CcCmd			%%CC%%
+ #define CppCmd			/usr/libexec/cpp
+ #define PreProcessCmd		CppCmd
+ #define StandardCppDefines	-traditional
+@@ -253,9 +253,9 @@
+ #endif
+ 
+ #ifdef i386Architecture
+-# define OptimizedCDebugFlags DefaultGcc2i386Opt
++# define OptimizedCDebugFlags %%CFLAGS%%
+ #else
+-# define OptimizedCDebugFlags -O2
++# define OptimizedCDebugFlags %%CFLAGS%%
+ #endif
+ 
+ #ifndef PreIncDir
diff --git a/net/tightvnc/files/patch-Xvnc::programs::Xserver::hw::vnc::sockets.c b/net/tightvnc/files/patch-Xvnc::programs::Xserver::hw::vnc::sockets.c
index 0aebcaa10112..42fc342840c6 100644
--- a/net/tightvnc/files/patch-Xvnc::programs::Xserver::hw::vnc::sockets.c
+++ b/net/tightvnc/files/patch-Xvnc::programs::Xserver::hw::vnc::sockets.c
@@ -8,11 +8,3 @@
  #include <sys/types.h>
  #include <sys/time.h>
  #include <sys/socket.h>
-@@ -491,6 +492,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/tightvnc/files/patch-Xvnc::programs::Xserver::os::Imakefile b/net/tightvnc/files/patch-Xvnc::programs::Xserver::os::Imakefile
new file mode 100644
index 000000000000..e2c803c61be1
--- /dev/null
+++ b/net/tightvnc/files/patch-Xvnc::programs::Xserver::os::Imakefile
@@ -0,0 +1,11 @@
+--- Xvnc/programs/Xserver/os/Imakefile.orig	Sun Jun 11 21:00:52 2000
++++ Xvnc/programs/Xserver/os/Imakefile	Fri Dec  6 02:53:22 2002
+@@ -135,7 +135,7 @@
+ #if defined(SparcArchitecture) && HasGcc && !HasGcc2
+ oscolor.o: oscolor.c $(ICONFIGFILES)
+ 	$(RM) $@
+-	cc -c $(DBM_DEFINES) $(CDEBUGFLAGS) $(ALLDEFINES) $*.c
++	$(CC) -c $(DBM_DEFINES) $(CDEBUGFLAGS) $(ALLDEFINES) $*.c
+ #else
+ SpecialCObjectRule(oscolor,$(ICONFIGFILES),$(DBM_DEFINES))
+ #endif
diff --git a/net/tightvnc/pkg-plist b/net/tightvnc/pkg-plist
index f598f4b02937..220556118f28 100644
--- a/net/tightvnc/pkg-plist
+++ b/net/tightvnc/pkg-plist
@@ -9,16 +9,13 @@ share/tightvnc/classes/ClipboardFrame.class
 share/tightvnc/classes/DesCipher.class
 share/tightvnc/classes/OptionsFrame.class
 share/tightvnc/classes/RecordingFrame.class
+share/tightvnc/classes/ReloginPanel.class
 share/tightvnc/classes/RfbProto.class
 share/tightvnc/classes/SessionRecorder.class
+share/tightvnc/classes/SocketFactory.class
 share/tightvnc/classes/VncCanvas.class
 share/tightvnc/classes/VncViewer.class
 share/tightvnc/classes/VncViewer.jar
-share/tightvnc/classes/hextile.vnc
 share/tightvnc/classes/index.vnc
-share/tightvnc/classes/noshared.vnc
-share/tightvnc/classes/shared.vnc
-share/tightvnc/classes/tight.vnc
-share/tightvnc/classes/zlib.vnc
 @dirrm share/tightvnc/classes
 @dirrm share/tightvnc