[87633] trunk/dports/gnome/devhelp

[devans at macports.org]

Revision: 87633
          http://trac.macports.org/changeset/87633
Author:   devans at macports.org
Date:     2011-11-29 13:04:32 -0800 (Tue, 29 Nov 2011)
Log Message:
-----------
devhelp: add python variants and fix python configuration, don't use autoreconf, build without -DG_DISABLE_DEPRECATED to allow building against glib2 2.30.2.

Modified Paths:
--------------
    trunk/dports/gnome/devhelp/Portfile

Added Paths:
-----------
    trunk/dports/gnome/devhelp/files/patch-configure.diff
    trunk/dports/gnome/devhelp/files/patch-src-Makefile.in.diff

Removed Paths:
-------------
    trunk/dports/gnome/devhelp/files/patch-src-Makefile.am.diff

Modified: trunk/dports/gnome/devhelp/Portfile
===================================================================
--- trunk/dports/gnome/devhelp/Portfile	2011-11-29 20:06:24 UTC (rev 87632)
+++ trunk/dports/gnome/devhelp/Portfile	2011-11-29 21:04:32 UTC (rev 87633)
@@ -5,8 +5,8 @@
 
 name            devhelp
 version         2.30.1
-revision        5
-license         GPL-2
+revision        6
+license         GPL-2+
 set branch      [join [lrange [split ${version} .] 0 1] .]
 description     Devhelp is an API documentation browser for GTK+ and GNOME.
 long_description \
@@ -26,10 +26,10 @@
                 sha1    51eda53f04080eaae75b6e62e222b98fe5bb0d6f \
                 rmd160  2ce6762a7838afad03f237ab0ac662cae426163c
 
-patchfiles      patch-src-Makefile.am.diff
+patchfiles      patch-configure.diff \
+                patch-src-Makefile.in.diff
 
 depends_build   port:pkgconfig \
-                port:python26 \
                 port:intltool
 
 depends_lib     port:webkit-gtk \
@@ -37,12 +37,27 @@
                 port:libwnck \
                 port:libunique
 
-use_autoreconf  yes
-
 configure.args  --disable-schemas-install
 
-configure.python ${prefix}/bin/python2.6
+variant python25 conflicts python26 python27 description {Build using Python 2.5} {
+    configure.python          ${prefix}/bin/python2.5
+    depends_build-append      port:python25
+}
 
+variant python26 conflicts python25 python27 description {Build using Python 2.6} {
+    configure.python          ${prefix}/bin/python2.6
+    depends_build-append      port:python26
+}
+
+variant python27 conflicts python25 python26 description {Build using Python 2.7} {
+    configure.python          ${prefix}/bin/python2.7
+    depends_build-append      port:python27
+}
+
+if {![variant_isset python25] && ![variant_isset python26]} {
+    default_variants +python27
+}
+
 post-activate {
         system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
         system "export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` && \

Added: trunk/dports/gnome/devhelp/files/patch-configure.diff
===================================================================
--- trunk/dports/gnome/devhelp/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/gnome/devhelp/files/patch-configure.diff	2011-11-29 21:04:32 UTC (rev 87633)
@@ -0,0 +1,14 @@
+--- configure.orig	2010-06-21 04:31:59.000000000 -0700
++++ configure	2011-11-29 12:38:22.000000000 -0800
+@@ -13675,9 +13675,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;'`
+ 
+ 
+ 

Deleted: trunk/dports/gnome/devhelp/files/patch-src-Makefile.am.diff
===================================================================
--- trunk/dports/gnome/devhelp/files/patch-src-Makefile.am.diff	2011-11-29 20:06:24 UTC (rev 87632)
+++ trunk/dports/gnome/devhelp/files/patch-src-Makefile.am.diff	2011-11-29 21:04:32 UTC (rev 87633)
@@ -1,10 +0,0 @@
---- src/Makefile.am.orig	2010-10-21 10:54:58.000000000 -0700
-+++ src/Makefile.am	2010-10-21 10:55:15.000000000 -0700
-@@ -25,7 +25,6 @@
- 	-DG_LOG_DOMAIN=\"Devhelp\"			\
- 	-DG_DISABLE_DEPRECATED				\
- 	-DGDK_DISABLE_DEPRECATED			\
--	-DGTK_DISABLE_DEPRECATED			\
- 	-DG_DISABLE_SINGLE_INCLUDES			\
- 	-DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES		\
- 	-DGTK_DISABLE_SINGLE_INCLUDES			\

Added: trunk/dports/gnome/devhelp/files/patch-src-Makefile.in.diff
===================================================================
--- trunk/dports/gnome/devhelp/files/patch-src-Makefile.in.diff	                        (rev 0)
+++ trunk/dports/gnome/devhelp/files/patch-src-Makefile.in.diff	2011-11-29 21:04:32 UTC (rev 87633)
@@ -0,0 +1,12 @@
+--- src/Makefile.in.orig	2011-11-29 12:35:01.000000000 -0800
++++ src/Makefile.in	2011-11-29 12:35:18.000000000 -0800
+@@ -332,9 +332,7 @@
+ 	-DLOCALEDIR=\""$(datadir)/locale"\" 	  	\
+ 	-DDATADIR=\""$(datadir)"\"                      \
+ 	-DG_LOG_DOMAIN=\"Devhelp\"			\
+-	-DG_DISABLE_DEPRECATED				\
+ 	-DGDK_DISABLE_DEPRECATED			\
+-	-DGTK_DISABLE_DEPRECATED			\
+ 	-DG_DISABLE_SINGLE_INCLUDES			\
+ 	-DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES		\
+ 	-DGTK_DISABLE_SINGLE_INCLUDES			\
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111129/3119ccb1/attachment-0001.html>