3 files changed, 24 insertions, 13 deletions

diff --git a/editors/gedit-plugins/Makefile b/editors/gedit-plugins/Makefile
index 5581f112acbd..7dcb9f3caed5 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.33 2008/10/26 20:28:27 marcus Exp $
+#   $MCom: ports/editors/gedit-plugins/Makefile,v 1.36 2009/03/17 13:37:37 kwm Exp $
 #
 
 PORTNAME=	gedit-plugins
-PORTVERSION=	2.22.5
-PORTREVISION=	1
+PORTVERSION=	2.26.0
 CATEGORIES=	editors gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -33,6 +32,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 
 GCONF_SCHEMAS=	gedit-show-tabbar-plugin.schemas
 
+OPTIONS=	PYTHON "Build plugins that depend on python" off
+
 .if defined(PACKAGE_BUILDING)
 .undef WITHOUT_GNOME
 WITH_GNOME=	yes
@@ -40,7 +41,7 @@ WITH_GNOME=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${HAVE_GNOME:Mpygtksourceview}!="" && ${ARCH}!="sparc64"
+.if ${HAVE_GNOME:Mpygtksourceview}!="" && ${ARCH}!="sparc64" || defined(WITH_PYTHON)
 USE_PYTHON=	yes
 .include "${PORTSDIR}/Mk/bsd.python.mk"
 USE_GNOME+=	pygtksourceview
diff --git a/editors/gedit-plugins/distinfo b/editors/gedit-plugins/distinfo
index 875e28337cd6..89472e6585d6 100644
--- a/editors/gedit-plugins/distinfo
+++ b/editors/gedit-plugins/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gedit-plugins-2.22.5.tar.bz2) = c2104d56b7aa78e14395648f8e235306
-SHA256 (gnome2/gedit-plugins-2.22.5.tar.bz2) = 98cd453525bcb53e725f8e49d5fa387019331e7df2d37101519d177141fbced9
-SIZE (gnome2/gedit-plugins-2.22.5.tar.bz2) = 592942
+MD5 (gnome2/gedit-plugins-2.26.0.tar.bz2) = 9549182efbc98f7601b281fd217061ec
+SHA256 (gnome2/gedit-plugins-2.26.0.tar.bz2) = 548c1570195118d31eaf1ef96ddf39e80e5e29621540e4e6863b8ed1285a4d80
+SIZE (gnome2/gedit-plugins-2.26.0.tar.bz2) = 546291
diff --git a/editors/gedit-plugins/pkg-plist b/editors/gedit-plugins/pkg-plist
index 97d3b375a387..fac2fa52f349 100644
--- a/editors/gedit-plugins/pkg-plist
+++ b/editors/gedit-plugins/pkg-plist
@@ -1,3 +1,4 @@
+lib/gedit-2/plugins/bookmarks.gedit-plugin
 %%PYTHON%%lib/gedit-2/plugins/bracketcompletion.gedit-plugin
 %%PYTHON%%lib/gedit-2/plugins/bracketcompletion.py
 %%PYTHON%%lib/gedit-2/plugins/bracketcompletion.pyc
@@ -11,11 +12,7 @@ lib/gedit-2/plugins/charmap.gedit-plugin
 %%PYTHON%%lib/gedit-2/plugins/colorpicker.py
 %%PYTHON%%lib/gedit-2/plugins/colorpicker.pyc
 %%PYTHON%%lib/gedit-2/plugins/colorpicker.pyo
-%%PYTHON%%lib/gedit-2/plugins/drawspaces.gedit-plugin
-%%PYTHON%%lib/gedit-2/plugins/drawspaces.glade
-%%PYTHON%%lib/gedit-2/plugins/drawspaces.py
-%%PYTHON%%lib/gedit-2/plugins/drawspaces.pyc
-%%PYTHON%%lib/gedit-2/plugins/drawspaces.pyo
+lib/gedit-2/plugins/drawspaces.gedit-plugin
 lib/gedit-2/plugins/gpdefs.py
 lib/gedit-2/plugins/gpdefs.pyc
 lib/gedit-2/plugins/gpdefs.pyo
@@ -23,9 +20,15 @@ lib/gedit-2/plugins/gpdefs.pyo
 %%PYTHON%%lib/gedit-2/plugins/joinlines.py
 %%PYTHON%%lib/gedit-2/plugins/joinlines.pyc
 %%PYTHON%%lib/gedit-2/plugins/joinlines.pyo
+lib/gedit-2/plugins/libbookmarks.a
+lib/gedit-2/plugins/libbookmarks.la
+lib/gedit-2/plugins/libbookmarks.so
 lib/gedit-2/plugins/libcharmap.a
 lib/gedit-2/plugins/libcharmap.la
 lib/gedit-2/plugins/libcharmap.so
+lib/gedit-2/plugins/libdrawspaces.a
+lib/gedit-2/plugins/libdrawspaces.la
+lib/gedit-2/plugins/libdrawspaces.so
 lib/gedit-2/plugins/libshowtabbar.a
 lib/gedit-2/plugins/libshowtabbar.la
 lib/gedit-2/plugins/libshowtabbar.so
@@ -36,7 +39,6 @@ lib/gedit-2/plugins/libshowtabbar.so
 %%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
@@ -49,6 +51,9 @@ lib/gedit-2/plugins/showtabbar.gedit-plugin
 %%PYTHON%%lib/gedit-2/plugins/terminal.py
 %%PYTHON%%lib/gedit-2/plugins/terminal.pyc
 %%PYTHON%%lib/gedit-2/plugins/terminal.pyo
+share/gedit-2/plugins/bookmarks/bookmark.png
+share/gedit-2/plugins/drawspaces/drawspaces.ui
+%%PYTHON%%share/gedit-2/plugins/sessionsaver/sessionsaver.ui
 share/locale/ar/LC_MESSAGES/gedit-plugins.mo
 share/locale/az/LC_MESSAGES/gedit-plugins.mo
 share/locale/be/LC_MESSAGES/gedit-plugins.mo
@@ -113,6 +118,11 @@ 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
+@dirrm share/gedit-2/plugins/sessionsaver
+@dirrm share/gedit-2/plugins/drawspaces
+@dirrm share/gedit-2/plugins/bookmarks
+@dirrm share/gedit-2/plugins
+@dirrm share/gedit-2
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/rw/LC_MESSAGES