Update bluefish to 0.5. Changes from version 0.4:

* new very powerful custom menu, extending both HTML, PHP and
  other serverside coding
* much more configuration, and better configuration dialogs
* easily open recently used files
* better handling of file opening and closing
* more efficient code
* fixed some bugs
* auto-indenting
* spell check
* multibyte character support
* internal preview mode (experimental)
* XHTML support

6 files changed, 84 insertions, 42 deletions

diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index 2395d8e5d05..b2873e95b81 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2000/08/16 05:38:35 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2000/08/23 12:39:37 jlam Exp $
 #
 
-DISTNAME=	bluefish-0.4
-PKGNAME=	${DISTNAME}nb1
+DISTNAME=	bluefish-0.5
 CATEGORIES=	www
 MASTER_SITES=	http://bluefish.openoffice.nl/download/
 EXTRACT_SUFX=	.tar.bz2
@@ -25,7 +24,13 @@ GNU_CONFIGURE=	# defined
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
 CPPFLAGS+=	-I${LOCALBASE}/include
 
+HTMLDIR=	${PREFIX}/share/doc/html/bluefish
+
 pre-configure:
 	cd ${WRKSRC} && autoreconf
 
+post-install:
+	${INSTALL_DATA_DIR} ${HTMLDIR}
+	cd ${WRKSRC}/manual; ${INSTALL_DATA} * ${HTMLDIR}
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/bluefish/files/md5 b/www/bluefish/files/md5
index e944555ad20..22d81a57d48 100644
--- a/www/bluefish/files/md5
+++ b/www/bluefish/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 2000/05/21 11:39:44 wulf Exp $
+$NetBSD: md5,v 1.3 2000/08/23 12:39:37 jlam Exp $
 
-MD5 (bluefish-0.4.tar.bz2) = 0be38c2b74c30cf125a8ef78b054b8c8
+MD5 (bluefish-0.5.tar.bz2) = ea338dafa61d7c82482322ae96a2bef7
diff --git a/www/bluefish/files/patch-sum b/www/bluefish/files/patch-sum
index 879b141aa7c..fae5f8c494f 100644
--- a/www/bluefish/files/patch-sum
+++ b/www/bluefish/files/patch-sum
@@ -1,4 +1,3 @@
-$NetBSD: patch-sum,v 1.4 2000/08/16 16:11:50 jlam Exp $
+$NetBSD: patch-sum,v 1.5 2000/08/23 12:39:37 jlam Exp $
 
-MD5 (patch-aa) = 674074b0a54a39ad78284a751b20d7f0
-MD5 (patch-ab) = fcf9e8d3ff134bbb4850ecb30e79a04c
+MD5 (patch-aa) = bed0de291c9b13d6654b303e9f78facf
diff --git a/www/bluefish/patches/patch-aa b/www/bluefish/patches/patch-aa
index 12d25e3d657..5c1a3a144d0 100644
--- a/www/bluefish/patches/patch-aa
+++ b/www/bluefish/patches/patch-aa
@@ -1,26 +1,38 @@
-$NetBSD: patch-aa,v 1.4 2000/08/16 16:11:50 jlam Exp $
+$NetBSD: patch-aa,v 1.5 2000/08/23 12:39:37 jlam Exp $
 
---- configure.in.orig	Sun May 14 11:36:13 2000
-+++ configure.in	Wed Aug 16 11:51:29 2000
-@@ -94,6 +94,7 @@
-   AC_MSG_ERROR(GTK was not detected, or a sufficent version was not found. This is a bad thing)
+--- configure.in.orig	Mon Aug 21 04:15:51 2000
++++ configure.in
+@@ -80,6 +80,11 @@
+   AC_DEFINE (ENABLE_NLS)
  fi
  
-+if false; then
- AC_CHECK_LIB(gdk_imlib, main,  
-    [ LIBS="$LIBS -lgdk_imlib"
-    AC_SUBST(IMLIB)
-@@ -109,6 +110,13 @@
- ,
- AC_DEFINE(HAVE_LIBGDK_IMLIB,0)
++dnl NetBSD: set DATADIRNAME to "share"
++DATADIRNAME="share"
++INTLDEPS=
++INTLLIBS="-lintl"
++
+ LIBS="$LIBS `gtk-config --libs`"
+ CFLAGS="$CFLAGS `gtk-config --cflags`"
+ 
+@@ -110,6 +115,7 @@
  )
+ 
+ 
++if false; then
+ dnl Check if system supports the graphical libraries
+ AC_CHECK_LIB(ungif, main, GLIBS="-lungif",
+ 	AC_CHECK_LIB(gif,main, GLIBS="-lgif"))
+@@ -124,6 +130,13 @@
+ 	AC_DEFINE(HAVE_LIBGDK_IMLIB,1) ]
+ 	,AC_DEFINE(HAVE_LIBGDK_IMLIB,0)
+ 	,$GLIBS)
 +else
