5 files changed, 40 insertions, 59 deletions

diff --git a/devel/sourcenav/Makefile b/devel/sourcenav/Makefile
index 539d7889e6d0..303abf143a00 100644
--- a/devel/sourcenav/Makefile
+++ b/devel/sourcenav/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	sourcenav
-PORTVERSION=	5.1.4
-PORTREVISION=	9
+DISTVERSION=	5.2b2
 CATEGORIES=	devel
 MASTER_SITES=	SF
 
@@ -24,16 +23,15 @@ USE_GMAKE=	yes
 USE_XORG=	x11 xext xpm
 GNU_CONFIGURE=	yes
 NO_MTREE=	yes
-USE_TCL=	83
-USE_TK=		83
 
 SUB_FILES=	pkg-message
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 600000
-EXTRA_PATCHES+=	${FILESDIR}/FreeBSD6-cdefs.h
-.endif
+post-patch:
+	${REINPLACE_CMD} -e 's|-fwritable-strings||g' \
+	    ${WRKSRC}/snavigator/configure \
+	    ${WRKSRC}/tix/unix/tk8.3/Makefile.in
 
 post-install:
 	@${LN} -s ${PREFIX}/bin/snavigator ${PREFIX}/../bin
diff --git a/devel/sourcenav/distinfo b/devel/sourcenav/distinfo
index 5622add1b61f..a8f6fc4c6bb1 100644
--- a/devel/sourcenav/distinfo
+++ b/devel/sourcenav/distinfo
@@ -1,3 +1,3 @@
-MD5 (sourcenav-5.1.4.tar.gz) = a0d03e062851adf1364a6adba0350219
-SHA256 (sourcenav-5.1.4.tar.gz) = 338a583c044f2ca1db3850e13206ff205a9867b2cfdabd51f159f255bfd906c7
-SIZE (sourcenav-5.1.4.tar.gz) = 11101823
+MD5 (sourcenav-5.2b2.tar.gz) = e21c52c5db7a9da5712881b8bfc30064
+SHA256 (sourcenav-5.2b2.tar.gz) = c03cb65f875250c8a6cc48ecbd2934e5f90b65cf428fe561ec2a1705747f1355
+SIZE (sourcenav-5.2b2.tar.gz) = 13486494
diff --git a/devel/sourcenav/files/patch-gcc4 b/devel/sourcenav/files/patch-gcc4
index b3f9a10da9ac..68c03ee7f82d 100644
--- a/devel/sourcenav/files/patch-gcc4
+++ b/devel/sourcenav/files/patch-gcc4
@@ -1,30 +1,6 @@
-diff -ru ../sourcenav-5.1.4/itcl/itcl/unix/configure ../sourcenav-5.1.4.new/itcl/itcl/unix/configure
---- ../sourcenav-5.1.4/itcl/itcl/unix/configure	2000-02-06 16:19:46.000000000 -0800
-+++ ../sourcenav-5.1.4.new/itcl/itcl/unix/configure	2006-07-19 18:39:26.000000000 -0700
-@@ -1113,7 +1113,7 @@
- fi
- # CYGNUS LOCAL - use -fwritable-strings with gcc, needed for Tcl8.1
- if test "$itcl_cv_prog_gcc" = "yes" ; then
--    CFLAGS="$CFLAGS -fwritable-strings -Wshadow -Wtraditional -Wall"
-+    CFLAGS="$CFLAGS -Wshadow -Wtraditional -Wall"
- fi
- 
- echo $ac_n "checking default compiler flags""... $ac_c" 1>&6
-diff -ru ../sourcenav-5.1.4/itcl/itk/unix/configure ../sourcenav-5.1.4.new/itcl/itk/unix/configure
---- ../sourcenav-5.1.4/itcl/itk/unix/configure	2000-02-06 16:19:46.000000000 -0800
-+++ ../sourcenav-5.1.4.new/itcl/itk/unix/configure	2006-07-19 18:39:41.000000000 -0700
-@@ -1173,7 +1173,7 @@
-     # that they obscure everything else.
-     # CYGNUS LOCAL - add -fwritable-strings to CFLAGS for gcc.  Needed 
-     # with Tcl8.1
--    CFLAGS="$CFLAGS -fwritable-strings -Wshadow -Wtraditional -Wall -Wno-implicit-int"
-+    CFLAGS="$CFLAGS -Wshadow -Wtraditional -Wall -Wno-implicit-int"
- fi
- 
- echo $ac_n "checking default compiler flags""... $ac_c" 1>&6
-diff -ru ../sourcenav-5.1.4/libgui/configure ../sourcenav-5.1.4.new/libgui/configure
---- ../sourcenav-5.1.4/libgui/configure	2001-10-28 08:22:24.000000000 -0800
-+++ ../sourcenav-5.1.4.new/libgui/configure	2006-07-19 18:41:08.000000000 -0700
+diff -ru libgui/configure libgui/configure
+--- libgui/configure	2001-10-28 08:22:24.000000000 -0800
++++ libgui/configure	2006-07-19 18:41:08.000000000 -0700
 @@ -1921,11 +1921,11 @@
  
  # Tcl8.1 requires writable strings for gcc
@@ -42,9 +18,9 @@ diff -ru ../sourcenav-5.1.4/libgui/configure ../sourcenav-5.1.4.new/libgui/confi
  
  echo $ac_n "checking for cygwin32""... $ac_c" 1>&6
  echo "configure:1932: checking for cygwin32" >&5
