[80080] trunk/dports/gnome

3 Jul 2011

Revision: 80080
          http://trac.macports.org/changeset/80080
Author:   jeremyhu@macports.org
Date:     2011-07-03 16:49:45 -0700 (Sun, 03 Jul 2011)
Log Message:
-----------
gnome/*: Add variants to choose between python versions (2.5, 2.6, and 2.7)

Modified Paths:
--------------
    trunk/dports/gnome/alacarte/Portfile
    trunk/dports/gnome/at-spi/Portfile
    trunk/dports/gnome/eog/Portfile
    trunk/dports/gnome/gedit/Portfile
    trunk/dports/gnome/gnome-applets/Portfile
    trunk/dports/gnome/gnome-desktop/Portfile
    trunk/dports/gnome/gnome-games/Portfile
    trunk/dports/gnome/gnome-menus/Portfile
    trunk/dports/gnome/gnome-python-desktop/Portfile
    trunk/dports/gnome/gnumeric/Portfile
    trunk/dports/gnome/gramps/Portfile
    trunk/dports/gnome/gucharmap/Portfile
    trunk/dports/gnome/pessulus/Portfile
    trunk/dports/gnome/totem/Portfile

Modified: trunk/dports/gnome/alacarte/Portfile
===================================================================

--- trunk/dports/gnome/alacarte/Portfile	2011-07-03 23:49:21 UTC (rev 80079)
+++ trunk/dports/gnome/alacarte/Portfile	2011-07-03 23:49:45 UTC (rev 80080)
@@ -6,7 +6,7 @@
 name            alacarte
 version         0.13.2
 epoch           1
-revision        2
+revision        3
 set branch      [join [lrange [split ${version} .] 0 1] .]
 description     A simple freedesktop.org compliant menu editor for use with GNOME
 
@@ -28,14 +28,30 @@
 depends_build   port:pkgconfig \
                 port:intltool
 
-depends_lib     port:py26-gtk \
-                port:gnome-menus
+depends_lib     port:gnome-menus
 
 patchfiles      patch-Makefile.in.diff \
                 patch-configure.diff
 
-configure.python ${prefix}/bin/python2.6
+variant python25 conflicts python26 python27 description {Use python 2.5} {
+    configure.python          ${prefix}/bin/python2.5
+    depends_lib-append        port:py25-gtk
+}
 
+variant python26 conflicts python25 python27 description {Use python 2.6} {
+    configure.python          ${prefix}/bin/python2.6
+    depends_lib-append        port:py26-gtk
+}
+
+variant python27 conflicts python25 python26 description {Use python 2.7} {
+    configure.python          ${prefix}/bin/python2.7
+    depends_lib-append        port:py27-gtk
+}
+
+if {![variant_isset python25] && ![variant_isset python26]} {
+    default_variants +python27
+}
+
 post-destroot {
     file rename ${destroot}${prefix}/bin/alacarte.py ${destroot}${prefix}/bin/alacarte
 }

Modified: trunk/dports/gnome/at-spi/Portfile
===================================================================
--- trunk/dports/gnome/at-spi/Portfile	2011-07-03 23:49:21 UTC (rev 80079)
+++ trunk/dports/gnome/at-spi/Portfile	2011-07-03 23:49:45 UTC (rev 80080)
@@ -5,7 +5,7 @@
 
 name                at-spi
 version             1.30.1
-revision            1
+revision            2
 set branch          [join [lrange [split ${version} .] 0 1] .]
 description         Gnome Accesibility Technology Service
 long_description \
@@ -28,17 +28,12 @@
 depends_lib         port:atk \
                     port:gtk2 \
                     port:libbonobo \
-                    port:py26-gnome \
                     port:xorg-libXtst
 
 use_bzip2           yes
 
 patchfiles          patch-pyatspi-Makefile.in.diff
 
-post-patch          {
-                        reinplace "s|__MP_PYTHON_EXEC_DIR__|${prefix}//Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages|" ${worksrcpath}/pyatspi/Makefile.in
-                    }
-
 configure.args      --enable-static \
                     --disable-xevie \
                     --with-x \
@@ -46,8 +41,6 @@
                     --x-libraries=${prefix}/lib \
                     --disable-schemas-install
  
-configure.python    ${prefix}/bin/python2.6
-
 variant no_x11 {
    pre-fetch {
       return -code error "The +no_x11 (was +quartz) variant of ${name} does not work. See http://trac.macports.org/ticket/15013"
@@ -59,6 +52,34 @@
    depends_lib-delete      port:xorg-libXtst
 }
 
+variant python25 conflicts python26 python27 description {Use python 2.5} {
+    configure.python        ${prefix}/bin/python2.5
+    depends_lib-append      port:py25-gnome
+    post-patch {
+        reinplace "s|__MP_PYTHON_EXEC_DIR__|${prefix}//Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages|" ${worksrcpath}/pyatspi/Makefile.in
+    }
+}
+
+variant python26 conflicts python25 python27 description {Use python 2.6} {
+    configure.python        ${prefix}/bin/python2.6
+    depends_lib-append      port:py26-gnome
+    post-patch {
+        reinplace "s|__MP_PYTHON_EXEC_DIR__|${prefix}//Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages|" ${worksrcpath}/pyatspi/Makefile.in
+    }
+}
+
+variant python27 conflicts python25 python26 description {Use python 2.7} {
+    configure.python        ${prefix}/bin/python2.7
+    depends_lib-append      port:py27-gnome
+    post-patch {
+        reinplace "s|__MP_PYTHON_EXEC_DIR__|${prefix}//Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages|" ${worksrcpath}/pyatspi/Makefile.in
+    }
+}
+
+if {![variant_isset python25] && ![variant_isset python26]} {
+    default_variants +python27
+}
+
 post-activate {
    system "export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` && \
         gconftool-2 --makefile-install-rule ${prefix}/etc/gconf/schemas/*.schemas"

Modified: trunk/dports/gnome/eog/Portfile
===================================================================
--- trunk/dports/gnome/eog/Portfile	2011-07-03 23:49:21 UTC (rev 80079)
+++ trunk/dports/gnome/eog/Portfile	2011-07-03 23:49:45 UTC (rev 80080)
@@ -5,7 +5,7 @@
 
 name		eog
 version		2.30.2
-revision        3
+revision        4
 set branch	[join [lrange [split ${version} .] 0 1] .]
 description	An image viewing program.
 long_description        This is the Eye of Gnome, an image viewer program. \
@@ -32,8 +32,7 @@
                 port:shared-mime-info \
                 port:libexif \
                 port:lcms \
-                port:exempi \
-                port:py26-gtk
+                port:exempi
                
 use_bzip2 	yes
 
@@ -43,10 +42,31 @@
                 --disable-scrollkeeper \
                 --disable-schemas-install
 
-configure.python ${prefix}/bin/python2.6
-set python_framework ${frameworks_dir}/Python.framework/Versions/2.6
-configure.pkg_config_path ${python_framework}/lib/pkgconfig
+variant python25 conflicts python26 python27 description {Use python 2.5} {
+    configure.python          ${prefix}/bin/python2.5
+    depends_lib-append        port:py25-gtk
+    set python_framework      ${frameworks_dir}/Python.framework/Versions/2.5
+    configure.pkg_config_path ${python_framework}/lib/pkgconfig
+}
 
+variant python26 conflicts python25 python27 description {Use python 2.6} {
+    configure.python          ${prefix}/bin/python2.6
+    depends_lib-append        port:py26-gtk
+    set python_framework      ${frameworks_dir}/Python.framework/Versions/2.6
+    configure.pkg_config_path ${python_framework}/lib/pkgconfig
+}
+
+variant python27 conflicts python25 python26 description {Use python 2.7} {
+    configure.python          ${prefix}/bin/python2.7
+    depends_lib-append        port:py27-gtk
+    set python_framework      ${frameworks_dir}/Python.framework/Versions/2.7
+    configure.pkg_config_path ${python_framework}/lib/pkgconfig
+}
+
+if {![variant_isset python25] && ![variant_isset python26]} {
+    default_variants +python27
+}
+
 post-activate {
    system "scrollkeeper-update"
    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"

Modified: trunk/dports/gnome/gedit/Portfile
===================================================================
--- trunk/dports/gnome/gedit/Portfile	2011-07-03 23:49:21 UTC (rev 80079)
+++ trunk/dports/gnome/gedit/Portfile	2011-07-03 23:49:45 UTC (rev 80080)
@@ -5,7 +5,7 @@
 
 name            gedit
 version         2.30.4
-revision        2
+revision        3
 set branch      [join [lrange [split ${version} .] 0 1] .]
 description     GNOME editor.
 long_description \
@@ -25,7 +25,6 @@
                 port:gnome-doc-utils
 
 depends_lib     port:gconf \
-                port:py26-pygtksourceview \
                 port:iso-codes \
                 port:enchant \
                 port:xorg-libsm
@@ -40,14 +39,35 @@
                 --disable-gvfs-metadata \
                 --disable-updater
 
-configure.python ${prefix}/bin/python2.6
-set python_framework ${frameworks_dir}/Python.framework/Versions/2.6
-configure.pkg_config_path ${python_framework}/lib/pkgconfig
-
 variant no_x11 {
         depends_lib-delete  port:xorg-libsm
 }
 
+variant python25 conflicts python26 python27 description {Use python 2.5} {
+    configure.python          ${prefix}/bin/python2.5
+    depends_lib-append        port:py25-pygtksourceview
+    set python_framework      ${frameworks_dir}/Python.framework/Versions/2.5
+    configure.pkg_config_path ${python_framework}/lib/pkgconfig
+}
+
+variant python26 conflicts python25 python27 description {Use python 2.6} {
+    configure.python          ${prefix}/bin/python2.6
+    depends_lib-append        port:py26-pygtksourceview
+    set python_framework      ${frameworks_dir}/Python.framework/Versions/2.6
+    configure.pkg_config_path ${python_framework}/lib/pkgconfig
+}
+
+variant python27 conflicts python25 python26 description {Use python 2.7} {
+    configure.python          ${prefix}/bin/python2.7
+    depends_lib-append        port:py27-pygtksourceview
+    set python_framework      ${frameworks_dir}/Python.framework/Versions/2.7
+    configure.pkg_config_path ${python_framework}/lib/pkgconfig
+}
+
+if {![variant_isset python25] && ![variant_isset python26]} {
+    default_variants +python27
+}
+
 post-activate    {
         system "${prefix}/bin/scrollkeeper-update"
         system "export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` && \

Modified: trunk/dports/gnome/gnome-applets/Portfile
===================================================================
--- trunk/dports/gnome/gnome-applets/Portfile	2011-07-03 23:49:21 UTC (rev 80079)
+++ trunk/dports/gnome/gnome-applets/Portfile	2011-07-03 23:49:45 UTC (rev 80080)
@@ -5,7 +5,7 @@
 
 name            gnome-applets
 version         2.30.0
-revision        2
+revision        3
 set branch      [join [lrange [split ${version} .] 0 1] .]
 description     GNOME panel applets.
 long_description This package contains applets for use with the \
@@ -35,17 +35,37 @@
                 port:libnotify \
                 port:policykit-gnome \
                 port:gucharmap \
-                port:py26-gtk \
                 port:libxml2 \
                 port:libgweather \
                 port:gst-plugins-base
 
 use_bzip2 	yes
 
-configure.python  ${prefix}/bin/python2.6
-set python_framework ${frameworks_dir}/Python.framework/Versions/2.6
-configure.pkg_config_path ${python_framework}/lib/pkgconfig
+variant python25 conflicts python26 python27 description {Use python 2.5} {
+    configure.python          ${prefix}/bin/python2.5
+    depends_lib-append        port:py25-gtk
+    set python_framework      ${frameworks_dir}/Python.framework/Versions/2.5
+    configure.pkg_config_path ${python_framework}/lib/pkgconfig
+}
 
+variant python26 conflicts python25 python27 description {Use python 2.6} {
+    configure.python          ${prefix}/bin/python2.6
+    depends_lib-append        port:py26-gtk
+    set python_framework      ${frameworks_dir}/Python.framework/Versions/2.6
+    configure.pkg_config_path ${python_framework}/lib/pkgconfig
+}
+
+variant python27 conflicts python25 python26 description {Use python 2.7} {
+    configure.python          ${prefix}/bin/python2.7
+    depends_lib-append        port:py27-gtk
+    set python_framework      ${frameworks_dir}/Python.framework/Versions/2.7
+    configure.pkg_config_path ${python_framework}/lib/pkgconfig
+}
+
+if {![variant_isset python25] && ![variant_isset python26]} {
+    default_variants +python27
+}
+
 configure.args  --without-hal \
                 --enable-mixer-applet \
                 --disable-battstat \
@@ -58,7 +78,6 @@
 
 #
 # gnome-panel -> evolution-data-server -> nss is not universal
-#
 
 universal_variant no
 

Modified: trunk/dports/gnome/gnome-desktop/Portfile
===================================================================
--- trunk/dports/gnome/gnome-desktop/Portfile	2011-07-03 23:49:21 UTC (rev 80079)
+++ trunk/dports/gnome/gnome-desktop/Portfile	2011-07-03 23:49:45 UTC (rev 80080)
@@ -5,7 +5,7 @@
 
 name            gnome-desktop
 version         2.30.2
-revision        3
+revision        4
 set branch      [join [lrange [split ${version} .] 0 1] .]
 maintainers     devans openmaintainer
 categories      gnome
@@ -32,8 +32,7 @@
 
 depends_lib     port:gconf \
                 port:startup-notification \
-                port:xorg-libXrandr \
-                port:py26-gtk
+                port:xorg-libXrandr
 
 depends_run     port:gnome-themes
 
@@ -45,8 +44,25 @@
                 --x-libraries=${prefix}/lib \
                 --disable-scrollkeeper
 
-configure.python  ${prefix}/bin/python2.6
+variant python25 conflicts python26 python27 description {Use python 2.5} {
+    configure.python          ${prefix}/bin/python2.5
+    depends_lib-append        port:py25-gtk
+}
 
+variant python26 conflicts python25 python27 description {Use python 2.6} {
+    configure.python          ${prefix}/bin/python2.6
+    depends_lib-append        port:py26-gtk
+}
+
+variant python27 conflicts python25 python26 description {Use python 2.7} {
+    configure.python          ${prefix}/bin/python2.7
+    depends_lib-append        port:py27-gtk
+}
+
+if {![variant_isset python25] && ![variant_isset python26]} {
+    default_variants +python27
+}
+
 post-activate {
     system "${prefix}/bin/scrollkeeper-update"
 }

Modified: trunk/dports/gnome/gnome-games/Portfile
===================================================================
--- trunk/dports/gnome/gnome-games/Portfile	2011-07-03 23:49:21 UTC (rev 80079)
+++ trunk/dports/gnome/gnome-games/Portfile	2011-07-03 23:49:45 UTC (rev 80080)
@@ -5,7 +5,7 @@
 
 name		gnome-games
 version		2.30.2
-revision        1
+revision        2
 set branch  [join [lrange [split ${version} .] 0 1] .]
 description	Collection of small but addictive games for GNOME
 long_description    ${description}
@@ -27,7 +27,6 @@
 depends_lib     port:gconf \
                 port:librsvg \
                 port:clutter-gtk \
-                port:py26-gtk \
                 port:libcanberra \
                 port:xorg-libsm \
                 port:guile
@@ -36,10 +35,31 @@
 
 patchfiles      patch-configure.diff
 
-configure.python ${prefix}/bin/python2.6
-set python_prefix ${frameworks_dir}/Python.framework/Versions/2.6
-configure.pkg_config_path ${python_prefix}/lib/pkgconfig
+variant python25 conflicts python26 python27 description {Use python 2.5} {
+    configure.python          ${prefix}/bin/python2.5
+    depends_lib-append        port:py25-gtk
+    set python_framework      ${frameworks_dir}/Python.framework/Versions/2.5
+    configure.pkg_config_path ${python_framework}/lib/pkgconfig
+}
 
+variant python26 conflicts python25 python27 description {Use python 2.6} {
+    configure.python          ${prefix}/bin/python2.6
+    depends_lib-append        port:py26-gtk
+    set python_framework      ${frameworks_dir}/Python.framework/Versions/2.6
+    configure.pkg_config_path ${python_framework}/lib/pkgconfig
+}
+
+variant python27 conflicts python25 python26 description {Use python 2.7} {
+    configure.python          ${prefix}/bin/python2.7
+    depends_lib-append        port:py27-gtk
+    set python_framework      ${frameworks_dir}/Python.framework/Versions/2.7
+    configure.pkg_config_path ${python_framework}/lib/pkgconfig
+}
+
+if {![variant_isset python25] && ![variant_isset python26]} {
+    default_variants +python27
+}
+
 configure.args  --disable-scrollkeeper \
                 --disable-schemas-install \
                 --disable-silent-rules \

Modified: trunk/dports/gnome/gnome-menus/Portfile
===================================================================
--- trunk/dports/gnome/gnome-menus/Portfile	2011-07-03 23:49:21 UTC (rev 80079)
+++ trunk/dports/gnome/gnome-menus/Portfile	2011-07-03 23:49:45 UTC (rev 80080)
@@ -5,6 +5,7 @@
 
 name            gnome-menus
 version         2.30.5
+revision        1
 set branch      [join [lrange [split ${version} .] 0 1] .]
 maintainers     devans openmaintainer
 categories      gnome
@@ -24,8 +25,33 @@
 
 patchfiles      patch-configure.diff
 
+depends_build   port:pkgconfig \
+                port:intltool \
+                port:gnome-doc-utils
+
+depends_lib     path:lib/pkgconfig/glib-2.0.pc:glib2
+
+variant python25 conflicts python26 python27 description {Use python 2.5} {
+    configure.python          ${prefix}/bin/python2.5
+    depends_lib-append        port:py25-gtk
+}
+
+variant python26 conflicts python25 python27 description {Use python 2.6} {
+    configure.python          ${prefix}/bin/python2.6
+    depends_lib-append        port:py26-gtk
+}
+
+variant python27 conflicts python25 python26 description {Use python 2.7} {
+    configure.python          ${prefix}/bin/python2.7
+    depends_lib-append        port:py27-gtk
+}
+
+if {![variant_isset python25] && ![variant_isset python26]} {
+    default_variants +python27
+}
+
 post-patch {
-    reinplace "s|/usr/bin/env python|${prefix}/bin/python2.6|g" \
+    reinplace "s|/usr/bin/env python|${configure.python}|g" \
         ${worksrcpath}/simple-editor/gmenu-simple-editor.in \
         ${worksrcpath}/simple-editor/GMenuSimpleEditor/config.py.in \
         ${worksrcpath}/simple-editor/GMenuSimpleEditor/main.py \
@@ -34,15 +60,6 @@
         ${worksrcpath}/simple-editor/GMenuSimpleEditor/menutreemodel.py
 }
 
-depends_build   port:pkgconfig \
-                port:intltool \
-                port:gnome-doc-utils
-
-depends_lib     path:lib/pkgconfig/glib-2.0.pc:glib2 \
-                port:py26-gtk
-
-configure.python   ${prefix}/bin/python2.6
-
 configure.args  --enable-introspection=no \
                 --enable-python \
                 --disable-silent-rules

Modified: trunk/dports/gnome/gnome-python-desktop/Portfile
===================================================================
--- trunk/dports/gnome/gnome-python-desktop/Portfile	2011-07-03 23:49:21 UTC (rev 80079)
+++ trunk/dports/gnome/gnome-python-desktop/Portfile	2011-07-03 23:49:45 UTC (rev 80080)
@@ -5,7 +5,7 @@
 
 name            gnome-python-desktop
 version         2.30.2
-revision        1
+revision        2
 set branch      [join [lrange [split ${version} .] 0 1] .]
 categories      gnome python
 maintainers     devans openmaintainer
@@ -21,8 +21,7 @@
 
 use_bzip2       yes
 
-depends_lib	port:py26-gnome \
-                port:gtksourceview \
+depends_lib	port:gtksourceview \
                 port:libgtop \
                 port:gnome-media \
                 port:gnome-panel \
@@ -36,16 +35,85 @@
 configure.args 	--enable-metacity \
                 --disable-nautilusburn
 
-set python_prefix          ${frameworks_dir}/Python.framework/Versions/2.6
-
 configure.pre_args-delete  --prefix=${prefix}
-configure.pre_args-append  --prefix=${python_prefix}
-configure.args-append      --includedir=${python_prefix}/include/python2.6
 
-configure.python          ${prefix}/bin/python2.6
-configure.env             PATH=${python_prefix}/bin:$env(PATH)
-configure.pkg_config_path ${python_prefix}/lib/pkgconfig
+variant python25 conflicts python26 python27 description {Use python 2.5} {
+    set python_ver            2.5
 
+    configure.python          ${prefix}/bin/python${python_ver}
+    depends_lib-append        port:py25-gnome
+
+    set python_prefix         ${frameworks_dir}/Python.framework/Versions/${python_ver}
+    configure.pre_args-append --prefix=${python_prefix}
+    configure.args-append     --includedir=${python_prefix}/include/python${python_ver}
+    configure.python          ${prefix}/bin/python${python_ver}
+    configure.env             PATH=${python_prefix}/bin:$env(PATH)
+    configure.pkg_config_path ${python_prefix}/lib/pkgconfig
+
+    post-destroot {
+        set python_prefix ${frameworks_dir}/Python.framework/Versions/2.5
+        # devhelp requires gtk-doc directory name  and .devhelp file name (less the .devhelp) to match
+        foreach docname {pygnomeprint pygnomeprintui pygtksourceview} {
+            file rename ${destroot}${python_prefix}/share/gtk-doc/html/${docname}/${docname}.devhelp \
+                        ${destroot}${python_prefix}/share/gtk-doc/html/${docname}/${docname}25.devhelp 
+            ln -s ${python_prefix}/share/gtk-doc/html/${docname} ${destroot}${prefix}/share/gtk-doc/html/${docname}25
+        }
+    }
+}
+
+variant python26 conflicts python25 python27 description {Use python 2.6} {
+    set python_ver            2.6
+
+    configure.python          ${prefix}/bin/python${python_ver}
+    depends_lib-append        port:py26-gnome
+
+    set python_prefix         ${frameworks_dir}/Python.framework/Versions/${python_ver}
+    configure.pre_args-append --prefix=${python_prefix}
+    configure.args-append     --includedir=${python_prefix}/include/python${python_ver}
+    configure.python          ${prefix}/bin/python${python_ver}
+    configure.env             PATH=${python_prefix}/bin:$env(PATH)
+    configure.pkg_config_path ${python_prefix}/lib/pkgconfig
+
+    post-destroot {
+        set python_prefix ${frameworks_dir}/Python.framework/Versions/2.6
+        # devhelp requires gtk-doc directory name  and .devhelp file name (less the .devhelp) to match
+        foreach docname {pygnomeprint pygnomeprintui pygtksourceview} {
+            file rename ${destroot}${python_prefix}/share/gtk-doc/html/${docname}/${docname}.devhelp \
+                        ${destroot}${python_prefix}/share/gtk-doc/html/${docname}/${docname}26.devhelp 
+            ln -s ${python_prefix}/share/gtk-doc/html/${docname} ${destroot}${prefix}/share/gtk-doc/html/${docname}26
+        }
+    }
+}
+
+variant python27 conflicts python25 python26 description {Use python 2.7} {
+    set python_ver            2.7
+
+    configure.python          ${prefix}/bin/python${python_ver}
+    depends_lib-append        port:py27-gnome
+
+    set python_prefix         ${frameworks_dir}/Python.framework/Versions/${python_ver}
+    configure.pre_args-append --prefix=${python_prefix}
+    configure.args-append     --includedir=${python_prefix}/include/python${python_ver}
+    configure.python          ${prefix}/bin/python${python_ver}
+    configure.env             PATH=${python_prefix}/bin:$env(PATH)
+    configure.pkg_config_path ${python_prefix}/lib/pkgconfig
+
+    post-destroot {
+        set python_prefix ${frameworks_dir}/Python.framework/Versions/2.7
+        # devhelp requires gtk-doc directory name  and .devhelp file name (less the .devhelp) to match
+        foreach docname {pygnomeprint pygnomeprintui pygtksourceview} {
+            file rename ${destroot}${python_prefix}/share/gtk-doc/html/${docname}/${docname}.devhelp \
+                        ${destroot}${python_prefix}/share/gtk-doc/html/${docname}/${docname}27.devhelp 
+            ln -s ${python_prefix}/share/gtk-doc/html/${docname} ${destroot}${prefix}/share/gtk-doc/html/${docname}27
+        }
+    }
+}
+
+if {![variant_isset python25] && ![variant_isset python26]} {
+    default_variants +python27
+}
+
+
 platform darwin 9 {
     post-patch {
         reinplace "s| -export-symbols-regex.*||g" \
@@ -77,12 +145,6 @@
     xinstall -m 0644 -W ${worksrcpath} AUTHORS COPYING ChangeLog NEWS README \
         ${destroot}${docdir}
     xinstall -d ${destroot}${prefix}/share/gtk-doc/html
-# devhelp requires gtk-doc directory name  and .devhelp file name (less the .devhelp) to match
-    foreach docname {pygnomeprint pygnomeprintui pygtksourceview} {
-        file rename ${destroot}${python_prefix}/share/gtk-doc/html/${docname}/${docname}.devhelp \
-                    ${destroot}${python_prefix}/share/gtk-doc/html/${docname}/${docname}26.devhelp 
-        ln -s ${python_prefix}/share/gtk-doc/html/${docname} ${destroot}${prefix}/share/gtk-doc/html/${docname}26
-    }
 }
 
 livecheck.type  regex

Modified: trunk/dports/gnome/gnumeric/Portfile
===================================================================
--- trunk/dports/gnome/gnumeric/Portfile	2011-07-03 23:49:21 UTC (rev 80079)
+++ trunk/dports/gnome/gnumeric/Portfile	2011-07-03 23:49:45 UTC (rev 80080)
@@ -5,7 +5,7 @@
 
 name		gnumeric
 version		1.10.12
-revision        1
+revision        2
 set branch      [join [lrange [split ${version} .] 0 1] .]
 description	A spreadsheet with gnome support.
 long_description	${description}
@@ -24,19 +24,46 @@
 depends_build	port:gnome-doc-utils
 
 depends_lib	port:goffice \
-                port:libglade2 \
-                port:py26-gobject
+                port:libglade2
 
-
 configure.args  --disable-schemas-install \
                 --without-gda \
                 --without-paradox \
                 --without-psiconv
 
-configure.python ${prefix}/bin/python2.6
-set python_framework ${frameworks_dir}/Python.framework/Versions/2.6
-configure.pkg_config_path ${python_framework}/lib/pkgconfig
+variant python25 conflicts python26 python27 description {Use python 2.5} {
+    configure.python          ${prefix}/bin/python2.5
+    depends_lib-append        port:py25-gobject
+    set python_framework      ${frameworks_dir}/Python.framework/Versions/2.5
+    configure.pkg_config_path ${python_framework}/lib/pkgconfig
+}
 
+variant python26 conflicts python25 python27 description {Use python 2.6} {
+    configure.python          ${prefix}/bin/python2.6
+    depends_lib-append        port:py26-gobject
+    set python_framework      ${frameworks_dir}/Python.framework/Versions/2.6
+    configure.pkg_config_path ${python_framework}/lib/pkgconfig
+}
+
+variant python27 conflicts python25 python26 description {Use python 2.7} {
+    configure.python          ${prefix}/bin/python2.7
+    depends_lib-append        port:py27-gobject
+    set python_framework      ${frameworks_dir}/Python.framework/Versions/2.7
+    configure.pkg_config_path ${python_framework}/lib/pkgconfig
+}
+
+if {![variant_isset python25] && ![variant_isset python26]} {
+    default_variants +python27
+}
+
+if {${configure.compiler} == "clang"} {
+    configure.cflags-append "-std=gnu89"
+}
+
+# 1.10.12 has a buggy configure script
+use_autoreconf yes
+autoreconf.args -fvi
+
 post-activate {
 	system "${prefix}/bin/scrollkeeper-update"
         system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"

Modified: trunk/dports/gnome/gramps/Portfile
===================================================================
--- trunk/dports/gnome/gramps/Portfile	2011-07-03 23:49:21 UTC (rev 80079)
+++ trunk/dports/gnome/gramps/Portfile	2011-07-03 23:49:45 UTC (rev 80080)
@@ -5,6 +5,7 @@
 
 name                            gramps
 version                         3.2.5
+revision                        1
 categories                      gnome science python genealogy
 platforms                       darwin
 maintainers                     devans openmaintainer
@@ -45,10 +46,7 @@
                                 port:shared-mime-info
 
 # librsvg is required at least for icons in dialogs
-depends_lib                     port:py26-gtkspell \
-                                port:py26-enchant \
-                                port:py26-webkitgtk \
-                                port:librsvg \
+depends_lib                     port:librsvg \
                                 port:aspell-dict-en
 
 #
@@ -57,6 +55,28 @@
 
 universal_variant               no
 
+variant python25 conflicts python26 python27 description {Use python 2.5} {
+    depends_lib-append        port:py25-gtkspell \
+                              port:py25-enchant \
+                              port:py25-webkitgtk
+}
+
+variant python26 conflicts python25 python27 description {Use python 2.6} {
+    depends_lib-append        port:py26-gtkspell \
+                              port:py26-enchant \
+                              port:py26-webkitgtk
+}
+
+variant python27 conflicts python25 python26 description {Use python 2.7} {
+    depends_lib-append        port:py27-gtkspell \
+                              port:py27-enchant \
+                              port:py27-webkitgtk
+}
+
+if {![variant_isset python25] && ![variant_isset python26]} {
+    default_variants +python27
+}
+
 post-activate {
     system "${prefix}/bin/update-mime-database ${prefix}/share/mime"
 }

Modified: trunk/dports/gnome/gucharmap/Portfile
===================================================================
--- trunk/dports/gnome/gucharmap/Portfile	2011-07-03 23:49:21 UTC (rev 80079)
+++ trunk/dports/gnome/gucharmap/Portfile	2011-07-03 23:49:45 UTC (rev 80080)
@@ -5,7 +5,7 @@
 
 name		gucharmap
 version         2.30.3
-revision        2
+revision        3
 set branch      [join [lrange [split ${version} .] 0 1] .]
 description	gucharmap is a featureful unicode character map.
 long_description ${description}
@@ -24,8 +24,7 @@
                 port:gnome-doc-utils \
                 port:gtk-doc
 
-depends_lib     port:gconf \
-                port:py26-gtk
+depends_lib     port:gconf
 
 use_bzip2       yes
 
@@ -36,10 +35,31 @@
                 --disable-introspection \
                 --enable-python-bindings
 
-configure.python ${prefix}/bin/python2.6
-set python_framework ${frameworks_dir}/Python.framework/Versions/2.6
-configure.pkg_config_path ${python_framework}/lib/pkgconfig
+variant python25 conflicts python26 python27 description {Use python 2.5} {
+    configure.python          ${prefix}/bin/python2.5
+    depends_lib-append        port:py25-gtk
+    set python_framework      ${frameworks_dir}/Python.framework/Versions/2.5
+    configure.pkg_config_path ${python_framework}/lib/pkgconfig
+}
 
+variant python26 conflicts python25 python27 description {Use python 2.6} {
+    configure.python          ${prefix}/bin/python2.6
+    depends_lib-append        port:py26-gtk
+    set python_framework      ${frameworks_dir}/Python.framework/Versions/2.6
+    configure.pkg_config_path ${python_framework}/lib/pkgconfig
+}
+
+variant python27 conflicts python25 python26 description {Use python 2.7} {
+    configure.python          ${prefix}/bin/python2.7
+    depends_lib-append        port:py27-gtk
+    set python_framework      ${frameworks_dir}/Python.framework/Versions/2.7
+    configure.pkg_config_path ${python_framework}/lib/pkgconfig
+}
+
+if {![variant_isset python25] && ![variant_isset python26]} {
+    default_variants +python27
+}
+
 post-activate	{
     system "${prefix}/bin/scrollkeeper-update"
     system "export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` && \

Modified: trunk/dports/gnome/pessulus/Portfile
===================================================================
--- trunk/dports/gnome/pessulus/Portfile	2011-07-03 23:49:21 UTC (rev 80079)
+++ trunk/dports/gnome/pessulus/Portfile	2011-07-03 23:49:45 UTC (rev 80080)
@@ -5,6 +5,7 @@
 
 name		pessulus
 version		2.30.4
+revision        1
 set branch      [join [lrange [split ${version} .] 0 1] .]
 categories	gnome python
 platforms	darwin
@@ -28,17 +29,37 @@
                 port:intltool
 
 depends_lib     port:gconf \
-	        port:py26-gtk \
                 port:gnome-python-desktop
 
 patchfiles      patch-configure.diff \
                 patch-Makefile.in.diff \
                 patch-data-Makefile.in.diff
 
-configure.python ${prefix}/bin/python2.6
-set python_prefix ${frameworks_dir}/Python.framework/Versions/2.6
-configure.pkg_config_path ${python_prefix}/lib/pkgconfig
+variant python25 conflicts python26 python27 description {Use python 2.5} {
+    configure.python          ${prefix}/bin/python2.5
+    depends_lib-append        port:py25-gtk
+    set python_framework      ${frameworks_dir}/Python.framework/Versions/2.5
+    configure.pkg_config_path ${python_framework}/lib/pkgconfig
+}
 
+variant python26 conflicts python25 python27 description {Use python 2.6} {
+    configure.python          ${prefix}/bin/python2.6
+    depends_lib-append        port:py26-gtk
+    set python_framework      ${frameworks_dir}/Python.framework/Versions/2.6
+    configure.pkg_config_path ${python_framework}/lib/pkgconfig
+}
+
+variant python27 conflicts python25 python26 description {Use python 2.7} {
+    configure.python          ${prefix}/bin/python2.7
+    depends_lib-append        port:py27-gtk
+    set python_framework      ${frameworks_dir}/Python.framework/Versions/2.7
+    configure.pkg_config_path ${python_framework}/lib/pkgconfig
+}
+
+if {![variant_isset python25] && ![variant_isset python26]} {
+    default_variants +python27
+}
+
 post-destroot {
     file rename ${destroot}${prefix}/bin/pessulus.py ${destroot}${prefix}/bin/pessulus
 }

Modified: trunk/dports/gnome/totem/Portfile
===================================================================
--- trunk/dports/gnome/totem/Portfile	2011-07-03 23:49:21 UTC (rev 80079)
+++ trunk/dports/gnome/totem/Portfile	2011-07-03 23:49:45 UTC (rev 80080)
@@ -5,7 +5,7 @@
 
 name            totem
 version         2.30.2
-revision        3
+revision        4
 set branch      [join [lrange [split ${version} .] 0 1] .]
 categories      gnome
 maintainers     devans openmaintainer
@@ -46,7 +46,6 @@
                 port:totem-pl-parser \
                 port:xorg-libXtst \
                 port:xorg-libXxf86vm \
-                port:py26-gtk \
                 port:gst-plugins-base \
                 port:nautilus
 
@@ -72,11 +71,34 @@
                 --x-libraries=${prefix}/lib \
                 BROWSER_PLUGIN_DIR=${prefix}/lib/nsplugins
 
-set python_prefix          ${frameworks_dir}/Python.framework/Versions/2.6
-configure.python           ${prefix}/bin/python2.6
-configure.pkg_config_path  ${python_prefix}/lib/pkgconfig
-configure.env              PATH=${python_prefix}/bin:$env(PATH)
+variant python25 conflicts python26 python27 description {Use python 2.5} {
+    configure.python          ${prefix}/bin/python2.5
+    depends_lib-append        port:py25-gtk
+    set python_framework      ${frameworks_dir}/Python.framework/Versions/2.5
+    configure.pkg_config_path ${python_framework}/lib/pkgconfig
+    configure.env              PATH=${python_framework}/bin:$env(PATH)
+}
 
+variant python26 conflicts python25 python27 description {Use python 2.6} {
+    configure.python          ${prefix}/bin/python2.6
+    depends_lib-append        port:py26-gtk
+    set python_framework      ${frameworks_dir}/Python.framework/Versions/2.6
+    configure.pkg_config_path ${python_framework}/lib/pkgconfig
+    configure.env              PATH=${python_framework}/bin:$env(PATH)
+}
+
+variant python27 conflicts python25 python26 description {Use python 2.7} {
+    configure.python          ${prefix}/bin/python2.7
+    depends_lib-append        port:py27-gtk
+    set python_framework      ${frameworks_dir}/Python.framework/Versions/2.7
+    configure.pkg_config_path ${python_framework}/lib/pkgconfig
+    configure.env              PATH=${python_framework}/bin:$env(PATH)
+}
+
+if {![variant_isset python25] && ![variant_isset python26]} {
+    default_variants +python27
+}
+
 post-patch {
     reinplace "s:libdbus-glib-1.so.2:${prefix}/lib/libdbus-glib-1.2.dylib:" ${worksrcpath}/browser-plugin/totemPluginGlue.cpp
 }

    

jeremyhu＠macports.org

tags

participants (1)