-+   GDK_IMLIB_CFLAGS="`imlib-config --cflags-gdk`"
-+   GDK_IMLIB_LIBS="`imlib-config --libs-gdk`"
-+   GDK_IMLIB_LIBS="$GDK_IMLIB_LIBS `imlib-config --libs`"
-+   CFLAGS="$CFLAGS $GDK_IMLIB_CFLAGS"
-+   LIBS="$LIBS $GDK_IMLIB_LIBS"
++	GDK_IMLIB_CFLAGS="`imlib-config --cflags-gdk`"
++	GDK_IMLIB_LIBS="`imlib-config --libs-gdk`"
++	GDK_IMLIB_LIBS="$GDK_IMLIB_LIBS `imlib-config --libs`"
++	CFLAGS="$CFLAGS $GDK_IMLIB_CFLAGS"
++	LIBS="$LIBS $GDK_IMLIB_LIBS"
 +fi
  
- AC_CHECK_LIB(posix4, nanosleep, 
- 	LIBS="$LIBS -lposix4"
+ localedir='${prefix}/share/locale'
+ AC_SUBST(localedir)
diff --git a/www/bluefish/patches/patch-ab b/www/bluefish/patches/patch-ab
deleted file mode 100644
index c28fb65a54d..00000000000
--- a/www/bluefish/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2000/08/16 05:38:36 jlam Exp $
-
---- Makefile.in.orig	Sun May 21 14:26:55 2000
-+++ Makefile.in	Tue Apr 18 07:01:14 2000
-@@ -29,7 +29,7 @@
- bindir = @bindir@
- datadir = @datadir@
- pkgdatadir = @pkgdatadir@
--pixmapsdir = /usr/share/pixmaps
-+pixmapsdir = @datadir@/pixmaps
- 
- INSTALL = @INSTALL@
- 
diff --git a/www/bluefish/pkg/PLIST b/www/bluefish/pkg/PLIST
index 45d6afc39f1..6a38f204bbb 100644
--- a/www/bluefish/pkg/PLIST
+++ b/www/bluefish/pkg/PLIST
@@ -1,9 +1,47 @@
-@comment $NetBSD: PLIST,v 1.3 2000/08/16 05:38:36 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2000/08/23 12:39:37 jlam Exp $
 bin/bluefish
 man/man1/bluefish.1
 share/bluefish/php3_functions
 share/bluefish/rxml_functions
 share/bluefish/ssi_functions
+share/pixmaps/bluefish_icon.xpm
+share/doc/html/bluefish/bluefish.gif
+share/doc/html/bluefish/bluefish.png
+share/doc/html/bluefish/button_close.gif
+share/doc/html/bluefish/button_config.gif
+share/doc/html/bluefish/button_copy.gif
+share/doc/html/bluefish/button_cut.gif
+share/doc/html/bluefish/button_new.gif
+share/doc/html/bluefish/button_new.png
+share/doc/html/bluefish/button_open.gif
+share/doc/html/bluefish/button_paste.gif
+share/doc/html/bluefish/button_print.gif
+share/doc/html/bluefish/button_quickstart.gif
+share/doc/html/bluefish/button_redo.gif
+share/doc/html/bluefish/button_replace.gif
+share/doc/html/bluefish/button_save.gif
+share/doc/html/bluefish/button_saveas.gif
+share/doc/html/bluefish/button_search.gif
+share/doc/html/bluefish/button_undo.gif
+share/doc/html/bluefish/chapter1.html
+share/doc/html/bluefish/chapter2.html
+share/doc/html/bluefish/chapter3.html
+share/doc/html/bluefish/chapter4.html
+share/doc/html/bluefish/config_editor.png
+share/doc/html/bluefish/config_external.png
+share/doc/html/bluefish/config_gui.png
+share/doc/html/bluefish/config_html.png
+share/doc/html/bluefish/config_img.png
+share/doc/html/bluefish/editarea.gif
+share/doc/html/bluefish/float.gif
+share/doc/html/bluefish/index.html
+share/doc/html/bluefish/mainscreen.gif
+share/doc/html/bluefish/mainscreen.png
+share/doc/html/bluefish/manual.book
+share/doc/html/bluefish/manual.css
+share/doc/html/bluefish/preface.html
+share/doc/html/bluefish/tfilemenu.gif
+share/doc/html/bluefish/tfilemenu.png
 share/locale/cs/LC_MESSAGES/bluefish.mo
 share/locale/da/LC_MESSAGES/bluefish.mo
 share/locale/de/LC_MESSAGES/bluefish.mo
@@ -15,6 +53,7 @@ share/locale/it/LC_MESSAGES/bluefish.mo
 share/locale/ja/LC_MESSAGES/bluefish.mo
 share/locale/ro/LC_MESSAGES/bluefish.mo
 share/locale/ru/LC_MESSAGES/bluefish.mo
-share/pixmaps/bluefish_icon.xpm
+share/locale/sv/LC_MESSAGES/bluefish.mo
 @unexec rmdir -p %D/share/pixmaps 2>/dev/null || true
+@dirrm share/doc/html/bluefish
 @dirrm share/bluefish