Update to 0.6

3 files changed, 62 insertions, 28 deletions

diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index c0efe9c75239..af421d4658b9 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bluefish
-PORTVERSION= 	0.5
+PORTVERSION= 	0.6
 CATEGORIES=	www editors
 MASTER_SITES=	http://bluefish.openoffice.nl/download/ \
 		http://student.wau.nl/~olivier/bluefish/download/
diff --git a/www/bluefish/distinfo b/www/bluefish/distinfo
index 43f0dc3bf287..34d8a122fd8e 100644
--- a/www/bluefish/distinfo
+++ b/www/bluefish/distinfo
@@ -1 +1 @@
-MD5 (bluefish-0.5.tar.bz2) = ea338dafa61d7c82482322ae96a2bef7
+MD5 (bluefish-0.6.tar.bz2) = 29b2da00d3bd72d8bd79e1d7f525e02a
diff --git a/www/bluefish/files/patch-aa b/www/bluefish/files/patch-aa
index faf86ff8c22b..d0fd85d10d90 100644
--- a/www/bluefish/files/patch-aa
+++ b/www/bluefish/files/patch-aa
@@ -1,7 +1,7 @@
---- configure.orig	Wed Mar 15 22:51:32 2000
-+++ configure	Wed Mar 15 22:53:38 2000
-@@ -946,8 +946,8 @@
-   x_includes="/usr/include"
+--- configure.orig	Sun Dec 24 16:31:57 2000
++++ configure	Sun Dec 24 16:32:49 2000
+@@ -3093,8 +3093,8 @@
+ 
  fi
  
 -LIBS="$LIBS `gtk-config --libs`"
@@ -11,7 +11,7 @@
  
  # Check whether --with-gtk-prefix or --without-gtk-prefix was given.
  if test "${with_gtk_prefix+set}" = set; then
-@@ -977,18 +977,18 @@
+@@ -3133,18 +3133,18 @@
    if test x$gtk_config_exec_prefix != x ; then
       gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
       if test x${GTK_CONFIG+set} != xset ; then
@@ -32,27 +32,61 @@
 +  # Extract the first word of "${GTK_CONFIG}", so it can be a program name with args.
 +set dummy ${GTK_CONFIG}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
- echo "configure:994: checking for $ac_word" >&5
+ echo "configure:3150: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
-@@ -1124,10 +1124,10 @@
+@@ -3230,16 +3230,16 @@
+       (gtk_minor_version != $gtk_config_minor_version) ||
+       (gtk_micro_version != $gtk_config_micro_version))
+     {
+-      printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
++      printf("\n*** '${GTK_CONFIG} --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
+              $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
+              gtk_major_version, gtk_minor_version, gtk_micro_version);
+-      printf ("*** was found! If gtk-config was correct, then it is best\n");
++      printf ("*** was found! If ${GTK_CONFIG} was correct, then it is best\n");
+       printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
+       printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+       printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
+       printf("*** required on your system.\n");
+-      printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
+-      printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
++      printf("*** If ${GTK_CONFIG} was wrong, set the environment variable GTK_CONFIG\n");
++      printf("*** to point to the correct copy of ${GTK_CONFIG}, and remove the file config.cache\n");
+       printf("*** before re-running configure\n");
+     } 
+ #if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
+@@ -3270,10 +3270,10 @@
+         printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
+         printf("***\n");
+         printf("*** If you have already installed a sufficiently new version, this error\n");
+-        printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
++        printf("*** probably means that the wrong copy of the ${GTK_CONFIG} shell script is\n");
+         printf("*** being found. The easiest way to fix this is to remove the old version\n");
+         printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
+-        printf("*** correct copy of gtk-config. (In this case, you will have to\n");
++        printf("*** correct copy of ${GTK_CONFIG}. (In this case, you will have to\n");
+         printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+         printf("*** so that the correct libraries are found at run-time))\n");
+       }
+@@ -3304,10 +3304,10 @@
    else
       echo "$ac_t""no" 1>&6
- #     if test "$GTK_CONFIG" = "no" ; then
--#       echo "*** The gtk-config script installed by GTK could not be found"
-+#       echo "*** The ${GTK_CONFIG} script installed by GTK could not be found"
- #       echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
- #       echo "*** your path, or set the GTK_CONFIG environment variable to the"
--#       echo "*** full path to gtk-config."
-+#       echo "*** full path to ${GTK_CONFIG}."
- #     else
- #       if test -f conf.gtktest ; then
- #        :
-@@ -1156,7 +1156,7 @@
- #        [ echo "*** The test program failed to compile or link. See the file config.log for the"
- #          echo "*** exact error that occured. This usually means GTK was incorrectly installed"
- #          echo "*** or that you have moved GTK since it was installed. In the latter case, you"
--#          echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ])
-+#          echo "*** may want to edit the ${GTK_CONFIG} script: $GTK_CONFIG" ])
- #          CFLAGS="$ac_save_CFLAGS"
- #          LIBS="$ac_save_LIBS"
- #       fi
+      if test "$GTK_CONFIG" = "no" ; then
+-       echo "*** The gtk-config script installed by GTK could not be found"
++       echo "*** The ${GTK_CONFIG} script installed by GTK could not be found"
+        echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
+        echo "*** your path, or set the GTK_CONFIG environment variable to the"
+-       echo "*** full path to gtk-config."
++       echo "*** full path to ${GTK_CONFIG}."
+      else
+        if test -f conf.gtktest ; then
+         :
+@@ -3349,7 +3349,7 @@
+    echo "*** The test program failed to compile or link. See the file config.log for the"
+           echo "*** exact error that occured. This usually means GTK was incorrectly installed"
+           echo "*** or that you have moved GTK since it was installed. In the latter case, you"
+-          echo "*** may want to edit the gtk-config script: $GTK_CONFIG" 
++          echo "*** may want to edit the ${GTK_CONFIG} script: $GTK_CONFIG" 
+ fi
+ rm -f conftest*
+           CFLAGS="$ac_save_CFLAGS"