4 files changed, 62 insertions, 60 deletions

diff --git a/www/bluefish-devel/Makefile b/www/bluefish-devel/Makefile
index f77c73c144cf..eda564cc3ff3 100644
--- a/www/bluefish-devel/Makefile
+++ b/www/bluefish-devel/Makefile
@@ -6,27 +6,33 @@
 #
 
 PORTNAME=	bluefish
-PORTVERSION=	0.11.20031031
+PORTVERSION=	0.12
 CATEGORIES=	www editors
 MASTER_SITES=	http://pkedu.fbt.eitn.wau.nl/~olivier/${DOWNLOAD}/ \
 		ftp://bluefish.advancecreations.com/pub/bluefish/${DOWNLOAD}/ \
 		http://bluefish.mrball.net/${DOWNLOAD}/ \
 		ftp://ftp.ratisbona.com/pub/bluefish/${DOWNLOAD}/ \
 		http://bluefish.shellhung.org/${DOWNLOAD}/
-DISTNAME=	${PORTNAME}-2003-10-31
 
 MAINTAINER=	einekoai@chello.nl
 COMMENT=	HTML editor designed for the experienced web designer
 
 LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre \
 		aspell.15:${PORTSDIR}/textproc/aspell
-RUN_DEPENDS=	weblint:${PORTSDIR}/www/weblint
 
-DOWNLOAD=	snapshots
-WRKSRC=		${WRKDIR}/bluefish-gtk2
+.if !defined(WITHOUT_WEBLINT)
+RUN_DEPENDS+=	weblint:${PORTSDIR}/www/weblint
+.endif
+.if defined(WITH_TIDY)
+RUN_DEPENDS+=	tidy:${PORTSDIR}/www/tidy
+.endif
+
+CONFLICTS=	bluefish-0.7*
+
+DOWNLOAD=	downloads
 NO_LATEST_LINK=	yes
 USE_BZIP2=	yes
-USE_GNOME=	gnomehier gtk20
+USE_GNOME=	gnomehier gtk20 gnomevfs2
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -39,10 +45,17 @@ CONFIGURE_ARGS=	--with-gnome2-menu=${PREFIX}/share/gnome/apps/Applications \
 CONFIGURE_ARGS+=	--with-debugging-output
 .endif
 
+.if defined(WITHOUT_SPLASH)
+CONFIGURE_ARGS+=	--disable-splash-screen
+.endif
+
 pre-everything::
-.if !defined(WITH_DEBUG)
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} "WITH_DEBUG=yes for debug support"
-.endif
+	@${ECHO_MSG} "Bluefish  has the following tunable option(s):"
+	@${ECHO_MSG} "  WITH_DEBUG		for debug support"
+	@${ECHO_MSG} "  WITHOUT_WEBLINT	disable the weblint syntax and style checker"
+	@${ECHO_MSG} "  WITH_TIDY		for the tidy html cleanup program"
+	@${ECHO_MSG} "  WITHOUT_SPLASH	disable the splash screen"
+	@${ECHO_MSG} ""
 
 .include <bsd.port.mk>
