7 files changed, 68 insertions, 27 deletions

diff --git a/editors/gedit-plugins/Makefile b/editors/gedit-plugins/Makefile
index 467dbbd372fc..2d9fd231f367 100644
--- a/editors/gedit-plugins/Makefile
+++ b/editors/gedit-plugins/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/editors/gedit-plugins/Makefile,v 1.18 2006/09/09 02:54:39 ahze Exp $
+#   $MCom: ports/editors/gedit-plugins/Makefile,v 1.21 2007/02/20 21:09:47 marcus Exp $
 #
 
 PORTNAME=	gedit-plugins
-PORTVERSION=	2.16.0
-PORTREVISION=	1
+PORTVERSION=	2.17.2
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -46,6 +45,8 @@ WITH_GNOME=	yes
 USE_PYTHON=	yes
 .include "${PORTSDIR}/Mk/bsd.python.mk"
 USE_GNOME+=	pygnomedesktop
+BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/gtk-2.0/vtemodule.so:${PORTSDIR}/x11-toolkits/py-vte
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/gtk-2.0/vtemodule.so:${PORTSDIR}/x11-toolkits/py-vte
 CONFIGURE_ARGS+=--enable-python
 PLIST_SUB+=	PYTHON=""
 .else
diff --git a/editors/gedit-plugins/distinfo b/editors/gedit-plugins/distinfo
index e44698576c22..c845dee15a00 100644
--- a/editors/gedit-plugins/distinfo
+++ b/editors/gedit-plugins/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gedit-plugins-2.16.0.tar.bz2) = db67c3c53f81809460232639f3bfef64
-SHA256 (gnome2/gedit-plugins-2.16.0.tar.bz2) = be92336004be2bff03b3e03311d74b65bb32a63f83494a226d738a628fb09733
-SIZE (gnome2/gedit-plugins-2.16.0.tar.bz2) = 573389
+MD5 (gnome2/gedit-plugins-2.17.2.tar.bz2) = b8c0f762e1cc306c807a4937c88050f7
+SHA256 (gnome2/gedit-plugins-2.17.2.tar.bz2) = 324c7286d00e23675c1cf218c7d1dfb0729931789caa45c4a7df5a52f2f20e55
+SIZE (gnome2/gedit-plugins-2.17.2.tar.bz2) = 559728
diff --git a/editors/gedit-plugins/pkg-plist b/editors/gedit-plugins/pkg-plist
index 09fda262f5c9..1657e72d5610 100644
--- a/editors/gedit-plugins/pkg-plist
+++ b/editors/gedit-plugins/pkg-plist
@@ -22,11 +22,26 @@ lib/gedit-2/plugins/libcharmap.la
 lib/gedit-2/plugins/libcharmap.so
 lib/gedit-2/plugins/libshowtabbar.la
 lib/gedit-2/plugins/libshowtabbar.so
+%%PYTHON%%lib/gedit-2/plugins/sessionsaver.gedit-plugin
+%%PYTHON%%lib/gedit-2/plugins/sessionsaver/__init__.py
+%%PYTHON%%lib/gedit-2/plugins/sessionsaver/__init__.pyc
+%%PYTHON%%lib/gedit-2/plugins/sessionsaver/__init__.pyo
+%%PYTHON%%lib/gedit-2/plugins/sessionsaver/dialogs.py
+%%PYTHON%%lib/gedit-2/plugins/sessionsaver/dialogs.pyc
+%%PYTHON%%lib/gedit-2/plugins/sessionsaver/dialogs.pyo
+%%PYTHON%%lib/gedit-2/plugins/sessionsaver/sessionsaver.glade
+%%PYTHON%%lib/gedit-2/plugins/sessionsaver/store.py
+%%PYTHON%%lib/gedit-2/plugins/sessionsaver/store.pyc
+%%PYTHON%%lib/gedit-2/plugins/sessionsaver/store.pyo
 lib/gedit-2/plugins/showtabbar.gedit-plugin
 %%PYTHON%%lib/gedit-2/plugins/smartspaces.gedit-plugin
 %%PYTHON%%lib/gedit-2/plugins/smartspaces.py
 %%PYTHON%%lib/gedit-2/plugins/smartspaces.pyc
 %%PYTHON%%lib/gedit-2/plugins/smartspaces.pyo
