Update to 1.3.0

Approved by:	maintainer

5 files changed, 123 insertions, 101 deletions

diff --git a/editors/gnotepad+/Makefile b/editors/gnotepad+/Makefile
index 257fa25371da..89e700262917 100644
--- a/editors/gnotepad+/Makefile
+++ b/editors/gnotepad+/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnotepad+
-PORTVERSION=	1.2.1
+PORTVERSION=	1.3.0
 CATEGORIES=	editors www
 MASTER_SITES=	http://download.sourceforge.net/gnotepad/
 .if !defined(NOPORTDOCS)
@@ -16,15 +16,15 @@ DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
 
 MAINTAINER=	brett@peloton.runet.edu
 
-LIB_DEPENDS=    Xpm.4:${PORTSDIR}/graphics/xpm \
-		gnome.3:${PORTSDIR}/x11/gnomelibs \
-		intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=    gnome.3:${PORTSDIR}/x11/gnomelibs
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 DOCVERSION=	1.2.0
 USE_X_PREFIX=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
+		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}" \
 		CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
@@ -33,9 +33,8 @@ MAN1=	gnp.1
 
 .if !defined(NOPORTDOCS)
 post-extract:
-		${MV} ${WRKSRC}/docs ${WRKSRC}/docs.old
-		${CP} -R ${WRKDIR}/${PORTNAME}-help-${DOCVERSION}/docs \
-			${WRKSRC}/docs
+	@${MV} ${WRKSRC}/docs ${WRKSRC}/docs.old
+	@${CP} -R ${WRKDIR}/${PORTNAME}-help-${DOCVERSION}/docs ${WRKSRC}/docs
 .endif
 
 .include <bsd.port.mk>
diff --git a/editors/gnotepad+/distinfo b/editors/gnotepad+/distinfo
index e1d5533da490..cf6f2778947b 100644
--- a/editors/gnotepad+/distinfo
+++ b/editors/gnotepad+/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnotepad+-1.2.1.tar.gz) = 3448a7b3b391768be07ead4843ae9c73
+MD5 (gnotepad+-1.3.0.tar.gz) = 9c57caac58613ba449f3c0165627dbc9
 MD5 (gnotepad+-help-1.2.0.tar.gz) = 1d624118056c2c0e4ba8c45f9ab9bbee