-diff -ru ../sourcenav-5.1.4/snavigator/configure ../sourcenav-5.1.4.new/snavigator/configure
---- ../sourcenav-5.1.4/snavigator/configure	2003-06-26 13:01:11.000000000 -0700
-+++ ../sourcenav-5.1.4.new/snavigator/configure	2006-07-19 18:41:51.000000000 -0700
+diff -ru snavigator/configure snavigator/configure
+--- snavigator/configure	2003-06-26 13:01:11.000000000 -0700
++++ snavigator/configure	2006-07-19 18:41:51.000000000 -0700
 @@ -1369,7 +1369,7 @@
  
  if test x$ide_cv_os_cygwin32 = xyes ||
@@ -54,21 +30,9 @@ diff -ru ../sourcenav-5.1.4/snavigator/configure ../sourcenav-5.1.4.new/snavigat
  fi
   
  
-diff -ru ../sourcenav-5.1.4/tix/unix/tk8.1/Makefile.in ../sourcenav-5.1.4.new/tix/unix/tk8.1/Makefile.in
---- ../sourcenav-5.1.4/tix/unix/tk8.1/Makefile.in	2001-09-08 16:25:55.000000000 -0700
-+++ ../sourcenav-5.1.4.new/tix/unix/tk8.1/Makefile.in	2006-07-19 18:42:37.000000000 -0700
-@@ -46,7 +46,7 @@
- # To change the compiler switches, for example to change from -O
- # to -g, change the following line:
- CFLAGS = -O
--TIX_CFLAGS = $(CFLAGS) -fwritable-strings
-+TIX_CFLAGS = $(CFLAGS)
- 
- # To disable ANSI-C procedure prototypes reverse the comment characters
- # on the following lines:
-diff -ru ../sourcenav-5.1.4/tix/unix/tk8.3/Makefile.in ../sourcenav-5.1.4.new/tix/unix/tk8.3/Makefile.in
---- ../sourcenav-5.1.4/tix/unix/tk8.3/Makefile.in	2006-07-19 18:43:48.000000000 -0700
-+++ ../sourcenav-5.1.4.new/tix/unix/tk8.3/Makefile.in	2006-07-19 18:42:55.000000000 -0700
+diff -ru tix/unix/tk8.1/Makefile.in tix/unix/tk8.1/Makefile.in
+--- tix/unix/tk8.1/Makefile.in	2001-09-08 16:25:55.000000000 -0700
++++ tix/unix/tk8.1/Makefile.in	2006-07-19 18:42:37.000000000 -0700
 @@ -46,7 +46,7 @@
  # To change the compiler switches, for example to change from -O
  # to -g, change the following line:
diff --git a/devel/sourcenav/files/patch-snavigator-snavigator-unix-snavigator.in b/devel/sourcenav/files/patch-snavigator-snavigator-unix-snavigator.in
index 5656426cace2..5318e790a686 100644
--- a/devel/sourcenav/files/patch-snavigator-snavigator-unix-snavigator.in
+++ b/devel/sourcenav/files/patch-snavigator-snavigator-unix-snavigator.in
@@ -1,5 +1,5 @@
---- snavigator/snavigator/unix/snavigator.in.orig	Mon Feb 27 20:22:56 2006
-+++ snavigator/snavigator/unix/snavigator.in	Mon Feb 27 20:23:35 2006
+--- snavigator/snavigator/unix/snavigator.orig	2004-01-04 00:13:24.000000000 +0100
++++ snavigator/snavigator/unix/snavigator	2008-04-22 01:11:03.000000000 +0200
 @@ -1,7 +1,8 @@
  #!/bin/sh
  
@@ -7,6 +7,6 @@
 -snbindir=`dirname $0`
 +me=`realpath $0`
 +snbindir=`dirname $me`
+ script=snavigator
  
- # navigato is either in ../share/etc/navigato or ../../share/etc/navigato
- 
+ # $script is either in ../share/etc/ or ../../share/etc/
diff --git a/devel/sourcenav/files/patch-tix-unix_Makefile.in b/devel/sourcenav/files/patch-tix-unix_Makefile.in
new file mode 100644
index 000000000000..5b4ad5ca42cb
--- /dev/null
+++ b/devel/sourcenav/files/patch-tix-unix_Makefile.in
@@ -0,0 +1,19 @@
+--- tix/unix/Makefile.in.orig	2008-06-02 14:38:17.000000000 +0200
++++ tix/unix/Makefile.in	2008-06-02 14:38:53.000000000 +0200
+@@ -66,6 +66,7 @@
+ INSTALL		=	@SRC_DIR@/install.sh -c
+ INSTALL_PROGRAM =	@INSTALL_PROGRAM@
+ INSTALL_DATA	=	@INSTALL_DATA@
++INSTALL_SCRIPT	=	@INSTALL_SCRIPT@
+ SRC_DIR		=	@SRC_DIR@
+ INC_DIR		=	@SRC_DIR@/generic
+ UNIX_DIR	=	@SRC_DIR@/unix
+@@ -140,7 +141,7 @@
+ 		fi; \
+ 	    done;
+ 	@echo "installing the tixindex program for building tclIndex for Tix scripts"
+-	@cd $(TOOLS_DIR); $(INSTALL_PROGRAM) tixindex $(DESTDIR)$(BIN_DIR)/tixindex
++	@cd $(TOOLS_DIR); $(INSTALL_SCRIPT) tixindex $(DESTDIR)$(BIN_DIR)/tixindex
+ 
+ install-headers:
+ 	@for i in $(INCLUDE_DIR); \