+%%PYTHON%%lib/gedit-2/plugins/terminal.gedit-plugin
+%%PYTHON%%lib/gedit-2/plugins/terminal.py
+%%PYTHON%%lib/gedit-2/plugins/terminal.pyc
+%%PYTHON%%lib/gedit-2/plugins/terminal.pyo
 share/locale/ar/LC_MESSAGES/gedit-plugins.mo
 share/locale/az/LC_MESSAGES/gedit-plugins.mo
 share/locale/be/LC_MESSAGES/gedit-plugins.mo
@@ -35,6 +50,7 @@ share/locale/ca/LC_MESSAGES/gedit-plugins.mo
 share/locale/cs/LC_MESSAGES/gedit-plugins.mo
 share/locale/da/LC_MESSAGES/gedit-plugins.mo
 share/locale/de/LC_MESSAGES/gedit-plugins.mo
+share/locale/dz/LC_MESSAGES/gedit-plugins.mo
 share/locale/el/LC_MESSAGES/gedit-plugins.mo
 share/locale/en_CA/LC_MESSAGES/gedit-plugins.mo
 share/locale/en_GB/LC_MESSAGES/gedit-plugins.mo
@@ -87,6 +103,7 @@ share/locale/wa/LC_MESSAGES/gedit-plugins.mo
 share/locale/zh_CN/LC_MESSAGES/gedit-plugins.mo
 share/locale/zh_HK/LC_MESSAGES/gedit-plugins.mo
 share/locale/zh_TW/LC_MESSAGES/gedit-plugins.mo
+%%PYTHON%%@dirrm lib/gedit-2/plugins/sessionsaver
 @dirrmtry share/locale/zh_TW/LC_MESSAGES
 @dirrmtry share/locale/zh_TW
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -123,6 +140,8 @@ share/locale/zh_TW/LC_MESSAGES/gedit-plugins.mo
 @dirrmtry share/locale/fi
 @dirrmtry share/locale/el/LC_MESSAGES
 @dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
 @dirrmtry share/locale/cs/LC_MESSAGES
 @dirrmtry share/locale/cs
 @dirrmtry share/locale/ca/LC_MESSAGES
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 4a8113aa487d..cdd79479537a 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/editors/gedit/Makefile,v 1.7 2006/10/30 18:26:49 marcus Exp $
+#   $MCom: ports/editors/gedit/Makefile,v 1.58 2007/03/11 17:00:31 marcus Exp $
 #
 
 PORTNAME=	gedit
-PORTVERSION=	2.16.2
+PORTVERSION=	2.18.0
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -16,7 +16,9 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A small but powerful text editor for GNOME 2 Desktop Environment
 
-LIB_DEPENDS=	pspell.16:${PORTSDIR}/textproc/aspell
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
+LIB_DEPENDS=	enchant.1:${PORTSDIR}/textproc/enchant
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
diff --git a/editors/gedit/distinfo b/editors/gedit/distinfo
index 264c3881e336..e1f1edc850f7 100644
--- a/editors/gedit/distinfo
+++ b/editors/gedit/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gedit-2.16.2.tar.bz2) = 9ed4fb2891d07c022b487723d1c72161
-SHA256 (gnome2/gedit-2.16.2.tar.bz2) = 8c5c3d5319d060b0db15c30c48503fde85341fa0f1aa848e99c1f0b825c20b4e
-SIZE (gnome2/gedit-2.16.2.tar.bz2) = 2851971
+MD5 (gnome2/gedit-2.18.0.tar.bz2) = faf35c2a934aff2a37a58f56c9f11e15
+SHA256 (gnome2/gedit-2.18.0.tar.bz2) = a163ed74b4446d5d0177494b92f678300bb3f12eb5fe9f876d541bc94f838e09
+SIZE (gnome2/gedit-2.18.0.tar.bz2) = 3145247
diff --git a/editors/gedit/files/patch-plugins_externaltools_data_Makefile.in b/editors/gedit/files/patch-plugins_externaltools_data_Makefile.in
new file mode 100644
index 000000000000..aa069fd241ca
--- /dev/null
+++ b/editors/gedit/files/patch-plugins_externaltools_data_Makefile.in
@@ -0,0 +1,11 @@
+--- plugins/externaltools/data/Makefile.in.orig	Thu Jan 11 00:53:33 2007
++++ plugins/externaltools/data/Makefile.in	Thu Jan 11 00:53:41 2007
+@@ -471,7 +471,7 @@
+ # (.desktop), which happens to be translated using intltool.
+ $(tools_SCRIPTS): %: %.tool.in %.desktop $(TOOL_MERGE)
+ 	perl $(TOOL_MERGE) -o $@ $< $(word 2,$^)
+-	chmod --reference=$< $@
++	chmod 0755 $@
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/editors/gedit/pkg-plist b/editors/gedit/pkg-plist
index 24fe603ae408..64efd4571cf9 100644
--- a/editors/gedit/pkg-plist
+++ b/editors/gedit/pkg-plist
@@ -23,6 +23,7 @@ include/gedit-%%VERSION%%/gedit/gedit-tab.h
 include/gedit-%%VERSION%%/gedit/gedit-utils.h
 include/gedit-%%VERSION%%/gedit/gedit-view.h
 include/gedit-%%VERSION%%/gedit/gedit-window.h
