Update to 2.11.2.

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

8 files changed, 96 insertions, 12 deletions

diff --git a/x11-toolkits/py-gnome-desktop/Makefile b/x11-toolkits/py-gnome-desktop/Makefile
index 6afdd19e6..d2976de1b 100644
--- a/x11-toolkits/py-gnome-desktop/Makefile
+++ b/x11-toolkits/py-gnome-desktop/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnome
-PORTVERSION=	2.11.0
+PORTVERSION=	2.11.2
 CATEGORIES=	x11-toolkits python gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-python-extras/${PORTVERSION:C/..$//}
@@ -58,6 +58,11 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 
 EG_SRC_DIR=	${WRKSRC}/examples
 EG_DST_DIR=	${PREFIX}/share/examples/py-gnome
+.if !defined(NOPORTDOCS)
+DOCSDIR=	${PREFIX}/share/doc/py-gnome-extras
+.else
+DOCSDIR=	${WRKSRC}/share/doc/py-gnome-extras
+.endif
 
 .include <bsd.port.pre.mk>
 
@@ -73,6 +78,8 @@ post-patch:
 		s|$$MOZILLA-gtkmozembed|$$MOZILLA-gtkmozembed${HEADERS_SUFX}|g ; \
 		s|$$MOZILLA-xpcom|$$MOZILLA-xpcom${HEADERS_SUFX}|g' \
 		${WRKSRC}/configure
+	@${FIND} ${WRKSRC}/docs -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \
+		-e 's|^HTML_DIR =.*|HTML_DIR = ${DOCSDIR}|g'
 
 .if !defined(NOPORTDOCS)
 post-install:
diff --git a/x11-toolkits/py-gnome-desktop/distinfo b/x11-toolkits/py-gnome-desktop/distinfo
index 5e55b1606..ccaf2db86 100644
--- a/x11-toolkits/py-gnome-desktop/distinfo
+++ b/x11-toolkits/py-gnome-desktop/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-python-extras-2.11.0.tar.bz2) = e5424d8dbbbed1f281aa4d9ac4200702
-SIZE (gnome2/gnome-python-extras-2.11.0.tar.bz2) = 360746
+MD5 (gnome2/gnome-python-extras-2.11.2.tar.bz2) = e57ef132930d89ec7df7751d80207eb4
+SIZE (gnome2/gnome-python-extras-2.11.2.tar.bz2) = 418740
diff --git a/x11-toolkits/py-gnome-desktop/files/patch-gtop_gtop.c b/x11-toolkits/py-gnome-desktop/files/patch-gtop_gtop.c
index 98e0b4ff8..05db58a4c 100644
--- a/x11-toolkits/py-gnome-desktop/files/patch-gtop_gtop.c
+++ b/x11-toolkits/py-gnome-desktop/files/patch-gtop_gtop.c
@@ -1,6 +1,6 @@
---- gtop/gtop.c.orig	Fri Jan 28 14:09:00 2005
-+++ gtop/gtop.c	Fri Jan 28 14:09:18 2005
-@@ -43,6 +43,7 @@
+--- gtop/gtop.c.orig	Wed May 18 00:54:59 2005
++++ gtop/gtop.c	Wed May 18 00:54:12 2005
+@@ -44,6 +44,7 @@
  
  #include <sys/types.h>
  #include <sys/socket.h>
@@ -8,3 +8,13 @@
  #include <arpa/inet.h>
  
  
