3 files changed, 18 insertions, 20 deletions

diff --git a/editors/bless/Makefile b/editors/bless/Makefile
index 79105053c1dc..fd547553fbbb 100644
--- a/editors/bless/Makefile
+++ b/editors/bless/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	bless
-PORTVERSION=	0.3.4
+PORTVERSION=	0.3.5
 PORTEPOCH=	1
 CATEGORIES=	editors
 MASTER_SITES=	http://download.gna.org/bless/
@@ -18,7 +18,7 @@ COMMENT=	A high quality, full featured hex editor
 BUILD_DEPENDS=	gapi-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-USE_GNOME=	gnometarget
+USE_GNOME=	gnomehack gnomeprefix gnometarget
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 INSTALLS_OMF=	yes
@@ -30,11 +30,8 @@ DOCS=		AUTHORS COPYING ChangeLog NEWS README
 post-patch:
 	@${REINPLACE_CMD} -e 's|data tests|data|g' \
 		${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|[(]datadir[)]/applications|(prefix)/share/gnome/applications|g ; \
-		s|[(]datadir[)]/pixmaps|(prefix)/share/gnome/pixmaps|g' \
-			${WRKSRC}/data/Makefile.in
 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
-		's|doc/$$(PACKAGE_NAME)-$$(PACKAGE_VERSION)|doc/$$(PACKAGE_NAME)|g'
+		's|$$(datadir)/doc/$$(PACKAGE_NAME)-$$(PACKAGE_VERSION)|${DOCSDIR}|g'
 .if defined(NOPORTDOCS)
 	@${REINPLACE_CMD} -e 's|src doc|src|g' \
 		${WRKSRC}/Makefile.in
diff --git a/editors/bless/distinfo b/editors/bless/distinfo
index 8f38361d852c..ce2800ce6c02 100644
--- a/editors/bless/distinfo
+++ b/editors/bless/distinfo
@@ -1,2 +1,2 @@
-MD5 (bless-0.3.4.tar.gz) = 71e5c3cbecb32f4a27e0f436b4e730e9
-SIZE (bless-0.3.4.tar.gz) = 491216
+MD5 (bless-0.3.5.tar.gz) = 84010aec289b00321cacbfecf6a4c1fe
+SIZE (bless-0.3.5.tar.gz) = 493083
diff --git a/editors/bless/pkg-plist b/editors/bless/pkg-plist
index 476693a6c45e..77605e5002d0 100644
--- a/editors/bless/pkg-plist
+++ b/editors/bless/pkg-plist
@@ -1,11 +1,11 @@
 bin/bless
-lib/bless-0.3.4/bin/bless.exe
-lib/bless-0.3.4/data/bless-16-bytes-per-row.layout
-lib/bless-0.3.4/data/bless-48x48.png
-lib/bless-0.3.4/data/bless-about.png
-lib/bless-0.3.4/data/bless-all-number-bases.layout
-lib/bless-0.3.4/data/bless-default.layout
-lib/bless-0.3.4/data/help_script.sh
+lib/bless-0.3.5/bin/bless.exe
+lib/bless-0.3.5/data/bless-16-bytes-per-row.layout
+lib/bless-0.3.5/data/bless-48x48.png
+lib/bless-0.3.5/data/bless-about.png
+lib/bless-0.3.5/data/bless-all-number-bases.layout
+lib/bless-0.3.5/data/bless-default.layout
+lib/bless-0.3.5/data/help_script.sh
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
@@ -23,6 +23,7 @@ lib/bless-0.3.4/data/help_script.sh
 %%PORTDOCS%%%%DOCSDIR%%/user/ch04s03.html
 %%PORTDOCS%%%%DOCSDIR%%/user/ch04s04.html
 %%PORTDOCS%%%%DOCSDIR%%/user/ch05.html
+%%PORTDOCS%%%%DOCSDIR%%/user/ch05s02.html
 %%PORTDOCS%%%%DOCSDIR%%/user/ch06.html
 %%PORTDOCS%%%%DOCSDIR%%/user/figures/bless_area_focus.png
 %%PORTDOCS%%%%DOCSDIR%%/user/figures/bless_display_tag.png
@@ -37,13 +38,13 @@ lib/bless-0.3.4/data/help_script.sh
 %%PORTDOCS%%%%DOCSDIR%%/user/index.html
 %%PORTDOCS%%%%DOCSDIR%%/user/legal.xml
 share/gnome/applications/bless.desktop
+share/gnome/omf/bless/bless-manual.omf
 share/gnome/pixmaps/bless-48x48.png
-share/omf/bless/bless-manual.omf
-@dirrm share/omf/bless
+@dirrm share/gnome/omf/bless
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/user/figures
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/user
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/developer
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm lib/bless-0.3.4/data
-@dirrm lib/bless-0.3.4/bin
-@dirrm lib/bless-0.3.4
+@dirrm lib/bless-0.3.5/data
+@dirrm lib/bless-0.3.5/bin
+@dirrm lib/bless-0.3.5