diff --git a/editors/gnotepad+/files/patch-aa b/editors/gnotepad+/files/patch-aa
new file mode 100644
index 000000000000..c807f58847d6
--- /dev/null
+++ b/editors/gnotepad+/files/patch-aa
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Wed May 10 11:11:34 2000
++++ Makefile.in	Wed May 17 10:18:42 2000
+@@ -97,7 +97,7 @@
+ 
+ CLEANFILES = *~ .deps/*
+ 
+-Applicationsdir = $(datadir)/gnome/apps/Applications
++Applicationsdir = $(datadir)/apps/Applications
+ 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
new file mode 100644
index 000000000000..6566ba43564b
--- /dev/null
+++ b/editors/gnotepad+/files/patch-ab
@@ -0,0 +1,11 @@
+--- 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 a250e52ec8cb..3358dad85dea 100644
--- a/editors/gnotepad+/pkg-plist
+++ b/editors/gnotepad+/pkg-plist
@@ -1,6 +1,96 @@
 bin/gnp
 share/gnome/apps/Applications/gnotepad+.desktop
 share/gnome/apps/Applications/gnotepad+.spec
+share/gnome/gnotepad+/gnotepad+.glade
+share/gnome/gnotepad+/xpm/colsel.xpm
+share/gnome/gnotepad+/xpm/filesel.xpm
+share/gnome/gnotepad+/xpm/gnp48x48.xpm
+share/gnome/gnotepad+/xpm/tb_big.xpm
+share/gnome/gnotepad+/xpm/tb_blank.xpm
+share/gnome/gnotepad+/xpm/tb_bold.xpm
+share/gnome/gnotepad+/xpm/tb_cancel.xpm
+share/gnome/gnotepad+/xpm/tb_centjust.xpm
+share/gnome/gnotepad+/xpm/tb_comment.xpm
+share/gnome/gnotepad+/xpm/tb_copy.xpm
+share/gnome/gnotepad+/xpm/tb_cut.xpm
+share/gnome/gnotepad+/xpm/tb_edit.xpm
+share/gnome/gnotepad+/xpm/tb_emphasis.xpm
+share/gnome/gnotepad+/xpm/tb_exit.xpm
+share/gnome/gnotepad+/xpm/tb_find.xpm
+share/gnome/gnotepad+/xpm/tb_find_next.xpm
+share/gnome/gnotepad+/xpm/tb_fontm1.xpm
+share/gnome/gnotepad+/xpm/tb_fontp1.xpm
+share/gnome/gnotepad+/xpm/tb_form.xpm
+share/gnome/gnotepad+/xpm/tb_formoption.xpm
+share/gnome/gnotepad+/xpm/tb_formselect.xpm
+share/gnome/gnotepad+/xpm/tb_frame.xpm
+share/gnome/gnotepad+/xpm/tb_frame2.xpm
+share/gnome/gnotepad+/xpm/tb_framebase.xpm
+share/gnome/gnotepad+/xpm/tb_frameno.xpm
+share/gnome/gnotepad+/xpm/tb_frameset.xpm
+share/gnome/gnotepad+/xpm/tb_frameset2.xpm
+share/gnome/gnotepad+/xpm/tb_framewiz.xpm
+share/gnome/gnotepad+/xpm/tb_h1.xpm
+share/gnome/gnotepad+/xpm/tb_h2.xpm
+share/gnome/gnotepad+/xpm/tb_h3.xpm
+share/gnome/gnotepad+/xpm/tb_h4.xpm
+share/gnome/gnotepad+/xpm/tb_h5.xpm
+share/gnome/gnotepad+/xpm/tb_h6.xpm
+share/gnome/gnotepad+/xpm/tb_help.xpm
+share/gnome/gnotepad+/xpm/tb_image.xpm
+share/gnome/gnotepad+/xpm/tb_inputbutton.xpm
+share/gnome/gnotepad+/xpm/tb_inputcheckbox.xpm
+share/gnome/gnotepad+/xpm/tb_inputimage.xpm
+share/gnome/gnotepad+/xpm/tb_inputpass.xpm
+share/gnome/gnotepad+/xpm/tb_inputradio.xpm
+share/gnome/gnotepad+/xpm/tb_inputreset.xpm
+share/gnome/gnotepad+/xpm/tb_inputsubmit.xpm
+share/gnome/gnotepad+/xpm/tb_inputtext.xpm
+share/gnome/gnotepad+/xpm/tb_inputtextarea.xpm
+share/gnome/gnotepad+/xpm/tb_italic.xpm
+share/gnome/gnotepad+/xpm/tb_leftjust.xpm
+share/gnome/gnotepad+/xpm/tb_linebreak.xpm
+share/gnome/gnotepad+/xpm/tb_link.xpm
+share/gnome/gnotepad+/xpm/tb_listdd.xpm
+share/gnome/gnotepad+/xpm/tb_listdl.xpm
+share/gnome/gnotepad+/xpm/tb_listdt.xpm
+share/gnome/gnotepad+/xpm/tb_listitem.xpm
+share/gnome/gnotepad+/xpm/tb_menu.xpm
+share/gnome/gnotepad+/xpm/tb_new.xpm
+share/gnome/gnotepad+/xpm/tb_open.xpm
+share/gnome/gnotepad+/xpm/tb_ordered.xpm
+share/gnome/gnotepad+/xpm/tb_paragraph.xpm
+share/gnome/gnotepad+/xpm/tb_paste.xpm
+share/gnome/gnotepad+/xpm/tb_pre.xpm
+share/gnome/gnotepad+/xpm/tb_prefs.xpm
+share/gnome/gnotepad+/xpm/tb_print.xpm
+share/gnome/gnotepad+/xpm/tb_redo.xpm
+share/gnome/gnotepad+/xpm/tb_replace.xpm
+share/gnome/gnotepad+/xpm/tb_rightjust.xpm
+share/gnome/gnotepad+/xpm/tb_save.xpm
+share/gnome/gnotepad+/xpm/tb_separator.xpm
+share/gnome/gnotepad+/xpm/tb_small.xpm
+share/gnome/gnotepad+/xpm/tb_strikeout.xpm
+share/gnome/gnotepad+/xpm/tb_strong.xpm
+share/gnome/gnotepad+/xpm/tb_subscript.xpm
+share/gnome/gnotepad+/xpm/tb_superscript.xpm
+share/gnome/gnotepad+/xpm/tb_table.xpm
+share/gnome/gnotepad+/xpm/tb_table2.xpm
+share/gnome/gnotepad+/xpm/tb_tablewiz.xpm
+share/gnome/gnotepad+/xpm/tb_target.xpm
+share/gnome/gnotepad+/xpm/tb_td.xpm
+share/gnome/gnotepad+/xpm/tb_td2.xpm
+share/gnome/gnotepad+/xpm/tb_th.xpm
+share/gnome/gnotepad+/xpm/tb_th2.xpm
+share/gnome/gnotepad+/xpm/tb_title.xpm
+share/gnome/gnotepad+/xpm/tb_tr.xpm
+share/gnome/gnotepad+/xpm/tb_tr2.xpm
+share/gnome/gnotepad+/xpm/tb_typewriter.xpm
+share/gnome/gnotepad+/xpm/tb_underline.xpm
+share/gnome/gnotepad+/xpm/tb_undo.xpm
+share/gnome/gnotepad+/xpm/tb_unordered.xpm
+share/gnome/gnotepad+/xpm/tb_winclose.xpm
+share/gnome/gnotepad+/xpm/tb_winnew.xpm
 share/gnome/help/gnotepad+/C/closedialog.png
 share/gnome/help/gnotepad+/C/doclist.png
 share/gnome/help/gnotepad+/C/doctabs.png
@@ -15,12 +105,12 @@ 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.html
 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
@@ -46,99 +136,10 @@ 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
-share/gnotepad+/xpm/colsel.xpm
-share/gnotepad+/xpm/filesel.xpm
-share/gnotepad+/xpm/gnp48x48.xpm
-share/gnotepad+/xpm/tb_big.xpm
-share/gnotepad+/xpm/tb_blank.xpm
-share/gnotepad+/xpm/tb_bold.xpm
-share/gnotepad+/xpm/tb_cancel.xpm
-share/gnotepad+/xpm/tb_centjust.xpm
-share/gnotepad+/xpm/tb_comment.xpm
-share/gnotepad+/xpm/tb_copy.xpm
-share/gnotepad+/xpm/tb_cut.xpm
-share/gnotepad+/xpm/tb_edit.xpm
-share/gnotepad+/xpm/tb_emphasis.xpm
-share/gnotepad+/xpm/tb_exit.xpm
-share/gnotepad+/xpm/tb_find.xpm
-share/gnotepad+/xpm/tb_find_next.xpm
-share/gnotepad+/xpm/tb_fontm1.xpm
-share/gnotepad+/xpm/tb_fontp1.xpm
-share/gnotepad+/xpm/tb_form.xpm
-share/gnotepad+/xpm/tb_formoption.xpm
-share/gnotepad+/xpm/tb_formselect.xpm
-share/gnotepad+/xpm/tb_frame.xpm
-share/gnotepad+/xpm/tb_frame2.xpm
-share/gnotepad+/xpm/tb_framebase.xpm
-share/gnotepad+/xpm/tb_frameno.xpm
-share/gnotepad+/xpm/tb_frameset.xpm
-share/gnotepad+/xpm/tb_frameset2.xpm
-share/gnotepad+/xpm/tb_framewiz.xpm
-share/gnotepad+/xpm/tb_h1.xpm
-share/gnotepad+/xpm/tb_h2.xpm
-share/gnotepad+/xpm/tb_h3.xpm
-share/gnotepad+/xpm/tb_h4.xpm
-share/gnotepad+/xpm/tb_h5.xpm
-share/gnotepad+/xpm/tb_h6.xpm
-share/gnotepad+/xpm/tb_help.xpm
-share/gnotepad+/xpm/tb_image.xpm
-share/gnotepad+/xpm/tb_inputbutton.xpm
-share/gnotepad+/xpm/tb_inputcheckbox.xpm
-share/gnotepad+/xpm/tb_inputimage.xpm
-share/gnotepad+/xpm/tb_inputpass.xpm
-share/gnotepad+/xpm/tb_inputradio.xpm
-share/gnotepad+/xpm/tb_inputreset.xpm
-share/gnotepad+/xpm/tb_inputsubmit.xpm
-share/gnotepad+/xpm/tb_inputtext.xpm
-share/gnotepad+/xpm/tb_inputtextarea.xpm
-share/gnotepad+/xpm/tb_italic.xpm
-share/gnotepad+/xpm/tb_leftjust.xpm
-share/gnotepad+/xpm/tb_linebreak.xpm
-share/gnotepad+/xpm/tb_link.xpm
-share/gnotepad+/xpm/tb_listdd.xpm
-share/gnotepad+/xpm/tb_listdl.xpm
-share/gnotepad+/xpm/tb_listdt.xpm
-share/gnotepad+/xpm/tb_listitem.xpm
-share/gnotepad+/xpm/tb_menu.xpm
-share/gnotepad+/xpm/tb_new.xpm
-share/gnotepad+/xpm/tb_open.xpm
-share/gnotepad+/xpm/tb_ordered.xpm
-share/gnotepad+/xpm/tb_paragraph.xpm
-share/gnotepad+/xpm/tb_paste.xpm
-share/gnotepad+/xpm/tb_pre.xpm
-share/gnotepad+/xpm/tb_prefs.xpm
-share/gnotepad+/xpm/tb_print.xpm
-share/gnotepad+/xpm/tb_redo.xpm
-share/gnotepad+/xpm/tb_replace.xpm
-share/gnotepad+/xpm/tb_rightjust.xpm
-share/gnotepad+/xpm/tb_save.xpm
-share/gnotepad+/xpm/tb_separator.xpm
-share/gnotepad+/xpm/tb_small.xpm
-share/gnotepad+/xpm/tb_strikeout.xpm
-share/gnotepad+/xpm/tb_strong.xpm
-share/gnotepad+/xpm/tb_subscript.xpm
-share/gnotepad+/xpm/tb_superscript.xpm
-share/gnotepad+/xpm/tb_table.xpm
-share/gnotepad+/xpm/tb_table2.xpm
-share/gnotepad+/xpm/tb_tablewiz.xpm
-share/gnotepad+/xpm/tb_target.xpm
-share/gnotepad+/xpm/tb_td.xpm
-share/gnotepad+/xpm/tb_td2.xpm
-share/gnotepad+/xpm/tb_th.xpm
-share/gnotepad+/xpm/tb_th2.xpm
-share/gnotepad+/xpm/tb_title.xpm
-share/gnotepad+/xpm/tb_tr.xpm
-share/gnotepad+/xpm/tb_tr2.xpm
-share/gnotepad+/xpm/tb_typewriter.xpm
-share/gnotepad+/xpm/tb_underline.xpm
-share/gnotepad+/xpm/tb_undo.xpm
-share/gnotepad+/xpm/tb_unordered.xpm
-share/gnotepad+/xpm/tb_winclose.xpm
-share/gnotepad+/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 share/gnotepad+/xpm
-@dirrm share/gnotepad+
 @dirrm share/gnome/help/gnotepad+/C
 @dirrm share/gnome/help/gnotepad+
+@dirrm share/gnome/gnotepad+/xpm
+@dirrm share/gnome/gnotepad+