+lib/gedit-2/gedit-bugreport.sh
 lib/gedit-2/plugins/changecase.gedit-plugin
 lib/gedit-2/plugins/docinfo.gedit-plugin
 %%PYTHON%%lib/gedit-2/plugins/externaltools.gedit-plugin
@@ -38,6 +39,9 @@ lib/gedit-2/plugins/docinfo.gedit-plugin
 %%PYTHON%%lib/gedit-2/plugins/externaltools/functions.py
 %%PYTHON%%lib/gedit-2/plugins/externaltools/functions.pyc
 %%PYTHON%%lib/gedit-2/plugins/externaltools/functions.pyo
+%%PYTHON%%lib/gedit-2/plugins/externaltools/library.py
+%%PYTHON%%lib/gedit-2/plugins/externaltools/library.pyc
+%%PYTHON%%lib/gedit-2/plugins/externaltools/library.pyo
 %%PYTHON%%lib/gedit-2/plugins/externaltools/manager.py
 %%PYTHON%%lib/gedit-2/plugins/externaltools/manager.pyc
 %%PYTHON%%lib/gedit-2/plugins/externaltools/manager.pyo
@@ -55,6 +59,8 @@ lib/gedit-2/plugins/libfilebrowser.la
 lib/gedit-2/plugins/libfilebrowser.so
 lib/gedit-2/plugins/libindent.la
 lib/gedit-2/plugins/libindent.so
+lib/gedit-2/plugins/libmodelines.la
+lib/gedit-2/plugins/libmodelines.so
 lib/gedit-2/plugins/libsample.la
 lib/gedit-2/plugins/libsample.so
 lib/gedit-2/plugins/libsort.la
@@ -65,11 +71,14 @@ lib/gedit-2/plugins/libtaglist.la
 lib/gedit-2/plugins/libtaglist.so
 lib/gedit-2/plugins/libtime.la
 lib/gedit-2/plugins/libtime.so
-%%PYTHON%%lib/gedit-2/plugins/modelines.gedit-plugin
-%%PYTHON%%lib/gedit-2/plugins/modelines.py
-%%PYTHON%%lib/gedit-2/plugins/modelines.pyc
-%%PYTHON%%lib/gedit-2/plugins/modelines.pyo
+lib/gedit-2/plugins/modelines.gedit-plugin
 %%PYTHON%%lib/gedit-2/plugins/pythonconsole.gedit-plugin
+%%PYTHON%%lib/gedit-2/plugins/pythonconsole/__init__.py
+%%PYTHON%%lib/gedit-2/plugins/pythonconsole/__init__.pyc
+%%PYTHON%%lib/gedit-2/plugins/pythonconsole/__init__.pyo
+%%PYTHON%%lib/gedit-2/plugins/pythonconsole/console.py
+%%PYTHON%%lib/gedit-2/plugins/pythonconsole/console.pyc
+%%PYTHON%%lib/gedit-2/plugins/pythonconsole/console.pyo
 lib/gedit-2/plugins/sample.gedit-plugin
 %%PYTHON%%lib/gedit-2/plugins/snippets.gedit-plugin
 %%PYTHON%%lib/gedit-2/plugins/snippets/ElementTree.py
@@ -105,12 +114,6 @@ lib/gedit-2/plugins/sample.gedit-plugin
 %%PYTHON%%lib/gedit-2/plugins/snippets/snippets.glade
 lib/gedit-2/plugins/sort.gedit-plugin
 lib/gedit-2/plugins/spell.gedit-plugin
