4 files changed, 143 insertions, 157 deletions

diff --git a/editors/gnotepad+/Makefile b/editors/gnotepad+/Makefile
index 8b930089c51f..8398f0d4a76a 100644
--- a/editors/gnotepad+/Makefile
+++ b/editors/gnotepad+/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnotepad+
 PORTVERSION=	1.3.3
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	editors www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gnotepad
@@ -25,7 +25,7 @@ USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 WANT_GNOME=	yes
-USE_GNOME=	gtk12
+USE_GNOME=	gnomeprefix gtk12
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
@@ -44,12 +44,10 @@ post-extract:
 .endif
 
 .if ${HAVE_GNOME:Mgnomelibs}!=""
-USE_GNOME=	gnomeprefix gnomelibs
+USE_GNOME+=	gnomelibs
 PKGNAMESUFFIX=	-gnome
-PLIST_SUB=	DATADIR="share/gnome"
 .else
 CONFIGURE_ARGS+=--disable-gnome
-PLIST_SUB=	DATADIR="share"
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/editors/gnotepad+/files/patch-aa b/editors/gnotepad+/files/patch-aa
index 048e275ef951..8a6d751bb623 100644
--- a/editors/gnotepad+/files/patch-aa
+++ b/editors/gnotepad+/files/patch-aa
@@ -6,7 +6,7 @@
  
 -Applicationsdir = $(datadir)/gnome/apps/Applications
 -Applications_DATA = gnotepad+.desktop gnotepad+.spec
-+@HAVE_GNOME_TRUE@Applicationsdir = $(datadir)/apps/Applications
++@HAVE_GNOME_TRUE@Applicationsdir = $(datadir)/gnome/apps/Applications
 +@HAVE_GNOME_TRUE@Applications_DATA = gnotepad+.desktop gnotepad+.spec
  
  SUBDIRS = docs po intl src
diff --git a/editors/gnotepad+/files/patch-ab b/editors/gnotepad+/files/patch-ab
deleted file mode 100644
index 6566ba43564b..000000000000
--- a/editors/gnotepad+/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- docs/C/Makefile.in.orig	Wed May 17 10:17:47 2000
-+++ docs/C/Makefile.in	Wed May 17 10:18:09 2000
-@@ -65,7 +65,7 @@
- pkgdata_DATA =  	index-1.html			index-2.html			index-3.html			index-4.html			index-5.html			index.html			closedialog.png			doclist.png			doctabs.png			editmenu.png			fileinfo1.png			fileinfo2.png			find1.png			find2.png			find3.png			htmldoc.png			htmltag.png			htmltb1.png			htmltb2.png			htmlwin.png			mainoptions.png			maintb.png			mainwin.png			msgbar.png			msgbox.png			optionsmenu0.png		optionsmenu1.png		optionsmenu2.png		prefs_appearance.png		prefs_document.png		prefs_fonts.png			prefs_fontsel.png		prefs_htmltb.png		prefs_maintb.png		prefs_misc.png			prefs_srcctrl.png		prefs_window.png		printdialog.png			shellcmd.png			splashscreen.png		textarea.png			windowmenu.png			winlist.png			winnew.png			topic.dat
- 
- 
--gnp_helpdir = $(datadir)/gnome/help/gnotepad+/C
-+gnp_helpdir = $(datadir)/help/gnotepad+/C
- 
- EXTRA_DIST = $(pkgdata_DATA)
- 
diff --git a/editors/gnotepad+/pkg-plist b/editors/gnotepad+/pkg-plist
index 167dd00a9cac..8e6d6daa6304 100644
--- a/editors/gnotepad+/pkg-plist
+++ b/editors/gnotepad+/pkg-plist
@@ -1,146 +1,145 @@
 bin/gnp
 %%GNOME:%%share/gnome/apps/Applications/gnotepad+.desktop
 %%GNOME:%%share/gnome/apps/Applications/gnotepad+.spec
