[146510] trunk/dports/devel/pkgconfig

[ryandesign at macports.org]

Revision: 146510
          https://trac.macports.org/changeset/146510
Author:   ryandesign at macports.org
Date:     2016-03-09 18:49:55 -0800 (Wed, 09 Mar 2016)
Log Message:
-----------
pkgconfig: update to 0.29.1

Modified Paths:
--------------
    trunk/dports/devel/pkgconfig/Portfile
    trunk/dports/devel/pkgconfig/files/patch-glib-configure.diff

Added Paths:
-----------
    trunk/dports/devel/pkgconfig/files/patch-glib-glib-gunicollate.c.diff

Modified: trunk/dports/devel/pkgconfig/Portfile
===================================================================
--- trunk/dports/devel/pkgconfig/Portfile	2016-03-10 01:49:05 UTC (rev 146509)
+++ trunk/dports/devel/pkgconfig/Portfile	2016-03-10 02:49:55 UTC (rev 146510)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                pkgconfig
-version             0.28
+version             0.29.1
 categories          devel
 maintainers         ryandesign
 license             GPL-2+
@@ -22,8 +22,8 @@
                     about installed libraries in the system. It is typically \
                     used to compile and link against one or more libraries.
 
-checksums           rmd160  233f0b667cfb8f2e6a5647984d6389a770132173 \
-                    sha256  6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845
+checksums           rmd160  2054eb2dac507c912182f2fbd90baee041aa5463 \
+                    sha256  beb43c9e064555469bd4390dcfd8030b1536e0aa103f08d7abf7ae8cac0cb001
 
 depends_lib         port:libiconv
 

Modified: trunk/dports/devel/pkgconfig/files/patch-glib-configure.diff
===================================================================
--- trunk/dports/devel/pkgconfig/files/patch-glib-configure.diff	2016-03-10 01:49:05 UTC (rev 146509)
+++ trunk/dports/devel/pkgconfig/files/patch-glib-configure.diff	2016-03-10 02:49:55 UTC (rev 146510)
@@ -1,6 +1,6 @@
---- glib/configure.orig	2013-01-22 07:13:56.000000000 -0600
-+++ glib/configure	2013-01-27 14:33:51.000000000 -0600
-@@ -5434,7 +5434,7 @@
+--- glib/configure.orig	2015-09-27 09:07:16.000000000 -0500
++++ glib/configure	2015-10-02 08:05:20.000000000 -0500
+@@ -5934,7 +5934,7 @@
  fi
  
  GLIB_RUNTIME_LIBDIR="$with_runtime_libdir"
@@ -9,7 +9,7 @@
  
  
   if test "x$with_runtime_libdir" != "x"; then
-@@ -27651,10 +27651,10 @@
+@@ -27643,10 +27643,10 @@
  *)			glib_vacopy=''
  esac
  
@@ -23,7 +23,7 @@
  
  if test x$glib_cv_hasinline = xyes; then
      glib_inline='#define G_HAVE_INLINE 1'
-@@ -29351,18 +29351,32 @@
+@@ -29338,18 +29338,32 @@
  	cat >>$outfile <<_______EOF
  #define G_HAVE_GINT64 1          /* deprecated, always true */
  
@@ -63,26 +63,29 @@
  _______EOF
          else
  	  cat >>$outfile <<_______EOF
-@@ -29374,9 +29388,15 @@
+@@ -29361,10 +29375,17 @@
  
          cat >>$outfile <<_______EOF
  
 -#define GLIB_SIZEOF_VOID_P $glib_void_p
 -#define GLIB_SIZEOF_LONG   $glib_long
 -#define GLIB_SIZEOF_SIZE_T $glib_size_t
+-#define GLIB_SIZEOF_SSIZE_T $glib_ssize_t
 +#ifdef __LP64__
 +#define GLIB_SIZEOF_VOID_P 8
 +#define GLIB_SIZEOF_LONG   8
 +#define GLIB_SIZEOF_SIZE_T 8
++#define GLIB_SIZEOF_SSIZE_T 8
 +#else
 +#define GLIB_SIZEOF_VOID_P 4
 +#define GLIB_SIZEOF_LONG   4
 +#define GLIB_SIZEOF_SIZE_T 4
++#define GLIB_SIZEOF_SSIZE_T 4
 +#endif
  
  _______EOF
  
-@@ -29404,18 +29424,33 @@
+@@ -29393,18 +29414,33 @@
  	if test -z "$glib_unknown_void_p"; then
  	  cat >>$outfile <<_______EOF
  
@@ -125,7 +128,7 @@
  _______EOF
  	else
  	  echo '#error SIZEOF_VOID_P unknown - This should never happen' >>$outfile
-@@ -29528,7 +29563,9 @@
+@@ -29517,7 +29553,9 @@
  
  	if test x"$g_memory_barrier_needed" != xno; then
  	  echo >>$outfile
@@ -135,7 +138,7 @@
  	fi
  	if test x"$g_atomic_lock_free" = xyes; then
            echo >>$outfile
-@@ -29538,27 +29575,52 @@
+@@ -29527,27 +29565,52 @@
  	g_bit_sizes="16 32 64"
  	for bits in $g_bit_sizes; do
  	  cat >>$outfile <<_______EOF
@@ -178,9 +181,9 @@
  #define GINT_TO_BE(val)		((gint) GINT${gintbits}_TO_BE (val))
  #define GUINT_TO_BE(val)	((guint) GUINT${gintbits}_TO_BE (val))
 -#define GSIZE_TO_LE(val)	((gsize) GUINT${gsizebits}_TO_LE (val))
--#define GSSIZE_TO_LE(val)	((gssize) GINT${gsizebits}_TO_LE (val))
+-#define GSSIZE_TO_LE(val)	((gssize) GINT${gssizebits}_TO_LE (val))
 -#define GSIZE_TO_BE(val)	((gsize) GUINT${gsizebits}_TO_BE (val))
--#define GSSIZE_TO_BE(val)	((gssize) GINT${gsizebits}_TO_BE (val))
+-#define GSSIZE_TO_BE(val)	((gssize) GINT${gssizebits}_TO_BE (val))
 -#define G_BYTE_ORDER $g_byte_order
 +#ifdef __LP64__
 +#define GSIZE_TO_LE(val)	((gsize) GUINT64_TO_LE (val))

Copied: trunk/dports/devel/pkgconfig/files/patch-glib-glib-gunicollate.c.diff (from rev 140799, trunk/dports/devel/glib2/files/patch-glib_gunicollate.c.diff)
===================================================================
--- trunk/dports/devel/pkgconfig/files/patch-glib-glib-gunicollate.c.diff	                        (rev 0)
+++ trunk/dports/devel/pkgconfig/files/patch-glib-glib-gunicollate.c.diff	2016-03-10 02:49:55 UTC (rev 146510)
@@ -0,0 +1,12 @@
+--- glib/glib/gunicollate.c.orig	2009-03-31 18:04:20.000000000 -0500
++++ glib/glib/gunicollate.c	2010-03-06 17:59:08.000000000 -0600
+@@ -26,6 +26,9 @@
+ #include <wchar.h>
+ #endif
+ 
++/* Carbon is not available on 64-bit */
++#undef HAVE_CARBON
++
+ #ifdef HAVE_CARBON
+ #include <CoreServices/CoreServices.h>
+ #endif
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160309/4279eeb2/attachment-0001.html>