4 files changed, 63 insertions, 33 deletions

diff --git a/editors/bless/Makefile b/editors/bless/Makefile
index 9e83ca63b6c5..79105053c1dc 100644
--- a/editors/bless/Makefile
+++ b/editors/bless/Makefile
@@ -2,12 +2,12 @@
 # Date created:				24 October 2004
 # Whom:					Mezz <mezz@FreeBSD.org>
 #
+# $Id: Makefile,v 1.3 2005/05/10 16:34:16 mezz7 Exp $
 # $FreeBSD$
 #
 
 PORTNAME=	bless
-PORTVERSION=	0.3.1
-PORTREVISION=	1
+PORTVERSION=	0.3.4
 PORTEPOCH=	1
 CATEGORIES=	editors
 MASTER_SITES=	http://download.gna.org/bless/
@@ -18,16 +18,27 @@ 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_GMAKE=	yes
-USE_X_PREFIX=   yes
+USE_X_PREFIX=	yes
+INSTALLS_OMF=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 
-DOCS=		AUTHORS Changelog NEWS README
+DOCS=		AUTHORS COPYING ChangeLog NEWS README
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|make|${GMAKE}|g ; s|config.gmake|config.make|g' \
-		${WRKSRC}/Makefile
+	@${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'
+.if defined(NOPORTDOCS)
+	@${REINPLACE_CMD} -e 's|src doc|src|g' \
+		${WRKSRC}/Makefile.in
+.endif
 
 .ifndef (NOPORTDOCS)
 post-install:
diff --git a/editors/bless/distinfo b/editors/bless/distinfo
index 8614c07f76ea..8f38361d852c 100644
--- a/editors/bless/distinfo
+++ b/editors/bless/distinfo
@@ -1,2 +1,2 @@
-MD5 (bless-0.3.1.tar.gz) = 91597bacbffbd24b3ff5b19de60f7a08
-SIZE (bless-0.3.1.tar.gz) = 333150
+MD5 (bless-0.3.4.tar.gz) = 71e5c3cbecb32f4a27e0f436b4e730e9
+SIZE (bless-0.3.4.tar.gz) = 491216
diff --git a/editors/bless/files/patch-src::Makefile b/editors/bless/files/patch-src::Makefile
deleted file mode 100644
index b1aec5af1a8b..000000000000
--- a/editors/bless/files/patch-src::Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/Makefile.orig	Sun Feb  6 04:32:01 2005
-+++ src/Makefile	Sun Feb  6 04:33:23 2005
-@@ -65,12 +65,12 @@
- 
- 
- bless.exe: $(GUI_SRC) $(BB_SRC) $(GUI_DRAWERS_SRC) $(GUI_AREAS_SRC) $(GUI_DIALOGS_SRC) $(TOOLS_FIND_SRC) $(UTIL_SRC) $(MISC_DEPS)
--	$(MCS) -g -o bless.exe -t:exe -r:nunit.framework  $(RESOURCES) -pkg:gtk-sharp -pkg:glade-sharp \
-+	$(MCS) -g -o bless.exe -t:exe -r:nunit.framework  $(RESOURCES) $(shell pkg-config --libs gtk-sharp glade-sharp) \
- 	$(GUI_SRC) $(BB_SRC) $(GUI_DRAWERS_SRC)  $(GUI_AREAS_SRC) $(GUI_DIALOGS_SRC) $(TOOLS_FIND_SRC) $(UTIL_SRC)
- 
- 
- %.dll:%.cs
--	$(MCS) -t:library -r:nunit.framework -pkg:gtk-sharp $<
-+	$(MCS) -t:library -r:nunit.framework $(shell pkg-config --libs gtk-sharp) $<
- 
- install: bless.exe 
- 	install -c -d $(PREFIX)/lib/bless/bin/
diff --git a/editors/bless/pkg-plist b/editors/bless/pkg-plist
index 683fdcb145c2..476693a6c45e 100644
--- a/editors/bless/pkg-plist
+++ b/editors/bless/pkg-plist
@@ -1,13 +1,49 @@
 bin/bless
-lib/bless/bin/bless.exe
-lib/bless/data/Makefile
-lib/bless/data/bless-about.png
-lib/bless/data/bless-icon.png
+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
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/Changelog
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/developer/bless.xmi
+%%PORTDOCS%%%%DOCSDIR%%/user/bless-manual.xml
+%%PORTDOCS%%%%DOCSDIR%%/user/ch01.html
+%%PORTDOCS%%%%DOCSDIR%%/user/ch02.html
+%%PORTDOCS%%%%DOCSDIR%%/user/ch02s02.html
+%%PORTDOCS%%%%DOCSDIR%%/user/ch03.html
+%%PORTDOCS%%%%DOCSDIR%%/user/ch03s02.html
+%%PORTDOCS%%%%DOCSDIR%%/user/ch04.html
+%%PORTDOCS%%%%DOCSDIR%%/user/ch04s02.html
+%%PORTDOCS%%%%DOCSDIR%%/user/ch04s03.html
+%%PORTDOCS%%%%DOCSDIR%%/user/ch04s04.html
+%%PORTDOCS%%%%DOCSDIR%%/user/ch05.html
+%%PORTDOCS%%%%DOCSDIR%%/user/ch06.html
+%%PORTDOCS%%%%DOCSDIR%%/user/figures/bless_area_focus.png
+%%PORTDOCS%%%%DOCSDIR%%/user/figures/bless_display_tag.png
+%%PORTDOCS%%%%DOCSDIR%%/user/figures/bless_edit_mode.png
+%%PORTDOCS%%%%DOCSDIR%%/user/figures/bless_goto.png
+%%PORTDOCS%%%%DOCSDIR%%/user/figures/bless_layout_example1.png
+%%PORTDOCS%%%%DOCSDIR%%/user/figures/bless_layout_oha.png
+%%PORTDOCS%%%%DOCSDIR%%/user/figures/bless_search_find.png
+%%PORTDOCS%%%%DOCSDIR%%/user/figures/bless_search_replace.png
+%%PORTDOCS%%%%DOCSDIR%%/user/figures/bless_start_window.png
+%%PORTDOCS%%%%DOCSDIR%%/user/figures/bless_tab_close.png
+%%PORTDOCS%%%%DOCSDIR%%/user/index.html
+%%PORTDOCS%%%%DOCSDIR%%/user/legal.xml
+share/gnome/applications/bless.desktop
+share/gnome/pixmaps/bless-48x48.png
+share/omf/bless/bless-manual.omf
+@dirrm share/omf/bless
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/user/figures
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/user
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/developer
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm lib/bless/data
-@dirrm lib/bless/bin
-@dirrm lib/bless
+@dirrm lib/bless-0.3.4/data
+@dirrm lib/bless-0.3.4/bin
+@dirrm lib/bless-0.3.4