-%%DATADIR%%/gnotepad+/gnotepad+.glade
-%%DATADIR%%/gnotepad+/xpm/colsel.xpm
-%%DATADIR%%/gnotepad+/xpm/filesel.xpm
-%%DATADIR%%/gnotepad+/xpm/gnp48x48.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_big.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_blank.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_bold.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_cancel.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_centjust.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_comment.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_copy.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_cut.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_edit.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_emphasis.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_exit.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_find.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_find_next.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_fontm1.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_fontp1.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_form.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_formoption.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_formselect.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_frame.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_frame2.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_framebase.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_frameno.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_frameset.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_frameset2.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_framewiz.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_h1.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_h2.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_h3.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_h4.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_h5.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_h6.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_help.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_image.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_inputbutton.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_inputcheckbox.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_inputimage.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_inputpass.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_inputradio.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_inputreset.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_inputsubmit.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_inputtext.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_inputtextarea.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_italic.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_leftjust.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_linebreak.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_link.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_listdd.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_listdl.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_listdt.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_listitem.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_menu.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_new.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_open.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_ordered.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_paragraph.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_paste.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_pre.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_prefs.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_print.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_redo.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_replace.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_rightjust.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_save.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_separator.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_small.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_strikeout.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_strong.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_subscript.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_superscript.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_table.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_table2.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_tablewiz.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_target.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_td.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_td2.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_th.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_th2.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_title.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_tr.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_tr2.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_typewriter.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_underline.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_undo.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_unordered.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_winclose.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_winnew.xpm
-%%DATADIR%%/help/gnotepad+/C/closedialog.png
-%%DATADIR%%/help/gnotepad+/C/doclist.png
-%%DATADIR%%/help/gnotepad+/C/doctabs.png
-%%DATADIR%%/help/gnotepad+/C/editmenu.png
-%%DATADIR%%/help/gnotepad+/C/fileinfo1.png
-%%DATADIR%%/help/gnotepad+/C/fileinfo2.png
-%%DATADIR%%/help/gnotepad+/C/find1.png
-%%DATADIR%%/help/gnotepad+/C/find2.png
-%%DATADIR%%/help/gnotepad+/C/find3.png
-%%DATADIR%%/help/gnotepad+/C/htmldoc.png
-%%DATADIR%%/help/gnotepad+/C/htmltag.png
-%%DATADIR%%/help/gnotepad+/C/htmltb1.png
-%%DATADIR%%/help/gnotepad+/C/htmltb2.png
-%%DATADIR%%/help/gnotepad+/C/htmlwin.png
-%%DATADIR%%/help/gnotepad+/C/index-1.html
-%%DATADIR%%/help/gnotepad+/C/index-2.html
-%%DATADIR%%/help/gnotepad+/C/index-3.html
-%%DATADIR%%/help/gnotepad+/C/index-4.html
-%%DATADIR%%/help/gnotepad+/C/index-5.html
-%%DATADIR%%/help/gnotepad+/C/index.html
-%%DATADIR%%/help/gnotepad+/C/mainoptions.png
-%%DATADIR%%/help/gnotepad+/C/maintb.png
-%%DATADIR%%/help/gnotepad+/C/mainwin.png
-%%DATADIR%%/help/gnotepad+/C/msgbar.png
-%%DATADIR%%/help/gnotepad+/C/msgbox.png
-%%DATADIR%%/help/gnotepad+/C/optionsmenu0.png
-%%DATADIR%%/help/gnotepad+/C/optionsmenu1.png
-%%DATADIR%%/help/gnotepad+/C/optionsmenu2.png
-%%DATADIR%%/help/gnotepad+/C/prefs_appearance.png
-%%DATADIR%%/help/gnotepad+/C/prefs_document.png
-%%DATADIR%%/help/gnotepad+/C/prefs_fonts.png
-%%DATADIR%%/help/gnotepad+/C/prefs_fontsel.png
-%%DATADIR%%/help/gnotepad+/C/prefs_htmltb.png
-%%DATADIR%%/help/gnotepad+/C/prefs_maintb.png
-%%DATADIR%%/help/gnotepad+/C/prefs_misc.png
-%%DATADIR%%/help/gnotepad+/C/prefs_srcctrl.png
-%%DATADIR%%/help/gnotepad+/C/prefs_window.png
-%%DATADIR%%/help/gnotepad+/C/printdialog.png
-%%DATADIR%%/help/gnotepad+/C/shellcmd.png
-%%DATADIR%%/help/gnotepad+/C/splashscreen.png
-%%DATADIR%%/help/gnotepad+/C/textarea.png
-%%DATADIR%%/help/gnotepad+/C/topic.dat
-%%DATADIR%%/help/gnotepad+/C/windowmenu.png
-%%DATADIR%%/help/gnotepad+/C/winlist.png
-%%DATADIR%%/help/gnotepad+/C/winnew.png
+share/gnome/help/gnotepad+/C/closedialog.png
+share/gnome/help/gnotepad+/C/doclist.png
+share/gnome/help/gnotepad+/C/doctabs.png
+share/gnome/help/gnotepad+/C/editmenu.png
+share/gnome/help/gnotepad+/C/fileinfo1.png
+share/gnome/help/gnotepad+/C/fileinfo2.png
+share/gnome/help/gnotepad+/C/find1.png
+share/gnome/help/gnotepad+/C/find2.png
+share/gnome/help/gnotepad+/C/find3.png
+share/gnome/help/gnotepad+/C/htmldoc.png
+share/gnome/help/gnotepad+/C/htmltag.png
+share/gnome/help/gnotepad+/C/htmltb1.png
+share/gnome/help/gnotepad+/C/htmltb2.png
+share/gnome/help/gnotepad+/C/htmlwin.png
+share/gnome/help/gnotepad+/C/index-1.html
+share/gnome/help/gnotepad+/C/index-2.html
+share/gnome/help/gnotepad+/C/index-3.html
+share/gnome/help/gnotepad+/C/index-4.html
+share/gnome/help/gnotepad+/C/index-5.html
+share/gnome/help/gnotepad+/C/index.html
+share/gnome/help/gnotepad+/C/mainoptions.png
+share/gnome/help/gnotepad+/C/maintb.png
+share/gnome/help/gnotepad+/C/mainwin.png
+share/gnome/help/gnotepad+/C/msgbar.png
+share/gnome/help/gnotepad+/C/msgbox.png
+share/gnome/help/gnotepad+/C/optionsmenu0.png
+share/gnome/help/gnotepad+/C/optionsmenu1.png
+share/gnome/help/gnotepad+/C/optionsmenu2.png
+share/gnome/help/gnotepad+/C/prefs_appearance.png
+share/gnome/help/gnotepad+/C/prefs_document.png
+share/gnome/help/gnotepad+/C/prefs_fonts.png
+share/gnome/help/gnotepad+/C/prefs_fontsel.png
+share/gnome/help/gnotepad+/C/prefs_htmltb.png
+share/gnome/help/gnotepad+/C/prefs_maintb.png
+share/gnome/help/gnotepad+/C/prefs_misc.png
+share/gnome/help/gnotepad+/C/prefs_srcctrl.png
+share/gnome/help/gnotepad+/C/prefs_window.png
+share/gnome/help/gnotepad+/C/printdialog.png
+share/gnome/help/gnotepad+/C/shellcmd.png
+share/gnome/help/gnotepad+/C/splashscreen.png
+share/gnome/help/gnotepad+/C/textarea.png
+share/gnome/help/gnotepad+/C/topic.dat
+share/gnome/help/gnotepad+/C/windowmenu.png
+share/gnome/help/gnotepad+/C/winlist.png
+share/gnome/help/gnotepad+/C/winnew.png
+%%DATADIR%%/gnotepad+.glade
+%%DATADIR%%/xpm/colsel.xpm
+%%DATADIR%%/xpm/filesel.xpm
+%%DATADIR%%/xpm/gnp48x48.xpm
+%%DATADIR%%/xpm/tb_big.xpm
+%%DATADIR%%/xpm/tb_blank.xpm
+%%DATADIR%%/xpm/tb_bold.xpm
+%%DATADIR%%/xpm/tb_cancel.xpm
+%%DATADIR%%/xpm/tb_centjust.xpm
+%%DATADIR%%/xpm/tb_comment.xpm
+%%DATADIR%%/xpm/tb_copy.xpm
+%%DATADIR%%/xpm/tb_cut.xpm
+%%DATADIR%%/xpm/tb_edit.xpm
+%%DATADIR%%/xpm/tb_emphasis.xpm
+%%DATADIR%%/xpm/tb_exit.xpm
+%%DATADIR%%/xpm/tb_find.xpm
+%%DATADIR%%/xpm/tb_find_next.xpm
+%%DATADIR%%/xpm/tb_fontm1.xpm
+%%DATADIR%%/xpm/tb_fontp1.xpm
+%%DATADIR%%/xpm/tb_form.xpm
+%%DATADIR%%/xpm/tb_formoption.xpm
+%%DATADIR%%/xpm/tb_formselect.xpm
+%%DATADIR%%/xpm/tb_frame.xpm
+%%DATADIR%%/xpm/tb_frame2.xpm
+%%DATADIR%%/xpm/tb_framebase.xpm
+%%DATADIR%%/xpm/tb_frameno.xpm
+%%DATADIR%%/xpm/tb_frameset.xpm
+%%DATADIR%%/xpm/tb_frameset2.xpm
+%%DATADIR%%/xpm/tb_framewiz.xpm
+%%DATADIR%%/xpm/tb_h1.xpm
+%%DATADIR%%/xpm/tb_h2.xpm
+%%DATADIR%%/xpm/tb_h3.xpm
+%%DATADIR%%/xpm/tb_h4.xpm
+%%DATADIR%%/xpm/tb_h5.xpm
+%%DATADIR%%/xpm/tb_h6.xpm
+%%DATADIR%%/xpm/tb_help.xpm
+%%DATADIR%%/xpm/tb_image.xpm
+%%DATADIR%%/xpm/tb_inputbutton.xpm
+%%DATADIR%%/xpm/tb_inputcheckbox.xpm
+%%DATADIR%%/xpm/tb_inputimage.xpm
+%%DATADIR%%/xpm/tb_inputpass.xpm
+%%DATADIR%%/xpm/tb_inputradio.xpm
+%%DATADIR%%/xpm/tb_inputreset.xpm
+%%DATADIR%%/xpm/tb_inputsubmit.xpm
+%%DATADIR%%/xpm/tb_inputtext.xpm
+%%DATADIR%%/xpm/tb_inputtextarea.xpm
+%%DATADIR%%/xpm/tb_italic.xpm
+%%DATADIR%%/xpm/tb_leftjust.xpm
+%%DATADIR%%/xpm/tb_linebreak.xpm
+%%DATADIR%%/xpm/tb_link.xpm
+%%DATADIR%%/xpm/tb_listdd.xpm
+%%DATADIR%%/xpm/tb_listdl.xpm
+%%DATADIR%%/xpm/tb_listdt.xpm
+%%DATADIR%%/xpm/tb_listitem.xpm
+%%DATADIR%%/xpm/tb_menu.xpm
+%%DATADIR%%/xpm/tb_new.xpm
+%%DATADIR%%/xpm/tb_open.xpm
+%%DATADIR%%/xpm/tb_ordered.xpm
+%%DATADIR%%/xpm/tb_paragraph.xpm
+%%DATADIR%%/xpm/tb_paste.xpm
+%%DATADIR%%/xpm/tb_pre.xpm
+%%DATADIR%%/xpm/tb_prefs.xpm
+%%DATADIR%%/xpm/tb_print.xpm
+%%DATADIR%%/xpm/tb_redo.xpm
+%%DATADIR%%/xpm/tb_replace.xpm
+%%DATADIR%%/xpm/tb_rightjust.xpm
+%%DATADIR%%/xpm/tb_save.xpm
+%%DATADIR%%/xpm/tb_separator.xpm
+%%DATADIR%%/xpm/tb_small.xpm
+%%DATADIR%%/xpm/tb_strikeout.xpm
+%%DATADIR%%/xpm/tb_strong.xpm
+%%DATADIR%%/xpm/tb_subscript.xpm
+%%DATADIR%%/xpm/tb_superscript.xpm
+%%DATADIR%%/xpm/tb_table.xpm
+%%DATADIR%%/xpm/tb_table2.xpm
+%%DATADIR%%/xpm/tb_tablewiz.xpm
+%%DATADIR%%/xpm/tb_target.xpm
+%%DATADIR%%/xpm/tb_td.xpm
+%%DATADIR%%/xpm/tb_td2.xpm
+%%DATADIR%%/xpm/tb_th.xpm
+%%DATADIR%%/xpm/tb_th2.xpm
+%%DATADIR%%/xpm/tb_title.xpm
+%%DATADIR%%/xpm/tb_tr.xpm
+%%DATADIR%%/xpm/tb_tr2.xpm
+%%DATADIR%%/xpm/tb_typewriter.xpm
+%%DATADIR%%/xpm/tb_underline.xpm
+%%DATADIR%%/xpm/tb_undo.xpm
+%%DATADIR%%/xpm/tb_unordered.xpm
+%%DATADIR%%/xpm/tb_winclose.xpm
+%%DATADIR%%/xpm/tb_winnew.xpm
 share/locale/da/LC_MESSAGES/gnotepad+.mo
 share/locale/fr/LC_MESSAGES/gnotepad+.mo
 share/locale/ja/LC_MESSAGES/gnotepad+.mo
-@dirrm %%DATADIR%%/help/gnotepad+/C
-@dirrm %%DATADIR%%/help/gnotepad+
-%%NOGNOME:%%@dirrm %%DATADIR%%/help
-@dirrm %%DATADIR%%/gnotepad+/xpm
-@dirrm %%DATADIR%%/gnotepad+
+@dirrm %%DATADIR%%/xpm
+@dirrm %%DATADIR%%
+@dirrm share/gnome/help/gnotepad+/C
+@dirrm share/gnome/help/gnotepad+