[147206] users/devans/GNOME-3/stable/dports/x11/pango

[devans at macports.org]

Revision: 147206
          https://trac.macports.org/changeset/147206
Author:   devans at macports.org
Date:     2016-03-30 23:30:04 -0700 (Wed, 30 Mar 2016)
Log Message:
-----------
GNOME-3/stable: pango, sync with trunk.

Modified Paths:
--------------
    users/devans/GNOME-3/stable/dports/x11/pango/files/patch-ltmain.sh.diff

Property Changed:
----------------
    users/devans/GNOME-3/stable/dports/x11/pango/


Property changes on: users/devans/GNOME-3/stable/dports/x11/pango
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/mld-qt-481/dports/x11/pango:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
   + /branches/mld-qt-481/dports/x11/pango:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/x11/pango:143558-147205

Modified: users/devans/GNOME-3/stable/dports/x11/pango/files/patch-ltmain.sh.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/x11/pango/files/patch-ltmain.sh.diff	2016-03-31 02:45:03 UTC (rev 147205)
+++ users/devans/GNOME-3/stable/dports/x11/pango/files/patch-ltmain.sh.diff	2016-03-31 06:30:04 UTC (rev 147206)
@@ -1,6 +1,6 @@
---- ltmain.sh.orig	2015-12-14 05:39:23.000000000 -0800
-+++ ltmain.sh	2015-12-14 16:27:19.000000000 -0800
-@@ -7070,7 +7070,7 @@
+--- ltmain.sh.orig	2012-04-15 01:07:38.000000000 -0500
++++ ltmain.sh	2012-04-15 02:39:51.000000000 -0500
+@@ -5655,7 +5655,7 @@
  	continue
  	;;
  
@@ -9,12 +9,12 @@
        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
  	func_append compiler_flags " $arg"
  	func_append compile_command " $arg"
-@@ -7604,7 +7604,7 @@
+@@ -6160,7 +6160,7 @@
  	lib=
- 	found=false
+ 	found=no
  	case $deplib in
 -	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
 +	-mt|-mthreads|-kthread|-Kthread|-lpthread|-pthreads|--thread-safe \
          |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
- 	  if test prog,link = "$linkmode,$pass"; then
+ 	  if test "$linkmode,$pass" = "prog,link"; then
  	    compile_deplibs="$deplib $compile_deplibs"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160330/85fb8aec/attachment.html>