[144704] users/devans/GNOME-3/stable/dports/gnome/devhelp

[devans at macports.org]

Revision: 144704
          https://trac.macports.org/changeset/144704
Author:   devans at macports.org
Date:     2016-01-15 13:40:19 -0800 (Fri, 15 Jan 2016)
Log Message:
-----------
GNOME-3/stable: devhelp, update to version 3.18.1 using webkit2-gtk, builds but segfaults on startup (#50339).

Modified Paths:
--------------
    users/devans/GNOME-3/stable/dports/gnome/devhelp/Portfile
    users/devans/GNOME-3/stable/dports/gnome/devhelp/files/autogen.sh

Added Paths:
-----------
    users/devans/GNOME-3/stable/dports/gnome/devhelp/files/autogen.sh-3.8.2

Modified: users/devans/GNOME-3/stable/dports/gnome/devhelp/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/devhelp/Portfile	2016-01-15 21:16:21 UTC (rev 144703)
+++ users/devans/GNOME-3/stable/dports/gnome/devhelp/Portfile	2016-01-15 21:40:19 UTC (rev 144704)
@@ -4,8 +4,7 @@
 PortSystem          1.0
 
 name                devhelp
-version             3.8.2
-revision            4
+version             3.18.1
 license             GPL-2+
 set branch          [join [lrange [split ${version} .] 0 1] .]
 description         Devhelp is an API documentation browser for GTK+ and GNOME.
@@ -22,8 +21,8 @@
 
 use_xz              yes
 
-checksums           rmd160  8d855f485742a0bdc766591d36af09bdbea61801 \
-                    sha256  a245b53824c6f2ff89245ff807bb2140bde74951ea6f1d759a0fd0c6959ca9f7
+checksums           rmd160  e4375eadc5876c3f78b4f282140b39489801d491 \
+                    sha256  303a162ad294dc6f9984898e501a06dc5d2aa9812b06801c2e39b250d8c51aef
 
 depends_build       port:pkgconfig \
                     port:intltool \
@@ -34,31 +33,14 @@
                     port:python27
 
 depends_lib         port:desktop-file-utils \
-                    port:gtk3 \
-                    path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
+                    port:gtk3
 
 depends_run         port:gnome-themes-standard
 
-platform darwin {
-    if {${configure.cxx_stdlib} eq "libstdc++"} {
-       depends_lib-delete path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
-       depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
-    }
-}
-
-patchfiles          patch-configure.ac.diff
-
-# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
-
-post-patch {
-    xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
-    copy ${worksrcpath}/libgd/libgd.m4 ${worksrcpath}/m4
-}
-
 configure.cmd       ./autogen.sh
 
 configure.python    ${prefix}/bin/python2.7
-configure.args      --with-webkit2=no \
+configure.args      --disable-silent-rules \
                     --disable-schemas-compile
 
 post-activate {
@@ -67,4 +49,32 @@
     system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
 }
 
-livecheck.type      none
+platform darwin {
+    if {${configure.cxx_stdlib} eq "libstdc++"} {
+        version                 3.8.2
+        revision                4
+        checksums               rmd160  8d855f485742a0bdc766591d36af09bdbea61801 \
+                                sha256  a245b53824c6f2ff89245ff807bb2140bde74951ea6f1d759a0fd0c6959ca9f7
+        depends_lib-append      path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
+        patchfiles              patch-configure.ac.diff
+
+        # reconfigure using upstream autogen.sh for intltool 0.51 compatibility
+
+        post-patch {
+            xinstall -m 755 ${filespath}/autogen.sh-3.8.2 ${worksrcpath}/autogen.sh
+            copy ${worksrcpath}/libgd/libgd.m4 ${worksrcpath}/m4
+        }
+        configure.args-append   --with-webkit2=no
+        livecheck.type          none
+    } else {
+        depends_lib-append path:lib/pkgconfig/webkit2gtk-4.0.pc:webkit2-gtk
+
+        # reconfigure using upstream autogen.sh for intltool 0.51 compatibility
+
+        post-patch {
+            xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
+        }
+        configure.args-append   --enable-compile-warnings=minimum
+        livecheck.type          gnome
+    }
+}

Modified: users/devans/GNOME-3/stable/dports/gnome/devhelp/files/autogen.sh
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/devhelp/files/autogen.sh	2016-01-15 21:16:21 UTC (rev 144703)
+++ users/devans/GNOME-3/stable/dports/gnome/devhelp/files/autogen.sh	2016-01-15 21:40:19 UTC (rev 144704)
@@ -4,12 +4,9 @@
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
-PKG_NAME="Devhelp"
-ACLOCAL_FLAGS="-I libgd $ACLOCAL_FLAGS"
-
 (test -f $srcdir/src/dh-main.c) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level $PKG_NAME directory"
+    echo " top-level Devhelp directory."
     exit 1
 }
 
@@ -18,4 +15,6 @@
     exit 1
 }
 
+# git submodule update --init --recursive
+
 . gnome-autogen.sh

Copied: users/devans/GNOME-3/stable/dports/gnome/devhelp/files/autogen.sh-3.8.2 (from rev 144699, users/devans/GNOME-3/stable/dports/gnome/devhelp/files/autogen.sh)
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/devhelp/files/autogen.sh-3.8.2	                        (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/devhelp/files/autogen.sh-3.8.2	2016-01-15 21:40:19 UTC (rev 144704)
@@ -0,0 +1,21 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+PKG_NAME="Devhelp"
+ACLOCAL_FLAGS="-I libgd $ACLOCAL_FLAGS"
+
+(test -f $srcdir/src/dh-main.c) || {
+    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+    echo " top-level $PKG_NAME directory"
+    exit 1
+}
+
+which gnome-autogen.sh || {
+    echo "You need to install gnome-common."
+    exit 1
+}
+
+. gnome-autogen.sh
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160115/e178bd5a/attachment.html>