Update to 0.7.0, with a new MASTER_SITE and bunch of new features

Remove lots of Makefile bogons, replacing them with lots of
patches (like other GNOME ports :) to put things in the right place.

5 files changed, 53 insertions, 67 deletions

diff --git a/editors/gedit2/Makefile b/editors/gedit2/Makefile
index 366d7207edce..7025272d0e2c 100644
--- a/editors/gedit2/Makefile
+++ b/editors/gedit2/Makefile
@@ -6,49 +6,27 @@
 #
 
 PORTNAME=	gedit
-PORTVERSION=	0.6.1
+PORTVERSION=	0.7.0
 CATEGORIES=	editors gnome
-MASTER_SITES=	http://gedit.pn.org/tar/
+MASTER_SITES=	http://download.sourceforge.net/gedit/
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	gnomeui.3:${PORTSDIR}/x11/gnomelibs
+LIB_DEPENDS=	gnomeui.3:${PORTSDIR}/x11/gnomelibs \
+		gnomeprint.7:${PORTSDIR}/print/gnomeprint
+
+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
-FETCH_BEFORE_ARGS=	-b
 USE_X_PREFIX=	yes
-GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+USE_LIBTOOL=	yes
+
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--with-gnome=${X11BASE} \
 		--datadir=${PREFIX}/share/gnome
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		GLIB_CONFIG="${LOCALBASE}/bin/glib12-config" \
-		GTK_CONFIG="${X11BASE}/bin/gtk12-config" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
 
 MAN1=		gedit.1
 
-pre-install:
-	@ touch ${WRKSRC}/po/da.gmo
-post-install:
-	@ ${MKDIR} ${PREFIX}/share/gnome/apps/Applications
-	@ ${MKDIR} ${PREFIX}/share/gnome/help/gedit
-	@ ${MKDIR} ${PREFIX}/share/gnome/help/gedit/C
-	@ ${MKDIR} ${PREFIX}/share/gnome/help/gedit/no
-	@ ${MV} ${PREFIX}/share/gnome/gnome/apps/Applications/gedit.desktop ${PREFIX}/share/gnome/apps/Applications
-	@ ${MV} ${PREFIX}/share/gnome/gnome/help/gedit/C/index.html ${PREFIX}/share/gnome/help/gedit/C
-	@ ${MV} ${PREFIX}/share/gnome/gnome/help/gedit/C/topic.dat ${PREFIX}/share/gnome/help/gedit/C
-	@ ${MV} ${PREFIX}/share/gnome/gnome/help/gedit/no/index.html ${PREFIX}/share/gnome/help/gedit/no
-	@ ${MV} ${PREFIX}/share/gnome/gnome/help/gedit/no/topic.dat ${PREFIX}/share/gnome/help/gedit/no
-	@ ${RMDIR} ${PREFIX}/share/gnome/gnome/apps/Applications
-	@ ${RMDIR} ${PREFIX}/share/gnome/gnome/apps
-	@ ${RMDIR} ${PREFIX}/share/gnome/gnome/help/gedit/C
-	@ ${RMDIR} ${PREFIX}/share/gnome/gnome/help/gedit/no
-	@ ${RMDIR} ${PREFIX}/share/gnome/gnome/help/gedit
-.if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${PREFIX}/share/doc/gedit
-.for file in AUTHORS COPYING ChangeLog FAQ INSTALL KNOWNBUGS README README.plugins THANKS TODO
-	@ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/gedit
-.endfor
-.endif
-
 .include <bsd.port.mk>
diff --git a/editors/gedit2/distinfo b/editors/gedit2/distinfo
index 0f28091f423c..0e1a3f810c68 100644
--- a/editors/gedit2/distinfo
+++ b/editors/gedit2/distinfo
@@ -1 +1 @@
-MD5 (gedit-0.6.1.tar.gz) = 8d7105ad9d2164cb69ca85b567589717
+MD5 (gedit-0.7.0.tar.gz) = b9327f8cb53c3b79eb110cd492cf16e8
diff --git a/editors/gedit2/files/patch-ai b/editors/gedit2/files/patch-ai
new file mode 100644
index 000000000000..e429c0495572
--- /dev/null
+++ b/editors/gedit2/files/patch-ai
@@ -0,0 +1,11 @@
+--- po/Makefile.in.in.orig	Tue Apr 18 14:25:43 2000
++++ po/Makefile.in.in	Wed Apr 19 19:06:53 2000
+@@ -19,7 +19,7 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ datadir = $(prefix)/@DATADIRNAME@
+-localedir = $(datadir)/locale
++localedir = $(prefix)/share/locale
+ gnulocaledir = $(prefix)/share/locale
+ gettextsrcdir = $(prefix)/share/gettext/po
+ subdir = po
diff --git a/editors/gedit2/pkg-descr b/editors/gedit2/pkg-descr
index fd391af0fa71..6016fb0dbcf7 100644
--- a/editors/gedit2/pkg-descr
+++ b/editors/gedit2/pkg-descr
@@ -5,12 +5,17 @@ It is being developed by Alex Roberts, Evan Lawrence and Chris Lahey
 This version is quite a neat text editor, it contains the following
 features:
 	* Opening/Saving/Creating of files;
