Update to 3.6.5.

Re-enable python support.

4 files changed, 43 insertions, 25 deletions

diff --git a/devel/glade3/Makefile b/devel/glade3/Makefile
index adafadfe8d26..0f3f785f5c60 100644
--- a/devel/glade3/Makefile
+++ b/devel/glade3/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	glade3
-PORTVERSION=	3.6.4
+PORTVERSION=	3.6.5
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -40,16 +40,16 @@ PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-gnome
 CONFIGURE_ARGS+=--disable-gnome
 .endif
 
-#.if ${HAVE_GNOME:Mpygtk2}!=""
-#USE_PYTHON=	yes
-#.include "${PORTSDIR}/Mk/bsd.python.mk"
-#USE_GNOME+=	pygtk2
-#PLIST_SUB+=	PYTHON:=""
-#CONFIGURE_ARGS+=--enable-python
-#.else
+.if ${HAVE_GNOME:Mpygtk2}!=""
+USE_PYTHON=	yes
+.include "${PORTSDIR}/Mk/bsd.python.mk"
+USE_GNOME+=	pygtk2
+PLIST_SUB+=	PYTHON:=""
+CONFIGURE_ARGS+=--enable-python
+.else
 CONFIGURE_ARGS+=--disable-python
 PLIST_SUB+=	PYTHON:="@comment "
-#.endif
+.endif
 
 post-install:
 	${MKDIR} ${PREFIX}/lib/glade3/bindings
diff --git a/devel/glade3/distinfo b/devel/glade3/distinfo
index 2863c8154eeb..1acb1b56e1d5 100644
--- a/devel/glade3/distinfo
+++ b/devel/glade3/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glade3-3.6.4.tar.bz2) = 519bad0148cadb4a31a058c75aa128d8
-SHA256 (gnome2/glade3-3.6.4.tar.bz2) = 489b920c89a566a18b15765ff81e325da64b35f2dfc63e650c9c68555ae8e6df
-SIZE (gnome2/glade3-3.6.4.tar.bz2) = 2239237
+MD5 (gnome2/glade3-3.6.5.tar.bz2) = 4d5d5ad0b9dc37d6e63e263e393c5105
+SHA256 (gnome2/glade3-3.6.5.tar.bz2) = 0ad7cac05a86a46e9e320a927d3eb054ebb067b5b1a1369296e090205b38650c
+SIZE (gnome2/glade3-3.6.5.tar.bz2) = 2239630
diff --git a/devel/glade3/files/patch-configure b/devel/glade3/files/patch-configure
new file mode 100644
index 000000000000..1ba48665ba93
--- /dev/null
+++ b/devel/glade3/files/patch-configure
@@ -0,0 +1,15 @@
+--- configure.orig	2009-06-13 12:44:55.000000000 +0200
++++ configure	2009-06-13 12:45:11.000000000 +0200
+@@ -24755,10 +24755,10 @@
+ { echo "$as_me:$LINENO: checking for libraries required to embed python" >&5
+ echo $ECHO_N "checking for libraries required to embed python... $ECHO_C" >&6; }
+ py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
+-if test "x$PYTHON_LIBS" == x; then
++if test "x$PYTHON_LIBS" = x; then
+ 	PYTHON_LIBS="-L${py_prefix}/lib -lpython${PYTHON_VERSION}"
+ fi
+-if test "x$PYTHON_LIB_LOC" == x; then
++if test "x$PYTHON_LIB_LOC" = x; then
+ 	PYTHON_LIB_LOC="${py_prefix}/lib"
+ fi
+ 
diff --git a/devel/glade3/pkg-plist b/devel/glade3/pkg-plist
index 9216bbdafb19..e08b19ee6725 100644
--- a/devel/glade3/pkg-plist
+++ b/devel/glade3/pkg-plist
@@ -56,6 +56,9 @@ include/libgladeui-1.0/gladeui/glade.h
 %%GNOME:%%lib/glade3/modules/libgladegnome.a
 %%GNOME:%%lib/glade3/modules/libgladegnome.la
 %%GNOME:%%lib/glade3/modules/libgladegnome.so
+%%PYTHON:%%lib/glade3/modules/libgladepython.a
+%%PYTHON:%%lib/glade3/modules/libgladepython.la
+%%PYTHON:%%lib/glade3/modules/libgladepython.so
 lib/glade3/modules/libgladegtk.a
 lib/glade3/modules/libgladegtk.la
 lib/glade3/modules/libgladegtk.so
@@ -70,7 +73,7 @@ share/applications/glade-3.desktop
 %%DOCSDIR%%/GladeClipboard.html
 %%DOCSDIR%%/GladeClipboardView.html
 %%DOCSDIR%%/GladeCommand.html
-share/doc/gladeui/GladeDesignView.html
+%%DOCSDIR%%/GladeDesignView.html
 %%DOCSDIR%%/GladeEditor.html
 %%DOCSDIR%%/GladeEditorProperty.html
 %%DOCSDIR%%/GladeFixed.html
@@ -79,31 +82,31 @@ share/doc/gladeui/GladeDesignView.html
 %%DOCSDIR%%/GladePlaceholder.html
 %%DOCSDIR%%/GladeProject.html
 %%DOCSDIR%%/GladeWidget.html
-share/doc/gladeui/GladeWidgetAction.html
+%%DOCSDIR%%/GladeWidgetAction.html
 %%DOCSDIR%%/catalog.html
 %%DOCSDIR%%/catalogintro.html
 %%DOCSDIR%%/core.html
 %%DOCSDIR%%/dockables.html
+%%DOCSDIR%%/gladeui.devhelp
+%%DOCSDIR%%/gladeui.devhelp2
 %%DOCSDIR%%/gladeui-GladePropertyClass.html
 %%DOCSDIR%%/gladeui-GladeWidgetAdaptor.html
 %%DOCSDIR%%/gladeui-glade-parameter.html
 %%DOCSDIR%%/gladeui-glade-property.html
 %%DOCSDIR%%/gladeui-glade-signal-editor.html
 %%DOCSDIR%%/gladeui-glade-utils.html
-share/doc/gladeui/gladeui-glade-xml-utils.html
-share/doc/gladeui/gladeui.devhelp
-share/doc/gladeui/gladeui.devhelp2
-share/doc/gladeui/home.png
-share/doc/gladeui/index.html
-share/doc/gladeui/index.sgml
-share/doc/gladeui/ix01.html
-share/doc/gladeui/left.png
-share/doc/gladeui/right.png
-share/doc/gladeui/style.css
-share/doc/gladeui/up.png
+%%DOCSDIR%%/gladeui-glade-xml-utils.html
+%%DOCSDIR%%/home.png
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/ix01.html
+%%DOCSDIR%%/left.png
 %%DOCSDIR%%/misc.html
 %%DOCSDIR%%/properties.html
 %%DOCSDIR%%/pythonsupport.html
+%%DOCSDIR%%/right.png
+%%DOCSDIR%%/style.css
+%%DOCSDIR%%/up.png
 %%DOCSDIR%%/widgetclasses.html
 %%GNOME:%%%%DATADIR%%/catalogs/bonobo.xml
 %%GNOME:%%%%DATADIR%%/catalogs/bonobo.xml.in