Update bluefish to 0.7

- numerous small updates and improvements
- more translations
- the custom menu now is extended for custom search and replace macro's
- some small memory leaks fixed
- better handling for file history

6 files changed, 134 insertions, 106 deletions

diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index cfea3b3447b..6db3dcb8b4b 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2001/12/05 15:00:48 agc Exp $
+# $NetBSD: Makefile,v 1.20 2002/01/19 02:00:44 mjl Exp $
 
-DISTNAME=	bluefish-0.6
+DISTNAME=	bluefish-0.7
 CATEGORIES=	www
 MASTER_SITES=	http://pkedu.fbt.eitn.wau.nl/~olivier/downloads/	\
 		http://student.wau.nl/~olivier/bluefish/download/	\
@@ -14,22 +14,29 @@ MAINTAINER=	wulf@ping.net.au
 HOMEPAGE=	http://bluefish.openoffice.nl/
 COMMENT=	GTK HTML editor for the experienced web designer
 
-BUILD_DEPENDS+=	autoconf>=2.13:../../devel/autoconf
-BUILD_USES_MSGFMT=	YES
-DEPENDS+=	gtk+-1.2.*:../../x11/gtk
+DEPENDS+=	gtk+>=1.2.7:../../x11/gtk
 DEPENDS+=	imlib-[0-9]*:../../graphics/imlib
 DEPENDS+=	weblint-[0-9]*:../../www/weblint
+DEPENDS+=	jpeg>=6b:../../graphics/jpeg
+DEPENDS+=	png-[0-9]*:../../graphics/png
+DEPENDS+=	tiff-[0-9]*:../../graphics/tiff
+DEPENDS+=	gnome-libs-[0-9]*:../../x11/gnome-lib
+DEPENDS+=	gdk-pixbuf-[0-9]*:../../graphics/gdk-pixbuf
+
+BUILD_USES_MSGFMT=	YES
 
 USE_X11BASE=	# defined
 USE_GMAKE=	# defined
 USE_LIBINTL=	# defined
 
+CONFIGURE_ARGS+=	--with-autocomplet
+
 GNU_CONFIGURE=	# defined
 
 HTMLDIR=	${PREFIX}/share/doc/html/bluefish
 
-pre-configure:
-	cd ${WRKSRC} && ${LOCALBASE}/bin/autoreconf
+# pre-configure:
+# 	cd ${WRKSRC} && ${LOCALBASE}/bin/autoreconf
 
 post-install:
 	${INSTALL_DATA_DIR} ${HTMLDIR}
diff --git a/www/bluefish/PLIST b/www/bluefish/PLIST
index 026c095010c..fc7730a1fbf 100644
--- a/www/bluefish/PLIST
+++ b/www/bluefish/PLIST
@@ -1,11 +1,37 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:16:21 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/01/19 02:00:44 mjl Exp $
 bin/bluefish
 man/man1/bluefish.1
 share/bluefish/php3_functions
 share/bluefish/php4_functions
 share/bluefish/rxml_functions
 share/bluefish/ssi_functions
+share/bluefish/loose.dtd
+share/bluefish/strict.dtd
+share/bluefish/frameset.dtd
+share/bluefish/html.dtd
+share/bluefish/html-s.dtd
+share/bluefish/html-0.dtd
+share/bluefish/html-0s.dtd
+share/bluefish/html-1.dtd
+share/bluefish/html-1s.dtd
+share/bluefish/html-2.1e.dtd
+share/bluefish/html-3.dtd
+share/bluefish/html-3s.dtd
+share/bluefish/html-3.2.dtd
+share/bluefish/html-4.dtd
+share/bluefish/html-4-frameset.dtd
+share/bluefish/html-4-strict.dtd
+share/bluefish/xhtml1-strict.dtd
+share/bluefish/xhtml1-transitional.dtd
+share/bluefish/xhtml1-frameset.dtd
+share/bluefish/gen_php3_functions
+share/bluefish/gen_php4_functions
+share/bluefish/gen_rxml_functions
 share/pixmaps/bluefish_icon.xpm