diff --git a/www/bluefish-devel/distinfo b/www/bluefish-devel/distinfo
index 16616332d9c9..2f894031d392 100644
--- a/www/bluefish-devel/distinfo
+++ b/www/bluefish-devel/distinfo
@@ -1 +1 @@
-MD5 (bluefish-2003-10-31.tar.bz2) = 983b31d4fd3261ddf50889baa46b6083
+MD5 (bluefish-0.12.tar.bz2) = 9b01162747c7be6e2fc46475544bf995
diff --git a/www/bluefish-devel/files/patch-src_fref.c b/www/bluefish-devel/files/patch-src_fref.c
deleted file mode 100644
index a6e08d36f130..000000000000
--- a/www/bluefish-devel/files/patch-src_fref.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/fref.c.orig	Fri Oct 31 22:36:50 2003
-+++ src/fref.c	Sun Nov  9 17:10:58 2003
-@@ -1784,9 +1784,9 @@
- } Tfref_cleanup;
- 
- static guint fref_idle_cleanup(Tfref_cleanup *data) {
--	DEBUG_MSG("fref_idle_cleanup, started for data=%s\n",data->cat);
- 	GtkTreeIter iter;
- 	gboolean cont = TRUE;
-+	DEBUG_MSG("fref_idle_cleanup, started for data=%s\n",data->cat);
- 	gtk_tree_model_get_iter_first(GTK_TREE_MODEL(FREFDATA(main_v->frefdata)->store),&iter);
- 	while (cont) {
- 		gchar *str;
diff --git a/www/bluefish-devel/pkg-plist b/www/bluefish-devel/pkg-plist
index 5e0c4594d72e..bf8adf0f4296 100644
--- a/www/bluefish-devel/pkg-plist
+++ b/www/bluefish-devel/pkg-plist
@@ -20,53 +20,55 @@ share/bluefish/icon_unknown.png
 share/bluefish/icon_xml.png
 share/gnome/apps/Applications/bluefish.desktop
 share/gnome/pixmaps/bluefish-icon.png
+share/locale/cs/LC_MESSAGES/bluefish.mo
 share/locale/da/LC_MESSAGES/bluefish.mo
 share/locale/de/LC_MESSAGES/bluefish.mo
+share/locale/el/LC_MESSAGES/bluefish.mo
 share/locale/es/LC_MESSAGES/bluefish.mo
 share/locale/fr/LC_MESSAGES/bluefish.mo
 share/locale/hu/LC_MESSAGES/bluefish.mo
 share/locale/it/LC_MESSAGES/bluefish.mo
 share/locale/ja/LC_MESSAGES/bluefish.mo
+share/locale/nl/LC_MESSAGES/bluefish.mo
 share/locale/no/LC_MESSAGES/bluefish.mo
 share/locale/pl/LC_MESSAGES/bluefish.mo
 share/locale/pt_BR/LC_MESSAGES/bluefish.mo
+share/locale/ro/LC_MESSAGES/bluefish.mo
 share/locale/ru/LC_MESSAGES/bluefish.mo
 share/locale/sv/LC_MESSAGES/bluefish.mo
-@unexec rmdir share/nls/POSIX 2>/dev/null || true
-@unexec rmdir share/nls/en_US.US-ASCII 2> /dev/null || true
-@unexec rmdir share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir share/locale/zh_CN 2>/dev/null || true
-@unexec rmdir share/locale/sv/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir share/locale/sv 2>/dev/null || true
-@unexec rmdir share/locale/ru/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir share/locale/ru 2>/dev/null || true
-@unexec rmdir share/locale/pl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir share/locale/pl 2>/dev/null || true
-@unexec rmdir share/locale/no_nb/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir share/locale/no_nb 2>/dev/null || true
-@unexec rmdir share/locale/no/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir share/locale/no 2>/dev/null || true
-@unexec rmdir share/locale/nl_NL/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir share/locale/nl_NL 2>/dev/null || true
-@unexec rmdir share/locale/it/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir share/locale/it 2>/dev/null || true
-@unexec rmdir share/locale/hu/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir share/locale/hu 2>/dev/null || true
-@unexec rmdir share/locale/gr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir share/locale/gr 2>/dev/null || true
-@unexec rmdir share/locale/fr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir share/locale/fr 2>/dev/null || true
-@unexec rmdir share/locale/fi/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir share/locale/fi 2>/dev/null || true
-@unexec rmdir share/locale/es/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir share/locale/es 2>/dev/null || true
-@unexec rmdir share/locale/de/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir share/locale/de 2>/dev/null || true
-@unexec rmdir share/locale/da_DK/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir share/locale/da_DK 2>/dev/null || true
-@unexec rmdir share/locale/da/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir share/locale/da 2>/dev/null || true
-@unexec rmdir share/locale/ar/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir share/locale/ar 2>/dev/null || true
-@unexec rmdir share/locale 2>/dev/null || true
+@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
+@unexec rmdir %D/share/locale/sv/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/sv 2>/dev/null || true
+@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/ru 2>/dev/null || true
+@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/pl 2>/dev/null || true
+@unexec rmdir %D/share/locale/no_nb/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/no_nb 2>/dev/null || true
+@unexec rmdir %D/share/locale/no/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/no 2>/dev/null || true
+@unexec rmdir %D/share/locale/nl_NL/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/nl_NL 2>/dev/null || true
+@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/it 2>/dev/null || true
+@unexec rmdir %D/share/locale/hu/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/hu 2>/dev/null || true
+@unexec rmdir %D/share/locale/gr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/gr 2>/dev/null || true
+@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/fr 2>/dev/null || true
+@unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/fi 2>/dev/null || true
+@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/es 2>/dev/null || true
+@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/de 2>/dev/null || true
+@unexec rmdir %D/share/locale/da_DK/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/da_DK 2>/dev/null || true
+@unexec rmdir %D/share/locale/da/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/da 2>/dev/null || true
+@unexec rmdir %D/share/locale/ar/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/ar 2>/dev/null || true
+@unexec rmdir %D/share/locale 2>/dev/null || true
 @dirrm share/bluefish