[144758] trunk/dports/gnome/devhelp
devans at macports.org
devans at macports.org
Sun Jan 17 09:26:50 PST 2016
Revision: 144758
https://trac.macports.org/changeset/144758
Author: devans at macports.org
Date: 2016-01-17 09:26:50 -0800 (Sun, 17 Jan 2016)
Log Message:
-----------
devhelp: update to version 3.18.1, use system python for build, increment revision of legacy version to rebuild.
Modified Paths:
--------------
trunk/dports/gnome/devhelp/Portfile
trunk/dports/gnome/devhelp/files/autogen.sh
Added Paths:
-----------
trunk/dports/gnome/devhelp/files/autogen.sh-3.8.2
Property Changed:
----------------
trunk/dports/gnome/devhelp/
Property changes on: trunk/dports/gnome/devhelp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/mld-qt-481/dports/gnome/devhelp:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/stable/dports/gnome/devhelp:108269-138868
/users/devans/GNOME-3/unstable/dports/gnome/devhelp:116416-118152
/users/rmstonecipher/gnome/devhelp:102363-103172
+ /branches/mld-qt-481/dports/gnome/devhelp:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/stable/dports/gnome/devhelp:108269-144757
/users/devans/GNOME-3/unstable/dports/gnome/devhelp:116416-118152
/users/rmstonecipher/gnome/devhelp:102363-103172
Modified: trunk/dports/gnome/devhelp/Portfile
===================================================================
--- trunk/dports/gnome/devhelp/Portfile 2016-01-17 17:23:24 UTC (rev 144757)
+++ trunk/dports/gnome/devhelp/Portfile 2016-01-17 17:26:50 UTC (rev 144758)
@@ -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,43 +21,27 @@
use_xz yes
-checksums rmd160 8d855f485742a0bdc766591d36af09bdbea61801 \
- sha256 a245b53824c6f2ff89245ff807bb2140bde74951ea6f1d759a0fd0c6959ca9f7
+checksums rmd160 e4375eadc5876c3f78b4f282140b39489801d491 \
+ sha256 303a162ad294dc6f9984898e501a06dc5d2aa9812b06801c2e39b250d8c51aef
depends_build port:pkgconfig \
port:intltool \
port:gnome-common \
port:autoconf \
port:automake \
- port:libtool \
- port:python27
+ port:libtool
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
- }
-}
+configure.cmd ./autogen.sh
-patchfiles patch-configure.ac.diff
+# use system python for build, requires python2 >= 2.3
-# 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.python /usr/bin/python
+configure.args --disable-silent-rules \
--disable-schemas-compile
post-activate {
@@ -67,4 +50,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 5
+ 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: trunk/dports/gnome/devhelp/files/autogen.sh
===================================================================
--- trunk/dports/gnome/devhelp/files/autogen.sh 2016-01-17 17:23:24 UTC (rev 144757)
+++ trunk/dports/gnome/devhelp/files/autogen.sh 2016-01-17 17:26:50 UTC (rev 144758)
@@ -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: trunk/dports/gnome/devhelp/files/autogen.sh-3.8.2 (from rev 144755, users/devans/GNOME-3/stable/dports/gnome/devhelp/files/autogen.sh-3.8.2)
===================================================================
--- trunk/dports/gnome/devhelp/files/autogen.sh-3.8.2 (rev 0)
+++ trunk/dports/gnome/devhelp/files/autogen.sh-3.8.2 2016-01-17 17:26:50 UTC (rev 144758)
@@ -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/20160117/c6c64355/attachment.html>
More information about the macports-changes
mailing list