+share/doc/html/bluefish/images/proyect_edit_file.png
+share/doc/html/bluefish/images/proyect_edit.png
+share/doc/html/bluefish/images/es.gif
+share/doc/html/bluefish/images/es.png
 share/doc/html/bluefish/images/germany.gif
 share/doc/html/bluefish/images/hungary.gif
 share/doc/html/bluefish/images/italy.gif
@@ -49,6 +75,12 @@ share/doc/html/bluefish/de/chapter4.html
 share/doc/html/bluefish/de/manual.book
 share/doc/html/bluefish/de/preface.html
 share/doc/html/bluefish/de/index.html
+share/doc/html/bluefish/de/images/tfilemenu.gif
+share/doc/html/bluefish/de/images/tfilemenu.png
+share/doc/html/bluefish/de/images/editarea.gif
+share/doc/html/bluefish/de/images/editarea.png
+share/doc/html/bluefish/de/images/mainscreen.gif
+share/doc/html/bluefish/de/images/mainscreen.png
 share/doc/html/bluefish/en/chapter1.html
 share/doc/html/bluefish/en/chapter2.html
 share/doc/html/bluefish/en/chapter3.html
@@ -56,6 +88,66 @@ share/doc/html/bluefish/en/chapter4.html
 share/doc/html/bluefish/en/manual.book
 share/doc/html/bluefish/en/preface.html
 share/doc/html/bluefish/en/index.html
+share/doc/html/bluefish/es/images/mainscreen.jpg
+share/doc/html/bluefish/es/images/config_editor.gif
+share/doc/html/bluefish/es/images/project_edit_files.gif
+share/doc/html/bluefish/es/images/tfilemenu.jpg
+share/doc/html/bluefish/es/images/config_gui.gif
+share/doc/html/bluefish/es/images/config_img.gif
+share/doc/html/bluefish/es/images/project_edit.gif
+share/doc/html/bluefish/es/images/editarea.gif
+share/doc/html/bluefish/es/images/config_html.gif
+share/doc/html/bluefish/es/images/project_edit_lists.gif
+share/doc/html/bluefish/es/images/config_external.gif
+share/doc/html/bluefish/es/preface.html
+share/doc/html/bluefish/es/manual.book
+share/doc/html/bluefish/es/chapter1.html
+share/doc/html/bluefish/es/index.html
+share/doc/html/bluefish/es/chapter3.html
+share/doc/html/bluefish/es/chapter4.html
+share/doc/html/bluefish/es/chapter2.html
+share/doc/html/bluefish/fr/images/mainscreen.jpg
+share/doc/html/bluefish/fr/images/config_external.jpg
+share/doc/html/bluefish/fr/images/config_editor.jpg
+share/doc/html/bluefish/fr/images/button_saveas.gif
+share/doc/html/bluefish/fr/images/float.png
+share/doc/html/bluefish/fr/images/button_cut.gif
+share/doc/html/bluefish/fr/images/button_redo.gif
+share/doc/html/bluefish/fr/images/button_close.gif
+share/doc/html/bluefish/fr/images/project_edit_files.jpg
+share/doc/html/bluefish/fr/images/tfilemenu.jpg
+share/doc/html/bluefish/fr/images/button_undo.gif
+share/doc/html/bluefish/fr/images/config_gui.jpg
+share/doc/html/bluefish/fr/images/button_config.gif
+share/doc/html/bluefish/fr/images/button_replace.gif
+share/doc/html/bluefish/fr/images/es.gif
+share/doc/html/bluefish/fr/images/hungary.gif
+share/doc/html/bluefish/fr/images/button_quickstart.gif
+share/doc/html/bluefish/fr/images/button_save.gif
+share/doc/html/bluefish/fr/images/button_print.gif
+share/doc/html/bluefish/fr/images/bluefish_thumbnail.jpg
+share/doc/html/bluefish/fr/images/config_img.jpg
+share/doc/html/bluefish/fr/images/germany.gif
+share/doc/html/bluefish/fr/images/button_new.gif
+share/doc/html/bluefish/fr/images/button_search.gif
+share/doc/html/bluefish/fr/images/uk.gif
+share/doc/html/bluefish/fr/images/bluefish.gif
+share/doc/html/bluefish/fr/images/bluefish.png
+share/doc/html/bluefish/fr/images/project_edit.jpg
+share/doc/html/bluefish/fr/images/project_edit.png
+share/doc/html/bluefish/fr/images/button_paste.gif
+share/doc/html/bluefish/fr/images/editarea.jpg
+share/doc/html/bluefish/fr/images/config_html.jpg
+share/doc/html/bluefish/fr/images/button_copy.gif
+share/doc/html/bluefish/fr/images/italy.gif
+share/doc/html/bluefish/fr/images/project_edit_lists.jpg
+share/doc/html/bluefish/fr/images/button_open.gif
+share/doc/html/bluefish/fr/preface.html
+share/doc/html/bluefish/fr/chapter1.html
+share/doc/html/bluefish/fr/index.html
+share/doc/html/bluefish/fr/chapter3.html
+share/doc/html/bluefish/fr/chapter4.html
+share/doc/html/bluefish/fr/chapter2.html
 share/doc/html/bluefish/it/chapter1.html
 share/doc/html/bluefish/it/chapter2.html
 share/doc/html/bluefish/it/chapter3.html
