From 9e54a7400932db970c7b43548745d65a2ddfe9d9 Mon Sep 17 00:00:00 2001 From: Joe Marcus Clarke Date: Tue, 11 Jul 2006 15:53:33 +0000 Subject: [PATCH] Update to 2.14.1. --- x11-toolkits/py-gnome-extras/Makefile | 6 +++--- x11-toolkits/py-gnome-extras/distinfo | 6 +++--- .../py-gnome-extras/files/patch-configure | 21 +++++++++++++------ x11-toolkits/py-gnome-extras/pkg-plist | 5 +++++ 4 files changed, 26 insertions(+), 12 deletions(-) diff --git a/x11-toolkits/py-gnome-extras/Makefile b/x11-toolkits/py-gnome-extras/Makefile index 52db3920c6cc..95ddc299b785 100644 --- a/x11-toolkits/py-gnome-extras/Makefile +++ b/x11-toolkits/py-gnome-extras/Makefile @@ -7,7 +7,7 @@ # PORTNAME= gnome -PORTVERSION= 2.14.0 +PORTVERSION= 2.14.1 CATEGORIES= x11-toolkits python gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-python-extras/${PORTVERSION:C/..$//} @@ -28,7 +28,7 @@ USE_GECKO= firefox mozilla seamonkey USE_BZIP2= yes USE_GMAKE= yes USE_PYTHON= yes -USE_GNOME= gnomehack libgtkhtml pygnome2 +USE_GNOME= gnomehack libgtkhtml pygnome2 libgda2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-gtkmozembed=${GECKO} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ @@ -43,7 +43,7 @@ DOCSDIR= ${WRKSRC}/share/doc/py-gnome-extras .endif .include -.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk" +.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk" post-patch: @${FIND} ${WRKSRC}/docs -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \ diff --git a/x11-toolkits/py-gnome-extras/distinfo b/x11-toolkits/py-gnome-extras/distinfo index aa67159b86a0..87724e57aafb 100644 --- a/x11-toolkits/py-gnome-extras/distinfo +++ b/x11-toolkits/py-gnome-extras/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-python-extras-2.14.0.tar.bz2) = e9390569e18a5e71da1ed9476fa750b3 -SHA256 (gnome2/gnome-python-extras-2.14.0.tar.bz2) = 72108b6327b1894cc302b423aa18c0aad14d066c3befad403c7247148745aef3 -SIZE (gnome2/gnome-python-extras-2.14.0.tar.bz2) = 347462 +MD5 (gnome2/gnome-python-extras-2.14.1.tar.bz2) = f6868ad32303adb13a25e99f682ffe80 +SHA256 (gnome2/gnome-python-extras-2.14.1.tar.bz2) = 86dc73c305580c88229b63a38c910ef9aa155a40fd353240a3668dbf607070c8 +SIZE (gnome2/gnome-python-extras-2.14.1.tar.bz2) = 351815 diff --git a/x11-toolkits/py-gnome-extras/files/patch-configure b/x11-toolkits/py-gnome-extras/files/patch-configure index 2151fdea25de..7d967a338cf8 100644 --- a/x11-toolkits/py-gnome-extras/files/patch-configure +++ b/x11-toolkits/py-gnome-extras/files/patch-configure @@ -1,10 +1,19 @@ ---- configure.orig Fri Nov 11 21:36:37 2005 -+++ configure Fri Nov 11 21:36:55 2005 -@@ -21713,6 +21713,7 @@ - case $mozpackage in +--- configure.orig Tue Jul 11 11:39:00 2006 ++++ configure Tue Jul 11 11:43:03 2006 +@@ -19275,7 +19275,7 @@ echo "${ECHO_T}$PYGTK_DEFSDIR" >&6 + + echo "$as_me:$LINENO: checking for gnome-python defs" >&5 + echo $ECHO_N "checking for gnome-python defs... $ECHO_C" >&6 +-PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir gnome-python-2.0` ++GNOME_PYTHON_DEFSDIR=`$PKG_CONFIG --variable=defsdir gnome-python-2.0` + + echo "$as_me:$LINENO: result: $GNOME_PYTHON_DEFSDIR" >&5 + echo "${ECHO_T}$GNOME_PYTHON_DEFSDIR" >&6 +@@ -20762,6 +20762,7 @@ case $mozpackage in + xulrunner) mozpackage_required_version=1.8 ;; firefox) mozpackage_required_version=1.0 ;; mozilla) mozpackage_required_version=1.2b ;; + seamonkey) mozpackage_required_version=1.2b ;; - *) { { echo "$as_me:$LINENO: error: --with-gtkmozembed argument must be either 'mozilla' or 'firefox'" >&5 - echo "$as_me: error: --with-gtkmozembed argument must be either 'mozilla' or 'firefox'" >&2;} + *) { { echo "$as_me:$LINENO: error: --with-gtkmozembed argument must be either 'mozilla', 'firefox', or 'xulrunner'" >&5 + echo "$as_me: error: --with-gtkmozembed argument must be either 'mozilla', 'firefox', or 'xulrunner'" >&2;} { (exit 1); exit 1; }; } diff --git a/x11-toolkits/py-gnome-extras/pkg-plist b/x11-toolkits/py-gnome-extras/pkg-plist index 3232c7de259a..a7ddb6cc83e9 100644 --- a/x11-toolkits/py-gnome-extras/pkg-plist +++ b/x11-toolkits/py-gnome-extras/pkg-plist @@ -1,3 +1,4 @@ +include/pygda-1.2/pygdavalue_conversions.h %%PYTHON_SITELIBDIR%%/gtk-2.0/egg/__init__.py %%PYTHON_SITELIBDIR%%/gtk-2.0/egg/__init__.pyc %%PYTHON_SITELIBDIR%%/gtk-2.0/egg/__init__.pyo @@ -5,6 +6,8 @@ %%PYTHON_SITELIBDIR%%/gtk-2.0/egg/recent.so %%PYTHON_SITELIBDIR%%/gtk-2.0/egg/trayicon.la %%PYTHON_SITELIBDIR%%/gtk-2.0/egg/trayicon.so +%%PYTHON_SITELIBDIR%%/gtk-2.0/gda.la +%%PYTHON_SITELIBDIR%%/gtk-2.0/gda.so %%PYTHON_SITELIBDIR%%/gtk-2.0/gdl.la %%PYTHON_SITELIBDIR%%/gtk-2.0/gdl.so %%PYTHON_SITELIBDIR%%/gtk-2.0/gksu/__init__.py @@ -21,6 +24,7 @@ %%PYTHON_SITELIBDIR%%/gtk-2.0/gtkspell.la %%PYTHON_SITELIBDIR%%/gtk-2.0/gtkspell.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 @@ -40,6 +44,7 @@ libdata/pkgconfig/gnome-python-extras-2.0.pc %%PORTDOCS%%share/examples/py-gnome/gtkhtml2/simple-browser.py %%PORTDOCS%%share/examples/py-gnome/gtkspell/gtkspell.py %%PORTDOCS%%share/examples/py-gnome/gtkspell/test.py +share/pygtk/2.0/defs/gda.defs share/pygtk/2.0/defs/gtkhtml2.defs share/pygtk/2.0/defs/gtkmozembed.defs share/pygtk/2.0/defs/trayicon.defs