[72803] trunk/dports/devel/glade3

27 Oct 2010

Revision: 72803
          http://trac.macports.org/changeset/72803
Author:   devans@macports.org
Date:     2010-10-27 12:08:35 -0700 (Wed, 27 Oct 2010)
Log Message:
-----------
glade3: 
  * for compatibility with the other GNOME ports, remove +python25 +python26 variants
  * configure properly for python26, increment revision
  * disable broken +quartz variant until issues with ige_mac_integration are resolved (#23356)
  * skip arch check for devhelp to allow port to build +universal (runtime dep only)
  * conflicts glade3-devel

Modified Paths:
--------------
    trunk/dports/devel/glade3/Portfile

Added Paths:
-----------
    trunk/dports/devel/glade3/files/
    trunk/dports/devel/glade3/files/patch-configure.diff

Modified: trunk/dports/devel/glade3/Portfile
===================================================================

--- trunk/dports/devel/glade3/Portfile	2010-10-27 18:59:16 UTC (rev 72802)
+++ trunk/dports/devel/glade3/Portfile	2010-10-27 19:08:35 UTC (rev 72803)
@@ -4,8 +4,9 @@
 PortSystem 1.0
 
 name            glade3
+conflicts       glade3-devel
 version         3.6.7
-revision        1
+revision        2
 set branch      [join [lrange [split ${version} .] 0 1] .]
 description     Glade is a free user interface builder for GTK+ and GNOME.
 long_description    Glade is a free user interface builder for GTK+ \
@@ -23,48 +24,44 @@
                 sha1    7621d5ae486ed42c35bb1d147b5693428481e733 \
                 rmd160  ab8487a8914b31ba2cb22bf0261b6ad39b0d1629
 
+depends_skip_archcheck devhelp
+
 depends_build   port:pkgconfig \
                 port:intltool \
                 port:gnome-doc-utils \
                 port:gtk-doc
 
-depends_lib     port:gtk2 \
+depends_lib     port:py26-gtk \
                 port:libxml2 \
                 port:libgnomeui
 
 depends_run     port:hicolor-icon-theme \
                 port:devhelp
 
+patchfiles      patch-configure.diff
+
 configure.args  --disable-scrollkeeper
 
-post-activate   {
-        system "scrollkeeper-update"
-}
+set python_prefix         ${frameworks_dir}/Python.framework/Versions/2.6
+configure.python          ${prefix}/bin/python2.6
+configure.pkg_config_path ${python_prefix}/lib/pkgconfig
 
 variant disable_gnome description {Disable support for GNOME UI widgets} {
         configure.args-append --disable-gnome
         depends_lib-delete port:libgnomeui
 }
 
-variant quartz {
-         depends_lib-append port:ige-mac-integration
-         depends_run-delete port:devhelp
-}
+#
+# ige-mac-integration is broken
+#
+# disable quartz variant until this is resolved
+#
 
-variant python25 conflicts python26 description {Use Python 2.5} {
-        depends_lib-append port:py25-gtk
-        configure.python ${prefix}/bin/python2.5
-}
+#variant quartz {
+#         depends_lib-append port:ige-mac-integration
+#         depends_run-delete port:devhelp
+#}
 
-variant python26 conflicts python25 description {Use Python 2.6} {
-        depends_lib-append port:py26-gtk
-        configure.python ${prefix}/bin/python2.6
-}
-
-if {![variant_isset python25]} {
-    default_variants +python26
-}
-
 post-activate {
         system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
 }

Added: trunk/dports/devel/glade3/files/patch-configure.diff
===================================================================
--- trunk/dports/devel/glade3/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/devel/glade3/files/patch-configure.diff	2010-10-27 19:08:35 UTC (rev 72803)
@@ -0,0 +1,14 @@
+--- configure.orig	2009-06-29 12:51:09.000000000 -0700
++++ configure	2010-10-27 10:10:04.000000000 -0700
+@@ -24644,9 +24644,9 @@
+ 
+ 
+ 
+-  PYTHON_PREFIX='${prefix}'
++  PYTHON_PREFIX=`$PYTHON -c 'import sys; print sys.prefix;'`
+ 
+-  PYTHON_EXEC_PREFIX='${exec_prefix}'
++  PYTHON_EXEC_PREFIX=`$PYTHON -c 'import sys; print sys.exec_prefix;'`
+ 
+ 
+

    

devans＠macports.org

tags

participants (1)