-%%PYTHON%%lib/gedit-2/plugins/pythonconsole/__init__.py
-%%PYTHON%%lib/gedit-2/plugins/pythonconsole/__init__.pyc
-%%PYTHON%%lib/gedit-2/plugins/pythonconsole/__init__.pyo
-%%PYTHON%%lib/gedit-2/plugins/pythonconsole/console.py
-%%PYTHON%%lib/gedit-2/plugins/pythonconsole/console.pyc
-%%PYTHON%%lib/gedit-2/plugins/pythonconsole/console.pyo
 lib/gedit-2/plugins/taglist.gedit-plugin
 lib/gedit-2/plugins/time.gedit-plugin
 libdata/pkgconfig/gedit-%%VERSION%%.pc
@@ -160,11 +163,11 @@ share/gnome/gedit-2/glade/spell-checker.glade2
 share/gnome/gedit-2/glade/time.glade2
 share/gnome/gedit-2/icons/gedit-plugin.png
 share/gnome/gedit-2/logo/gedit-logo.png
-%%PYTHON%%share/gnome/gedit-2/plugins/externaltools/stock-tools.xml
 share/gnome/gedit-2/plugins/filebrowser/gedit-file-browser-widget-ui.xml
 %%PYTHON%%share/gnome/gedit-2/plugins/snippets/c++.xml
 %%PYTHON%%share/gnome/gedit-2/plugins/snippets/c.xml
 %%PYTHON%%share/gnome/gedit-2/plugins/snippets/css.xml
+%%PYTHON%%share/gnome/gedit-2/plugins/snippets/docbook.xml
 %%PYTHON%%share/gnome/gedit-2/plugins/snippets/global.xml
 %%PYTHON%%share/gnome/gedit-2/plugins/snippets/haskell.xml
 %%PYTHON%%share/gnome/gedit-2/plugins/snippets/html.xml
@@ -179,9 +182,14 @@ share/gnome/gedit-2/plugins/filebrowser/gedit-file-browser-widget-ui.xml
 %%PYTHON%%share/gnome/gedit-2/plugins/snippets/sh.xml
 %%PYTHON%%share/gnome/gedit-2/plugins/snippets/tcl.xml
 %%PYTHON%%share/gnome/gedit-2/plugins/snippets/xml.xml
+%%PYTHON%%share/gnome/gedit-2/plugins/tools/build
+%%PYTHON%%share/gnome/gedit-2/plugins/tools/open-terminal-here
+%%PYTHON%%share/gnome/gedit-2/plugins/tools/remove-trailing-spaces
+%%PYTHON%%share/gnome/gedit-2/plugins/tools/run-command
 share/gnome/gedit-2/taglist/HTML.tags
 share/gnome/gedit-2/taglist/Latex.tags
 share/gnome/gedit-2/taglist/XSLT.tags
+share/gnome/gedit-2/taglist/XUL.tags
 share/gnome/gedit-2/ui/gedit-ui.xml
 share/gnome/help/gedit/C/figures/gedit_format_bold.png
 share/gnome/help/gedit/C/figures/gedit_format_italic.png
@@ -419,17 +427,17 @@ share/locale/zh_TW/LC_MESSAGES/gedit.mo
 @dirrm share/gnome/help/gedit
 @dirrm share/gnome/gedit-2/ui
 @dirrm share/gnome/gedit-2/taglist
-@dirrm share/gnome/gedit-2/logo
-@dirrm share/gnome/gedit-2/icons
+%%PYTHON%%@dirrm share/gnome/gedit-2/plugins/tools
 %%PYTHON%%@dirrm share/gnome/gedit-2/plugins/snippets
 @dirrm share/gnome/gedit-2/plugins/filebrowser
-%%PYTHON%%@dirrm share/gnome/gedit-2/plugins/externaltools
 @dirrm share/gnome/gedit-2/plugins
+@dirrm share/gnome/gedit-2/logo
+@dirrm share/gnome/gedit-2/icons
 @dirrm share/gnome/gedit-2/glade
 @dirrm share/gnome/gedit-2
 @dirrm %%DOCSDIR%%
-%%PYTHON%%@dirrm lib/gedit-2/plugins/pythonconsole
 %%PYTHON%%@dirrm lib/gedit-2/plugins/snippets
+%%PYTHON%%@dirrm lib/gedit-2/plugins/pythonconsole
 %%PYTHON%%@dirrm lib/gedit-2/plugins/externaltools
 @dirrm lib/gedit-2/plugins
 @dirrm lib/gedit-2