As with gedit, optionalize Python support.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6399 df743ca5-7f9a-e211-a948-0013205c9059

3 files changed, 38 insertions, 19 deletions

diff --git a/editors/gedit-plugins/Makefile b/editors/gedit-plugins/Makefile
index 2407daa96..96e22cdc3 100644
--- a/editors/gedit-plugins/Makefile
+++ b/editors/gedit-plugins/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/editors/gedit-plugins/Makefile,v 1.13 2006/06/11 19:11:10 marcus Exp $
 #
 
 PORTNAME=	gedit-plugins
 PORTVERSION=	2.15.3
+PORTREVISION=	1
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -22,14 +23,32 @@ RUN_DEPENDS=	gedit:${PORTSDIR}/editors/gedit \
 		gucharmap:${PORTSDIR}/deskutils/gucharmap
 
 USE_BZIP2=	yes
-USE_PYTHON=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME=	gnomehack gnomeprefix gnometarget intlhack pygnomedesktop
+USE_GNOME=	gnomehack gnomeprefix gnometarget intlhack
+WANT_GNOME=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 GCONF_SCHEMAS=	gedit-show-tabbar-plugin.schemas
 
-.include <bsd.port.mk>
+.if defined(PACKAGE_BUILDING)
+.undef WITHOUT_GNOME
+WITH_GNOME=	yes
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if ${HAVE_GNOME:Mpygnomedesktop}!="" && ${ARCH}!="sparc64"
+USE_PYTHON=	yes
+.include "${PORTSDIR}/Mk/bsd.python.mk"
+USE_GNOME+=	pygnomedesktop
+CONFIGURE_ARGS+=--enable-python
+PLIST_SUB+=	PYTHON=""
+.else
+CONFIGURE_ARGS+=--disable-python
+PLIST_SUB+=	PYTHON="@comment "
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/editors/gedit-plugins/files/patch-configure b/editors/gedit-plugins/files/patch-configure
index 5ce757d34..36d6a0198 100644
--- a/editors/gedit-plugins/files/patch-configure
+++ b/editors/gedit-plugins/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	Sun Jun 11 15:05:43 2006
-+++ configure	Sun Jun 11 15:06:33 2006
+--- configure.orig	Sun Jun 11 15:53:52 2006
++++ configure	Sun Jun 11 15:58:59 2006
 @@ -22866,7 +22866,7 @@ disabled_plugins=
  # ================================================================
  # Plugin specific checks
@@ -35,7 +35,7 @@
  	fi
  
 -	PLUGINS=$(echo "$PLUGINS" | sed "s/\(\W\|^\)$1\b//")
-+	PLUGINS=$(echo "$PLUGINS" | sed "s/[^[:alnum:]]$1[[:space:]]{1,}//" | sed "s/[^[:alnum:]]$1$//" | sed "s/^$1[[:space:]]{1,}//")
++	PLUGINS=$(echo "$PLUGINS" | sed "s/[^[:alnum:]]$1[[:space:]]\{1,\}/ /" | sed "s/[^[:alnum:]]$1$//" | sed "s/^$1[[:space:]]\{1,\}/ /")
  }
  
  # ================================================================
diff --git a/editors/gedit-plugins/pkg-plist b/editors/gedit-plugins/pkg-plist
index 517fccaf1..3930df932 100644
--- a/editors/gedit-plugins/pkg-plist
+++ b/editors/gedit-plugins/pkg-plist
@@ -1,18 +1,18 @@
 lib/gedit-2/plugins/charmap.gedit-plugin
-lib/gedit-2/plugins/colorpicker.gedit-plugin
-lib/gedit-2/plugins/colorpicker.py
-lib/gedit-2/plugins/colorpicker.pyc
-lib/gedit-2/plugins/colorpicker.pyo
-lib/gedit-2/plugins/joinlines.gedit-plugin
-lib/gedit-2/plugins/joinlines.py
-lib/gedit-2/plugins/joinlines.pyc
-lib/gedit-2/plugins/joinlines.pyo
+%%PYTHON%%lib/gedit-2/plugins/colorpicker.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/joinlines.gedit-plugin
+%%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/libcharmap.la
 lib/gedit-2/plugins/libcharmap.so
 lib/gedit-2/plugins/libshowtabbar.la
 lib/gedit-2/plugins/libshowtabbar.so
 lib/gedit-2/plugins/showtabbar.gedit-plugin
-lib/gedit-2/plugins/smartspaces.gedit-plugin
-lib/gedit-2/plugins/smartspaces.py
-lib/gedit-2/plugins/smartspaces.pyc
-lib/gedit-2/plugins/smartspaces.pyo
+%%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