From c3facd46a8c4b96b469b59f869740c3232e316c2 Mon Sep 17 00:00:00 2001
From: Ion-Mihai Tetcu <itetcu@FreeBSD.org>
Date: Sun, 15 Mar 2009 14:53:57 +0000
Subject: Update to 1.3.10 [1] Changelog:
 http://www.tightvnc.com/whatsnew.html

- use bsdoptions.mk :-)

PR:		ports/132438 [1]
Submitted by:	Tsurutani Naoki [1]
Tested by:	jonathan@kc8onw.net
---
 net/tightvnc/Makefile                                |  9 ++++-----
 net/tightvnc/distinfo                                |  6 +++---
 .../files/patch-Xvnc::config::cf::FreeBSD.cf         | 20 +++++++++++++++-----
 3 files changed, 22 insertions(+), 13 deletions(-)

(limited to 'net')

diff --git a/net/tightvnc/Makefile b/net/tightvnc/Makefile
index d38a27621ebb..597906d87d8d 100644
--- a/net/tightvnc/Makefile
+++ b/net/tightvnc/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	tightvnc
-PORTVERSION=	1.3.9
-PORTREVISION=	2
+PORTVERSION=	1.3.10
 CATEGORIES=	net
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	vnc-tight
@@ -36,10 +35,10 @@ MAN1=		Xvnc.1 vncviewer.1 vncpasswd.1 vncconnect.1 vncserver.1
 
 OPTIONS=	JVNC_VIEWER "Install Java-based vnc viewer" off
 
-.include <bsd.port.pre.mk>
+#.include <bsd.port.pre.mk>
 
 ### use me when 5.5, 6.1, 6.2R die or we do impement something in b.p.m
-#.include "bsd.port.options.mk"
+.include <bsd.port.options.mk>
 
 .ifdef(WITH_JVNC_VIEWER)
 USE_JAVA=	yes
@@ -49,7 +48,7 @@ PLIST_SUB+=	JVNC_VIEWER=""
 PLIST_SUB+=	JVNC_VIEWER="@comment "
 .endif
 
-#.include <bsd.port.pre.mk>
+.include <bsd.port.pre.mk>
 
 .if exists(${LOCALBASE}/share/vnc/classes/index.vnc)
 IGNORE=		vnc has already been installed, please uninstall it first
diff --git a/net/tightvnc/distinfo b/net/tightvnc/distinfo
index 3050c0f337a9..3cb32a6ecd93 100644
--- a/net/tightvnc/distinfo
+++ b/net/tightvnc/distinfo
@@ -1,3 +1,3 @@
-MD5 (tightvnc-1.3.9_unixsrc.tar.bz2) = 49a0748ea52793f2e3069e05af28f716
-SHA256 (tightvnc-1.3.9_unixsrc.tar.bz2) = 99aaca636535f9127f3a435ee71aef6821f821e6319bc6e9b2c775fefd34325a
-SIZE (tightvnc-1.3.9_unixsrc.tar.bz2) = 1792459
+MD5 (tightvnc-1.3.10_unixsrc.tar.bz2) = 397b35faad32d5246b6d44b142f8304f
+SHA256 (tightvnc-1.3.10_unixsrc.tar.bz2) = f48c70fea08d03744ae18df6b1499976362f16934eda3275cead87baad585c0d
+SIZE (tightvnc-1.3.10_unixsrc.tar.bz2) = 1780510
diff --git a/net/tightvnc/files/patch-Xvnc::config::cf::FreeBSD.cf b/net/tightvnc/files/patch-Xvnc::config::cf::FreeBSD.cf
index 83b3d1f55259..59aae4a84bd2 100644
--- a/net/tightvnc/files/patch-Xvnc::config::cf::FreeBSD.cf
+++ b/net/tightvnc/files/patch-Xvnc::config::cf::FreeBSD.cf
@@ -1,18 +1,18 @@
 --- Xvnc/config/cf/FreeBSD.cf.orig	2000-06-11 21:00:51.000000000 +0900
-+++ Xvnc/config/cf/FreeBSD.cf	2007-09-04 17:11:16.000000000 +0900
++++ Xvnc/config/cf/FreeBSD.cf	2009-03-09 08:18:00.000000000 +0900
 @@ -253,11 +253,17 @@
  #endif
  
  #ifdef i386Architecture
 -# define OptimizedCDebugFlags DefaultGcc2i386Opt
-+# define OptimizedCDebugFlags -O -pipe
++# define OptimizedCDebugFlags -O2 -pipe
  #else
 -# define OptimizedCDebugFlags -O2
-+# define OptimizedCDebugFlags -O -pipe
++# define OptimizedCDebugFlags -O2 -pipe
  #endif
  
 +#ifdef x86_64Architecture 
-+# define OptimizedCDebugFlags    -O -pipe
++# define OptimizedCDebugFlags    -O2 -pipe
 +# define ServerOSDefines         XFree86ServerOSDefines -DDDXTIME 
 +# define ServerExtraDefines      GccGasOption XFree86ServerDefines -D_XSERVER64 
 +#endif /* x86_64Architecture */ 
@@ -20,7 +20,17 @@
  #ifndef PreIncDir
  # define PreIncDir	/usr/include
  #endif
-@@ -359,6 +366,5 @@
+@@ -353,12 +359,15 @@
+ #define HasBsdMake	YES
+ #endif
+ 
++#if OSMajorVersion > 5 || (OSMajorVersion == 5 && OSMinorVersion >= 3)
++#define HasFfsl	YES
++#endif
++
+ #ifndef StaticLibrary
+ #define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath) Concat(-l,libname) -Wl,-Bdynamic
+ #endif
  
  #include <bsdLib.rules>
  
-- 
cgit v1.2.3