Revision: 67094 http://trac.macports.org/changeset/67094 Author: jeremyhu@macports.org Date: 2010-04-28 17:24:18 -0700 (Wed, 28 Apr 2010) Log Message: ----------- xscope: Don't use xtrans as it leads to a lockup. Modified Paths: -------------- trunk/dports/x11/xscope/Portfile Added Paths: ----------- trunk/dports/x11/xscope/files/ trunk/dports/x11/xscope/files/0001-Allow-a-configure-option-to-build-without-xtrans-dis.patch Modified: trunk/dports/x11/xscope/Portfile =================================================================== --- trunk/dports/x11/xscope/Portfile 2010-04-28 23:54:52 UTC (rev 67093) +++ trunk/dports/x11/xscope/Portfile 2010-04-29 00:24:18 UTC (rev 67094) @@ -4,6 +4,7 @@ name xscope version 1.2 +revision 1 categories x11 platforms darwin maintainers jeremyhu openmaintainer @@ -22,8 +23,17 @@ depends_build \ port:pkgconfig \ - port:xorg-xtrans + port:xorg-xtrans \ + port:xorg-util-macros +use_autoreconf yes +autoreconf.args -fvi + +patchfiles 0001-Allow-a-configure-option-to-build-without-xtrans-dis.patch +patch.args -p1 + +configure.args --disable-xtrans + livecheck.type regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D livecheck.regex ${name}-(\\d+(?:\\.\\d+)*) Added: trunk/dports/x11/xscope/files/0001-Allow-a-configure-option-to-build-without-xtrans-dis.patch =================================================================== --- trunk/dports/x11/xscope/files/0001-Allow-a-configure-option-to-build-without-xtrans-dis.patch (rev 0) +++ trunk/dports/x11/xscope/files/0001-Allow-a-configure-option-to-build-without-xtrans-dis.patch 2010-04-29 00:24:18 UTC (rev 67094) @@ -0,0 +1,63 @@ +From 344db0911e1e2447abe210b5684269a2a0daf04c Mon Sep 17 00:00:00 2001 +From: Jeremy Huddleston <jeremyhu@apple.com> +Date: Mon, 5 Apr 2010 17:19:46 -0700 +Subject: [PATCH] Allow a configure option to build without xtrans (--disable-xtrans) + +Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> +--- + configure.ac | 37 ++++++++++++++++++++++++------------- + 1 files changed, 24 insertions(+), 13 deletions(-) + +diff --git a/configure.ac b/configure.ac +index f9a8a1d..61a7d27 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -38,21 +38,32 @@ AC_PROG_CC + XORG_DEFAULT_OPTIONS + AC_PROG_INSTALL + +-dnl Issue an error if xtrans.m4 was not found and XTRANS_CONNECTION_FLAGS macro +-dnl was not expanded, since xscope with no transport types is rather useless. +-dnl +-dnl If you're seeing an error here, be sure you installed the lib/xtrans module +-dnl first and if it's not in the default location, that you set the ACLOCAL +-dnl environment variable to find it, such as: +-dnl ACLOCAL="aclocal -I ${PREFIX}/share/aclocal" +-m4_pattern_forbid([XTRANS_CONNECTION_FLAGS]) ++AC_ARG_ENABLE(xtrans, AS_HELP_STRING([--enable-xtrans], ++ [Use xtrans for socket connections (default: auto)]), ++ [XTRANS=$enableval], [XTRANS=auto]) ++ ++if test "x$XTRANS" = xauto ; then ++ PKG_CHECK_EXISTS(xtrans, [XTRANS=yes], [XTRANS=no]) ++fi ++ ++if test "x$XTRANS" = xyes ; then ++ dnl Issue an error if xtrans.m4 was not found and XTRANS_CONNECTION_FLAGS macro ++ dnl was not expanded, since xscope with no transport types is rather useless. ++ dnl ++ dnl If you're seeing an error here, be sure you installed the lib/xtrans module ++ dnl first and if it's not in the default location, that you set the ACLOCAL ++ dnl environment variable to find it, such as: ++ dnl ACLOCAL="aclocal -I ${PREFIX}/share/aclocal" ++ m4_pattern_forbid([XTRANS_CONNECTION_FLAGS]) ++ ++ # Transport selection macro from xtrans.m4 ++ XTRANS_CONNECTION_FLAGS + +-# Transport selection macro from xtrans.m4 +-XTRANS_CONNECTION_FLAGS ++ # Checks for pkg-config packages ++ PKG_CHECK_MODULES(XSCOPE, xtrans) ++ XSCOPE_CFLAGS="$XSCOPE_CFLAGS -DUSE_XTRANS" ++fi + +-# Checks for pkg-config packages +-PKG_CHECK_MODULES(XSCOPE, xtrans) +-XSCOPE_CFLAGS="$XSCOPE_CFLAGS -DUSE_XTRANS" + AC_SUBST(XSCOPE_CFLAGS) + AC_SUBST(XSCOPE_LIBS) + +-- +1.7.0.3 +