From 4f316a28c47527b50667bc99fe88f7905c132da4 Mon Sep 17 00:00:00 2001
From: kevlo <kevlo@openbsd.org>
Date: Mon, 28 Feb 2000 12:12:12 +0000
Subject: [PATCH] Upgrade to version 0.3.6. Remove the patches.

---
 www/bluefish/Makefile         |  6 ++--
 www/bluefish/files/md5        |  6 ++--
 www/bluefish/patches/patch-aa | 58 -----------------------------------
 3 files changed, 6 insertions(+), 64 deletions(-)
 delete mode 100644 www/bluefish/patches/patch-aa

diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index 4beda9d9625..404334805c4 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.7 2000/02/22 22:55:07 jasoni Exp $
+# $OpenBSD: Makefile,v 1.8 2000/02/28 12:12:12 kevlo Exp $
 
-DISTNAME=	bluefish-0.3.5
+DISTNAME=	bluefish-0.3.6
 CATEGORIES=	www 
 MASTER_SITES=	http://bluefish.linuxbox.com/download/ \
 		http://student.wau.nl/~olivier/bluefish/download/ \
@@ -29,7 +29,7 @@ CONFIGURE_ENV=  GTK_CONFIG="${GTK_CONFIG}" \
 		CPPFLAGS="-I${LOCALBASE}/include" \
 		CFLAGS="-I${LOCALBASE}/include"
 do-install:
-	@mkdir -p ${PREFIX}/lib/bluefish
+	${INSTALL_DATA_DIR} ${PREFIX}/lib/bluefish
 	${INSTALL_PROGRAM} ${WRKSRC}/src/bluefish ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/data/php3_functions ${PREFIX}/lib/bluefish
 	${INSTALL_DATA} ${WRKSRC}/data/rxml_functions ${PREFIX}/lib/bluefish
diff --git a/www/bluefish/files/md5 b/www/bluefish/files/md5
index b8d74f0cc2d..6a8e49e1a14 100644
--- a/www/bluefish/files/md5
+++ b/www/bluefish/files/md5
@@ -1,3 +1,3 @@
-MD5 (bluefish-0.3.5.tar.gz) = e586d749a9fd7c0ab9c293fb338175f2
-RMD160 (bluefish-0.3.5.tar.gz) = 877cda87498b9254c2bfa9a4532ab8d9680aa3be
-SHA1 (bluefish-0.3.5.tar.gz) = 07a842aa33856ef6deaef25521b47f0d7ab0639e
+MD5 (bluefish-0.3.6.tar.gz) = 1dfd21dd74a7f3e98d720ffb657f745d
+RMD160 (bluefish-0.3.6.tar.gz) = 8bd255faacb9287eec051b149fc785a3d65b305d
+SHA1 (bluefish-0.3.6.tar.gz) = 86a310c63877f733f25edeae48ef12f1ca926571
diff --git a/www/bluefish/patches/patch-aa b/www/bluefish/patches/patch-aa
deleted file mode 100644
index 82dd1393e33..00000000000
--- a/www/bluefish/patches/patch-aa
+++ /dev/null
@@ -1,58 +0,0 @@
---- configure.orig	Fri Jan 14 18:21:58 2000
-+++ configure	Fri Jan 14 18:22:59 2000
-@@ -944,8 +944,8 @@
-   x_includes="/usr/include"
- fi
- 
--LIBS="$LIBS `gtk-config --libs`"
--CFLAGS="$CFLAGS `gtk-config --cflags` -Wall"
-+LIBS="$LIBS `${GTK_CONFIG} --libs`"
-+CFLAGS="$CFLAGS `${GTK_CONFIG} --cflags` -Wall"
- 
- # Check whether --with-gtk-prefix or --without-gtk-prefix was given.
- if test "${with_gtk_prefix+set}" = set; then
-@@ -975,18 +975,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
--        GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
-+        GTK_CONFIG=$gtk_config_exec_prefix/bin/${GTK_CONFIG}
-      fi
-   fi
-   if test x$gtk_config_prefix != x ; then
-      gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
-      if test x${GTK_CONFIG+set} != xset ; then
--        GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
-+        GTK_CONFIG=$gtk_config_prefix/bin/${GTK_CONFIG}
-      fi
-   fi
- 
--  # Extract the first word of "gtk-config", so it can be a program name with args.
--set dummy gtk-config; ac_word=$2
-+  # 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:992: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
-@@ -1122,10 +1122,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
- #        :
-@@ -1154,7 +1154,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