+@@ -1316,8 +1317,8 @@ build_siglist(void)
+ 
+ 	for(i = 0; i < len; ++i)
+ 	{
+-		p = &glibtop_sys_siglist[i];
+ 		PyObject* d;
++		p = &glibtop_sys_siglist[i];
+ 
+ 		d = PyDict_New();
+ 		my_dict_add_and_decref(d, "number", PyI_L(p->number));
diff --git a/x11-toolkits/py-gnome-desktop/pkg-plist b/x11-toolkits/py-gnome-desktop/pkg-plist
index d58990eac..445cbbe56 100644
--- a/x11-toolkits/py-gnome-desktop/pkg-plist
+++ b/x11-toolkits/py-gnome-desktop/pkg-plist
@@ -27,6 +27,26 @@ include/pygda-1.2/pygdavalue_conversions.h
 %%PYTHON_SITELIBDIR%%/gtk-2.0/wnck.so
 libdata/pkgconfig/gnome-python-extras-2.0.pc
 libdata/pkgconfig/pygda-1.2.pc
+%%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/class-gtkmozembed.html
+%%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/gtkmozembed-class-reference.html
+%%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/index.html
+%%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/pygtkmozembed.devhelp
+%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourcebuffer.html
+%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourcelanguage.html
+%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourcelanguagesmanager.html
+%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourcemarker.html
+%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourcestylescheme.html
+%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourcetag.html
+%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourcetagstyle.html
+%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourcetagtable.html
+%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourceview.html
+%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/gtksourcesview-class-reference.html
+%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/index.html
+%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/pygtksourceview.devhelp
+%%PORTDOCS%%%%DOCSDIR%%/pygtkspell/class-gtkspell.html
+%%PORTDOCS%%%%DOCSDIR%%/pygtkspell/gtkspell-class-reference.html
+%%PORTDOCS%%%%DOCSDIR%%/pygtkspell/index.html
+%%PORTDOCS%%%%DOCSDIR%%/pygtkspell/pygtkspell.devhelp
 %%PORTDOCS%%share/examples/py-gnome/applet/GNOME_PythonAppletSample.server
 %%PORTDOCS%%share/examples/py-gnome/applet/README
 %%PORTDOCS%%share/examples/py-gnome/applet/applet.py
@@ -52,6 +72,7 @@ libdata/pkgconfig/pygda-1.2.pc
 %%PORTDOCS%%share/examples/py-gnome/gnomeprint/test-print.py
 %%PORTDOCS%%share/examples/py-gnome/gtkhtml2/simple-browser.py
 %%PORTDOCS%%share/examples/py-gnome/gtksourceview/test-widget.py
+%%PORTDOCS%%share/examples/py-gnome/gtkspell/gtkspell.py
 %%PORTDOCS%%share/examples/py-gnome/gtkspell/test.py
 %%PORTDOCS%%share/examples/py-gnome/nautilusburn/blank_disc.py
 %%PORTDOCS%%share/examples/py-gnome/nautilusburn/drive_selection.py
@@ -75,6 +96,10 @@ share/pygtk/2.0/defs/wnck.defs
 %%PORTDOCS%%@dirrm share/examples/py-gnome/egg/recent
 %%PORTDOCS%%@dirrm share/examples/py-gnome/egg
 %%PORTDOCS%%@dirrm share/examples/py-gnome/applet
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/pygtkspell
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/pygtksourceview
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/pygtkmozembed
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/totem
 @dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint
 @dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/egg
diff --git a/x11-toolkits/py-gnome-extras/Makefile b/x11-toolkits/py-gnome-extras/Makefile
index 6afdd19e6..d2976de1b 100644
--- a/x11-toolkits/py-gnome-extras/Makefile
+++ b/x11-toolkits/py-gnome-extras/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnome
-PORTVERSION=	2.11.0
+PORTVERSION=	2.11.2
 CATEGORIES=	x11-toolkits python gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-python-extras/${PORTVERSION:C/..$//}
@@ -58,6 +58,11 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 
 EG_SRC_DIR=	${WRKSRC}/examples
 EG_DST_DIR=	${PREFIX}/share/examples/py-gnome
+.if !defined(NOPORTDOCS)
+DOCSDIR=	${PREFIX}/share/doc/py-gnome-extras
+.else
+DOCSDIR=	${WRKSRC}/share/doc/py-gnome-extras
+.endif
 
 .include <bsd.port.pre.mk>
 
@@ -73,6 +78,8 @@ post-patch:
 		s|$$MOZILLA-gtkmozembed|$$MOZILLA-gtkmozembed${HEADERS_SUFX}|g ; \
 		s|$$MOZILLA-xpcom|$$MOZILLA-xpcom${HEADERS_SUFX}|g' \
 		${WRKSRC}/configure
+	@${FIND} ${WRKSRC}/docs -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \
+		-e 's|^HTML_DIR =.*|HTML_DIR = ${DOCSDIR}|g'
 
 .if !defined(NOPORTDOCS)
 post-install:
diff --git a/x11-toolkits/py-gnome-extras/distinfo b/x11-toolkits/py-gnome-extras/distinfo
index 5e55b1606..ccaf2db86 100644
--- a/x11-toolkits/py-gnome-extras/distinfo
+++ b/x11-toolkits/py-gnome-extras/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-python-extras-2.11.0.tar.bz2) = e5424d8dbbbed1f281aa4d9ac4200702
-SIZE (gnome2/gnome-python-extras-2.11.0.tar.bz2) = 360746
+MD5 (gnome2/gnome-python-extras-2.11.2.tar.bz2) = e57ef132930d89ec7df7751d80207eb4
+SIZE (gnome2/gnome-python-extras-2.11.2.tar.bz2) = 418740
diff --git a/x11-toolkits/py-gnome-extras/files/patch-gtop_gtop.c b/x11-toolkits/py-gnome-extras/files/patch-gtop_gtop.c
index 98e0b4ff8..05db58a4c 100644
--- a/x11-toolkits/py-gnome-extras/files/patch-gtop_gtop.c
+++ b/x11-toolkits/py-gnome-extras/files/patch-gtop_gtop.c
@@ -1,6 +1,6 @@
---- gtop/gtop.c.orig	Fri Jan 28 14:09:00 2005
-+++ gtop/gtop.c	Fri Jan 28 14:09:18 2005
-@@ -43,6 +43,7 @@
+--- gtop/gtop.c.orig	Wed May 18 00:54:59 2005
++++ gtop/gtop.c	Wed May 18 00:54:12 2005
+@@ -44,6 +44,7 @@
  
  #include <sys/types.h>
  #include <sys/socket.h>
@@ -8,3 +8,13 @@
  #include <arpa/inet.h>
  
  
+@@ -1316,8 +1317,8 @@ build_siglist(void)
+ 
+ 	for(i = 0; i < len; ++i)
+ 	{
+-		p = &glibtop_sys_siglist[i];
+ 		PyObject* d;
++		p = &glibtop_sys_siglist[i];
+ 
+ 		d = PyDict_New();
+ 		my_dict_add_and_decref(d, "number", PyI_L(p->number));
diff --git a/x11-toolkits/py-gnome-extras/pkg-plist b/x11-toolkits/py-gnome-extras/pkg-plist
index d58990eac..445cbbe56 100644
--- a/x11-toolkits/py-gnome-extras/pkg-plist
+++ b/x11-toolkits/py-gnome-extras/pkg-plist
@@ -27,6 +27,26 @@ include/pygda-1.2/pygdavalue_conversions.h
 %%PYTHON_SITELIBDIR%%/gtk-2.0/wnck.so
 libdata/pkgconfig/gnome-python-extras-2.0.pc
 libdata/pkgconfig/pygda-1.2.pc
+%%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/class-gtkmozembed.html
+%%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/gtkmozembed-class-reference.html
+%%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/index.html
+%%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/pygtkmozembed.devhelp
+%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourcebuffer.html
+%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourcelanguage.html
+%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourcelanguagesmanager.html
+%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourcemarker.html
+%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourcestylescheme.html
+%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourcetag.html
+%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourcetagstyle.html
+%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourcetagtable.html
+%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourceview.html
+%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/gtksourcesview-class-reference.html
+%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/index.html
+%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/pygtksourceview.devhelp
+%%PORTDOCS%%%%DOCSDIR%%/pygtkspell/class-gtkspell.html
+%%PORTDOCS%%%%DOCSDIR%%/pygtkspell/gtkspell-class-reference.html
+%%PORTDOCS%%%%DOCSDIR%%/pygtkspell/index.html
+%%PORTDOCS%%%%DOCSDIR%%/pygtkspell/pygtkspell.devhelp
 %%PORTDOCS%%share/examples/py-gnome/applet/GNOME_PythonAppletSample.server
 %%PORTDOCS%%share/examples/py-gnome/applet/README
 %%PORTDOCS%%share/examples/py-gnome/applet/applet.py
@@ -52,6 +72,7 @@ libdata/pkgconfig/pygda-1.2.pc
 %%PORTDOCS%%share/examples/py-gnome/gnomeprint/test-print.py
 %%PORTDOCS%%share/examples/py-gnome/gtkhtml2/simple-browser.py
 %%PORTDOCS%%share/examples/py-gnome/gtksourceview/test-widget.py
+%%PORTDOCS%%share/examples/py-gnome/gtkspell/gtkspell.py
 %%PORTDOCS%%share/examples/py-gnome/gtkspell/test.py
 %%PORTDOCS%%share/examples/py-gnome/nautilusburn/blank_disc.py
 %%PORTDOCS%%share/examples/py-gnome/nautilusburn/drive_selection.py
@@ -75,6 +96,10 @@ share/pygtk/2.0/defs/wnck.defs
 %%PORTDOCS%%@dirrm share/examples/py-gnome/egg/recent
 %%PORTDOCS%%@dirrm share/examples/py-gnome/egg
 %%PORTDOCS%%@dirrm share/examples/py-gnome/applet
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/pygtkspell
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/pygtksourceview
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/pygtkmozembed
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/totem
 @dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint
 @dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/egg