* Update to the latest 0.9 develop snapshot (0.9.20030703)

* Fix the icon for bluefish.desktop
* Make sure all locale dirs are removed if empty

PR:		54088
Submitted by:	maintainer

4 files changed, 44 insertions, 9 deletions

diff --git a/www/bluefish-devel/Makefile b/www/bluefish-devel/Makefile
index 0559eabf6f3d..cb31e93c0d0f 100644
--- a/www/bluefish-devel/Makefile
+++ b/www/bluefish-devel/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	bluefish
-PORTVERSION=	0.9.20030621
+PORTVERSION=	0.9.20030703
 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-06-21
+DISTNAME=	${PORTNAME}-2003-07-03
 
 MAINTAINER=	einekoai@chello.nl
 COMMENT=	HTML editor designed for the experienced web designer
@@ -32,9 +32,8 @@ USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--with-gnome2-menu=${PREFIX}/share/gnome/apps/Applications
-
-.include <bsd.port.pre.mk>
+CONFIGURE_ARGS=	--with-gnome2-menu=${PREFIX}/share/gnome/apps/Applications \
+			--with-icon-path=${PREFIX}/share/gnome/pixmaps
 
 # Turns debugging output on
 .if defined(WITH_DEBUG)
@@ -47,4 +46,4 @@ pre-everything::
 	@${ECHO_MSG} "WITH_DEBUG=yes for debug support"
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/bluefish-devel/distinfo b/www/bluefish-devel/distinfo
index d3a3c4e74d54..92bd9ba2997f 100644
--- a/www/bluefish-devel/distinfo
+++ b/www/bluefish-devel/distinfo
@@ -1 +1 @@
-MD5 (bluefish-2003-06-21.tar.bz2) = 439f167f36d498388529e8fbdb18e418
+MD5 (bluefish-2003-07-03.tar.bz2) = 3d4cacdbdf7ad107917579b475b84e57
diff --git a/www/bluefish-devel/files/patch-Makefile.in b/www/bluefish-devel/files/patch-Makefile.in
index 67a5fc855e22..7ae8e282f06a 100644
--- a/www/bluefish-devel/files/patch-Makefile.in
+++ b/www/bluefish-devel/files/patch-Makefile.in
@@ -4,7 +4,7 @@
  bluefish:all
  all:
  	@cd src/ && $(MAKE) all
--	if [ ${USE_NLS} == "yes" ]; then \
+-	if [ "${USE_NLS}" == "yes" ]; then \
 +	if [ ${USE_NLS} = "yes" ]; then \
  		cd po/ && $(MAKE) all; \
  	fi
@@ -13,7 +13,7 @@
  		$(INSTALL_DATA) inline_images/bluefish_icon1.png $(iconpath)/bluefish-icon.png ;\
  	fi
  	@cd src/ && $(MAKE) install
--	if [ ${USE_NLS} == "yes" ]; then \
+-	if [ "${USE_NLS}" == "yes" ]; then \
 +	if [ ${USE_NLS} = "yes" ]; then \
  		cd po/ && $(MAKE) install;\
  	fi
diff --git a/www/bluefish-devel/pkg-plist b/www/bluefish-devel/pkg-plist
index d4dcf381fcb6..77869ae5b2d2 100644
--- a/www/bluefish-devel/pkg-plist
+++ b/www/bluefish-devel/pkg-plist
@@ -19,6 +19,7 @@ share/bluefish/icon_r.png
 share/bluefish/icon_unknown.png
 share/bluefish/icon_xml.png
 share/gnome/apps/Applications/bluefish.desktop
+share/gnome/pixmaps/bluefish-icon.png
 share/locale/da/LC_MESSAGES/bluefish.mo
 share/locale/de/LC_MESSAGES/bluefish.mo
 share/locale/es/LC_MESSAGES/bluefish.mo
@@ -29,4 +30,39 @@ share/locale/no/LC_MESSAGES/bluefish.mo
 share/locale/pl/LC_MESSAGES/bluefish.mo
 share/locale/ru/LC_MESSAGES/bluefish.mo
 share/locale/sv/LC_MESSAGES/bluefish.mo
+@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
 @dirrm share/bluefish