5 files changed, 117 insertions, 26 deletions

diff --git a/editors/gnotepad+/Makefile b/editors/gnotepad+/Makefile
index df100a90f3f9..257fa25371da 100644
--- a/editors/gnotepad+/Makefile
+++ b/editors/gnotepad+/Makefile
@@ -1,25 +1,41 @@
 # New ports collection makefile for:	 gnotepad+
-# Date created:		08-March-1999
+# Date created:		08 March 1999
 # Whom:			brett@peloton.physics.montana.edu
 #
 # $FreeBSD$
 #
 
 PORTNAME=	gnotepad+
-PORTVERSION=	1.1.4
+PORTVERSION=	1.2.1
 CATEGORIES=	editors www
-MASTER_SITES=	http://ack.netpedia.net/gnp/
+MASTER_SITES=	http://download.sourceforge.net/gnotepad/
+.if !defined(NOPORTDOCS)
+DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
+		${PORTNAME}-help-${DOCVERSION}${EXTRACT_SUFX}
+.endif
 
 MAINTAINER=	brett@peloton.runet.edu
 
 LIB_DEPENDS=    Xpm.4:${PORTSDIR}/graphics/xpm \
-		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+		gnome.3:${PORTSDIR}/x11/gnomelibs \
+		intl.1:${PORTSDIR}/devel/gettext
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
+DOCVERSION=	1.2.0
+USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=  GTK_CONFIG="${GTK_CONFIG}"
+CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}" \
+		CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib"
 
 MAN1=	gnp.1
 
+.if !defined(NOPORTDOCS)
+post-extract:
+		${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 a86f18a22eaa..e1d5533da490 100644
--- a/editors/gnotepad+/distinfo
+++ b/editors/gnotepad+/distinfo
@@ -1 +1,2 @@
-MD5 (gnotepad+-1.1.4.tar.gz) = f4a3856991d1833c8654e50555636577
+MD5 (gnotepad+-1.2.1.tar.gz) = 3448a7b3b391768be07ead4843ae9c73
+MD5 (gnotepad+-help-1.2.0.tar.gz) = 1d624118056c2c0e4ba8c45f9ab9bbee
diff --git a/editors/gnotepad+/files/patch-ab b/editors/gnotepad+/files/patch-ab
deleted file mode 100644
index bd274f13b714..000000000000
--- a/editors/gnotepad+/files/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/file.c.~1~	Sat Mar  6 01:38:53 1999
-+++ src/file.c	Fri Apr 30 17:23:33 1999
-@@ -24,7 +24,6 @@
- #include <errno.h>
- #include <stdlib.h>
- #include <ctype.h>
--#include <utime.h>
- #include <string.h>
- #include <unistd.h>
- #include <fcntl.h>
-@@ -32,6 +31,7 @@
- #include <sys/file.h>
- #include <sys/types.h>
- #include <sys/file.h>
-+#include <utime.h>
- #include "main.h"
- #if defined(APP_GNP) && defined(USE_GTKXMHTML)
- #include <glib.h>
diff --git a/editors/gnotepad+/pkg-descr b/editors/gnotepad+/pkg-descr
index e4b74e952543..92a1a300ea16 100644
--- a/editors/gnotepad+/pkg-descr
+++ b/editors/gnotepad+/pkg-descr
@@ -1,4 +1,6 @@
-gnotepad+ is a simple GTK based text editor.  It also has built-in simple
+gnotepad+ is a simple Gnome based text editor.  It also has built-in simple
 HTML editing with previews directed to Netscape.  
 
 -brett@peloton.physics.montana.edu
+
+WWW: http://gnotepad.sourceforge.net
diff --git a/editors/gnotepad+/pkg-plist b/editors/gnotepad+/pkg-plist
index 63938ef7a245..a250e52ec8cb 100644
--- a/editors/gnotepad+/pkg-plist
+++ b/editors/gnotepad+/pkg-plist
@@ -1,5 +1,56 @@
 bin/gnp
+share/gnome/apps/Applications/gnotepad+.desktop
+share/gnome/apps/Applications/gnotepad+.spec
+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.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/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
+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
@@ -11,6 +62,18 @@ 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
@@ -19,16 +82,30 @@ 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
@@ -41,14 +118,27 @@ 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/gnome/apps/Applications/gnotepad+.desktop
+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+