@@ -67,26 +159,33 @@ share/doc/html/bluefish/hu/preface.html
 share/doc/html/bluefish/hu/index.html
 share/doc/html/bluefish/index.html
 share/doc/html/bluefish/manual.css
-share/locale/de/LC_MESSAGES/bluefish.mo
-share/locale/da/LC_MESSAGES/bluefish.mo
-share/locale/fr/LC_MESSAGES/bluefish.mo
-share/locale/ru/LC_MESSAGES/bluefish.mo
-share/locale/ro/LC_MESSAGES/bluefish.mo
-share/locale/cs/LC_MESSAGES/bluefish.mo
-share/locale/es/LC_MESSAGES/bluefish.mo
-share/locale/el/LC_MESSAGES/bluefish.mo
-share/locale/en/LC_MESSAGES/bluefish.mo
-share/locale/ja/LC_MESSAGES/bluefish.mo
-share/locale/it/LC_MESSAGES/bluefish.mo
-share/locale/sv/LC_MESSAGES/bluefish.mo
-share/locale/br/LC_MESSAGES/bluefish.mo
-share/locale/hu/LC_MESSAGES/bluefish.mo
-share/locale/pl/LC_MESSAGES/bluefish.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/bluefish.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/bluefish.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/bluefish.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/bluefish.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/bluefish.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/bluefish.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/bluefish.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/bluefish.mo
+${PKGLOCALEDIR}/locale/en/LC_MESSAGES/bluefish.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/bluefish.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/bluefish.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/bluefish.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/bluefish.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/bluefish.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/bluefish.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/bluefish.mo
 @unexec rmdir -p %D/share/pixmaps 2>/dev/null || true
-@dirrm share/doc/html/bluefish/de
+@dirrm share/doc/html/bluefish/images
 @dirrm share/doc/html/bluefish/en
 @dirrm share/doc/html/bluefish/it
 @dirrm share/doc/html/bluefish/hu
-@dirrm share/doc/html/bluefish/images
+@dirrm share/doc/html/bluefish/es/images
+@dirrm share/doc/html/bluefish/es
+@dirrm share/doc/html/bluefish/de/images
+@dirrm share/doc/html/bluefish/de
+@dirrm share/doc/html/bluefish/fr/images
+@dirrm share/doc/html/bluefish/fr
 @dirrm share/doc/html/bluefish
+@dirrm share/bluefish/man1
 @dirrm share/bluefish
diff --git a/www/bluefish/distinfo b/www/bluefish/distinfo
index 922908499a3..d722088f0e4 100644
--- a/www/bluefish/distinfo
+++ b/www/bluefish/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 12:02:34 skrll Exp $
+$NetBSD: distinfo,v 1.3 2002/01/19 02:00:44 mjl Exp $
 
-SHA1 (bluefish-0.6.tar.bz2) = fbfd8a27e675e3dc55ebcfbab7178aa693ac17b0
-Size (bluefish-0.6.tar.bz2) = 680541 bytes
+SHA1 (bluefish-0.7.tar.bz2) = 2b4c117894fc4db329a2aeb8a2ab4cda187d62a9
+Size (bluefish-0.7.tar.bz2) = 1686219 bytes
 SHA1 (patch-aa) = 534b3350c0c4f134aa3c5c173e1565fdda092fce
 SHA1 (patch-ab) = 29e7545b12e8813baea3ff70a834960a4f4b6b26
 SHA1 (patch-ac) = f1f8e0a0160dbb8ccf43b21d87cc173fbcab4b5b