+	* File Revert;
 	* Cut/Copy/Paste and Select All text;
+	* Complete integration with the GNOME Environment, including GnomeMDI;
 	* Search and Replace;
+	* Global search;	
 	* A complete preferences interface;
 	* Dynamically loading fonts;
 	* Splitscreen Mode;
 	* Printing support; 
-	* Configurable Plugins system.
+	* Configurable Plugins system;
+	* Configurable window sizing;
+	* Unlimited Undo/Redo.
 
-WWW: http://gedit.pn.org
+WWW: http://gedit.sourceforge.net/
diff --git a/editors/gedit2/pkg-plist b/editors/gedit2/pkg-plist
index 0817b7a7c419..c1f48c9ba3d9 100644
--- a/editors/gedit2/pkg-plist
+++ b/editors/gedit2/pkg-plist
@@ -1,49 +1,36 @@
 bin/gedit
-libexec/go/plugins/browse-plugin
-libexec/go/plugins/convert-plugin
-libexec/go/plugins/cvsdiff-plugin
-libexec/go/plugins/diff-plugin
-libexec/go/plugins/email-plugin
-libexec/go/plugins/encrypt-plugin
-libexec/go/plugins/hello-plugin
-libexec/go/plugins/httpview-plugin
-libexec/go/plugins/man-plugin
-libexec/go/plugins/openother-plugin
-libexec/go/plugins/prm-plugin
-libexec/go/plugins/reverse-plugin
-libexec/go/plugins/spell-plugin
-libexec/go/plugins/testselect-plugin
-libexec/go/plugins/time-plugin
-libexec/go/plugins/wordcount-plugin
-share/doc/gedit/AUTHORS
-share/doc/gedit/COPYING
-share/doc/gedit/ChangeLog
-share/doc/gedit/FAQ
-share/doc/gedit/INSTALL
-share/doc/gedit/KNOWNBUGS
-share/doc/gedit/README
-share/doc/gedit/README.plugins
-share/doc/gedit/THANKS
-share/doc/gedit/TODO
-share/gnome/geditrc
+lib/gedit/plugins/libdiff.so
+lib/gedit/plugins/libemail.so
+lib/gedit/plugins/libtime.so
 share/gnome/apps/Applications/gedit.desktop
+share/gnome/gedit/glade/about.glade
+share/gnome/gedit/glade/email.glade
+share/gnome/gedit/glade/find-line.glade
+share/gnome/gedit/glade/prefs.glade
+share/gnome/gedit/glade/replace.glade
+share/gnome/gedit/glade/search.glade
 share/gnome/help/gedit/C/index.html
 share/gnome/help/gedit/C/topic.dat
 share/gnome/help/gedit/no/index.html
 share/gnome/help/gedit/no/topic.dat
+share/gnome/help/gedit/uk/index.html
+share/gnome/help/gedit/uk/topic.dat
 share/gnome/mime-info/gedit.keys
-share/gnome/pixmaps/gnome-gedit.png
 share/gnome/pixmaps/gedit-logo.png
+share/gnome/pixmaps/gnome-gedit.png
 share/locale/cs/LC_MESSAGES/gedit.mo
 share/locale/da/LC_MESSAGES/gedit.mo
 share/locale/de/LC_MESSAGES/gedit.mo
+share/locale/el/LC_MESSAGES/gedit.mo
 share/locale/es/LC_MESSAGES/gedit.mo
 share/locale/fr/LC_MESSAGES/gedit.mo
 share/locale/ga/LC_MESSAGES/gedit.mo
 share/locale/gl/LC_MESSAGES/gedit.mo
+share/locale/hu/LC_MESSAGES/gedit.mo
 share/locale/it/LC_MESSAGES/gedit.mo
 share/locale/ja/LC_MESSAGES/gedit.mo
 share/locale/ko/LC_MESSAGES/gedit.mo
+share/locale/lt/LC_MESSAGES/gedit.mo
 share/locale/nl/LC_MESSAGES/gedit.mo
 share/locale/no/LC_MESSAGES/gedit.mo
 share/locale/pl/LC_MESSAGES/gedit.mo
@@ -51,11 +38,16 @@ share/locale/pt/LC_MESSAGES/gedit.mo
 share/locale/pt_BR/LC_MESSAGES/gedit.mo
 share/locale/ru/LC_MESSAGES/gedit.mo
 share/locale/sv/LC_MESSAGES/gedit.mo
+share/locale/tr/LC_MESSAGES/gedit.mo
 share/locale/uk/LC_MESSAGES/gedit.mo
 share/locale/wa/LC_MESSAGES/gedit.mo
+share/locale/zh_CN.GB2312/LC_MESSAGES/gedit.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/gedit.mo
-@dirrm include/gedit
-@dirrm share/doc/gedit
-@dirrm share/gnome/help/gedit/C
+@dirrm share/gnome/help/gedit/uk
 @dirrm share/gnome/help/gedit/no
+@dirrm share/gnome/help/gedit/C
 @dirrm share/gnome/help/gedit
+@dirrm share/gnome/gedit/glade
+@dirrm share/gnome/gedit
+@dirrm lib/gedit/plugins
+@dirrm lib/gedit