[144373] trunk/dports/devel/geany
devans at macports.org
devans at macports.org
Wed Jan 6 21:21:01 PST 2016
Revision: 144373
https://trac.macports.org/changeset/144373
Author: devans at macports.org
Date: 2016-01-06 21:21:01 -0800 (Wed, 06 Jan 2016)
Log Message:
-----------
geany: update to version 1.26, dependencies, configuration, reconfigure using distributed autogen.sh for intltool 0.51 compatibility (#50208, maintainer timeout).
Modified Paths:
--------------
trunk/dports/devel/geany/Portfile
trunk/dports/devel/geany/files/vte-sonames.diff
Modified: trunk/dports/devel/geany/Portfile
===================================================================
--- trunk/dports/devel/geany/Portfile 2016-01-07 05:08:54 UTC (rev 144372)
+++ trunk/dports/devel/geany/Portfile 2016-01-07 05:21:01 UTC (rev 144373)
@@ -4,8 +4,7 @@
PortSystem 1.0
name geany
-version 1.24.1
-revision 1
+version 1.26
license GPL-2+
categories devel
platforms darwin
@@ -24,47 +23,42 @@
master_sites http://download.geany.org/
use_bzip2 yes
-checksums rmd160 f5fd46ed83451147a95516812628a1a6b459a98c \
- sha256 7fb505d9b01fe6874890525f837644a6a38c23a372bb068c65ef3673108a8c33
+checksums rmd160 6f1f73067a0e802a7c335e23526024533b9b2249 \
+ sha256 e38530e87c577e1e9806be3b40e08fb9ee321eb1abc6361ddacdad89c825f90d
depends_build \
port:pkgconfig \
- port:intltool
+ port:intltool \
+ port:autoconf \
+ port:automake \
+ port:libtool
depends_lib \
port:desktop-file-utils \
port:gettext \
port:gtk2 \
port:vte-gtk2-compat
-# update m4/intltool.m4 and autoreconf
+# reconfigure using distributed autogen.sh for intltool 0.51 compatibility
-pre-configure {
- copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
-}
+configure.cmd ./autogen.sh
-use_autoreconf yes
-autoreconf.args -fvi
-
configure.args --disable-silent-rules \
--enable-vte
-platform darwin {
- patchfiles-append vte-sonames.diff
+patchfiles vte-sonames.diff
- post-patch {
- reinplace "s|@@MP_PREFIX@@|${prefix}|" ${worksrcpath}/src/vte.c
- }
-}
-
variant gtk3 description {Enable experimental gtk3 support} {
depends_lib-replace port:gtk2 port:gtk3
depends_lib-replace port:vte-gtk2-compat port:vte-2.90
+ depends_run-append port:gnome-themes-standard
configure.args-append --enable-gtk3
}
if {[variant_isset gtk3]} {
set update_icon_cache "gtk-update-icon-cache-3.0"
+ configure.args-append --with-vte-module-path=${prefix}/lib/libvte2_90.dylib
} else {
+ configure.args-append --with-vte-module-path=${prefix}/lib/libvte.dylib
set update_icon_cache "gtk-update-icon-cache"
}
Modified: trunk/dports/devel/geany/files/vte-sonames.diff
===================================================================
--- trunk/dports/devel/geany/files/vte-sonames.diff 2016-01-07 05:08:54 UTC (rev 144372)
+++ trunk/dports/devel/geany/files/vte-sonames.diff 2016-01-07 05:21:01 UTC (rev 144373)
@@ -1,18 +1,6 @@
--- src/vte.c.orig 2014-04-16 08:20:13.000000000 -0700
+++ src/vte.c 2014-09-22 09:04:22.000000000 -0700
-@@ -203,9 +203,9 @@
- gint i;
- const gchar *sonames[] = {
- #if GTK_CHECK_VERSION(3, 0, 0)
-- "libvte2_90.so", "libvte2_90.so.9",
-+ "@@MP_PREFIX@@/lib/libvte2_90.dylib",
- #else
-- "libvte.so", "libvte.so.4", "libvte.so.8", "libvte.so.9",
-+ "@@MP_PREFIX@@/lib/libvte.dylib",
- #endif
- NULL
- };
-@@ -219,7 +219,7 @@
+@@ -234,7 +234,7 @@
if (module == NULL)
{
vte_info.have_vte = FALSE;
@@ -21,9 +9,9 @@
return;
}
else
---- src/main.c.orig 2014-04-16 08:20:13.000000000 -0700
-+++ src/main.c 2014-09-22 09:08:22.000000000 -0700
-@@ -140,7 +140,7 @@
+--- src/libmain.c.orig 2014-04-16 08:20:13.000000000 -0700
++++ src/libmain.c 2014-09-22 09:08:22.000000000 -0700
+@@ -136,7 +136,7 @@
{ "no-session", 's', G_OPTION_FLAG_REVERSE, G_OPTION_ARG_NONE, &cl_options.load_session, N_("Don't load the previous session's files"), NULL },
#ifdef HAVE_VTE
{ "no-terminal", 't', 0, G_OPTION_ARG_NONE, &no_vte, N_("Don't load terminal support"), NULL },
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160106/964708c2/attachment.html>
More information about the macports-changes
mailing list