diff --git a/www/bluefish/patches/patch-aa b/www/bluefish/patches/patch-aa
deleted file mode 100644
index 6db53972b7b..00000000000
--- a/www/bluefish/patches/patch-aa
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2000/12/28 14:07:19 wulf Exp $
-
---- configure.in.orig	Sun Dec 24 08:21:52 2000
-+++ configure.in	Thu Dec 28 11:20:10 2000
-@@ -97,6 +97,11 @@
- 	AC_DEFINE(ENABLE_NLS)
- fi
- 
-+dnl NetBSD: set DATADIRNAME to "share"
-+DATADIRNAME="share"
-+INTLDEPS=
-+INTLLIBS="-lintl"
-+
- LIBS="$LIBS `gtk-config --libs`"
- CFLAGS="$CFLAGS `gtk-config --cflags`"
- 
-@@ -127,6 +132,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"))
-@@ -141,6 +147,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"
-+fi
- 
- localedir='${prefix}/share/locale'
- AC_SUBST(localedir)
diff --git a/www/bluefish/patches/patch-ac b/www/bluefish/patches/patch-ac
deleted file mode 100644
index a21c0b2e30f..00000000000
--- a/www/bluefish/patches/patch-ac
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2000/12/28 14:07:19 wulf Exp $
-
---- man/Makefile.in.orig	Thu Dec 28 11:52:38 2000
-+++ man/Makefile.in	Thu Dec 28 11:56:21 2000
-@@ -25,11 +25,10 @@
- top_srcdir = @top_srcdir@
- srcdir = @srcdir@
- prefix = @prefix@
--mandirprefix = @mandir@
- exec_prefix = @exec_prefix@
- bindir = $(exec_prefix)/bin
- infodir = $(prefix)/info
--mandir = $(mandirprefix)/man/man1
-+mandir = @mandir@
- localedir = @localedir@
- gnulocaledir = $(prefix)/share/locale
- aliaspath = $(localedir):.
-@@ -54,5 +53,5 @@
- distclean: patchclean
- 
- install: all
--	$(INSTALL) -d -m 755 $(mandir)
--	$(INSTALL) -m 644 ./$(OBJS) $(mandir)/$(OBJS)
-+	$(INSTALL) -d -m 755 $(mandir)/man1
-+	$(INSTALL) -m 644 ./$(OBJS) $(mandir)/man1/$(OBJS)
diff --git a/www/bluefish/patches/patch-ad b/www/bluefish/patches/patch-ad
deleted file mode 100644
index 96e382907b7..00000000000
--- a/www/bluefish/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2001/01/01 01:19:06 wulf Exp $
-
---- src/init.c.orig	Tue Dec 26 23:15:00 2000
-+++ src/init.c	Tue Dec 26 23:15:40 2000
-@@ -166,8 +166,8 @@
- 	/* another g_get_home_dir () */
- 	homedir = g_get_home_dir();
- 	DEBUG_MSG("check_directories, homedir=%s\n", homedir);
--	chk_dir(strncat(strncpy(name, homedir, PATH_MAX), "/.bluefish/", PATH_MAX));
--	chk_dir(strncat(strncpy(name, homedir, PATH_MAX), "/.bluefish/projects/", PATH_MAX));
-+	chk_dir(strncat(strncpy(name, homedir, PATH_MAX), "/.bluefish", PATH_MAX));
-+	chk_dir(strncat(strncpy(name, homedir, PATH_MAX), "/.bluefish/projects", PATH_MAX));
- 	chk_link(strncat(strncpy(name, homedir, PATH_MAX), "/.bluefish/php3_functions", PATH_MAX),
- 			 strncat(strncpy(name2, PKGDATADIR, PATH_MAX), "/php3_functions", PATH_MAX));
- 	chk_link(strncat(strncpy(name, homedir, PATH_MAX), "/.bluefish/ssi_functions", PATH_MAX),