[111807] trunk/dports/gnome/libgnomeui

[cal at macports.org]

Revision: 111807
          https://trac.macports.org/changeset/111807
Author:   cal at macports.org
Date:     2013-10-02 09:35:50 -0700 (Wed, 02 Oct 2013)
Log Message:
-----------
libgnomeui: fix unexpanded @SM_LIBS@ in libgnomeui-2.0.pc, closes #40144

Modified Paths:
--------------
    trunk/dports/gnome/libgnomeui/Portfile
    trunk/dports/gnome/libgnomeui/files/patch-configure.in.diff

Modified: trunk/dports/gnome/libgnomeui/Portfile
===================================================================
--- trunk/dports/gnome/libgnomeui/Portfile	2013-10-02 16:13:35 UTC (rev 111806)
+++ trunk/dports/gnome/libgnomeui/Portfile	2013-10-02 16:35:50 UTC (rev 111807)
@@ -5,7 +5,7 @@
 
 name            libgnomeui
 version         2.24.5
-revision        9
+revision        10
 set branch      [join [lrange [split ${version} .] 0 1] .]
 maintainers     nomaintainer
 categories      gnome

Modified: trunk/dports/gnome/libgnomeui/files/patch-configure.in.diff
===================================================================
--- trunk/dports/gnome/libgnomeui/files/patch-configure.in.diff	2013-10-02 16:13:35 UTC (rev 111806)
+++ trunk/dports/gnome/libgnomeui/files/patch-configure.in.diff	2013-10-02 16:35:50 UTC (rev 111807)
@@ -1,5 +1,5 @@
---- configure.in.orig	2013-06-27 13:21:24.000000000 -0700
-+++ configure.in	2013-06-27 13:25:22.000000000 -0700
+--- configure.in.orig	2013-10-02 18:32:45.000000000 +0200
++++ configure.in	2013-10-02 18:33:15.000000000 +0200
 @@ -118,9 +118,9 @@
      gnome_keyring_requirement="gnome-keyring-1 >= gnome_keyring_required_version"
      GNOME_KEYRING="gnome-keyring-1"
@@ -13,13 +13,17 @@
      ;;
  esac
  AM_CONDITIONAL(OS_WIN32, [test "$os_win32" = "yes"])
-@@ -142,34 +142,34 @@
+@@ -142,30 +142,34 @@
  dnl Check for -lSM (for gnome-client)
  dnl
  
 -GNOME_HAVE_SM=true
 -PKG_CHECK_MODULES(SM, sm ice, :, [
-+# GNOME_HAVE_SM=true
++GNOME_HAVE_SM=false
++SM_CFLAGS=""
++SM_LIBS=""
++# SM_LIBS is used in the .pc file
++AC_SUBST([SM_LIBS])
 +# PKG_CHECK_MODULES(SM, sm ice, :, [
  # pkg-config modules not found (only present since X11R7); use old-style
  # detection
@@ -44,10 +48,6 @@
 -    GNOME_HAVE_SM=false
 -fi
 -])
--
--if test "$GNOME_HAVE_SM" = true; then
--	AC_DEFINE(HAVE_LIBSM, 1, [Define to 1 if you have libSM installed])
--fi
 +# if test x$no_x != xyes ; then
 +#     libgnomeui_save_cflags="$CFLAGS"
 +#     libgnomeui_save_libs="$LIBS"
@@ -66,10 +66,6 @@
 +#    GNOME_HAVE_SM=false
 +# fi
 +# ])
-+#
-+# if test "$GNOME_HAVE_SM" = true; then
-+#	AC_DEFINE(HAVE_LIBSM, 1, [Define to 1 if you have libSM installed])
-+# fi
  
- dnl
- dnl Start of pkg-config checks
+ if test "$GNOME_HAVE_SM" = true; then
+ 	AC_DEFINE(HAVE_LIBSM, 1, [Define to 1 if you have libSM installed])
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131002/9e4bd4b3/attachment.html>